diff --git a/Manifest b/Manifest
index 477a1a3b876b..5c6211674347 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29634 BLAKE2B 6203ae41b77ffc32823e6144f775d247c22c0275e014d4684c210930ea993f2828aab72792d1f01f8c166685d7c07210d669aaccafd70e5244c36ba4f1a85579 SHA512 970e58af45f7c0cfa079ce472b6b89ef6d600cd1988861aa3ef938ffe9059848b3d024c91205fa2a06dac050d33551308f8b66726915b299a517590e498d3782
-TIMESTAMP 2022-08-10T06:40:02Z
+MANIFEST Manifest.files.gz 29671 BLAKE2B e899e33d35818fac64eb2504d1a2e7ee06333b2afd192f5a0a79589289f666e0a869681d27f1608fff11cc2f19108d9d5ab84cac866b2ee3b06a71490e124bcf SHA512 2bab80dd3f334806ff68ca7d258d3ffa21ec4a541cd5586a2e3a966b09fa4e6ea03f4184a858bdd2dab0dd116bad620eb5230838762990816e5863aeda65d26a
+TIMESTAMP 2022-08-11T12:40:08Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLzUsJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL0+KhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCH4g//TyyqtY+PaHbH0FRZrpK/kyfOZYYedzuAWbxdbeyGshOgnvCuXa715kRk
-Y5hGg5QDVruL/xjVYxmdxmZDoUu8nFmc/CqVmEpJ26fAWASj3YlFbM7rJPm5e8NY
-0bLNijU79bbeEpEWQ4hE9NkeHld/GwZv9X5XYj3smBAHOSHp3yb5e3aq3re53HXp
-Fpk6cZM8LLkjrCM9eTQFR9dqZ+4Na0NGtA6l8H0djXP4ZLnkh2LAQUZJ9kzhA+6Z
-e25gZMCcJPEjPbx3UjGEHnVQepghqZImSTdbnc55EJPCNgBwHuhoapOGqfWMgq7g
-WP1Z9VgcWI50RltBemo5ZSvZhCulJqEglJpnQKbKGM8+GUTbFW78bB3612ygTZJC
-d4R2+f2bb3/RYsYaJb2aIEt8uJ0dZLikNUBOcsV8ZaF4gkAD4YufJMFGXBBZ1RYW
-ylNl/3ZhzN0jHBvy4OjUdc7d8B3r0mLm1ajJdSnW0b+EtNM1cj8aHWURYy5OpZal
-yDWCrVxMzR9rfmo69bbiH1mEFd+4Irs27BGFwdbG2UXXUs5M72Ho/r5kmk9uGHWW
-tzQaqegGIsLektFSpQLn6qOYFGVyZloCDwfENngN3rR7IGvZthWG8ZLmiFDNmE54
-AlBFcwh2Q6F2CI3BEiAhCJ550rLHmpLi1afU/GcQIkZ7jo2ITfA=
-=0W8Q
+klBdWhAAq1RyvjeQwuWeBdy1SqgU/1EKSqdafLf5DChBwAAvU3n4bLXa+OwsjHB0
+xsMxG4YHIhmOfJbmRd/pRoTKrmABCMwPy2JfBDqj2sxfrZOW8heV7+NxuXxOHhnx
+I932bpcXFP51jn/JYnr5A2CbgQpXhBJ9pV8mRM/ITxaD6UknMvoFjZsyXWFSDH3E
+IixEgcFLv7wycjEsVPF0gnwz2U4t+x86zrtlwyVtlaNeba88B1iE7d3CrLQ3MEX4
+wlBM1fE58uNnNoW8aN3h/oO22wIJ31/60u6vnO9kFEmewimnuXtuzH7nfJuDPBFi
+vTyyf3FEJezx6/WryHPnYLU3owIgYh9zv5JclMosyUdTrbxWDJUpouX7NJL3ct0T
+nbQh/D6gzfNYSFIJVKBTR++rzH4i0ONjMZQEjgDb8tt2SbdkrTY5lQWJOc8bBAWk
+UcC+4Mdb8Rh+5HnlHmGeocCzKRAgGcJ2mb4h7Fqc7aojHG+28FLsTZVW61X81W18
+KyK+V2EEY6bF0CVMUvcr0F5C5eQE7LsPuswJB+Lam7xtGM+qOOTyV/o5uJv5f249
+OPfC8zusnhy0J6qcSVlbkfM8Ft+JpE9i4IhNGiuuslLveYZZghGjAG7L0JhdqxTX
+AqWiQyseUgWO63RY1P2vopNkxV+/VTFayZp93X0MF02TT7Zp49E=
+=0EO/
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 5bfee5c19994..71f94e17851e 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 470ca3ff69fc..4ab8addd23d4 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index f76fdf78fac8..6ee6854c6286 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -2,8 +2,10 @@ DIST aws-cli-1.25.36.gh.tar.gz 2237211 BLAKE2B fbab136a1c1211646c1213357cd80068d
 DIST aws-cli-1.25.41.gh.tar.gz 2238897 BLAKE2B b0e4d1b96048971f41a0fce9c9149154778177ec8569f467cd210edaa063d629ea6998c1ebfa4506f8b2cca65caef7f73b307ef6aeec683801045c6121f85a8c SHA512 712c237181b166cdf1148ca4b3588a92939dbbfbaa5cdff9bffd8e2da35089539ef3b0b0ba271b234918796cd5fd83bf2a59e29c974f9e341d0e42e05bb8b69e
 DIST aws-cli-1.25.46.gh.tar.gz 2240196 BLAKE2B fde009f43c4a9c900b0ce66ad540252b87bd023e0070efd5403beae61fe72f4e5d42e0c0402eb36f0b45a08f8769f49ffeec404dbf9d4d58cb8ae2be72caf81e SHA512 387c428e1643c21b7598962b18d19929bc26747ed80a041bda31d2bb6239239f2693c272ba320616320be3ff1a536e6af859a289f4fb0813e0c9b89978da56f8
 DIST aws-cli-1.25.47.gh.tar.gz 2241028 BLAKE2B 6aea17029d28bf0875f58472ab27e244e2ace10d1d4d56e156c5fe97462d9ec2e10869609bbd19134edcdd3deba19235a39d409ce11617cf914d856cb325ef59 SHA512 1e76aa939f3098a19bb64cd79fd265d70bf3d96a0b92411c5d72d8e9b0635d0cfde70c6b4d3effce5ac8c82b0ddd84b761b2ce0b131ac1ed2fba9e0222057764
+DIST aws-cli-1.25.49.gh.tar.gz 2241270 BLAKE2B 6c5e3c20855df9da322f3e6085f4f6f5894f4bdb19b7a47011bd111fb5934ecbe921397e45e5539d4734520dfad144906337f488bfc4b2aaf479fe9a74a689aa SHA512 f8dbd6d0ce2e919e20e2c251d289be2720c46e9ca25595e249eb1934d6a0494347c8d13131c9839a7177f0aa89cf4a5ee0ed1a938c53febd70424349c8fcc661
 EBUILD awscli-1.25.36.ebuild 1834 BLAKE2B 8dd7abd62571c499386dcc73967b693b028c094797cb10c43b7719b7ad2af01e683c056e9888e6ab6119204362dd2e61b6a465d3d115045130075d54c16295aa SHA512 84785cb46646fc3c97a504a712db51fc68d92739732fe696c1d5e198b99fc5665776629400cb99cb17fcebc47f6a426cc3678c827ebf28912854b8f9b5960906
 EBUILD awscli-1.25.41.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.46.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.47.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.49.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.49.ebuild b/app-admin/awscli/awscli-1.25.49.ebuild
new file mode 100644
index 000000000000..9f176fa05cc8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.49.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index d55c0c1d789b..5144db8eea09 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -7,24 +7,21 @@ AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad1
 AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b9427edb3bc4def5239415f16b67629de70d61e12dc835a3e8e7049c183f0c667d301919ffa7e6a22e7 SHA512 e6de86a72e11d37427a17e07cebdfc26b5c6108b413d853255108acf3c55882fd79d03ed41c0a6c1a23babd55f2e4bf36e5c7fc3e98c19bc07dc4593cd2a07c3
 AUX rsyslog.service 644 BLAKE2B 311072ff896b07d82e9d88b34120b4fa903b7a84c5ac9686751bd88db5263c912e60a7be1e90fa50ecd3b10b14d046f525227b1feb39528ef488b8879d58ba84 SHA512 5d11cfe47ca797941815f51f08d4e8e308e4827bed9235ddf1174f3357d7279a3c8151e02f1cbd3cf3a6d2f7d5e2f68061d3e17fab6a0291f01c32f88e995039
 DIST rsyslog-8.2102.0.tar.gz 3123684 BLAKE2B f5c4e00d68ec82ed3f7b89dd5e888bebda9c4eb38185dfd8ecd96c1bf77380385aaddac73ab1de8364e1239a3de746f160c18b0f135d006f473f9e40be2c18a1 SHA512 281b0e5d5cb548c39a6e514e5fd5b1bdbe8ca0bdd9234f4fea581ed7679f76d2d75b65d14c3c5e799f86f91600074ff75b467aa1ff27cdbec0f4197261c5aec0
-DIST rsyslog-8.2106.0.tar.gz 3180745 BLAKE2B a949c36e0c5251fa3cd7748387990b667564561a5fcf0250bb19ebf62bf88f367814f86d743c64e0b5e5a184e2160ec0c2cd2600ac0ffc655e41d651495e9311 SHA512 309bba7e53f0dc6462f8cac781f567ce879f31bc020b233e80aa4461cc4c6e9279ca1c65c910ce3015fcab9ed663020db84ff4073c03a436b5be66e57a99164f
-DIST rsyslog-8.2108.0.tar.gz 3204178 BLAKE2B d120f2b20521a40fbe985a4ba751edd51ed5917fcd0db5d7abb35ecada3ada31f99d34f74cd3278736356e8f09f13b79ca2166e4732676a97655c189d257e3fa SHA512 95096660bc93f7808d22c39549d7429deb340ef8d706f08dc8be35f48d1c7e3d389907fdf18ba04dd54fb59c9780fdb267eef7985184f0e5932bf11f46c5423b
 DIST rsyslog-8.2110.0.tar.gz 3217225 BLAKE2B df239609b7a5e08d2a5b1ab5823d45868ac75e1359876e032d4de633165878310f43bfacabab2df4b5657789f77dd2d93814d2fe2aa39e18b267b9bb9234c975 SHA512 b3ec40a272e1fee3034fb24a21ae6c773878b013c04bd01279f6b3bba65a98287c3497a3c4c3e46f8c91311117b3dc491a11a7e193f7ee0347b769c4162b48aa
 DIST rsyslog-8.2112.0.tar.gz 3230105 BLAKE2B deee27f0b1e2b9783bef4d90e396c92c772465156ae8242172548794d628edb5d1e9a95d9ee2aeb2b301ec4b691572391ea7db7b1e8fdb1d14c65e3857857799 SHA512 32ee475d4ef34a68aa43997a97472d21f45c27052c528c1904786df608977189a53e8bb88f310dc2ebe3bf11857824e4e2188c5b85591a005b6977f90a6b17c3
 DIST rsyslog-8.2204.0.tar.gz 3242825 BLAKE2B 1e7a75f151053c28bf8e1215f8f1da58ee2232127b4edae6c1a59ff236b2ff0aea57fb175bcdde9a3bd3ce516015422a2eda1f857fdeb56489555de27cf2deda SHA512 d26ab950788b8931b895719f7d8a42509f709b69a76e4188df16f72be050863ee402310ad9300840fed4ac089638497725d67433172778be7b2932fa82210472
 DIST rsyslog-8.2206.0.tar.gz 3246829 BLAKE2B cfe88f12821146011914610e33cb907bd96f19b6e67c0eb3f9bd88b749eebd3a91ae27e445688842a806719cfe9757778d3f9705cd2d6a497d358015c9ddf36b SHA512 000d2a05ef4823879e615a347f62f76d3af7d43cddb119e7f57a8470aade00139475368579385ba008a1d5979082128ef6148e0fac2478f6e0ccb26e68d317b7
+DIST rsyslog-8.2208.0.tar.gz 3262298 BLAKE2B c13920c755a24d8060335f3281a349d2f32c3c99de7351991e09e62302f6d9f61f4390b7945e30816c7d28afe5f757f6a49b2855e40e3f2f518a423662196b1b SHA512 e63f2465011722eb1bc99676ef6afd66e655af4fb9d751b3d8776499d054c422b195c65fef9ea6b9012d9fb334b7ed8a1c918167fecff389cbb79aa6b74acb73
 DIST rsyslog-doc-8.2102.0.tar.gz 6419104 BLAKE2B 134c7ccde6f7435b35840fa37f5774223ac1ebd7dc10db961900a7b1600483156518433c7f70d0981e96ea750e1916ab53e346abacf58066bf141e85c719ae00 SHA512 a5dc4fb9bd8892fac693c5692b926c8d7d9fa36667d6b4c6eccba750713af88d4317f6232efc2a16de38c2e58c4a8bc4d04c9ebb2e7ebc3b0878d53eef20dd2e
-DIST rsyslog-doc-8.2106.0.tar.gz 6500747 BLAKE2B d004af40dfc82577fe262993b10497cbf50142295ccfc046126e0d8cc85dd964cca7798732d2f41ef9d776096b3ec99a8c835bb037a78c9030ea6cd596d1e057 SHA512 04c205ea463f7487baedf60d0469f3752edfb60a0833954a3f208d52ed6495152c785a4a8ea47396ac85b581ced0657f7b51d313c2d4295e26d547b996ff4ca3
-DIST rsyslog-doc-8.2108.0.tar.gz 6527584 BLAKE2B b7974d2f723603017f1c725f820e03f355af1805d77143e6ff9eeb02e54a991ba4c143fc45b48b3e1625328e68113df36d71abd0763983a8db655081c5d81abc SHA512 d4ca8c91cbdd7be458083ffec9d933e5d1e175dff93fdf9274f5ca444c9cfe8710349c16de6edfd3e12cf97fc889a9e71059ef1d0b85fda4ed335fb107b98a9f
 DIST rsyslog-doc-8.2110.0.tar.gz 6533014 BLAKE2B 16670903ddbbc14ef5ebc726964d1fa879849294401825a4e2c65e0ca06924830c2c882b98ab6eb6c2f639dfcf683b8c7659b49965b4280d441935126364ce9c SHA512 f0081b28d7394af30d4e1873a040208ec358d45c7336c69e99e2d6d4a2aae86a25a65d3c803b6570668e24625e50e01d5af3f9fa90f1c8cc82b45b1b6bd7a7e0
 DIST rsyslog-doc-8.2112.0.tar.gz 6545985 BLAKE2B 4f6cfbbf8062a70faa67dd7168ad35bcbe2c81f80560ddb48229a332ce8ac861efe3bdaa1baeddbdd086c3e9ac8912746ba58bc64ab62f3caba8b8cc1b0014fd SHA512 8588d5fd1a79fce785db85ba162ed2fa9e5375590ee8e6d8569e75334d36683a1b977e930c096a6b3dac15596c066b46fc3105fcc5e8232ab11cf43c6eed3a55
 DIST rsyslog-doc-8.2204.0.tar.gz 6553264 BLAKE2B b4691a6bba44ec37bf310c4f7b307f85bc5d30954296ad62f77ff0f5041badf5fc40fc5680b940f6f3929da8956928dea890f7f2547f7db5e1e4141ef0855b48 SHA512 361528b95c1f02cdc2b2ca8ba5252c8215996e81ef1602e08c46be4e1fd8c1c287dd7d52ae9b2b58c0ec7fe38d7079a89e10642ac3f34fe0b6c5737968999fb4
 DIST rsyslog-doc-8.2206.0.tar.gz 6553532 BLAKE2B 51288f5e819393ad6b5af1acfa030b262c1a97c9cc791606c16792201eb8f7bbc9750bb004e7592a99fa1261b971911a6c2bbe6c0b82a6c3bb067b077ce22641 SHA512 23d686241bb6422146602420e21a53208ff82f39f76258d7147dc0b5c06863f8229e1e2df06bfcae63408d06e70b68f7a0b0d216671b78302527d436091a698a
+DIST rsyslog-doc-8.2208.0.tar.gz 6563848 BLAKE2B ec68684f1d7d895833f656ba6224a8013213a12b1bc7a28a268f2f629c25a3fbac7c379091f17eae24b6d71278c087e4a4cbed1656554de743fe5616a96559bf SHA512 428c2fe9e5025928d4a9d33f05f4eb20ac1bbde052b7fa2a8a0e45bfffe111eecc94eb2b6ec129de1011f0eabb106b4fb41d402b2a270e4148d3b1081e3b1da0
 EBUILD rsyslog-8.2102.0-r1.ebuild 12864 BLAKE2B cdbbbe6c4b582c5d899318ebffc5a3eb0469eb3326db85fd152c1288e1494456bddca5e891690b7331c5e852db3cb7ec092471f42ece1e12ad71b92f894efd7e SHA512 7d20f94c6f7730c3644f1aa90035cc79dc3c945549e03d7e7bdaf2f062c701b5d42a21688d837134bb8b7e4bcdd871ef8c48af0bd3edf9d33b890e5a74172e5e
-EBUILD rsyslog-8.2106.0-r1.ebuild 12967 BLAKE2B f0054541a377a79f49f51a977a085b53dd75699f18204666ddf281db571dbf8c5a3a4ed73265b7562cb77132bab3a1be917b4dc5bdd23cabd7574d478e49e96d SHA512 0ac99d17ffcf484f60a8fb019655223665c34c4a112b0512c17a277380146da20824ec59d15736f3f726a128f21f329e90108aa945a453bc2478a2c18a507586
-EBUILD rsyslog-8.2108.0-r1.ebuild 12924 BLAKE2B 8c34d70db094b3249718e6076f415d9986f6d357396e5abf474b8414a6330b9de4285f1fd79e6287e5e7af33e62fe96a086466f28d8925d9d4096b13222abedd SHA512 7e6078eae9a74a52d7d3614299ea472bbf548187fd1069259ccfb005516a1c440e242530c287415df819d6daadf28cbb13da605a10a567a5dd28d22bc3658af7
 EBUILD rsyslog-8.2110.0-r1.ebuild 12990 BLAKE2B 556a0641ea0dc1bf634a3e2eb67bf4ad98be01988b92b268d4319bee2fb044976c8c0e659f203b20583d82e9b9c2aeb78347077f32bd95d133cb4500ce66fd8c SHA512 c630700d84ed9462eaa2f56245d2bd4f4720440f686fa6c3559dcc1fb8609de440d80305ee3d8e0b75cbc21fbcf17f2e7076764b8c1d31761eede3a6de0c5870
 EBUILD rsyslog-8.2112.0-r1.ebuild 12918 BLAKE2B a6b90c61486be47ed3b22a9bb5c7cc8b7837f56db21d88353403c50ef427fa4cf364a964db74d0a07fd15f4420cd87441a4d51edec4ff19dfbce7ef7d4c787f1 SHA512 a9b6313794a45610b62a0ff700c89db057c9c825445a124ab7b10826e379333fa236fa9376f4c4c798519f163ced12c9d753a63f48c1840e1d705d218bbb329f
 EBUILD rsyslog-8.2204.0-r1.ebuild 12922 BLAKE2B 7190afdac273d3d1be851dafb59e4a0dcebe368eff979340cd48b177ad8d896467b84b6ec33aa3e20c1310af2242b6b00d5bf2f66f5a3a20e4017486a136ff9e SHA512 730f72c6bc668aa550851dac2e7954cc35e21180adf212cdc5cbbabe367093f15e5946985ed8ad98dea456c708314eac8b966108411e99905359813129543511
 EBUILD rsyslog-8.2206.0.ebuild 12923 BLAKE2B c11a103ea1cd9f10a1ec0cc55dca9fbcfe4eff0712e4e9fddb2a9f3f513b10d39352c1b72e051f91579dd7d59627f10b59fc4cc2f529e04772d19afd633b0ea8 SHA512 8c4bde5bbf9ac2097cd7a1071d4397a5a1e68b88fd1fabca30347b5e0feae50592554c6c54cd25daedee370fdf56e862401422ba42cd1b3bf94610535a6f3b8d
+EBUILD rsyslog-8.2208.0.ebuild 13008 BLAKE2B f503fbad2ab404cab93e957078eb8f00c63c35ccd44fa4e4beb5ee61fb5648e7df6f6a2c47a187b44c4673c4dbc07958fba28e81ee6a65e8c9dd96a561d32d7e SHA512 bd8ef69ecc3c3bf12c01e42b591afcef75073d8204bf3c0f33b8f7f3e7aeca308d497958da3469865ad6c7a597420079f9219edfa836a9aaf99118dfe0d511b7
 MISC metadata.xml 4688 BLAKE2B 61d9ef924def00bed85b9b164e95ae8f512e51a0f0090b61a5737ee93b21db69db642867ddb6076fda757ae10748b9172de42754839d01859529aec70760d04f SHA512 01bedda2baeefccffc765550ab2f8aa29235e7a3a3fc8b765beb205518785da9fb5905037ad9e8e6ba9385d2f009d260260e3c207bbf1eea5a5ce4834a004365
diff --git a/app-admin/rsyslog/rsyslog-8.2108.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2108.0-r1.ebuild
deleted file mode 100644
index 4ead7a5d9cca..000000000000
--- a/app-admin/rsyslog/rsyslog-8.2108.0-r1.ebuild
+++ /dev/null
@@ -1,486 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit autotools linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-	"
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-
-IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
-IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
-IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
-IUSE+=" systemd test usertools +uuid xxhash zeromq"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	kubernetes? ( normalize )
-	ssl? ( || ( gnutls openssl ) )
-"
-
-BDEPEND=">=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	test? (
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.8:=
-	>=dev-libs/libestr-0.1.9
-	>=sys-libs/zlib-1.2.5
-	curl? ( >=net-misc/curl-7.35.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	imhttp? ( www-servers/civetweb )
-	impcap? ( net-libs/libpcap )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	kubernetes? ( >=net-misc/curl-7.35.0 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	normalize? (
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	clickhouse? ( >=net-misc/curl-7.35.0 )
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? (
-		>=dev-libs/hiredis-0.11.0:=
-		dev-libs/libevent[threads]
-	)
-	relp? ( >=dev-libs/librelp-1.2.17:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		>=dev-libs/openssl-0.9.8y:0=
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
-		openssl? (
-			dev-libs/openssl:0=
-		)
-	)
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	xxhash? ( dev-libs/xxhash:= )
-	zeromq? (
-		>=net-libs/czmq-4:=[drafts]
-	)"
-DEPEND="${RDEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-	test? (
-		>=dev-libs/liblogging-1.0.1[stdlog]
-	)"
-
-if [[ ${PV} == "9999" ]]; then
-	BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	BDEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	BDEPEND+=" >=sys-devel/bison-2.4.3"
-	BDEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${PN}-doc-${PV}.tar.gz
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# https://github.com/rsyslog/rsyslog/issues/3626
-	sed -i \
-		-e '\|^#!/bin/bash$|a exit 77' \
-		tests/mmkubernetes-cache-expir*.sh \
-		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		--disable-liblogging-stdlog
-		$(use_enable test testbench)
-		$(use_enable test libfaketime)
-		$(use_enable test extended-tests)
-		# Input Plugins without dependencies
-		--enable-imbatchreport
-		--enable-imdiag
-		--enable-imfile
-		--enable-improg
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without dependencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmtaghostname
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-fmhash
-		--enable-fmunflatten
-		$(use_enable xxhash fmhash-xxhash)
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmdb2diag
-		--enable-pmlastmsg
-		$(use_enable normalize pmnormalize)
-		--enable-pmnull
-		--enable-pmpanngfw
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis imhiredis)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable clickhouse)
-		$(use_enable curl fmhttp)
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable imhttp)
-		$(use_enable impcap)
-		$(use_enable jemalloc)
-		$(use_enable kafka imkafka)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable kubernetes mmkubernetes)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable omhttp)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable gnutls)
-		$(use_enable openssl)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq omczmq)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
-	systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/${PN}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/${PN}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	if ! hash certtool &>/dev/null; then
-		die "certtool not found! Is net-libs/gnutls[tools] is installed?"
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" || die
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" || die
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.2106.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2208.0.ebuild
similarity index 97%
rename from app-admin/rsyslog/rsyslog-8.2106.0-r1.ebuild
rename to app-admin/rsyslog/rsyslog-8.2208.0.ebuild
index 17e58184ef8f..28fb4cde75da 100644
--- a/app-admin/rsyslog/rsyslog-8.2106.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2208.0.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=( python3_{7..10} )
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit autotools linux-info python-any-r1 systemd
 
@@ -16,7 +17,7 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~x86"
 
 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
@@ -42,7 +43,6 @@ REQUIRED_USE="
 
 BDEPEND=">=sys-devel/autoconf-archive-2015.02.24
 	virtual/pkgconfig
-	elibc_musl? ( sys-libs/queue-standalone )
 	test? (
 		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
 		!jemalloc? ( sys-libs/libfaketime )
@@ -57,7 +57,11 @@ RDEPEND="
 	dbi? ( >=dev-db/libdbi-0.8.3 )
 	elasticsearch? ( >=net-misc/curl-7.35.0 )
 	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	imhttp? ( www-servers/civetweb )
+	imhttp? (
+		dev-libs/apr-util
+		www-servers/civetweb
+		virtual/libcrypt:=
+	)
 	impcap? ( net-libs/libpcap )
 	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
 	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
@@ -96,11 +100,11 @@ RDEPEND="
 	zeromq? (
 		>=net-libs/czmq-4:=[drafts]
 	)"
-DEPEND="${RDEPEND}
+
+DEPEND="
+	${RDEPEND}
 	elibc_musl? ( sys-libs/queue-standalone )
-	test? (
-		>=dev-libs/liblogging-1.0.1[stdlog]
-	)"
+"
 
 if [[ ${PV} == "9999" ]]; then
 	BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
@@ -182,6 +186,7 @@ src_configure() {
 		--disable-generate-man-pages
 		--without-valgrind-testbench
 		--disable-liblogging-stdlog
+		--disable-imfile-tests  # Some imfile tests fail (noticed in version 8.2208.0)
 		$(use_enable test testbench)
 		$(use_enable test libfaketime)
 		$(use_enable test extended-tests)
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index eac354ce9a74..4f7241fe4099 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index d5b99f81204f..f0a55d909e6b 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -14,7 +14,9 @@ AUX newscripts/bacula-fd.initd 253 BLAKE2B 38b87d2868f7cc0afb3270f81445832bdf876
 AUX newscripts/bacula-sd.initd 252 BLAKE2B c27f6635ca72c96fc74d1d27c252934ca516cf768a5fec5e043a19d14e7fa67ccfbd6bbbf5da8ee6b718ca7f232565b23216f8ef3adc372681ea4f6bf763f46e SHA512 f4e1252d3e106ebd842cb23c6994cbe29e48e07cff15726479628d1cc5695bd45a0102652203316efcf8a3b3454ad2ca08ee7c6a673880064d15f96c43c395d4
 DIST bacula-11.0.5.tar.gz 5982886 BLAKE2B 99e9c616c29ab6e0064b336e4ad9d0caf96aee9c51009e04b44bfa4f5f3f8d57de93d8bf6c06f60b01f50838fd8cba4500117245b06e82f42a14a6de507a27d1 SHA512 56dd3208f9774f637fbec2781a847d5e7899ceb4e54178c54c9283eba3fcd83b1579fa690aa380bc6aba363a465151f8e709ce728a582e2518ba715c6179af17
 DIST bacula-11.0.6.tar.gz 5986763 BLAKE2B 60b1c1f4de3cef7470f0f33aa9d361393cee176222bb911d93bac108b8e3a6e38d73acdcc8b773a06d8820039d2e12a4216a5773a4fab4a9c35095607bd6b7c6 SHA512 44abc9e3598f3d3beea3e85cca0867e4b9b77c4e7a17cb1902a5e952b049fb2b15f8f6319436fce1dd92ad52d26f04d7225dd052372ecc30aa55fb668a639149
+DIST bacula-13.0.1.tar.gz 6224778 BLAKE2B 1b5d9aa56aae2de57589a421e33b9d394dcfbaf59f442e19c88c8ca8dcc234ffb42fca3f019e17836ce1d0ede75178c0fecf63b225c54c6d1b6dd0849d2fd50e SHA512 fd10857d12bb637b9f6e51a03888d8cc93604ba1e793f888304f3c115d48800d7f0d69e30a843355c6760ff8e9b5481c174a24ace1c2adc106cf4ec73646b426
 EBUILD bacula-11.0.5.ebuild 11871 BLAKE2B f47ab3915e5b4fe49680c7a784c50fdaf573056322d7d8b969d64d290a1e98fc8e1f25322f6e74dbf34ecf4fb8157b041476e1f6e5d87e8105545b4eb6280c24 SHA512 b1b8a2721877e332d98b7ed1300b061ea9cc1f624d3b16dbd09e7f108a9b0a2005751b741422968abfe95dbdf3baac87aeeee774c2f33e7da74062f66849093d
 EBUILD bacula-11.0.6-r1.ebuild 11873 BLAKE2B 76c9e91f8f0a6c042f750ee8b752cc02959b1d08ded810f39b8908dc2f58fb399477966f5669c05ad1a8b93f53cff5c047c340299fe686986c9287ba89fa2ce6 SHA512 7c140c4a74e7acb5f376093af1df61fccbc3bd9936c00cccceaa64f4ce0b3dda239cf0d3241d88de002e3e54de4b8513cc8cd08af4b42d82f11d8c1634be4fe2
 EBUILD bacula-11.0.6-r2.ebuild 11917 BLAKE2B e0a0d4ab97ad5a2b419f68f2c0ed68978cc979b4afa5d5b03910c9cd857bb81ee7a96393db2319977df848eacaf492158b09f604a19583a978cfdebc855d8354 SHA512 c7164d7e06643dd4bf1ee4044096b165753b501bcd6d1e1d70ad18912947ca977c5c08c9359abc11cb5ce696d49e42dcfec85470089378d6e347558e80b4e8c6
+EBUILD bacula-13.0.1.ebuild 12032 BLAKE2B 02eaf44ceab7284a84863d4fcbed572dde74caea3f81573e3251e2ceaf6c5fd0e53bf55b2664fff7e52602282b61694d5e3397964037a76ee154d50dd17672c9 SHA512 ec020d6133bd56d7ef6567f939cdff5c1e854e5f5ab4af51782b248c67edb474d2c52804d038eb540fdb40a5746cae41e3c096104d3892001b5641b22cb2af46
 MISC metadata.xml 697 BLAKE2B 6fd293a1009c2d461a43d404eff2883443f4e2a49d862120f4c9477f7fae8f2462be4786a7e8f6216515373e881d071b433835b9fb8da3b2f30c0701ef4a7ced SHA512 6d0077158112c26232370f11ec0d00ccb14376ce2649cc8ef79d3f99332bbe1bf18968a42e9c20d82934be3f9b49d49cf1f848e4e837143f8a5914fade6b14f7
diff --git a/app-backup/bacula/bacula-13.0.1.ebuild b/app-backup/bacula/bacula-13.0.1.ebuild
new file mode 100644
index 000000000000..37b6baa2b2cb
--- /dev/null
+++ b/app-backup/bacula/bacula-13.0.1.ebuild
@@ -0,0 +1,419 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop libtool qmake-utils systemd
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bacula.org/"
+SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+	!bacula-clientonly? (
+		!bacula-nodir? ( virtual/mta )
+		postgres? ( dev-db/postgresql:=[threads] )
+		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
+		sqlite? ( dev-db/sqlite:3 )
+	)
+	dev-libs/gmp:0
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtsvg:5
+		x11-libs/qwt:6
+	)
+	logwatch? ( sys-apps/logwatch )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+		acl? ( virtual/acl[static-libs(+)] )
+		ssl? (
+			dev-libs/openssl:0=[static-libs]
+		)
+	)
+	!static? (
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		sys-libs/zlib
+		acl? ( virtual/acl )
+		ssl? (
+			dev-libs/openssl:0=
+		)
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	dev-util/patchelf
+"
+RDEPEND="${DEPEND}
+	acct-user/bacula
+	acct-group/bacula
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			app-arch/mt-st
+			sys-block/mtx
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+REQUIRED_USE="
+	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+	static? ( bacula-clientonly )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	if use bacula-clientonly && use static && use qt5; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
+
+	# bug #310087
+	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
+
+	# bat needs to respect LDFLAGS and CFLAGS
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
+
+	# bug #328701
+	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	eapply -p0 "${FILESDIR}"/${PN}-11.0.2-fix-static.patch
+
+	# fix soname in libbaccat.so, see bugs #602952, #790140 and #845126
+	eapply "${FILESDIR}/bacula-fix-sonames-new.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	eapply_user
+
+	# Fix systemd unit files:
+	# bug 497748
+	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+	# bug 504370
+	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+	# build 'bat' for Qt5
+	export QMAKE="$(qt5_get_bindir)"/qmake
+
+	# adapt to >=Qt-5.9 (see bug #644566)
+	# qmake needs an existing target file to generate install instructions
+	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
+		src/qt-console/bat.pro.in || die
+	mkdir src/qt-console/.libs || die
+	touch src/qt-console/.libs/bat || die
+	chmod 755 src/qt-console/.libs/bat || die
+
+	# Don't let program install man pages directly
+	sed -i -e 's/ manpages//' Makefile.in || die
+
+	# correct installation for plugins to mode 0755 (bug #725946)
+	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile ||die
+	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/docker/Makefile ||die
+
+	# fix bundled libtool (bug 466696)
+	# But first move directory with M4 macros out of the way.
+	# It is only needed by autoconf and gives errors during elibtoolize.
+	mv autoconf/libtool autoconf/libtool1 || die
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=''
+
+	if use bacula-clientonly; then
+		myconf="${myconf} \
+			$(use_enable bacula-clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	else
+		myconf="${myconf} \
+			$(use_enable !bacula-nodir build-dird) \
+			$(use_enable !bacula-nosd build-stored)"
+		# bug #311099
+		# database support needed by dir-only *and* sd-only
+		# build as well (for building bscan, btape, etc.)
+		myconf="${myconf}
+			--with-${mydbtype}"
+	fi
+
+	# do not build bat if 'static' clientonly
+	if ! use bacula-clientonly || ! use static; then
+		myconf="${myconf} \
+			$(use_enable qt5 bat)"
+	fi
+
+	myconf="${myconf} \
+		$(use_with X x) \
+		$(use_enable batch-insert) \
+		$(use_enable !readline conio) \
+		$(use_enable readline) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_enable acl) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-archivedir=/var/lib/bacula/tmp \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-logdir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-systemd=$(systemd_get_systemunitdir) \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--disable-afs \
+		--without-s3 \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+	keepdir /var/lib/bacula/tmp
+
+	# remove not needed .la files #840957
+	find "${ED}" -name '*.la' -delete || die
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt5 && ! use static ; then
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	# Install all man pages
+	doman "${S}"/manpages/*.[18]
+
+	if ! use qt5; then
+		rm -vf "${D}"/usr/share/man/man1/bat.1*
+	fi
+	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+
+	if use bacula-clientonly || use bacula-nodir ; then
+		rm -vf "${D}"/usr/libexec/bacula/create_*_database
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
+		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
+	fi
+	if use bacula-clientonly || use bacula-nosd; then
+		rm -vf "${D}"/usr/libexec/bacula/disk-changer
+		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
+		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
+	fi
+
+	# documentation
+	dodoc ChangeLog ReleaseNotes SUPPORT
+
+	# install examples (bug #457504)
+	if use examples; then
+		docinto examples/
+		dodoc -r examples/*
+	fi
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bacula.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bacula_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bacula-fd"
+	if ! use bacula-clientonly; then
+		if ! use bacula-nodir; then
+			myscripts="${myscripts} bacula-dir"
+		fi
+		if ! use bacula-nosd; then
+			myscripts="${myscripts} bacula-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependancy for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	einfo
+	einfo "A group 'bacula' has been created. Any users you add to this"
+	einfo "group have access to files created by the daemons."
+	einfo
+	einfo "A user 'bacula' has been created.  Please see the bacula manual"
+	einfo "for information about running bacula as a non-root user."
+	einfo
+
+	if ! use bacula-clientonly && ! use bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+
+		ewarn "ATTENTION!"
+		ewarn "The format of the database may have changed."
+		ewarn "If you just upgraded from a version below 9.0.0 you must run"
+		ewarn "'update_bacula_tables' now."
+		ewarn "Make sure to have a backup of your catalog before."
+		ewarn
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bacula does not officially support SQLite database anymore."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+	fi
+
+	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
+	einfo "you have to enable 'USE=qt5'."
+	einfo
+	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
+	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
+}
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index 4298ac3fdb41..39985be3fb6b 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,5 +1,7 @@
 DIST dar-2.7.5.tar.gz 2404076 BLAKE2B 2887629cecf069cfb5063132299279b8be985785485c6f04a8389dfd4930f00b073b421fbb17915d69f5efd46ebb4c3d371c10d3936bfb16d82a191218af350d SHA512 a4e01dce8a078ba81b3032a1910d75f0f59a23511246f570a50ade135f49f11e522ed8916a947aece1799dcd1d37308ba6e4a009313b80d6a1561698c3d5623a
 DIST dar-2.7.6.tar.gz 2410200 BLAKE2B 925b4854c66fec9287e0f42d213f94f208b5248d09eb6abe4e36a41df1fc57641d7a6b41e1f8aaa202e6f74ad04399c70a8cb74dc63685985a5671ba54efdf93 SHA512 517fa06a5b8caa53ad111e4287446583f328ee2027169db067610877e05291e63179c1bdd92312a6885d1c7eba0566a86301e974d1d48df56f0fce9ccfdb3a19
+DIST dar-2.7.7.tar.gz 2410835 BLAKE2B c2b1cff205a7af0b714808bbb952677ffdfa8d62289d412e4e3056db16f5c204a2eecc8f770ff57d18839218ff1babcb5c56c9729e03316d698a351dacf47e25 SHA512 984328cff1ed3338707858aced83a6a18e950581f02dd686a2a01668f6c374d0af2d98ba49068a61624641fcfbb139ae893d02e5b5f303b8b26d8e05fcb6a229
 EBUILD dar-2.7.5.ebuild 2226 BLAKE2B 305c99ac9f516c706032ec066f7e22d6c85690bc6e7c29cfe8eecd54fbb0a4ca2e2db17fd58edbd0d6de98c3f89af13500e48369a62036f6816880b6f116b3fb SHA512 c43754f566d0ff4772ba9bc8062ac2c121c2d9f9bf7bd85bf1153301b5c06b8e75200e1cbb75708abc19c283c07b40917de85658a42c46bbcedff96155b27092
-EBUILD dar-2.7.6.ebuild 2229 BLAKE2B 99607c20ed3ea2faac8c4b99ca0cd13e84d9518e43e6838225d336754f312a3512605ee1933e29dcac6a15e098da21babfec7ff76f866f0ff7d37521a3979290 SHA512 d988d0b34c957729ddb070299e41ca70e60f0fdafdd23b5366499a54dc354fded62f910c838191cbb5e4a9901fd20a67c2b491727059dff4f88d1ab22f055ea2
+EBUILD dar-2.7.6.ebuild 2227 BLAKE2B e0d301f76a7e4901e204732eaa8690e461cda568ba02026ebb1ed772d2f985a9caeccbf8a6570f48fcdd22e8a01912141c028ee7e7c0b076ce213aa5b513578f SHA512 656ae177934759b0b44ebabf8b6de4a332e98290277aa08d32d90bdb9164a1de5512f0ba89bcb372bb0488b4711aed530ed80b9b97fc5a4beb2c63d47c036860
+EBUILD dar-2.7.7.ebuild 2318 BLAKE2B 4041bc8ed85f878faac8e541cbd02813f345e3757b7ffb2059a7614d2413517e40d5f784ec4ea7c522198e720dc27aba994cbe60e1766c48c0eaebc834784697 SHA512 ff2a873c907d92468abc4e27dce106986ab8d860ea91da6ed295b770424b913aaa028afcd1e368fddfc2ecee761a30e6529536a78761d23c55dffea44bc70937
 MISC metadata.xml 1284 BLAKE2B b70f06ea13076c3de9470fa1b65d9a17de048db8f52ade94246c62241828be74f308dcc39067b27ed99ff963c3554e371611aba0bb04ed6d57d14d4f7fd7f9dc SHA512 5cbbbff7e0652a85f717f2eb6a574d6fe52d478e049fa81e1c25b1bbe034086d433558952be1bc56ea4492c9c43f6da1e0968cc9132d18e7342890434c0a19d6
diff --git a/app-backup/dar/dar-2.7.6.ebuild b/app-backup/dar/dar-2.7.6.ebuild
index e38b345ee35d..efe67752937a 100644
--- a/app-backup/dar/dar-2.7.6.ebuild
+++ b/app-backup/dar/dar-2.7.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc sparc x86 ~amd64-linux"
 IUSE="argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync threads xattr"
 
 REQUIRED_USE="?? ( dar32 dar64 )
diff --git a/app-backup/dar/dar-2.7.7.ebuild b/app-backup/dar/dar-2.7.7.ebuild
new file mode 100644
index 000000000000..81fa3cd32f1d
--- /dev/null
+++ b/app-backup/dar/dar-2.7.7.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="A full featured backup tool, aimed for disks"
+HOMEPAGE="http://dar.linux.free.fr/"
+SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
+IUSE="argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync threads xattr"
+
+REQUIRED_USE="?? ( dar32 dar64 )
+		gpg? ( gcrypt )"
+
+RESTRICT="test" # need to be run as root
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils
+	app-arch/zstd:=
+	sys-libs/libcap
+	>=sys-libs/zlib-1.2.3:=
+	argon2? ( app-crypt/argon2:= )
+	curl? ( net-misc/curl )
+	gcrypt? (
+		dev-libs/libgcrypt:0=
+		dev-libs/libgpg-error
+	)
+	gpg? ( app-crypt/gpgme:= )
+	lz4? ( app-arch/lz4:= )
+	lzo? ( dev-libs/lzo:2 )
+	nls? ( virtual/libintl )
+	rsync? ( net-libs/librsync:= )
+	threads? ( dev-libs/libthreadar )
+	xattr? ( sys-apps/attr )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )
+"
+
+QA_PKGCONFIG_VERSION=""	#862025 - upstream has a different numbering scheme for libdar
+
+src_configure() {
+	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
+	# logic.
+	# For example "--enable-dar-static" causes configure to DISABLE
+	# static builds of dar.
+	# Do _not_ use $(use_enable) until you have verified that the
+	# logic has been fixed by upstream.
+	local myconf=(
+		--disable-dar-static
+		--disable-python-binding
+		--disable-upx
+		$(usev !argon2 --disable-libargon2-linking)
+		$(usev !curl --disable-libcurl-linking)
+		$(usev dar32 --enable-mode=32)
+		$(usev dar64 --enable-mode=64)
+		$(usev !doc --disable-build-html)
+		$(usev !gcrypt --disable-libgcrypt-linking)
+		$(usev !gpg --disable-gpgme-linking)
+		$(usev !lz4 --disable-liblz4-linking)
+		$(usev !lzo --disable-liblzo2-linking)
+		$(usev !nls --disable-nls)
+		$(usev !rsync --disable-librsync-linking)
+		$(usev !threads --disable-threadar)
+		$(usev !xattr --disable-ea-support)
+	)
+
+	# Bug 103741
+	filter-flags -fomit-frame-pointer
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
+
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+
+	# Bug 729150
+	rm "${ED}/usr/share/doc/${PF}/html/samples/MyBackup.sh.tar.gz" || die
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index a0803c3279cd..228def1aaebe 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 054cc4943b96..e412c44f0eb3 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,4 +1,4 @@
 DIST gpgme-1.17.1.tar.bz2 1747692 BLAKE2B 44cf9309cbad038f23aa7c5c77fd85be23faf3d8e1eb7abdb87a737ad1ade1ee269a95ce618dba327bbd06e6f4b2a91e2446744ee08f09ea6fb3b2dad44431c5 SHA512 e6399c3de1e430e38f2692bf5ec0c02ecb36ea3dbb56ff29dc3a438a5be4900a77a0559dc5b673dc1ffbff5e7f589e548e19176b2644fe8f63e00c6b9181b920
 DIST gpgme-1.17.1.tar.bz2.sig 119 BLAKE2B 31832424c0e029dc520d3302a71b086d9fcb044c74344cc0fb4b6c6a02d0dd840e62e7eb60acfaf004e6f3650d58436b58e645ef2a50b948ecaf3ca162bf577a SHA512 e1a4213d0d39f2efd0d5c007a0449c76bd650e76e002a9acb673eef0579912db06d844df11a4f7cb821e1d8468d2d6c1303f1c5d915a5c3c9cb5abacfbd004fc
-EBUILD gpgme-1.17.1-r1.ebuild 3338 BLAKE2B 0ef0376fc45aa59da998221c683b6cd95aba45a83bc4505b0d8d9623699cb101092f1edd77ae9d01ea99689e5cde780532bcf076fdf95e8c706c596d26f13cda SHA512 56f050bb6856e59e1edf5938df3202d3faf9d35c01ca1aae7fee1c00e83774594aa36ad16c69c46a633998cdaeca62d3eeff8f84b29a99fe294c37bfca932c9e
+EBUILD gpgme-1.17.1-r1.ebuild 3339 BLAKE2B b94b1c3ccbac471ad16c406823460d4ffca1c9428b1420f3b433f224faf2a4a760c23b2923bff5a007cf37c63497d9ed5737683ad9bb4cc97250443bb71e00b6 SHA512 f4479a00ae16770c7180c8465079a4cf0cb92811715f87439e92c591701d1ace2c6af35a2990120723ca4c4091fc673aa61fdbda67d6648891c24905279a0dd5
 MISC metadata.xml 333 BLAKE2B 6dd18b63ec1f7656ab8bd705242bec45d7820db8be31f326172cad400711e6d7268c156d6b81facfdfa79118c04728ac910a8f8de36a11454227a1399235a582 SHA512 21b8d7bf3f14b5ab7e2ea587027395cdd881ecddd5a4f70237cafc70dc904b396a33f70dd7ef37519df5a204f4e3a89d9ea6ffc221df41bd9cbf23e69863f12f
diff --git a/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild b/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild
index 532d754689ae..278233bab4c9 100644
--- a/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild
@@ -10,7 +10,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
 inherit distutils-r1 libtool flag-o-matic qmake-utils toolchain-funcs verify-sig
 
 DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
-HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
+HOMEPAGE="https://www.gnupg.org/related_software/gpgme"
 SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2
 	verify-sig? ( mirror://gnupg/gpgme/${P}.tar.bz2.sig )"
 
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 96d25d6ce7a3..fb0bc6677afd 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 076b68b27e8f..82a2c2139c96 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -24,6 +24,6 @@ EBUILD emacs-28.1-r2.ebuild 14934 BLAKE2B 0d81ef8eddbc2aeeace9071b7ce9214f539dd7
 EBUILD emacs-28.1.90-r2.ebuild 14940 BLAKE2B b6bb7cf14803f2649554168191d2533a2912212d399a31c1095c1b463356a7284ce135d648b1378042f20ae780cadac6b848efacecc1cda5c190fa2f925fb7aa SHA512 b7d7852e3f7367f18500132317ab0c95a076ace63080cfa805ed638266cbd7171ddd6814911bed3532f0c5740300689f2773790744e9cccbc426ac7d1867c2af
 EBUILD emacs-28.1.91.ebuild 14940 BLAKE2B b6bb7cf14803f2649554168191d2533a2912212d399a31c1095c1b463356a7284ce135d648b1378042f20ae780cadac6b848efacecc1cda5c190fa2f925fb7aa SHA512 b7d7852e3f7367f18500132317ab0c95a076ace63080cfa805ed638266cbd7171ddd6814911bed3532f0c5740300689f2773790744e9cccbc426ac7d1867c2af
 EBUILD emacs-28.1.9999.ebuild 15037 BLAKE2B 61cbff92ed83808be6868a4451f6e7f4064474da368f7e93295a3b23ff8a9f3a6ceb6c78ebc3955a3aa506ccf01e096b6a906b0ae4225c532b649b7492c865dd SHA512 37e7756db860b4564557b7f93c6a46e3b390dd899568802296ea2416cf9b23c408843192e5f9793a2968eff9bf622138c09858210efb85f16da0f006a912693d
-EBUILD emacs-28.1.ebuild 14790 BLAKE2B 9555b8b3d692fd33b9575e5666a63345369070187799e1a33556565c15a4f1c07b91197223e9db311911ca9ee4e797e9840b525fe8a2e8a9255f153c1bb541a5 SHA512 22757ca82108d2a47ee187119e82460a33c1df1d7b6cfd543a7bedd87e22aaff63083b2dffe47bcbb795430fa40e0a43477d0ef415a0de6e8b6bc5aaae425670
+EBUILD emacs-28.1.ebuild 14789 BLAKE2B a34823f4e5f862663981f580fff6b3a66e8b0b6c605cb584fb5bed3c5f2aeca0ae266668c31c0d302855fcfdffb1790c7193bf7a5d77596438bf7c0530d300af SHA512 b752b2befed614b341ea8688f6e66ef752dc026015906b77a32ef1828fb7f115de4a7c45e21be09081f72b631a5ea2bf6cddb98a0b0a84a681ffdebf2cea4dcf
 EBUILD emacs-29.0.9999.ebuild 16519 BLAKE2B ad8023a343f5b3809ac1a1b361c6213921931c2afa9eeca1d57d77b925f56c319ca10880ab7d70a33488e44c35969475b14442989c50147b7722e3d9cf44ee03 SHA512 50c3e8308f7627dd0da511104fcf3dc93e6095ad8334fa425de17b597e44e6feba58e0851cf15a8e1deb280b4957fce2ae173688f519b5e27bd4be25c42ffcb7
 MISC metadata.xml 3130 BLAKE2B 162f49aa253a87b89e80dcbc961cacf659220c16c5b9d83e96b1eb90c40f828b87830173a80fb24cbfae50efb2ddfe51aed3e334c8c0f8e5cd30b63569e991cb SHA512 71a1b4b298ae915a33c7876a20892799c3c7b39f913b7b2606c18e6c14a4169b60f17c41742cdaab870cb60bceee14c0d10ea6f345739b1e9c3d07a14d9d60ee
diff --git a/app-editors/emacs/emacs-28.1.ebuild b/app-editors/emacs/emacs-28.1.ebuild
index 69b2645dfb9b..87fef3ceb3c2 100644
--- a/app-editors/emacs/emacs-28.1.ebuild
+++ b/app-editors/emacs/emacs-28.1.ebuild
@@ -33,7 +33,7 @@ else
 	fi
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
diff --git a/app-editors/vile/Manifest b/app-editors/vile/Manifest
index dc50fdb902ce..8700795cc822 100644
--- a/app-editors/vile/Manifest
+++ b/app-editors/vile/Manifest
@@ -2,4 +2,4 @@ DIST vile-9.8t.tgz 2352119 BLAKE2B fc1c75eba09e8be99945ba0d178fd150576d8108f906a
 DIST vile-9.8v.tgz 2405398 BLAKE2B cd8753c57ff95c9b420026128fd19b7c689c99500da7cae91d3160dded46aa101b0cae32daeaf0377d4d72a5e526e8e4f25422bbbff2cc5ecdef10b7f04c8b39 SHA512 b752f26148bd4411ab6b31697459a16d8168f79ffad6b3509d6cf5d40611176b833e56f4bac21fe18ecdd256be467ba96ea98149daceab671002df49508eb8d2
 EBUILD vile-9.8t-r2.ebuild 950 BLAKE2B 5d082c434b62bab766ee593d91ba0ce24e7752aef614200961574124805d762b40f6ccba501146a761a5c51f76af02604bbec7e8d9d28b63c6d71d18f82350ba SHA512 96666520c3e73d5af37a75cd448a49f87c17191746e89007e26605568b296c7b167b372f0d5545f7e9c6f23b436eae96a3f637e034c4ab1a485ec5f8e285dd9c
 EBUILD vile-9.8v.ebuild 1114 BLAKE2B 68a2af209f156fef9008379068fa5e8bfb606704ec0624a5367ead7c6a1c98faca8df7138d23f2d7e981487b3031e0894e39ab516e6352dcc2109e06525f503d SHA512 51183d1418065aa77c408cdfadbc3b42573a2ac093dde690256fd936e028fd121345e0482c27c39673eb4675423a9a7cc07ffed84868571d140b4124aac98730
-MISC metadata.xml 347 BLAKE2B 5546714e3c87c1f8380e655e16cf7915878127cbf23ba125010a023056f73e20acb3a268aec33c1829244b7d637f62c47003d98ce90ac127035853b8f2c68ca5 SHA512 a0f8b7dd3327440537748c2e2faaf268efd46b20cbddfb9cbb1ced71b04ed37fd7b65ab3d317d1bc260fdad7497f60e32d29d9313764cdb0896f7137c39fa2e5
+MISC metadata.xml 414 BLAKE2B 93e7e4e15eed1c018ddb60017fb36c7c13fb0b1a5282da5b831c33de07ee9bb9d585ab98da43e6206b06eb309909a8cc52a1b1bdaa7c28b355dbb61c9e8add5e SHA512 e77d586873f04527576c5d4f2a967280708a77b68456188660bc25c57eb47502b3b111383e9c705aef1c2da58b4622b770916753e01caf9c94cb3b27002419ca
diff --git a/app-editors/vile/metadata.xml b/app-editors/vile/metadata.xml
index 5156eb857fef..d110c3ebb42b 100644
--- a/app-editors/vile/metadata.xml
+++ b/app-editors/vile/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<changelog>https://invisible-island.net/vile/CHANGES.html</changelog>
+		<remote-id type="github">ThomasDickey/vile-snapshots</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index bdb6d74deeb3..0d6f6f79ab81 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/citar/Manifest b/app-emacs/citar/Manifest
new file mode 100644
index 000000000000..49ff9b18b3ba
--- /dev/null
+++ b/app-emacs/citar/Manifest
@@ -0,0 +1,4 @@
+AUX 50citar-gentoo.el 69 BLAKE2B 4852ed7422e341e92f938dceedc3d6f0d0fdf8f955ef93021286d9d10e7c3a5d726175e2e79d34ca67f6815d7d6e0445ca2c9a80a2a6690daf4bda49d9972f96 SHA512 0afe62329cd2dc6ea548bbc28aa3c7fea86fb2a20febc91528ba994c77edf08fd72dcf1a0c417dcd4db75b4a6b8e237ade2257130ff3887499377b8f77fefc46
+DIST citar-1.0.tar.gz 1339812 BLAKE2B 2093cc820199219ec70f99a746c630f2b8e6b4d464b1457d7b7db1c5c953138e7dd5ac55e21b13e7417dd0a764b6f1caaf400af353ecce9fb7e1bc578f570b0d SHA512 7f02a4e41a927c2c7c625189fa38caea8f0fc5616dd3487a93f71a373d1e4a124dd1cc520778a1ff2fa6dd7c3b619b539e3b0e47cb9caf7edd16e27e9d739585
+EBUILD citar-1.0.ebuild 979 BLAKE2B 8b40e7b2c88ea5b739db50ffd588be12720330a89c84a11c2e0092fab7c08bc8c411e04e476df97867a7fd0ba59bee8829519a99fc2856c70ecbca7da8c2a29a SHA512 192a72c0a645dde0fabd681769f1dfa1eb9cf5f2cc91a996c7f52f837ef014543b2d2f299b35dcf3ee5c696da66f3fa63fc84caa64692d599293f95b67424bf0
+MISC metadata.xml 1034 BLAKE2B 10d658566f58e3a91deab1c4d2035bcd25ee216777aa105b1e8c8853ab103add779f0f439e706496b2468a3fcb8490320ccb454d90c2e70b5b8bbe9f218773e4 SHA512 4b81115dfccc471987c63876c0b282875fe95c5738f69dfdf7a6300c37998102f2fdda829d14938871bd857fbb5d145e6c62b5b4be40b532f46245256d0be259
diff --git a/app-emacs/citar/citar-1.0.ebuild b/app-emacs/citar/citar-1.0.ebuild
new file mode 100644
index 000000000000..0f6a51de1eb0
--- /dev/null
+++ b/app-emacs/citar/citar-1.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=27.1
+
+inherit elisp
+
+DESCRIPTION="Emacs package to quickly find and act on bibliographic references"
+HOMEPAGE="https://github.com/emacs-citar/citar/"
+SRC_URI="https://github.com/emacs-citar/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	app-emacs/citeproc-el
+	app-emacs/parsebib
+"
+BDEPEND="${RDEPEND}"
+
+# Embark integration has it's own package on MELPA, and it is probably better
+# to split them. https://melpa.org/#/citar-embark
+ELISP_REMOVE="citar-embark.el"
+
+DOCS=( CHANGELOG.org CONTRIBUTING.org README.org images )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -L . -L test \
+		-l test/citar-file-test.el \
+		-l test/citar-format-test.el \
+		-l test/citar-test.el \
+		-f ert-run-tests-batch-and-exit || die
+}
diff --git a/app-emacs/citar/files/50citar-gentoo.el b/app-emacs/citar/files/50citar-gentoo.el
new file mode 100644
index 000000000000..6243866c44c2
--- /dev/null
+++ b/app-emacs/citar/files/50citar-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "citar-autoloads" nil t)
diff --git a/app-emacs/citar/metadata.xml b/app-emacs/citar/metadata.xml
new file mode 100644
index 000000000000..2ba5ec6831b5
--- /dev/null
+++ b/app-emacs/citar/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    Emacs package to quickly find and act on bibliographic references, and edit
+    org, markdown, and latex academic documents. This package provides a
+    completing-read front-end to browse and act on BibTeX, BibLaTeX, and CSL
+    JSON bibliographic data, and LaTeX, markdown, and org-cite editing support.
+    When used with vertico, embark, and marginalia, it provides similar
+    functionality to helm-bibtex and ivy-bibtex: quick filtering and selecting
+    of bibliographic entries from the minibuffer, and the option to run
+    different commands against them.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/emacs-citar/citar/issues/</bugs-to>
+    <remote-id type="github">emacs-citar/citar</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/citeproc-el/Manifest b/app-emacs/citeproc-el/Manifest
new file mode 100644
index 000000000000..8c0b587e41fc
--- /dev/null
+++ b/app-emacs/citeproc-el/Manifest
@@ -0,0 +1,4 @@
+AUX 50citeproc-el-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST citeproc-el-0.9.1.tar.gz 108702 BLAKE2B 409548f50baa37c03906d3435569b8f75d8f0238b2d463e22ab0428a0536c6b12e2bf723a8fc4684fae17b31a9d46121d0ebcfd3cd03ada5b0838c8f0e042106 SHA512 6eab58576b4f851f44b45e444ee43a9022651dd322efa77b6162db0906a8cace70458b0a1431ed3d995d480d38944bafc13e76e04e5a310e8c14ffc28888953f
+EBUILD citeproc-el-0.9.1.ebuild 909 BLAKE2B 6416b809b0f5cb6fa84b9f092103e4892f73720275052209604fec5aca036251929a5cedc99feec206f8199859c9c8883fd8ad6e9ae52023e968fde48d8468ac SHA512 0796d18c86de02a2bb137baecce1fd9a65eb20fa46e8d9cefea9d9560da51e1f5f0dfa7de2e327769ec5b076881f2ee37fbda53d4c6a8ada5f8ea2488c3a4e2f
+MISC metadata.xml 1335 BLAKE2B 100bfe27f5d296a91fa300faa044dd80ba7762e53468b9f4c62c1ffaf23cfbcea7c611451f1ec82385d29d8a0400812ac536c302ae6f4b615bf25583d98c8b8b SHA512 2e9ce67c3e10f25113fe65a9307139b1e493ecb2b6cf15c34c5b4659279361fba04b5830cc20fb7a2818a290067236811754ca92607c8d991ea505657dad7570
diff --git a/app-emacs/citeproc-el/citeproc-el-0.9.1.ebuild b/app-emacs/citeproc-el/citeproc-el-0.9.1.ebuild
new file mode 100644
index 000000000000..b59dcf28c0e8
--- /dev/null
+++ b/app-emacs/citeproc-el/citeproc-el-0.9.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26
+
+inherit elisp
+
+DESCRIPTION="CSL 1.0.2 Citation Processor for Emacs"
+HOMEPAGE="https://github.com/andras-simonyi/citeproc-el"
+SRC_URI="https://github.com/andras-simonyi/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-editors/emacs-26:*[libxml2]
+	app-emacs/dash
+	app-emacs/f
+	app-emacs/parsebib
+	app-emacs/queue
+	app-emacs/s
+	app-emacs/string-inflection
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-emacs/ht
+		app-emacs/yaml
+	)
+"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -L . -L test \
+		-l citeproc-test-human.el \
+		-l test/citeproc-test-int-biblatex.el \
+		-l test/citeproc-test-int-formatters.el \
+		-f ert-run-tests-batch-and-exit || die
+}
diff --git a/app-emacs/citeproc-el/files/50citeproc-el-gentoo.el b/app-emacs/citeproc-el/files/50citeproc-el-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/citeproc-el/files/50citeproc-el-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/citeproc-el/metadata.xml b/app-emacs/citeproc-el/metadata.xml
new file mode 100644
index 000000000000..33a57a1b947e
--- /dev/null
+++ b/app-emacs/citeproc-el/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    citeproc-el is an Emacs Lisp library for rendering citations and
+    bibliographies in styles described in the Citation Style Language (CSL), an
+    XML-based, open format to describe the formatting of bibliographic
+    references (see http://citationstyles.org/ for further information on CSL).
+    The library implements most of the CSL 1.0.2 specification, including such
+    features as citation disambiguation, cite collapsing and subsequent author
+    substitution, and passes more than 70% of the tests in the CSL Test Suite.
+    In addition to the standard CSL-JSON data format, citeproc-el has
+    rudimentary support for reading bibliographic data from BibTeX, biblatex
+    and org-bibtex bibliographies and can produce output in several formats
+    including HTML and org-mode markup (see Supported output formats for the
+    full list).
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/andras-simonyi/citeproc-el/issues/</bugs-to>
+    <remote-id type="github">andras-simonyi/citeproc-el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/string-inflection/Manifest b/app-emacs/string-inflection/Manifest
new file mode 100644
index 000000000000..12d7a03960e4
--- /dev/null
+++ b/app-emacs/string-inflection/Manifest
@@ -0,0 +1,4 @@
+AUX 50string-inflection-gentoo.el 81 BLAKE2B a8d271963c8ee584ed50ab57b0797f2406728f1ba4fcdcc705a4cc134b307d0a66dd61d0dc9893377a7dd6ebc582312388ec831e9eb90c3637207caf73eec2ca SHA512 4715c7f6502d55ba7f821a8cf8ce1b89edc021808c1566cfdda6ea04fafd1988f7088d9d80e889e654c509c73e1547422cf3c0ad949d90a4038a044c47a56115
+DIST string-inflection-1.0.16.tar.gz 6238 BLAKE2B 2a8db2786f9a744329e6e298308a5bec00e6872ed350ab867ff2d2d5176cbb1532d3dec5e09573228808fd5ba3e3214cda063cf01cd52f862043718e8e664bec SHA512 7bd575c02e1917d9f52f49c4409150dbc9d097968304e687eb1145520ed88dee0bc359bbc85883dd1c167e8918440c91d1f362983f0a35f99feff61c85a08ca8
+EBUILD string-inflection-1.0.16.ebuild 663 BLAKE2B 6572ed3038a751e2256eb59ede2a873913a3c404d829e5b8a38b1ea3f3c243008887c2e610e9c72958e37a5c5d1ac5ce55cb5687feeebf9d437daffb169b0361 SHA512 2a4b2e9493d980ba21beceb59262825a158a0832975c3d5164d90a12a80000e6ca67efae2ce2d5a50ed1a4384695e8dbf3c238718fde67fe8e26873afeafe8d4
+MISC metadata.xml 713 BLAKE2B b11d272fc2fb866eabc353bf90a5a22c19e40637150709406985838d2b05cbac17603c54b60bed771e435b3155448735b0dbbae3ccc2a32dc2a92146f64e0fe9 SHA512 a1f00997455092ba5d2014419da0614bbb1801870573fe28c71106595e9c2190230c4f1109b7d6c6551d09e330278b59e3da1cb93bcf2a9b42a4f3ae85a66aab
diff --git a/app-emacs/string-inflection/files/50string-inflection-gentoo.el b/app-emacs/string-inflection/files/50string-inflection-gentoo.el
new file mode 100644
index 000000000000..df8f2cee5137
--- /dev/null
+++ b/app-emacs/string-inflection/files/50string-inflection-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "string-inflection-autoloads" nil t)
diff --git a/app-emacs/string-inflection/metadata.xml b/app-emacs/string-inflection/metadata.xml
new file mode 100644
index 000000000000..cd4c3ed5c6ab
--- /dev/null
+++ b/app-emacs/string-inflection/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    This Emacs package provides convenient methods for manipulating the naming
+    style of a symbol. It supports different naming conventions such as: camel
+    case, Pascal case, all upper case, lower case separated by underscore.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/akicho8/string-inflection/issues/</bugs-to>
+    <remote-id type="github">akicho8/string-inflection</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/string-inflection/string-inflection-1.0.16.ebuild b/app-emacs/string-inflection/string-inflection-1.0.16.ebuild
new file mode 100644
index 000000000000..74a4f359e8e7
--- /dev/null
+++ b/app-emacs/string-inflection/string-inflection-1.0.16.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Convert symbol names between different naming conventions"
+HOMEPAGE="https://github.com/akicho8/string-inflection/"
+SRC_URI="https://github.com/akicho8/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.org HISTORY.org )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
+
+src_test() {
+	# "test/string-inflection-test.el" calls "(ert-run-tests-batch t)"
+	${EMACS} ${EMACSFLAGS} -L . -L test -l test/${PN}-test.el || die
+}
diff --git a/app-emacs/yaml/Manifest b/app-emacs/yaml/Manifest
new file mode 100644
index 000000000000..eebf2c3d7883
--- /dev/null
+++ b/app-emacs/yaml/Manifest
@@ -0,0 +1,4 @@
+AUX 50yaml-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST yaml-0.5.1.tar.gz 44335 BLAKE2B dbcaf29d5d0a18e167cf0fd43d5ea0536d3879ed8bc924930c06aa1eedb2c268f91fd2d0c8981ab81f928db82148ad7fbc01a5926b3dd4645ec57cc78bac7256 SHA512 4ed2dc26a87137deb2d06cffac7c9b0748f66a9b05d91e33022da0edee0966b94ac2dfdb5a181628357dd3714ac55cfb48b1a35f9f6352c01d745a1d69131381
+EBUILD yaml-0.5.1.ebuild 573 BLAKE2B b25bbdf7655812861b9f354c2ad0bbc5e559dcb460f0d5472a314d30fe973d0fab51dae5e19129197e57d7453acc62c69290d7f0f1bd4a927a4d1950ae43cfaf SHA512 a114ebd698d3f955e250947d15ec2ea7424abef1bd6721d3200b93ae6d3d82e92a61eaf3262c509b36c8484e73151b87c0d2dba7291ab94b162d613f46a481b3
+MISC metadata.xml 616 BLAKE2B e28c7b7774635055616362ec847585f91e12a8a92832e51cf8c13dee70ce35273b255257b213804ff5d7ae5733718fc3194f97f1307e45c3dd439be144c82dd0 SHA512 7035a36f53cd4c08a274b88d216fbad3c3fd5579e0c10f38158a5128c61d7feea30800101dbf71c5baa03a3a1f2ec8d61f343a1fec21a067a919cbd146835d77
diff --git a/app-emacs/yaml/files/50yaml-gentoo.el b/app-emacs/yaml/files/50yaml-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/yaml/files/50yaml-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/yaml/metadata.xml b/app-emacs/yaml/metadata.xml
new file mode 100644
index 000000000000..ebb91ed4f6fa
--- /dev/null
+++ b/app-emacs/yaml/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    yaml.el is a YAML parser written in Emacs List without any external
+    dependencies. It provides an interface similar to the Emacs JSON parsing
+    utility.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/zkry/yaml.el/issues/</bugs-to>
+    <remote-id type="github">zkry/yaml.el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/yaml/yaml-0.5.1.ebuild b/app-emacs/yaml/yaml-0.5.1.ebuild
new file mode 100644
index 000000000000..7e951ead7442
--- /dev/null
+++ b/app-emacs/yaml/yaml-0.5.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="YAML parser in Emacs Lisp"
+HOMEPAGE="https://github.com/zkry/yaml.el/"
+SRC_URI="https://github.com/zkry/yaml.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/yaml.el-${PV}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	# "test/string-inflection-test.el" calls "(ert-run-tests-batch t)"
+	${EMACS} ${EMACSFLAGS} -L . -l yaml-tests.el || die
+}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 1cd6636d2867..3891e4656256 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/transifex-client/Manifest b/app-i18n/transifex-client/Manifest
index fbaed0d57823..fd4705afaad7 100644
--- a/app-i18n/transifex-client/Manifest
+++ b/app-i18n/transifex-client/Manifest
@@ -1,7 +1,7 @@
 DIST transifex-client-1.1-deps.tar.xz 227565760 BLAKE2B d976f8e778abd2bab54306f53afa02f450be3564d427ac3624849e17d2e1adc109c0ec344bfb052a59e5a8060dd0d7313919efbf9883243f27aa82b25df0d5fb SHA512 d244fc394db334478593b69069b61b2795607ed3fdf719b6083eebcb50e128e33c8513e35660490005f2716892d98886f990a0850a15f91c3f75e9569341005a
 DIST transifex-client-1.1.0.tar.gz 83035 BLAKE2B fafee6b554116c8525409b2ad581f4b9c46faf58332b885afc74468e73f50936af743e9fefca29f773a8126fd5e91f0fd902b3542c1d2bb0e41ff6475d3bcddb SHA512 315208498ad18a6008c16b8e7cf6c25c227b4c28f1c54ced7fc31d082da3eb54859230acd67ad293405770be444c96687a1879792b6385c3ca6cf5f221ed9450
-DIST transifex-client-1.2.0-deps.tar.bz 241369348 BLAKE2B 4e7dce98ece36658b1ae6bc6e66f9cb60ba80504ed13c42f1766662a08a6a6faf89cd7a184b1840c838b361aa1b33c853b2a7af64df250377687ea23136975d5 SHA512 9f7efb88ac716726693dc242bc9752787d7115f159dda517401f1e5b0ffcfcb6828d9fffc35457e91282572ef221ea2cd84247ffd183b811ad07ca9d7993088b
-DIST transifex-client-1.2.0.tar.gz 84681 BLAKE2B 920f5a3257c31da6a076f48b9549fd9c40e1d0b8d0815808bb914ed5ecc88bb0d7a83ea40173c16e2985315d5c17aa8e1da6869fd325509579d9004f17d12c34 SHA512 6bf8b4341be77a81aad267c5efe923351797c02b666ed4fc8baec09a267d6c2ad84de38eb50061c33d4694c7b5198063f84b411007ebc79294b35a78a480d72a
+DIST transifex-client-1.3.0-deps.tar.bz 241930614 BLAKE2B 7855172504f3fe1208556e0030bcaec7dac4b21ed948926368b0b91c1984cb73e6d0bda0110bdd592cf3be7835f847fe54009f2c5c41fd14899b7b5d37932937 SHA512 5eb88614b354aeac0acd02cfe416c884adb8070614946dd71de512030e410a20ca7eb6b426876c218ef9b6ec1d4faf9eb557e2daf84cf9895cce04c33a937655
+DIST transifex-client-1.3.0.tar.gz 87395 BLAKE2B 90da67d49e1b2e09d509b0ff373f0403eddc5c29a63ca64f747006ed3cb95c51add58e442a139e7e17d28b44e700aed249d0e5ca563f6af832578640f8f7164d SHA512 6e81d94e95157322d0fc74386d7e6f218f589bb81ce36b0967c09ca9199d641b13953f491373d9e7ec9f6ddc50c243801a24da985a2e577b733bf364623e3d75
 EBUILD transifex-client-1.1.0.ebuild 831 BLAKE2B 8d9a148f65b3e626c04a5cb8c827a5fe6be5f6c23a0651f2107d795a27c156eb6975faf92c767bbc24f4410cda03a0ab224244e7bbc5da5ea5e3b8855d85d8cb SHA512 460bb2bdd8508aed891819f23dc4484c2faec4f78e134c2dbb81933e2c36db1ca385af89888c5c2e356c4dab673095df2a05e30a072d0629a27d8a9ff345e74e
-EBUILD transifex-client-1.2.0.ebuild 828 BLAKE2B c51a8c2e057ffa0b2fa3e5d47ccdb615c255ebaf5832761f816545182e3772dab95227906cc294af53415f15571fee66434b52c4daa962a76c7c42a1872ee000 SHA512 7aa398b9b13a0eda42c424ad8213dccd7160d82658ec020d20a3a17d2823b4330a7578a581721feb2fe08e594c237a921afb1827a5a7732b963f7003571e1d0a
+EBUILD transifex-client-1.3.0.ebuild 828 BLAKE2B c51a8c2e057ffa0b2fa3e5d47ccdb615c255ebaf5832761f816545182e3772dab95227906cc294af53415f15571fee66434b52c4daa962a76c7c42a1872ee000 SHA512 7aa398b9b13a0eda42c424ad8213dccd7160d82658ec020d20a3a17d2823b4330a7578a581721feb2fe08e594c237a921afb1827a5a7732b963f7003571e1d0a
 MISC metadata.xml 542 BLAKE2B c848737ba110443b53155e2e499f0b55f25fe1f6eb0fe35009eac80a42e34b45a00e56d40d9eea42e94129ef87ba446dbf19a1a3469a46801ab0c5c981c05c2d SHA512 a19b2e39fb736dca1c05c21097e9e75baad16ce4632767582dc634f41280fc9b41ee1ed3beca01f6992a1217b3abe63f36ac638dcb29e06ee8b2b76de338b7c9
diff --git a/app-i18n/transifex-client/transifex-client-1.2.0.ebuild b/app-i18n/transifex-client/transifex-client-1.3.0.ebuild
similarity index 100%
rename from app-i18n/transifex-client/transifex-client-1.2.0.ebuild
rename to app-i18n/transifex-client/transifex-client-1.3.0.ebuild
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 3af2288d29fb..97378c8363d2 100644
Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ
diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index 7d2b4ee33036..9e5877abc830 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -2049,5 +2049,5 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea29
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb93b06fd376d1b0932626c7dcbdaf43df8c8eb14e07529e84e028576bb67ce1961c3c86d0303d375d8d0aa372ded259c3561b9291 SHA512 52a52b3d380ae6e2cbe1b2c849d3089f74aa876fb3fadfbd02eada97446e0f2cf387f10ddb527f2dfefd57dccba8c82b0b349efbecaa0e6e3d00dc2b5d4fc21e
 DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
 EBUILD prometheus-2.31.1.ebuild 114477 BLAKE2B 81f7f10435f634f85a3c8338b8fa85bbb5829091a2328edc85dc66d307005f82ee569b8c604674c701f8b031b93c298bac2e32aae63592b477317ce19c0e0ce4 SHA512 25f4b8c49fd093c5111cf099fd27d2e3dd5c93e7df1556ce49b904138a8b13ca9f7d6592a31119151e67218c8a9846c3f6a850037cd8ae4b967b60c350216827
-EBUILD prometheus-2.36.2.ebuild 2147 BLAKE2B 8d91e22d35f706c324bc4a80fa3a4423cb42b65bee8fe776c99a6764c5bdb2fb9abc65e21ddc0034bac844383bdd9c0d092209390048665722d46e575655dee2 SHA512 9e83403e823e0c6a6a2c9861863f243f18af5b6b193d1287a897c113ccde1ebb658b66dfe36e6300437c428944a44f18a753248ce9068bf83a5ce09367f588ae
+EBUILD prometheus-2.36.2.ebuild 2149 BLAKE2B d193350d631f99863bd0b5c00c73aa8c851e970ae8d4b61d5378789f8ffcaf587d748b882a7dd541047a3d106de8c5343bb1f082f6fa2c9ad6677aa7c1fb4545 SHA512 479c3b8d3158a593f33fa105e2785c422630d58a40bdedb2d94a24ecc9a9421a553fcab605bdc63e7703f998d124246f9d13834bd2bc6751595a2b318b7a4f73
 MISC metadata.xml 443 BLAKE2B e6f1b0fa6c89174aebf787bdfe37000233cb29f68aecea6b2586af76216c04fa094e6dc08793092c36e51b2f34887a968174960e55c45fcd3d2c91f93f3b1ee1 SHA512 13cdf9d1e49aeb1470223c4cfa830c3063e5816141afddfffe6eb6078b9118cab262bc520b873254e65b81663042f317b5797e35b74e25df21cf28b46fe1477d
diff --git a/app-metrics/prometheus/prometheus-2.36.2.ebuild b/app-metrics/prometheus/prometheus-2.36.2.ebuild
index 33afcbc18829..896df6b72ce8 100644
--- a/app-metrics/prometheus/prometheus-2.36.2.ebuild
+++ b/app-metrics/prometheus/prometheus-2.36.2.ebuild
@@ -37,7 +37,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake PROMU=${EPREFIX}/usr/bin/promu common-build plugins
+	emake PROMU="${EPREFIX}"/usr/bin/promu common-build plugins
 }
 
 src_install() {
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 072e6a81c3fb..4ee059d98369 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/cpuid2cpuflags/Manifest b/app-portage/cpuid2cpuflags/Manifest
index 07b3b0cade42..d17d898e53d2 100644
--- a/app-portage/cpuid2cpuflags/Manifest
+++ b/app-portage/cpuid2cpuflags/Manifest
@@ -1,3 +1,3 @@
 DIST cpuid2cpuflags-12.tar.bz2 84750 BLAKE2B 0f7418eaad406427be02047c06f9a6e3f3b1cd953ef320c1cdf5082d309f6887f1caeb4828761287266e2f527d5bb9d6cd4c8848ac2b47a019d6d156231364f6 SHA512 e415a04b5963eaaf4027dbb191a30d4b3cc93a7708e33ea21f9dfe53ad90e735fc5f298fdfb35e155323391a8b8c6c208d988d5cbad811536ab27764bf1e5981
-EBUILD cpuid2cpuflags-12.ebuild 421 BLAKE2B 1aa35175f8a82ed3a1159223fcaea3be6c20e047e667d8330ebfd6ebfb082fdb105ab256661b06c93f8634f887dc9dba8e083787798f194c7d33248af108c3d7 SHA512 b316da8927f820950ea97d51bb47b8f80ee14b2bdac1b7fb9d827f2fdc95f029ca25923a4643bdbba1b50476e2965593a3afcf832d6e9e5b550e1024a4c39e8f
-MISC metadata.xml 344 BLAKE2B f374f330468fc02f2bb21ba9fb5d5e24ea9537b9f2ed83f8c770e9d60dfc5274e180225b5f362daeac65fd298893f58239a3c300e24d00faf1454584c8478c2d SHA512 2ad0184d5828342cc42f17ff74b6964acdde380ee489f70f90bcb60cf84aae84743b4af6afefe33c923a24d68cb18e2b1087df476ec287ed046d5a487e4860da
+EBUILD cpuid2cpuflags-12.ebuild 421 BLAKE2B 17823d4b49b5ef25c45047e0c8e076b724d07fa6e828a65f5c358bc6dd5c9546dce720c61cafd305d84b760bf1bd62e2e23833f8e0e3ea336f9a91ad2ecbeed8 SHA512 ea1e1b1813f7b885c41793615b901ff9fab7ad44221b375bd8b38e97eac6f58bb9373eba5bd5704e2a9f200c6f862ba6e1b66d322e6054eca9dcafc82e6f4b2a
+MISC metadata.xml 344 BLAKE2B 60e1495c23b3805355f49fb292debd6c0c5be230be41bd7bbbfae7770980e24894cab32fa35b85561069e7cf830aa595d60ebb3193fe71151e2c4690e17c9ebd SHA512 2033445c5b2789011c913a4776bfd3b49cf130c1239eb189540800086f526dd3727aa46e2c162f1e66e24d307455a05ce004465303a9047ccc09817e6f495c25
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-12.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-12.ebuild
index 52cc6a3f3194..a80354af97ff 100644
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-12.ebuild
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-12.ebuild
@@ -4,9 +4,9 @@
 EAPI=8
 
 DESCRIPTION="Tool to guess CPU_FLAGS_* flags for the host"
-HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags/"
+HOMEPAGE="https://github.com/projg2/cpuid2cpuflags/"
 SRC_URI="
-	https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.tar.bz2
+	https://github.com/projg2/cpuid2cpuflags/releases/download/v${PV}/${P}.tar.bz2
 "
 
 LICENSE="BSD-2"
diff --git a/app-portage/cpuid2cpuflags/metadata.xml b/app-portage/cpuid2cpuflags/metadata.xml
index 6de9269a1ebe..2d8cc330ba90 100644
--- a/app-portage/cpuid2cpuflags/metadata.xml
+++ b/app-portage/cpuid2cpuflags/metadata.xml
@@ -6,6 +6,6 @@
     <name>Michał Górny</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">mgorny/cpuid2cpuflags</remote-id>
+    <remote-id type="github">projg2/cpuid2cpuflags</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-portage/diffmask/Manifest b/app-portage/diffmask/Manifest
index 6d8992665d91..c5205a78368a 100644
--- a/app-portage/diffmask/Manifest
+++ b/app-portage/diffmask/Manifest
@@ -1,4 +1,3 @@
 DIST diffmask-0.3.3.tar.bz2 8605 BLAKE2B a7699dba6b619ff2e64a8148057e06be8d477605fba100b45f056957eb1b55cc50634b698250f68023137bcf01932635c7de798f42edfa1297cc38097e764f44 SHA512 5f28f68dc1adba2fb7b0db5e2a329e46017298de9c44765d521a0f338223eef2a77573636987e942595db9b89b72db93b68cf5b805091b0ebb1e91a18bfcd48b
-EBUILD diffmask-0.3.3-r4.ebuild 544 BLAKE2B 047990aac93ff7ceaee037c9ae1147f2474d2bdd4e024d468511a8c8bb8ad44bcc07a2266b1efeb0a60cb8ac90e424eddd3e4ed3fcb00ca06f975f36aa2a6ed2 SHA512 4831b31221f2427016ae54c163a19d7a4b1c7eb66e338982db14b2a2ea886949ad0b7c2c0d7ce323f51feed36dcaf30c205552317838abd0f69e7a2697adc5f0
-EBUILD diffmask-0.3.3-r5.ebuild 544 BLAKE2B 82bca667e0179945fdde82124932af1383d1bb2801aa8e7e11f512cf18d337967567c55a3a3a7c9eb1b54de655390a4509f00f6ac4635ac7a8291d65e3e35df2 SHA512 f163775c9d00a460c3d7d6646d7ed511a1a4fcae7e8b4c45c50f35e402b539dec7a912bc5f724e1dfbd57b731a0b229e1da4c76285e29cd86210ae151ca607a9
-MISC metadata.xml 752 BLAKE2B afe13741c466af0964e8df5675b09dd0951bb4a34b93f3bab8070b1385dff66a50e3013bb455c4c7b5deb32d8b922e9fab8959760692cca28536738001e895d7 SHA512 8b34c7a30cdb16e08df2808ff355b560c68bb674242b83c4f30d363b3d789472383cf40c0160a334f260bb0ced04774c89e091bb08a793b7906118b66424a79f
+EBUILD diffmask-0.3.3-r5.ebuild 544 BLAKE2B 23994287e74be1ea243f7bd181e1c5dc2bf05319dc11e2a78521f5ca876cacb8c6c40b0531115742f031fdc95edf374d0de47bb1e35b9f850869622e21569f82 SHA512 302573af46cf8a0ba789c3720b080c8fcbe5752e9d7f47804e238f6b8038a220f98ab88b6650e7eb5a5851021666d45b1e2f3d3f9f866133d78c1a2d803a1b08
+MISC metadata.xml 752 BLAKE2B 6d4fab0465c176648efd096d0f5b8529057224f233d18e6d11ff447805f40cb5ffdd0dc907c106cf75341b2c1e3f6dc8d6e7a23785b1595e6e7e136a2cb9c52f SHA512 95cc67ec491b1acf367334222f89df9b44d0dfe3b5ac29ac0b3203621f8996c71af9caba9c15c8550d56ff738f61efe2eb35e23e5681a2c5522ca524c73c17ea
diff --git a/app-portage/diffmask/diffmask-0.3.3-r4.ebuild b/app-portage/diffmask/diffmask-0.3.3-r4.ebuild
deleted file mode 100644
index 4942a259424f..000000000000
--- a/app-portage/diffmask/diffmask-0.3.3-r4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A utility to maintain package.unmask entries up-to-date with masks"
-HOMEPAGE="https://github.com/mgorny/diffmask/"
-SRC_URI="https://github.com/mgorny/diffmask/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/diffmask/diffmask-0.3.3-r5.ebuild b/app-portage/diffmask/diffmask-0.3.3-r5.ebuild
index e1d32c613721..d20dd7797195 100644
--- a/app-portage/diffmask/diffmask-0.3.3-r5.ebuild
+++ b/app-portage/diffmask/diffmask-0.3.3-r5.ebuild
@@ -9,8 +9,8 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A utility to maintain package.unmask entries up-to-date with masks"
-HOMEPAGE="https://github.com/mgorny/diffmask/"
-SRC_URI="https://github.com/mgorny/diffmask/releases/download/${P}/${P}.tar.bz2"
+HOMEPAGE="https://github.com/projg2/diffmask/"
+SRC_URI="https://github.com/projg2/diffmask/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/app-portage/diffmask/metadata.xml b/app-portage/diffmask/metadata.xml
index 0d301429aca9..82b3808f17cf 100644
--- a/app-portage/diffmask/metadata.xml
+++ b/app-portage/diffmask/metadata.xml
@@ -13,7 +13,7 @@
 		the mask entries) and remove old unmasks.
 	</longdescription>
 	<upstream>
-		<bugs-to>https://github.com/mgorny/diffmask/issues/</bugs-to>
-		<remote-id type="github">mgorny/diffmask</remote-id>
+		<bugs-to>https://github.com/projg2/diffmask/issues/</bugs-to>
+		<remote-id type="github">projg2/diffmask</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-portage/flaggie/Manifest b/app-portage/flaggie/Manifest
index 812648882987..9af9053e3757 100644
--- a/app-portage/flaggie/Manifest
+++ b/app-portage/flaggie/Manifest
@@ -1,4 +1,3 @@
 DIST flaggie-0.2.1.tar.bz2 16767 BLAKE2B fea0fbc505bfa97e7bee2c05f0cc19077b9b23a021b01aafa2c4b064466677f9dd4ae95c36f6de65b4ad07c5046d539ceb0cb667dcb791b60410d7a5e688813f SHA512 3f273ebeceaaedce7a3807126fb3f450e420338a883440066d06a4d6a95b63bd538bb5da882fea23e0d390b28a83f50375dbda2624f656327775b2b700f2b2e4
-EBUILD flaggie-0.2.1-r1.ebuild 1134 BLAKE2B 022cff23c92b9e98cc1a5ce369d31cb8e972a677ceb8aee977a5d3e346d9b1e851ea33298fc0e2951042b5b39edfbef3c7f80397637d709ca7376b9deeb2d45a SHA512 002c9e4e2200a674ada814d08184ba4bfe2844f7aaa446c8a59f7a364b1fce0a8577889f933a2699e8f731b6238bd342b5c7a1d30aaf8f569d4c88ffd848d612
-EBUILD flaggie-0.2.1-r2.ebuild 1134 BLAKE2B df4c0408ae5897f6be4759ed21c5e6da09d90979f4c9737a7d9d91d7df245afb4015e11fb8f278fbe055f8ea4bccb1ec251854a39dc44fc03ec78c76681603f2 SHA512 b1206e7bb6b8fdc78831754e1382cb827f293d3150607c7ff11ad4be2ff4fb16a466853c4743abdc0d7d856430b5381f98d5c9e630c72064d90ef98a4a7e2ba4
-MISC metadata.xml 414 BLAKE2B e1943db472d39833f39013b45ef474c54ea19e252a9dde019d083c8c5dde4b790758488b2135d11415f5a0fa60baa5831a7e554cbec83eeb854ea85e2709c8e3 SHA512 10a6e4a79ab5a6fa8810d06ca0aa22ccfe81aba18430227c6ee7874bb9aeb562d585515d98b522894a8b87b51504b5db35e2dc6afab5c53ccd049537afbedf8a
+EBUILD flaggie-0.2.1-r2.ebuild 1134 BLAKE2B 74557fe9278d6f7ee9e20da32ca337d2fd4c125b4d054c4c02ca399ec5b3d7ce09f8c4d6105ebddc08c97b8d5aa0d3e75cdbb8541992c8e978e871847baba506 SHA512 08d6c8958b7a40e5ee35d69ca78e4675e1a2f571fe590a3551ca55d127c3dbfd3949cb8c60f6a9c8966df826625b8e15cf230afa39884076efaab82bdcb55821
+MISC metadata.xml 414 BLAKE2B a2588b6736a139961f6d6902437c9bdf0418eff547ce47814ed2b5630a3b27a74798434971de570ec740c4364b808c1035ea624bb4c0d8911631c72e8e43ce61 SHA512 a675b33fc1d436db9215f2bc373258749a34f31f9b70d0d191d7464eca0ef121ccae2e5aa3f7537ed015fd6bbd02ab91264576080725b6c50c3984910a7ed05d
diff --git a/app-portage/flaggie/flaggie-0.2.1-r1.ebuild b/app-portage/flaggie/flaggie-0.2.1-r1.ebuild
deleted file mode 100644
index ccf3b152e2ca..000000000000
--- a/app-portage/flaggie/flaggie-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="A smart CLI mangler for package.* files"
-HOMEPAGE="https://github.com/mgorny/flaggie/"
-SRC_URI="https://github.com/mgorny/flaggie/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	newbashcomp contrib/bash-completion/${PN}.bash-completion ${PN}
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	ewarn "Please note that flaggie creates backups of your package.* files"
-	ewarn "before performing each change through appending a single '~'."
-	ewarn "If you'd like to keep your own backup of them, please use another"
-	ewarn "naming scheme (or even better some VCS)."
-	if ! has_version app-shells/gentoo-bashcomp; then
-		elog
-		elog "If you want to use bash-completion, you need to install:"
-		elog "	app-shells/gentoo-bashcomp"
-	fi
-}
diff --git a/app-portage/flaggie/flaggie-0.2.1-r2.ebuild b/app-portage/flaggie/flaggie-0.2.1-r2.ebuild
index dc1e4ca5c0ae..bc938abe510f 100644
--- a/app-portage/flaggie/flaggie-0.2.1-r2.ebuild
+++ b/app-portage/flaggie/flaggie-0.2.1-r2.ebuild
@@ -9,8 +9,8 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="A smart CLI mangler for package.* files"
-HOMEPAGE="https://github.com/mgorny/flaggie/"
-SRC_URI="https://github.com/mgorny/flaggie/releases/download/${P}/${P}.tar.bz2"
+HOMEPAGE="https://github.com/projg2/flaggie/"
+SRC_URI="https://github.com/projg2/flaggie/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/app-portage/flaggie/metadata.xml b/app-portage/flaggie/metadata.xml
index a1a932d16da1..8d9c07df173b 100644
--- a/app-portage/flaggie/metadata.xml
+++ b/app-portage/flaggie/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<bugs-to>https://github.com/mgorny/flaggie/issues/</bugs-to>
-		<remote-id type="github">mgorny/flaggie</remote-id>
+		<bugs-to>https://github.com/projg2/flaggie/issues/</bugs-to>
+		<remote-id type="github">projg2/flaggie</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-portage/gander/Manifest b/app-portage/gander/Manifest
index f173313f80d5..4a365b41ba8d 100644
--- a/app-portage/gander/Manifest
+++ b/app-portage/gander/Manifest
@@ -1,3 +1,3 @@
 DIST gander-0.0.1.tar.gz 8882 BLAKE2B 29c25fedabff3936e13789ae31f2e06871cfe4eb31a0eed1d36150ec219e741d25ba1603d0151d026777c81dff8461a1c051e4c02bff2488d8b9d6888ebe9618 SHA512 d72b2fd92ddd646369f8eb16d73a67e7b793aa84109231365abebec3ab2e14a8c76bae301271ec1cc82850a71bcb217a72f969086554e6c850117b5492215d57
-EBUILD gander-0.0.1-r2.ebuild 796 BLAKE2B 77fb5be23e306055ae5d297a60dfe541cf83478e74c254953abecb0ed37e1be403aa00cd06114a7c70c806b3b8008799f721e1add80656530c20b5030497e968 SHA512 7b22821068b83596e4bced8e8ebdd6b399653a6513131174008a65a20bb6efc31178c23caa0b79aae751842e448dd57b42d24f3818183c0a09e2938ad91ca953
-MISC metadata.xml 326 BLAKE2B 63c40c392a14654552fc7fe5d5b719afb2cb6876966d283360b15c88c57621b486b17a8bfd7fa11d5dcaf8f61d48ebca6641d5708f64472254b98c34bd109cc6 SHA512 a66081eaa96514f941073ae4060492202f6ad350a839811bf0137b9866b5bb896f4561eb9ced5d57392503089e88c8d6aad19b91528190b0e0ecb2b3a81e712e
+EBUILD gander-0.0.1-r2.ebuild 796 BLAKE2B 7afb336f3989dddaae54e65317c6d00920fdd30e6b3846b855ceeb5e0c7955091484ddd0a0a09563c914256f7e589ae46ae14abba1a4508b1e74d418a73bca1b SHA512 415d79ba0236cd3e4e34b0bdbd4ecd1e76cfb16b54b705a30bc0bef644131ee2fc55bead27067e6c3e75606d145eb6102752090b91bb32d5351436705541039e
+MISC metadata.xml 326 BLAKE2B 6a5d01a474dc60b61cc93ae42a149c97584c99ad281c437916f38b1480c69ac17aa87a506705f8879a5f28ca80b581f9eeb7a8a4de23af386858a0f9e1e09546 SHA512 2c7c6dff031808964e0d2f59c16f92c6e4adc54d8648a67397b4214adf64b02387c628efd1353fb448d711ca46bb828306458ebc9373f515e481cb516c1444ee
diff --git a/app-portage/gander/gander-0.0.1-r2.ebuild b/app-portage/gander/gander-0.0.1-r2.ebuild
index b2903319f0c2..56b2c1f608d2 100644
--- a/app-portage/gander/gander-0.0.1-r2.ebuild
+++ b/app-portage/gander/gander-0.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Statistic submission client for Goose (anser.gentoo.org)"
-HOMEPAGE="https://github.com/mgorny/gander/"
-SRC_URI="https://github.com/mgorny/gander/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/projg2/gander/"
+SRC_URI="https://github.com/projg2/gander/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/app-portage/gander/metadata.xml b/app-portage/gander/metadata.xml
index 09d062ff11d2..b4083e29dfcf 100644
--- a/app-portage/gander/metadata.xml
+++ b/app-portage/gander/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Michał Górny</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">mgorny/gander</remote-id>
+		<remote-id type="github">projg2/gander</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 09f521925692..80ad5362bfed 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,4 +1,4 @@
 DIST gemato-16.2.tar.gz 80178 BLAKE2B c973c36bb1277d07618ba8d90f7d6820508d78aedae200f0678c8b2e1dde38e3b7f4d7dc24791dedb9c88791d3b71711c9bdeb749b5fc091a20aa87f71ad70d3 SHA512 9d59ba360afaf237e47c5ded0e5bc29ec44d5b1d73eadadc19ff834a1966e1e620da258eb7a1b6afbff5c66cbd7e39454fd5920f2f82fc510c2f8836c0b80462
-EBUILD gemato-16.2.ebuild 980 BLAKE2B a3616f07d88c1f656534f4cabf904d5d45eef85e03ee9c07197cf0333c335bd6c76b180702edc29549fe38c2ff96c8632505b91b76387859119a272427b72eeb SHA512 e3c4b0820d6228de1dcbb16b0014049445a4f7a9d81487a67906fa5d5007cb5e86bb36fae87ddf4e209ee7be3ca923b43bb0086c492ba5e96363dd46692ecca7
-EBUILD gemato-9999.ebuild 879 BLAKE2B e29bc4109bec2140b19df25b09479ebeb13a933f1fa7c07d86c8b037ba13d40260fa68b9a335cb21c0be5f3509f1e29acb25eb8e7c5b5131cae324d743ebb47e SHA512 848580249bf3288ed81c30c9439cf903832ba91fa9e7d0a3c87ab1717b9261273fe5c012b4c15f7af22566fb2525e52d68f114e98afbd6bf5859f09c12d935e4
-MISC metadata.xml 715 BLAKE2B f13d81c7c06f97f5a60bddf1f5161b45140d4ce649b77b719ce6857af5c4d23e03e185c00e1ee61eed9e17a65b141f87d4c677d7037d62d2b0a0b47d40ad1fea SHA512 d286065399a0c7c379731a90db3fb66d8da8edb2b093a59b902f01330a7c25b961401bdf9b2a0359d0e656a724dd9c8059df52a3c5c65fbab3c07609febd43f7
+EBUILD gemato-16.2.ebuild 980 BLAKE2B 16c0d7fdce3c3defa0b7015412d67f651caba7141dcdc7a85ac731f039f2f07fff25d95a3ce92ac4ba3b400fee8ffd0fba43522910ad1c1bbe1caf55874d0c71 SHA512 34d7b6b56721719ef46b8215cd24b9f0df814b698de3bd2eb2c88732d39a0e58a636a36b8ffb110b7ee69c1d0960773237137c91290b07effbad4320cf7f51fd
+EBUILD gemato-9999.ebuild 879 BLAKE2B 720e02d9130298eb1382dfbf24ce0d42096fe67f92926e837ccb45927cc3cda3d5ecabb1ee83009e0adf2e8755ddbc8c3a9100c7c805b1f026cdac211d6a4ca3 SHA512 e28ef345f444fedd446765b679396f5e30e911f4250fee56726e997c28213d50dd3d02807cafebab261390ee90a49bf9c23c415e6c55bd70a8ac7f15cc03fcdb
+MISC metadata.xml 715 BLAKE2B a059e3f4fb7629c06ddddf660e19aa59717514fd0004837020d8db3ef7fdacc2b8abb5bdff5241e00d68cc8de88d213331542f5afb56dc1954c8b81047593727 SHA512 1d53b9e589241c76fa0327296a43b22c6a60e2fc04be9e65cd57ddfcbd4449a40b7ad7fbb7660eb7cb55236dc88215129a61398524d1e0729582f1c05fd84d83
diff --git a/app-portage/gemato/gemato-16.2.ebuild b/app-portage/gemato/gemato-16.2.ebuild
index 81db99fc2309..00a120a58c04 100644
--- a/app-portage/gemato/gemato-16.2.ebuild
+++ b/app-portage/gemato/gemato-16.2.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE='threads(+)'
 inherit distutils-r1
 
 DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/mgorny/gemato"
+HOMEPAGE="https://github.com/projg2/gemato"
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/app-portage/gemato/gemato-9999.ebuild b/app-portage/gemato/gemato-9999.ebuild
index 6892ffdf9023..d889559f38d7 100644
--- a/app-portage/gemato/gemato-9999.ebuild
+++ b/app-portage/gemato/gemato-9999.ebuild
@@ -9,9 +9,9 @@ PYTHON_REQ_USE='threads(+)'
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/mgorny/gemato"
+HOMEPAGE="https://github.com/projg2/gemato"
 SRC_URI=""
-EGIT_REPO_URI="https://github.com/mgorny/gemato.git"
+EGIT_REPO_URI="https://github.com/projg2/gemato.git"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-portage/gemato/metadata.xml b/app-portage/gemato/metadata.xml
index 7baeb4158267..2157106e5d71 100644
--- a/app-portage/gemato/metadata.xml
+++ b/app-portage/gemato/metadata.xml
@@ -14,8 +14,8 @@
 			to /usr/share/gemato.</flag>
 	</use>
 	<upstream>
-		<bugs-to>https://github.com/mgorny/gemato/issues/</bugs-to>
-		<remote-id type="github">mgorny/gemato</remote-id>
+		<bugs-to>https://github.com/projg2/gemato/issues/</bugs-to>
+		<remote-id type="github">projg2/gemato</remote-id>
 		<remote-id type="pypi">gemato</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-portage/gentoopm/Manifest b/app-portage/gentoopm/Manifest
index eb9002f24e08..5707b0fc8091 100644
--- a/app-portage/gentoopm/Manifest
+++ b/app-portage/gentoopm/Manifest
@@ -1,4 +1,4 @@
 DIST gentoopm-0.4.tar.gz 39123 BLAKE2B c8ea81e2d1aa09d3aa838ccb2a1d221e29ba6cf20c5539435a36da058733ee6814864f11a5a96742b371c6d0f2e1ffa269edf197cd30cf4bc7d517f9fa6623cc SHA512 7af0d4d8b3562b009d8897b70b8621d2004e22a16006ec84144544174724757b39e09cbde98ee876adc166947a58e4afa85f752c66d4dbb03ff1d3a52074720f
-EBUILD gentoopm-0.4.ebuild 979 BLAKE2B c38bb41ba66659b9bfe95d96739a023c7165bed7bb562c200a28183a6ec59da01d78deb216b9cd5f9e7c6599d6d08dd2d025da3b2e99c9449d5f531dffc08976 SHA512 7346b3b6416399ec52a439d4f5cbe59b2f8881d546558baa16bbc10834ef2e1d41068807a3ebaf5ab2df9757d24d1bb821b10600778ef6ff21924bcc8348d6d5
-EBUILD gentoopm-9999.ebuild 587 BLAKE2B 0e32cb8009f92072f675608d3ea41141b296c3bd9a09fa56fa74d94d41af5780c7a5e9f56d249009da955771871ff1056146bef67c95b42fc7da8dfaba4bcf7e SHA512 eb39068ae38aebf7006f056d2017b47eab1d000529a14924e00771db36b2056d04b8e23d9590eb5c05fa4fa94844c8ea6a10410fa318cdbd68a254b0c245fe01
-MISC metadata.xml 601 BLAKE2B 838ca5c422fd36bd0a7b5404a80a5e19155738bf5bcaad568952983079b33b3c056b0a181d6c61448e06746107db63149fb4fe4b856b502346c561909de68b8c SHA512 0a8c96d9b8b153c6970c0200169dff748ad11908d454fcb8e770f7c5ad82518e425bd269edbc420666306a154188e88c5e614edeaf40ec9d0c436dc494626f6b
+EBUILD gentoopm-0.4.ebuild 979 BLAKE2B 15eee7f3b2280155e401f08aab1f5ec7fe2ea40bd2ba97a86f23bd217e83813d6842b82744c3f967f71ac317f325c8e2e40e1d1b5b365f4046acf3c45062b990 SHA512 d42e7bacd655a0d55877ef92ecf59c9b5374c0eb81c983ef5a6f432db1de1dc821cdc3661dda4e1ae3b65ef1a2ba7e9aaaa0250139e4a6125cb1ec72eb406ca1
+EBUILD gentoopm-9999.ebuild 587 BLAKE2B 197379cbc7c3c98fb37efba89ebbf5bdb185c78f74fa1d7402d66aa8e28b474b885ef783770cc698852f3a72ed71eecd7b99cdc65eeb5e1cc39e7948f3f42182 SHA512 7da950ca313802ff76d9776bd43f1956ed2f60c39f840c3242722c4a3ebbfa15fa399d57a7cc0ab62c99de25a155a40d67ce233dee039559a03739ac6b1fbc93
+MISC metadata.xml 601 BLAKE2B d0b8ff6fbeff832d028c1b42a73c33ee4a66c915b054c90976a3b6b53cb68bb62b39ef6d2462781df24cbe56f0232cb2234640c56e6ba3c10adbff1f312c39d4 SHA512 82dd932cccccc873beed8c20e080591221d9fb2247deddc068828799638154eb4bd18736e27edff7fd323e9d2af5fd7eff42fa1a8fea9cedadff658a93c20c4e
diff --git a/app-portage/gentoopm/gentoopm-0.4.ebuild b/app-portage/gentoopm/gentoopm-0.4.ebuild
index a0239a1e00e6..7c4adef8e55a 100644
--- a/app-portage/gentoopm/gentoopm-0.4.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.4.ebuild
@@ -9,9 +9,9 @@ PYTHON_COMPAT=( python3_{8..11} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A common interface to Gentoo package managers"
-HOMEPAGE="https://github.com/mgorny/gentoopm/"
+HOMEPAGE="https://github.com/projg2/gentoopm/"
 SRC_URI="
-	https://github.com/mgorny/gentoopm/archive/v${PV}.tar.gz
+	https://github.com/projg2/gentoopm/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/app-portage/gentoopm/gentoopm-9999.ebuild b/app-portage/gentoopm/gentoopm-9999.ebuild
index 93e0b5ad6e14..8a42963846f3 100644
--- a/app-portage/gentoopm/gentoopm-9999.ebuild
+++ b/app-portage/gentoopm/gentoopm-9999.ebuild
@@ -9,8 +9,8 @@ PYTHON_COMPAT=( python3_{8..11} pypy3 )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="A common interface to Gentoo package managers"
-HOMEPAGE="https://github.com/mgorny/gentoopm/"
-EGIT_REPO_URI="https://github.com/mgorny/gentoopm.git"
+HOMEPAGE="https://github.com/projg2/gentoopm/"
+EGIT_REPO_URI="https://github.com/projg2/gentoopm.git"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-portage/gentoopm/metadata.xml b/app-portage/gentoopm/metadata.xml
index 96c8ee1d462d..4eaa4cb48702 100644
--- a/app-portage/gentoopm/metadata.xml
+++ b/app-portage/gentoopm/metadata.xml
@@ -11,8 +11,8 @@
       <email>mgorny@gentoo.org</email>
       <name>Michał Górny</name>
     </maintainer>
-    <bugs-to>https://github.com/mgorny/gentoopm/issues/</bugs-to>
-    <remote-id type="github">mgorny/gentoopm</remote-id>
+    <bugs-to>https://github.com/projg2/gentoopm/issues/</bugs-to>
+    <remote-id type="github">projg2/gentoopm</remote-id>
     <remote-id type="pypi">gentoopm</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index f4f9abe5adcd..eec634f1dabb 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,4 +1,4 @@
-AUX implementations.txt 868 BLAKE2B d7319947a1e548f877a3fd2799cb9f5387d8c6d6787073edcc4763a15220c5dec2fcad48f81de0505569615dd5b67541a330044af61e4035cd4a697e4b989d46 SHA512 ff34a2a4c31799c21e1eb9001da8be85bd84b1e956e1905271b8c9e4b1e44cd9703b72dccf665c1122cd706da5e0b65e9ce409227f39c53d61cb24a2f1e17cd8
+AUX implementations.txt 862 BLAKE2B 676429b6a1eaaf20e0823ca1a6c4b0b482359b9cf37943a876af0e67ed770d0ff457bc1898dc4f243b23245fcec735685e09574633da3d33e1ca9f34e0e23da9 SHA512 18bf218672ef713f1fee2d396c3383191222931fa98123ae1eeba99fc6f82b07202b6721a509eabee18836553baa863781ca9cf6d3c7b4071eabdefb16cf5104
 DIST gpyutils-0.8.2.gh.tar.gz 20247 BLAKE2B acbde89975e233ebd7d7dcaba629d35c09a9064be48ae1d529e9f5f814b9486e9a208506ff194894dcf827069cf24faa81efa14258866fb32cf5946dafadaf6f SHA512 932500c730635ed1f8f529012f7c65c48385d92db4a673abc0145fdbb14edf8c8b5a5ed4a4c7f892e7df310b92cd8fa0532af95340096f2bd4ef7047d6b6163b
-EBUILD gpyutils-0.8.2.ebuild 573 BLAKE2B 9b97713889d100ab250a791afcf288b899f1ca7c62922759f447df55017b610b1873856919a9c5173502615f4b8b8552d6c33c5d93d501baa2e7bf42f1154ccf SHA512 cd124b6957b8898b223c39048203ff899a7b50450300790bd9025f238618e8f4229923b7342a1b2775e004a8c0b4fb95e8a1b085180650921fbf58d6c8d52f00
-MISC metadata.xml 601 BLAKE2B 55e9b56b636971035d53b432dcdc5100127f286512a3d2c7568baf91970656803db20ec62ae8161fc2dfb0c27343ed8d869c73d71f0889860d4b648faaa9a96e SHA512 7f7e83d43dbe3fe944178e1547737973ff2012510aca40a8f30b9a081db894d23ad0126047f418f9fbe7748a8ea6133487af07e2f0f26ba5d04fe6a918853820
+EBUILD gpyutils-0.8.2.ebuild 573 BLAKE2B 946384ee7998fd2012c91c3d55a9d8c09328c55a4aa3e0677d4de2c6756247df373d499cb95674838318a2f89fcdabfcb084273b60ce2e5d79952b58f2a49d69 SHA512 d74fa0544d104a3f6bdac999b71239792cf0daf30e2e2753d1890e731efb94ce868486210ad0305d45c8cbc978f002aecd2ca55ab362a7d9b5c609d5052b8ab2
+MISC metadata.xml 601 BLAKE2B 3a90fccb93c2acd9e02c847f5a9170c6a7b976561d02e76ec0f58906b4b514b352bd621fe5a64ae6c8653253417a90fcce5b10e13bda2218b9b7bc29a86b9b8d SHA512 ce7bded5842dfd2dec8f0db875d8b302726f42deec340efaacdf4c6f99cde9daf18365f3edb9367b6a77f7690442b14a0b925bb2265c58f833a0937d6325dcfa
diff --git a/app-portage/gpyutils/files/implementations.txt b/app-portage/gpyutils/files/implementations.txt
index f55ca773827c..88202c6748a3 100644
--- a/app-portage/gpyutils/files/implementations.txt
+++ b/app-portage/gpyutils/files/implementations.txt
@@ -18,8 +18,8 @@ python3_5		dead	3.5
 python3_6		dead	3.6
 python3_7		dead	3.7
 python3_8		old	3.8
-python3_9		current	3.9
-python3_10		supported	3.10
+python3_9		old	3.9
+python3_10		current	3.10
 python3_11		supported	3.11
 
 pypy1_8	2.7-pypy-1.8	dead	p1.8
diff --git a/app-portage/gpyutils/gpyutils-0.8.2.ebuild b/app-portage/gpyutils/gpyutils-0.8.2.ebuild
index 9a5bbcb0aeee..dcd8ac0da69c 100644
--- a/app-portage/gpyutils/gpyutils-0.8.2.ebuild
+++ b/app-portage/gpyutils/gpyutils-0.8.2.ebuild
@@ -10,11 +10,11 @@ inherit distutils-r1
 
 DESCRIPTION="Utitilies for maintaining Python packages"
 HOMEPAGE="
-	https://github.com/mgorny/gpyutils/
+	https://github.com/projg2/gpyutils/
 	https://pypi.org/project/gpyutils/
 "
 SRC_URI="
-	https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz
+	https://github.com/projg2/gpyutils/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
 "
 
diff --git a/app-portage/gpyutils/metadata.xml b/app-portage/gpyutils/metadata.xml
index a7e17ec45420..89201d449b7c 100644
--- a/app-portage/gpyutils/metadata.xml
+++ b/app-portage/gpyutils/metadata.xml
@@ -11,8 +11,8 @@
       <email>mgorny@gentoo.org</email>
       <name>Michał Górny</name>
     </maintainer>
-    <bugs-to>https://github.com/mgorny/gpyutils/issues/</bugs-to>
-    <remote-id type="github">mgorny/gpyutils</remote-id>
+    <bugs-to>https://github.com/projg2/gpyutils/issues/</bugs-to>
+    <remote-id type="github">projg2/gpyutils</remote-id>
     <remote-id type="pypi">gpyutils</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-portage/gverify/Manifest b/app-portage/gverify/Manifest
index ed72a05ef47b..91d9f0d60db7 100644
--- a/app-portage/gverify/Manifest
+++ b/app-portage/gverify/Manifest
@@ -1,3 +1,3 @@
 DIST gverify-2.tar.gz 4609 BLAKE2B 73f97ba232fe0269ec56649bc5682650d48c001e432f8076c820a58a94c3d1de079dc89873d589a76b91164153e5c5be78870ef34b3b69f3c39ca0c0e388b114 SHA512 1756671d22047edc6ed1121b65af8c163afba854364a50a9089cef733213ccd6c9dd1276e876b9118741bcfa92ad02cde572fe2b6cebb22339664552c67d2957
-EBUILD gverify-2.ebuild 689 BLAKE2B 4732acae8f1ce9220685e1ccdf44c16f505c76dcb6b318f618ac87981cd2db45a4195ad6d9d11562967a989c3e4fc221a4e5d25661390ab7e92fe2c8756c7b85 SHA512 21ba14a2bd1f17bab89492520d8e601c3616c0ee7a95acf89b0a7d384ff6f441450fa4a9cba312181fba1f6a39828a3b1b0fc58c974d3253b37839a4464f3ea5
+EBUILD gverify-2.ebuild 689 BLAKE2B 51ab3ef0f094813a35728d8435b2fc88bbae86f19420ce66496f20f388f676081763efd7ab25c40c6a8872d15cc54efbbf6cce9a1464579160750528b9686c7e SHA512 1ebb864e67a57c2aa78271897f2fe36b87f2188843958fdec957d86cd1ceaba6b7e512257b96f551b71c6b6803f44c8930d302557685bb91c7471fe63c0411e7
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-portage/gverify/gverify-2.ebuild b/app-portage/gverify/gverify-2.ebuild
index a6afeed27f55..0cc566534efc 100644
--- a/app-portage/gverify/gverify-2.ebuild
+++ b/app-portage/gverify/gverify-2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python3_{7..10} )
 inherit python-single-r1
 
 DESCRIPTION="gentoo.git signature verification tool"
-HOMEPAGE="https://github.com/mgorny/gverify"
-SRC_URI="https://github.com/mgorny/gverify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/projg2/gverify"
+SRC_URI="https://github.com/projg2/gverify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-portage/kuroneko/Manifest b/app-portage/kuroneko/Manifest
index f917c5712baf..66410eaeb663 100644
--- a/app-portage/kuroneko/Manifest
+++ b/app-portage/kuroneko/Manifest
@@ -1,9 +1,3 @@
-DIST kuroneko-0.1.0.tar.gz 8964 BLAKE2B 051539ab6714332b02188854debe655d405093418a3edcf88f58bc54f153c5e9cecf9f9ab165ea32e9dc1d967c43618249b2a6677cb74ea020b05def99479d1b SHA512 b4f9e4cbf932927549ab1411aba15e8ca394919e80a19f7bd04a560764d74c7c884e96133c9aad1be69f9646b1d37713dfb449a1ca09bd74d407101789c213c1
-DIST kuroneko-0.1.1.tar.gz 10223 BLAKE2B aad046291218139662e74c653241bfb36180a0f7fdb4e3571c4d3c8787c41032c48a96d7b02f612e957b2a0eca9fd880daa03c31302d2e92eb6dec5df1b18aab SHA512 c4f29cb5244e659f2615cca706d002c9f20b200b51c964250da8c915d45bcaca03eac2a2dbc19e1d9b6a6374b7458b2c9e0a004e0fa14b1655e8c2c9ce8268a9
-DIST kuroneko-0.1.2.tar.gz 10279 BLAKE2B 9c468e17a1ca566a0bbdc65a3b4d8f5e08e188b2d999c9ee94187ee072f627f34dad9c965d67fc58108585cf05b876158b12b0c2c6043e0a1f5f16ed2cfe929f SHA512 9fff9b65fdda9a48d6c2b40b84fce5af811b288b0da08aee50ab2d393826dad2bfbd2250875b2dc40c55e417c7f8bff04bf7f4ad1b5f2adbee26a0bc94b9955f
 DIST kuroneko-0.1.3.tar.gz 10872 BLAKE2B 3dc85e92a4490501897e25949d258341e661672a2bd1fbce2673d3be6ead3599269cfc93884ad05da9ee41f90b60d17faeebb6b806da870458c8cf13e33fe58e SHA512 b388e0c19faae282b158e63a2ef3f54af98932e5f0efe96dcdcbd0ace509a22a1f7887834c94813912a03734448bc230767ab8e1367545f5cc877d778954fa0c
-EBUILD kuroneko-0.1.0.ebuild 790 BLAKE2B 4d5b1b9aa95ac1a1ed215e08690fa3b5b4d5f6a183c9d52960d2cb6bccd825e2d9a30c688f4b9d203571bf3ee63ffbbcfd7888182d9a02518ab0c33833005ea6 SHA512 52e2fa14d8baf97817e400170bc452a105a3b677ac91b9ea16654272f0076fbc25eb1fb2b1e6c77adbd08e632e6084059984e6215a91ae1ee3033101c8a9ff73
-EBUILD kuroneko-0.1.1.ebuild 749 BLAKE2B abe1b2260751e12a962bc2bafc53a11ebaadeffe107ae12fcdf16460aabd4e8481d88d4e78c73ac9f98f3b65a2b20d7f7016915307bc896052d1882ad503a6ea SHA512 581ff5f1d6c6a8081160141507f5fcd141dcf0b549f18f12702cfc08f57b6a0713bf9eabc607d426501b8976c985bee636e5b9619b0a5419e3e1573203e90628
-EBUILD kuroneko-0.1.2.ebuild 749 BLAKE2B abe1b2260751e12a962bc2bafc53a11ebaadeffe107ae12fcdf16460aabd4e8481d88d4e78c73ac9f98f3b65a2b20d7f7016915307bc896052d1882ad503a6ea SHA512 581ff5f1d6c6a8081160141507f5fcd141dcf0b549f18f12702cfc08f57b6a0713bf9eabc607d426501b8976c985bee636e5b9619b0a5419e3e1573203e90628
-EBUILD kuroneko-0.1.3.ebuild 749 BLAKE2B abe1b2260751e12a962bc2bafc53a11ebaadeffe107ae12fcdf16460aabd4e8481d88d4e78c73ac9f98f3b65a2b20d7f7016915307bc896052d1882ad503a6ea SHA512 581ff5f1d6c6a8081160141507f5fcd141dcf0b549f18f12702cfc08f57b6a0713bf9eabc607d426501b8976c985bee636e5b9619b0a5419e3e1573203e90628
-MISC metadata.xml 438 BLAKE2B f6580ad00ec0574de3d6f3a254a493263c6569e6af7e71abb2e0e62da8c300b33813df2efa9cb68d790510ad35c7beaf30b642b7577d0007d4eb2d399c051d69 SHA512 2158c9311b3898ffdc2cd3acad1f4fbd3aa3703c1ed49fd5e969c48cf039f603a9ce02f7667a909bcf7fec01b6f39a2b52a70a8384b5ef847a26593c5ed48948
+EBUILD kuroneko-0.1.3.ebuild 754 BLAKE2B 62ff24035b45737a0a175fecb7baa78e032306fb1398be0768d00defe646a67077afb871dddf8b5ebfa8335ffc37c664a55b41e8600403e72cab8169fd286f0e SHA512 8989f30d2bcefa992e226ffdec7893aaf1ce3b037d389662ff2374337f1d81c961383579109bcc35e8326a1d886338db296762f9274d95cd9d97aaa7b0435ff5
+MISC metadata.xml 438 BLAKE2B 75bd77f5e0411973b394f906dcce51fbaa9b75d3ba30b80a72b3ea3cfe15120ed9767d553e67e2a6f1ca8179d31c57e6113bd2393157ae4f0ef08afabb4635f5 SHA512 41b54eeb946cfd4f704c0b03bf4440b8f987cd6b710dd631c982262816bde6b06675e0f2a86310a840c59b351b3e736f2e6db3642dc086b4d91d17862119349d
diff --git a/app-portage/kuroneko/kuroneko-0.1.0.ebuild b/app-portage/kuroneko/kuroneko-0.1.0.ebuild
deleted file mode 100644
index 0bd9b554e20a..000000000000
--- a/app-portage/kuroneko/kuroneko-0.1.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Vulnerability checker using data scraped from Gentoo Bugzilla"
-HOMEPAGE="https://github.com/mgorny/kuroneko/"
-SRC_URI="
-	https://github.com/mgorny/kuroneko/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="scraper"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	sys-apps/pkgcore[${PYTHON_USEDEP}]
-	scraper? (
-		dev-python/bracex[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	test? (
-		dev-python/bracex[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/app-portage/kuroneko/kuroneko-0.1.1.ebuild b/app-portage/kuroneko/kuroneko-0.1.1.ebuild
deleted file mode 100644
index 9b74e4af13e3..000000000000
--- a/app-portage/kuroneko/kuroneko-0.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Vulnerability checker using data scraped from Gentoo Bugzilla"
-HOMEPAGE="https://github.com/mgorny/kuroneko/"
-SRC_URI="
-	https://github.com/mgorny/kuroneko/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="scraper"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-apps/pkgcore[${PYTHON_USEDEP}]
-	scraper? (
-		dev-python/bracex[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	test? (
-		dev-python/bracex[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/app-portage/kuroneko/kuroneko-0.1.2.ebuild b/app-portage/kuroneko/kuroneko-0.1.2.ebuild
deleted file mode 100644
index 9b74e4af13e3..000000000000
--- a/app-portage/kuroneko/kuroneko-0.1.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Vulnerability checker using data scraped from Gentoo Bugzilla"
-HOMEPAGE="https://github.com/mgorny/kuroneko/"
-SRC_URI="
-	https://github.com/mgorny/kuroneko/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="scraper"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-apps/pkgcore[${PYTHON_USEDEP}]
-	scraper? (
-		dev-python/bracex[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	test? (
-		dev-python/bracex[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/app-portage/kuroneko/kuroneko-0.1.3.ebuild b/app-portage/kuroneko/kuroneko-0.1.3.ebuild
index 9b74e4af13e3..8760452d1720 100644
--- a/app-portage/kuroneko/kuroneko-0.1.3.ebuild
+++ b/app-portage/kuroneko/kuroneko-0.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,9 +7,9 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Vulnerability checker using data scraped from Gentoo Bugzilla"
-HOMEPAGE="https://github.com/mgorny/kuroneko/"
+HOMEPAGE="https://github.com/projg2/kuroneko/"
 SRC_URI="
-	https://github.com/mgorny/kuroneko/archive/v${PV}.tar.gz
+	https://github.com/projg2/kuroneko/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/app-portage/kuroneko/metadata.xml b/app-portage/kuroneko/metadata.xml
index f97ac90e4b67..7af1965fdefb 100644
--- a/app-portage/kuroneko/metadata.xml
+++ b/app-portage/kuroneko/metadata.xml
@@ -11,6 +11,6 @@
 		</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">mgorny/kuroneko</remote-id>
+		<remote-id type="github">projg2/kuroneko</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 6954f8e37b07..da306277c930 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,7 +1,7 @@
 DIST mgorny-dev-scripts-21.tar.gz 11674 BLAKE2B cb3c217df259a6ef48f8e11da8d42c3dcba6c50cbed7e9006d0a02520b0f4bd54a7ea330c680f8570a93d799accfd7f93f410e8fc085cd544fb9f09168a47f84 SHA512 be49f0f5392817cf881ec9bcbca78da525f8170b0f9babdfcc0f7c2b9fdd3a0bd31db332498e98c937b22b3b6a5b6325ec2f7150548847cbbdc915d589a99b06
 DIST mgorny-dev-scripts-22.tar.gz 11684 BLAKE2B 6a17ecec290d761df650d8607f246411d85e80e8511ef1073d671878544785c055dfc4e35bb9e8d937747eac731e4c18075dcbc95044fff3bfe3e8567ed9300b SHA512 597505fe6d27fb0f21308a4966714bc9161e976abe66ac5437d4705a161d960a4beeaa9d3dc36346e69221b1dc912a5957a6ad537ae0f7b4b96f33a419d6933b
 DIST mgorny-dev-scripts-24.tar.gz 11691 BLAKE2B bfc81908b4769a111eee3ad12c931f8d3c1b60715d6b9828ff091da19a7df8258878105cfb402f7b1f4760f27e746db5e65e452bc5a727366cdd51be442e5bd2 SHA512 f2fd31f1a8c9de6b7310c7cc24bf861836948a9d88adb389ebdde9fc0d365efafae908f7fdba556a83c6de607587c55a90fd96116c48e78d39900e8b6dfb15b7
-EBUILD mgorny-dev-scripts-21.ebuild 662 BLAKE2B 19c9b1e870586b42036e48983021b78c5237ad4492d2819fa74a4c9090f9123dc69aa938dcab8c1d6cd78b637e4820ed34a3233b394fad7d46eba11f82945eb7 SHA512 c26fde3efa808e48b2414ef1f7106ff2d1788c3c868efe50a2405977d060149e7116c8c6f8a5220cb4870ffc28d4b9d3298f57ca9ded609e45be71aa557f055d
-EBUILD mgorny-dev-scripts-22.ebuild 666 BLAKE2B d710ad936e36c317afcd07ecedd163a30c30669e259d0f9379abf123ff8081a178d95c92aa9f05f267bb69173819ae0d8e3ff0a69b53bfd33fd0d05b41672455 SHA512 28fd5a01b940970ee1a5eead332cde991ed0feae7b030aed7cef34b866e75572d6abe9f48c3cbe9ccf89e1444707964d87aa6c5d3a6425f8d775be00315f801f
+EBUILD mgorny-dev-scripts-21.ebuild 662 BLAKE2B 753e4b2ae52dec310c27f21ebcd690d86822fccfd5dc08c11e963e6613d0c2b5967316c9a1b60020de7863677b35a7fd781b56062f12557996ab3cbde17ce58e SHA512 b1d47a3a289cf9339f151b7ddd451ed95c86439dc741bac199cc464dcc3f28370834402b2608bd255306a65627e73cd2a0bec8598bf3a54945f84f3dce6f076b
+EBUILD mgorny-dev-scripts-22.ebuild 666 BLAKE2B 3b35b5f9e8a3462fc06dfe58c77c9a62affe90641fdacb11998746cc4c1c67b2deeba8abdad58a0320777b56bf2c6bf82d70656d1fcbf85533086650fa9e40d1 SHA512 c7dc3f9dc74cba4a45895aa68319300d5ed8337931c16034eba6bcbc41fb3707da5a875c3ea8cbfdf9c829a59392deb171eb52130ba4005552fe33e04a4fc62f
 EBUILD mgorny-dev-scripts-24.ebuild 666 BLAKE2B 3b35b5f9e8a3462fc06dfe58c77c9a62affe90641fdacb11998746cc4c1c67b2deeba8abdad58a0320777b56bf2c6bf82d70656d1fcbf85533086650fa9e40d1 SHA512 c7dc3f9dc74cba4a45895aa68319300d5ed8337931c16034eba6bcbc41fb3707da5a875c3ea8cbfdf9c829a59392deb171eb52130ba4005552fe33e04a4fc62f
 MISC metadata.xml 362 BLAKE2B 9f7873c2b1dea8abe84daabea4db33438b730c92487220d28af391e411f58b15f7eaa7aedffab8849a8d0cf4c032db04e48cbf9be28f0ee7602b6a05f0e430be SHA512 d7d44e67c952a00cda52b223975c1c48ca8283d55ccc084edbed956633e8f2a04ede1553f16a3b673485ce433b9067d35c1459f0ef392ddf6d4d03ab02d339a2
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-21.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-21.ebuild
index e607c80581a5..56f187c76de9 100644
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-21.ebuild
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-21.ebuild
@@ -4,8 +4,8 @@
 EAPI=8
 
 DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/mgorny/mgorny-dev-scripts"
-SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts"
+SRC_URI="https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-22.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-22.ebuild
index 3b3f636dbc02..09ed49fb3813 100644
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-22.ebuild
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-22.ebuild
@@ -4,8 +4,8 @@
 EAPI=8
 
 DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/mgorny/mgorny-dev-scripts"
-SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts"
+SRC_URI="https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
index c9805c898936..c073a25864e8 100644
--- a/app-portage/nattka/Manifest
+++ b/app-portage/nattka/Manifest
@@ -1,3 +1,3 @@
 DIST nattka-0.3.1.tar.gz 95368 BLAKE2B cefe8236694ceffe9adf3c5af9c8c3521613fbc09b6e27804ee855a376f940baa5e7bf3d6d5d62371d37cea090748ec7053963dd675e88b9cedb48d595425ff4 SHA512 14b04b2f6fff41cc9705afe5cfc522a3009b14afa4ff5759c1913387afd04c97231fe2ad5661cef43c5ebfe764012cec251fd78463bbca924fbf33068a31aaee
-EBUILD nattka-0.3.1.ebuild 952 BLAKE2B da1bd79e29cb79bf775a8347e0470543eb4d505f35d515e2c62e616452bc76f4738666409629f98167bf230f4603985554fce7f97ebef8fc8cb194df45bcf8f2 SHA512 9e32ecbd6556f30d7913af114ae67dba586ed342d93f37501f4ee36ca164edab89fe9300ed68994eb17091888966782511016bc3ed666ade606809f5d717eef6
-MISC metadata.xml 507 BLAKE2B ce5804f8de9203f99ba65cbd80a7f17644b98d16cd771b7003563a2fce3411141db157b88032bceb9279371c0a537c79f8a0f6dbb7786f4c4af4a8cf5e5a0ed1 SHA512 67f71ff09ba69666813aff7ef9380dd86f58144de9e1ecaa5f1232034b7693707a2a43b9bb018e180d177994e3c9221ce5eee45b3d7eafb383ac9f222da6fdf4
+EBUILD nattka-0.3.1.ebuild 952 BLAKE2B 11b850bb00518f839dcd4d94317648950f2a67d0b23c72766a80b83931a8e7bde9f3e3ae7354c74ecabcd3059c9eead2b958a3d6b8874dc976fd454c72ff4fa3 SHA512 9e41b5402ede0c9f2cbb0bcf0fec01a6ebe511e5ffaf0eb8291ecf7519772d9c0fc13513ccded8cc5bc71f5eb2477420cf958a1c6208b713fe34cc94edaa36f7
+MISC metadata.xml 507 BLAKE2B 8a1c2cdea4e8af36c498cdcab09ce144df070f082ed18a7fae9b6efdc51a62ed47d6afe77de4a416811e1d29bdb8989f4a470a012c6e08db757a34ecd60871c7 SHA512 82acdc10588aaae42fe818de37bc2ba23464e46847d8e9ee83240a6555e1b7d94a3495fa8df964b142977f9b42a404d5cf01ca2e345a4a2a36594a1039a76e70
diff --git a/app-portage/nattka/metadata.xml b/app-portage/nattka/metadata.xml
index 39c3292f2a1c..5ab1f4379e97 100644
--- a/app-portage/nattka/metadata.xml
+++ b/app-portage/nattka/metadata.xml
@@ -12,7 +12,7 @@
 		</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">mgorny/nattka</remote-id>
+		<remote-id type="github">projg2/nattka</remote-id>
 		<remote-id type="pypi">nattka</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-portage/nattka/nattka-0.3.1.ebuild b/app-portage/nattka/nattka-0.3.1.ebuild
index 57dec4861b07..8b8256936b3a 100644
--- a/app-portage/nattka/nattka-0.3.1.ebuild
+++ b/app-portage/nattka/nattka-0.3.1.ebuild
@@ -9,8 +9,8 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A New Arch Tester Toolkit -- open-source stable-bot replacement"
-HOMEPAGE="https://github.com/mgorny/nattka/"
-SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/projg2/nattka/"
+SRC_URI="https://github.com/projg2/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-portage/pram/Manifest b/app-portage/pram/Manifest
index 1c021ddb706c..72646e4a3f08 100644
--- a/app-portage/pram/Manifest
+++ b/app-portage/pram/Manifest
@@ -1,3 +1,3 @@
 DIST pram-10.tar.gz 8292 BLAKE2B a5d6cbef942127479709b3306f20aaed696ac60d34dba53cbe15377c42d785d43c11b36889ce67a674d3ce355529c267e896cded714ef6f042cf77a3721100f8 SHA512 5dc11ef82ed84b5170f094ccd5e9515affc250f9efdc24be52edc7aa1720cda664a1a394301e0d8fc18a7f8c839a1147d29eca5f758d922a5ebbed6d166394f2
-EBUILD pram-10.ebuild 590 BLAKE2B 59c477357c28000a37f8925718a6471a8b602d6199889afb878e4098846d291ffba2d2818e5ea0a6b6838d60dec64f42b851db157b8baa7dda68d962677cf985 SHA512 5f35dbed078169c8cb0c6d5719d2ab417ea72797c24ac0e8d4c202bd7511cf7ea403d16702e714b4a1ecc9f4e44cfc8d7d1fac5478bcd2b987f1200434b77f8f
-MISC metadata.xml 522 BLAKE2B 51d47d3af0c81e86e9465ed49dc43f5994844444049870d8de1e3e3a8a01b1ffea366d0669df99badc72f26e21767a38378258472b3165aa7e1a1a8025e6947e SHA512 41fa051f0ee62189023ae3fb12121f74fe4276a8c221c74ac0d1683464bfd2fffce0be3d9328ca68f9101ce74089ab2e19a4364abd2ff5459aa61deb11ee0152
+EBUILD pram-10.ebuild 590 BLAKE2B 8e57378da09f213656665766b529e11d05dd9858c25ceed90b5a3d95f16978ed4f7380f63cfdb82c09dd1f846d5f0701ea0e5ec39cf981e2234a5fb4a4cc382e SHA512 cdcb6212670a799cf0370dad4caf7aaa1243d202a9f6022bbe71f27baed0925d9576cbcbaa248ea985d89a2879c5f7e58d3349c93d083433c85b26e594e890c6
+MISC metadata.xml 522 BLAKE2B fba6a122663f259795ee8ab8c53f48651761f145f16aff1094309bd7253c1261236c301a9753cd516fc929a4b9d01f38a08fbc5970f422a14e9ea79a1aff992e SHA512 16844d850f9d405854323c230195919c8bd082606b06051995ea0961c71280ac7d4cb24c38fe604ed1633d9269da9e8e10d8fd2e5df6c9311bb5814375fb8d19
diff --git a/app-portage/pram/metadata.xml b/app-portage/pram/metadata.xml
index 0b3b5635fcc0..8a8dbe18503f 100644
--- a/app-portage/pram/metadata.xml
+++ b/app-portage/pram/metadata.xml
@@ -11,7 +11,7 @@
 			<email>mgorny@gentoo.org</email>
 			<name>Michał Górny</name>
 		</maintainer>
-		<bugs-to>https://github.com/mgorny/pram/issues/</bugs-to>
-		<remote-id type="github">mgorny/pram</remote-id>
+		<bugs-to>https://github.com/projg2/pram/issues/</bugs-to>
+		<remote-id type="github">projg2/pram</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-portage/pram/pram-10.ebuild b/app-portage/pram/pram-10.ebuild
index c60fc2d697b3..25e440cef3bf 100644
--- a/app-portage/pram/pram-10.ebuild
+++ b/app-portage/pram/pram-10.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 inherit meson
 
 DESCRIPTION="Tool to ease merging Pull Requests and git patches"
-HOMEPAGE="https://github.com/mgorny/pram"
-SRC_URI="https://github.com/mgorny/pram/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/projg2/pram"
+SRC_URI="https://github.com/projg2/pram/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-portage/smart-live-rebuild/Manifest b/app-portage/smart-live-rebuild/Manifest
index 83c81ca472d5..0d9339a22023 100644
--- a/app-portage/smart-live-rebuild/Manifest
+++ b/app-portage/smart-live-rebuild/Manifest
@@ -1,4 +1,4 @@
 DIST smart-live-rebuild-1.4.0.tar.gz 17630 BLAKE2B 84faabbe702dc05dbd895961dba83b8b8968bafcc5e35bd1b7dc8644f98a904651168aaee081ecb0c101761def2f5d49046116179156e75f6b335a79595d82e6 SHA512 add82ac413c698a430afbb48a7d4c7d0dae26b9d37f01dcbe7f71ee2e2fbc1686ff63c6ea9ae1c24dbc3662d27247bec2ccc002841bd42c4c11729873a49617f
-EBUILD smart-live-rebuild-1.4.0.ebuild 816 BLAKE2B 5c86d8a0e58ec7ccce434b303c7b4a9fc58c261060ddb7d1f645ea7eeecb41a7998c16fdf191daebc8232aa060b8ee2d93fdd72871fdf33d7f5310845b96444d SHA512 fee0e917fb37095ad5e11d34ef5aacaad0c0b470a717bc1c3244c2b5bb65d58dd9eec7e332c71f582309eab79807054b71e3ed154149839748ecb5db52547ede
-EBUILD smart-live-rebuild-9999.ebuild 723 BLAKE2B 757ddfda7dbcb90fce93a7bc3c967975a68ee372e089bebaf554f685869cd6f687f44f301fccb391ff784eb94c2b8ecc2df236017b6c17aa8a799f762e62b8ff SHA512 9e4f540f520f79307b094a5c745e764c0d921af037e89395645b8df406fc760a0fbcf0f8a28634e8f59c257c6745f8e5840d6bdf76fa58b78bb119db1f84912f
-MISC metadata.xml 794 BLAKE2B 24cd92d94a8efeb0b9a3ab601f9f5581dce5686365332decc71c80c5a3a431560929d33faa4736259a19bf8c92fc9e1b6557126e67678c3bf1c2573236eca3f9 SHA512 24d79d34c1aa3c213ff920ca9f6e010809f949d1c5487601735ead39da88ad8c285eee091336f4a45ab5d9a095597e3aea16511f17ad6e33416439e89521d35e
+EBUILD smart-live-rebuild-1.4.0.ebuild 816 BLAKE2B 350a62c20c6277601c025c48fd99fc48c6e613793f5a5300e2532cb84ff893b5d9eb2ca5d960193bb9eb133ebeb6c4ee6de0c3be228173283f4ff4fade5baa94 SHA512 853d0f5d4cd5c0ff94bf87f492c10c5256119a343243fcca0120232aec574b1dbd64978b5f256684475ec42ad4ae3cbe6d963d1f7b399616e85dfa4eabcc4c09
+EBUILD smart-live-rebuild-9999.ebuild 723 BLAKE2B 7e44cd57e02b4be1dd9637fa39ecaa8419e7b48d37841efbce0c759d31269f24475b49b1eecb818cda4d190955b8c502bedac49cd79d686025954b7ad7cdfd34 SHA512 f767d0dcea03f2edfbe5ec74fd919a9acaafde8790c49578126d6981fd9c62090a4773a20888f1cd1ac3cd211030d251c4b660ad644822238835d5375bb8f560
+MISC metadata.xml 794 BLAKE2B 782678608fa8406a1f0cc82d6c121f69c11d6f5cfad96ede40f8d50203fc1ca5f74c8b3f17bdd98d007843387cc7ef67aaec2e70b21f8d032a82d7b5ef5341bb SHA512 30a2d57a354ed9ca5e61a08cd08d122c7d29058b967ddbb61b3bbea6ff14ac35c5ebac490ea7116d486c16a80d458d66619a8dae417d3af727437e2edd8a139c
diff --git a/app-portage/smart-live-rebuild/metadata.xml b/app-portage/smart-live-rebuild/metadata.xml
index 2d3dc3beb1b3..122403d5a743 100644
--- a/app-portage/smart-live-rebuild/metadata.xml
+++ b/app-portage/smart-live-rebuild/metadata.xml
@@ -17,7 +17,7 @@
 			<email>mgorny@gentoo.org</email>
 			<name>Michał Górny</name>
 		</maintainer>
-		<bugs-to>https://github.com/mgorny/smart-live-rebuild/issues/</bugs-to>
-		<remote-id type="github">mgorny/smart-live-rebuild</remote-id>
+		<bugs-to>https://github.com/projg2/smart-live-rebuild/issues/</bugs-to>
+		<remote-id type="github">projg2/smart-live-rebuild</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-1.4.0.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.4.0.ebuild
index 06f0f8a0098b..871b545544f3 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-1.4.0.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-1.4.0.ebuild
@@ -9,8 +9,8 @@ PYTHON_COMPAT=( python3_{8..11} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Check live packages for updates and emerge them as necessary"
-HOMEPAGE="https://github.com/mgorny/smart-live-rebuild/"
-SRC_URI="https://github.com/mgorny/smart-live-rebuild/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/projg2/smart-live-rebuild/"
+SRC_URI="https://github.com/projg2/smart-live-rebuild/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
index 190ef2047ebe..14cf632fdf30 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
@@ -9,8 +9,8 @@ PYTHON_COMPAT=( python3_{8..11} pypy3 )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Check live packages for updates and emerge them as necessary"
-HOMEPAGE="https://github.com/mgorny/smart-live-rebuild/"
-EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
+HOMEPAGE="https://github.com/projg2/smart-live-rebuild/"
+EGIT_REPO_URI="https://github.com/projg2/${PN}.git"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-portage/unsymlink-lib/Manifest b/app-portage/unsymlink-lib/Manifest
index 5fbf172e2e62..0bd1dc4a5df7 100644
--- a/app-portage/unsymlink-lib/Manifest
+++ b/app-portage/unsymlink-lib/Manifest
@@ -1,3 +1,3 @@
 DIST unsymlink-lib-20.tar.gz 11333 BLAKE2B bf5ab4390e52dceb0f86717abc21d752449754b6cb1083b34547997377c24618412d1dfef9736286d5af35632113885c998bddaeb373267280289b93a9ee8f40 SHA512 084d733046499ffa3bbeec6f59e72a8bd8bd9924c6f4cdca5f1bec5a6ef59502ceb19b156783c14d0418dbcd37025da65caaa2ce47665a26cec609e1895b01fb
-EBUILD unsymlink-lib-20.ebuild 721 BLAKE2B eab912763fbe9a46d1b8dc043f4019b50f8980d9759e4e5ee9a85a5976e1f0819349356eddea4b5842cee54398f17cb13f4fc95e687cf084a59401af65c827b9 SHA512 11554b955d9472a9d8115c408aa63c15f1455aceab8a6fe43ddc8e30a70912d4338b38580f813f6c3d6739511ef18191c1f393aa86978408c58767da18633349
-MISC metadata.xml 402 BLAKE2B edaf7e0b834e6f57dd8db2d667a47539d0d1a0ba402880fa79855036fc5f25684657e1b8870aca2705010aae30b189f60eba1a14e18d2ed3956c4277ea013159 SHA512 5bbe61d0e16c6c7dfc928dcdc4ce7fc7006577c0e41d18ea3e1b91c0943050ec232c9c184152c9f248e09cfa15ee3d86796ed22ea903f7286cfd02271d8d7ef1
+EBUILD unsymlink-lib-20.ebuild 721 BLAKE2B 474b5f1aa9a090879781411793c60d5b130911fbed30423de78c64b7c258d7ef013d9d2ae84d5120632ba1578d4156156e39e507846a99455f1d02ddf601ed8e SHA512 b7333e5f03dd01f9699e5184de5279515034109a0aad64f9d77b400712e0e1d2528b07f5d5aabbcd04ad7f81cdcb083f9ae754d8935cba5354cba372b2c0cc8e
+MISC metadata.xml 402 BLAKE2B 1a8af8f3754ec266f0708ec05269e9ae452610cddae9899bca4ac6fb44670e600ba7baf8c4c56e5a34ce6f9db18b696366f2daeb3fcc39fc9006aa7b5e4b0665 SHA512 e8f30e3b9041b935d92a9cf9987e6631d45b9b15ae77c93db3fe95630137584bfb91bb1af9ab8224dc1c594b1e3a7c9eb84cc7bf49dc7131f064fbf48aaa981a
diff --git a/app-portage/unsymlink-lib/metadata.xml b/app-portage/unsymlink-lib/metadata.xml
index 0ba87dff8fe0..3cccb08d1631 100644
--- a/app-portage/unsymlink-lib/metadata.xml
+++ b/app-portage/unsymlink-lib/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Michał Górny</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://github.com/mgorny/unsymlink-lib/issues/</bugs-to>
-		<remote-id type="github">mgorny/unsymlink-lib</remote-id>
+		<bugs-to>https://github.com/projg2/unsymlink-lib/issues/</bugs-to>
+		<remote-id type="github">projg2/unsymlink-lib</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild
index 070dd5986d41..30c2eb4c6e4d 100644
--- a/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild
+++ b/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit python-single-r1
 
 DESCRIPTION="Convert your system to SYMLINK_LIB=no"
-HOMEPAGE="https://github.com/mgorny/unsymlink-lib"
-SRC_URI="https://github.com/mgorny/unsymlink-lib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/projg2/unsymlink-lib"
+SRC_URI="https://github.com/projg2/unsymlink-lib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index f0d214ebf19e..4a5764e9ab65 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 1aebd2b79cb5..a7148767435e 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -3,8 +3,8 @@ AUX fish-3.4.1-atomic.patch 2109 BLAKE2B 8b33b8a0d3add15847ea54d5c3f243bc7bb5a8e
 DIST fish-3.4.0.tar.xz 3292216 BLAKE2B 3691e5387a8392d7d43b3b0f8b893e83e246c3532684e95a19c7b2eb4ebe80bcf04aaa1b965f5c4f6d782d0ae52269bb1cdafef76845b02f9f99d4c82ea77ce3 SHA512 463ee8d86815520c6de9777fd2b5975f06cc0842137c86cca7ae0331e95d74e755bf6f4b0bdea7e96c11371436ff9f97ce483ae026daa1e8d385f6cad8860ed4
 DIST fish-3.4.1.tar.xz 3293068 BLAKE2B 5edcd59445e6d928fb2183deb68fb0a305f6f80c134fef48ea79d91b79af1da6b31a1e870a9df963bb27dfc5985f326d9b6d53d64b16c79f9c303aa8edfa4423 SHA512 20a2892ec0c413c4c3fcfe5fbf52fb2398de35a9172758728bd2ccdccc5fb6e0e18712a664d02db67543d47180a4d04f3998a6297d23088926b6d03baefdf981
 DIST fish-3.5.0.tar.xz 3326276 BLAKE2B ac8fa514a728af5bc02ea02f57344d92d3d897c5dda3a2a32b6dbaab81c795828da0cc6938f19bb6d538aa1e620b67de72225fa73b52405c94e1eecab2299faa SHA512 ccec4abcdb425563688c6112f3c9c57add16aa3a05c121d2633b655d27185e1c96c263d51d6af7d83c068580d7d0723c072f1a4853fa8b6736291beeab64b859
-EBUILD fish-3.4.0.ebuild 2342 BLAKE2B e1da974c7abcfa42059f85206d1b332d363cc9c41fec99b1aa9d0605b9b14ef9482c0af6dbb9af39c46770d01ad13beaa70baa1f8253dd34be0c00b62a308479 SHA512 cc270dda6da40e95576cd6714885ac2e8e84c4b1c1ed73502fc3aa8660e96086a93bdeec0f9bb650356d9c11c357b196557c36ef15cc56e109a705846b59158f
-EBUILD fish-3.4.1.ebuild 2463 BLAKE2B 9376647dc551b4d754038e2a13ec19bb59319a11fa9fea118016eb4b7ad6010353db6e425cad4ab43ec3ed1c1ae93ef2070a4654b3e3617eae7c823cb3a971f9 SHA512 25ccb6285e2f1b30a66d82326c3f0b16f470b021dc765f0eb06d9c60ba59c60eb79f7d5eaa9d55f26199200ef26563565bbb59eb0edc2db404d9c994c04cae76
-EBUILD fish-3.5.0.ebuild 2611 BLAKE2B 0111b5193d134969e5cb9024cb8c7c26fcf9b76a7132d7252c9f17889c9072bb3458d1af79f121d844173bc106568b8ba8d9c6f03bf8ec6829a35240111d1fa5 SHA512 6ff9d74c493867a2ea0efd0c59a8d5bb183a5ec2f1be168942eadb9dec0442d8302b83d5e3987d3075e62237a8ecb227e8400573297dd97c6c08ec61fda23067
-EBUILD fish-9999.ebuild 2611 BLAKE2B 0111b5193d134969e5cb9024cb8c7c26fcf9b76a7132d7252c9f17889c9072bb3458d1af79f121d844173bc106568b8ba8d9c6f03bf8ec6829a35240111d1fa5 SHA512 6ff9d74c493867a2ea0efd0c59a8d5bb183a5ec2f1be168942eadb9dec0442d8302b83d5e3987d3075e62237a8ecb227e8400573297dd97c6c08ec61fda23067
+EBUILD fish-3.4.0.ebuild 2346 BLAKE2B 540bb7722faa9a5b609c8613c294b62fa7285c84027a1a1216c57cc9eb87ebfdd459188d621aa8e771800d8453c33bae1dc38d2efd0fdf66f2769377d61346cd SHA512 8801a597506ecb2e1f92d84e64c44c11055ffebe80945eeb00953db2fd0eb60252604bddec1af135eaf85be58d8fbf3cc4f364390e1ca3cfec3eb2a4a49bbc81
+EBUILD fish-3.4.1.ebuild 2467 BLAKE2B 6b66f8f300aa0c8e3dbf66f355001c62ed7f909404355d27d5dee305153042ebf19869ab81d714664ad05966a53ea4cdecbfac578939465df25d4487daf7c637 SHA512 7e80999fa43681a93bd0c64125c063c4a449f700abb1058978e0a0fbeb4b888ba1ce416af8e2e60614a73f8c820c1d069d9253944d2babf0d0ed021260101b0b
+EBUILD fish-3.5.0.ebuild 2615 BLAKE2B c411170b4573d767fbc2e2c8097e171501abae458bfcf4bcbff960ce935d9ded5dd612c05b79edeb04398a7cd2a2da71f0fd33e63a790a38cd5353a0d5d34d1f SHA512 7e94c344a5191f506f8072dce81c7eabcdf5744920333dcd93811d3f89615d6ec88cd062349b531a8045407697d587e8b1f759e379689d7989d55b534a3b09ee
+EBUILD fish-9999.ebuild 2615 BLAKE2B c411170b4573d767fbc2e2c8097e171501abae458bfcf4bcbff960ce935d9ded5dd612c05b79edeb04398a7cd2a2da71f0fd33e63a790a38cd5353a0d5d34d1f SHA512 7e94c344a5191f506f8072dce81c7eabcdf5744920333dcd93811d3f89615d6ec88cd062349b531a8045407697d587e8b1f759e379689d7989d55b534a3b09ee
 MISC metadata.xml 628 BLAKE2B 0449de5f2df4578d1b6ea0ca56276805afa3726b9120b96de0968db59a92bf933c6516f7d62afe7074d64fe1f5cb7c48fce09d0f15ccda67b5f45fd600cef490 SHA512 f30b029929df8548ad626b96d6426227c9bd421d8838836ca09304a44aa7045d7a06b4ca215c98dd6ab9554dbd594578c5d9b0baa1b8564c17cd69dd9a8d9203
diff --git a/app-shells/fish/fish-3.4.0.ebuild b/app-shells/fish/fish-3.4.0.ebuild
index 761a34b45d20..b5f7b1b12b38 100644
--- a/app-shells/fish/fish-3.4.0.ebuild
+++ b/app-shells/fish/fish-3.4.0.ebuild
@@ -51,7 +51,7 @@ S="${WORKDIR}/${MY_P}"
 
 python_check_deps() {
 	use test || return 0
-	has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]"
 }
 
 src_prepare() {
diff --git a/app-shells/fish/fish-3.4.1.ebuild b/app-shells/fish/fish-3.4.1.ebuild
index 96644c7a999a..08acc9d3b69e 100644
--- a/app-shells/fish/fish-3.4.1.ebuild
+++ b/app-shells/fish/fish-3.4.1.ebuild
@@ -56,7 +56,7 @@ PATCHES=(
 
 python_check_deps() {
 	use test || return 0
-	has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]"
 }
 
 src_prepare() {
diff --git a/app-shells/fish/fish-3.5.0.ebuild b/app-shells/fish/fish-3.5.0.ebuild
index d0328d498838..936ed237ea77 100644
--- a/app-shells/fish/fish-3.5.0.ebuild
+++ b/app-shells/fish/fish-3.5.0.ebuild
@@ -51,7 +51,7 @@ S="${WORKDIR}/${MY_P}"
 
 python_check_deps() {
 	use test || return 0
-	has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]"
 }
 
 src_prepare() {
diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild
index d0328d498838..936ed237ea77 100644
--- a/app-shells/fish/fish-9999.ebuild
+++ b/app-shells/fish/fish-9999.ebuild
@@ -51,7 +51,7 @@ S="${WORKDIR}/${MY_P}"
 
 python_check_deps() {
 	use test || return 0
-	has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]"
 }
 
 src_prepare() {
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 9b0c814cfa0f..ca8c260f458f 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index 57d74d9f06fc..9264acd060a5 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -1,4 +1,4 @@
 AUX htmltidy-5.8.0-no_static_lib.patch 1282 BLAKE2B 6c5dd8ce16b0e05ce0cca9ea268b85bffa371f99e20d909f606c20c5fb6d06464f65daf7a297989966656f3eda0d5cc920a8f9e60dbbbba21927aab180567f9b SHA512 8742a0db922098f46d377861d56c6202144ed02c9603e3899817c9d1b5a903bc10e729066c2bc95b0a9c9b63603c6ed42a3b8486264d3560b78255b096b62000
 DIST htmltidy-5.8.0.tar.gz 1015303 BLAKE2B e8e48cfdcfffb7c7ac494f71ba709361e21fcbe5cfbd56c29d9d67ffe11fcdc20aa03aace65e6dc5315988dc0dd1fc148be616549f4f84f37928e662633bd7ec SHA512 f352165bdda5d1fca7bba3365560b64d6f70a4e010821cd246cde43bed5c23cea3408d461d3f889110fd35ec9b68aa2b4e95412b07775eb852b7ee1745007a44
-EBUILD htmltidy-5.8.0-r1.ebuild 1502 BLAKE2B aec48ca0cef9fcfbbb3641074edf952e0e9c7382b7b8c270d7e81b477c23e4dc56962403f8c66cfe7c1136ce4cede9bbe4a480c081060218be1424a2ac67b3d6 SHA512 cc990e0b088e33ee0a82b8b99ca275cb190867491e2005d8777b9e952c8baed7ac6e14877cf3fbec64dc01cbddc409403f7f3ad4927f55afa0eb5d28b2aaf9ae
+EBUILD htmltidy-5.8.0-r1.ebuild 1509 BLAKE2B 0abbffdc724dff69de7dd8c05f323bebc2064242c15df0933d837588806fe1caefbbe454ffe5a490c930d687e3c289e48846022ba63d4970aa66a3ae9d2db8ed SHA512 285dac8348486ee886e1146eaaa29a7507156de5cfbc3b5ee0d5c9bd4c0b6b29a5dc8037ec05200eedc39b4e376ce6cb7d0d902a925ae96bddb4dffbe2e984ea
 MISC metadata.xml 608 BLAKE2B 7fcc3eaa3f24191606776cc3a92f97d58f1ba27c3ebeea50727bc334d504ef09ff4387208222080574856db1e6d1d8689a9b22f1ef0f0347f3bb82d9a38a6afc SHA512 adc1857b273dc8bb8fd7215cd733e56dd41eb7e9eaf82ccf183f001afeeaafd2ba4cde4f9b75c2882427ebed7cfcb60a16408d19f9f6c6ad91b6beacc9edefeb
diff --git a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild b/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
index 3259929cc1d0..b69b369a2d16 100644
--- a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
+++ b/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 RUBY_OPTIONAL="yes"
 
 inherit cmake ruby-ng
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 97dcdbf9efe5..5e11d52fd034 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -18,5 +18,5 @@ DIST mupdf-1.20.0-source.tar.gz 88455853 BLAKE2B 686d8b02972fc6cb7fa4541e4f0561c
 EBUILD mupdf-1.18.0-r4.ebuild 4358 BLAKE2B 67d3b045314556eb3e81a668015e36115e7729436a91bfebededdf316bce062bac229c64b63f0aebae7553b8a5595fa0d4db53bb7a7a9b452a087967cd04547c SHA512 90dd0ae5d0376dafbce8b19d711d92ab9debceb467578f0e529881b219e8b3166fe5ec1f0b535036300a1e4a60d9969ba21450ca54b6f7e18f8631b035b8a4b8
 EBUILD mupdf-1.19.0.ebuild 4465 BLAKE2B 28283005cf1c4c688cf24544bedc20683d2e043221c74a3922e3f86b6affddbf8a0e62c8d79f8805bc5c5a508e999a57c4d212f6ec3f4b88036b512ea0251017 SHA512 ba83c50f6bca1cfcaabc7410f4fcfc842cdf8e4381ed7763af895cac78861f0f585069fd8b92d50bdc1e22baf30b56533a00b4ebfd8d0cb7515450c5f19eaf5b
 EBUILD mupdf-1.19.1.ebuild 4490 BLAKE2B cf556d6ba654118ccd0316fb75f2f970cb96990f254bf3c51aee44405ad2bab8bd3f5245f5d04fd4d713d8befd8a84b62632a757ae69396e5291ac6c8cb6b57b SHA512 b1ee92e6e10373980739bed7bffb1bd658d9b3830f82fcc2b3153c5296828a50b487164e686a69de31df6ea25aa6e0925b5ff5c997ec91a6cef1851a7bff76af
-EBUILD mupdf-1.20.0.ebuild 4756 BLAKE2B 81587e6f15b4183e46c01d95d424dff3bec6c18e53dd8b4b3138f620adf8b598fb773219d88fca3c968e70bcaa2055832b896af3165a6a9be7845ac459d4be56 SHA512 b837b64b10ca880527cf09fd91726ebd0a791ef312c2fb268e45272390720780e85ecacf479d1f80d5dba09de8845b7f2e3e0076c519b1d86f8e993157a29887
+EBUILD mupdf-1.20.0.ebuild 4750 BLAKE2B 9675a86e5f8bbf05933f49d422adb3d3d246953c7abe80eab58d75946265b4e5b4b17ed3e64098bc4fa5b1b0537884263ce50a084bf4f9109bd8f217212a2541 SHA512 591df3401dee953bb51499fb754e13127e32737dcbde3d924b02d713b1de8a7736e2c1bc123c24e5fb31a530a49c7a7eab0fc47ae8b9a22aea1206bb8df07989
 MISC metadata.xml 405 BLAKE2B 8b71db6f16bfb481e524a331eac615661b267d2d2fddde3aa6c9244b75026eacada167e2ed2ad6e7611bad234b53c0b073063925ae6745832585771d5342c913 SHA512 23f707e5ed833c5901d482e0d9cedbae751434311d8c67e7b300b452faabd958eb0c12a5b1c48a3c6d4773891cf3c7426d60a85eecd4b3ceb3358f68f4c8ad87
diff --git a/app-text/mupdf/mupdf-1.20.0.ebuild b/app-text/mupdf/mupdf-1.20.0.ebuild
index 447778adb9d5..c541f96f9cd6 100644
--- a/app-text/mupdf/mupdf-1.20.0.ebuild
+++ b/app-text/mupdf/mupdf-1.20.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86"
 IUSE="+javascript opengl ssl X"
 REQUIRED_USE="opengl? ( javascript )"
 
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 728507cdba40..6a8f5bf725d7 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/highway/Manifest b/dev-cpp/highway/Manifest
index 3f86f110b672..702c5c0d57dc 100644
--- a/dev-cpp/highway/Manifest
+++ b/dev-cpp/highway/Manifest
@@ -1,7 +1,9 @@
 AUX highway-0.16.0-fix-AVX512-detection-on-IceLakeClient.patch 569 BLAKE2B 89915c3fc3e934415026bbc8e19bd8d50b6e3e438f1942b0345832ae6067f7ffaf714d3b99efd3876c6774966cb0cdee05f1dc87788b37c072199d5c714cb937 SHA512 99333059c069f09c59281a7f464805eb41cc6da627dd11ac7dcc565fd688532f162776897ebf506c50e58f17dc7a9486214cc1ec683cb8b2c7efa8b767574410
 DIST highway-0.16.0.tar.gz 1639388 BLAKE2B 660b0079b25a12a2e982b4ba16147b923d167989a7dc1c0cb65ebe5219577f2f02c8774a554fd3fe9e1c10ef7b1cf5db747500bd8acf454e26952722f7b5ac9e SHA512 c08e66f43d9d0b307737b016cfa6c3d3a1df9bd528de435d193388104f34c264866c5ff0da633fc0a6f8c50f21df1ac653e9dd3f6fbfaf227d636411ac14cd47
 DIST highway-0.17.0.tar.gz 1694290 BLAKE2B 23ab48e11e8a79eb0469bb4fef7f32148ef6d2a266779a151345fc072213521f46828c2efcb4ab75823f977c619c7727fb064f05d6b3e0aa341698074e6b0e6a SHA512 7e55724c844a09a07cb981a7d8e913dcc5491e07d14ff3e7783a69060b0c470e7d5adc4f5dbeea526b3e109eea8cc9e80605d6b8d2da1b794382e56fd534ba06
+DIST highway-1.0.0.tar.gz 1723558 BLAKE2B f6580ca846aa659c80548e61daec0560dce335cd9c6c449df148398c97c0bafdf86e656a592903494d30de5ced8dcdf4be570b6009a2a5a5457b07f62e770e75 SHA512 19371a4771f4fcba82a125ed09544e2bbbd0d32af103881c8cfa41908a4fb4d6d5c536e1dcfb82628434622f31113a650259582c543275b704b45703805dc101
 EBUILD highway-0.16.0-r1.ebuild 935 BLAKE2B 8484a40941728da18999caf18af1726b9c40af9a4795e11964dcf2f3cd1a5c7bcea340154fc60cc52d9a5ce2ae0531e464b88a975542156b2e351f035e370918 SHA512 ef056830cc78222567662012d922833b027df578a557bfe64fb076cde91605a0a41b4a9fd08c11f87afcd19512471bada855841bd37ed794a7b5fd1d11fc00b2
 EBUILD highway-0.17.0.ebuild 862 BLAKE2B a0e9cef824f94f9f639d54ef4aa3ccb6a7369a74b3e8725df941a4688ecba172224ee7ea35aaf248bef8cce4d62e7688c1c245ccbf6989f7555adb1a76666d15 SHA512 8aedd21bb7bc30652a47eef5ba74ae467fe4c1d50227d5c366e254adb7b754a77a9c27e7b6ae696605ff96d3c0dbd5acf42dfddeed5eca401c7f0a182e3a7122
+EBUILD highway-1.0.0.ebuild 865 BLAKE2B bcfacafc475dd05cb21bc1f757cde7f83798be0e0836987ec5289aa8628c0588363de2117b4bd86c816bc5f948c416d767a1660b297e1b86c49c9f3de6b715c7 SHA512 b020595afa836c92fe12549746cbaed9952f6ee485f521d85bb7276088d651cc8d89acb8bcb6181077a0913329e6cc07560f3fb5dcfd1fc88c6fc44174d04b2d
 EBUILD highway-9999.ebuild 865 BLAKE2B bcfacafc475dd05cb21bc1f757cde7f83798be0e0836987ec5289aa8628c0588363de2117b4bd86c816bc5f948c416d767a1660b297e1b86c49c9f3de6b715c7 SHA512 b020595afa836c92fe12549746cbaed9952f6ee485f521d85bb7276088d651cc8d89acb8bcb6181077a0913329e6cc07560f3fb5dcfd1fc88c6fc44174d04b2d
 MISC metadata.xml 617 BLAKE2B 85392a8a226aa984039fed26796d0baf6bdb38da7084932e59ec6dcf882ba11863066adff2caffcb34b2b9f337b539c64498cf48c4eea43364ebf2522ea9971f SHA512 5ec72623048e7c940af745ca256671402dc2126004b2be29e01891619c119f847ba1ed72b99f66ee44b8076510833444f5c733a9724e1b9eb13bc58a125e16e4
diff --git a/dev-cpp/highway/highway-1.0.0.ebuild b/dev-cpp/highway/highway-1.0.0.ebuild
new file mode 100644
index 000000000000..89b07a85a587
--- /dev/null
+++ b/dev-cpp/highway/highway-1.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Performance-portable, length-agnostic SIMD with runtime dispatch"
+HOMEPAGE="https://github.com/google/highway"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/google/highway.git"
+else
+	SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
+
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DHWY_WARNINGS_ARE_ERRORS=OFF
+	)
+
+	use test && mycmakeargs+=( "-DHWY_SYSTEM_GTEST=ON" )
+
+	cmake_src_configure
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 12fd2d16ef8b..28a70ac42753 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index 1c9ee68dbf50..07e6c6350812 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -3,6 +3,6 @@ AUX mysql-connector-c-8.0.22-always-build-decompress-utilities.patch 534 BLAKE2B
 AUX mysql-connector-c-8.0.27-add-OpenSSL-3.0.0-support.patch 11508 BLAKE2B 1fe2341c938ce580611bb1f2ded279d02d4f1130b719c43d0c70942e9954214cc4392b86a18dfd0f88082c6b72fdf270e076647dd1600d7ebb8eb437ca10bb64 SHA512 1b7b1bf471ad6cab6c86dbfb7f6ffe506e3d20a51efcc1df503a9d65976fedb8dbcd67993897241fc0dd9e1f7356670bf3ec80c5b7f66c9246a44b4aa3eee3cc
 AUX mysql-connector-c-8.0.27-res_n.patch 1635 BLAKE2B f75811958a6415bf45aa571a8da14c371500216a197602dec19b8b565bc219f98e8feb9bc660d81e32c4af7f39abb626af405d33a7f478617c8ee96c5b4453b8 SHA512 bb6315f0ac540d0723dffd9f8c2bdad9b9b1c0a3d706f80fd3bbdc9c7f276a8dda2754df94f6cb4ffecb0c3b0e65edc96c90b171eb0a4e5032fe6583e56ade85
 DIST mysql-boost-8.0.27.tar.gz 292184025 BLAKE2B 177209f3c62b0326ca9d021c751a701dec84c1b15c946ab0a68b1b4cf0620468eb3a1df77a918284007a0fde1aaa6a9767d0baed57936612813ef583df51c35e SHA512 6ef2426c0bee46bdf8e2fa5cb159d5ae19f0bed4f7c9bea9b33e0dd922b568c3c68ca063dcbcd7ea6904aaea31877c10064ea10b4bc63fb40d9f31778e3a7891
-EBUILD mysql-connector-c-8.0.27-r1.ebuild 3269 BLAKE2B 7dd57e4dfd1136904170b50ce3310063ca8283cb2b188d9b4a3025bd449d62f59db76d8f3f143c51c7882b2affce51b15caa2907d4d058ae3fdb9708bf05ff25 SHA512 a54b8fe93d921a2e67efcf638014584eb33ffe234ec6ea7164d59ec2dc575e08e18c40536561705121c7467c9f26a45933cd5d0fdfa4a102ef2287ea7ba375d8
+EBUILD mysql-connector-c-8.0.27-r1.ebuild 3264 BLAKE2B ac3ba907ebe65dd80163632cbd505232de8c875429cb1badf5f672e050e7dcd56f5ac6b0c722ecd9a0d13abc21168bcd3c290e228698beeac8efb63e6888ebe1 SHA512 80f1dc8d6c0ebfc1b44128fcfa8785c9a9bdef00617cd6a512213869a8199f2ceca39650ddd625ed2be3241b0644bc2625e93de0f4a860f080e958fff76becc2
 EBUILD mysql-connector-c-8.0.27.ebuild 3222 BLAKE2B 3b8888fe231a27fd07f29ebe1fddabc215ccd9337af0b7f7b30cfab64f2c98b3af06d4840b19fb7a8dbe47fb3699bbfd7a2be39bf8d39ca9eb8d704e92eedc51 SHA512 60c9a2f43d481b51d1334dc92dc9f2f056efb8217f381503b8253ad8b54e570dda98f5b79c0b2ceb272a1b4de84157bbb14a99da3998bed428dce8196734d924
 MISC metadata.xml 240 BLAKE2B cc93ae4da8408b221c296e092d9db6ae3879754ade669d81c1218d53a5f007c6b7717bda6f92dbb0af38ff9b5e45f44e91503b12d3603d9955ec7d5a2a67399b SHA512 0f41c32ce3d736e061302252f14913d7425bc97e19d0c2f3b80c50637ab3521aa6cfc67f82e5f70f91174cddb36bb5622837dc18fd9db3bf75eb860359aade27
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild
index 7058ba6c50ed..90e2dcb59ab5 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 	S="${WORKDIR}/mysql-${PV}"
 fi
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index bd90a59944b1..888e15dcdab3 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/ode/Manifest b/dev-games/ode/Manifest
index afe85b67e75b..a259457df504 100644
--- a/dev-games/ode/Manifest
+++ b/dev-games/ode/Manifest
@@ -1,8 +1,4 @@
 AUX ode-0.14-gcc7.patch 2580 BLAKE2B 2f39faf4ad093cb8ec4ad17dc3a72212081f48386566d652bbdc9c2056605ac943144122ad56d5a2c3b797b5275a628e2160a5a02b1ddf7f248053518a73e536 SHA512 d758281bb2f390aab6b793871f8f7e3224e486e6e4d4bc7e9bd0e9e9a9d97ca6f0f7775c3c86478256870e6b76383a6792787f9135e2b7f61e8cea95e6141f8d
-DIST ode-0.11.1.tar.bz2 1720088 BLAKE2B 0908356d45e9b17af80cc2afefd3a09735c4955d0a03b502a60f0bd01023796c3b00b1caf379eac354d7754035db11bcdf802c1ecc72abd28a9fce7e1dd7eef1 SHA512 1e015231f4d01c68e7539144d197031cca23d4b58ea53733184a826ce23388956c428a53385254e7eed2c5d3fc28224a688eb13be7ea648bd78e186c8f203d37
-DIST ode-0.12.tar.bz2 1816246 BLAKE2B 7ac4b9158f6672775e0374a619f71a178cb8a3a1cf8c957d67c2547081a9dd660a091923fec364133dfbe4cd6b82cfe14961bda8994bb6241aa9e1af61ef22ef SHA512 303ffda8afcb89a87d09c44393f590f5646f10e8959ca06746121859ad2407709cd711ab185fed4817a9f74c9ca4ee13d1698a28577211bf65dbaad1141f6fc0
 DIST ode-0.14.tar.gz 4018146 BLAKE2B 7dbb3d4cd673dabce176cf92d9d0b5fdd21dea25b751b8b43fd99a71e7806170fb97459dc2ecc7a9cbd14bf54bd32b4a3e631b78a1c3420ebc11c2d518f0eb45 SHA512 1f74c3c4687ee9665fa70e65a79100747fba577729830a90806e374115f1c161a2f4545cf591b0979054aa3e2f9a3673635668cb7362ab5c213ada0d39b1a03d
-EBUILD ode-0.11.1.ebuild 1548 BLAKE2B e67e4e91af66fc532e7619667bf3941405ab47b5587fb243d2f51118fe67d6d9149961d2028be251cdef5a391f47fc1c358e2de54f4f8a0d807f45756165255e SHA512 036b48d645a5159d4edae4d780553b09d9fbc76f796dd649abcfd61f7a9bcd2f538eb3044ae74b127c240666d46b3a4d6c0d77d64d4aaca867c6ee08732e6032
-EBUILD ode-0.12.ebuild 1578 BLAKE2B 65c40b29fd35f5454c8bc96d77cea929af4bf67a01b669550223ac0343914ac6331a61684e504671fe336b5a8365227523736d2b66ae5d9520506506a53c15ae SHA512 6939b75cbcb0f753bb37e361fb818cf1599dff861f3bff9b710ccc1b3925e6da6b3d1080d1dc10dc35ffc6fe46051125b7ab2f3a301febe76fbc9a4a93560a80
 EBUILD ode-0.14-r1.ebuild 1749 BLAKE2B ab330ff3960c2fa5ca1cfcb1a048f31000db5cfdebd864a18a97b4d4f29300d8d75c9db168a37b7c38761d3b52cfa87d33b86e73d8eb4e77c7cc15e45524525a SHA512 2719f90895dc95224daedb6068c9bff92c899f6073009a6a623742fe9ca4456b84e114c80aeb894970d9f43760f7e86b4749ba8cc5bf7e3b135cfd07bce6cf37
 MISC metadata.xml 918 BLAKE2B e4a11f53fb82791c78f76e24df25ea74d9c6f1a0fb6088032650b0ad0bacbf61c9e6d73c7fc1e483a6243dea319ddb78387ad0adbf9ae070759c6a408abfb284 SHA512 4820375ea1d47b23689651cb964da11379f9238993fb231f3446e06a819949a56962a7a397226e106ca7d0c9fd62368f70068a1c28706913739dec8e9a89cbcd
diff --git a/dev-games/ode/ode-0.11.1.ebuild b/dev-games/ode/ode-0.11.1.ebuild
deleted file mode 100644
index 03338b82af9b..000000000000
--- a/dev-games/ode/ode-0.11.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Open Dynamics Engine SDK"
-HOMEPAGE="http://ode.org/"
-SRC_URI="mirror://sourceforge/opende/${P}.tar.bz2"
-
-LICENSE="|| ( LGPL-2.1 BSD )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc double-precision examples gyroscopic static-libs"
-
-RDEPEND="
-	examples? (
-		virtual/opengl
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( CHANGELOG.txt README.txt )
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:\$.*/drawstuff/textures:/usr/share/doc/${PF}/examples:" \
-		drawstuff/src/Makefile.in \
-		ode/demo/Makefile.in || die
-}
-
-src_configure() {
-	# use bash (bug #335760)
-	CONFIG_SHELL=/bin/bash \
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable debug asserts) \
-		$(use_enable double-precision) \
-		$(use_enable examples demos) \
-		$(use_enable gyroscopic) \
-		$(use_with examples drawstuff X11)
-}
-
-src_compile() {
-	emake
-
-	if use doc ; then
-		cd ode/doc
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-
-	if use doc ; then
-		docinto html
-		dodoc docs/*
-	fi
-
-	if use examples ; then
-		cd ode/demo || die
-
-		exeinto /usr/share/doc/${PF}/examples
-
-		local f
-		for f in *.c* ; do
-			doexe .libs/${f%.*}
-		done
-
-		cd ../.. || die
-
-		doexe drawstuff/dstest/dstest
-
-		docinto examples
-		dodoc ode/demo/*.{c,cpp,h} \
-			drawstuff/textures/*.ppm \
-			drawstuff/dstest/dstest.cpp \
-			drawstuff/src/{drawstuff.cpp,internal.h,x11.cpp}
-	fi
-}
diff --git a/dev-games/ode/ode-0.12.ebuild b/dev-games/ode/ode-0.12.ebuild
deleted file mode 100644
index c5e93ccbf22c..000000000000
--- a/dev-games/ode/ode-0.12.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Open Dynamics Engine SDK"
-HOMEPAGE="http://ode.org/"
-SRC_URI="mirror://sourceforge/opende/${P}.tar.bz2"
-
-LICENSE="|| ( LGPL-2.1 BSD )"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc double-precision examples gyroscopic static-libs"
-
-RDEPEND="
-	examples? (
-		virtual/opengl
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( CHANGELOG.txt README.txt )
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:\$.*/drawstuff/textures:/usr/share/doc/${PF}/examples:" \
-		drawstuff/src/Makefile.in \
-		ode/demo/Makefile.in || die
-}
-
-src_configure() {
-	# use bash (bug #335760)
-	CONFIG_SHELL=/bin/bash \
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable debug asserts) \
-		$(use_enable double-precision) \
-		$(use_enable examples demos) \
-		$(use_enable gyroscopic) \
-		$(use_with examples drawstuff X11)
-}
-
-src_compile() {
-	emake
-
-	if use doc ; then
-		cd ode/doc || die
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-
-	if use doc ; then
-		docinto html
-		dodoc docs/*
-	fi
-
-	if use examples ; then
-		cd ode/demo || die
-
-		exeinto /usr/share/doc/${PF}/examples
-
-		local f
-		for f in *.c* ; do
-			doexe .libs/${f%.*}
-		done
-
-		cd ../.. || die
-
-		doexe drawstuff/dstest/dstest
-		docinto examples
-		dodoc ode/demo/*.{c,cpp,h} \
-			drawstuff/textures/*.ppm \
-			drawstuff/dstest/dstest.cpp \
-			drawstuff/src/{drawstuff.cpp,internal.h,x11.cpp}
-	fi
-}
diff --git a/dev-games/openscenegraph-openmw/Manifest b/dev-games/openscenegraph-openmw/Manifest
index 2e8eac014c91..e76ffdac2b15 100644
--- a/dev-games/openscenegraph-openmw/Manifest
+++ b/dev-games/openscenegraph-openmw/Manifest
@@ -4,5 +4,4 @@ AUX openscenegraph-3.6.3-docdir.patch 2991 BLAKE2B 9d2d3bab0d8956f66b4b23a112dbd
 AUX openscenegraph-3.6.5-cmake_lua_version.patch 440 BLAKE2B 51a35309b01a096f9423ff64e66d62f99d3e26bd898db0b53c135dc99318b236a1b129211f51de9b1a29d054e0810aa4ff2a7c307dc4b4a606eb4075a60748d9 SHA512 a41c7a65b1cfd0dabc080f509cf288f575b3ec5d7666a4a889a8c3156e9d32559e1f802e23783c5c70376c82a24dd87813e9bfde0876085e0e3967b47852059a
 DIST openscenegraph-openmw-3.6_p20211017.tar.gz 5788414 BLAKE2B d5ec3c7834bc8138b417d9bf8d92dde201a94f0158560aca477755752fd886378bfdffbd8c2e878ec1c6d35b572a60368c09695a93be9d83e26712de176b6824 SHA512 8985c6abedf2cbbf524aacc4f51e0217a8bd5eb17bae04774afc960b5cf21a6fb22941e08efcbd37e538c3e44cb044ca5cfa02380a75b4c87fe606c6fdfa8155
 EBUILD openscenegraph-openmw-3.6_p20211017-r1.ebuild 4446 BLAKE2B 375282d25f6c7c9dc41b2e742d9d7fa9f261d68f0de64178fa1fa756150c28975011923bb8c7e880fa847043f1891d43f6629c8a2fec48f113a96b9e60deac1a SHA512 fe793c2cd75312899ba539d7e78bc231d7c57338ac9b757236e69f62b712c4e41ac4395a7fc416ab07e8cc77df4c5e0e9e194a942e117809a2249c533e2fd2b9
-EBUILD openscenegraph-openmw-3.6_p20211017.ebuild 4397 BLAKE2B afab21c4ad17e418478b7c3198e04522af21d200e0775806332672c4056d46c367cc6a6c8fde6d6db14061374d7bd20b339df60fe4a630b63b456ee11880d4a2 SHA512 6129ed3a0c787ea8fa4a22aebbb329b627bd7da42696bafe5de517f54fe49652e551b926196673df319ff7760edacceb0a53a87d2d2de615c6820f2a0a189408
 MISC metadata.xml 2088 BLAKE2B 8a6d83cb201e765310d776e4fae427d16f611cd2800c1d9bb3a315cbf3e37f21eea39604730405f18732203b509ab6f9ccde4c9ae54349c0f1be7b228fd8c44f SHA512 8e0b6cc0489b1651c7e0d67af7cf8e31da2916b3df6e27253beddb5cf0a8bb94224611b559c6ef3a52297964b9258de8f2fac72690aa7894c797cedab28031cd
diff --git a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017.ebuild b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017.ebuild
deleted file mode 100644
index 15ae49afe64a..000000000000
--- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 )
-
-WX_GTK_VER="3.0-gtk3"
-inherit cmake flag-o-matic lua-single wxwidgets
-
-MY_COMMIT="bbe61c3bc510a4f5bb4aea21cce506519c2d24e6"
-
-DESCRIPTION="OpenMW-specific fork of OpenSceneGraph"
-HOMEPAGE="https://github.com/OpenMW/osg"
-SRC_URI="https://github.com/OpenMW/osg/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/osg-${MY_COMMIT}"
-
-LICENSE="wxWinLL-3 LGPL-2.1"
-SLOT="0/162" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="
-	+collada curl dicom debug doc egl examples +ffmpeg fltk fox gdal
-	gif glut gstreamer +jpeg las lua openexr openinventor osgapps pdf +png
-	+sdl sdl2 +svg tiff +truetype vnc wxwidgets xrandr +zlib
-"
-
-REQUIRED_USE="
-	dicom? ( zlib )
-	lua? ( ${LUA_REQUIRED_USE} )
-	openexr? ( zlib )
-	sdl2? ( sdl )
-"
-
-# TODO: FBX, GTA, NVTT, OpenVRML, Performer
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	!dev-games/openscenegraph
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/mesa[egl(+)?]
-	virtual/glu
-	virtual/opengl
-	x11-libs/libSM
-	x11-libs/libXext
-	collada? ( dev-libs/collada-dom:= )
-	curl? ( net-misc/curl )
-	examples? (
-		fltk? ( x11-libs/fltk:1[opengl] )
-		fox? ( x11-libs/fox:1.6[opengl] )
-		glut? ( media-libs/freeglut )
-		sdl2? ( media-libs/libsdl2 )
-		wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
-	)
-	ffmpeg? ( media-video/ffmpeg:0= )
-	gdal? ( sci-libs/gdal:= )
-	gif? ( media-libs/giflib:= )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jpeg? ( virtual/jpeg:0 )
-	las? ( >=sci-geosciences/liblas-1.8.0 )
-	lua? ( ${LUA_DEPS} )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
-	openinventor? ( media-libs/coin )
-	pdf? ( app-text/poppler:=[cairo] )
-	png? ( media-libs/libpng:0= )
-	sdl? ( media-libs/libsdl )
-	svg? (
-		gnome-base/librsvg:2
-		x11-libs/cairo
-	)
-	tiff? ( media-libs/tiff:0 )
-	truetype? ( media-libs/freetype:2 )
-	vnc? ( net-libs/libvncserver )
-	xrandr? ( x11-libs/libXrandr )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/openscenegraph-3.6.3-cmake.patch
-	"${FILESDIR}"/openscenegraph-3.6.3-docdir.patch
-	"${FILESDIR}"/openscenegraph-3.6.5-cmake_lua_version.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_configure() {
-	if use examples && use wxwidgets; then
-		setup-wxwidgets unicode
-	fi
-
-	# Needed by FFmpeg
-	append-cppflags -D__STDC_CONSTANT_MACROS
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DDYNAMIC_OPENSCENEGRAPH=ON
-		-DLIB_POSTFIX=${libdir/lib}
-		-DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3
-		$(cmake_use_find_package collada COLLADA)
-		$(cmake_use_find_package curl CURL)
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		$(cmake_use_find_package dicom DCMTK)
-		$(cmake_use_find_package egl EGL)
-		-DBUILD_OSG_EXAMPLES=$(usex examples)
-		$(cmake_use_find_package ffmpeg FFmpeg)
-		$(cmake_use_find_package gdal GDAL)
-		$(cmake_use_find_package gif GIFLIB)
-		$(cmake_use_find_package gstreamer GLIB)
-		$(cmake_use_find_package gstreamer GStreamer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=ON
-		$(cmake_use_find_package jpeg JPEG)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
-		$(cmake_use_find_package las LIBLAS)
-		$(cmake_use_find_package lua Lua)
-		-DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=ON
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package openinventor Inventor)
-		-DBUILD_OSG_APPLICATIONS=$(usex osgapps)
-		$(cmake_use_find_package pdf Poppler-glib)
-		$(cmake_use_find_package png PNG)
-		$(cmake_use_find_package sdl SDL)
-		$(cmake_use_find_package sdl2 SDL2)
-		$(cmake_use_find_package svg RSVG)
-		$(cmake_use_find_package tiff TIFF)
-		$(cmake_use_find_package truetype Freetype)
-		$(cmake_use_find_package vnc LibVNCServer)
-		-DOSGVIEWER_USE_XRANDR=$(usex xrandr)
-		$(cmake_use_find_package zlib ZLIB)
-		-DOSG_USE_LOCAL_LUA_SOURCE=OFF
-		-DCMAKE_RELWITHDEBINFO_POSTFIX=
-	)
-
-	if use examples; then
-		mycmakeargs+=(
-			$(cmake_use_find_package fltk FLTK)
-			$(cmake_use_find_package fox FOX)
-			$(cmake_use_find_package glut GLUT)
-			$(cmake_use_find_package wxwidgets wxWidgets)
-		)
-	fi
-
-	if use lua; then
-		mycmakeargs+=(
-			-DLUA_VERSION="$(lua_get_version)"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc_openscenegraph doc_openthreads
-}
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index 03436147875c..07cc07de73c3 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -4,7 +4,5 @@ AUX openscenegraph-3.6.5-cmake_lua_version.patch 440 BLAKE2B 51a35309b01a096f942
 AUX openscenegraph-3.6.5-openexr3.patch 2014 BLAKE2B ea9d75986ea68519ca9d5dab066273cb8a5eb8a492c96131240d023660c939d948276c459a617413ba55b80767a945bfec038ac4ada7ca6f46185aeccdc949a4 SHA512 6cd446c69d99b68da6bf39862cdc81d51be534ed35cea9f2858dc7771dd189a9ee5f5c1f76ea1247680b03eff5b7ec3f2331c2e9505c17d5a6a3f3cac4d2ed1e
 AUX openscenegraph-3.6.5-use_boost_asio.patch 6995 BLAKE2B 0b0c0af9980b59e1cfd4cc5256720d0e69d5e3a65173c9364036e42efa34377beb00811fc4a0aee0cead870abe0c33feaaebe57c22cbefac43d4dcf65a1d19e1 SHA512 fa7c702eaf69c7b7890cf44e5293f9c8ea73ac441af1e4573dadd62f3ca797ccbbc2fbafd8c946a936192f7331fa16d8d4247de8b657db77791d5137207c23b6
 DIST OpenSceneGraph-3.6.5.tar.gz 5780762 BLAKE2B 31ebeeae94eb6aff043788313946d5c08886f97d97cd5796e600918e137ef7f06839206b79b2f5649aac7f34037d4d79e18a5638152e150de931b7f7a7d3c38b SHA512 7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b
-EBUILD openscenegraph-3.6.5-r101.ebuild 4242 BLAKE2B 678e3f538596a337bd4155770df526481c282bb1879e2a396d68603184795918cb7f2f6781ba5f62dd8447de26e48e13225456c4a5a53d7e4737ba016c1a5d62 SHA512 b3cf5a83ece032638e6afc2144ac97542e8e7575c4f985c7cde99e7d3f3ac5d5d63105310a3f59d801d348c8b3cda66ecb7467db0ecf05c2f4572f1e22743e5d
-EBUILD openscenegraph-3.6.5-r110.ebuild 4320 BLAKE2B 5897bfe924eb829b3ee64bfcba5ccd8ff26a4079270c5bcff2f004fc14fd07d957c312143feb2afc7915cccc0f048940afac28feb70f7b61efd5c65e90296157 SHA512 35a4645a916096f148639549406e69675fa6e874845e0e8b8cf4631270527236b21e7539238027e28e2ca211a7c07758faadd2a3ad1b2537160c6cb84cb80839
 EBUILD openscenegraph-3.6.5-r112.ebuild 4359 BLAKE2B 7729f57c54b8aa785388641a192a02adf2ffb6cf52be7c4fe08807e699ac663b0be5621b6a1c12dadc5a7ba199cfbf86707e523327d056449d878657771137ca SHA512 df653429e25a7919bf013021eed85fed5ab8243990d5ff1b7fcea383f1077a28e0aa84bc331949cd9a6582d80c162e70c03f8c37d51edb2c52e2e5ac1e648606
 MISC metadata.xml 1866 BLAKE2B 9165a16faa78d3298365ca0d0814f7e4f1a1f8d514d7dfb1dbe613f7ab2212e30ae7e8518dc430d2626967be779330179023f445d9214ac4b2062a08df1298b2 SHA512 7b9abb010e2021656bb4e48c84bd8d0879606f05ce9213323159e6f415cea1226cd6a3c2b7290dcb68c1a99dafce5295fd18b4ad542e2d888ac8d06ed0c4f03e
diff --git a/dev-games/openscenegraph/openscenegraph-3.6.5-r101.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.5-r101.ebuild
deleted file mode 100644
index ad9c80b0d43f..000000000000
--- a/dev-games/openscenegraph/openscenegraph-3.6.5-r101.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1,2} )
-
-MY_PN="OpenSceneGraph"
-MY_P=${MY_PN}-${PV}
-WX_GTK_VER="3.0-gtk3"
-inherit cmake flag-o-matic lua-single wxwidgets
-
-DESCRIPTION="Open source high performance 3D graphics toolkit"
-HOMEPAGE="http://www.openscenegraph.org/"
-SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="wxWinLL-3 LGPL-2.1"
-SLOT="0/161" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
-KEYWORDS="amd64 ~arm64 ~hppa ppc64 x86"
-IUSE="curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut
-gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2
-svg tiff truetype vnc wxwidgets xrandr +zlib"
-
-REQUIRED_USE="dicom? ( zlib )
-	lua? ( ${LUA_REQUIRED_USE} )
-	openexr? ( zlib )
-	sdl2? ( sdl )"
-
-# TODO: COLLADA, FBX, GTA, NVTT, OpenVRML, Performer
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	media-libs/mesa[egl(+)?]
-	virtual/glu
-	virtual/opengl
-	x11-libs/libSM
-	x11-libs/libXext
-	curl? ( net-misc/curl )
-	examples? (
-		fltk? ( x11-libs/fltk:1[opengl] )
-		fox? ( x11-libs/fox:1.6[opengl] )
-		glut? ( media-libs/freeglut )
-		sdl2? ( media-libs/libsdl2 )
-		wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
-	)
-	ffmpeg? ( media-video/ffmpeg:0= )
-	gdal? ( sci-libs/gdal:= )
-	gif? ( media-libs/giflib:= )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jpeg? ( virtual/jpeg:0 )
-	las? ( >=sci-geosciences/liblas-1.8.0 )
-	lua? ( ${LUA_DEPS} )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
-	openinventor? ( media-libs/coin )
-	pdf? ( app-text/poppler[cairo] )
-	png? ( media-libs/libpng:0= )
-	sdl? ( media-libs/libsdl )
-	svg? (
-		gnome-base/librsvg
-		x11-libs/cairo
-	)
-	tiff? ( media-libs/tiff:0 )
-	truetype? ( media-libs/freetype:2 )
-	vnc? ( net-libs/libvncserver )
-	xrandr? ( x11-libs/libXrandr )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.37.0:*
-	x11-base/xorg-proto
-"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.6.3-cmake.patch
-	"${FILESDIR}"/${PN}-3.6.3-docdir.patch
-	"${FILESDIR}"/${PN}-3.6.5-use_boost_asio.patch
-	"${FILESDIR}"/${PN}-3.6.5-cmake_lua_version.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_configure() {
-	if use examples && use wxwidgets; then
-		setup-wxwidgets unicode
-	fi
-
-	# Needed by FFmpeg
-	append-cppflags -D__STDC_CONSTANT_MACROS
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DDYNAMIC_OPENSCENEGRAPH=ON
-		-DLIB_POSTFIX=${libdir/lib}
-		-DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3
-		$(cmake_use_find_package curl CURL)
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		$(cmake_use_find_package dicom DCMTK)
-		$(cmake_use_find_package egl EGL)
-		-DBUILD_OSG_EXAMPLES=$(usex examples)
-		$(cmake_use_find_package ffmpeg FFmpeg)
-		$(cmake_use_find_package gdal GDAL)
-		$(cmake_use_find_package gif GIFLIB)
-		$(cmake_use_find_package gstreamer GLIB)
-		$(cmake_use_find_package gstreamer GStreamer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=ON
-		$(cmake_use_find_package jpeg JPEG)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
-		$(cmake_use_find_package las LIBLAS)
-		$(cmake_use_find_package lua Lua)
-		-DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=ON
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package openinventor Inventor)
-		-DBUILD_OSG_APPLICATIONS=$(usex osgapps)
-		$(cmake_use_find_package pdf Poppler-glib)
-		$(cmake_use_find_package png PNG)
-		$(cmake_use_find_package sdl SDL)
-		$(cmake_use_find_package sdl2 SDL2)
-		$(cmake_use_find_package svg RSVG)
-		$(cmake_use_find_package tiff TIFF)
-		$(cmake_use_find_package truetype Freetype)
-		$(cmake_use_find_package vnc LibVNCServer)
-		-DOSGVIEWER_USE_XRANDR=$(usex xrandr)
-		$(cmake_use_find_package zlib ZLIB)
-		-DOSG_USE_LOCAL_LUA_SOURCE=OFF
-	)
-	if use examples; then
-		mycmakeargs+=(
-			$(cmake_use_find_package fltk FLTK)
-			$(cmake_use_find_package fox FOX)
-			$(cmake_use_find_package glut GLUT)
-			$(cmake_use_find_package wxwidgets wxWidgets)
-		)
-	fi
-	if use lua; then
-		mycmakeargs+=(
-			-DLUA_VERSION="$(lua_get_version)"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc_openscenegraph doc_openthreads
-}
diff --git a/dev-games/openscenegraph/openscenegraph-3.6.5-r110.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.5-r110.ebuild
deleted file mode 100644
index f9972d280224..000000000000
--- a/dev-games/openscenegraph/openscenegraph-3.6.5-r110.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 )
-
-WX_GTK_VER="3.0-gtk3"
-inherit cmake flag-o-matic lua-single wxwidgets
-
-MY_PN="OpenSceneGraph"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Open source high performance 3D graphics toolkit"
-HOMEPAGE="http://www.openscenegraph.org/"
-SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${MY_P}"
-
-LICENSE="wxWinLL-3 LGPL-2.1"
-SLOT="0/161" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~x86"
-IUSE="
-	collada curl dicom debug doc egl examples ffmpeg fltk fox gdal
-	gif glut gstreamer jpeg las lua openexr openinventor osgapps pdf png
-	sdl sdl2 svg tiff truetype vnc wxwidgets xrandr +zlib
-"
-
-REQUIRED_USE="
-	dicom? ( zlib )
-	lua? ( ${LUA_REQUIRED_USE} )
-	openexr? ( zlib )
-	sdl2? ( sdl )
-"
-
-# TODO: FBX, GTA, NVTT, OpenVRML, Performer
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	media-libs/mesa[egl(+)?]
-	virtual/glu
-	virtual/opengl
-	x11-libs/libSM
-	x11-libs/libXext
-	collada? ( dev-libs/collada-dom:= )
-	curl? ( net-misc/curl )
-	examples? (
-		fltk? ( x11-libs/fltk:1[opengl] )
-		fox? ( x11-libs/fox:1.6[opengl] )
-		glut? ( media-libs/freeglut )
-		sdl2? ( media-libs/libsdl2 )
-		wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
-	)
-	ffmpeg? ( media-video/ffmpeg:0= )
-	gdal? ( sci-libs/gdal:= )
-	gif? ( media-libs/giflib:= )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jpeg? ( virtual/jpeg:0 )
-	las? ( >=sci-geosciences/liblas-1.8.0 )
-	lua? ( ${LUA_DEPS} )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
-	openinventor? ( media-libs/coin )
-	pdf? ( app-text/poppler[cairo] )
-	png? ( media-libs/libpng:0= )
-	sdl? ( media-libs/libsdl )
-	svg? (
-		gnome-base/librsvg
-		x11-libs/cairo
-	)
-	tiff? ( media-libs/tiff:0 )
-	truetype? ( media-libs/freetype:2 )
-	vnc? ( net-libs/libvncserver )
-	xrandr? ( x11-libs/libXrandr )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.6.3-cmake.patch
-	"${FILESDIR}"/${PN}-3.6.3-docdir.patch
-	"${FILESDIR}"/${PN}-3.6.5-use_boost_asio.patch
-	"${FILESDIR}"/${PN}-3.6.5-cmake_lua_version.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_configure() {
-	if use examples && use wxwidgets; then
-		setup-wxwidgets unicode
-	fi
-
-	# Needed by FFmpeg
-	append-cppflags -D__STDC_CONSTANT_MACROS
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DDYNAMIC_OPENSCENEGRAPH=ON
-		-DLIB_POSTFIX=${libdir/lib}
-		-DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3
-		$(cmake_use_find_package collada COLLADA)
-		$(cmake_use_find_package curl CURL)
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		$(cmake_use_find_package dicom DCMTK)
-		$(cmake_use_find_package egl EGL)
-		-DBUILD_OSG_EXAMPLES=$(usex examples)
-		$(cmake_use_find_package ffmpeg FFmpeg)
-		$(cmake_use_find_package gdal GDAL)
-		$(cmake_use_find_package gif GIFLIB)
-		$(cmake_use_find_package gstreamer GLIB)
-		$(cmake_use_find_package gstreamer GStreamer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=ON
-		$(cmake_use_find_package jpeg JPEG)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
-		$(cmake_use_find_package las LIBLAS)
-		$(cmake_use_find_package lua Lua)
-		-DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=ON
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package openinventor Inventor)
-		-DBUILD_OSG_APPLICATIONS=$(usex osgapps)
-		$(cmake_use_find_package pdf Poppler-glib)
-		$(cmake_use_find_package png PNG)
-		$(cmake_use_find_package sdl SDL)
-		$(cmake_use_find_package sdl2 SDL2)
-		$(cmake_use_find_package svg RSVG)
-		$(cmake_use_find_package tiff TIFF)
-		$(cmake_use_find_package truetype Freetype)
-		$(cmake_use_find_package vnc LibVNCServer)
-		-DOSGVIEWER_USE_XRANDR=$(usex xrandr)
-		$(cmake_use_find_package zlib ZLIB)
-		-DOSG_USE_LOCAL_LUA_SOURCE=OFF
-	)
-
-	if use examples; then
-		mycmakeargs+=(
-			$(cmake_use_find_package fltk FLTK)
-			$(cmake_use_find_package fox FOX)
-			$(cmake_use_find_package glut GLUT)
-			$(cmake_use_find_package wxwidgets wxWidgets)
-		)
-	fi
-
-	if use lua; then
-		mycmakeargs+=(
-			-DLUA_VERSION="$(lua_get_version)"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc_openscenegraph doc_openthreads
-}
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 293253a5ed8c..83bd30f2564e 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,8 +1,6 @@
 AUX simgear-2019.1.1-gdal3.patch 388 BLAKE2B 364d5f6692809c67d73a3191f387cbd9735e7183a25696e612827c1a796c872ee5d4a09085fa8a24a0fd524725fdeca9303c5c5ee71981de054ab5a8833d5285 SHA512 44d59cf379c8c7d82b87a31a4d29dd02aaa865c37f12c7e565c641bf3fb14497f4d63b69bbc973551b53d74919ddce5495e3f29b598ed87a6a4565e22ec81667
 AUX simgear-2020.1.2-do-not-assume-libc++-clang.patch 629 BLAKE2B 1ce89c84f6ac94d7f29a3d9fc8b66cd972dcca809188ac487f7b1d961b9bad6ecdaf31882e5a0beb239cf2fb0d946bff7c5838dca7ac7872cbab22480a7b7aed SHA512 a294c55b84331bdabdea5d950b5a9a53c17eb4b949a863cb0b77c9dd585cb6a43b74f86323e1cc4de48564e064927cd49d7dec032361e50f75bfc82351319a26
-DIST simgear-2020.3.12.tar.bz2 1415062 BLAKE2B bed00dabb8d2ac937cb2fa7a8782c32568dc106d857dd2e9a7f3d2c99ad1372ffcd3c571b899920122e711ce1e561a9895762fb199f1cac947bb68769066b555 SHA512 2292c5c43b485fdf4b814b25eae8caa2ed16e043a159328aa5e35a27f9a4fd250219e8b506da1361916bd1d314bb857d3bd1343b1b6b34890bf06c63705c8dbc
 DIST simgear-2020.3.13.tar.bz2 1415729 BLAKE2B ed8a5daddba84811318ed92acd6a998785c4159b7e9bf39245e3fc0863e75ae8475283e123c7b185cae8d1113b1fc860758f347f3e19c2749322b280445a2a9f SHA512 1128c6026cebc902f1d411a6013b3d406664ebae5b209248d15c55895823715066d18ca442af2642577d69c6f68d6d02daf64ebbc9bfe43142aae30b9ce1ae62
-EBUILD simgear-2020.3.12.ebuild 1493 BLAKE2B 885613ee8ca30daf49c3116f985973c6744b48f2cab6453286a3e311907ec19d2e2808b8fb5aa00ec8951a6966b1e39504756ed54082ad36c568c6032b2a9ec0 SHA512 74ecfa4e2ce17b48bbd6435508a9e5208bae72473e9c5b339e7182419b526898e0a62c156be60f2b85dd58b2d6b8387f7511f9b83c292c6699575264e70b72c8
 EBUILD simgear-2020.3.13.ebuild 1493 BLAKE2B 96be08e57025b2c2ca86f02f1bfcbd7c6ccc98cec604dcf5a15b38199398800594b2bc0f2d5fc1ecd3ab409c4602e576c2bd956509222e91f21de8442783273c SHA512 5f1412e620d160dd1ccd0315e1398d5f2159f22ea7f9abecbae4e5a15641127342b049f10b3994cbb8178a39b2626b9c9c387b55118a00b41e6e140f71f86577
 EBUILD simgear-9999.ebuild 1529 BLAKE2B 109080b15c86f1bec2480e52e9abddc8e74764a6d42f41edfa4ebc7cf995e1e8fa8292534926e857ee7749ae0b5ce19d369478c654c336dc437c5d2bb11c29f8 SHA512 d28d6376037ed605586ae09e9961f0584bb2b2d04a44aea5268d455e2180a649f98c90f15ff8e051a3483f36495e5aad48468c7ca54fb7b969d82de53c3e7d6e
 MISC metadata.xml 912 BLAKE2B 859be3b8c4eaaa3fb0937ec479e92b38bc6a025409f24bd537f07f2181d79ab68acdc458b21dd5c6c3845b4e18ebef92576e7826496ecee350e57737c1787ea4 SHA512 aac6ae0cb9916ea5f25197e44b1fab54e1b525150e47af4bb932c14b6dc97bfcdc799e43e245d6ddf3bd503556267beffad3dc8967978e91834f61c487d5ff82
diff --git a/dev-games/simgear/simgear-2020.3.12.ebuild b/dev-games/simgear/simgear-2020.3.12.ebuild
deleted file mode 100644
index 03d49387c0ed..000000000000
--- a/dev-games/simgear/simgear-2020.3.12.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="Development library for simulation games"
-HOMEPAGE="https://www.flightgear.org/"
-SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="cpu_flags_x86_sse2 +dns debug gdal openmp subversion test"
-RESTRICT="!test? ( test )"
-
-# TODO aeonwave
-COMMON_DEPEND="
-	app-arch/xz-utils
-	dev-libs/expat
-	dev-games/openscenegraph
-	media-libs/openal
-	net-misc/curl
-	sys-libs/zlib
-	virtual/opengl
-	dns? ( net-libs/udns )
-	gdal? ( sci-libs/gdal )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.44
-"
-RDEPEND="${COMMON_DEPEND}
-	subversion? ( dev-vcs/subversion )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2019.1.1-gdal3.patch"
-	"${FILESDIR}/${PN}-2020.1.2-do-not-assume-libc++-clang.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DNS=$(usex dns)
-		-DENABLE_GDAL=$(usex gdal)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PKGUTIL=ON
-		-DENABLE_RTI=OFF
-		-DENABLE_SIMD=$(usex cpu_flags_x86_sse2)
-		-DENABLE_SOUND=ON
-		-DENABLE_TESTS=$(usex test)
-		-DSIMGEAR_HEADLESS=OFF
-		-DSIMGEAR_SHARED=ON
-		-DSYSTEM_EXPAT=ON
-		-DSYSTEM_UDNS=ON
-		-DUSE_AEONWAVE=OFF
-		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
-	)
-	cmake_src_configure
-}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index f045f046dfe8..1114674ed9cb 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest
index 40ebca6945aa..8885b4e3a780 100644
--- a/dev-java/byte-buddy/Manifest
+++ b/dev-java/byte-buddy/Manifest
@@ -1,5 +1,7 @@
 DIST byte-buddy-1.12.10-sources.jar 1331398 BLAKE2B 8732ac81514de40d3d2ffd67ddca05ab9b8a5d0a7f240ee4591fd02b41f410f9e834f389aa898829fbae6082e14a090f87052f537b2b6293c7f8f98d4a5d0583 SHA512 15cb4330598d9259afa29aac0317f8e0e003eb76fb26052bba0714ad30453db721938be7d46fcc6a0c7bbe124bffe68dfee6fcf11a3e4030e99ef01d0ae3d461
 DIST byte-buddy-1.12.12.tar.gz 149937318 BLAKE2B 1a1bd0de97b47ace4c64649da3ae80dcb421a4d46e9b4f66e121accad94a99a2b81fa9aeaca99ae14cf1ef56feff5248d5700d6b056d490563bbc7ae9f07ace9 SHA512 bd8dc5b86ce456d5a907dd23643233bb001c15df5419aeed177d3b4f8054ab172d13244d0b3fef734e8232dfdd9339745d8112fa69e0be566b62459c198bf67a
+DIST byte-buddy-1.12.13.tar.gz 1721038 BLAKE2B 60aadbbb3b56e5ac2ecc2bb162653b769f4d4b913bd675457ce2fbf12a5777addc4beb2bb2e347d5956dbf1fbe6a6dfce078a29c53b1f1e2a60585670897d4ee SHA512 88c221d0dccb248683069070e498c5d4320f4fce059c45f460e04fbd86c2c596c18a4c7f4e9b3a0480eaf96d93593d1f1af87d894a7c4b3d73511e88a95f4e92
 EBUILD byte-buddy-1.12.10.ebuild 1375 BLAKE2B 3d215a54ae80086b7e1a3f1a523546131c3a24db57106d13ef3d7f010a78e6a316bd01e10619c3b00c5a8fea84cad6cd942bca132b5e5fee9716d4645655fb0f SHA512 8e299b9c4ca17244c695e69ea50e7e40dbe6ef3eae116363c080ca4c3d4cae01411a1af9eb253973be3b50c1d51d78eb33d2ecc5c518a6a93ff21b93ac8c7d22
 EBUILD byte-buddy-1.12.12.ebuild 6645 BLAKE2B 1c791641004695ae56721b0b34d190477fbb08bb0eadb2d5688d495f2f57bcf2ccb1d9ebba6d77a0efcd252bb00ae875f3b3398f047bd678e00c49e63f0360be SHA512 a47a9b13cc084e550255fa6cd5afe34f2c8ce6ad5312419d90fa917596e5ee61e99d4e5c9697b762683e2987a02e19eb99e5de2f44afc069a25a22b353ab6a02
+EBUILD byte-buddy-1.12.13.ebuild 4579 BLAKE2B a9b851edb04f778f5085c998900fd48480d239096e593f36808c0513f764df9fbf3c0f992115beba81abf4a97da9b82d3b5afed870da6ba98f2cf61c03a21468 SHA512 7edd44092b056245708a072c19207480a63234f6670a1241fc1d19d43499db42f99c696247ae16a489ffd5a6c09d6107c7039911490b326eb2bff20cccfd3eb5
 MISC metadata.xml 440 BLAKE2B ef73e69de33dc6bbea38c81b8744fad5ce4764644d9cc6168d7c0f175856e30c3a577ffc597f25f8caf26bacfd80663b55eddde047a346fcb582d883269233b9 SHA512 b27c92e768c2783c90c8b4693c3265a9533a09abe76b2b3bd54e3865d270eed91414fcd89513bc30feb0243ea21f63d354b907b74eb18e98f899811101a6c956
diff --git a/dev-java/byte-buddy/byte-buddy-1.12.13.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.13.ebuild
new file mode 100644
index 000000000000..c5c66b0dfca9
--- /dev/null
+++ b/dev-java/byte-buddy/byte-buddy-1.12.13.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/raphw/byte-buddy/archive/byte-buddy-1.12.13.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.13.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="net.bytebuddy:byte-buddy-agent:1.12.13"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Offers convenience for attaching an agent to the local or a remote VM"
+HOMEPAGE="https://bytebuddy.net"
+SRC_URI="https://github.com/raphw/${PN}/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	dev-java/asm:9
+	dev-java/findbugs-annotations:0
+	dev-java/jna:4
+	dev-java/jsr305:0
+	test? (
+		dev-java/mockito:4
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_CLASSPATH_EXTRA="
+	asm-9
+	findbugs-annotations
+	jsr305
+	jna-4
+"
+
+src_prepare() {
+	default
+	# https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.12/byte-buddy-agent/pom.xml#L132-L165
+	cat > byte-buddy-agent/src/main/java/module-info.java <<-EOF
+		module net.bytebuddy.agent {
+			requires java.instrument;
+			requires static jdk.attach;
+			requires static com.sun.jna;
+			requires static com.sun.jna.platform;
+			requires java.base;
+			exports net.bytebuddy.agent;
+			exports net.bytebuddy.agent.utility.nullability;
+		}
+	EOF
+
+	sed \
+		-e 's:verifyZeroInteractions:verifyNoInteractions:g' \
+		-i byte-buddy-dep/src/test/java/net/bytebuddy/*.java \
+		-i byte-buddy-dep/src/test/java/net/bytebuddy/*/*Test.java \
+		-i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*Test.java \
+		-i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*/*Test.java \
+		-i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*/*/*Test.java \
+		|| die
+}
+
+src_compile() {
+	einfo "Compiling byte-buddy-agent.jar"
+	JAVA_SRC_DIR="byte-buddy-agent/src/main/java"
+	JAVA_RESOURCE_DIRS="byte-buddy-agent/src/main/resources"
+	JAVA_JAR_FILENAME="byte-buddy-agent.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-agent.jar"
+	rm -r target || die
+
+# For pkgdiff to compare the content of module-info.class
+#	mkdir -p META-INF/versions/9 || die
+#	cp target/classes/module-info.class META-INF/versions/9/ || die
+#	jar -uf byte-buddy.jar -C . META-INF/versions/9/module-info.class || die
+
+	einfo "Compiling byte-buddy-dep.jar"
+	JAVA_SRC_DIR="byte-buddy-dep/src/main/java"
+	JAVA_RESOURCE_DIRS=()
+	JAVA_JAR_FILENAME="byte-buddy-dep.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-dep.jar"
+	rm -r target || die
+
+	if use doc; then
+		einfo "Compiling javadocs"
+		JAVA_SRC_DIR=(
+			"byte-buddy-agent/src/main/java"
+			"byte-buddy-dep/src/main/java"
+		)
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_test() {
+	JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4"
+
+	# einfo "Setting -Djava.library.path"
+	# This would work only after manually adding libjnidispatch.so to /usr/share/jna-4/lib/jna.jar,
+	# done with ( jar -uf /usr/share/jna-4/lib/jna.jar -C . com/sun/jna/linux-x86-64/libjnidispatch )
+#	JAVA_TEST_EXTRA_ARGS=( -Djava.library.path+="$(java-config -i jna-4)" com.sun.jna.Native )
+	# Otherwise fails with:
+	# Exception in thread "main" java.lang.UnsatisfiedLinkError: Native library (com/sun/jna/linux-x86-64/libjnidispatch.so) not found in resource path
+
+	einfo "Testing byte-buddy-agent"
+	JAVA_TEST_SRC_DIR="byte-buddy-agent/src/test/java"
+	# Native library (com/sun/jna/linux-x86-64/libjnidispatch.so) not found in resource path
+	JAVA_TEST_EXCLUDES=(
+		net.bytebuddy.agent.VirtualMachineAttachmentTest
+	)
+	java-pkg-simple_src_test
+
+	einfo "Testing byte-buddy-dep"
+	JAVA_TEST_SRC_DIR="byte-buddy-dep/src/test/java"
+	JAVA_TEST_RESOURCE_DIRS=(
+		byte-buddy-dep/src/test/resources
+		byte-buddy-dep/src/test/precompiled*
+	)
+
+	# what "mvn test" does with java 17 is:
+	# Tests run: 9855, Failures: 0, Errors: 0, Skipped: 0
+	JAVA_TEST_EXCLUDES+=(
+		net.bytebuddy.pool.TypePoolDefaultMethodDescriptionTest	# 39 tests
+		# v1.12.13
+		net.bytebuddy.build.CachedReturnPluginTest	# 44 tests
+		net.bytebuddy.build.CachedReturnPluginOtherTest	# 4 tests 
+	)
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg_dojar "byte-buddy-agent.jar"
+	java-pkg_dojar "byte-buddy-dep.jar"
+
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+
+	if use source; then
+		java-pkg_dosrc "byte-buddy-agent/src/main/java/*"
+		java-pkg_dosrc "byte-buddy-dep/src/main/java/*"
+	fi
+}
diff --git a/dev-java/istack-commons-runtime/Manifest b/dev-java/istack-commons-runtime/Manifest
index 89c32c71ac35..bb87b5450c9d 100644
--- a/dev-java/istack-commons-runtime/Manifest
+++ b/dev-java/istack-commons-runtime/Manifest
@@ -1,3 +1,3 @@
 DIST jaxb-istack-commons-istack-commons-runtime-4.1.1.tar.gz 66161 BLAKE2B 07103ec616d23e14a5f61c4bb7ef9dce042f0df678db44f035b48c74eb7930f251d8b7fd8ce36c9bae7a7ef8ce213c62587dad2547518ba4638faf102ef651cd SHA512 b119b2c3582f5cbbd5793e0eb0a00c199c93119f3c18e34c57f8753b3a7008b9b93de58fd62df94d6cbedd698488616a80c334fda3d5038078e3858229f995cf
-EBUILD istack-commons-runtime-4.1.1-r1.ebuild 1572 BLAKE2B 56da8777f570ae2123101ea25869c161a6d3377ac34c10b1cd6586b473b8ef14e2e7de2e60304ceb74e83ffe949b83a37e0522b809d4688fd7a496d41fc132ca SHA512 c9db560d0b377c85f44a5b95cd225841f598102085a28ff5b6c5c82e12033197c1926b5086b9381df0a67c1a0363e4ee32006643ab1cae4ee6dd30a2452c0371
+EBUILD istack-commons-runtime-4.1.1-r1.ebuild 1570 BLAKE2B 529ef72f480b1aef3ef2b6fc9f935d868d6bdb4ba2031df34dc143123dc8f99a48a1a03fec90233e8f521c9ffd6edbb686a8c8f32749030cfd17df67ba5ee3e1 SHA512 1992e5db9ac255019bdb0337953706c0825230d1dd098339e914388e7846f4cb702ac4e3cc04b18bdbb76f33b6b050505a06ad10b69945cfdde02c4c86cb43da
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild b/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild
index 0d9371ac7cea..b0afba4a1024 100644
--- a/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild
+++ b/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaxb-istack-commons/archive/${PV}.tar.g
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
 
 # Compile dependencies
 # POM: runtime/pom.xml
diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest
index 75ad29369239..51d57e92955a 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,5 +1,5 @@
 DIST jakartaee-migration-1.0.0-sources.tar.gz 35116 BLAKE2B 98b587e5a51e8f3540d6f4570c60ffa5516801709e41260ac09f7fcabc9e96a3b9067e8eba6c5975c62e3c56585a1f334a21acc15627666e1616ced6f625c56f SHA512 f0c0dc5da4d3c5d4bae8fd4c3db349cb45b7c8d82ca0bb12f3c995e92d4b0893db111ab33ce812299d66904827adc91b22c49381625760fc05c1b10de76faa0c
 DIST jakartaee-migration-1.0.1-sources.tar.gz 35763 BLAKE2B 9e739668a7ebd65396960cd2447ecf2bc114cb85a2c554a17cb8478bef13f70f2fed26cc96553a22e7279dde698e1c094ca4dc7a8695ff9f82903ebe8badbd69 SHA512 6caaadfe5dcb21a859f2e401c039832b2774d8876ac724c3159b28c80a1153f7cd1c6706ba29a38d5f748cd2e55a85bd9bfecfb3a405f86aa85637ff3ca3c5f7
 EBUILD jakartaee-migration-1.0.0.ebuild 2875 BLAKE2B 5c1d22930a619cedf70f5ab662f97254d749f9e61b69cef1042cdf953ed88500760a584293f85ddfd6092e16cb5da37a6e338bd8774248a30b6a356bc1b65977 SHA512 437f3185594bcc8450f8f000ae300bd178e82a4da58cb6a30c9412e387684a50d435e026d28712d6d06c675055ea23f0fa85f9f18bc0290116a6ad8010bae1e3
-EBUILD jakartaee-migration-1.0.1.ebuild 2946 BLAKE2B 7b51890cf04d922d23ce3abe48b789175bf5f9cb92bab182d3b5b822d6732078d322f611cafc235eed5e45cdc108acb8036a86a2a371b866b462c1c654bed482 SHA512 742c0c758e91b7f03e417756b3ce49e762cf6ddd7f7b6fa913defe80af3043219852c22cca78a134d21a7c006e0079f18a52753790b65dcef938af77aea9cd9b
+EBUILD jakartaee-migration-1.0.1.ebuild 2946 BLAKE2B d6fe4116b5c7244c28d8f60ffb402a5350b0a4da24f481740bbcbea0ebb319af61afd2f5827eeff69b1425b64929e83cf3b3136af8d818a2855bf336db49a1b9 SHA512 19f136cff748996cb735841a399de38ad98e34e3699482185ffa6dca9bb51441fc340a4424031a6d1834c5df2e58c333882d7ace2b7011ae278a6fbada7dbb24
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild
index 112b36077026..8dc73b5ae0eb 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild
@@ -7,7 +7,7 @@
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.0"
+MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.1"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
index 43c0d5b2f560..f51595f56524 100644
--- a/dev-java/java-service-wrapper/Manifest
+++ b/dev-java/java-service-wrapper/Manifest
@@ -4,5 +4,5 @@ AUX java-service-wrapper-3.5.25-testsuite.patch 463 BLAKE2B aa5f7e4e298265afd227
 DIST wrapper_3.5.25_src.tar.gz 556678 BLAKE2B bead95eb2feebe0c22f8c66ca948185c320a979e498fb5156de576d443ba6e3375efb6244a66db6af101fa7dc459d983b51631fc237ad4578505be47059cf2c7 SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4
 DIST wrapper_3.5.50_src.tar.gz 779253 BLAKE2B 64863e408c2147014946f869bbd98775d1d23d4cd63ef562167f40191febf87cc72697a55fe2ec6a5d085f3df4897cc4485f4ed88a3ee3a7f7930215448972f7 SHA512 403deec1bcc70a93ce0b0749bf2d5bc27a4a540d07785bc3ac83b38257cc5e8247a784f646770c96ac318f22d30c463dafb2f002720041b93443b292d6669c09
 EBUILD java-service-wrapper-3.5.25-r2.ebuild 1407 BLAKE2B e05a6930c0ee852a43df15a7cadc1011663ab8db7849e45461a3d0fd1db43b379e254f1fcae482451a85c067eed0c851fe923c7dbd0c6785cb3adce9d92b9953 SHA512 60b08f6ce759bb8a724b1c50d5dd1e5aa8ca76ce95602dfae7c21d6567d9ff9719d5528e0d715842158f2f2f7c4f3147b7f646247cd4538e42eb0954ae98c705
-EBUILD java-service-wrapper-3.5.50.ebuild 2104 BLAKE2B ead9a776dd653f65c14088739a3e57e39cf442a785106ece1b021d53c5a58e8ee732b5d204897c157656d136dd2bb50e56795d8b309122bb1ff10f103c3829bf SHA512 92555ad47e803b6fd34f3a7de0f1e6bc8bbddb904f8615f64a7f0209fc14bbed43ed3a34a906b2678cbb696140d158053fc6146e8c1c07ae3049d9b8f0f8f75a
+EBUILD java-service-wrapper-3.5.50.ebuild 2303 BLAKE2B 2e76891b2b8e64ea7ed6d4a0b62a255c8ba85082ff3a16c825e201d7fc8a26cff16e0efee0488684e51b9839a89ddd9af118dc57805e8b17eedb14160d49c6d8 SHA512 d2ba915f2f835d66be165f6abf786ab00e4f7afca6408faa1bde38ec2ca29912ac14abbfc877db09fca5a3b454b2db6cea382af023951efd88aaaa03a15ff4aa
 MISC metadata.xml 640 BLAKE2B 1ced5abe1a0ff9b141f3a6020cd6352b02cf228524b694f36bedb7ef91a892ee471235b36e81e03fbe98eee6f28f680821b15501447b58c8788129eaf8e6b39a SHA512 4d9eb54f0328aa00380b40a0ead3fc43e552b71e8d4b5279341d5249a9615c3c161ca19295d6f586c43708f9e29aaf3799799243dd277c8822b95d7c1f82afd1
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
index 149e25fdc514..40ab4cf7bcbd 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
@@ -47,7 +47,11 @@ src_prepare() {
 	cp "${S}/src/c/Makefile-linux-armel-32.make" "${S}/src/c/Makefile-linux-arm-32.make"
 	java-pkg-2_src_prepare
 
-	# enable tests on all platforms
+	# disable tests by default (they are only enabled by default on amd64)
+	sed -e "s/\(all: init wrapper libwrapper.so\) testsuite/\1/g" \
+		-i src/c/Makefile-linux-x86-64.make || die
+
+	# re-enable tests on all platforms if requested
 	if use test; then
 		grep "testsuite_SOURCE" "src/c/Makefile-linux-x86-64.make" | tee -a src/c/Makefile-*.make
 		assert
diff --git a/dev-java/log4j-core/Manifest b/dev-java/log4j-core/Manifest
index 0434fe7d4e31..08e41750cf4d 100644
--- a/dev-java/log4j-core/Manifest
+++ b/dev-java/log4j-core/Manifest
@@ -1,5 +1,6 @@
 DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176
 DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b
 EBUILD log4j-core-2.17.2-r1.ebuild 8550 BLAKE2B d60dca70b9c62de3320543df7313ae3f1c523107f60e0a99ffaa48872058fe79054b2486936a394b665915af52464c77c83226159d7acdc42f7f703473745938 SHA512 5edfa502777e147684afc7b804b77ab7ba3c602ced5b04f501e8ce0b86f7cdb873821cff64eebdddbf44485d6c7c1d112b73a16bd0f26829bab50c06844d20b2
+EBUILD log4j-core-2.18.0-r1.ebuild 8531 BLAKE2B 9ca4ab440893e5658918c44f3c619764ccaeb9d1a5242a0a4670d0e2c4ba526b2e3793c11f59de34232b155f31d40d7e7f13530e37240beb51209b7a79d62911 SHA512 1ee8e743329fe801a4a927c3d334c30e2cb55dbbd85f2794084daf078895c0eb2a4bc5f659f2cd312752b2578f07125680f1a9381bf43040be04a46a7e854f3f
 EBUILD log4j-core-2.18.0.ebuild 8536 BLAKE2B 63be3499494c1a1066db363605a3fb4c8172c0ff9bc94cddc2275769649045c1c4dbed2994a3a8ff979bdb3186d1aecfd26fc70b40d04c1769e08c7e8a826a72 SHA512 792238501eb6d61e348701180a3d7f3d25487a2546967a315bb1d10856f102359ef9ab62e1955a88295b91f265ad078e181c368badc21a3b3246047d466a722f
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-core/log4j-core-2.18.0-r1.ebuild b/dev-java/log4j-core/log4j-core-2.18.0-r1.ebuild
new file mode 100644
index 000000000000..139a53d77109
--- /dev/null
+++ b/dev-java/log4j-core/log4j-core-2.18.0-r1.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom log4j-core/pom.xml --download-uri mirror://apache/logging/log4j/2.18.0/apache-log4j-2.18.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-core-2.18.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.logging.log4j:log4j-core:2.18.0"
+# JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The Apache Log4j Implementation"
+HOMEPAGE="https://logging.apache.org/log4j/2.x/"
+SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# We don't have junit-vintage and junit-jupiter
+RESTRICT="test"
+
+# Common dependencies
+# POM: ${PN}/pom.xml
+# com.conversantmedia:disruptor:1.2.15 -> >=dev-java/conversant-disruptor-1.2.19:0
+# com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0
+# com.fasterxml.jackson.core:jackson-databind:2.13.3 -> >=dev-java/jackson-databind-2.13.3:0
+# com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.3 -> >=dev-java/jackson-dataformat-xml-2.13.3:0
+# com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.3 -> >=dev-java/jackson-dataformat-yaml-2.13.3:0
+# com.fasterxml.woodstox:woodstox-core:6.2.8 -> >=dev-java/woodstox-core-6.2.8:0
+# com.lmax:disruptor:3.4.4 -> >=dev-java/lmax-disruptor-3.4.4:0
+# org.apache.commons:commons-compress:1.21 -> >=dev-java/commons-compress-1.21:0
+# org.apache.commons:commons-csv:1.9.0 -> >=dev-java/commons-csv-1.9.0:0
+# org.apache.kafka:kafka-clients:1.1.1 -> >=dev-java/kafka-clients-1.1.1:0
+# org.apache.logging.log4j:log4j-api:2.18.0 -> >=dev-java/log4j-api-2.18.0:2
+# org.fusesource.jansi:jansi:2.4.0 -> >=dev-java/jansi-2.4.0:2
+# org.jctools:jctools-core:3.3.0 -> !!!suitable-mavenVersion-not-found!!!
+# org.slf4j:slf4j-api:1.7.36 -> >=dev-java/slf4j-api-1.7.36:0
+# org.zeromq:jeromq:0.5.2 -> >=dev-java/jeromq-0.5.2:0
+
+CP_DEPEND="
+	dev-java/commons-compress:0
+	dev-java/commons-csv:0
+	dev-java/conversant-disruptor:0
+	dev-java/jackson-core:0
+	dev-java/jackson-databind:0
+	dev-java/jackson-dataformat-xml:0
+	dev-java/jackson-dataformat-yaml:0
+	dev-java/jansi:2
+	dev-java/javax-mail:0
+	dev-java/jctools-core:3
+	dev-java/jeromq:0
+	dev-java/kafka-clients:0
+	dev-java/lmax-disruptor:0
+	~dev-java/log4j-api-${PV}:2
+	dev-java/slf4j-api:0
+	dev-java/woodstox-core:0
+"
+
+# Compile dependencies
+# POM: ${PN}/pom.xml
+# javax.activation:javax.activation-api:1.2.0 -> !!!groupId-not-found!!!
+# javax.jms:javax.jms-api:2.0.1 -> !!!groupId-not-found!!!
+# javax.mail:javax.mail-api:1.6.2 -> !!!groupId-not-found!!!
+# org.osgi:org.osgi.core:6.0.0 -> >=dev-java/osgi-core-8.0.0:0
+# POM: ${PN}/pom.xml
+# test? ch.qos.logback:logback-classic:1.2.11 -> >=dev-java/logback-classic-1.2.11:0
+# test? ch.qos.logback:logback-core:1.2.11 -> >=dev-java/logback-core-1.2.11:0
+# test? com.github.tomakehurst:wiremock:2.26.3 -> !!!groupId-not-found!!!
+# test? com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0 -> !!!groupId-not-found!!!
+# test? com.h2database:h2:2.1.214 -> !!!groupId-not-found!!!
+# test? commons-codec:commons-codec:1.15 -> >=dev-java/commons-codec-1.15:0
+# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
+# test? commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+# test? net.javacrumbs.json-unit:json-unit:2.32.0 -> !!!groupId-not-found!!!
+# test? org.apache-extras.beanshell:bsh:2.0b6 -> >=dev-java/bsh-2.0_beta6:0
+# test? org.apache.activemq:activemq-broker:5.17.1 -> !!!groupId-not-found!!!
+# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
+# test? org.apache.felix:org.apache.felix.framework:7.0.5 -> !!!groupId-not-found!!!
+# test? org.apache.logging.log4j:log4j-api:2.18.0 -> >=dev-java/log4j-api-2.18.0:2
+# test? org.apache.maven:maven-core:3.8.5 -> !!!groupId-not-found!!!
+# test? org.awaitility:awaitility:4.2.0 -> !!!groupId-not-found!!!
+# test? org.codehaus.groovy:groovy-dateutil:3.0.10 -> !!!groupId-not-found!!!
+# test? org.codehaus.groovy:groovy-jsr223:3.0.10 -> !!!groupId-not-found!!!
+# test? org.codehaus.plexus:plexus-utils:3.4.2 -> !!!groupId-not-found!!!
+# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
+# test? org.hamcrest:hamcrest:2.2 -> >=dev-java/hamcrest-2.2:0
+# test? org.hsqldb:hsqldb:2.5.2 -> !!!groupId-not-found!!!
+# test? org.jmdns:jmdns:3.5.7 -> !!!groupId-not-found!!!
+# test? org.junit-pioneer:junit-pioneer:1.6.2 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!!
+# test? org.junit.platform:junit-platform-commons:1.8.2 -> !!!groupId-not-found!!!
+# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!!
+# test? org.mockito:mockito-core:4.4.0 -> >=dev-java/mockito-4.4.0:4
+# test? org.mockito:mockito-junit-jupiter:4.4.0 -> !!!artifactId-not-found!!!
+# test? org.slf4j:slf4j-ext:1.7.36 -> >=dev-java/slf4j-ext-1.7.36:0
+# test? org.springframework:spring-test:5.3.20 -> !!!groupId-not-found!!!
+# test? org.tukaani:xz:1.9 -> >=dev-java/xz-java-1.9:0
+# test? org.xmlunit:xmlunit-core:2.9.0 -> !!!groupId-not-found!!!
+# test? org.xmlunit:xmlunit-matchers:2.9.0 -> !!!groupId-not-found!!!
+# test? org.zapodot:embedded-ldap-junit:0.8.1 -> !!!groupId-not-found!!!
+
+DEPEND="${CP_DEPEND}
+	dev-java/jakarta-activation-api:1
+	dev-java/jakarta-mail-api:0
+	dev-java/javax-jms-api:0
+	dev-java/osgi-core:0
+	>=virtual/jdk-1.8:*"
+#	test? (
+#		!!!artifactId-not-found!!!
+#		!!!groupId-not-found!!!
+#		>=dev-java/bsh-2.0_beta6:0
+#		>=dev-java/commons-codec-1.15:0
+#		>=dev-java/commons-io-2.11.0:1
+#		>=dev-java/commons-lang-3.12.0:3.6
+#		>=dev-java/commons-logging-1.2:0
+#		>=dev-java/hamcrest-2.2:0
+#		>=dev-java/log4j-api-2.18.0:2
+#		>=dev-java/logback-classic-1.2.11:0
+#		>=dev-java/logback-core-1.2.11:0
+#		>=dev-java/mockito-4.4.0:4
+#		>=dev-java/slf4j-ext-1.7.36:0
+#		>=dev-java/xz-java-1.9:0
+#	)
+#"
+
+# Runtime dependencies
+# POM: ${PN}/pom.xml
+# com.sun.mail:javax.mail:1.6.2 -> !!!artifactId-not-found!!!
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
+
+S="${WORKDIR}/apache-log4j-${PV}-src"
+
+JAVA_CLASSPATH_EXTRA="jakarta-activation-api-1,jakarta-mail-api,javax-jms-api,osgi-core"
+JAVA_SRC_DIR="${PN}/src/main/java"
+JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
+
+#JAVA_TEST_GENTOO_CLASSPATH="logback-classic,logback-core,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,commons-codec,commons-io-1,commons-logging,!!!groupId-not-found!!!,bsh,!!!groupId-not-found!!!,commons-lang-3.6,!!!groupId-not-found!!!,log4j-api-2,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,hamcrest,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,mockito-4,!!!artifactId-not-found!!!,slf4j-ext,!!!groupId-not-found!!!,xz-java,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
+#JAVA_TEST_SRC_DIR="${PN}/src/test/java"
+#JAVA_TEST_RESOURCE_DIRS=(
+#	"${PN}/src/test/resources"
+#)
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	# Process the @Plugin annotation used on Log4j 2 built-in plugins
+	# to generate a serialized plugin listing file
+	# https://logging.apache.org/log4j/2.x/manual/plugins.html
+	local processor="org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor"
+	local classes="target/classes"
+	local classpath="${JAVA_JAR_FILENAME}:$(\
+		java-pkg_getjars --build-only --with-dependencies \
+		"${JAVA_GENTOO_CLASSPATH},${JAVA_CLASSPATH_EXTRA}")"
+	# Just in case java-pkg-simple.eclass changes the path in the future
+	mkdir -p "${classes}" || die "Failed to create directory for classes"
+	local sources_list_file="${T}/sources.lst"
+	find "${JAVA_SRC_DIR}" -type f -name "*.java" > "${sources_list_file}" || die
+	ejavac -d "${classes}" -cp "${classpath}" \
+		-proc:only -processor "${processor}" \
+		@"${sources_list_file}"
+	# Update the JAR to include the serialized plugin listing file
+	local jar="$(java-config -j)"
+	"${jar}" -uf "${JAVA_JAR_FILENAME}" -C "${classes}" . ||
+		die "Failed to update JAR"
+}
diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest
index bd6d8353499c..2ed62ab87ca0 100644
--- a/dev-java/snappy/Manifest
+++ b/dev-java/snappy/Manifest
@@ -5,5 +5,6 @@ AUX 1.1.7.8-unbundle-bitshuffle.patch 1006 BLAKE2B 99b88fd2af02ff6d95d90ec2e3025
 AUX 1.1.7.8-unbundle-snappy.patch 1820 BLAKE2B ec2f5724675cef1a796678f5b12ccd4b49c2415fcfd98e2a3f9214bb63477bfd9bed93999c2f12b2f0e8b5aedb705299bf37e52a16833797a745bf4e1eeecdd9 SHA512 408c09f01cb65dcf17b7ecd5542cd622b6296ab6d433be79ff2a8d03dc4e8f8b9c48165d95afa0b865c8ab196c4470e93f5b07e9eeded1f492d1ef2d8d91fa82
 AUX 1.x-build.xml 8496 BLAKE2B 0ab98a4149d0d7b294efec29374c59af8599362fa40d04737d50d1106157d8e604e17ce06c9180c2d9ca2b612cb5d025a111fe620739f7109a0c384ae940d4dc SHA512 ed47379879bab5cbaa4111616c3cca526725e4fa3d8d42da72d19a21738cc42826e37756a181e6d541f27aa4abe7f2353be90c51f4d89d04413501e6ccdb4cb0
 DIST snappy-java-1.1.7.8.tar.gz 3558859 BLAKE2B 871f4190212399c5bd34a72766d7f3abca9a09608d9acddc126905bcdafc723613aa33d0cdb59419e6bfba46ff27e91f5ca5382073dd895d5601f6d84929ef96 SHA512 8129d4ae2abd78f967c07e7f13df8cb9043cc34bd8346be28625a3d2bea06674ce6dd09b521af2b7053b25d0132a0e822b78c06e09bacd0067ba8178bd167691
+EBUILD snappy-1.1.7.8-r1.ebuild 2565 BLAKE2B 331d3ad9a56c7991efb5d839a6f4f84d60c4e1d9ca8e6a092012fee5f05ee5aa30e60580161c966e09e21c897326e2252857cf976d99d2678c235af59b576352 SHA512 19d5edc0d2ca972c3b3f865a155e38b676d06a827174ea94ea9c4dc1ff603d153671f6700b685b4dc89c28d44c9a5097c3226cd268da776a9e67717833ab96e0
 EBUILD snappy-1.1.7.8.ebuild 2569 BLAKE2B 5744632d7f2d1931790e0b5ef481444653eb3711e4311688f6cda071b9b2f339d2743e8f0a2cd299ba93164e8c1e135110c315256f3b6b0330ce721dd2964b89 SHA512 f274294167f77a7f9c96868117c4ee75f1e0fa062bbab9027f12bf98333fcb0bf6ae7bb0e5692bfba0193ce423598674bc6b982bbb700e3255ce557d4c7c6572
 MISC metadata.xml 320 BLAKE2B 5e3039edeec0b66e6b896158777909fdfed881f06def61b5e3424baeb51ea898cb3cb273e6ddc939b7efea88860a945b5f29da513be22ee6b601551a6e02170a SHA512 c2e9282ce950b419588d080145e85e63e6491500edce141678a4aaae65a43d945694ad992dd4d485c94748e26ac225e58177fcff11db3430035b837741ec45af
diff --git a/dev-java/snappy/snappy-1.1.7.8-r1.ebuild b/dev-java/snappy/snappy-1.1.7.8-r1.ebuild
new file mode 100644
index 000000000000..a0190bc964ba
--- /dev/null
+++ b/dev-java/snappy/snappy-1.1.7.8-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.xerial.snappy:snappy-java:1.1.7.8"
+
+inherit java-pkg-2 java-ant-2 toolchain-funcs
+
+MY_PN="${PN}-java"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Snappy compressor/decompressor for Java"
+HOMEPAGE="https://github.com/xerial/snappy-java/"
+SRC_URI="https://github.com/xerial/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Tests require org.apache.hadoop:hadoop-common:2.7.*, which is yet to be
+# packaged.  Some extra steps are required before running the tests:
+# 1. Download hadoop-common 2.7.x from https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-common
+# 2. Set EANT_GENTOO_CLASSPATH_EXTRA to the path to hadoop-common-2.7.*.jar
+# 3. Set ALLOW_TEST="all"
+RESTRICT="test"
+
+CDEPEND="dev-java/osgi-core:0
+	app-arch/snappy
+	dev-libs/bitshuffle"
+
+DEPEND=">=virtual/jdk-1.8:*
+	${CDEPEND}
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/commons-io:1
+		dev-java/commons-lang:2.1
+		dev-java/plexus-classworlds:0
+		dev-java/xerial-core:0
+	)"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
+EANT_GENTOO_CLASSPATH="osgi-core"
+EANT_TEST_GENTOO_CLASSPATH="
+	${EANT_GENTOO_CLASSPATH}
+	commons-io-1
+	commons-lang-2.1
+	plexus-classworlds
+	xerial-core
+"
+
+src_prepare() {
+	cp "${FILESDIR}/1.x-build.xml" build.xml || die
+	rm -r src/main/resources/org/xerial/snappy/native || die
+	eapply "${FILESDIR}/${PV}-java-version-target.patch"
+	eapply "${FILESDIR}/${PV}-remove-perl-usage.patch"
+	eapply "${FILESDIR}/${PV}-unbundle-snappy.patch"
+	eapply "${FILESDIR}/${PV}-unbundle-bitshuffle.patch"
+	eapply "${FILESDIR}/${PV}-gentoo.patch"
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	emake \
+		CXX="$(tc-getCXX)" \
+		JAVA_SOURCE="$(java-pkg_get-source)" \
+		JAVA_TARGET="$(java-pkg_get-target)"
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	cp -r src/test/resources/org/xerial/snappy/* \
+		src/test/java/org/xerial/snappy || die
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local jniext=.so
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		jniext=.jnilib
+		# avoid install_name check failure
+		install_name_tool -id "@loader_path/libsnappyjava${jniext}" \
+			"target/libsnappyjava${jniext}"
+	fi
+	java-pkg_doso "target/libsnappyjava${jniext}"
+	java-pkg_dojar "target/${PN}.jar"
+
+	use source && java-pkg_dosrc src/main/java/*
+	use doc && java-pkg_dojavadoc target/site/apidocs
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 6deb5cdc4fd5..011a637e8c38 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 6cfa87dfcf6e..03ceb95a20e9 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -20,26 +20,32 @@ DIST python-gentoo-patches-2.7.18_p15.tar.xz 34956 BLAKE2B d173f276dd9c0ce31004d
 DIST python-gentoo-patches-3.10.5.tar.xz 8584 BLAKE2B d4a812a33e485b1eae5629e519dca4dc6625b743b07c7f7bbc62562f345d87723ba499893702310b1e96e443d2946e27a8d4971f32ca1125d4827d0d594ccaa6 SHA512 77f0478f7d0491e103857a83a97d6e04a9ec68740a7f9357cbbdd316462e7d98ea8236bd05a30e7556457ece5fbcfa4a7a78a25d4eb12779455ce2bb5b6f30d0
 DIST python-gentoo-patches-3.10.6.tar.xz 8580 BLAKE2B 4ff3839be2f6bf172acdca22bbded702804809d6334e088190cee4ae4c61e25580a3bdc105bfe27b7f3c3b5f219d363cdca21ef895a3e91f13515afb348a77a0 SHA512 c58a85f7c48a4e822527411a6e0618be5408e1a82fe72b21a254dac77b4e5d4b01ac24cf70dc277cd16ccdc8499a9fa53b7cebae3b9f8facc9c978adcc8a2876
 DIST python-gentoo-patches-3.10.6_p1.tar.xz 10592 BLAKE2B 0b0f54faf93e3b6a3ba5ae5fef01ff4adbb1560e3d5c0c8e7d69d80e2e10b15e7fc7f5471f82d5322c86a1eec762f10cda6e8ea650c993481342cda06a47a863 SHA512 c4a2ff7d16042729f5a23222d154bc0832f51b7ab5b1dafe4a6c6bd40b037c85a6d40d07516c1207cd0bc9a233865700d7cca4b01ed27a1f21516392992bc6eb
+DIST python-gentoo-patches-3.10.6_p2.tar.xz 12040 BLAKE2B 75c93fab19137a966b3775308bc20142f4d3648bbb9364e82c4eaffae93beda54011192881c52b85d2e2493a06cfe2a90f50675609908c3d5ebdb0103fe41644 SHA512 7e451a8a18a62592c2cd7b2db71065b77256960f43e172a0d7856b22b69138dcb1552f53b39bec14585a761cfe729c81613551c1b616fe1ec8d2b59856b11453
 DIST python-gentoo-patches-3.11.0b4.tar.xz 4388 BLAKE2B 16b112f1ecdce86022ed64d7c7007fb323b7bd4497b5802a48bb0a86667c282d1a9150d744f44cefbe9321af4916d35941707c1259a0cf175c0161c8e1b17e97 SHA512 f9c8c7180da20e839a0862571b9077b2702dbee8a1acd55ebb11329912cf9f81862ba615be484b92d39461c3eb6c38890f8d58bcbce2c4722418a967faedc1f5
 DIST python-gentoo-patches-3.11.0b5.tar.xz 4384 BLAKE2B b036e9103f8315d6e2bb6e85a2db12ec60f8e05ccff083183f24c0b4ba16c807a2eb1fa43b88f8d7a253d5bbeef0880b31d60e13b449f7de992156319753ef33 SHA512 af6315f97b0f2463d6c0f18a99a5ff5f96c3d18567ae0d73461f0fc82ca2173a8f6c3fedc2fada2b9460547a457d4264bc2acb90f1906599229afe85bcc2afde
 DIST python-gentoo-patches-3.11.0rc1.tar.xz 4384 BLAKE2B 31bcdc055bfaf3434dbb02543aaf66910eaccd01808d9a0e57bf7cb3b097fc0046c00ac44737d9c37e3b6d074c524f4dd3ab439a741e66d74a0425889ecaead5 SHA512 05b044e2d8f881c471528600ee300bfd9cf5160609dfb3d7cbdb8e43f47b681542582a85de97e28e6a3b89a3fb6c8d7398e029d31e20cea9c5a2a71700382d4e
 DIST python-gentoo-patches-3.8.13_p2.tar.xz 18816 BLAKE2B 8612ca33e5569319c5d1a5a3fb1a81e860bd515bfde656b79f087ccf7020923fbd06b315178bef8630e4c36bb22c27299fe439aadc6a161f1ec93be8778314ee SHA512 be5668a0a4be0a03e61466436973125a3be4f33a61524e4a5c8d86745727cfcae59e5048477887c9f6bfc09727f3aef3652ad47a13a6bf0f1452d3172f1c34dc
 DIST python-gentoo-patches-3.8.13_p4.tar.xz 23084 BLAKE2B 44be6b19275189bd04c9dcd3c4be4f4b8f92a0003710a12a12d60c0ab182942993a76d8d7f26b289cd0a4226eeeb9a39723822dfb896307fd6e75d6980c3898e SHA512 b78a39a15d361aed4ce887b4726c7967c09c0ee3add614f1dbca24b6f301bd20660fe074c03a58b325f8720ad853c109b334e41102de0b6cc362c467fb669feb
 DIST python-gentoo-patches-3.8.13_p5.tar.xz 26620 BLAKE2B 24d05e3f46acf339d2e1d0d86efdb6b61719c09aba08879397df6ed40ce41a5bae892f3677bbafe694b4ced5b469a81c27c4002c1de271565a6cd413e627ae7c SHA512 d18d4e6a5fc10990e9ce1cdda311016e9486d6aa90ad73bcd6e306ffe89ca180ae81a905b3b8d94569e0834103e77d5fffea34238b7aeaec8aeeeaf04fb2f72b
+DIST python-gentoo-patches-3.8.13_p6.tar.xz 27968 BLAKE2B 0cafbdfed47e0d58a9798c1e090abb17428472f769ebe4125cf1210218b90bcfd2ad8790fafbfdc1daccc51078a6bf5e068157f05151c2283eb80d5fe128d85c SHA512 b23d51478cc126a6f7f3d1d6d2302a13f3e873a3fac19c7b2b86b79f4b25bd421b60e5ecbe9bb606ee0eedc0e6871d20c0befd1b6596b525bf6ef79a19230ae2
 DIST python-gentoo-patches-3.9.13.tar.xz 12836 BLAKE2B ba687a3d6e00baf4d9640ab78a29c3e21bf1872b5019198991521cf37bb0780f592db742ee4fdfe6bfb1cab1c1f6587889dfdb024cae72766b6c83c2ffe319be SHA512 e393992ff92625771c6ffeb500637862f0163c689c685fd245a6e5bbdd3128154ce439ecab56eaf1359e67ea0d173dfb19f65a4098ea2266922bfb43aba517dc
 DIST python-gentoo-patches-3.9.13_p1.tar.xz 17036 BLAKE2B baf534d002c610426f9f183f53b935d83a4cf084834d3946986baa5d983e8197719b1d3e8568cc7f78a6aaa95b084dd8796e8539169415e19f2d9eb8f296242a SHA512 c7eb503defcc5e91d5de39eed84aeba748f96ef28f0d9ae3b3a98f111543d09311f51ae4fe321ec5f397c5f46dc8c715ecc401124f4e4a94c9fe8e2a6db9e052
 DIST python-gentoo-patches-3.9.13_p2.tar.xz 20708 BLAKE2B e86a80405683228211ea763523e71aa130f716a19d4e343ec46d1d428804cd59d07cdad0efea09b09d92139bdec93f40f7667db20240b89ed3a7a6bb46b0981f SHA512 1e9f84d0cde9a251e191b3784ec551a307572e779350e7d20ace0164f6cbc47b883632ebc32638a8f5f16f9c0d618a13d9105ef471657a9745bc6a09bf1d13d9
+DIST python-gentoo-patches-3.9.13_p4.tar.xz 22072 BLAKE2B a0e084eff35d075d2255b139d0db114d282cb6c9c0c2ea51a8ecb7f5f1dc8096d6578ae5f804b7583a2b7842152b5723ad802ca816d46813c40aaa756118afc8 SHA512 cdf8d43fd5263c4956be234f36c0767215ab2495705d4f2a060b32ecbfbe159e618e31693b0538a1b970f7b27ebe4953063f585930d074dcaf59f2f61486e6b6
 EBUILD python-2.7.18_p15.ebuild 9827 BLAKE2B 77ebeacfa236e518ec0c0a791e0da60f8158d369e870c88ce69d1eef25cdc99e658903abf313452b849254e97b4c9f583e0edb75ec845faf5b47fb2fc3173ce4 SHA512 19219cd43391d8d53838c9b0e15b30f8ccb5d5a23503a213cc961ff2fa545cd17a5ecc6ce253e2a01534db3bc931be212969c40885c2e99f203c23a5ecb689a1
 EBUILD python-3.10.5.ebuild 11701 BLAKE2B e83015ffd3bdcbceab4271ed82f6ee54d8b79494458a51ff46221ecfd1f39319fd00ad4d27471c73ef2fab3a3468b587138f9dd3d431ebf8192f31789c9d58f0 SHA512 fe2a00f53699a0ea809d891b66e0c1973402e8a504dc45bb67f57d1549b3809c2f894cb27264d8d8f35071c5fc967cb43c6250382e2627ec4197635d7f91a023
 EBUILD python-3.10.6.ebuild 11189 BLAKE2B b50f71bbb9b5a72724f52193aa114fc7ec4ceef3559649964899f9aec4911726503ab24ec4c07b53d2f15ba498844913d3618832763e9b3728d8f9303a97a3ea SHA512 2a09997fa8f451ab873bd039f47a7f4c1a146befb43c8b56467ea9fd93f61e7d55a90ef289804aa6d15c9e5ebc5fded62879eec8dccd528ab25e4df8d39e63a8
 EBUILD python-3.10.6_p1.ebuild 11189 BLAKE2B b50f71bbb9b5a72724f52193aa114fc7ec4ceef3559649964899f9aec4911726503ab24ec4c07b53d2f15ba498844913d3618832763e9b3728d8f9303a97a3ea SHA512 2a09997fa8f451ab873bd039f47a7f4c1a146befb43c8b56467ea9fd93f61e7d55a90ef289804aa6d15c9e5ebc5fded62879eec8dccd528ab25e4df8d39e63a8
+EBUILD python-3.10.6_p2.ebuild 11185 BLAKE2B 74667d26bfcce104fda9fa80195a550778c0ae26497342d40df5c32c40118ffc0fc44ed86cea42a8ed65f6f301292c6fd33fc8d061939fe512079105407aab24 SHA512 315a2a0a008f275764c44964a90d65adb9dd0aec27840c1b3a38504dead761a823c7da54755122fa8efe7eea82bee8339a71eba306b3cdeeb0bf197473e92f2d
 EBUILD python-3.11.0_beta4-r2.ebuild 13637 BLAKE2B 230701d089c7e42f80b0666a1ac6c5d48ff6fe8a5b7822ee3d4cd41adfe6e50143ecde143e228416f97cc0886910b22bc0fbb83ffad3ad19006aebcc382516fc SHA512 ec7a302106654abefb0672e25e1f189506d35111be4a983ae5b51281bd195a452fe1fb7170b77f8048c880563664f8b9b3624c434594a4f3b36306a203e299e9
 EBUILD python-3.11.0_beta5-r1.ebuild 13385 BLAKE2B 00d7c1d17bd8ad3acebfde6907fc27f77abc91a25f3d3e576bb6895c46f7cae88a8cd6dcf883dc3d91d0fba36349f3b209a512fff70cf4ff950a7f52d3e7d548 SHA512 56442b0cd0b7789c30d180b07e2e77b3203720e66084340cc85923410d54ca2ff40ce9096af844cde217f44bbd4e95ed4f8e69f192130de45bf14883d5127982
 EBUILD python-3.11.0_rc1.ebuild 13384 BLAKE2B 7ac3f74190fafd1321f2ae9b478cb1b7381f13ce88d1839bbe2eea12a9abb0f14286f3e6036ca65c2d37ca6b07b62c14f557a7af080f6f05f119e7bbd77764cc SHA512 3b94a9e45017c0ec3d2bb2ca346d423a0e31d3b1f2c1fa098aa2c4f0af58e49f3626688dacde9740b2c1f44c63f143bf43ec305d0ce69c3e68de3ff6ae0a88c3
 EBUILD python-3.8.13_p2.ebuild 10219 BLAKE2B c736d7417d2f7c8f8a6ee61182e1b2b9e22873343594a3779c83fc1af03103ae71f440f856d7dae7a661dc7190e70afa7c478dd7d8531d28637897c1ebd4106f SHA512 89f482e716b308565f41c4c6ce1db32f9a4023a41570070ddad4ac9d156f802d79f8ad7d2971b9ed02487482c50d8e4de64d212df092dd907d2c94838e6af921
 EBUILD python-3.8.13_p4.ebuild 9739 BLAKE2B 7baa8adde29baaea89a9f126a3090fba2186bcb2734ca737705c97d1b3f8d3036341ab2b626dc6e4cd5ab7630e386ef7f3444bb5847b79abf41806e2607715a6 SHA512 80ee67adf3b1c7461edb6b3ba60f5f825d93d89cc68f4a11b1de2bf84f4cb428718cee8079e68b074044a8e7f00d2423c97fc0cc3bfaa0848b6154b9abc3d6c7
 EBUILD python-3.8.13_p5.ebuild 9739 BLAKE2B 7baa8adde29baaea89a9f126a3090fba2186bcb2734ca737705c97d1b3f8d3036341ab2b626dc6e4cd5ab7630e386ef7f3444bb5847b79abf41806e2607715a6 SHA512 80ee67adf3b1c7461edb6b3ba60f5f825d93d89cc68f4a11b1de2bf84f4cb428718cee8079e68b074044a8e7f00d2423c97fc0cc3bfaa0848b6154b9abc3d6c7
+EBUILD python-3.8.13_p6.ebuild 9734 BLAKE2B 3647765a3fe766069b8689e970159a7f2660b9daf096eec27bff652c59cc2339bd2bb01aafb6c0289ca7e7a11c323f961f8882df9c5596e056fc2ff71e065ce5 SHA512 c7397835bb6ea3b47dd3649eafc1dfb472a98ff133967714b44632d80b2a439ed23088ab2a236129cdecf8292e59642ecb68ecedf8aade16f69117e3bb9f507a
 EBUILD python-3.9.13.ebuild 11462 BLAKE2B cfa217f58ee03528ce5dd467daa9023c67f89d4673def5a183eb7a0c2db6fe40527a78067803f7edcdcf32eef5dc72179b9be9d9a04f5766258945a4a16e3991 SHA512 4a7fbd6f6e7ae1fc1726a170879e26a6f7e74fe4fc2b52efacf5608350bd967ee52d63df4fb8d52aebe881bc003285e29d55fca5aedf74182cdb5f8b120ca8c4
 EBUILD python-3.9.13_p1.ebuild 10992 BLAKE2B 95d62e2bb7b6c3005020827484360929c7782563a545a914c61d0f54257525856bd5298273a39f73280036e738f532bba28abf6e9116f6c18a49725fd3f97d7a SHA512 fac82f66b21097cb564fc943a09bb61a834b4e51255bd5b2c8850b209eb5c20bdabad5028ee262fb0508672d1cc711394c217d48e0c2bb7427ffa670a25aa4d9
 EBUILD python-3.9.13_p2.ebuild 10992 BLAKE2B 95d62e2bb7b6c3005020827484360929c7782563a545a914c61d0f54257525856bd5298273a39f73280036e738f532bba28abf6e9116f6c18a49725fd3f97d7a SHA512 fac82f66b21097cb564fc943a09bb61a834b4e51255bd5b2c8850b209eb5c20bdabad5028ee262fb0508672d1cc711394c217d48e0c2bb7427ffa670a25aa4d9
+EBUILD python-3.9.13_p4.ebuild 10989 BLAKE2B 5b9fd1d22c6c1deb694b46ed6f991237af6c92285c5915bf073ae3f85365fc9b8442a6623165121e61c3da96f9c195ccd765d166eaabc8efb01e2e464c1668a7 SHA512 c54690ea24fa8e0d1dc90777a4b31c85efcec9b634820aa5e3dd5a84feb37cec0ee519d53784404f09fa2245ebd826228db342d2048b7f90304379dca661cc2d
 MISC metadata.xml 1068 BLAKE2B 3c3511739ae8251d11bde32aa3a21225fd3468f2b1f31c459de956c5bb7dbc2de4103a288dd29b26d1023e40bac62631fa953d1515513e934f5c3962d9c715a7 SHA512 0f7d3f9305cc539619568aea7e54cdb9a3319579e811108cf03d7c66290e4f21080a87ca02f1a62264d4ecd41a243c91f0a639e6c064ccf2b24b460508c848b8
diff --git a/dev-lang/python/python-3.10.6_p2.ebuild b/dev-lang/python/python-3.10.6_p2.ebuild
new file mode 100644
index 000000000000..7bcf965809fe
--- /dev/null
+++ b/dev-lang/python/python-3.10.6_p2.ebuild
@@ -0,0 +1,408 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
+inherit python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+IUSE="
+	bluetooth build +ensurepip examples gdbm hardened libedit lto
+	+ncurses pgo +readline +sqlite +ssl test tk +xml
+"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	dev-lang/python-exec[python_targets_python3_10(-)]
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? (
+		!libedit? ( >=sys-libs/readline-4.1:= )
+		libedit? ( dev-libs/libedit:= )
+	)
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )
+	!!<sys-apps/sandbox-2.21
+"
+# bluetooth requires headers from bluez
+DEPEND="
+	${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/awk
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+QA_PKGCONFIG_VERSION=${PYVER}
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat and libffi are not used.
+	rm -r Modules/expat || die
+	rm -r Modules/_ctypes/libffi* || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# https://bugs.gentoo.org/850151
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
+
+	# force the correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs)
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# disable automagic bluetooth headers detection
+	if ! use bluetooth; then
+		local -x ac_cv_header_bluetooth_bluetooth_h=no
+	fi
+	local disable
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	append-flags -fwrapv
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	# PKG_CONFIG needed for cross.
+	tc-export CXX PKG_CONFIG
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	local dbmliborder=
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	if use pgo; then
+		local profile_task_flags=(
+			-m test
+			"-j$(makeopts_jobs)"
+			--pgo-extended
+			-x test_gdb
+			-u-network
+
+			# All of these seem to occasionally hang for PGO inconsistently
+			# They'll even hang here but be fine in src_test sometimes.
+			# bug #828535 (and related: bug #788022)
+			-x test_asyncio
+			-x test_httpservers
+			-x test_logging
+			-x test_multiprocessing_fork
+			-x test_socket
+			-x test_xmlrpc
+		)
+
+		if has_version "app-arch/rpm" ; then
+			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
+			profile_task_flags+=(
+				-x test_distutils
+			)
+		fi
+		local -x PROFILE_TASK="${profile_task_flags[*]}"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--without-static-libpython
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+
+		$(use_with lto)
+		$(use_enable pgo optimizations)
+		$(use_with readline readline "$(usex libedit editline readline)")
+	)
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	# Prevent using distutils bundled by setuptools.
+	# https://bugs.gentoo.org/823728
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
+	# end up writing bytecode & violating sandbox.
+	# bug #831897
+	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict /usr/lib/python3.10/site-packages
+	fi
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Restore saved value from above.
+	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	local test_opts=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite /usr/lib/python3.10/site-packages
+
+	emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty || die "emake test failed"
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	rm -r "${libdir}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${libdir}"/ensurepip || die
+	fi
+	if ! use sqlite; then
+		rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}/usr/bin/idle${PYVER}" || die
+		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+	fi
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(
+		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
+		emake --no-print-directory -s -f - 2>/dev/null
+	)
+	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local EPYTHON=python${PYVER}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/python/python-3.8.13_p6.ebuild b/dev-lang/python/python-3.8.13_p6.ebuild
new file mode 100644
index 000000000000..5487cc4c3e38
--- /dev/null
+++ b/dev-lang/python/python-3.8.13_p6.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools flag-o-matic multiprocessing pax-utils
+inherit python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="
+	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
+	+readline +sqlite +ssl test tk wininst +xml
+"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	dev-lang/python-exec[python_targets_python3_8(-)]
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? ( >=sys-libs/readline-4.1:= )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )
+"
+# bluetooth requires headers from bluez
+DEPEND="
+	${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/awk
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+QA_PKGCONFIG_VERSION=${PYVER}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat and libffi are not used.
+	rm -r Modules/expat || die
+	rm -r Modules/_ctypes/libffi* || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# https://bugs.gentoo.org/850151
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
+
+	# force the correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs)
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# disable automagic bluetooth headers detection
+	if ! use bluetooth; then
+		local -x ac_cv_header_bluetooth_bluetooth_h=no
+	fi
+	local disable
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	append-flags -fwrapv
+
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	# PKG_CONFIG needed for cross.
+	tc-export CXX PKG_CONFIG
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	local dbmliborder=
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+	)
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	# Prevent using distutils bundled by setuptools.
+	# https://bugs.gentoo.org/823728
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	local test_opts=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty || die "emake test failed"
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	# Remove static library
+	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	rm -r "${libdir}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${libdir}"/ensurepip || die
+	fi
+	if ! use sqlite; then
+		rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}/usr/bin/idle${PYVER}" || die
+		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+	fi
+	if ! use wininst; then
+		rm "${libdir}/distutils/command/"wininst-*.exe || die
+	fi
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(
+		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
+		emake --no-print-directory -s -f - 2>/dev/null
+	)
+	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local EPYTHON=python${PYVER}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/python/python-3.9.13_p4.ebuild b/dev-lang/python/python-3.9.13_p4.ebuild
new file mode 100644
index 000000000000..450744bce894
--- /dev/null
+++ b/dev-lang/python/python-3.9.13_p4.ebuild
@@ -0,0 +1,403 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
+inherit python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+IUSE="
+	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
+	+readline +sqlite +ssl test tk +xml
+"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	dev-lang/python-exec[python_targets_python3_9(-)]
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? ( >=sys-libs/readline-4.1:= )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )
+"
+# bluetooth requires headers from bluez
+DEPEND="
+	${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/awk
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+QA_PKGCONFIG_VERSION=${PYVER}
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat and libffi are not used.
+	rm -r Modules/expat || die
+	rm -r Modules/_ctypes/libffi* || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# https://bugs.gentoo.org/850151
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
+
+	# force the correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs)
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# disable automagic bluetooth headers detection
+	if ! use bluetooth; then
+		local -x ac_cv_header_bluetooth_bluetooth_h=no
+	fi
+	local disable
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	append-flags -fwrapv
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	# PKG_CONFIG needed for cross.
+	tc-export CXX PKG_CONFIG
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	local dbmliborder=
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	if use pgo; then
+		local profile_task_flags=(
+			-m test
+			"-j$(makeopts_jobs)"
+			--pgo-extended
+			-x test_gdb
+			-u-network
+
+			# All of these seem to occasionally hang for PGO inconsistently
+			# They'll even hang here but be fine in src_test sometimes.
+			# bug #828535 (and related: bug #788022)
+			-x test_asyncio
+			-x test_httpservers
+			-x test_logging
+			-x test_multiprocessing_fork
+			-x test_socket
+			-x test_xmlrpc
+		)
+
+		if has_version "app-arch/rpm" ; then
+			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
+			profile_task_flags+=(
+				-x test_distutils
+			)
+		fi
+		local -x PROFILE_TASK="${profile_task_flags[*]}"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+
+		$(use_with lto)
+		$(use_enable pgo optimizations)
+	)
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	# Prevent using distutils bundled by setuptools.
+	# https://bugs.gentoo.org/823728
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
+	# end up writing bytecode & violating sandbox.
+	# bug #831897
+	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict /usr/lib/python3.9/site-packages
+	fi
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Restore saved value from above.
+	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	local test_opts=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty || die "emake test failed"
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	# Remove static library
+	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	rm -r "${libdir}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${libdir}"/ensurepip || die
+	fi
+	if ! use sqlite; then
+		rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}/usr/bin/idle${PYVER}" || die
+		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+	fi
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(
+		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
+		emake --no-print-directory -s -f - 2>/dev/null
+	)
+	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local EPYTHON=python${PYVER}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 0d0d797d3bf9..bcf2c2a9e53f 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,10 +1,8 @@
-AUX spidermonkey-1.8.5-LTO.patch 1886 BLAKE2B 28559662306681570ed7b910190da9042a7724a5d9fda0960ebe36039e994b56b65f103095381a8838db54e2ebdd5b8bc3f0f7d500f338907624ca448695a2f1 SHA512 8c44683370f7a919a930dc505278240164b1bea35cd0408ce7d880f56603abde9799aea3bf35f05bd080b214d5d0b944dd004ef5e157607bbb3e679f3ff2c574
 AUX spidermonkey-60.5.2-ia64-fix-virtual-address-length.patch 2554 BLAKE2B d5759da22c521e389b8633aa2aa75e0a300af76f431a53c0bd445781002b0b7dd93543657cdf53afb12d87e4be1464584d5c3ccb30a2c9acc608aaeb1b2eb34f SHA512 d767cb00988772a0e5789d5b27aaaf0c0cc0124f4dd78ba67d2c4b4587c26346b01fc5b3d29f346e931dcd037ecefc8cec0d5c48510726a1841a6b6396c5507c
 AUX spidermonkey-60.5.2-ia64-support.patch 1615 BLAKE2B bd2ae36194bdb6a17638ec500e5211abb9700f2b7c5056b5be51e8e54d59326a5c9f0cb6d2d6fa56dd946dba264635e6d75e9b4ed52103c7904df19d33257c7d SHA512 71f2a0f27910ae086910f6599985a32ad2fdedeffc9c4c6baa446f4856dee74051fa158cc0552a3f21210098e0d006a0b5d781437fded80969e1edf23c04b9e0
 AUX spidermonkey-68.0-add-riscv-support.patch 4328 BLAKE2B 64ef005bff60ce3cc3e698a65494ef97441b9f27493bcbc7576286f6e06ce754dbcbcc8d9088ca88f6aa1a1ea7f008565922b5a4baf54019c64d8040c5b509f1 SHA512 70aad64600221f805f0fcd485b63c5383e9f160889b001963f5b6196d57672257c8ce02e75ad384bd2a0eeb9eeae0f7fc4820f1abcec3677f736cd60391f7d6f
 AUX spidermonkey-68.0-loong-support.patch 4156 BLAKE2B ed86f74240c1c7df0ae5012e80d3c4daec1083cdb48d3a985bdc4be287e591e536195ecc38a30f42bfa8d39ba3f46f2bef235ea2691687f7f33ba5f6052438b9 SHA512 0b8554b7afd35738ce9e2d2c71ea6658a680523160f5b05a7734ebdaccd6cdd288aa3168fd0a97318da88b2f149e6a4662b6069da1e805564b5320f674438e66
 AUX spidermonkey-91-known-test-failures.txt 8778 BLAKE2B e429909a6aa90dc6127ba957045d119d894f50fed508ee5ef47bdd163585987510c5cc0898f0d8af608a7ec3f8425a3b8d1073b6cfc1fda5196a81a1c255d885 SHA512 b2cb12abd942ecdfca641dcc63ac652574fbb010b78e4661c29e669d3beb2217f60904d61d5a574cf8d70040c2290672fbb410234f78f665b6bb63fefa0090ed
-AUX spidermonkey-perl-defined-array-check.patch 341 BLAKE2B e11a74cc2afbea5e39ec5f3fb4c108278a8b71b57ce71644184bc4e19188059f6cb9c164ab87877605028241ed0b68a1447414f1aa0f5453fa26a603ecd4f6a6 SHA512 5d178b68cf0744da874624da79cd31555bd882aed205e697a3f0bfc3cb91a149d74da79b7af5883ea5a23e1d1692753ebfda0d83e7a25ac000105849db5c1548
 DIST firefox-68.0-patches-15.tar.xz 16060 BLAKE2B f9e6cd58ea51bed1af90a9d30fd551dc7e939afcd1b4d00de1271bd4bda94021c6f1799fd9945962c14ffa1fd0b6a6429369c4e45efc2000f179b9b2e46971e7 SHA512 9cb2479637dd8b84e0ab68dc0fe144acd2dc74feca282fd3c4b485ca6f0de8190244587622713a5421b243ccda153f738e9a8f463e87e15e93e9b725d943e128
 DIST firefox-68.12.0esr.source.tar.xz 313856956 BLAKE2B eeaa4acc9fabf15ec1b313170a30cee8e1fc10a8b08512b915b83b7d6a81c09b365733ed94638bd434864fd7b0cb8cbf1bc2e43441be69e31117e8e6a099234c SHA512 839b02422e4c87bdb12e0995cd35ca8c1996f3fba00bbb46b419e46b67df5ec48a264cb14632db777ce29166ee4fdcb06e2ee3ce847e64328c58c9a2f9129f4c
 DIST firefox-78.15.0esr.source.tar.xz 330819568 BLAKE2B dc8785613c2f72c55d484642c89c2545765a9efbd609bc7c2cf57b4a3a06a2ea22e6959e42b5b8af867db782e8b2097a67dec858796b744e47008a8e575e2316 SHA512 ac3de735b246ce4f0e1619cd2664321ffa374240ce6843e785d79a350dc30c967996bbcc5e3b301cb3d822ca981cbea116758fc4122f1738d75ddfd1165b6378
@@ -12,14 +10,11 @@ DIST firefox-78esr-patches-19.tar.xz 88424 BLAKE2B fdc7bf8f28b3e799551a70f1cec7a
 DIST firefox-91.11.0esr.source.tar.xz 384459848 BLAKE2B cff327378a1712d0dfb99e1a67bd63e958987e3147279af5f98ee9318fe91f42823bbc9afb0308638e42de789451b04ea895320a8c674cc221e0d4b0b1d80f38 SHA512 bff3a399c03bd1cdaaec0b6963b1558aa35b6338b6c02042ffd65fec0aedd344d01718692e881332f5f352c32da15ba09a20a09ee072200b47ae840bc0585a96
 DIST firefox-91.12.0esr.source.tar.xz 379877004 BLAKE2B c00e5cc219c59d8347a69e5236a4a4f439d9caae6ab7dabc3ed8c8f9a096ded26ec1ffb53b015b86481f1d43ec4f263bb8acbd841ebf36e8a741d73e12a0a914 SHA512 323fb752488b45872b40f0b0ee1d8c1dffa16874dbff2afde19a54286c824ef48177233e029faeafa5946184e71c31c6bc5ba7ec17a571e21af64fc5f7334042
 DIST firefox-91esr-patches-10j.tar.xz 18320 BLAKE2B ec882411eed19bafab8676e3d79f4ae43947bb97c44571c1497bb93a44fcfec99de06ebacbdf8c4944dcecdf949e4f684908d7ce4226cdcec60241e62e75810e SHA512 670a14d852bb74b9074c3fef9310650f71ce1c56314109c49aea02a7a69acc836af60a8beab11da53e21b10a8e6da341fcfa18b68a1dfd33b26978dd63758e9c
-DIST js185-1.0.0.tar.gz 6164605 BLAKE2B 76a37f0ceae05d3475853875bd0ce4be6e525e4114816f8f281ea6fc6b60a71060975a0fa1cb843f57ad1e2f842dfb26b24244fa0fd6c20f6ae2ebbe430f70be SHA512 2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718
 DIST mozjs-60.5.2.tar.bz2 32816585 BLAKE2B 45ac4c9646e1275faf60eeedbf486f802cd106583eb7f640fe2243adc7cbb811dced5cefa94426cceca63468b0112be84078ffcef24cb2b8c1a7b6c8173c0d45 SHA512 5fb73330e7803bdd524fbe7cfdf4e6b72e85d4b22b0c827400317b5d052d1088d36e558ceac376393089e9d03e658b24e69262851fc04a66bbcda47135423dc0
 DIST spidermonkey-60.0-patches-04.tar.xz 4428 BLAKE2B af78049cd9b3ee6a9b689e6253486c4670fd3b506faade7d745dafaa7af329c0bd15cd35e95528a4c96688230f4803130967fb09b97aae2bda0ce0f73acaaf3e SHA512 fb1326a81512146ba98773d4f7e0c4bc1bff0f076897c13f576fcf63b56f6965efeff633eea9160bca9f9bc4546505901084eabc33bc955de0b7ab3d6334387a
 DIST spidermonkey-68.6.0-patches-04.tar.xz 5956 BLAKE2B b1250391a5173e676272d5926b710c06b0e9de1ff03b130a57fdac30f2deefbee3fa92250b37e28087572fe5cce73eb112ef4e1fb0c0401d6ecdb22ab9868998 SHA512 94575b11b4f006c6ee0c8d64b315734a173cecb68e9128ca61ba1a28177e3c149b8cf1f3b3c47a7a263fad8da6196fc0101df87392f016686a827e0cd24fdc74
 DIST spidermonkey-78-patches-04.tar.xz 3408 BLAKE2B f2fdd4882e1e4de1908c458dc8dfedd5665ef7118f19704dabf2b2a80e2fae48813e9bc3d0c3410287e32c21e3f9d09233d8e5d15917f53aa2f60e6190cd9cdb SHA512 87ac83c0ccc05f482913b1fbf043db1878536f935f934362a47283809c0cbfdeff040206a9c18c687384b606ba8a7bd9a7c1fc3c0bcfdd620987990a33ca1fe2
 DIST spidermonkey-91-patches-04j.tar.xz 4624 BLAKE2B d9cf47b39a165e8434d4f2f20ae3a9734c1bb81c32ddb75360e5edfa6817d6343be89aff0f8ec381485772cad80b00a069789decbc462129161afc3d4acfcb53 SHA512 bd574fee600cb4c6a262893b7d992d85c4059d512b829cd2f226aff86d8a6a83c2bdab466704e22f64bf6d29f90901037a34f9e90a42251952ba1cdbc0cab968
-DIST spidermonkey-slot0-patches-02.tar.xz 10952 BLAKE2B fb7bf5cdac6c821a48d407ff172fe0ec7297e047d3b3bab952f226f413b83ea70325175b41c1680725ff588111b424efc97a0c66e392989da510c43d38528ff1 SHA512 cd62890c4b58658d99fc1b52f05ccb35c07da835b168bb9d5e6b219de5021122c199cc2255c5b0be01ef582f53dd51c9975921e6bde9f14e9b43536e2bee85f2
-EBUILD spidermonkey-1.8.5-r10.ebuild 3998 BLAKE2B c54b791025b3416f96068a20e8f5526d15223aa4f5d4b5dedc5451ea711f5376d26ff9823226a7617dc53e4beece4ef48dc608a5f6fd02c03221e46c69be3add SHA512 8a33566ef0d15caf811d79d17862ccaaa708c9c6a4171bfc3889bc3f3268e6bcfc61090ebff1014b5369f469c0b9e516a340ab32930888a07cce1ac95faf6fb3
 EBUILD spidermonkey-60.5.2_p0-r6.ebuild 4080 BLAKE2B 7269a944ab109fa27ee80016d44c4c71d91c0f230fbea9704ba468bff06d62c2740af3cce4ce7c39179dca6be7c74b3eb62b877e7f7db2c7a6e7314e0361401c SHA512 971cbfaad2aabaf43b6f528bc67f5bb207bf53bc4d9bd19d8d21948ad6e055a8f3aa0f059028db13c95740fef3ebc9257a1ab2813131180dfb5c7b2306b66e2b
 EBUILD spidermonkey-68.12.0-r1.ebuild 7834 BLAKE2B 35252f841078dc8b0f06c2c2dab0d0a17abbfa23f025c3b2534232a82951298722a7ee5c3c7bcd56055879c5a886961a8ac34bb325fca7a466dc7d59f7b391ec SHA512 4ecbf27cddb67cdef15aa2c93cb4acfb4851973a07b7b9040186555027f5bc4d7126351b5bb1646640d0493afa78e63151d39b0bf37a6899c87ff20a7ea22198
 EBUILD spidermonkey-78.15.0.ebuild 13041 BLAKE2B aef027a6499b02cc44e1fc1eda7d60b74542590513147ff47978786f14ac8afbf636f8ebb86fcbd0ac0d6f30130d5ff679df7342215bf0126c21db343591c905 SHA512 bcce7f25a9791a0bafcb1f9ecbca883a96dd677ab6c184370f791b1463c3eba6bf57be17e5f1bbcb6b52814600ffe18d3d0d7453eeb18f1cd96087925b2aca02
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-LTO.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-LTO.patch
deleted file mode 100644
index 7c36b5525b04..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-LTO.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 6ff7ad09daf98e5b804cf73c066c382a76e74e8c Mon Sep 17 00:00:00 2001
-From: Alexander Miller <alex.miller@gmx.de>
-Date: Wed, 12 Jun 2019 00:29:23 -0500
-Subject: [PATCH] Fix breakage with lto builds
-
-<artificial>:(.text+0x7a): undefined reference to `PopActiveVMFrame'
-collect2: error: ld returned 1 exit status
-
-Signed-off-by: Alexander Miller <alex.miller@gmx.de>
----
- js/src/methodjit/InvokeHelpers.cpp | 2 +-
- js/src/methodjit/MethodJIT.cpp     | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/js/src/methodjit/InvokeHelpers.cpp b/js/src/methodjit/InvokeHelpers.cpp
-index d017c2a..abde396 100644
---- a/js/src/methodjit/InvokeHelpers.cpp
-+++ b/js/src/methodjit/InvokeHelpers.cpp
-@@ -500,7 +500,7 @@ stubs::PutActivationObjects(VMFrame &f)
-     js::PutActivationObjects(f.cx, f.fp());
- }
- 
--extern "C" void *
-+extern "C" void * __attribute__((used))
- js_InternalThrow(VMFrame &f)
- {
-     JSContext *cx = f.cx;
-diff --git a/js/src/methodjit/MethodJIT.cpp b/js/src/methodjit/MethodJIT.cpp
-index 4feefbc..66099e6 100644
---- a/js/src/methodjit/MethodJIT.cpp
-+++ b/js/src/methodjit/MethodJIT.cpp
-@@ -120,20 +120,20 @@ static uint32 StubCallsForOp[STUB_CALLS_FOR_OP_COUNT];
- 
- extern "C" void JaegerTrampolineReturn();
- 
--extern "C" void JS_FASTCALL
-+extern "C" void JS_FASTCALL __attribute__((used))
- PushActiveVMFrame(VMFrame &f)
- {
-     f.entryfp->script()->compartment->jaegerCompartment->pushActiveFrame(&f);
-     f.regs.fp->setNativeReturnAddress(JS_FUNC_TO_DATA_PTR(void*, JaegerTrampolineReturn));
- }
- 
--extern "C" void JS_FASTCALL
-+extern "C" void JS_FASTCALL __attribute__((used))
- PopActiveVMFrame(VMFrame &f)
- {
-     f.entryfp->script()->compartment->jaegerCompartment->popActiveFrame();
- }
- 
--extern "C" void JS_FASTCALL
-+extern "C" void JS_FASTCALL __attribute__((used))
- SetVMFrameRegs(VMFrame &f)
- {
-     f.cx->setCurrentRegs(&f.regs);
--- 
-2.22.0
-
diff --git a/dev-lang/spidermonkey/files/spidermonkey-perl-defined-array-check.patch b/dev-lang/spidermonkey/files/spidermonkey-perl-defined-array-check.patch
deleted file mode 100644
index c3996ae82bb3..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-perl-defined-array-check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/js/src/config/milestone.pl	2013-02-11 17:33:22.000000000 -0500
-+++ b/js/src/config/milestone.pl	2015-07-15 10:44:31.676153600 -0400
-@@ -55,7 +55,7 @@
- #
- my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE);
- 
--if (defined(@TEMPLATE_FILE)) {
-+if (@TEMPLATE_FILE) {
-   my $TFILE;
- 
-   foreach $TFILE (@TEMPLATE_FILE) {
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r10.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r10.ebuild
deleted file mode 100644
index 99ebd7b97664..000000000000
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r10.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WANT_AUTOCONF="2.1"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-inherit autotools toolchain-funcs multilib python-any-r1 versionator pax-utils
-
-MY_PN="js"
-TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))"
-MY_P="${MY_PN}-${PV}"
-TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
-SRC_URI="https://archive.mozilla.org/pub/js/${TARBALL_P}.tar.gz
-	https://dev.gentoo.org/~axs/distfiles/${PN}-slot0-patches-02.tar.xz
-	"
-
-LICENSE="NPL-1.1"
-SLOT="0/mozjs185"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~x64-macos"
-IUSE="debug minimal static-libs test"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-BUILDDIR="${S}/js/src"
-
-RDEPEND=">=dev-libs/nspr-4.7.0
-	sys-libs/readline:0=
-	x64-macos? ( dev-libs/jemalloc )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/zip
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${WORKDIR}"/sm0/${P}-fix-install-symlinks.patch
-	"${WORKDIR}"/sm0/${P}-fix-ppc64.patch
-	"${WORKDIR}"/sm0/${P}-arm_respect_cflags-3.patch
-	"${WORKDIR}"/sm0/${PN}-1.8.7-freebsd-pthreads.patch
-	"${WORKDIR}"/sm0/${P}-perf_event-check.patch
-	"${WORKDIR}"/sm0/${P}-symbol-versions.patch
-	"${WORKDIR}"/sm0/${P}-ia64-fix.patch
-	"${WORKDIR}"/sm0/${P}-ia64-static-strings.patch
-	"${WORKDIR}"/sm0/${P}-isfinite.patch
-	"${FILESDIR}"/${PN}-perl-defined-array-check.patch
-	"${WORKDIR}"/sm0/${PN}-1.8.7-x32.patch
-	"${WORKDIR}"/sm0/${P}-gcc6.patch
-	"${WORKDIR}"/sm0/${P}-drop-asm-volatile-toplevel.patch
-	"${FILESDIR}"/${P}-LTO.patch
-)
-
-DOCS=( "${S}"/README )
-HTML_DOCS=( "${BUILDDIR}"/README.html )
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		export LC_ALL="C"
-	fi
-}
-
-src_prepare() {
-	pwd
-
-	default
-
-	cd "${BUILDDIR}" || die
-	eautoconf
-
-	# remove options that are not correct from js-config
-	sed '/lib-filenames/d' -i "${BUILDDIR}"/js-config.in || die "failed to remove invalid option from js-config"
-}
-
-src_configure() {
-	cd "${BUILDDIR}" || die
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-	LD="$(tc-getLD)" \
-	ac_cv_lib_dnet_dnet_ntoa=no \
-	ac_cv_lib_dnet_stub_dnet_ntoa=no \
-	econf \
-		${myopts} \
-		--enable-jemalloc \
-		--enable-readline \
-		--enable-threadsafe \
-		--with-system-nspr \
-		--disable-optimize \
-		--disable-profile-guided-optimization \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests)
-}
-
-cross_make() {
-	emake \
-		CFLAGS="${BUILD_CFLAGS}" \
-		CXXFLAGS="${BUILD_CXXFLAGS}" \
-		AR="${BUILD_AR}" \
-		CC="${BUILD_CC}" \
-		CXX="${BUILD_CXX}" \
-		RANLIB="${BUILD_RANLIB}" \
-		"$@"
-}
-src_compile() {
-	cd "${BUILDDIR}" || die
-	if tc-is-cross-compiler; then
-		tc-export_build_env BUILD_{AR,CC,CXX,RANLIB}
-		cross_make jscpucfg host_jsoplengen host_jskwgen
-		cross_make -C config nsinstall
-		mv {,native-}jscpucfg || die
-		mv {,native-}host_jskwgen || die
-		mv {,native-}host_jsoplengen || die
-		mv config/{,native-}nsinstall || die
-		sed -i \
-			-e 's@./jscpucfg@./native-jscpucfg@' \
-			-e 's@./host_jskwgen@./native-host_jskwgen@' \
-			-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
-			Makefile || die
-		sed -i -e 's@/nsinstall@/native-nsinstall@' config/config.mk || die
-		rm -f config/host_nsinstall.o \
-			config/host_pathsub.o \
-			host_jskwgen.o \
-			host_jsoplengen.o || die
-	fi
-	emake
-}
-
-src_test() {
-	cd "${BUILDDIR}/jsapi-tests" || die
-	# for bug 415791
-	pax-mark mr jsapi-tests
-	emake check
-}
-
-src_install() {
-	cd "${BUILDDIR}" || die
-	emake DESTDIR="${D}" install
-	# bug 437520 , exclude js shell for small systems
-	if ! use minimal ; then
-		dobin shell/js
-		pax-mark m "${ED}/usr/bin/js"
-	fi
-	einstalldocs
-
-	if ! use static-libs; then
-		# We can't actually disable building of static libraries
-		# They're used by the tests and in a few other places
-		find "${D}" -iname '*.a' -delete || die
-	fi
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 7b1b2407995c..ada7f4ce7dd4 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index e4cda6e0d023..acae732a692e 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,6 +1,8 @@
 AUX appstream-glib-0.8.0-fix-as-self-test.patch 1105 BLAKE2B 55871bd0e63caac85ab6c2ed40abe9412b47b84132c3235b8c80870299c7d1f120e8533ef048ccd117eeb95cab3dda5497c332d1b14008a68ee1c768cd7c3119 SHA512 aaf7f392c7ea3faa2bd1a9cddb0ec8964432ec35a360715cc6b931209a0fc0fe7b0da79aa969101243908fa513638a208039f888d667410b0c6bbf7c36416805
 DIST appstream-glib-0.7.18.tar.xz 2309276 BLAKE2B 67f414ae45866cab314ed2b307f2045a2035c262810696246f5bdea2a0bac88d98b561f72a8e87608f90407ad6d577d720213461ecef09d277e919b5330c0bc2 SHA512 2a202eb25d823d524128a8ab164025b6579e069f8b62373cf5447d049a0e3764fca5bf1464296101a45870d1426b094493fc8ead07a6a4bcb514c0f1a91e8ff2
 DIST appstream-glib-0.8.0.tar.xz 2315988 BLAKE2B b0858a2dccc70c3eee32262bd83a73ad739d72ca049b23387fea012c68d8dcbaec28aeaa31f81b05dee12c60a5426bdbcf1f22f5a8edbb441c663882c47b1a22 SHA512 13aeb37b8e890691a14d20ed0a86a14ae7125a6e08e60adcefe58ce2f861cebf7f49a01d9d1c137205b923f3162b307fc2671d476b7aaa9eae5fc5234ea4c1da
+DIST appstream-glib-0.8.1.tar.xz 2320596 BLAKE2B de8d68c541cd6700fff0bc22a71d59510ccf584ac1380e2aed3e5aa122825cb3087d65b42ac1dc35acbd4b171382d9560545cdeaffa9d6bda721784444bf7a36 SHA512 32462a32ea25c945abb8d9084af1c84850f264b3a2136c6f54444e0168acf0d74ee450f8cbf483a504e417dc29b85a2e9bbc0a5bb8a217296eccacaa02db5ef5
 EBUILD appstream-glib-0.7.18-r1.ebuild 1651 BLAKE2B 321871842b6b26a0d05825c51d8e1b55577249e78f272c27b17af44431a45413fe659e73948ff260765d41750d6ebdfbc55c0078e8e194f1064e0e4b5e79afc9 SHA512 8fc7c9fb1b9073fe1b7340428c0d258f7d6ae6f2d87eff6b3201334e21aee4cbc60b3d3a61bf09d5f11386cc2d0f2743ba77f011a4612edef3c6043f3a893db0
 EBUILD appstream-glib-0.8.0.ebuild 1661 BLAKE2B ed20b7a3c50fa1bd95da73fbe5c844fbfd8cccff5d6573e4e9268ffa5941bdeb51e75365824839f1260da46f1353ea9384e07a126dbd162db088ca46b5058e30 SHA512 be2e2ce1a38904cdbae11eb893e85f40caa0c29c9f468c382946998e9f0e4af18dcd327b80cee17bad4481f73bd3bbff7585bcd9ecd76e11d164d9a0e9532e24
+EBUILD appstream-glib-0.8.1.ebuild 1605 BLAKE2B b738b67069244c06c830da86c586417d0519286aa79315b3416f32ce434b84b439640bdcb5ec2392acf7391cce9bb1f813c84d1477f27b197f3a97308019de4a SHA512 c047df33f26a03617df502e8c684cdfbc49350f80b04c4a103ad6d55a6ae491bfab189febda25103753581373ce657c05bec8dab548d257d902410bf14e957c5
 MISC metadata.xml 423 BLAKE2B f1fc786c21caf25b776ccfa366294cd7efe83b5f160517b80b020ae439265c92d5d2377438d8a5c2eb42498562964c1a194289561510075971a6921e87ed8e68 SHA512 d2be7970d5bb30d2de64d6a220be6aa1073c9dc692bb6ed48800ec5b509c2eb265b2dc4a0221dd880952d03fb418cf89ff026efa088ad38304dd6f2270ff8d8c
diff --git a/dev-libs/appstream-glib/appstream-glib-0.8.1.ebuild b/dev-libs/appstream-glib/appstream-glib-0.8.1.ebuild
new file mode 100644
index 000000000000..be7926bb8630
--- /dev/null
+++ b/dev-libs/appstream-glib/appstream-glib-0.8.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg meson
+
+DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata"
+HOMEPAGE="https://people.freedesktop.org/~hughsient/appstream-glib/ https://github.com/hughsie/appstream-glib"
+SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/8" # soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="gtk-doc fonts +introspection stemmer"
+
+RDEPEND="
+	>=dev-libs/glib-2.58.0:2
+	sys-apps/util-linux
+	app-arch/libarchive:=
+	>=net-misc/curl-7.56.0
+	>=dev-libs/json-glib-1.1.2
+	>=x11-libs/gdk-pixbuf-2.31.5:2[introspection?]
+
+	fonts? (
+		x11-libs/gtk+:3
+		>=media-libs/freetype-2.4:2
+	)
+	>=media-libs/fontconfig-2.11:1.0
+	dev-libs/libyaml
+	stemmer? ( dev-libs/snowball-stemmer:= )
+	x11-libs/pango
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+# libxml2 required for glib-compile-resources
+BDEPEND="
+	dev-util/gperf
+
+	dev-libs/libxml2:2
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.9
+		app-text/docbook-xml-dtd:4.3
+	)
+	>=sys-devel/gettext-0.19.8
+"
+
+src_configure() {
+	local emesonargs=(
+		-Ddep11=true
+		-Dbuilder=true
+		-Drpm=false
+		-Dalpm=false
+		$(meson_use fonts)
+		$(meson_use stemmer)
+		-Dman=true
+		$(meson_use gtk-doc)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/cdk/Manifest b/dev-libs/cdk/Manifest
index 83ff1d4b744d..04fa8d90f7c4 100644
--- a/dev-libs/cdk/Manifest
+++ b/dev-libs/cdk/Manifest
@@ -3,4 +3,4 @@ DIST cdk-5.0-20210324.tgz 548203 BLAKE2B 7a944f347bf30a6bf602b9ac61fa547c7b4aef0
 DIST cdk-5.0-20211216.tgz 552041 BLAKE2B ce82ac22d4ec2ed37079d3de52a4f93a4206e5228aa952a3e45294d260c1ffef7c363b2c290060cc909bb8ab4ae88cbedecf498db7bd0f13e2d2822d87d7e4fa SHA512 622e99681af8468aaf8638833d0821c743667fb9b41716fe16acb8e78e8a3d5ba4eb7aced0bc213697e120dcb6e96067d6b75d53531555c3e6d90e4961cb99aa
 EBUILD cdk-5.0.20210324-r2.ebuild 1408 BLAKE2B 289be6470d1a76b8360d1ee588719ef4ec1b638cca4a3e92ba5e1a29374fe4e02fc7b2735d8c4c4099bd374374ebba1ac9f7b43e2bf27395f5ad6bd56ad30f35 SHA512 9a7f5264715654d6e6f66ca083aa8369c7d627c8b08e4a6715fcbd05da76b31e60acbbf2ae61e53afe67aa75d3e29c2e4b48c894950f70ae4ca4f03d618a5e68
 EBUILD cdk-5.0.20211216.ebuild 1347 BLAKE2B bfdf2d3c54dfc3a09934f4f7abbe23d4a82e618f3827f7b89cfe57a1698b2b3ac94fdf06621e283f81462a710b8a728c470c97cde4b1df6ed7af24a72af96386 SHA512 f420682c4eef06435d5fa4dacc49de28c036072befa586a754e806b3e1cd268155a2a0531d4a5424958a12285ca79e66d1efac251c00a3ba7f00012d0a79c4a2
-MISC metadata.xml 258 BLAKE2B 9eea1c1dbc095bcf42ec12aecd34edb7eb5555036e5c4df6f2a99bd4b347b01d29a836383ea1c84766da09449f1f3b5d384ae88d1eca3a5b4bdebb443714ebf5 SHA512 5c828c062e4484fde8de46a476e9a3cc653b8c2863a1fc12a696d72ae81f50e2327e7ec4533085f6bae68c3f85fa6bbe0935a7f286d25363b8f60a99f7804dd0
+MISC metadata.xml 324 BLAKE2B bf46126999ac5cdcd845a040fd4a3999ce2a068e55ef9bb51502318ae95b7fced58a315939649b7f33a7a40f2c4e47a4255c86fd4a4e141cd1513176e109fb2d SHA512 865d63909eea54c984081d7203b09d07439c2b91bf29eabe3d1fa9958fd82e38e19527aafd6ec4e8cfe844082178084b9f418820ccbd22e7c554c770b7d56b3a
diff --git a/dev-libs/cdk/metadata.xml b/dev-libs/cdk/metadata.xml
index 9dc14192b95c..f683d1054e8f 100644
--- a/dev-libs/cdk/metadata.xml
+++ b/dev-libs/cdk/metadata.xml
@@ -4,5 +4,6 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<changelog>https://dickey.his.com/cdk/CHANGES.html</changelog>
+		<remote-id type="github">ThomasDickey/cdk-snapshots</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/foma/Manifest b/dev-libs/foma/Manifest
index 11def9123269..3e4c11394600 100644
--- a/dev-libs/foma/Manifest
+++ b/dev-libs/foma/Manifest
@@ -1,4 +1,6 @@
 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
 MISC metadata.xml 255 BLAKE2B 6fe10a1f843a8b2494606052a69206e32fdd5edf3ca6bdfb661cf6f8e39c0e16fb652acb8697d339770f3559c56a4ba964a0e959b3e0bb456d09ee7570f0d9e9 SHA512 235170971553178916cc484a07e1c665c94cd0a7ec442d2190d3608f7a3441dd2fe08fea666ca23d151077c10c908bc1da0e57355fab43be02711be35531b362
diff --git a/dev-libs/foma/foma-0.10.0_p20220612.ebuild b/dev-libs/foma/foma-0.10.0_p20220612.ebuild
new file mode 100644
index 000000000000..eeada44575e2
--- /dev/null
+++ b/dev-libs/foma/foma-0.10.0_p20220612.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_COMMIT="9e8c3df573015a26c84e113ba710ef3d57c8e777"
+
+DESCRIPTION="Multi-purpose finite-state toolkit"
+HOMEPAGE="https://fomafst.github.io/ https://github.com/mhulden/foma"
+SRC_URI="https://github.com/mhulden/foma/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/0.10"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="sys-devel/bison
+	sys-devel/flex"
+DEPEND="sys-libs/readline:=
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/foma-${MY_COMMIT}/foma"
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+}
diff --git a/dev-libs/icinga-php-thirdparty/Manifest b/dev-libs/icinga-php-thirdparty/Manifest
index 88b9eee436d0..a591b8c85421 100644
--- a/dev-libs/icinga-php-thirdparty/Manifest
+++ b/dev-libs/icinga-php-thirdparty/Manifest
@@ -1,5 +1,5 @@
 DIST icinga-php-thirdparty-0.10.0.tar.gz 576508 BLAKE2B 3e07262415340c413bf79aa3031cf3679f0374c85dad9c41ffed78f65379837fc87df8433ea201b02455bde5c1fee1406f5b149b9d5b39cd726407657bdafb54 SHA512 3f5b6caad23860cecf5f06d165b01211af5284cb3dcb635bdcf4c2118b03c96de40a6d86cd0bccbe0f817ae87cc5d09aa2709ca90f55b948cf975c69dc234e95
 DIST icinga-php-thirdparty-0.11.0.tar.gz 764914 BLAKE2B b9fbe66252edf5f504feab16392c60f4edf142d3644d13c29ba4f0291df40f8b4e3163f6bb97d944827a8a3d88728b5bf1c05ad193a078f889ba917714746c00 SHA512 5a2b9218a0426de6b560845db36e8e113a8be786eaf4ab57ff4f5e0ef485dc426cb0f203b4b45c3b791adb852098b64f2a0099c9909506594502edb2b4d4ee35
 EBUILD icinga-php-thirdparty-0.10.0-r1.ebuild 496 BLAKE2B c7bdb148c91759b9f53e55bf1faa76662da56555605730ad1fbf9615a873fae162cfdf7011fed5908a630ce15e170b7611a3f140bf311ed03bbfcbd4ed320e81 SHA512 30b1270daeb05524441079671b62976ed457ce9c765d0614f21b2ca3bbbeb01df13c6c8dd1b00e82c6300cda12542f2bf43280f7dcd6f4c03dc1c562d01c052a
-EBUILD icinga-php-thirdparty-0.11.0.ebuild 498 BLAKE2B 7e0e627fb516293a6336361303a98a856091a15057137458f9ff85fc42d0af2f97bde2ac6e040f2dfe74add378aee577147ea925d982d73a4aeb40f7ed81d0b3 SHA512 e345dae50a19c336ce201b2a9076e89f21a1a2b1cba00f54749c1e611054f7fd3632ff90747cb62fc551924a7aedf79a08ebaa72d938a28784651a891e0816ed
+EBUILD icinga-php-thirdparty-0.11.0.ebuild 496 BLAKE2B c7bdb148c91759b9f53e55bf1faa76662da56555605730ad1fbf9615a873fae162cfdf7011fed5908a630ce15e170b7611a3f140bf311ed03bbfcbd4ed320e81 SHA512 30b1270daeb05524441079671b62976ed457ce9c765d0614f21b2ca3bbbeb01df13c6c8dd1b00e82c6300cda12542f2bf43280f7dcd6f4c03dc1c562d01c052a
 MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/dev-libs/icinga-php-thirdparty/icinga-php-thirdparty-0.11.0.ebuild b/dev-libs/icinga-php-thirdparty/icinga-php-thirdparty-0.11.0.ebuild
index db39b492539b..4bbb21e3af1a 100644
--- a/dev-libs/icinga-php-thirdparty/icinga-php-thirdparty-0.11.0.ebuild
+++ b/dev-libs/icinga-php-thirdparty/icinga-php-thirdparty-0.11.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Icinga/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-lang/php:*"
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 7b5d5b47b6c0..75105c010d18 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -5,5 +5,5 @@ DIST llvm-project-15.0.0rc2.src.tar.xz.sig 438 BLAKE2B 09f260b30724b41b27ef62192
 EBUILD libclc-14.0.6.ebuild 1453 BLAKE2B 8d049f8f1d7b218f164ea21d289ead001d611c2c2f2432ad4661cece52a19ddcc36090d30d4b611e05403d9141c2a23a68df0d3f627ab2dc4f502b2314c4d2fa SHA512 9cfd836743a72ae4864d89464485b7b7c8e546b43db01b4b973dd50cbb90f0a3e5759e5fb348dbc8e4e73d576823dc6b273e27c9083d631a7fcaa45c6965fa0b
 EBUILD libclc-15.0.0.9999.ebuild 1465 BLAKE2B 58dad6d67bb157d5d4877172bec8048452141b3f64f51e434a8b169fd8206298d61ab9302e75468e299896bfc09fb605fb469a028f5024e4265d04f5c87bcedc SHA512 175d39d02979fddbe46c09693e1aa0491fb30a447a1f2ea305106ccc77c0830029dad316646862055bd8ebc45a52f7a42b039668ff42e2450c0e6821d5c25970
 EBUILD libclc-15.0.0_rc2.ebuild 1465 BLAKE2B 58dad6d67bb157d5d4877172bec8048452141b3f64f51e434a8b169fd8206298d61ab9302e75468e299896bfc09fb605fb469a028f5024e4265d04f5c87bcedc SHA512 175d39d02979fddbe46c09693e1aa0491fb30a447a1f2ea305106ccc77c0830029dad316646862055bd8ebc45a52f7a42b039668ff42e2450c0e6821d5c25970
-EBUILD libclc-16.0.0.9999.ebuild 1465 BLAKE2B 58dad6d67bb157d5d4877172bec8048452141b3f64f51e434a8b169fd8206298d61ab9302e75468e299896bfc09fb605fb469a028f5024e4265d04f5c87bcedc SHA512 175d39d02979fddbe46c09693e1aa0491fb30a447a1f2ea305106ccc77c0830029dad316646862055bd8ebc45a52f7a42b039668ff42e2450c0e6821d5c25970
+EBUILD libclc-16.0.0.9999.ebuild 1486 BLAKE2B 80b3e2ef44fcd760fd1da8a22f6df34fee0c84137d441cc4d0ab16fd1d1d35cd2b12405b61b633b2f8400fde718374cd9f649844b2d5ddbf6d09ddc314b0d1be SHA512 e43d3fa32b92859e3279211a6472a203f6eec746dd1080ed34f4cfac1d4d159535e21e5514c3f3b70ed1d6cf0ab90db7312bc976a68d65af007d22171821733e
 MISC metadata.xml 394 BLAKE2B 2c73a04cae5f0956ff187000d761ce8709fa39ab701f9adf2747f87da65fee48f996a56df540d5b95cfdecadef6383001b5e3dd57e1002f7f494d1ba3ecc987c SHA512 17bc874995ebeff9513d60dc850f3d1c5e7a3417f7170ec727edae1d09fb83242955ad24ff3fd24718a8eeadc80602cbe21618d081d50e6dc809a597dca72df1
diff --git a/dev-libs/libclc/libclc-16.0.0.9999.ebuild b/dev-libs/libclc/libclc-16.0.0.9999.ebuild
index 4ec05a0a963c..535092cda010 100644
--- a/dev-libs/libclc/libclc-16.0.0.9999.ebuild
+++ b/dev-libs/libclc/libclc-16.0.0.9999.ebuild
@@ -16,10 +16,11 @@ IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 IUSE="${IUSE_VIDEO_CARDS}"
 REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
 
-LLVM_MAX_SLOT=15
+LLVM_MAX_SLOT=16
 BDEPEND="
 	${PYTHON_DEPS}
 	|| (
+		sys-devel/clang:16
 		sys-devel/clang:15
 		sys-devel/clang:14
 		sys-devel/clang:13
diff --git a/dev-libs/libgcrypt-compat/Manifest b/dev-libs/libgcrypt-compat/Manifest
index 87ea88144214..e762464f715c 100644
--- a/dev-libs/libgcrypt-compat/Manifest
+++ b/dev-libs/libgcrypt-compat/Manifest
@@ -1,5 +1,5 @@
 AUX libgcrypt-1.5.0-uscore.patch 981 BLAKE2B 0f7bae068fa1c04834a0295b902aa479304a8b9f066d984d28a49c59a5c041281d93a7bc73e053f4098461364e87b7a665cb890b4792cdf221f44593c23fbae4 SHA512 716e182684886c905525ab9218b3453fd968ee8f73da83d3ba97ca84a868e18eb1c1c9bb3891a1e4b25f870eb3d762a5e8a415168c9804e9367d8dd12090a601
 AUX libgcrypt-1.5.4-clang-arm.patch 4189 BLAKE2B 39fb88e752a544232c4c48aa8b8df44952e700966f1cbc361664015d075c1d8ef171ae68e9cabd87cab9ce0424243dfbe71271ce2a984d7ad1bdc8c52efd1349 SHA512 86d462340595420a70977d697237a8bb87583750e90c8368ce783ca0fbfed8816c646dd5e40b8e929fbce29917a2b05bb48a0a492d271605958fcb98faf4caa4
 DIST libgcrypt-1.5.6.tar.bz2 1548918 BLAKE2B 14ff8dfcfd7c5345f1be6d5300b97db27c9ac3c78141cc888ee978882aee39ac386a1e90588d3840bf0595a519437e92fa53b5f73d8659e193a43cfa374dfb34 SHA512 2c16912de66bc83adfbf8f43a2a9f57e1afcc866b1774ec11a670e2a793a7c5f2029d134c0bda681c9cb95f7dcc166133782c124e520b7fbe246ec10a9e1c06a
-EBUILD libgcrypt-compat-1.5.6.ebuild 1560 BLAKE2B 1263cfe7d7f281b19737a9ee4640bdbda4bd9581c3a7cbfb73f64921b5f3d679b0601dce7e77cf345e810ffe67ed68296e5fb15be8a554e6e3daa09073554547 SHA512 787b49b758d421a41e9d063e13789b2909a6b1a6e49e1c8ea6a732ca77ea84f79e32b3bd8d0e69343e0063e825b8dfc32c0c426f800a36f9c87c66edff726ba7
+EBUILD libgcrypt-compat-1.5.6.ebuild 1561 BLAKE2B d7bcafab1ef8408e6238db172f6464d1fb8bed85f8aae996529eb8c5a91e62742941bd8ef207c428c939633e941f23cf826982bcea76d19f2978a9193374a7f6 SHA512 496092531de8de328346df234856b178190237991b2bdc9c6929e29ffc52edb36c1c7807455942a1b4a52ae8a79174bbc646e2ac37919833a1afd588cccdf718
 MISC metadata.xml 248 BLAKE2B 97ed0d2320e1aa2d1cca6b63b0cf9cb07669ea73ac0dad7a8f7db4f510d3b2dc28cbf5a7c019f15ac87c25c5e51e619386694b49d21fc19f4092047c8e382287 SHA512 23bb29604f7cc644073025158d751004189a85fe6be88a7817afebad685c3b73f21cdb3e5d05f16699baa5d6b52f1e3a1f365b1ad7ea09bfcd204182e646f203
diff --git a/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild b/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
index ec5dee1b148b..9cab16a86f27 100644
--- a/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
+++ b/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ MY_PN="${PN%-compat}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Old version of libgcrypt needed by some binaries"
-HOMEPAGE="http://www.gnupg.org/"
+HOMEPAGE="https://www.gnupg.org/"
 SRC_URI="mirror://gnupg/${MY_PN}/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1 MIT"
 SLOT="11" # soname major version
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 00c4900e2ea0..61f8ea57c397 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1,5 +1,5 @@
 AUX libical-3.0.11-pkgconfig-libdir.patch 612 BLAKE2B 90b53adfb90684dd8c18f91a4de5d87df9cf590e097e414eef7ec92221dddbc5b0ade7b3deccd1aed6c7c61c1d9bb16663d2e1910718ced1f21a55ffeffe7a16 SHA512 bf1af662e65d62778fcc946543d41e4fd592a90bb643a8b584916c4d62ddb100c1746aaf0d4b4698c1b97de19926220f7c3c8dd03014febfdce32015571f77eb
 AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c1786eb21c4550d12ed3dd86fe587ca26471319e8a695983529f789085a1e4ca0fae4ca48cab97b5376ed858deede SHA512 16367f68d15112b37266a794efe4a19f7c971fafe48b13c85095f15657f9d98796067bce91680986615d95740269f8fe1d03deb674ce2bb952b462de1d2ab1c9
 DIST libical-3.0.14.tar.gz 887795 BLAKE2B 8c073b77b5e4e6b24e3dfae7ac7a5f88da874bdfa53489cd04afd4d458d2fc963d39c2816691e777003ca9af510ceaf7bab9d7e1021942aa9c3adaad32ca8341 SHA512 36da5516672976c71b049a12af36164d91f9b655f81f1884766558149f25e80c30e64d15da848842f8a629295d708f39ce6fa63a3b0da39b5cbeb91911a4e6d8
-EBUILD libical-3.0.14-r1.ebuild 2433 BLAKE2B a56e65ff0920b976bb409ab6c1e28726a9a23dd4ce17bde1254ed17b44cb4ab6f151fc49777c38408eb15afd3e5f9ea31c5d2e78ee4be04d9a2781f0a10ab558 SHA512 db89e44f96d3f1f8744660289441859234c940e1920fc3eea10eeabaaefcb508e06414d4146c4bf2ebc1d8298945d57103d3989e9bbf4f38d4d5053ddb8f6aa0
+EBUILD libical-3.0.14-r1.ebuild 2440 BLAKE2B f7d4d3913e10543772f7da02b7e46a554e7de91ff58637b9a967b190cf40b26da5c1496461ddc3f30baaeb92e215112da6d4b98adc13e2f244712d8b746ae62f SHA512 523081cc89e4d9773978b0b065f6a731ceeeae45771afd55014e74dac63394f42b8123068d87a2ad28b3c78eee24200860ab4aadaabd6dd49507ee0fe7e67706
 MISC metadata.xml 415 BLAKE2B a03d59a58e875698695319e5f427ef82ef11dd8aaa457cc6647039ec57583d730d53c5040b5b76007bf9662a78684968791f0a15ae7172007d4c49ffe8fd2318 SHA512 0663988285e1881903c0e8f62bd5ef99c26089b54f4abfeaa0a97f5ecc9820586b1a20077ddea24bf4e513b8049110f08c33acde433777adc1dd6d03f7ea7966
diff --git a/dev-libs/libical/libical-3.0.14-r1.ebuild b/dev-libs/libical/libical-3.0.14-r1.ebuild
index 0d3758945c83..8c98c968633b 100644
--- a/dev-libs/libical/libical-3.0.14-r1.ebuild
+++ b/dev-libs/libical/libical-3.0.14-r1.ebuild
@@ -56,7 +56,7 @@ PATCHES=(
 )
 
 python_check_deps() {
-	has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index 693138f0fcf8..cd5a342fddc5 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -1,7 +1,7 @@
 DIST libksba-1.5.0.tar.bz2 656518 BLAKE2B 077655031f82ff13c596ad0be0d0f15408a5b793f00e3af3516f4f207285f7d76096216c7bf11d2c46c28eb332cc74df39bef84afb0f47184c8ebdd8cb92a86d SHA512 84383e8b084bf47ac646a9aacb174e510ffcab4b966b649e4351990eaf7ce78cc9d199e6c4f3a1be697888c857ee86ecef949c06156790c7d8d0bd0fb0142721
 DIST libksba-1.5.1.tar.bz2 659280 BLAKE2B f247a2c9545e3c3ae3bbcf50344ca530ef320d12b9a1e301bca086b0e1a69e6b7a88b912b14f862d82e7ad45bf588754db601d987ee42579d8042e68b5108d33 SHA512 156fe6a36daa7b11ce580366ab36a5fceda253413f0057ace791e4f028fd3158a70a3f6ba1d0c824fafee4420d1076864dbd0911606fb65e14c8b2332b6cc92b
 DIST libksba-1.6.0.tar.bz2 662120 BLAKE2B 59bee23f764ab3e0f79fae6074ffe568845b6089ff29b8c5112973490ff5e1436834d5d0b50954ba9fbd6be655f47043a6345181c5c7e552322ceb331d030780 SHA512 a7c76d41dfd8ec6383ac2de3c53848cd9f066b538f6f3cd43175e3c8095df51b96d0a24a573481c0c4856b09b7c224e2b562d88f5c0801e7acfb582ea2739c2b
-EBUILD libksba-1.5.0.ebuild 1044 BLAKE2B 53a3c6515f07e397a33e68214c3569a29e1c146c38310ba8aefb009b89f5e0055cc721ba0f74c0ff339ef394369c367338cc5830da7d1e567bc95f2fd7f7b7f1 SHA512 b4eb5db5c7e043235df8c2ae1f7f480983e0f7833533460e49ae3fe9b25d165913a755b6068ddd4deb5593785cf0345dfb6a33a423d3ffff895a467193f6b35c
-EBUILD libksba-1.5.1.ebuild 1044 BLAKE2B 53a3c6515f07e397a33e68214c3569a29e1c146c38310ba8aefb009b89f5e0055cc721ba0f74c0ff339ef394369c367338cc5830da7d1e567bc95f2fd7f7b7f1 SHA512 b4eb5db5c7e043235df8c2ae1f7f480983e0f7833533460e49ae3fe9b25d165913a755b6068ddd4deb5593785cf0345dfb6a33a423d3ffff895a467193f6b35c
-EBUILD libksba-1.6.0.ebuild 1057 BLAKE2B e3a7e0a602785a3277e7b1a121d5a25377c867f437d4ff43498bae0aad654a0f7b56ec64895ec6f02d4051beddfc72e17f6ea31e7f0e198325ddb3f86f494007 SHA512 20ca2f2811d4cf0aa53e71d45531dd91d588aebedc25056bb0dcff3c2be653cf1cace7aa39850f7b4b3390cee858a652959796da1ad3d1f0bdc2a72c73132376
+EBUILD libksba-1.5.0.ebuild 1045 BLAKE2B 3a522d4a2e1c74b5f7480643697905061c39dbe8c40f448679ca5102b630f94566766ff286c588847cad686a8aeb24c8105097613359a30a51f92ef26989ce99 SHA512 0a0b32fccad43d1e6c06fc451ea300c847053802157e0e72b5c38501144074a8b3dd6bb4292225ca712c4dd0b5460525ca8b5a8401da9f11a4617d6762365fb6
+EBUILD libksba-1.5.1.ebuild 1045 BLAKE2B 3a522d4a2e1c74b5f7480643697905061c39dbe8c40f448679ca5102b630f94566766ff286c588847cad686a8aeb24c8105097613359a30a51f92ef26989ce99 SHA512 0a0b32fccad43d1e6c06fc451ea300c847053802157e0e72b5c38501144074a8b3dd6bb4292225ca712c4dd0b5460525ca8b5a8401da9f11a4617d6762365fb6
+EBUILD libksba-1.6.0.ebuild 1058 BLAKE2B 51ce7a93f6561d8c631072a742132676eaf636924ab46bfd93fd45f789403c40298ce31a92677e30e43868e7636a95d6740999c31e3f9961ef419ce952f7a6b7 SHA512 9cc8ed42f6fc43ce99294be3c02495e5d5f4918f441d44576e01038571955db9da96268846f1cc90751f91eaf40ccd03cf2d0b6b1ad761000350fc5279f16d85
 MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
diff --git a/dev-libs/libksba/libksba-1.5.0.ebuild b/dev-libs/libksba/libksba-1.5.0.ebuild
index 32f6d92671c7..24c1dc721659 100644
--- a/dev-libs/libksba/libksba-1.5.0.ebuild
+++ b/dev-libs/libksba/libksba-1.5.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="X.509 and CMS (PKCS#7) library"
-HOMEPAGE="http://www.gnupg.org/related_software/libksba"
+HOMEPAGE="https://www.gnupg.org/related_software/libksba"
 SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
 
 LICENSE="LGPL-3+ GPL-2+ GPL-3"
diff --git a/dev-libs/libksba/libksba-1.5.1.ebuild b/dev-libs/libksba/libksba-1.5.1.ebuild
index 32f6d92671c7..24c1dc721659 100644
--- a/dev-libs/libksba/libksba-1.5.1.ebuild
+++ b/dev-libs/libksba/libksba-1.5.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="X.509 and CMS (PKCS#7) library"
-HOMEPAGE="http://www.gnupg.org/related_software/libksba"
+HOMEPAGE="https://www.gnupg.org/related_software/libksba"
 SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
 
 LICENSE="LGPL-3+ GPL-2+ GPL-3"
diff --git a/dev-libs/libksba/libksba-1.6.0.ebuild b/dev-libs/libksba/libksba-1.6.0.ebuild
index 59e487368563..184c9cd1140c 100644
--- a/dev-libs/libksba/libksba-1.6.0.ebuild
+++ b/dev-libs/libksba/libksba-1.6.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="X.509 and CMS (PKCS#7) library"
-HOMEPAGE="http://www.gnupg.org/related_software/libksba"
+HOMEPAGE="https://www.gnupg.org/related_software/libksba"
 SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
 
 LICENSE="LGPL-3+ GPL-2+ GPL-3"
diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest
index 03accaa4c801..6b7837786b4a 100644
--- a/dev-libs/libstrophe/Manifest
+++ b/dev-libs/libstrophe/Manifest
@@ -1,5 +1,7 @@
 DIST libstrophe-0.12.0.tar.xz 397120 BLAKE2B 6ac32e317e14a8641b1d092026772264682b7b0980158757a82036f3db2643a6429e5553d9173b578111d5b8b503e9a98a4e140f98f8ac03866758624a1cec67 SHA512 dd0fc54840bb5626859f91c7bbe5204ea89332856392a5a33c50cf7f66c8aaa7b0d7c24bd737e8473d63f2c9d7683a75dcb9465a19634d14e54c9f8f20580884
 DIST libstrophe-0.12.1.tar.xz 398492 BLAKE2B 9f0e06952603d51a0697366a83d6fa80af09161858d87bee8cfd95786944a58ad1551155b8b7a982646f775a695432822f33b36c6e52161db145dca98050689e SHA512 54e255f756a6705dc554ce75dd6b4ea889822774ca38042548480ea026a7f4d411b4ba30f3aaf88776a0d8437f51eb07fb3675ddbfb0afd661d5f965b280dd52
-EBUILD libstrophe-0.12.0.ebuild 1251 BLAKE2B 98d7083591a20d015b84e5b27a8f338a8ac0c4e10f2fee56f4da13f84f40c965c69851473abf0b3341f4004254ff4fa2c1c539086ef098d12e364a11e623a4ad SHA512 cbbdcfc9e5fe30ba3374e85460d206c754278552b1bb50eb087d60a3541b0043ff77ef8751828c995afdef804bc339ff71b97ffa0b87314a5138ccb3df074571
-EBUILD libstrophe-0.12.1.ebuild 1231 BLAKE2B 98d52c2c1dbdbf6134814b683be8ca553620419612b1b28c0f3c8701fe3e846c5a78a9b59242f9e0468c2f1cab0fc80edc217f3d0bb5c473fe2e75fe677981af SHA512 a48e29ef06a4f22094c74bc55efc9f919a68524edb79de096e8c155d7de559bc4c88e2e93684dd2a3ac4d15a734241b89cbb7c5d3cd670e79ba1d444ef336627
+DIST libstrophe-0.12.2.tar.xz 400092 BLAKE2B 28b655e4bf3a279f837fd26e7c7ba34cd32053ad16be660c04d1c07b5335d805e9745cd24af584ed62f8ae44caebd8bda48473872163c122ecbcd57f042fc3db SHA512 1026f57b107a0ff8f088a5c7f1d88b3b5a35d0e6bfefb4f6eb56de37fe9fd2f554f547663a41353b7c6b01a2aa47f6cab4a9f7a7c87ba8c0c7708d7b2b4c2086
+EBUILD libstrophe-0.12.0.ebuild 1098 BLAKE2B 26ddb67d356153b17703001dde23cb867421a8d0aece702c614c3109a2e0ad67b56faf83d5cb81c2d44964d077a79319a365915aa9aae967914bdba0b906d91c SHA512 7870002f1358c72bf8404f897398eced26ae070a496bd341d3b9185d377d375f254a49df5009b8f35d27880f11f761d6abd4c0fa1bdf61b33cc87faa8e9802b3
+EBUILD libstrophe-0.12.1.ebuild 1077 BLAKE2B 2101b4722ecb56a4b44c996ea117101ac2bb5210b5e9c2985f5e4313786529167e6d18f08af512970548c0f5abdb06f023a8ed9d0f57f4f412fe5c4a01138648 SHA512 d393ebdac2d807007ae611cc00f459409cec134f1b870b5c2de06d7302eb8f5ac2f85b4ecee9e4d34631c4ffa0ab256782a91b3af099d29963280b8854d4d6ee
+EBUILD libstrophe-0.12.2.ebuild 1078 BLAKE2B 458b0073edc90736f2752d386ddd79497b40061452011a1fe1ad09b9931ba96d3aff9bb78e0a8ce74900b7e242affb226301d02c1a73bebcad76585a478954d6 SHA512 6d0e08338357ea7027cb238bfc83fcb54b90042f4e17d643e931eab3d93bbe9e76383d053ff7f378278b721d013c83c4cd76373488c370a7c19ae715175d9c8e
 MISC metadata.xml 711 BLAKE2B 0fc95d72ff0d9dbf1765e8b2ddf7182d6543cecdd275798e79ad8bdf8bc494234f6fcd8acc76c6d3e87f6f4159d4b0ea0e70706932628173b1b75bed6c788701 SHA512 d8eb8fcbadee45ff2d411d766e3fba2afb18b2516eb4172ff2b072ef9b5469d7a92c32a4b70e989fd0b56eeaaad39d5f187748f7aedc6dca32493b1f2d0ca817
diff --git a/dev-libs/libstrophe/libstrophe-0.12.0.ebuild b/dev-libs/libstrophe/libstrophe-0.12.0.ebuild
index fb98239a890e..e883a03f6c63 100644
--- a/dev-libs/libstrophe/libstrophe-0.12.0.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.12.0.ebuild
@@ -48,9 +48,3 @@ src_install() {
 	use doc && dodoc -r examples
 	find "${D}" -type f \( -name '*.la' -o -name '*.a' \) -delete || die
 }
-
-# Explicit src_test is there to document that the test suite is integrated and
-# is expected to pass. Please do not remove.
-src_test() {
-	emake check
-}
diff --git a/dev-libs/libstrophe/libstrophe-0.12.1.ebuild b/dev-libs/libstrophe/libstrophe-0.12.1.ebuild
index a070ad9748ba..a491acaf81f5 100644
--- a/dev-libs/libstrophe/libstrophe-0.12.1.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.12.1.ebuild
@@ -8,7 +8,7 @@ SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.xz"
 LICENSE="|| ( MIT GPL-3 )"
 # Subslot: ${SONAME}.1 to differentiate from previous versions without SONAME
 SLOT="0/0.1"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc expat gnutls"
 
 RDEPEND="
@@ -47,9 +47,3 @@ src_install() {
 	use doc && dodoc -r examples
 	find "${D}" -type f \( -name '*.la' -o -name '*.a' \) -delete || die
 }
-
-# Explicit src_test is there to document that the test suite is integrated and
-# is expected to pass. Please do not remove.
-src_test() {
-	emake check
-}
diff --git a/dev-libs/libstrophe/libstrophe-0.12.2.ebuild b/dev-libs/libstrophe/libstrophe-0.12.2.ebuild
new file mode 100644
index 000000000000..77bb69760d4a
--- /dev/null
+++ b/dev-libs/libstrophe/libstrophe-0.12.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
+HOMEPAGE="http://strophe.im/libstrophe/"
+SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.xz"
+LICENSE="|| ( MIT GPL-3 )"
+# Subslot: ${SONAME}.1 to differentiate from previous versions without SONAME
+SLOT="0/0.1"
+KEYWORDS="~amd64"
+IUSE="doc expat gnutls"
+
+RDEPEND="
+	expat? ( dev-libs/expat )
+	!expat? ( dev-libs/libxml2:2 )
+	gnutls? ( net-libs/gnutls:0= )
+	!gnutls? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+DOCS=( ChangeLog )
+
+src_configure() {
+	# shellcheck disable=SC2207
+	local myeconf=(
+		--enable-tls
+		$(use_with !expat libxml2)
+		$(use_with gnutls)
+	)
+	econf "${myeconf[@]}"
+}
+src_compile() {
+	default
+	if use doc; then
+		doxygen || die
+		HTML_DOCS=( docs/html/* )
+	fi
+}
+
+src_install() {
+	default
+	use doc && dodoc -r examples
+	find "${D}" -type f \( -name '*.la' -o -name '*.a' \) -delete || die
+}
diff --git a/dev-libs/voikko-fi/Manifest b/dev-libs/voikko-fi/Manifest
index 116e3c93e959..e48df4aef2a4 100644
--- a/dev-libs/voikko-fi/Manifest
+++ b/dev-libs/voikko-fi/Manifest
@@ -1,4 +1,4 @@
 DIST voikko-fi-2.5.tar.gz 703898 BLAKE2B 596425311bcdbbf8af97bc32cd69c59cdfa56300afbce22501f084b138ffbd7a915f08628e40a832110e9d366d128747d7e7a0ebdfa38a7734c4f1c1cb303997 SHA512 6de3c6c13a9fb05a463a55177dc1707d5e4ca01c7ccf08e0f8ab73cb3a353ee4935adc23a1b5f6c5da568dbb075c081a700d8d46eb99b6bcbed0efb4d977f59a
 DIST voikko-fi-2.5.tar.gz.asc 833 BLAKE2B 329d442064adee3967b703e19edcdfb20a03e3337751282129e2816f265fcd4ada9c2ce82c146bcde8a644e47b462404ce9abf99f5bc6d2fe2f986f83b73d1e1 SHA512 ccdaa4e76b81f8ee8fcc20c1d870200a1255f9aa84c8dae139f343e8b2cc9ecefb38a16af8653e9c94a1e5cba25c850b8309d406e3d5b323864c8c0ad38979eb
-EBUILD voikko-fi-2.5.ebuild 871 BLAKE2B 99b3b6a84fac386874178d02d491dc024f06167fba19bfce81f2789743b83f7ce1faf9afe3bc408f7af5dfd246db07175ca1cb372cb3ef7e1e504c759903b187 SHA512 4a42ae789bea826b95e546f9a1ecb6eb3ccaad270462cc00434c2c2b374b1211b94b721665dc3c2c497e4e0e26f3dde49ae31e0fe7035861457793b6c8a98031
+EBUILD voikko-fi-2.5-r1.ebuild 873 BLAKE2B 20b00457c190b968097b3a183865c91c0d11c3ffc5d573bac8114cf0f0a8d16794cb4218822dde7c1bc25d877ea0b25dfb517b2653cb30f88c961e2dc6111680 SHA512 c56d6dea1f4ed8f6f4f27bfb6964dbdc385acaeff614ff48fa88a5e0d6705e1a32241d411f3b2184a5a2ee5131d5285b5b91c85fb0c353ac1aeb52006222cee9
 MISC metadata.xml 255 BLAKE2B 6fe10a1f843a8b2494606052a69206e32fdd5edf3ca6bdfb661cf6f8e39c0e16fb652acb8697d339770f3559c56a4ba964a0e959b3e0bb456d09ee7570f0d9e9 SHA512 235170971553178916cc484a07e1c665c94cd0a7ec442d2190d3608f7a3441dd2fe08fea666ca23d151077c10c908bc1da0e57355fab43be02711be35531b362
diff --git a/dev-libs/voikko-fi/voikko-fi-2.5.ebuild b/dev-libs/voikko-fi/voikko-fi-2.5-r1.ebuild
similarity index 97%
rename from dev-libs/voikko-fi/voikko-fi-2.5.ebuild
rename to dev-libs/voikko-fi/voikko-fi-2.5-r1.ebuild
index 24cce961816d..71c2acd08a57 100644
--- a/dev-libs/voikko-fi/voikko-fi-2.5.ebuild
+++ b/dev-libs/voikko-fi/voikko-fi-2.5-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-DEPEND="dev-libs/foma
+DEPEND="dev-libs/foma:=
 	dev-libs/libvoikko"
 RDEPEND="${DEPEND}"
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ad00f1a9c970..af50851e08b6 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/asttokens/Manifest b/dev-python/asttokens/Manifest
index edb123a0ec44..c95d63e687b0 100644
--- a/dev-python/asttokens/Manifest
+++ b/dev-python/asttokens/Manifest
@@ -1,3 +1,5 @@
 DIST asttokens-2.0.5.gh.tar.gz 46876 BLAKE2B 8a8da138888de0a4096b10eccc483c9540710acde0da188ed3fb3845f96b862fe2eec393c69ca62e7b313bfa0e2f0d673d828e9d1ff6dbbf5b641fe8122a548d SHA512 3e710ca9703e67643bb9c0a4db4e5c1656e6d5c904a1262a9ddb962beff06e4e8bd9815bcd2509b48974a97a565d8479a4369583c166a65b6d16c19fd926e93f
+DIST asttokens-2.0.7.gh.tar.gz 50675 BLAKE2B 75fbeb61b0f3ebba27cb3ea94d45cdb5810bb7b3b9cf1cdacc8e48fa800207af0e9ff4c162742944f30ca5253331f0f55aba21b6186d8a747e8e25f7b350baaa SHA512 eafa47f1e0683df2fc4f93a1f798b845f2d10b63f33eea689333df32e6ffc2b5e693298d912e82974ef4c65d3472aece3cbd0ecd05fa565eb0f94a45915f6905
 EBUILD asttokens-2.0.5.ebuild 931 BLAKE2B 1204fceb0c1f7c42e69597bc894d14ccdd618046a5d6d5b0459e415070cd2b3e9a4c83b7e98237e5f8cdb5c01c22b256ea4d2c6b97bf51735571ba15613434f5 SHA512 2902e7875746e415567de5867d2bbc21a725e1b8d55c6d1364ad16de5f62a40f3f7b233ab996cbb0ef9c65c130758e883de2ef519c2c50755a9ea1ad06d2dbed
+EBUILD asttokens-2.0.7.ebuild 977 BLAKE2B 959cd5ea32e19d1ec47961f814a26edffad66f79bac906a64e8eb6ac39eb9992c0ef4923aabe87bb803208b7bf7ee75abc4c3bfb95cb53734ac450e9ea3fa134 SHA512 834be7aa087a7449f3183b1e05b7306b102d4332b81f5cffd57a5823decf4eb27e83b52dea6a4470c37304933c10f06ecf95fc934407b9472f742019113e2e98
 MISC metadata.xml 350 BLAKE2B c05dcff93454660cb741def5cb0ca82e56f0cba84bddb9604153b6d70625e4dfc9e15743c3448a0cb68d9b5ccf0778f8126390872bd8689df0e0ab2bed7e6582 SHA512 521762b1e8a542c5f3156014884c3d845b6fe882e819c924aa8023f8dff32a94490e64a1d1f700f5127bd867c60c4f0f7c4aed5c39f78e52bd8ebabd113403cf
diff --git a/dev-python/asttokens/asttokens-2.0.7.ebuild b/dev-python/asttokens/asttokens-2.0.7.ebuild
new file mode 100644
index 000000000000..839fb416705f
--- /dev/null
+++ b/dev-python/asttokens/asttokens-2.0.7.ebuild
@@ -0,0 +1,43 @@
+# 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..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Annotate Python AST trees with source text and token information"
+HOMEPAGE="
+	https://github.com/gristlabs/asttokens/
+	https://pypi.org/project/asttokens/
+"
+SRC_URI="
+	https://github.com/gristlabs/asttokens/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/astroid[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# test suite itself broken with new astroid versions, upstream less care
+	# https://github.com/gristlabs/asttokens/issues/79
+	tests/test_astroid.py
+)
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 29efe5f0a6c0..23274ea53722 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,9 +2,11 @@ DIST boto3-1.24.36.gh.tar.gz 522156 BLAKE2B b76cb50f01ff85c960a0984f950e72f02ac6
 DIST boto3-1.24.41.gh.tar.gz 523844 BLAKE2B 0cff30d6aba5e8eddb8f545737e22a146ef9a3c33df2ad5b4f6d0ef8fd67cb46183eb7fa21e8a961d2597df8d965478bcb0038f5dda117611bcfe15f0de26eac SHA512 ad3a6035352c54f7ba0197357a5a4e001c8fe7548121a9a3931acb69f9c098feb8da1d1699ac98d3ff00626f39082753434f1c992351a82cf269ce2c6a4eab06
 DIST boto3-1.24.46.gh.tar.gz 524945 BLAKE2B f26235fb6993a9dd09fca562315c8ec7003f122fe63851eb7e9db47519b311557665998ba61dafbebcec825ff0b5ff55d329dfd41523b90a387bf590e6205eda SHA512 922423beac0f7ecefb44c474ba8a928f3faec0adc945fd06958c9ffdad612bbb3d0be9dbb68249bcb6cd12446f858c208346808239f37153e6631defb74189bf
 DIST boto3-1.24.47.gh.tar.gz 525452 BLAKE2B 2c191fb2de8d03f1529a8b9c7d9cb6c21ea86415108c79dc7c06071bbaa1d94c491ca05348877dc8352094c626c60a6a07e336af4241b7bde1154a4ebeac371d SHA512 dd3807ef9ef28a5c6bff20b801a33ae9c150a6ff57bf4af645d8d6a5de05e8507289b9714190ca1e80400c637cd1761a2c568453d2d7af24e71ace93d3e5355a
+DIST boto3-1.24.49.gh.tar.gz 526085 BLAKE2B 8372c65dbe92fee877a9aaafbbeda6ee6df672e431e40e139ad5cd852cc15d2d6add34de0b8c34bdec8d39947940891b949d1720425e1311dc5e45f724a89bf9 SHA512 baea5b18407052b9391d7e5ad3efd124d1448f7fa7e2f89bfc04bc417e395035aa9d2cfbbaed822328baf7f81dbed81bc3c66dcaa66598a97b53c8c08cf61366
 EBUILD boto3-1.24.36.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.41.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.46.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.47.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.49.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.49.ebuild b/dev-python/boto3/boto3-1.24.49.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.49.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 2530a0589cb4..aa8eb3920e1c 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,9 +2,11 @@ DIST botocore-1.27.36.gh.tar.gz 9465835 BLAKE2B c22c341d6e762316f3d8719bd8c1fd52
 DIST botocore-1.27.41.gh.tar.gz 9493802 BLAKE2B dff510a658e77fe7185a8d118228cd80d06ea066328d39c56eaa8f01459dd11131ca73dcfe464a5e1403f8aceaa96065d5ea335bb268155c81c9b71299488d45 SHA512 29f419c4338e37bcc7fce38836b1f3b0ed1e552ea94cbe77ea09cd18c3c0b80d3405cd4a3468570c7eb6f1301bfed0d26dcc98feb7a1f62b9e8b1b11c61cdac5
 DIST botocore-1.27.46.gh.tar.gz 9502831 BLAKE2B 75b4ada461e43573c202efdf12201dad8af017ec85c82d0e7cf9ba1823dfd988d4432daef13891a9b8063003a37432a041847cedf46d4665305f486f498edd8c SHA512 1b7719f2216ea170b8739811da2e11acf033919d826c138aa069b19250036b1b2f2cf276d71e464afc6fff63ed99333e6cc321e84139b55e02dea365aa71adc3
 DIST botocore-1.27.47.gh.tar.gz 9506174 BLAKE2B 9fe05af1b1cf7df90c61e15c0ad8a701082a15d206830167f8fa2cfef79538b99928442a9e007eb8f92a5d20513eab096a84a97aac6d8bf0a9adcce3cb50cfb2 SHA512 043bba6ed1f5987dff759c67faaa9ecea16cdafc1d48fbcfecaca393530a298cf31d990bbade4db1d149acc49ffb0dcc2d1eab46b77a4e5eb59d3502c1066889
+DIST botocore-1.27.49.gh.tar.gz 9510394 BLAKE2B 01a0f2dd80adadc3bc1acb3c26e3280171d11e0e1bd14535214aab7b01a5f43c7f707b6396a83a77edfc417c2047ca2d11b52550321acd88528c93a02250b079 SHA512 30f9891eed6277cadc3379f23214d08caab917114bceebd3400c64f8271d449609b9f3bc31c01976e705b565d136f8d1fab1f0bd3ee2870880703d6b40244f1f
 EBUILD botocore-1.27.36.ebuild 1610 BLAKE2B 19f47b6c38de4ffc3a0623bc006b257260abb255ab63d084bcea3552b403d504ddfbe7191494aa8dba8d19a445b55c9dc6c977bf5f0877dba72a3ca69cdbff43 SHA512 fcc38a1393610e2eb729cfbf3a9f579ca840a8e712fe2123235cec4aefc68c96b099821282a68de737bef5e2d1f1f4b00e64e1665985f718201909e1b56994bb
 EBUILD botocore-1.27.41.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-1.27.46.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-1.27.47.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
+EBUILD botocore-1.27.49.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-9999.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.27.49.ebuild b/dev-python/botocore/botocore-1.27.49.ebuild
new file mode 100644
index 000000000000..6558cbe56a50
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.49.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cachecontrol/Manifest b/dev-python/cachecontrol/Manifest
index 6b06fc80863b..f3785e7fa782 100644
--- a/dev-python/cachecontrol/Manifest
+++ b/dev-python/cachecontrol/Manifest
@@ -1,3 +1,3 @@
 DIST cachecontrol-0.12.11.gh.tar.gz 41338 BLAKE2B 09ce2336216b69dbe9796d658db9f5b0d378259484cba3a78ecd789843e19683adc2b1b90d579cea8700d07ed55a93ecc3a56e5da2c8ab025e5084d2847d4dbf SHA512 be1c91f58edda36192f1267a8fdfdc50685ff57da5d84f5348b608982327993333f18f5c318a20cf258b16d2bc83272ba58317e8c4c44a84d5d1f93b522dfc8b
-EBUILD cachecontrol-0.12.11.ebuild 755 BLAKE2B 4ab61172418eb3b6958d346c2a788f736baf7ec4cc1f1b04daed557428a35298dda82a836855be5d99fbc1aaa3bf8ac8241bf3eb7b10a6712b9c75816587e7a3 SHA512 780fe396777e6d539902c852f3dabc8b9d1f9402d4d33523f257f965b3c667797aaa8fa476aa5631024a9fa8de1d6eec45604fb5617666ac2eda3c60ecd75c40
+EBUILD cachecontrol-0.12.11.ebuild 755 BLAKE2B 7b8cf66d600e982f79382dfbde36e822ba028049290094bba0945f39f644cfb553f51065d795a03dc22dfca1537095c32fd2a5a8878916a1a7dc8401477be1de SHA512 89e119469d462b93076c36fd80cc8281b88267e7769c4964707adc0a2f0b12bfeeea29df253c920efff474a601acedf25f27848be78ab3cd3d72e7fe12984018
 MISC metadata.xml 400 BLAKE2B 0a4de3dff77966722a153ca7d1b4e6531932fc2ae1c99bf4c7482fa83a35ccdc1bf647e3c7a9097ff2844e2127af90709a47ed4f6b47e38c1ca0f240896b270e SHA512 992efa678056928cfaeb04df9a6a7c5523bef32ea0665d86e06faf7b61decaf424cb1c8f813fe19bab74ab25427b5a70f3e106e61cfaab1cc3fa3a359f052e8c
diff --git a/dev-python/cachecontrol/cachecontrol-0.12.11.ebuild b/dev-python/cachecontrol/cachecontrol-0.12.11.ebuild
index 415ebf228fa9..6519fd738c06 100644
--- a/dev-python/cachecontrol/cachecontrol-0.12.11.ebuild
+++ b/dev-python/cachecontrol/cachecontrol-0.12.11.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/construct/Manifest b/dev-python/construct/Manifest
index 665ff150f9a5..bfc5ee0d7031 100644
--- a/dev-python/construct/Manifest
+++ b/dev-python/construct/Manifest
@@ -1,3 +1,3 @@
 DIST construct-2.10.68.tar.gz 1190512 BLAKE2B b41e5b3b62cd1568c78ac4975b0d66e7a7ad4489e97031d3e866ff8eb98eea4eb387041dce15210304c608e0c419548cddea3557c2f53d52ecbcf6eb5be67749 SHA512 2388751323b16b69a06457c4862e7d1334580c201050734f150ab4437e2066ed18ff5323f7d81b8bb93124ae0f57a2ae91d7c64ffefc6e0369d6e625b7fef4eb
-EBUILD construct-2.10.68.ebuild 1048 BLAKE2B e914f94d7683960265f067617abb64e740c74295032fcd2335c60e874c042b4d0a9dbd6d7008dbb5fb350cdcbc6252000a944e80b89a5638e509f0b44e78e72a SHA512 5848649ecfe1c23cbbe4cec5865085cd31153ac23c0d5a1ebf0fd568caa3c926ba1ee0e28317f22f2a437b92195877edda5ce0d94bbfb0f9fc46ed880f03a1cc
+EBUILD construct-2.10.68.ebuild 1048 BLAKE2B 400663bdc444aac4f6339e7d96c04dbe64b91a03f3f509eb66fa3aef690fbf8676dcf963b2cfb2b0750e62ecb211ca14440d0bfd5b1a14ee275eef078833a76c SHA512 4f261068ca5bf64530bfb68fbcb3a479e7c8e4f81090f59d7131deb87528ed0765e8e806bd2b1614008ed1db052c4841d9a173ef4a564196c4a9e10edbca8725
 MISC metadata.xml 530 BLAKE2B 841ba440080eb109449759509abcefb1449a87e3aed1f63a2acf021e6bb8c18e67d4e7e6c85d530877b7a2eb3de167708a728ad35507e3e6268f2d3f202018a1 SHA512 6c0e4d31dfaf335a7f94bc21866791100f8e96f5d58aaf988a48c55a054f5ac5d7ef579943a01d68e1403432b33f62c241b2a06dcf874278a1424f3cf60c8caf
diff --git a/dev-python/construct/construct-2.10.68.ebuild b/dev-python/construct/construct-2.10.68.ebuild
index 727d0a891abc..4f911c8266f0 100644
--- a/dev-python/construct/construct-2.10.68.ebuild
+++ b/dev-python/construct/construct-2.10.68.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/css-parser/Manifest b/dev-python/css-parser/Manifest
index 242717788187..d12ab93eed4d 100644
--- a/dev-python/css-parser/Manifest
+++ b/dev-python/css-parser/Manifest
@@ -1,3 +1,4 @@
+AUX css-parser-1.0.7-python311-tests.patch 1849 BLAKE2B cc0912aa456246ad2a94b54f3871cc407ca3aeb3759bbe208a4c51784fb96e5bfe03cf79bc6a051524d6d420ef55bd537c2c7875516b9a269e438961d1a54e6f SHA512 6e58df270716d9de01ad04cc3d31a7750f481c7c1ca44cea5950b46a5b2a252d6de3ebfc32fea530f46bfcc8b930d8527c5e2bfa05764d8049739d8b60230b27
 DIST css-parser-1.0.7.tar.gz 348843 BLAKE2B 72fd2a0555eea2b912d3088b1d38a4bf082862a47a414c4c00718ad1b31299a3df3b2e9dcf4f22c3195520c28f5652aaf4103a9a999ceb3ea6b8c785f50bb40e SHA512 51e4ca836b18f963d798a14762bed78cbd3034598cc828dfe81b3f7d921a5bfe52374b0dc6160e1c01e40a8c8147a10664b9f7edeee867ca1086e6a4a96ff162
-EBUILD css-parser-1.0.7-r1.ebuild 536 BLAKE2B 6843a32f8c6d140728c1b44d87962f6076e4f17bb90eba1779f0990d031bd189999103b33e9d941034136b66ccfcb62d872121a485568766b541739787136a85 SHA512 994ff8ea97b2923ef19330304a77cfa3340486ec1c74373520d3a1588340dac970140c910333f6afcacc25cb89702b4003f0e7e22e5fb9372c1930b03c466c66
+EBUILD css-parser-1.0.7-r1.ebuild 591 BLAKE2B 083890af76373542ebd416e8dbb2442067ffa8cd31cf32ea815d203f28944a54ec5ea155b36aa4936e5b2b5f5277215e21babd415c2997472b369cb40aac8ab3 SHA512 0d12e750eea1bbb177d382c98dc92c73994e84bd8f579c1ebdda042c6d7589d5c50f4f2775deb2defbba50698d37b786e9544598b53156c9b5ac984247a2fdd5
 MISC metadata.xml 479 BLAKE2B 117a5a889216d7f10d68f4f61a5787e5c921167a26d099e1f268916f5e96c8332a396d2a41d76411e48a67991473ac2dae158b8c978bbc6a88cc015e79d32f5a SHA512 339cb0d6b67f1aa92e4ebef1ffd1dd79975e92d67b91c0fb88a39ae6bd54a7e713964655d8e486b7107562cb5b186404714531c5b348985cbf8d598c00b29f75
diff --git a/dev-python/css-parser/css-parser-1.0.7-r1.ebuild b/dev-python/css-parser/css-parser-1.0.7-r1.ebuild
index d450388f0198..91c945604f6a 100644
--- a/dev-python/css-parser/css-parser-1.0.7-r1.ebuild
+++ b/dev-python/css-parser/css-parser-1.0.7-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -20,4 +20,8 @@ BDEPEND="
 	test? ( dev-python/chardet[${PYTHON_USEDEP}] )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-python311-tests.patch
+)
+
 distutils_enable_tests unittest
diff --git a/dev-python/css-parser/files/css-parser-1.0.7-python311-tests.patch b/dev-python/css-parser/files/css-parser-1.0.7-python311-tests.patch
new file mode 100644
index 000000000000..c9e4801cafbe
--- /dev/null
+++ b/dev-python/css-parser/files/css-parser-1.0.7-python311-tests.patch
@@ -0,0 +1,51 @@
+https://github.com/ebook-utils/css-parser/commit/ad79cfcb6e55837a4353b92d051de023c18f6581
+
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Sat, 21 May 2022 14:21:28 +0200
+Subject: [PATCH] tests: adjust exception string checks for python 3.11
+
+Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2062102.
+--- a/css_parser_tests/test_property.py
++++ b/css_parser_tests/test_property.py
+@@ -5,6 +5,7 @@
+ import xml.dom
+ from . import basetest
+ import css_parser
++import sys
+ 
+ 
+ class PropertyTestCase(basetest.BaseTestCase):
+@@ -162,8 +163,9 @@ def test_literalname(self):
+         "Property.literalname"
+         p = css_parser.css.property.Property(r'c\olor', 'red')
+         self.assertEqual(r'c\olor', p.literalname)
+-        self.assertRaisesMsgSubstring(AttributeError, "can't set attribute", p.__setattr__,
+-                                      'literalname', 'color')
++        pattern = "object has no setter" if sys.version_info >= (3,11) else "can't set attribute"
++        self.assertRaisesMsgSubstring(AttributeError, pattern,
++                                      p.__setattr__, 'literalname', 'color')
+ 
+     def test_validate(self):
+         "Property.valid"
+--- a/css_parser_tests/test_selector.py
++++ b/css_parser_tests/test_selector.py
+@@ -11,6 +11,7 @@
+ import xml.dom
+ from . import basetest
+ import css_parser
++import sys
+ 
+ 
+ class SelectorTestCase(basetest.BaseTestCase):
+@@ -412,7 +413,9 @@ def test_specificity(self):
+ 
+         # readonly
+         def _set(): selector.specificity = 1
+-        self.assertRaisesMsgSubstring(AttributeError, "can't set attribute", _set)
++
++        pattern = "object has no setter" if sys.version_info >= (3,11) else "can't set attribute"
++        self.assertRaisesMsgSubstring(AttributeError, pattern, _set)
+ 
+         tests = {
+             '*': (0, 0, 0, 0),
+
diff --git a/dev-python/ddt/Manifest b/dev-python/ddt/Manifest
index 640cac82d92a..e8e4e90c38a4 100644
--- a/dev-python/ddt/Manifest
+++ b/dev-python/ddt/Manifest
@@ -1,3 +1,5 @@
 DIST ddt-1.5.0.tar.gz 19609 BLAKE2B 8986a7e3df8212dbd5ec6fd15e5cc73c5da65db56cf9234acd83649fc5fb988eccb9605a7fa09188ff9499e759c84ff076d86fbba2e3eeda054224acc8382626 SHA512 91faba2bed66df5cf366011343886e3f0059d4e0f44ca46ffcfed7288068ba43a94a426bd692717b3ea735437ee6c0339d42b5c15f75221386153c035597ae5c
+DIST ddt-1.6.0.gh.tar.gz 19615 BLAKE2B f79e25e9da39615d85f000c1029babef64725b159a2b77003efe9f9c5869fb26087fa20e1a58eea485479b12ee89c602076613a9d50711347a775a09c4bbb180 SHA512 c5ea14d3f60384676d9631c84d938b774dd360cea9b0ee1b111692dc2bc06238b5ffd3ab8950207b77aa007bac0ac79b290533a2532be4bee68b642629843a82
 EBUILD ddt-1.5.0.ebuild 668 BLAKE2B 92a0a26887ff2edd73b0a22b61352ea017085e193775839a94a4b720bfc9edab45322a61cf2e1296d93cb35aa849672b8bdaab71e9ed4f0c92170f80836e5ff9 SHA512 6896314ece65c22752c586aee741f7ba8da3c781b26b206a233a479570931c0e746a8cce263224c0aa4c33dc23149fc047841d0ffeac8bd6e704fa7934800e45
+EBUILD ddt-1.6.0.ebuild 679 BLAKE2B ef315e2be96a1cdbd45723f43611ddff751341a3674f4113eb045fd17b537b950d6ed6dbf8006a0de317d4a2ae22963f2798e6d72ca601d2f0bdcfd3c6ebecd6 SHA512 c26aab312f46b65a7cadc188f8078dedfe5d0539033cd3f672d01ae26155acd24b4e367e096ee570307c3f03dd5612aac7f6430ee2d7bb00f3ad3825be3f5f67
 MISC metadata.xml 637 BLAKE2B d7aca1ac2fde8171ceb8fab19b6be2f32125d3ceb411adb504e66a024bbaebb3be0234f17ea0c07073c647d4e613cac889cb241c49ade87f168218056fb8afee SHA512 7416856917a9b619b7884f9a8fde9fb30ee03223e9c8dd45920c43f296a469ee70d79ba999bf495d97ac41d310d17949674f87c0d365ac940eae37aca2ef8d94
diff --git a/dev-python/ddt/ddt-1.6.0.ebuild b/dev-python/ddt/ddt-1.6.0.ebuild
new file mode 100644
index 000000000000..01c20fb5b0e5
--- /dev/null
+++ b/dev-python/ddt/ddt-1.6.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Data-Driven/Decorated Tests"
+HOMEPAGE="
+	https://pypi.org/project/ddt/
+	https://github.com/datadriventests/ddt/
+"
+SRC_URI="
+	https://github.com/datadriventests/ddt/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/debugpy/Manifest b/dev-python/debugpy/Manifest
index 41c7a9c89dc9..f075d11646e2 100644
--- a/dev-python/debugpy/Manifest
+++ b/dev-python/debugpy/Manifest
@@ -3,5 +3,5 @@ AUX debugpy-1.6.1-unbundle-pydevd.patch 2908 BLAKE2B 2c9ef22ce4e00f8a7bafa4097bf
 DIST debugpy-1.6.0.gh.tar.gz 6366079 BLAKE2B 134d2adcae6ec926dcdb7161f0874b830a1d0e3c55abb991f4861fa5a58045437ee4f4cb4c9572b902e3e33634bc3f9970ae055985b983d89d0ef1d99561bda8 SHA512 fe245d4ff751a6c2ef0e75a5249f99661b78075ac62c931c20e3ccbc9389d39a08dc2fda44a33eb23a0a76e5ee339edae439b0004d130cdfe421048f3cc83962
 DIST debugpy-1.6.2.gh.tar.gz 6684477 BLAKE2B ab1bdf394d3447ba347db149e5c4c36820df6df24c5d0984fe862419a490cea21b240322d76644bc9ebadbdf9a6d6c8709ae28452828d42b45d65edd2d2e58cb SHA512 64ecd9f8290588358abcff538f2c68025f14efc38ac5b406f32cd40a580aab90e0b2f145de90ca81943872c70969d6294ac51b3151bc4e03f18370ddfbb9ac6c
 EBUILD debugpy-1.6.0.ebuild 1102 BLAKE2B 7d06281e8ef9398df0abec8a4f80343164406d12309612b11c2427354cbc10c7ad87eb6c2b69cda51238d3747d7f67abe70a6112feba12571316e5521f56fe2c SHA512 bdc106ee170b4d9b72a7e85da442ea64d5dc25b668fad251c4d9ad494d09b40c6fe58e047dc4707aa3439bfeb90ef98d6a78838c56aee06504ea2eef94a9f27f
-EBUILD debugpy-1.6.2.ebuild 1135 BLAKE2B 2f0cd31012fc4def9763ae604213bbf2c08b9324ba1c68fe7ac4617a2bd216956e93e062b2f40840d3dd29e1a214a7859a2e95b44efb1f8da7eaa56c44daad6d SHA512 e3b1d6ce37fafbee44ea0562ceeb52f81f300695cb0c0a1ba02ca3b70fe02e582fb3adaacf0cd2448aba20b9e18ffb8df04c17a517cac88532a41121d4d401a5
+EBUILD debugpy-1.6.2.ebuild 1133 BLAKE2B ff127e82e58d473b9f33d7d801c650c30632629383082e4a410d3a2a77a570fa8f782313edc99a7c2c2bd51a77323a88813ce8936bd9c4eccb52cbe26f31586e SHA512 652f6c52e02ddfdfcf78c663e02ee7b3f3232ffa3134c065713f46378d87133d6b18d4de99d8868d3a47536b195c888a5494eb8ba040297b571b72fee7f0d842
 MISC metadata.xml 451 BLAKE2B 671153316362e0394ae59824e67f5ea897615d3853552aa92fb273d4a41a88916cfe03650ab42248ffee557cb95149b21160395e0fcb2f1fd69bb3bc2c97ea55 SHA512 393d4898c3555b425c34dad5f540f42fc8e281f6299360d1192d099e73486467c92ed16ca710e34d2868aec63fca2eab4775b86e95e6dea79b8721ff70e1db87
diff --git a/dev-python/debugpy/debugpy-1.6.2.ebuild b/dev-python/debugpy/debugpy-1.6.2.ebuild
index 307130ce5da2..f1590800df08 100644
--- a/dev-python/debugpy/debugpy-1.6.2.ebuild
+++ b/dev-python/debugpy/debugpy-1.6.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 # This is completely broken
 RESTRICT="test"
diff --git a/dev-python/editorconfig-core-py/Manifest b/dev-python/editorconfig-core-py/Manifest
index bb583ddbe1a5..4d8438aebbc1 100644
--- a/dev-python/editorconfig-core-py/Manifest
+++ b/dev-python/editorconfig-core-py/Manifest
@@ -1,4 +1,4 @@
 DIST editorconfig-core-py-0.12.3.tar.gz 19261 BLAKE2B 58cac122cfee19527bc45def7e923da50982de0e2cd443cf67dd824c050fb12352b85a5679815a701bc5b8d88a089a0a98280c364730086d01b80f119ad996a4 SHA512 005d0698c410c8865d177a1e891b5c51b15255f36303b116fddbbbc08e309d1d60ca3003d27e6fd8455e53c5956db0c29e298f22f4b10950e1f7c56c7c6e0ab3
 DIST editorconfig-core-test-abb579e00f2deeede91cb485e53512efab9c6474.tar.gz 7900 BLAKE2B 9ebdb5e522948bc9e86ea84435ccaa11585a8a12f4cd6fe54c64d78917281c913568351767d8077623b1196d84206d1c2d0126a0510f70df484c1b55d829028b SHA512 ae5424b4926d6cb127cb3da473400ced4f7ccf224f7baa8bc5bde0317cc045bb7b99738a56efe5fd0e5a0fbe39b997b9fb1739d24713e7f83b58e987c5e56a32
-EBUILD editorconfig-core-py-0.12.3-r1.ebuild 1123 BLAKE2B ad68edaf5141b8422228bad5ba8bcef3844e17860810683db31ea0dac3b0bb3278f1e3da3bd453860fe1de56d928c95ce82f8c4ff883ecf985e108ad3177c7f7 SHA512 c66b67816cc83aa922d69e791a5aee359e21302ed1e2e3c73803ec3e3d58905121774ed53126087f5413a8fffed48f55670f86a1acde0d1de82b3b2401e98748
+EBUILD editorconfig-core-py-0.12.3-r1.ebuild 1123 BLAKE2B 0935194ba421edcfcb89fb4805ac2eb162fecd41110839949efd04f0c00ca02d0ec943aad065c1b89bec6e8efa2e44de6370292a1f169c00447b9e7c9593c4f5 SHA512 e5f1c381bb7b3bbf9589b338d618e28c5f58879c6c2435b8f8d74013b5407af88595ad2d4c80c13c7d5d6ca5abd3f922a5153fab1b2d2e1623f18559137ca1e9
 MISC metadata.xml 831 BLAKE2B 3eef9346c8fc78e09a5538c3dc7332edf53914bbf042bdb84b4173a3a6c7d00ec1e05054eb32e5641880e65957e1794a15dbcc748caf78e5d648c21b6deecffe SHA512 6de6c0a54227b593460da5c2e77ba739e854eaaf4576df55596d33f18417771d8f911d976fd7605c9ebf2bb332a934a89ef99e01da7940dc1b9603802c2bd949
diff --git a/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.3-r1.ebuild b/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.3-r1.ebuild
index 33ce2edc0308..94256dc40013 100644
--- a/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.3-r1.ebuild
+++ b/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit cmake distutils-r1
 
 TESTVER="abb579e00f2deeede91cb485e53512efab9c6474"
diff --git a/dev-python/ensurepip-wheels/Manifest b/dev-python/ensurepip-wheels/Manifest
index 5af914d9f5d6..9266440f2c22 100644
--- a/dev-python/ensurepip-wheels/Manifest
+++ b/dev-python/ensurepip-wheels/Manifest
@@ -1,9 +1,6 @@
-DIST pip-22.2.1-py3-none-any.whl 2044666 BLAKE2B 702699d059273182f248acb48f6f6c9ec287e2edb3de2c84c05402b4fc82da23c14f76e2d3ed8cc1c281e3c8d8fd1a467963d3b9ab6fa384c16d5057fce1561d SHA512 dad2ce78544502a3ec4492a57acc5c1cf6f34ee1d3200a46cf19246f7eda701524d745237909b154317c3d6be6d4e61b086be9562d31d54b60268ca573692638
 DIST pip-22.2.2-py3-none-any.whl 2044706 BLAKE2B 254427e593e44d9f1ce48276fd40f214e8ca9d27b6c31b7a6ed5fa4566df6b1f723215c6a1766a534ce18174f2363c383dbff19368d1b89f1519a53bebd34215 SHA512 142d3144c14b692c645613d98bf35dd91193128d5e21b61a8a702548f1247fac662499d6e39b65c0aa9a0444d2d92983fd8c410439796626485a4e1be99a102f
-DIST setuptools-63.3.0-py3-none-any.whl 1228351 BLAKE2B 5a7a8d864b5fc992952a4c7f0230c3ebb6f33c7b4fc965ca8bfa4cf3b57948e8353f59074f7374e3d002866333d3ad5fd072ccd479f8470cbfcd14aa635efc54 SHA512 f2df66493fb9520b50e3e93560b17e5aa6f01e5fde27028a550249beb54f3ea6b2d8f0a2bcc57afaff193e38d5b217544c0623b254ac300652aed444abf06a14
-DIST setuptools-63.4.1-py3-none-any.whl 1228875 BLAKE2B 8f5a91764f509311f217d9cec6030c8318138d2d60bf8e8cf8ab0d7e9a9d578c1f644aaf30988846c4f22b962b10fa47c2e92cf63ffe0186acaf697c8eb96cc9 SHA512 c73f075f80a97d77906ed9acc1850ab4e458c1d4423a3f9a4b71bd677d7bd0e3ea291683942cd2cc9a91d454e905ea9732e169711c5218a8047997049e0c5536
 DIST setuptools-63.4.2-py3-none-any.whl 1230330 BLAKE2B 8190129907edb6a5a3607fc8caae995070d5740c849cd31510efa43271fddd58c5c21cb1d60a4647473b10ba90a6220e06db92413847cbf71e11e43571def2ab SHA512 8b2a56c840220c616a13ec19b424981b9767f4e39b98a3ba0b99904beb63f4d6d6c28ada37a25d482c1838063ccd09d260b12cc7d00aeca78b95cde49928211e
-EBUILD ensurepip-wheels-63.3.0.22.2.1.ebuild 848 BLAKE2B 2d4062dcde645e944dcc73a9fe8150ded2473bdeb0656832223cc1071b8fbc9b99522eff3eef11778ac9f12e97a85a8c99bdd78a4fd85b7b87b6711439d5e0c4 SHA512 cd12ffe723070c282e9f92ce6c0b125ba0f336e73d063c68f49ad4c91e29dba542ed877dcfe1afd5913c71cfc1f0cc8333d0cb8f7f9ee36050e8f42610a3498d
-EBUILD ensurepip-wheels-63.4.1.22.2.2.ebuild 848 BLAKE2B 2d4062dcde645e944dcc73a9fe8150ded2473bdeb0656832223cc1071b8fbc9b99522eff3eef11778ac9f12e97a85a8c99bdd78a4fd85b7b87b6711439d5e0c4 SHA512 cd12ffe723070c282e9f92ce6c0b125ba0f336e73d063c68f49ad4c91e29dba542ed877dcfe1afd5913c71cfc1f0cc8333d0cb8f7f9ee36050e8f42610a3498d
-EBUILD ensurepip-wheels-63.4.2.22.2.2.ebuild 848 BLAKE2B 2d4062dcde645e944dcc73a9fe8150ded2473bdeb0656832223cc1071b8fbc9b99522eff3eef11778ac9f12e97a85a8c99bdd78a4fd85b7b87b6711439d5e0c4 SHA512 cd12ffe723070c282e9f92ce6c0b125ba0f336e73d063c68f49ad4c91e29dba542ed877dcfe1afd5913c71cfc1f0cc8333d0cb8f7f9ee36050e8f42610a3498d
-MISC metadata.xml 333 BLAKE2B 800dafc25b6f76bebd9f1d47d42e3427c7024ea0114c00201a766fd33d2cd2a466587da9e1cb22b2cd6e45637e8b8f93af7b6a52afd5fbbd460bea880f55a2e8 SHA512 40ee1087f3b5575c3a86368a5ee56c606442e8ace9396eb409bcfda734cc480e781f75d861253772cf9ef113d3cc4a05687b76df45ad5ecff984460ce54583e7
+DIST setuptools-63.4.3-py3-none-any.whl 1230380 BLAKE2B e8959efcfdd53e163a49605f4abada5b3571a6511b5859aa73546ad317255fac03b5a38bfc7945cf10cc589f692a7a44de0a12b3d8107782ff6fcd80d0f521b6 SHA512 0c1df89ed0d6bfb368eb8ef211663de5d5fdefc89bb43e23bd639e18b5362d34b90c4be3212c64cda7308109e626991410204c761b949a0f04ae8fe1f86056a5
+EBUILD ensurepip-wheels-63.4.2.22.2.2.ebuild 840 BLAKE2B 1243e37a93ffdd939c1aa55cb0926e111e6fd5b6e6011e81b3006734c0f73d35d6f4c1274995a4227cc8868f334eb30b8faab03d69fb2f8b25af0c6f60c80a38 SHA512 564fbb4336c4e46dbd0472801653c53c6af54aa72cf047f72a04ed7379474eefa49975d1e5ee231e3d0832bf22b65ad169acfea125abcc8dbc6ca7e4802a7e30
+EBUILD ensurepip-wheels-63.4.3.22.2.2.ebuild 848 BLAKE2B 2d4062dcde645e944dcc73a9fe8150ded2473bdeb0656832223cc1071b8fbc9b99522eff3eef11778ac9f12e97a85a8c99bdd78a4fd85b7b87b6711439d5e0c4 SHA512 cd12ffe723070c282e9f92ce6c0b125ba0f336e73d063c68f49ad4c91e29dba542ed877dcfe1afd5913c71cfc1f0cc8333d0cb8f7f9ee36050e8f42610a3498d
+MISC metadata.xml 357 BLAKE2B 2275bcbbf65269212f67a4524163fd07ae84c50ec48533b758e600c3d9e8e54db416d5e5a6d0b08f05a82b9c6adcf7df5ccb1ad3c760f79a615136c13235f7ed SHA512 0c30429f2ee7956f92537dcea88ed5e3598575a4b9b64935de0f437791e88ae3c9991c5759e670e7a1cba478a87be7675c4864a707d6a51d9b25540074f14963
diff --git a/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.1.22.2.2.ebuild b/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.1.22.2.2.ebuild
deleted file mode 100644
index 691136b4b5bb..000000000000
--- a/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.1.22.2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SETUPTOOLS_WHL=setuptools-$(ver_cut 1-3)-py3-none-any.whl
-PIP_WHL=pip-$(ver_cut 4-)-py3-none-any.whl
-
-DESCRIPTION="Shared wheels for ensurepip Python module"
-HOMEPAGE="
-	https://pypi.org/project/pip/
-	https://pypi.org/project/setuptools/
-"
-SRC_URI="
-	https://files.pythonhosted.org/packages/py3/p/pip/${PIP_WHL}
-	https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-"
-S=${DISTDIR}
-
-# combined license of setuptools and pip (with its bundled deps)
-LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${PIP_WHL}" "${SETUPTOOLS_WHL}"
-}
diff --git a/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.2.22.2.2.ebuild b/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.2.22.2.2.ebuild
index 691136b4b5bb..adfa2e2b013d 100644
--- a/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.2.22.2.2.ebuild
+++ b/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.2.22.2.2.ebuild
@@ -20,7 +20,7 @@ S=${DISTDIR}
 # combined license of setuptools and pip (with its bundled deps)
 LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 src_install() {
 	insinto /usr/lib/python/ensurepip
diff --git a/dev-python/ensurepip-wheels/ensurepip-wheels-63.3.0.22.2.1.ebuild b/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.3.22.2.2.ebuild
similarity index 100%
rename from dev-python/ensurepip-wheels/ensurepip-wheels-63.3.0.22.2.1.ebuild
rename to dev-python/ensurepip-wheels/ensurepip-wheels-63.4.3.22.2.2.ebuild
diff --git a/dev-python/ensurepip-wheels/metadata.xml b/dev-python/ensurepip-wheels/metadata.xml
index 0c63c4e2b6a7..406eacd7f9fb 100644
--- a/dev-python/ensurepip-wheels/metadata.xml
+++ b/dev-python/ensurepip-wheels/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pip</remote-id>
 		<remote-id type="pypi">setuptools</remote-id>
diff --git a/dev-python/exam/Manifest b/dev-python/exam/Manifest
index d37d77b8aec8..655001af2ebd 100644
--- a/dev-python/exam/Manifest
+++ b/dev-python/exam/Manifest
@@ -1,3 +1,3 @@
 DIST exam-0.10.6.tar.gz 15028 BLAKE2B 6d2a888b9adf14665e8f009bae7b2c724dcb60fe19efa98a189988a73a0cb5933179407c754ed1c19b24694080b6df31838768f694460fabd9196e58e8b4c94d SHA512 1cc082b4fb9a7270ea81750ee3f34400f3f6eac65dd1488af333a43d0623bf8f9176b73e2948c324bb9c0062296284bae66fe215263456baf9db378676c8a4f0
-EBUILD exam-0.10.6.ebuild 427 BLAKE2B 2f3f18667f8393bc8efb53167c9b3ddcbb979bf12bbf71a6de1115e8a7e6e0cf7dd3ddd03f595d3caf19b6d4cb643a6c2b3d7bf5d8f1b7b303daa9c28f962af1 SHA512 e74117f4ebafe4231de4c162dded289cd225d2679f2fbea8ae1a77e96227ca7adea846d1ad15e20fb8fcf5f25e0c1c0736e76a8ed6ad358ffe2ec8956a4822d1
+EBUILD exam-0.10.6.ebuild 427 BLAKE2B f8517c61901e73bcb3d2824c25974ca6cf88454a3aab960e2625ef210f5899358739b09d8ced0739064e6cfb8f238dfb7a655350cf2daa375a85a1d3a734bb40 SHA512 fc5872099c82725c04a9f26f95330dfb027aaf97497d2b777217a633d2e4e4ab0fd782dcc3e85d589ce22bde500db0fcc8bd40a2954f29b9f141a3a30005dcf1
 MISC metadata.xml 1731 BLAKE2B b6cc78ede7ae95106d0d1ff71bee52c6c7c56189ffda08e98430b372340574c580cc8c854259f80f3a0ee27f4d0406a10e231ca9430603e1d15e8f8cfa0e0d65 SHA512 c0e76b36f3ff962e6d70a6c0ebab589e51dd74557d05acff8bc9dd274ff5075670960ff901a07a79af33c0ae2fa8cc6eb252150cc8a1176456fc2503251df2fc
diff --git a/dev-python/exam/exam-0.10.6.ebuild b/dev-python/exam/exam-0.10.6.ebuild
index 8fe56f7886f9..ae55b9cf342e 100644
--- a/dev-python/exam/exam-0.10.6.ebuild
+++ b/dev-python/exam/exam-0.10.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index dc00fb097bd7..241fd29e294f 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,3 +1,5 @@
 DIST py-filelock-3.7.1.gh.tar.gz 204373 BLAKE2B e3ef657488a68caf8dc8158d5060a07447b74b53b26a2ad05eb67211a5ae7ef5deadeb8527cb6cd95ce225e0fcd29a0ce2dd53b68b7e2cacde4c0f2242966b21 SHA512 66708398ae3c4dcd97a6031feca6a1b7d1010a5ee605c5adce29a9cfabe67c5464eefb3812c66e2c32c3547240fdc7acac6eec25cc8dfb2d5255079c5e6b44b4
+DIST py-filelock-3.8.0.gh.tar.gz 204748 BLAKE2B 719f965eddf9a76aaa7d3700ffbd29df3856fdcd76aa184b12a1e3b3341a5d8681f05ebd7239b48a0ffbc942aebc8574ff3878177100ba659347a904945b2234 SHA512 a9b63ab9a6697334eb8c561c422e8ec6febd0b7b203c0ebb4cfd1e4281f16cc0ef5145121c90f3c08bec88f13e219c0655142e3d3f856163702a0d32e14cd5ce
 EBUILD filelock-3.7.1.ebuild 783 BLAKE2B 53160203c699d14062b0d0a4a504a15b1de07e02bcd881f2bb8ace6e39fd640c0af0caad548a9e5e21c11d5444bfa6e3958e938f60dc62013f4147d137172af7 SHA512 cb26dc32c6c44a1dbe237bc217d7ae0dc015e26b4e4716d5992930a29382c762f4aa59b6b374ad8cc1a374cb56d3a794bfdee123318f3f30f9ef2df573276feb
+EBUILD filelock-3.8.0.ebuild 844 BLAKE2B 0d6a77dc5134bef2d81a12fb0b3e6101ca4b719d0fc323770c7e686c7d78ce27fa316e172bf56a77b86d27eb013cb6ccb26f7e7639e79c4d77b464b380e3b263 SHA512 bfc386ea39a752e464846570c068434c0220fcaca26f9c45c38fce54fcd0055e4c775c786870b7a4268da9480500ecd114de2d5a85bf2d20034f444cfc76f61c
 MISC metadata.xml 373 BLAKE2B 8923cea15313a2a4cad1af3e5e6c5623ac9855d3de37b6e43ff5249504d2bf07e1e334ce6ea8d9c397e03e3a05585cec0233e841a0a9f6c30d43eaa26b488933 SHA512 c114595146c326243756d0053476677b8b8c7541a253a0c739827e9b0f93c2a695d7289ee5a17c4a1a79639c02bf1396d2df4d8e20aaac9402c9d80f55be2f7b
diff --git a/dev-python/filelock/filelock-3.8.0.ebuild b/dev-python/filelock/filelock-3.8.0.ebuild
new file mode 100644
index 000000000000..21f576cb0e32
--- /dev/null
+++ b/dev-python/filelock/filelock-3.8.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2018-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=py-filelock-${PV}
+DESCRIPTION="A platform independent file lock for Python"
+HOMEPAGE="
+	https://github.com/tox-dev/py-filelock/
+	https://pypi.org/project/filelock/
+"
+SRC_URI="
+	https://github.com/tox-dev/py-filelock/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index a67d7eb7c54b..425622d4630c 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -5,6 +5,7 @@ DIST hypothesis-6.52.3.gh.tar.gz 9321591 BLAKE2B 50415d463d2513b023b8a6ac87a2bb6
 DIST hypothesis-6.52.4.gh.tar.gz 9323011 BLAKE2B fece23da48d4849252a0fa48ae741506f49aa1f2b63f81afe3b71d18e0325a4e337bebde1a1707390d38bdf57e2ce1145985231f68557b36c58886d82774a7d9 SHA512 c51f29d52757d08652f83deda48825ca38c86e0bc67743c2cff9c85f52d726671f07d0249dfdc761b2ba8250d40beacdf5e037e8629f24df5baeddd297f38030
 DIST hypothesis-6.53.0.gh.tar.gz 9323355 BLAKE2B 589cd4803351e72cc1896453e5e548bb6fb5f998032bce91708e02f3c8ff5d288ec76d65eeffde5fa31b6b86fbb3ad81dfe3eebaaac841f197de3a07acfa12bd SHA512 ab4de3764ca3ce8e5e50966ea94fcadd85e7c9f170dbbd17383b5516528e091ebfe3b06846513ee77a1f7a2e827236d323c12cc120cac421ec7aa9f3a2ca5e4a
 DIST hypothesis-6.54.1.gh.tar.gz 9324403 BLAKE2B 897fa4901a5c5c0e32c4197020702dbe5d85a5ada79f52b66fc7f19180a32f4dce54f5300722f500fb560766e1ff76b5df648be6be0f229ece4b3aa0af856fc3 SHA512 ba4a7a3f5daa7437e903604d26a9dd0e4ce77d0a44a2e81fec5620f48a5f6a9080b5e5401fa1f7ee6c66d4e1d51cca095ce7e74999b0439b5a8a0c2d26f64464
+DIST hypothesis-6.54.2.gh.tar.gz 9324746 BLAKE2B 25e3effa9667e8b6c57dff0ed00c14cc36385678475a1a1ac9fd30d2e293ea3a49d76ad34e391b33bad7214ce97b5d23aebedcb5d7f74686f3182a72e133416f SHA512 f53d589426b2340f6d747763cc4228f632474bc833e53e2d67fd6545437fc46cf976055dd0f1a55c4cb6377667ce0b0d8bc7dae33454157fbb91af7a5b009b62
 EBUILD hypothesis-6.49.1.ebuild 2078 BLAKE2B 11eee6781b06ca0da65094d20403b7783d83799a1f0e3684fb450784faabd97cc624caa681d1b89974dae552d98ea8c98f8a2de3dfa57c97b4246afe9370f621 SHA512 972d703e77d7403ca70447f2b27617874be3a0eff802c79ee05d7c0991acb931bb2a91967055c27f244568049d86879ec1a77153a7a48aaa4305132b0b537eb4
 EBUILD hypothesis-6.52.1.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 EBUILD hypothesis-6.52.2.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
@@ -12,4 +13,5 @@ EBUILD hypothesis-6.52.3.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b70
 EBUILD hypothesis-6.52.4.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 EBUILD hypothesis-6.53.0.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 EBUILD hypothesis-6.54.1.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
+EBUILD hypothesis-6.54.2.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.54.2.ebuild b/dev-python/hypothesis/hypothesis-6.54.2.ebuild
new file mode 100644
index 000000000000..1065b755121f
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.54.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 044b19315f30..6dfc724cda01 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,5 +1,3 @@
-DIST ipykernel-6.15.0.tar.gz 134691 BLAKE2B ba3eefde9f1023ccf83c63a35dd99fdfebc0bda0d4f73e6477a098564c0a9fb7c0082413ae31dc8cf423339c3e44887bcf5253355c13630619f44b18d19e9913 SHA512 a6533f094d18d32a02e8de5638fdabb9f647edc9a512e609de3bb1d80f5592acef4e930d879bf79bde7a0ca23945d9eb112d841f2305204fac9f4c672b5315ac
 DIST ipykernel-6.15.1.tar.gz 133140 BLAKE2B 7d63b55f2b8d883234258106b8239cf77031336ce6e7e38234490a031fc4a56861788210fdb2acd0f895e4df43257b0339ef1592e12d33b441e4ba9061acbd08 SHA512 10f2390a4edafea89fcc049d5e07ef542418a3a7b076efec1f02bc0a787e01280624cc543bb60604478cae63b58a86d031b549a6f872c7a8530043d670dbdc0e
-EBUILD ipykernel-6.15.0.ebuild 2059 BLAKE2B 7f50716baf152faeda1bf42ac76e3078ccee939c10632e4b7b55193c745e209a79fca5babc4c680806a533f2380679afc8c4de5671c1b3ad317f1ce59b9c13e2 SHA512 e6c775f4b47cc3802a43ab8b35c08ca7b4c8f76dc84a4797d5d77ad6438779f10020987bc447eb40e8fd9aeec448c7a6b2e33a120aab5e720e93d089bf305ddd
-EBUILD ipykernel-6.15.1.ebuild 2067 BLAKE2B ed9a3b3a53035fdfa4847f57c5ee5dd4098ec24d967bed912eb4e7b9604f840d6fa901f0f08ae4c4b8faf77e63ff2457ed29fbfc1de527156c078e58b3f49dfb SHA512 945e1122d13b7b94b541d07252ba037d321379c1232f0c464fe31a775d0570249d46054a5a3a15970ae1db4e21fde7cc7543549058ee46ae106df00eefd4e76d
+EBUILD ipykernel-6.15.1.ebuild 2059 BLAKE2B 7f50716baf152faeda1bf42ac76e3078ccee939c10632e4b7b55193c745e209a79fca5babc4c680806a533f2380679afc8c4de5671c1b3ad317f1ce59b9c13e2 SHA512 e6c775f4b47cc3802a43ab8b35c08ca7b4c8f76dc84a4797d5d77ad6438779f10020987bc447eb40e8fd9aeec448c7a6b2e33a120aab5e720e93d089bf305ddd
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.15.0.ebuild b/dev-python/ipykernel/ipykernel-6.15.0.ebuild
deleted file mode 100644
index 01c1b618e4b0..000000000000
--- a/dev-python/ipykernel/ipykernel-6.15.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="https://github.com/ipython/ipykernel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	ipykernel/inprocess/tests/test_kernel.py::InProcessKernelTestCase::test_pylab
-	ipykernel/tests/test_debugger.py::test_attach_debug
-	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
-	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_set_breakpoints
-	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
-)
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
-}
diff --git a/dev-python/ipykernel/ipykernel-6.15.1.ebuild b/dev-python/ipykernel/ipykernel-6.15.1.ebuild
index 5526cde6276c..01c1b618e4b0 100644
--- a/dev-python/ipykernel/ipykernel-6.15.1.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.15.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index c5f1ae9faf91..d67c7ee5c897 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -4,6 +4,8 @@ AUX matplotlib-3.5.2-test.patch 10981 BLAKE2B cd7406a1452b22d5782ef293b10e1fbed8
 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b
 DIST matplotlib-3.5.1.tar.gz 35320470 BLAKE2B ebf69b62ac587c61ecf8442abaab302019f63a3c9d8db6f7f7fb32f4d14da554fd8305ea6dfed2ff86a5af4e7e4d2b81f14802692fe50c986f7da8545bd26c00 SHA512 a317dbd748e5fc1fafcf80020cb6d38a8888431487beded97acd59d759e67e54f59506b642e4a03d4351c1ac050d15e3f2e2b5443433debc78ddad52881c8d82
 DIST matplotlib-3.5.2.tar.gz 35210006 BLAKE2B e3f90a0cf1d28f041a8cdd6920a8a4efe16169bb4acf85f7b2562196db306eeb692218728ea33c7b62214e7894e83a104954cbef38c45ccbb4f630bd35c0c36b SHA512 32844dfa85dbc43360c1773d748a58d2ab089111c51c825da62956c778a0eeaf10ca33a5c6c094295388a80d5873a2e1b17484e02b653e9e8e5ba98659329974
+DIST matplotlib-3.5.3.tar.gz 35236343 BLAKE2B 0d3f4e15295afe2c737e441325206e77c520a514bc87ab1eebef624f89896a2cf609e8d57b8fa8ef28ecf8c836e20cb296adaa95f81dbfcf3f2a45631e3dd02c SHA512 f431d3046e9c5fbe5d44a16a762e9a178ba34380974964660eaf3681671178866a63b3bad9aad8d3ad423926f7db2965d514e9b1489e3a824a4532a01f0e0670
 EBUILD matplotlib-3.5.1-r2.ebuild 7232 BLAKE2B 38969ec1fd4c035afe1be859825105203abe9ecc0c9ef409a64fe4e041d87324205e58c8085c628bf80a11550f453351ef518807c4f5365092bfc6f9498b213a SHA512 8c7424c236d0348d23c117d0433316c92d85fcd1902d436b418bc2c0602d648cfa8d24f8ddfb3ada0b8d9e68feda3e9526c93cf9dcf6569db516e2596581a886
 EBUILD matplotlib-3.5.2-r3.ebuild 7393 BLAKE2B 87bea3c13eac18a8bfecffa9266bcde29681b43b4d9430e47b7a9acebc45cba14483c7ccdd0b43967c9125cc760fce9cdcaea783aec649fed06b2ddd96f55f19 SHA512 200a53e212de82d9ea655a327350cb7ddc00bdd078fa9627dca540064972e3ed03fca02af5db0ac4b52ba65445846a674c920a9275afb696c4020da897664f32
+EBUILD matplotlib-3.5.3.ebuild 7452 BLAKE2B 772cc3fa10b93c6c407644a30a1a240432b4bb9c17b88a285a24d2664c06658e5d09265842c16f1b4396f4750501dda4062afc0e8294d1eed2931e7657c15ef1 SHA512 a90a05dab36b35037165cd4e73888a0c67576f3b3f2f34ed4635f4c79713c8030087a11a797e8d376fd823f9ef46e873ed5cd2a3f1c703a9ccaee59420d60c9a
 MISC metadata.xml 1075 BLAKE2B 6e2f62f6788e5a673bd54e375e6c7e8fb32d4dd181a48cf62582b93f78ef7a0e513417d24e940844188d5ab38bb2946c09e80d40706c207648c95eeac672a796 SHA512 38d935eed141df3a8d675b51a547135c9a357ab2058292640a9e98a07e3e3cc70348011d8c4f7f9f0ddece9531b56a1b2dfb2245cf1dfe065d43dc834ca78748
diff --git a/dev-python/matplotlib/matplotlib-3.5.3.ebuild b/dev-python/matplotlib/matplotlib-3.5.3.ebuild
new file mode 100644
index 000000000000..e4d1e2aaf06d
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-3.5.3.ebuild
@@ -0,0 +1,283 @@
+# 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} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic multiprocessing prefix toolchain-funcs \
+	virtualx
+
+FT_PV=2.6.1
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="
+	https://matplotlib.org/
+	https://github.com/matplotlib/matplotlib/
+	https://pypi.org/project/matplotlib/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? (
+		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
+	)
+"
+
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-4.22.0[${PYTHON_USEDEP}]
+	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]
+	media-fonts/dejavu
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013:=
+	virtual/imagemagick-tools[jpeg,tiff]
+	cairo? (
+		dev-python/cairocffi[${PYTHON_USEDEP}]
+	)
+	excel? (
+		dev-python/xlwt[${PYTHON_USEDEP}]
+	)
+	gtk3? (
+		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+	latex? (
+		virtual/latex-base
+		app-text/dvipng
+		app-text/ghostscript-gpl
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		dev-texlive/texlive-xetex
+	)
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	webagg? (
+		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+	)
+	wxwidgets? (
+		$(python_gen_cond_dep '
+			dev-python/wxpython:*[${PYTHON_USEDEP}]
+		' python3_{8..10})
+	)
+"
+
+BDEPEND="
+	${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		>=app-text/dvipng-1.15-r1
+		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
+		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
+		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-luatex
+		dev-texlive/texlive-xetex
+		>=media-gfx/graphviz-2.42.3[cairo]
+	)
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
+		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+"
+
+distutils_enable_tests pytest
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use "${1}"; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	# Affects installed _version.py, bug #854600
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+	local PATCHES=(
+		"${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch
+		"${FILESDIR}"/matplotlib-3.5.2-test.patch
+	)
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+	sed -i -e '/setuptools_scm/s:,<7::' setup.py || die
+
+	hprefixify setupext.py
+
+	rm -rf libqhull || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+
+	unset DISPLAY # bug #278524
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[libs]
+		system_freetype = True
+		system_qhull = True
+		[packages]
+		tests = True
+		[gui_support]
+		agg = True
+		gtk = False
+		gtkagg = False
+		macosx = False
+		pyside = False
+		pysideagg = False
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup qt5)
+		$(use_setup tk)
+		$(use_setup wxwidgets wx)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+}
+
+wrap_setup() {
+	local MAKEOPTS=-j1
+	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		VARTEXFONTS="${T}"/fonts \
+		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
+	fi
+}
+
+src_test() {
+	mkdir build || die
+	ln -s "${WORKDIR}/freetype-${FT_PV}" build/ || die
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# broken by -Wdefault
+		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg6-MatplotlibDeprecationWarning]"
+		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg7-MatplotlibDeprecationWarning]"
+		tests/test_testing.py::test_warn_to_fail
+	)
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# https://github.com/matplotlib/matplotlib/issues/23384
+		"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtagg', 'QT_API': 'PyQt5'}]"
+		"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtcairo', 'QT_API': 'PyQt5'}]"
+	)
+
+	# we need to rebuild mpl against bundled freetype, otherwise
+	# over 1000 tests will fail because of mismatched font rendering
+	grep -v system_freetype "${BUILD_DIR}"/setup.cfg \
+		> "${BUILD_DIR}"/test-setup.cfg || die
+	local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg
+
+	esetup.py build -j1 --build-lib="${BUILD_DIR}"/test-lib
+	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
+
+	# speed tests up
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	nonfatal epytest --pyargs matplotlib -m "not network" \
+		-p xdist.plugin -n "$(makeopts_jobs)" || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 5f3fc5e505b1..bb24bf9bfda6 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,5 +1,7 @@
 AUX nbconvert-6.5.0-mistune-2.patch 12454 BLAKE2B ebf7b6ee76b268d7e6b55f94c4beccb4b7c1efdc5f37732ea06dff6df97e51c7c53149583aeb0e45b2e717870592d1615ab1c22cddac14afad7ca962119555cd SHA512 388c7966b377861561e3823b5312328535aab6d1b88d79ac55519bb7aaaade4b5c1859b1dca48a675ab7569474f04c5755fbebe3a0dd455a9a7d23d0388f47be
 DIST nbconvert-6.5.0.tar.gz 908377 BLAKE2B a91c6c93e9e33f90c5c7f19743e20aa6cf88e5dd29be4ee777744d96037dddd15294858776c8391d79f5436e929fb1b623a3f11f6c4cbcf60728dba2204b6e2e SHA512 4e0d26d581435525f819c05207890cc7cbeaff786a16c354f0356c9bc50111a724a92b7e15445a0cf0ebf1e1c2f0ff064a2c8722267f66dd8677ad82b5e61714
+DIST nbconvert-6.5.2.tar.gz 910454 BLAKE2B 0c80232697e1ecf31af17f10ae5ad9bcfaec89e06ab5f81c87f231f2abd585c23977d0b154363e72f6066a97d04ec96184b0d8325e5aaa399a1a9335109577bb SHA512 b955bd55bc1f69700652faae12a585230d939877551f792eebee57936a293b9b54caff5eb1bcaf996efa38c737f141069d4af2c2959b8b6318966c9020e8a2f5
 EBUILD nbconvert-6.5.0-r1.ebuild 2130 BLAKE2B 4aa566ebbaea70b1b416e7d89f6b81cf2441ef06e9b3fbf634a8a3023bdf61623e4ee89a66bdeac1d7a19ac7862b3449d43362b7611356c0ee458fee66363030 SHA512 3e1489bb742474e7458473b29348a11c1684b30c6970a5d441269f8a1b9323a7d7cb607775cbef8ebbe9b21e04e04fedfcd5fa2ff938aa8f576144ee399dccb1
 EBUILD nbconvert-6.5.0-r2.ebuild 2171 BLAKE2B fc2eee68c1088df5f0d47617b8dfed830ed285a825b7f9b7d2b63a0441f30bd901b1efa705febe7b8ff22173488673c180832ac58d75aeb02859c9ea8848783e SHA512 87eeb978f4784884054a67ed04850ddca4c6544ef362db936bdd310bc764deded0c35cba5491a62e5205d8f3e7d385dd0aa2c0795ee2d3090cfa4dc3771237ef
+EBUILD nbconvert-6.5.2.ebuild 2217 BLAKE2B fd177bd1c614657d0328acfed12b1cdfaa016ee1450568f090f0ecdba39919e8d290479c818ebe3b991c6d6d2802eb0c77faea52a14dc2cdfddab091deb5b947 SHA512 6956bd1772b9fbf217ef2fafc1a0a28e8f22e79621ad58902655bb9bb37312b403d1284d52fe849bc32441c95ff72c8423e754cd7b760d4b419cccd7a1bffc3b
 MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
diff --git a/dev-python/nbconvert/nbconvert-6.5.2.ebuild b/dev-python/nbconvert/nbconvert-6.5.2.ebuild
new file mode 100644
index 000000000000..476cb552e368
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-6.5.2.ebuild
@@ -0,0 +1,84 @@
+# 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="Converting Jupyter Notebooks"
+HOMEPAGE="
+	https://nbconvert.readthedocs.io/
+	https://github.com/jupyter/nbconvert/
+	https://pypi.org/project/nbconvert/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/bleach[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
+	>=dev-python/mistune-2.0.2[${PYTHON_USEDEP}]
+	dev-python/nbclient[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/tinycss2[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
+	dev-python/testpath[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pebble[${PYTHON_USEDEP}]
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		>=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/nbconvert-6.5.0-mistune-2.patch
+)
+
+src_test() {
+	mkdir -p "${HOME}/.local" || die
+	cp -r share "${HOME}/.local/" || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Missing pyppeteer for now
+		# TODO: Doesn't skip?
+		nbconvert/exporters/tests/test_webpdf.py
+		# Needs pyppeteer too
+		'nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
+	)
+
+	epytest --pyargs nbconvert
+}
+
+pkg_postinst() {
+	if ! has_version app-text/pandoc ; then
+		einfo "Pandoc is required for converting to formats other than Python,"
+		einfo "HTML, and Markdown. If you need this functionality, install"
+		einfo "app-text/pandoc."
+	fi
+}
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index 18b132db305f..14e62b3c5f64 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,5 +1,7 @@
 DIST Nuitka-1.0.1.tar.gz 3893766 BLAKE2B 7d48344231fca1efce8d783a197813a1aa77c992fad84c1a958740287ea8079566c98bb6ac1e017030a6d6dba84bdef6a7711542adaa8a59612aed19da96f425 SHA512 0d3ba38733fdee4f6f4bff80fd2c7729177209e101f0eefe2c5a74fd449d038710eb979e1b313c1534bfe079ea3a7f88cda07ba2977c153032a56db0b75f739c
 DIST Nuitka-1.0.2.tar.gz 3893195 BLAKE2B 7d3f154ecb128da34f1495d977ec81bc54dcd95d5d53d3ef437a0a55f11f91529eb12c985eba6256d53d2746e0b2925a50ab4fd19967f602c552a57c1ec51408 SHA512 a1cd4ba3b2ced48fd2b8fdd2438f8b6108ce3638fb59507bd2398cc8d3e9c9eb9b93d86446e960d26df351c2769799df3a8ca248482eee531dd6bbc276036a90
+DIST Nuitka-1.0.3.tar.gz 3894225 BLAKE2B 9e29cfc23c4c1fda50330a6ebfb30fe8a13b18486a87965e9b4daddedd6fb38f6f3c89c606ff63d7a0888bc1c329c593a92d36cfc6b0d2b46a289fa4fd6fc8f5 SHA512 68bab7f431e2469c01c8e3272ea75eff8bffe7a070768759949206109fc4bb035243e3b2511372ec449fe07aff9bc94185f2b3c3301d5e847d091fa340522362
 EBUILD nuitka-1.0.1.ebuild 1140 BLAKE2B 0f839fb78068157dccbf22121b2ecceb056e1462a5f7c8ce7c7d28116e390ec618b02f42f8f67dbaf3b345f04d519b0214bbdbdfe03b8c0e7594366a7a6911ea SHA512 ecbf3874813e37fd078cd5900a53b28e4686ab913b00867a0817ebeb7ea21f2c9d9fa712993ae7fc8eb26d9e31d375bff729135b432693700ce4e31fe42e631f
 EBUILD nuitka-1.0.2.ebuild 1140 BLAKE2B 0f839fb78068157dccbf22121b2ecceb056e1462a5f7c8ce7c7d28116e390ec618b02f42f8f67dbaf3b345f04d519b0214bbdbdfe03b8c0e7594366a7a6911ea SHA512 ecbf3874813e37fd078cd5900a53b28e4686ab913b00867a0817ebeb7ea21f2c9d9fa712993ae7fc8eb26d9e31d375bff729135b432693700ce4e31fe42e631f
+EBUILD nuitka-1.0.3.ebuild 1140 BLAKE2B 0f839fb78068157dccbf22121b2ecceb056e1462a5f7c8ce7c7d28116e390ec618b02f42f8f67dbaf3b345f04d519b0214bbdbdfe03b8c0e7594366a7a6911ea SHA512 ecbf3874813e37fd078cd5900a53b28e4686ab913b00867a0817ebeb7ea21f2c9d9fa712993ae7fc8eb26d9e31d375bff729135b432693700ce4e31fe42e631f
 MISC metadata.xml 943 BLAKE2B d7ab883773e7480dcfb4b79932a3874e2274669169a24a54aa622a2a0ac079e0296da4bd196d166cb11fcff785985da0b10d0fae351032914ccf312c9bb9833c SHA512 625d8760b8e849c6e014856f584cb42f50bb5ebb1fa648cb704a5a1baf175e7d2ce9f43f6f724d11c81a68e364b6ac1c38459540b58f2ccd6a675902af5b1cc9
diff --git a/dev-python/nuitka/nuitka-1.0.3.ebuild b/dev-python/nuitka/nuitka-1.0.3.ebuild
new file mode 100644
index 000000000000..5b987e13729d
--- /dev/null
+++ b/dev-python/nuitka/nuitka-1.0.3.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 flag-o-matic optfeature
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="https://www.nuitka.net"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	doman doc/nuitka3.1 doc/nuitka3-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/podman-py/Manifest b/dev-python/podman-py/Manifest
index 0613c58498ae..a170d40c3fc9 100644
--- a/dev-python/podman-py/Manifest
+++ b/dev-python/podman-py/Manifest
@@ -1,3 +1,5 @@
 DIST podman-py-4.0.0.tar.gz 172208 BLAKE2B 79e153c9b8e064398f31ad270d0f84f1bcc8ba830d4240914004c5d4eb1fffa32496c5e88b8191b074b521510e2bf0b8ea211a481af8a0ba70e7b0d6c26efe10 SHA512 e1dd48c931871206aae11fbcc31a711eecda89e9c60f62d5616dc3219e073d3ba74d38f63a05d4688e97fb678d2e03f8cd883456f7e75f2d7e313aa859ca3e8f
+DIST podman-py-4.2.0.gh.tar.gz 176692 BLAKE2B 62692fc8e7eea0f05ef6a0743f85d5d3f4beb2029d042b746bdf164737f7b9bf1e6ba199a654eb62f75af5a2949ba27f90657e9f134b3b7576f7ebc1916b9f59 SHA512 8ff46c3201bb7f109075a01db57a96ad60246d6ed8962c7f86c0395887de67236dc0d022cedd807766a2a3714a822d620b3e1e0a2c9304156eaecfdbc06928dd
 EBUILD podman-py-4.0.0.ebuild 1043 BLAKE2B c0bcf07a8edd5cf477b96573f7cc3391aef6e0c110bb0385080b9b18763be6bffae2aca050b664c29ea5e9add7046ba593b3212ad68db3d292a2d11182188083 SHA512 cdb128ad8c28758e114df16fd7be45fc05f38860e2d3732e5eb7fceeebd7e3b378f5e34bc1515d17d31df7a1727ea561f5b84b189a92e85d4da072e007956809
+EBUILD podman-py-4.2.0.ebuild 1051 BLAKE2B 014a913a64a2b3528748563695c7a4f5ae7e33b460088dcbc81c721742e798295869abf397c95f9195bb5280fe7f71f111c639559f5a4466541aa16845e1956e SHA512 2877462dd18ff18842d4a7b3a4f471f54b9a266e62c5503da79f9e7a1896f4a3692e219e8a769e55bfb004b593e9379bbc2f48b4edf10eb9bed4cd0d5661310e
 MISC metadata.xml 475 BLAKE2B 42fc2c044df94ebf8a4eb5088a39ad3075089cd5a007473db0964df4efb8c7a437c94db9c161d6ba81d2c017377919861f17b7fe3e133aa597312cad2df012f4 SHA512 017f54ebf56fc59c14ff0e9c2f15b899556ff3d512d22ed2abc35227c079ec64c8eb855f60e65299abd7f8b5433b2268dc7c2e428476efc334e24f0d90181bc8
diff --git a/dev-python/podman-py/podman-py-4.2.0.ebuild b/dev-python/podman-py/podman-py-4.2.0.ebuild
new file mode 100644
index 000000000000..e10d9c77c179
--- /dev/null
+++ b/dev-python/podman-py/podman-py-4.2.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library to interact with a Podman server"
+HOMEPAGE="
+	https://github.com/containers/podman-py/
+	https://pypi.org/project/podman/
+"
+SRC_URI="
+	https://github.com/containers/podman-py/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.24[${PYTHON_USEDEP}]
+	>=dev-python/toml-0.10.2[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.24.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		podman/tests/unit/test_volumesmanager.py::VolumesManagerTestCase::test_get_404
+	)
+
+	# integration tests require a workable podman server,
+	# and it doesn't seem to work in ebuild env
+	epytest podman/tests/unit
+}
diff --git a/dev-python/progressbar2/Manifest b/dev-python/progressbar2/Manifest
index 0b8235efa915..50ff2687ba7b 100644
--- a/dev-python/progressbar2/Manifest
+++ b/dev-python/progressbar2/Manifest
@@ -1,3 +1,3 @@
 DIST progressbar2-4.0.0.tar.gz 663046 BLAKE2B 1616f1b9c5f720f370dc9eb02ba37cf83391c853a525fca523fb33af1b580f38647b835a83558674a78dacc33bf7652cb9af8799ad13763f62d33417abaa35cf SHA512 b9b9dabb3093e42bc6f40c0e284caae2d29ebfa450db379c214a5ae39e7ccb8c690655da21a44882d0b68f24d83f55a3342671087a25ada168bce9d236685666
-EBUILD progressbar2-4.0.0.ebuild 718 BLAKE2B 2842582020925fb7be82a1eebd95c500d16cec11c87b5914e1b7377f6e5f9f9ccf812884dd4228ea065561b1fb70b5359c11c8d7f6f11554859f360f346008e6 SHA512 9d640141010c8047bd20f93d2dfeae96036860a6ed2655ed7fef8dbe92f074b9021695afa069fdb94837717144df6e27c2b5688015ad90e1fa5b41c100c690ef
+EBUILD progressbar2-4.0.0.ebuild 718 BLAKE2B 33eb46ad683cd82547a6a21b0cf472bacf4c44738c559b743c1d3b1d79f6f3573d8079b0ddde84932aab07330e6821185f05a9bf8113aba15c2f18b063bf6187 SHA512 7edb45896151f0c343b306b4a81c4c4a89a632b2685c5ee8bca6cdae1ffdd92e7b2bfd83b48cf61d0c600c2aaa2a571a1e5f420b80a87a72decaf1fece0d5691
 MISC metadata.xml 404 BLAKE2B 774a579e397ff18f4196eaf238847e52062742b1ff00999e6b970c4a0f5e032d6caf57e2f64903882269738bdeefa3b3533711d36c68694989ffe6b508c9c467 SHA512 95bd7c3ad0f1addc6d6dd57aa89f04b20ad7019b35468aa44cb5077a819c4658cf64196c5443a671d8beb339f5bdbf40e544807b21c7e2bc11b39da5e0e8dc99
diff --git a/dev-python/progressbar2/progressbar2-4.0.0.ebuild b/dev-python/progressbar2/progressbar2-4.0.0.ebuild
index 10b80ccec1d4..730fd2de7dcc 100644
--- a/dev-python/progressbar2/progressbar2-4.0.0.ebuild
+++ b/dev-python/progressbar2/progressbar2-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Text progressbar library for python"
diff --git a/dev-python/proto-plus/Manifest b/dev-python/proto-plus/Manifest
index 3c56c7059d72..3f4967145151 100644
--- a/dev-python/proto-plus/Manifest
+++ b/dev-python/proto-plus/Manifest
@@ -1,3 +1,5 @@
 DIST proto-plus-1.20.6.gh.tar.gz 67697 BLAKE2B 88fbf1086bc9430360316c89baaf6216d3f395792fbc2bf1336c22aeb4f912dedd5a4af73c5a10cf6536cdc4cf285c89d1d0a86afd4ee21c7e40b26d34631240 SHA512 5da41a8ddabb34a4083b622d60e59532cd7cb97e4fd243b796aded06ee0f6d9ba5ac847434aa8141b90cb3481d45fbc703de2f905ff4f4676a5d86d77a01c44c
+DIST proto-plus-1.22.0.gh.tar.gz 69248 BLAKE2B f0bcfec696fc732eca291452fac681a38c23baa0d67cbca64a1abb31879775d28c00cff0e67e2f6c9f1fe68c3ee2693cc99599bd29f1eb0f17e2f6b48e1c9731 SHA512 110b5cf7effbcec8ac0c99361d1e0710eeea5949d2cc015e6e41cac4d045bf93560eed72b8d83709a76fa57d522859e162e6cc5e60456f98d32761bd284e0d19
 EBUILD proto-plus-1.20.6.ebuild 917 BLAKE2B 7ebb9724e5e0fbfe88b3961912eea64bc61de0c47528fc34a4140b8d52a6891d5973bec31a46683690cefac235498ea55a45163ac5c7152bc479fa387d9913c6 SHA512 71e6499479714996cbb506f120802fc4ac1d437866c96df42a1a3515d9e30905ef25cfbfa2545a05ee015e106cefa962d834a2b76aa7532aa33560cba3e7411e
+EBUILD proto-plus-1.22.0.ebuild 919 BLAKE2B 9d2e638037ab6e048257fb15d6e654d9c1dd4661e3875e1a2354582539311ad01baca958a454072a6c51e003a6bbf5a1bbf27e05b1cf2db78b7d3de9100aebfa SHA512 c306d37b44976b9fd4041c58458cf9cfb0d8c6af06ba456681221c291a4af6b80c9e47ff47203e9659638c7ee422299a82e353aac22d3c90c3e2128687d93ebe
 MISC metadata.xml 447 BLAKE2B d440be836b8a2823ab3beb7f76cbe7ff3f027ec512dff3f7d920eefea3f18329e1aa910ca16e006b1424cbd780f3fad80b8ccdc632c08ade651afd815369e9d0 SHA512 d64b8d2eeac9916ec2faab3b038082155e46e8c379ce06d7f554de763318539fa9040d15f90a3a95f337937c90f4b4042f51b1ea1cd11727e5fd971a0af5280c
diff --git a/dev-python/proto-plus/proto-plus-1.22.0.ebuild b/dev-python/proto-plus/proto-plus-1.22.0.ebuild
new file mode 100644
index 000000000000..6be65f5713cd
--- /dev/null
+++ b/dev-python/proto-plus/proto-plus-1.22.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Beautiful, Pythonic protocol buffers"
+HOMEPAGE="
+	https://github.com/googleapis/proto-plus-python/
+	https://pypi.org/project/proto-plus/
+"
+SRC_URI="
+	https://github.com/googleapis/proto-plus-python/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${PN}-python-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/protobuf-python-5[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.19.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/google-api-core-1.31.5[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
diff --git a/dev-python/pyelftools/Manifest b/dev-python/pyelftools/Manifest
index f3e2d49c07db..a771372d8629 100644
--- a/dev-python/pyelftools/Manifest
+++ b/dev-python/pyelftools/Manifest
@@ -1,3 +1,5 @@
 DIST pyelftools-0.28.gh.tar.gz 5086001 BLAKE2B 87dad42d87b9d3de2382e21d6f7115fb24e420e262735d4bd73c4e3a325d10b69c6eab5d73ff999811633d6a024c22c15ad65be637339f0c609378d54926f747 SHA512 005163a53fe12baad0998d60d531e3ce4201236b7b042e3c28d7e68f9c40586f94a2576be6918be991a3bf464f2ca55700c0475a6e8c7b05b4342a6f5bbf3354
+DIST pyelftools-0.29.gh.tar.gz 14176561 BLAKE2B 441260492f8cd512445249700a79f1d823ef96f6213ab9183e17160b76efe51493c28d2ae8ecea79acf45e78987b4c24940441e9bc0a3deaeda0ee4fb72b58c3 SHA512 0eba3b029a734abe9f8df92cd58bc967f10bf9f61c3a419bdbc5e637200844dddd947bcb485e8ebbe2eeaa7f7e91efc6500316af51aace1db051a658cf61153e
 EBUILD pyelftools-0.28.ebuild 991 BLAKE2B 6caf74dbd7ed007de77efb2b767ec07d2640f4078b77d489e5c9c68ac82969749a1bc3e25d723302c0cc75588c4d88539063392dab95bff9fc54f5766c99e288 SHA512 cf4ce27e860ec1f10f231735c342cbc10fa52c7c53ed9107e05f449af13840d9150daeec5f2e5be81dfc1eaac65f41a6d0ce1fe4e36aaa91bc4c09be88cdd02d
+EBUILD pyelftools-0.29.ebuild 971 BLAKE2B 47c4d9d8e9b87191bb60f7e3e83ae11171978645ad713a4a5f06ef5dd2ee8238cec06ad6b23aa3384a8ed33c7d73c14d2f4baff3220b12c438414d7c2cb49dc6 SHA512 40470518450c4384d2090b1954b35655d315ce1711b9577894a602567abeab4bfc482d08d80e868c09d1d2c8f92aa848f36b3b756692e6b52675bcdbe59d3969
 MISC metadata.xml 395 BLAKE2B 18e95b29b16eeee438d7391b2370b4955f631578117df6bdf841f50af5c52c688a16e5819b521a37b7737ae0cbe8705c399c2483dd2c066e6e21a7c9b81ec477 SHA512 6ae9650404b3213bb2e1dcc730e782672cb35bc24e3f4b35b02a74d7866ddbda2fc2dc37809856a7e064968502f02d78e2cd1b7a078f44beadd62566913b9f08
diff --git a/dev-python/pyelftools/pyelftools-0.29.ebuild b/dev-python/pyelftools/pyelftools-0.29.ebuild
new file mode 100644
index 000000000000..919519a56c65
--- /dev/null
+++ b/dev-python/pyelftools/pyelftools-0.29.ebuild
@@ -0,0 +1,36 @@
+# 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="pure-Python library for analyzing ELF files and DWARF debugging information"
+HOMEPAGE="
+	https://pypi.org/project/pyelftools/
+	https://github.com/eliben/pyelftools/
+"
+# PyPI tarball lacks some test files
+SRC_URI="
+	https://github.com/eliben/pyelftools/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+python_test() {
+	# readelf_tests often fails due to host `readelf` changing output format
+	"${EPYTHON}" test/run_all_unittests.py || die
+	"${EPYTHON}" test/run_examples_test.py || die
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index 271f1e7ea839..bc693932ed59 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -1,3 +1,5 @@
 DIST PyHamcrest-2.0.3.gh.tar.gz 59353 BLAKE2B b393f250f1a5f3f2d3014ae8a6e20ec659e034d8e681fcbb16f4e9fbe69ba7a94ce342a79584cfc99dff6af57e1d9763efd5ff8b5d891951289d9047cab4270c SHA512 4a28c0ae04db11a86c44dff001e919a5bb6b820af8ffd60b1a1f2846f257d79daac76fbdeac4a0039d149e643043258a0685382a3a4b52c6d4586b8be95e1657
+DIST PyHamcrest-2.0.4.gh.tar.gz 59952 BLAKE2B 76d8bbe2581c178f26cabac5207b6f26f0e86d66848a51fb24d313fdafffc75d40a02f02a73462358ca55a6b50941f849c542340b854aed83a37cef5876d90e4 SHA512 6ee558fe04dce839d5d5d20b90ecf82fed96570e1c5b3a827fce19dba167bf4702ea707560b19e2d6e82be20913deb6cf17fa7e140733899a92abb28e9f2aa56
 EBUILD pyhamcrest-2.0.3-r1.ebuild 853 BLAKE2B 0046909958a999de992568caf452b34ae5c1e36df60571eb8f0b99db41a9742f51b67b5b20d1e28dbe4d24910aab3025f321f50502a146947de54e3302796268 SHA512 100e7ed81dc4a1e1284ee42f120057ee4c05a1e2fc9674f709d2b795e195e2b4b097f82bcf42b3f76345030ff7e523294db122ed131011e54caf1eb815e3c1e3
+EBUILD pyhamcrest-2.0.4.ebuild 958 BLAKE2B 16b4e58eb987b3a223d1a16d8bbd144d62cac3f3ada59af9b0100a465897545da324c5f7c82f3b0f83872951c9a04023dcedfaa2b490e3dd366f8f525c13229d SHA512 002bbb3ce2799882a5fc016762dbee5f4da37f37d74e89148b3da540e5783539a5126f89b66844fffd9e4ac965c126b0a2b22aed74687c75413ee74e68f805c5
 MISC metadata.xml 397 BLAKE2B cfdb950c34749dd9fa17d822df0194a8f35e477902947cf568f76aed96588c0e5a903ea5448f9772faef06ddc66df3c3c971978c6f4431861bf3586702d610db SHA512 024f24f466f0212a7ac599638bcd42b858e2cc786b7bf2641d0e0d4cc3df5dc97c958d4d85930cbd1c32e023f755f844a2675e2c820839729c54ad5e8fb40cd6
diff --git a/dev-python/pyhamcrest/pyhamcrest-2.0.4.ebuild b/dev-python/pyhamcrest/pyhamcrest-2.0.4.ebuild
new file mode 100644
index 000000000000..821699b69fbc
--- /dev/null
+++ b/dev-python/pyhamcrest/pyhamcrest-2.0.4.ebuild
@@ -0,0 +1,41 @@
+# 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
+
+MY_P="PyHamcrest-${PV}"
+DESCRIPTION="Hamcrest framework for matcher objects"
+HOMEPAGE="
+	https://github.com/hamcrest/PyHamcrest/
+	https://pypi.org/project/PyHamcrest/
+"
+SRC_URI="
+	https://github.com/hamcrest/PyHamcrest/archive/V${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="examples"
+
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx doc \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyphen/Manifest b/dev-python/pyphen/Manifest
index 52db53fcdad5..db8cf19ea5b1 100644
--- a/dev-python/pyphen/Manifest
+++ b/dev-python/pyphen/Manifest
@@ -1,3 +1,3 @@
 DIST Pyphen-0.12.0.tar.gz 1969022 BLAKE2B 9b7f6712a2085507684ddde52401a75b05d0a13a530572f0f08b9143168a8ea61a5ee73983606b19f88ff23f3c5344aa87722c3986291c7349f82e95dd3b1f19 SHA512 abecf0773f59b7a757b47c6512f1bf8e98f4709b285f04cf235c085ab4767eb95deab8ede4b792d6f4a6156d47287f9f712cb658939ed5afc475644e282adbd3
-EBUILD pyphen-0.12.0-r1.ebuild 632 BLAKE2B 178a56a9f11d1352421a3d1495df40dc7a780aa6eeba1b5360ab0c53074ac64a4b1bc64ce0240ee3d9bcf70d82c4edd0131c1d2cb9d042e8dba9b70f8c6787ec SHA512 0fcdb35530f17013773fbdc3bac737c735ef68e7cb367f77ae83c9de1c31e8ec3691a767e3b1271965461225d2b24e11ec3d8e55c2737b9fa36117ebbf98fee3
+EBUILD pyphen-0.12.0-r1.ebuild 632 BLAKE2B 0be300792e8aa4952428be73e2d793bd355462edbc2420f1c9927d0c4c76a19a7a6c988f366a25299f43661e2ef645e70f19afe658872a7f76e5032835fe007c SHA512 7dedd061b5e72e76f849acb8cce2155d77bc99db72d58765f05f03c6c6266bd324faa0ae4f8b4c82f8c39ec64fc077d3a53340f1ad70b9bc82246f7887d1ee62
 MISC metadata.xml 386 BLAKE2B 884bd76d980e70fcec706674b5363dfebc74931eac7a2e06cd77e5ca2cd7a72ec0673e44dd05a17dd16f91b7d43b7f97c996bb3994045adb008d97b64ef40c0f SHA512 20752bbbc3c47d4a6f1330a552a5c02bb5fc036f3656c067cb6ebcb4ac2fe2e766c343ec90542aa3ff7465d0726fcf705118ac03d743508ab135261fb115f8f8
diff --git a/dev-python/pyphen/pyphen-0.12.0-r1.ebuild b/dev-python/pyphen/pyphen-0.12.0-r1.ebuild
index 56755fa62959..a926e34e33f0 100644
--- a/dev-python/pyphen/pyphen-0.12.0-r1.ebuild
+++ b/dev-python/pyphen/pyphen-0.12.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index b993f78b0279..549dfc90094c 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,4 +1,5 @@
 DIST pypy2.7-gentoo-patches-7.3.9.tar.xz 7428 BLAKE2B 0a42e3c04ac0e560d56ce7218db81fa55f74ad45a4a033ccda8c5fba34e3a0b1f06587b5b18e947170cc635bd44e5a7799daeec9319c6a09165a73b32554a4b6 SHA512 3a52d40ccf8d77f3493a763b51e4bf86a808f6478191ed4eeaa4f2c2ce8b75769c3880d07cbc7614d8af5573f3e8edfe694be41626b947f3d06c321cf4f59abd
 DIST pypy2.7-v7.3.9-src.tar.bz2 23328628 BLAKE2B 50d015439b6a6f15dd24eb4524726a2054f0d8e7ef209b54dc4eb9365b41b333f3dad525422316af3ff19e6ffb5866859db4455e05fc1529a81ce3b6e7c621db SHA512 8d7513d4efe924f2456dd65a45a82dd16171f7962c81ba90f2a168c332cdad78ceffa3ed1af379c09e61082b39d5c2a8385cd77c89b698c47cc75e9df1bb4d2a
+EBUILD pypy-7.3.9-r1.ebuild 6968 BLAKE2B 91e44e8ca94603d95752dd310d016d24bf289281c33895fb54d47e204133f952f90785bc92dac29413280a06d369ccdaf23e3f60f49f8b10de24207bae1122eb SHA512 5c9742fa5085fc089d96d9ef0ac7a8998b726949d0693bd915c9ad1f97c437ffff7a70ca62244676ed15e38a7dbd8955f38a9b9a02b4a1c3391bcf5906677197
 EBUILD pypy-7.3.9.ebuild 5043 BLAKE2B 204cae544c1bd272e5171736312c8832568f50d59f18c45b36de474e8652cb03d6c7d80bf87e9c01a81c48237d37ea398e81e67495b768e2564509e737ae1ab8 SHA512 88032274e6ade0b1eb994afbbf09a79329e366f2969db15d2b2f4d50605affc16ba81c4f07066fc7f2b8e72c034f56f9a4643f439860ab90557d2ed941b9d6dc
-MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
+MISC metadata.xml 565 BLAKE2B 956a62e9d3632a7ab9ade67527bae54fe0b58d79a6c2f26dc7017a6b8d337f7e5a155b747f24b98f345eb9e1d15c3f38d8530212ad16cfa5292d6cb1ecbf3e91 SHA512 6dd5bc7712533a926b7efdba10c3bea32c813d703916f6bf152ff14f7561cdc466354c8fdbb9640afe415daa3cf2d9365351261e89b8aadfae7b74afd48ae061
diff --git a/dev-python/pypy/metadata.xml b/dev-python/pypy/metadata.xml
index efd7c8c21836..786955f8b2f0 100644
--- a/dev-python/pypy/metadata.xml
+++ b/dev-python/pypy/metadata.xml
@@ -5,4 +5,13 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<use>
+		<flag name="full-stdlib">
+			Install complete stdlib as necessary to use PyPy for general
+			purpose programs.  By default, only a limited subset that is
+			used when building <pkg>dev-python/pypy3-exe</pkg> is
+			installed.  Note that PyPy2.7's stdlib contains multiple
+			known vulnerabilities.
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-python/pypy/pypy-7.3.9-r1.ebuild b/dev-python/pypy/pypy-7.3.9-r1.ebuild
new file mode 100644
index 000000000000..ae8f4222bb0c
--- /dev/null
+++ b/dev-python/pypy/pypy-7.3.9-r1.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pax-utils python-utils-r1
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV/_}
+PATCHSET="pypy2.7-gentoo-patches-${PV/_rc/rc}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/73"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 full-stdlib gdbm +jit ncurses sqlite tk"
+
+RDEPEND="
+	|| (
+		>=dev-python/pypy-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
+		>=dev-python/pypy-exe-bin-${PYPY_PV}:${PYPY_PV}
+	)
+	dev-libs/openssl:0=
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy-bin-7.3.0:0
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die
+	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy-c
+
+	# verify the subslot
+	local soabi=$(
+		./pypy-c - <<-EOF
+			import sysconfig
+			print sysconfig.get_config_var("SOABI")
+		EOF
+	)
+	[[ ${soabi#pypy-} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
+	einfo "Generating caches and CFFI modules ..."
+
+	if use full-stdlib; then
+		# Generate Grammar and PatternGrammar pickles.
+		./pypy-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
+			import lib2to3.pygram
+			import lib2to3.patcomp
+			lib2to3.patcomp.PatternCompiler()
+		EOF
+
+		# Generate cffi modules
+		# Please keep in sync with pypy/tool/build_cffi_imports.py!
+		cffi_targets=( pypy_util ssl audioop syslog pwdgrp resource )
+		use gdbm && cffi_targets+=( gdbm )
+		use ncurses && cffi_targets+=( curses )
+		use sqlite && cffi_targets+=( sqlite3 )
+		use tk && cffi_targets+=( tkinter/tklib )
+
+		local t
+		# all modules except tkinter output to .
+		# tkinter outputs to the correct dir ...
+		cd lib_pypy || die
+		for t in "${cffi_targets[@]}"; do
+			# tkinter doesn't work via -m
+			../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+		done
+
+		# Verify that CFFI module list is up-to-date
+		local expected_cksum=2d3acf18
+		local local_cksum=$(
+			../pypy-c - <<-EOF
+				import binascii
+				import json
+				from pypy_tools.build_cffi_imports import cffi_build_scripts as x
+				print("%08x" % (binascii.crc32(json.dumps(x)),))
+			EOF
+		)
+		if [[ ${local_cksum} != ${expected_cksum} ]]; then
+			die "Please verify cffi_targets and update checksum to ${local_cksum}"
+		fi
+
+		# Cleanup temporary objects
+		find -name "_cffi_*.[co]" -delete || die
+		find -type d -empty -delete || die
+	fi
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+
+		# broken by expat-2.4.5
+		--ignore=lib-python/2.7/test/test_minidom.py
+		--ignore=lib-python/2.7/test/test_xml_etree.py
+		--ignore=lib-python/2.7/test/test_xml_etree_c.py
+	)
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	einfo "Installing PyPy ..."
+	dosym pypy-c-${PYPY_PV} "${dest}/pypy-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	if use full-stdlib; then
+		doins -r include lib_pypy lib-python
+
+		# replace copied headers with symlinks
+		for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do
+			dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
+		done
+
+		if ! use gdbm; then
+			rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
+				"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+		fi
+		if ! use sqlite; then
+			rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
+				"${ED}${dest}"/lib_pypy/_sqlite3.py \
+				"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+		fi
+		if ! use tk; then
+			rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+				"${ED}${dest}"/lib_pypy/_tkinter \
+				"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+		fi
+	else
+		# install only the absolutely minimal subset of modules needed
+		# for pypy3 build
+		local lib_py_modules=(
+			# base modules needed to even start pypy (and import site)
+			codecs.py
+			copy_reg.py
+			encodings
+			genericpath.py
+			linecache.py
+			os.py
+			pkgutil.py
+			posixpath.py
+			re.py
+			runpy.py
+			site.py
+			sre_compile.py
+			sre_constants.py
+			sre_parse.py
+			stat.py
+			string.py
+			sysconfig.py
+			traceback.py
+			warnings.py
+			UserDict.py
+
+			# needed for python_optimize
+			compileall.py
+			getopt.py
+			py_compile.py
+			struct.py
+
+			# needed for rpython
+			argparse.py
+			atexit.py
+			base64.py
+			bdb.py
+			bisect.py
+			cmd.py
+			code.py
+			codeop.py
+			collections.py
+			colorsys.py
+			contextlib.py
+			copy.py
+			ctypes
+			dis.py
+			fnmatch.py
+			functools.py
+			gettext.py
+			hashlib.py
+			heapq.py
+			inspect.py
+			io.py
+			json
+			keyword.py
+			locale.py
+			logging
+			opcode.py
+			optparse.py
+			pdb.py
+			pickle.py
+			platform.py
+			pprint.py
+			random.py
+			repr.py
+			shlex.py
+			shutil.py
+			StringIO.py
+			subprocess.py
+			tempfile.py
+			textwrap.py
+			threading.py
+			tokenize.py
+			weakref.py
+			zipfile.py
+		)
+
+		local distutils_modules=(
+			# needed by site
+			__init__.py
+			errors.py
+			sysconfig.py
+			sysconfig_cpython.py
+			sysconfig_pypy.py
+		)
+
+		local lib_pypy_modules=(
+			# needed by site
+			_sysconfigdata.py
+
+			# needed by rpython
+			cffi
+			_ctypes
+			_ffi.py
+			_functools.py
+			_sha.py
+			_sha256.py
+			_sha512.py
+
+			# NB: we're deliberately skipping _hashlib to avoid some deps
+		)
+
+		cd lib-python/2.7 || die
+		insinto "${dest}/lib-python/2.7"
+		doins -r "${lib_py_modules[@]}"
+		cd - >/dev/null || die
+
+		cd lib-python/2.7/distutils || die
+		insinto "${dest}/lib-python/2.7/distutils"
+		doins -r "${distutils_modules[@]}"
+		cd - >/dev/null || die
+
+		cd lib_pypy || die
+		insinto "${dest}/lib_pypy"
+		doins -r "${lib_pypy_modules[@]}"
+		cd - >/dev/null || die
+	fi
+
+	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	local -x EPYTHON=pypy
+	local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 57808cd9e3e7..f5cbff2f4a59 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -2,9 +2,11 @@ DIST pypy3.9-gentoo-patches-7.3.9_p1.tar.xz 3952 BLAKE2B 20ff145749d24f15214c0c7
 DIST pypy3.9-gentoo-patches-7.3.9_p2.tar.xz 4548 BLAKE2B 9acdd315d98b5147a21e9affcf4f4be86385cfe7e96a59a4aee1edb478c3c23990c7c846d7a1b268b616491d57346c939ddf02d4284f3b92f0f050e223eb85ba SHA512 28bc05b249f9f98501cb92354eabcdcd27987bfb6f4867bdda40752384db5ecf2204913c792785ce5a0e6ce588ef0044a179a3932da23205e8706cad065d95e2
 DIST pypy3.9-gentoo-patches-7.3.9_p3.tar.xz 5296 BLAKE2B 2422e7d74c563d7328e5bc5c131d13f0cb41f133e06a514e56ad89d2cc8e0b9c57d4379d0e8810486e5e34ec2807a74e9553768a493ffe54fc27d404977097d3 SHA512 3470efdd50ba10e2137b4661c940a3aa807b804ef582a5201507227573637171981bd597b3b40faa3606890f3f51fb8c43ff70628de924a67e2c1226beda9269
 DIST pypy3.9-gentoo-patches-7.3.9_p4.tar.xz 8664 BLAKE2B cccb62bb7957ee21f45eb65a307f255f61ba097cf9313517743bd0c4471d4b4e7c4c2bf2509fffd7584be6efbb467b39aeaec5e70b597844ddd40bd2184f65e8 SHA512 cf9722c5ada7544608b95cb94da4d119fa5371def760c52baaffe57ee0128c729e41a78bbcbcce6677eb88ad063d3f0572667ab8889cf68ee8be7e578ca420c7
+DIST pypy3.9-gentoo-patches-7.3.9_p5.tar.xz 13044 BLAKE2B 0a6119c3393a8b2d599659cee2a57b2a06b18c8dbe0f04fcdbcdde98098c1f19f51c2f387b20fd8db48c6e9dc52f08baeea5f722caf751c0a13078df00538450 SHA512 7965425e107058231657d94e923d132368f11fbc1451f5ae93379f4fc8f8ea62f9e22786b1a97b37a8b4bdb8a295fc5517f07143d04e21b4990f653c0e5f1f05
 DIST pypy3.9-v7.3.9-src.tar.bz2 26976726 BLAKE2B bf1ed21c575901abac020120aaff07ab57f1404713211b19cbd1eb4d6ffc675b7933be8c6fffc2b69ab467963d6598534cd5aa90c02feddad596611d2a6b6581 SHA512 83f8a6a2da351c190d2d224242cbc35e35529c7a8e8d842eaf5c945cbce2e172b02a340f32af3d49df8d5288370d794d5bc95fc12dd4a13d817c925abf06198a
 EBUILD pypy3-7.3.9_p1.ebuild 5459 BLAKE2B cecd4e9ef25bfa9c5c26e444d74eaccfe3a6f588c33af1f64ab0419cdf8944a5b6d78134fadcae6ca682edbe48197df765c830f9cc22a80fb2fa3e5a220fb61c SHA512 30c1a6315502c2fa6d219567c4ec827244257a4f4bdde204fbd0374fd0c1320cbf87097db029ef3822173fa2cd999799b7b79b51df3d1447f67140bee26ecc65
 EBUILD pypy3-7.3.9_p2.ebuild 5461 BLAKE2B 4086916df9196af0dfbc8cf9e2ca0bd4cd6d4d7b927d4d157abae2ff7f7460492d3c30ba4525d1140e4eee8f7f87067bcf6981a0982936cc3f60cd49f332e2fd SHA512 3a24f51744b66a511152a0c52c4d5bb4a41330e452b6d6d67abe87e74a6ffdc8eeb989b8657226c41bd18cdb600eca7ab924cd16839c0e0e6ac49db6a2e8ba9d
 EBUILD pypy3-7.3.9_p3.ebuild 5579 BLAKE2B 6b30c40b01e3e4e6ffa6eaa2095df5e061079bb5ea2e858564aa1fb9c03ac54b1bf5422b722a3ae6bc0d166e4a3f4a302862cbdf908034682d3d61930bb055b4 SHA512 a357b3c6fe57074821a5b7b95851e5dc22cda8135f1828dd9250715394d43a96369b43273bacff38865b5b2d3aeb29eadc0fb84b1d8746e5235a73cefc3d4c14
 EBUILD pypy3-7.3.9_p4.ebuild 5773 BLAKE2B 2f9fac9ca77b85d68f81f965324d7a58d87e2fd546653e9b72217a1cd7b716c49e94a482ed7ccfa907fcf8e936746879791a50d197709f80dceddc92bf430502 SHA512 6126c4b7e711930a039e4825396fcdfa784d2f4c54817a799b2f28e82a2cde9864fba17aa0cfddcfeee1828f4a0dc9eeccb9571693aee802295b4504e40bf355
+EBUILD pypy3-7.3.9_p5.ebuild 5773 BLAKE2B 2f9fac9ca77b85d68f81f965324d7a58d87e2fd546653e9b72217a1cd7b716c49e94a482ed7ccfa907fcf8e936746879791a50d197709f80dceddc92bf430502 SHA512 6126c4b7e711930a039e4825396fcdfa784d2f4c54817a799b2f28e82a2cde9864fba17aa0cfddcfeee1828f4a0dc9eeccb9571693aee802295b4504e40bf355
 MISC metadata.xml 455 BLAKE2B 568930d8cb9c6efa7e41d2285fa487ab7aee2344c11fe5cc325d24d6dbcd1184daffcad3b262351b39a45cdf7994ed301b61946eafa1be901b7419636d2eebd9 SHA512 357104cf9ac21d9c7fa5d843cfa7e2c5883d2f11e0bc15ac0fa8ab36a9595194ac05165f5aee94c3eb98ad370f0bf16f4488819311f8f077e9f2a79586f711f0
diff --git a/dev-python/pypy3/pypy3-7.3.9_p5.ebuild b/dev-python/pypy3/pypy3-7.3.9_p5.ebuild
new file mode 100644
index 000000000000..62da106fee36
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.9_p5.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python2_7 )
+inherit pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy3.9-v${PYPY_PV/_rc/rc}
+PATCHSET="pypy3.9-gentoo-patches-${PV/_rc/rc}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.9) language"
+HOMEPAGE="
+	https://www.pypy.org/
+	https://foss.heptapod.net/pypy/pypy/
+"
+SRC_URI="
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
+SLOT="0/pypy39-pp73-336"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 +ensurepip gdbm +jit ncurses sqlite test tk"
+# many tests are failing upstream
+# see https://buildbot.pypy.org/summary?branch=py3.9
+RESTRICT="test"
+
+RDEPEND="
+	|| (
+		>=dev-python/pypy3-exe-${PYPY_PV}_p3:3.9-${PYPY_PV}[bzip2?,ncurses?]
+		>=dev-python/pypy3-exe-bin-${PYPY_PV}_p3:3.9-${PYPY_PV}
+	)
+	dev-lang/python-exec[python_targets_pypy3(-)]
+	dev-libs/openssl:0=
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy3-bin-7.3.0:0
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		!!dev-python/pytest-forked
+	)
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	mkdir bin || die
+	# switch to the layout expected for cffi module builds
+	mkdir include/pypy3.9 || die
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/bin/pypy3.9-c-${PYPY_PV} pypy3.9-c || die
+	cp -p "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/* include/pypy3.9/ || die
+	# (not installed by pypy-exe)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/pypy3.9/ || die
+	mv pypy/module/cpyext/parse/*.h include/pypy3.9/ || die
+	pax-mark m pypy3.9-c
+
+	# verify the subslot
+	local soabi=$(
+		./pypy3.9-c - <<-EOF
+			import importlib.util
+			import sysconfig
+			soabi = sysconfig.get_config_var("SOABI")
+			magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff
+			print(f"{soabi}-{magic}")
+		EOF
+	)
+	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
+	# Add epython.py to the distribution
+	echo "EPYTHON='${EPYTHON}'" > lib-python/3/epython.py || die
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy3.9-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
+		import lib2to3.pygram
+		import lib2to3.patcomp
+		lib2to3.patcomp.PatternCompiler()
+	EOF
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+	# (NB: we build CFFI modules first to avoid error log when importing
+	# build_cffi_imports).
+	cffi_targets=( pypy_util blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma posixshmem )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy3.9-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Verify that CFFI module list is up-to-date
+	local expected_cksum=63d4659f
+	local local_cksum=$(
+		../pypy3.9-c - <<-EOF
+			import binascii
+			import json
+			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
+			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
+		EOF
+	)
+	if [[ ${local_cksum} != ${expected_cksum} ]]; then
+		die "Please verify cffi_targets and update checksum to ${local_cksum}"
+	fi
+
+	# Cleanup temporary objects
+	find -name "*_cffi.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	# (--deselect for failing doctests)
+	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3.9-c -vv lib-python || die
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	dodir /usr/bin
+	dosym pypy3.9-c-${PYPY_PV} /usr/bin/pypy3.9
+	dosym pypy3.9 /usr/bin/pypy3
+	insinto /usr/lib/pypy3.9
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r lib-python/3/. lib_pypy/.
+	insinto /usr/include
+	doins -r include/pypy3.9
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy3.9/${x##*/}"
+	done
+
+	dodoc README.rst
+
+	local dest=/usr/lib/pypy3.9
+	rm -r "${ED}${dest}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${ED}${dest}"/ensurepip || die
+	fi
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/sqlite3 \
+			"${ED}${dest}"/_sqlite3* \
+			"${ED}${dest}"/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/{idlelib,tkinter} \
+			"${ED}${dest}"/_tkinter \
+			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy3
+	local -x PYTHON=${ED}/usr/bin/pypy3.9-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}/usr/bin/pypy3.9-c-${PYPY_PV}" "${PYTHON}" || die
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pyspnego/Manifest b/dev-python/pyspnego/Manifest
index e6b5e5821919..5ec447932258 100644
--- a/dev-python/pyspnego/Manifest
+++ b/dev-python/pyspnego/Manifest
@@ -1,5 +1,7 @@
 DIST pyspnego-0.5.2.tar.gz 328222 BLAKE2B 7c811948d1d3890e2d03f4a532b9c0158195684b0cdee915811b1ee3bfa791b84632edb6d098562aa7b9f4c36eb00f244e249340b4de557999ec2a0f176ebd1e SHA512 805da232d138edaf4094614df0ebc4840f0c1b9deb9586026bffe0ec17d54553e4d3876ffc53d87b13687b741951a68334369f0f2475cf2f12359f072dc6a0c8
 DIST pyspnego-0.5.3.tar.gz 389939 BLAKE2B 236151d9d9f37137d46b06a99f037922563b4d43931288129492aa7173f166d24c3086297e30a0f05158773101df9868f88efffe00864b1bd5deb0a99a496b61 SHA512 41ca9f785a7dcc99818da351e0a020ffaed72d65cd67b0f19ad4a462a6a1fe739d040acec85052133a19aed06066dae9a9e8f0b469713b331f6ddc52cd3b4c0a
+DIST pyspnego-0.5.4.tar.gz 390427 BLAKE2B dcd9a58b2ecdab8d0ef89c6d321cdc75b8711d613afc7fdc2d3986768397b8c097cd2dd86383da7072f8e85686ea02afbe4c738d603d20590c67f8560df5e790 SHA512 5f49ba1a2f86880ded9f09f81969eecdfefc468c72c770846e3af6520bb186c585bf8d74e8fc16bcba24d9220f88d6f5d9b59af203efe499866d6335d13b96b5
 EBUILD pyspnego-0.5.2.ebuild 922 BLAKE2B 72374a98bd8ad5eaaadb201d5fbaf996eee2050f84bf232e67eb135020f2510aa2332a7e24051ec5846cc1f6047d552dd4373d0c0a87562e4f9cbc3aa333915e SHA512 1320ae5b3d893d70604c4c32152974f59dc31399b8aff9c2e93aa4aa8d90c437c29c1f9a7b368fffde1ef804163df16e7d355241c64c53b3816e6d909dd621d0
 EBUILD pyspnego-0.5.3.ebuild 983 BLAKE2B e92453d0e2c2c856fcf2b956e66c8f5fdc20b1e90947bbc9bf61fe57d4dd70a6518968e58f722abada3845eb531f9f464ab41ada10d441e0cc64f3b9cedc202c SHA512 fd78c905f5ca82dc3ba409cbf223ea3a8725e5d0a7c86d6ec85940fbde0deae1ec6f26c98eaf0c4b0c87eb0cbaeebcf7caa23c0d38097db45bd6e31052b291c4
+EBUILD pyspnego-0.5.4.ebuild 925 BLAKE2B 4c3d306b7b88e0bfbdded05c1e8ba82f44a9f1db3a32264b9261f5f8edd9fad45d83c8482f1d5bb32ca00de355e2a9f007ac67a4e93a95c010e9a8fca3858931 SHA512 f55c7a99baff0bdc65aeae861402156ca34b06f076d1ffc5211ff43d3410ad26bab015fe3c1ec51f45f6c1d0e01233142ea394ed6fe9c523f84217b09a46e98f
 MISC metadata.xml 370 BLAKE2B 113adf1bd70a99f41e2b8cd4d5bb69cbd4f6bffa1dba325a8a6e35a1b5ee2800ef1d4b9ceec9be2ad1291fdd054fa81fdb841cdf40b5e969360bf1ee2e456960 SHA512 baa8a1fee20b0cea6308fbfa24fc395cd58e8729eb703692cc2a109e838284ec21559d4c9af3c99fe6d63ac6a8e04e3a3c824cb073302f788f2fa5dcf1dbf00c
diff --git a/dev-python/pyspnego/pyspnego-0.5.4.ebuild b/dev-python/pyspnego/pyspnego-0.5.4.ebuild
new file mode 100644
index 000000000000..3f874f999ccf
--- /dev/null
+++ b/dev-python/pyspnego/pyspnego-0.5.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Library to handle SPNEGO and CredSSP authentication"
+HOMEPAGE="
+	https://github.com/jborean93/pyspnego/
+	https://pypi.org/project/pyspnego/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/gssapi[${PYTHON_USEDEP}]
+		>=dev-python/krb5-0.3.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "Kerberos authentication" "dev-python/gssapi >=dev-python/krb5-0.3.0"
+	optfeature "YAML output support" "dev-python/ruamel-yaml"
+}
diff --git a/dev-python/pyte/Manifest b/dev-python/pyte/Manifest
index ce45926b74cc..f1f14cdbad87 100644
--- a/dev-python/pyte/Manifest
+++ b/dev-python/pyte/Manifest
@@ -1,3 +1,3 @@
 DIST pyte-0.8.1.gh.tar.gz 92220 BLAKE2B f4f803ecbf9bc62936ea499929b7fb976c14ee09fe00ee56d5499bb2543a6ac769dd7c87e177c297bbf8ab082c34f154a26daf3a1c84917249400b09556c2b80 SHA512 f49d9394cca92c27fdd5319bdce164d5cac63b77d13156de7105bee6087a615e844fafa8507089c8bf6cf31a796cc858a3ccf597aa23cfa595d0d9e0adfab5d4
-EBUILD pyte-0.8.1.ebuild 738 BLAKE2B f2a4604af398dd8d61e781eee4423cd4f7d1cc28a9b180bcac9610f5b977fb4350b09e939c117698450586b0f8da41f1604f66b590b1894351b18f7b55281036 SHA512 488accd6d334ab612283aa155104d9b23839f6dd3dfc102710d599b54bd18dfe1d7f78904d1cb9ad11cbda69fe0b40b7cda05dc4f5164fc1e92c231b0c8a0a45
+EBUILD pyte-0.8.1.ebuild 738 BLAKE2B fc3be6e667353e5763c859bee2596e96e557a7060f941ecf780fd7f5cacbd6953936e8f77f28c37718cbe70b9a8f8b8b0e6845714cac98ce4a68fcef594b4e2b SHA512 9f2336382f09c53a0a3b9043811f5a2ad67da356c884a7fa8bbcfb91dc5f06a66b802e290be292991fa9c6bd2f37bb9e87f66c816c90c0c68362c40e2fff7761
 MISC metadata.xml 398 BLAKE2B 4bca2386a5448c989f5aa69096d6f1ab1601fbbd547d81c01920054cab0d3aed2182965e6ffda0ec07ddac5a18fc759e002173ffced3574767d730a39f06fafe SHA512 30ca4fae97a92145e55e0a59dec2edaafeb7931cd422bbe0c96d1ab1f68cc49124f00ed0d2143d444091b5c2561076e47b9ecd7436f59a11c79d3af670528a24
diff --git a/dev-python/pyte/pyte-0.8.1.ebuild b/dev-python/pyte/pyte-0.8.1.ebuild
index fa7fea362e6b..e6918854356f 100644
--- a/dev-python/pyte/pyte-0.8.1.ebuild
+++ b/dev-python/pyte/pyte-0.8.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-bdd/Manifest b/dev-python/pytest-bdd/Manifest
index da58042bcc58..1dc5c0a88595 100644
--- a/dev-python/pytest-bdd/Manifest
+++ b/dev-python/pytest-bdd/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-bdd-5.0.0.gh.tar.gz 61174 BLAKE2B 6dd1d53614226d3515b0f61f71822363b559aa45789bab7f3416c75e603e87a1fe48627f36862f44bfa7ac6ec5023ad8afde6054ec67fc9a2e756be7de729fd1 SHA512 827e57d410b05207b6c646062ddb54b677e22441311820d3bd406df202b6e9344dedf59cd4868e89cfbf8606fe3f15559e4cc3958d100e4fa74f9b864e6faada
 DIST pytest-bdd-6.0.1.gh.tar.gz 60932 BLAKE2B 67e0dbc251ce94da40033641f37e6c9ad70ca947f71db1a78907a6890d96d8d3112d57a2a63dda526c8f846010d39a575cb5d93a102f4653705d4229ee14ab07 SHA512 30bc697ae177e3f311af0c781e99bde5b491dfef28109359c0d80f33feb8b0b170ffe15c288fe73a624144a1d1c3223b220d591b4acc30d1ad53600482bef87d
-EBUILD pytest-bdd-5.0.0-r1.ebuild 1037 BLAKE2B fced384bd393f3371d5ba248728f9c5ec7a43b3f746ae9e1b6550c320cb4dfc2427ae725b339ee0a54dc729d800b1b5584eac34ec149bcb5a90837ba64416c9b SHA512 c475eeee113ff2ce20abeef242a80e805dd516a206e5b491299b445cbf169ad8b8fbb5c1cd0e43b8beb899028ed343beee61e1e64a522c2ebaa927a0ae3a822b
 EBUILD pytest-bdd-6.0.1.ebuild 1084 BLAKE2B baa7bbb71d57683cb4b03dc4fb15ffb510d214df05fdf714767767a73846b6543188ab4af6b931db3c3362cad3b945e271979837f1168a04dcb32c9acdf06549 SHA512 2df002e33e225db79ddb3f6afc9c70e7d1d6f0ef29aad3c8f44189cb9b86faa430053dcba31c3ddb2ce6f8ba5367873d61688b0cc6ffc3208af49868eb566118
 MISC metadata.xml 404 BLAKE2B b5bdea28ab998a54bd0b76e38c37a77af74d4ae149bfc5af47e7466b7c13ae6a5784be0ecc3e6cd8ccbbd5164dea02d704f596b7e00d22b0d640c4ad3dd13b41 SHA512 97800a5877bd8f3aa880a0cdff19cc89de983ec1a0cd9fbe2c74178b6fc214a0ca7fbb013b2ac490e1c4109f03ded7055e1517a3b57f6da0d79c9f5ea5864e77
diff --git a/dev-python/pytest-bdd/pytest-bdd-5.0.0-r1.ebuild b/dev-python/pytest-bdd/pytest-bdd-5.0.0-r1.ebuild
deleted file mode 100644
index edc44c97450b..000000000000
--- a/dev-python/pytest-bdd/pytest-bdd-5.0.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1
-
-DESCRIPTION="BDD library for the pytest runner"
-HOMEPAGE="https://pypi.org/project/pytest-bdd/"
-SRC_URI="https://github.com/pytest-dev/pytest-bdd/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/glob2[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/parse[${PYTHON_USEDEP}]
-	dev-python/parse_type[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-DOCS=( AUTHORS.rst CHANGES.rst README.rst )
-
-src_test() {
-	# terminal_reporter test needs exact wrapping
-	local -x COLUMNS=80
-
-	# hooks output parsing may be affected by other pytest-*, e.g. tornasync
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_bdd.plugin
-
-	distutils-r1_src_test
-}
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index cdacb86b974a..e01f004cdf94 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,6 +1,6 @@
 DIST python-ldap-3.4.0_p20220420.tar.gz 377780 BLAKE2B 433178138587dc09bfe1e6a8e894c001baf6e07c76266ca9d7c56b279f9e9ca5a642528a5869a837a9ee5576a2cf17afdeea313b4a8bc930926397738d6a5daf SHA512 0dfe8ff4737a630a08c7cd4d94f30c78fd1e0558ffc0609439d95ef064b72aef9d4ec4cdc0d40aaf1fc46396bdc0cbbdf0bf3cf6bb5e94bf8a9e3083b9ba1bf4
 DIST python-ldap-3.4.2.gh.tar.gz 377981 BLAKE2B 6efa768dd035f8867abacfd9cc1b9ceca1a468c79550d2529130bd8eaf7546e4474d5798cf9090a9a74f05286ca30a33b8e54821292b8aa2e27358f93d72cb7b SHA512 3a68dd2c160d7d74061d9c9eb060be6faeec1f607f3853722f969d7d1dc76c7da160aa20a4c139feb4d2eba6dbf2e2cfb02551cabd6fbf413654f32f73e94c15
 EBUILD python-ldap-3.4.0_p20220420.ebuild 2339 BLAKE2B 643b27187a5fc5892a6c7301bacb58fbf57a31f6de6a704e7871e6a9dfc693d9c6c3980137cfc41cf745d6fe52ebf94f0e98fa33094237e9dc0ee5407c0ae2d8 SHA512 2dcf1c028bd92213eedf22b099b9f4518b7a5add89d73b3aaec0958b20276ea18311145ac0ceb902f8ed9ea72eb1dfb5367e7404933acc309a0e5cf400d5aae3
-EBUILD python-ldap-3.4.2.ebuild 1706 BLAKE2B 4baf713276892bd69df2c593e65f4f859c422d3ac492d66b10957332d789fdeaa7a33f99d504f59f1dbebfda84b8e54ed74b919b7eb680fb539d76188d942724 SHA512 464b830763c8f4787e814fbf118d04106c58f085439bf2c3cfb911b2e8b1fbc4ce43dc268fc6f860f7bc3773ef131724092adc2da1838548cc13c6a7e07204bb
+EBUILD python-ldap-3.4.2.ebuild 1705 BLAKE2B 59f1e35298f5fc8269f06f66809d01b6d1d681431cb9587c5ecee1ea2e5ce1ac4db80829d2f9e7f0b94e440782c89f70951b56881d1701b3b11883132381d26c SHA512 cfd0d58b00104521cfe67bedd122e3a8c8cb30646da1fe334db76c97f312a4894cfaf0eb7be795616f33870181222ad4c489cce6c88ddb4e520ddd17c94a4b81
 EBUILD python-ldap-9999.ebuild 2000 BLAKE2B 1340f010714318a6a8e90ffa228a3c0799909ee1f70af5ec5cbd73449d6982a18df35353a3d356d559a89c43be1c44f097698236a6118ad66fac5630a75d57c8 SHA512 c58a4c82d5e18bb29b62024a826b063f0f47ee3f9e4a798251175b4115a31f5a5803962ec597c12d8855faba83c259f559083a6499524f41197d2ecfd0d3a9fb
 MISC metadata.xml 449 BLAKE2B 14ffa18ca09eb663d3ef4ff5bd0ebc8511fa408a4e96c93885ba2beaccdf3bb82a9733a01149e088c8b66d6cb938f94fc3940c0c0cca5685599191e772443cb6 SHA512 2f5c014e55f838b84abf6ba630b000620a01e2fca6d1f1bd1b30db309f820df50c2ef7feddc17c69ee0188c3cbc91a388933b4bccfc8d2ea0cb18c6dae85cda6
diff --git a/dev-python/python-ldap/python-ldap-3.4.2.ebuild b/dev-python/python-ldap/python-ldap-3.4.2.ebuild
index f749ed1579f1..b3b4226b9246 100644
--- a/dev-python/python-ldap/python-ldap-3.4.2.ebuild
+++ b/dev-python/python-ldap/python-ldap-3.4.2.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86 ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86 ~x86-solaris"
 IUSE="examples sasl ssl"
 
 RDEPEND="
diff --git a/dev-python/pyxattr/Manifest b/dev-python/pyxattr/Manifest
index 07835a7765f7..3ff0aabe85bc 100644
--- a/dev-python/pyxattr/Manifest
+++ b/dev-python/pyxattr/Manifest
@@ -1,3 +1,3 @@
 DIST pyxattr-0.7.2.tar.gz 31550 BLAKE2B 3505300d7a50dc305068740379bb8edbefa29f228c797e2e74467a51f4b0a6b740203f89b8ed461218978214213a6cd778107f58eb07a64d6b45e25d0fb769ea SHA512 fb9b36d5d2fb9ab674daf40d6f5c7dbe50d847dcb6d9955d270ef3aed2d8e3540f8feebd934009f47d63f3c55882846a20f7ed733b0d0c004e7a1984e7106206
-EBUILD pyxattr-0.7.2.ebuild 833 BLAKE2B 2855052a0cbaa3cd30935ce30e0a0a9dda80d39e50686f9f7a06ce54a811e465ab739b1f227c6ccd66d9c5dd040191bac0d689fa2d4a2e3452128a3114975dc6 SHA512 7fa7692c510e2a5b70b198ab80811ec21003fe5a7200428ff61bca3a852f013e1b27be8a6ffc3a5667ef2a059d8fd4686b8310ebd5d5666442ebef6e579b3d8f
-MISC metadata.xml 610 BLAKE2B 5e7bade0365a6bc3c784e678cd7165931f2ed212fde393cb4d110efca2f8e02c7627777317c91e4f03f8dea88e3c31105364334d1e63bd27f4bce973bd3d1278 SHA512 af554dee568ac71a61464a75ba29fdf4ac17dcf4c9b9be7bbaf2b009dbf52c04ea979503dee14d7289b6bdabec45ef05fc2374f2598d9802252018ea8054cae9
+EBUILD pyxattr-0.7.2.ebuild 833 BLAKE2B 6959b68b43d3b9377dffe705e0a4925f0e9c6ebde4641d951c01c4cd3a50b7e9bb566c6b8fdd2a8d3055542347f69be08b543092e57b28c00e9ed37a02d6a110 SHA512 abac72117c700b6045fd9f8014f2109cb5a2d108fd22e38e8be7e4e4e96b93dcc945223badc501a7ab928c33f141775cd8d39149b08192206404b7a6dacbc8ab
+MISC metadata.xml 666 BLAKE2B 0d08037b686b758708647a9bac820ec0664dd8b70e64bdc212270c95958e077de5ca6c4f32354dbc93522f1cf0d73df58f4160cd3dc9afea2586ca45280cb0fb SHA512 14fc002e3803a7f43fec0e36104c5af58b219bed19ec13dc71de94644bd71dcc8c3e516df4c201fac8c489cadddb1fd92915f2fb20da89045234fbbaaf497ede
diff --git a/dev-python/pyxattr/metadata.xml b/dev-python/pyxattr/metadata.xml
index 74f6f576e107..bc37bc90ec46 100644
--- a/dev-python/pyxattr/metadata.xml
+++ b/dev-python/pyxattr/metadata.xml
@@ -14,6 +14,7 @@
     <name>Python</name>
   </maintainer>
   <upstream>
+    <remote-id type="github">iustin/pyxattr</remote-id>
     <remote-id type="pypi">pyxattr</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pyxattr/pyxattr-0.7.2.ebuild b/dev-python/pyxattr/pyxattr-0.7.2.ebuild
index a6778fa0e754..e78d5d513925 100644
--- a/dev-python/pyxattr/pyxattr-0.7.2.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.7.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 2c7013bf3c40..ac30a539dbbf 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -7,5 +7,5 @@ DIST regex-2022.7.9.tar.gz 383431 BLAKE2B 9773b3e5c516d79ec6b37d288addb063801671
 EBUILD regex-2022.6.2.ebuild 889 BLAKE2B 2f4739ef643cd8ce3dce81e94160c6943bfb5f5309f62306bad54dbdf0ff0035fdac591d776c5da341060b4da89d12396b54e2436855bb85e4e449c454e6552d SHA512 e95dc22617b73dcd0e01504dd8e974f09260c79f0935fe9cc9d6a2842640556ed1f34d619fdf31917ae2d466dda860ed02fb9539178c5700ed26ec1132c738b0
 EBUILD regex-2022.7.24.ebuild 897 BLAKE2B 409dbb1b548b25d5ac390fdd799e88f54255462fe43a054bb079396a58d2124f06b619c9f97bd95e09a84fec93ed76f0904ace13a81f40ba34ab54fedc885e30 SHA512 0c57dc92862339020b9caf9e727f75f577fbcc3710dfbc8657ba403d7791e2a7a42e0866d6fe82640b2d674167c60ac51e259dd03ed2acf8260435f0b352fbfd
 EBUILD regex-2022.7.25.ebuild 897 BLAKE2B 409dbb1b548b25d5ac390fdd799e88f54255462fe43a054bb079396a58d2124f06b619c9f97bd95e09a84fec93ed76f0904ace13a81f40ba34ab54fedc885e30 SHA512 0c57dc92862339020b9caf9e727f75f577fbcc3710dfbc8657ba403d7791e2a7a42e0866d6fe82640b2d674167c60ac51e259dd03ed2acf8260435f0b352fbfd
-EBUILD regex-2022.7.9.ebuild 892 BLAKE2B da7db5f44160677d8d0039e18f57192b2bbf9180c7e1d52c2ccaa58c2d5e2bdc6378302543931ec6348d0837aeaa6e8860ea9beae76359f7ce89853f9b64a6f3 SHA512 005f45d4b297327eed9a928e1ba4f4ff296517f0658a0666c9c48a668871f5a13a33a86d0c16b5b9467a6f1fc38c905feb1a6f0a87683afbba19000baf627ea6
+EBUILD regex-2022.7.9.ebuild 890 BLAKE2B f296e36dd12abd066d236d045d084498c1b4f34b87de0e2594f581b2af032fe9ac29e36102f486c22fc96557b4fe107cc5f7ab9203d8855d001d44aad30da173 SHA512 2dbe6ce417cca1309ae4fc63e73377a51d4020ad25c339ef84fd75d833b7d4c26a27d55f95a86cc6282c61a3318d010b58c7685f8246e28741a0a3dc1e5d4604
 MISC metadata.xml 385 BLAKE2B 90c9075dcf3be9bd447746b249c438f50bc84a7c6c63051e808c5feb19b2c6208f85a681e449a025fe43cd0d5b2ab541752966b04b787052d78b92d5230d8e62 SHA512 f554035e72bcfff83e693f3651198f09fd354babfbadd5fef26dca3015ef8cc00c47072648794123c69bbd12c637eeaf9e9471680bab847ec701da2146462817
diff --git a/dev-python/regex/regex-2022.7.9.ebuild b/dev-python/regex/regex-2022.7.9.ebuild
index fd4fab4dd011..dd9fb7628614 100644
--- a/dev-python/regex/regex-2022.7.9.ebuild
+++ b/dev-python/regex/regex-2022.7.9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/requests-credssp/Manifest b/dev-python/requests-credssp/Manifest
index 17711acd3335..bb70bd8d8bb4 100644
--- a/dev-python/requests-credssp/Manifest
+++ b/dev-python/requests-credssp/Manifest
@@ -1,3 +1,3 @@
 DIST requests-credssp-2.0.0.tar.gz 15225 BLAKE2B 3cd2a6bafcef5803d89ab13c42385709308998187eda514a598d262ab5e8c94bc3c0e9b9bf3756de1454d570012863a01f650b4fc6e3a17fb2845d8e52f0bf3b SHA512 d11a76bc9577f3054e5955aad513ee27ff2cf3a70414a1d4a81e721a7b40510d45fa33abc5957724ead6c04958a009153f670e154f38f32f2331cc14dd44ee27
-EBUILD requests-credssp-2.0.0.ebuild 762 BLAKE2B 55d67aee98dd7c0976a8914056dd1decbb7e340c55e0a44f57714b25916ed6ada29bb73e287a9c6cb59183f17124dfe7d4a1efee16d3b485a9ad8603ff4fc0df SHA512 39e6b8adf49c12a0df6fff543dbf6ca8e169a6248449b5521311669a857c67d9816a48dce7b87e4ec96a13ae08fa9fda52967e1072a8af5e32acff9a7a91acd2
+EBUILD requests-credssp-2.0.0.ebuild 775 BLAKE2B 033717dbfe8e3ba2bfa59249b4e8f98af056898e91a8bc993ef73726471eabdfe1d9fd8f8f3b4fe800f05a95180845c9706f4cdd5807e92c9959eba2fc21fad6 SHA512 f12b93b486b0ab37ad81225f309f4ee6f3d40c155f4cc791b1308bd0ec3bb3645d6d9ec7a362e5b1c9423534d76d5950a3c45c1b06ddb8bd876001bd30ab2ef7
 MISC metadata.xml 516 BLAKE2B 23322b5685c76f093b1569624640bfaffda45012b99b24e988f938f3ee7099257e91b9bd86efdd294e5cb6b2ccd5135a109496ba3978cc691faa4a194c07b69b SHA512 fc4361579097ac7192abc556577cbecf45eec46c06537077eff9c97f7a65e66a7cb57c9d4668d95ceb15b354333b86048f45661a2b91c6fcc9464b9ffad6b938
diff --git a/dev-python/requests-credssp/requests-credssp-2.0.0.ebuild b/dev-python/requests-credssp/requests-credssp-2.0.0.ebuild
index 64274ccfbf94..ddc70f408253 100644
--- a/dev-python/requests-credssp/requests-credssp-2.0.0.ebuild
+++ b/dev-python/requests-credssp/requests-credssp-2.0.0.ebuild
@@ -4,22 +4,30 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
 DESCRIPTION="HTTPS CredSSP authentication with the requests library"
-HOMEPAGE="https://pypi.org/project/requests-credssp/ https://github.com/jborean93/requests-credssp"
-SRC_URI="https://github.com/jborean93/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://pypi.org/project/requests-credssp/
+	https://github.com/jborean93/requests-credssp/
+"
+SRC_URI="
+	https://github.com/jborean93/${PN}/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv"
 
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/gssapi[${PYTHON_USEDEP}]
 	dev-python/krb5[${PYTHON_USEDEP}]
 	>=dev-python/pyspnego-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]"
+	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/requests-kerberos/Manifest b/dev-python/requests-kerberos/Manifest
index 10f71b07f674..8fea86a2e9f7 100644
--- a/dev-python/requests-kerberos/Manifest
+++ b/dev-python/requests-kerberos/Manifest
@@ -1,3 +1,3 @@
 DIST requests-kerberos-0.14.0.tar.gz 21275 BLAKE2B d64c92bf70df07a8dd38626a6699ecb95aaf82b6aa93797eefa80af2b9760f5b064e0aa3a3bca5242ef73ce1efc4b6ef0ef1bb1802c7c59a20b6655bd3894aae SHA512 9dd6eed0d6afe4b852ba96f621be3af2965e9011bf372c5dce77e0bca18191255ea407ba313904271615d722d60029807db2d6815b24437b021b02b026eb60d6
-EBUILD requests-kerberos-0.14.0-r1.ebuild 784 BLAKE2B 3ab1e697c35f17c7f5080563aee5a30abb20dbe3886f708c09db4ec24802b25246d75eb5718f6c41970477d66314d87d00602fccd7f317cc9f281a8e69d2e330 SHA512 4117a4022b271364f2b407b980c0bd7875add7253aa83e7bed1d38dd34b3417e0a3a9bf4ec6a11d9b029ea34a902ed1b88d6d254c5d5697f10547b8fab805070
+EBUILD requests-kerberos-0.14.0-r1.ebuild 837 BLAKE2B 7633aa3d9585e2b88aa1a71270685831903a945bde3ac84612bc6503ac7a6b50c52666e6fadd0669ebdf0c4408f77f21ce98c26d25c57d3a7ffbf594328df2db SHA512 9a98c3212fec2e0b1d536160b992bd50e523d8315c23fc8e053fbc63761ba5b08ed357c2b182b8f623fbced07db3465e12c9db22e204ba3e041195f6fea90162
 MISC metadata.xml 411 BLAKE2B 06c28d67859801b83b28b32e12abeac09bb3a3d0ed02546ae211b8b8a3ac5a6b464ef3d5d6e6e5f6bac20d9201adc4e543ae02b701a374c50f8e475b7472e240 SHA512 656422babdd89a9afe5c96344c625ea5a5f0e541972636366176f77e39623773907dd0de9bbd53ed664b63bd3215ab40780e6010ea8f1febb73640920a800aba
diff --git a/dev-python/requests-kerberos/requests-kerberos-0.14.0-r1.ebuild b/dev-python/requests-kerberos/requests-kerberos-0.14.0-r1.ebuild
index 8c42297bc26d..82c2ef78dfc4 100644
--- a/dev-python/requests-kerberos/requests-kerberos-0.14.0-r1.ebuild
+++ b/dev-python/requests-kerberos/requests-kerberos-0.14.0-r1.ebuild
@@ -4,13 +4,19 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
-HOMEPAGE="https://github.com/requests/requests-kerberos/"
 DESCRIPTION="A Kerberos authentication handler for python-requests"
-SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://github.com/requests/requests-kerberos/
+	https://pypi.org/project/requests-kerberos/
+"
+SRC_URI="
+	https://github.com/requests/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
 
 LICENSE="ISC"
 SLOT="0"
diff --git a/dev-python/scandir/Manifest b/dev-python/scandir/Manifest
index ce35d4b93d69..1bae7f8195fa 100644
--- a/dev-python/scandir/Manifest
+++ b/dev-python/scandir/Manifest
@@ -1,3 +1,5 @@
+AUX scandir-1.10.0-python3.9.patch 2703 BLAKE2B bc37fbbf3cfb9c77db15a932b047f82af10b19890ef8e29979502a0d0d0bd3f71300a871a8a76d08ad606143c47ed3389e7a2f1c2f6376e3b86d32227ef0dfe8 SHA512 edd491cd68aee1a405b51113833a2cbde77f2146c0b3b1c807f2efff2cdbb307fe18d6a40f39b5b4567320dc52346feabf342472de308982bc46d03be28b5777
 DIST scandir-1.10.0.tar.gz 33311 BLAKE2B 47576618c41a477ff7bab9daecf2e4719ed0c497a25fd68b4bacae073fc418f9fc51503812af726d1d124f07cccfb418ae09c196cf7ce283abf5d3bbc36b7e09 SHA512 42a570320018ffff2172ada67002334446c73c53813b36d63558d3854ded2fac0b266fcaf399cf9a735ceba110636b6901683fb26cde1e286ff476bc37e3d335
 EBUILD scandir-1.10.0-r2.ebuild 584 BLAKE2B 72eda9a3d5eb828b5a00a765283c729a5245c6d2c213067a7a9a58248be39b272e56a12c2dc72064ef5e305ac7c5f6e9dd5ef4e5f730b8f042a7ca41a72613eb SHA512 2696963e0cbc0d63e2caf139a7deed1ed7ba418174ff6217cbc6edf693826a3f7fc89a7d6bc2438eb2769b1eaf7d135d7f5f01bf8675e659b96b1ce84e23f6be
+EBUILD scandir-1.10.0-r3.ebuild 773 BLAKE2B 07b9b8580f5fae38d3f68ce6dcbc7a5b62717baffc1f62824b0bda48d4ae102f98f0e361dc85316867ec2cf587bf4883a5182ffe4b5efcf443b3c6094e9c3a5c SHA512 a978ab19d5eaa3c836a657dd82c864dcf6887377d1ef4aedc68e2a6c752e6f2f3c34cd10a05d0ab2553e3f4c63e5791139c5aee5b6544e2172c67d5a3c49b871
 MISC metadata.xml 496 BLAKE2B a5e4d74cf0526a99d2c968bd225f6b5d284a7f532e18ab5d1ec8f2da6b43d25c323d194982ccdc29d216c42fde989f1515c07fd8d65ff2d464191fc428125140 SHA512 66ead6b25749d156a0b702f558ee93005653de6c2039e3d76c7567606154e5720ea4da69944f725eb1598254cc251f091a46fddd03df695a1aa88058c64d4df7
diff --git a/dev-python/scandir/files/scandir-1.10.0-python3.9.patch b/dev-python/scandir/files/scandir-1.10.0-python3.9.patch
new file mode 100644
index 000000000000..c8683c1c6b9b
--- /dev/null
+++ b/dev-python/scandir/files/scandir-1.10.0-python3.9.patch
@@ -0,0 +1,62 @@
+https://github.com/benhoyt/scandir/commit/3396aa4155ffde8600a0e9ca50d5872569169b5d
+
+From 3396aa4155ffde8600a0e9ca50d5872569169b5d Mon Sep 17 00:00:00 2001
+From: Ben Hoyt <benhoyt@gmail.com>
+Date: Mon, 24 Jan 2022 08:44:07 +1300
+Subject: [PATCH] Add Python 3.10 to tests (#137)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix PyStructSequence_UnnamedField build issues on Python 3.9/3.10
+
+_scandir.c:663:7: error: conflicting type qualifiers for ‘PyStructSequence_UnnamedField’
+  663 | char *PyStructSequence_UnnamedField = "unnamed field";
+      |       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+In file included from /usr/local/include/python3.10/Python.h:127,
+                 from _scandir.c:14:
+/usr/local/include/python3.10/structseq.h:22:27: note: previous declaration of ‘PyStructSequence_UnnamedField’ was here
+   22 | extern const char * const PyStructSequence_UnnamedField;
+      |                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Fixes https://github.com/benhoyt/scandir/pull/137
+---
+ _scandir.c                  | 10 +++++-----
+ scandir.py                  |  2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/_scandir.c b/_scandir.c
+index 6cc28c8..433483f 100644
+--- a/_scandir.c
++++ b/_scandir.c
+@@ -660,7 +660,7 @@ _pystat_fromstructstat(STRUCT_STAT *st)
+     return v;
+ }
+ 
+-char *PyStructSequence_UnnamedField = "unnamed field";
++static char *scandir_unnamed_field = "unnamed field";
+ 
+ PyDoc_STRVAR(stat_result__doc__,
+ "stat_result: Result from stat, fstat, or lstat.\n\n\
+@@ -681,7 +681,7 @@ static PyStructSequence_Field stat_result_fields[] = {
+     {"st_uid",     "user ID of owner"},
+     {"st_gid",     "group ID of owner"},
+     {"st_size",    "total size, in bytes"},
+-    /* The NULL is replaced with PyStructSequence_UnnamedField later. */
++    /* The NULL is replaced with scandir_unnamed_field later. */
+     {NULL,         "integer time of last access"},
+     {NULL,         "integer time of last modification"},
+     {NULL,         "integer time of last change"},
+@@ -1817,9 +1817,9 @@ init_scandir(void)
+     if (!billion)
+         INIT_ERROR;
+ 
+-    stat_result_desc.fields[7].name = PyStructSequence_UnnamedField;
+-    stat_result_desc.fields[8].name = PyStructSequence_UnnamedField;
+-    stat_result_desc.fields[9].name = PyStructSequence_UnnamedField;
++    stat_result_desc.fields[7].name = scandir_unnamed_field;
++    stat_result_desc.fields[8].name = scandir_unnamed_field;
++    stat_result_desc.fields[9].name = scandir_unnamed_field;
+     PyStructSequence_InitType(&StatResultType, &stat_result_desc);
+     structseq_new = StatResultType.tp_new;
+     StatResultType.tp_new = statresult_new;
diff --git a/dev-python/scandir/scandir-1.10.0-r3.ebuild b/dev-python/scandir/scandir-1.10.0-r3.ebuild
new file mode 100644
index 000000000000..ac31277480d8
--- /dev/null
+++ b/dev-python/scandir/scandir-1.10.0-r3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+# Do NOT add Python 3.11 without verifying the C extension is actually built
+# and installed for it!
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A better directory iterator and faster os.walk()"
+HOMEPAGE="https://github.com/benhoyt/scandir"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-python3.9.patch
+)
+
+python_test() {
+	"${EPYTHON}" test/run_tests.py -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/setuptools-rust/Manifest b/dev-python/setuptools-rust/Manifest
index dd6633900015..9d1b5b0f43c6 100644
--- a/dev-python/setuptools-rust/Manifest
+++ b/dev-python/setuptools-rust/Manifest
@@ -62,6 +62,7 @@ DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0
 DIST servo_arc-0.1.1.crate 9817 BLAKE2B 88586ca0c969df8bfb3a04ba4a689606995876434877a2cd48a72b26451deb6fdcf65273aa9b03948adcbc66b2450301840910e5c4162b993535d69585c62128 SHA512 59d531dcf7a9191b8462ce395e713194994714b65275c0af412186f862be169d0c6fc5d86603332a1aacd8af9ace934dc78531b9cb576cf8179ec35709225447
 DIST setuptools-rust-1.3.0.tar.gz 285698 BLAKE2B ecd1a2cdce5a9b3ca7c648c97d472dd0ed60db3738d44cfe601c85ac1cd8f3924cb82fe0a06f02a70d60cbe1956c324f3fe0153275c7bae75a14a21b242ecda7 SHA512 5971413a9544ddd626671de74e9517fb20410e4838c5420ed31653d7fdf07b858ff4ef14ec2d5b51677e3402757da915a76858337d0c2b164682450bce35ba11
 DIST setuptools-rust-1.4.1.tar.gz 288848 BLAKE2B 28f4ac618ae3550158814ac14b87d628ce16f140840c3948d48f486cb5a7f50389eccd78385fe3e5be635dad61bf19e25464d39567c2fc760e247d5a2e692145 SHA512 3b92eb37564872b4094e77c8412b006f57a3557213d1368e2db883bc04f5d0d516a97a5b1f0b5255b362ecc32832d2ef734ac759a49db72439f227d54f8a86f5
+DIST setuptools-rust-1.5.0.gh.tar.gz 293081 BLAKE2B bf373915da5c4703d94fa1b63cb9a7037731fb6fd8260032d947b8c57ce6ea3a726956af1ec38f242a1953fc696d9ae5297ab391e2a01d59e5004493743a402d SHA512 40e204e4599a41032dd591d4ef6edecb9dd90c756932fdaeab1999dd24000b97a3f9efb51a20ac81f7d9f1f5a9b25b3891b5f56292951090b89887f947346704
 DIST siphasher-0.3.10.crate 9889 BLAKE2B e5dd6d265340b4c9e4266ab1ff3a20f1fb87fd493b2d7b5fba32d26421cc858b38929e4ab96941d0c055375b8acebbd04236d994cadca324500ed05064b9bfc9 SHA512 f90425a2cccc9575d377bb92a765d34653ddef1ac12b7c63dc6d700aaa74b525787e11609061c2d3e44ea56fe0e4b8f93f7b13f0279b5de2e0f710c5caffd4ce
 DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
 DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
@@ -79,5 +80,6 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD setuptools-rust-1.3.0.ebuild 3145 BLAKE2B 89fcd32448cef2c1c9a68b3abcdcae256b22e3ebffd389efe37f6a8af0fbbf714d01c1c18143860b3baa94e65d38c23d94f2030d88e2fdb43810cb287475a081 SHA512 69a2570e8d7e6ecf833202b63196fc99d606a60aae02dcb369ba61a514fc6c16cfbd619a542ac10b0d567fa077f71314b592a2be8f20d9209d30b5fbf642135a
-EBUILD setuptools-rust-1.4.1.ebuild 3227 BLAKE2B 751bb0460f9a76f5f6ea698145d86f878b882f17a8b5b111af74e92da289736aae91da8365b8ced2fbf70ddc3b591914a73096110e65325c66ae1c114c4fbb7a SHA512 b63c1a672fb551a6593121d29d80c5796fb3233c25437a7f036ae13c5a3f897c1b53221eb6d7d95b5b30f1c2622e39e683c89df7cdebdad5d42c83a45c77615a
+EBUILD setuptools-rust-1.4.1.ebuild 3225 BLAKE2B 23ad7f4ef4aa5c5228593a9c3a829c67758de44365e055f6db844b96ad3ba8e8baea8e4234ab916134bea245d15eef4e7b0a4884f35b85f2362df010ca0eca3e SHA512 abde9ddb9101263a8b0504105c587deacc92f876473cfe73f287ae21517c624f93bc00fb0e1871e21dc446d868c59ba73e52ae56520da3a9110c8f2d6e5ebc1a
+EBUILD setuptools-rust-1.5.0.ebuild 3219 BLAKE2B bf1a733cfae3069ce56013278c0232cb4f03404b6296ecaa1fe054ded092fef0946ff479fb4e6ff6450558699af7c1cf9c1aa9a3abf3dcf457d73fd790b471e6 SHA512 1692d33a52db827ea9c36d6bb232f33d862f7f69e9a3668309aadd15bc22b2256253553d7deb77be877128460ee582a3dfd6b09c114feb1319f440f715175041
 MISC metadata.xml 476 BLAKE2B c8f0ef0779f0a4412a7d9b97e1bb03e3bfb3c031209f489a100b30402d99224014e379712989afd0cb76c85be301dcf9a51e21e8f9195262c5920dd1db0703d1 SHA512 af74755e9e8fb61cbded2dc3e63cd20f95393ef2650bed9f81e299f7759ae79c63b45df8048cd0fe25397ec7db10156be681fa5278606a20481f78d5279b815b
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.4.1.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.4.1.ebuild
index 692cddff5b19..099a4bf3dfc2 100644
--- a/dev-python/setuptools-rust/setuptools-rust-1.4.1.ebuild
+++ b/dev-python/setuptools-rust/setuptools-rust-1.4.1.ebuild
@@ -97,7 +97,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.5.0.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.5.0.ebuild
new file mode 100644
index 000000000000..47f9cfa253f4
--- /dev/null
+++ b/dev-python/setuptools-rust/setuptools-rust-1.5.0.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=yes
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+CRATES="
+	bitflags-1.3.2
+	byteorder-1.4.3
+	cfg-if-1.0.0
+	convert_case-0.4.0
+	cssparser-0.27.2
+	cssparser-macros-0.6.0
+	derive_more-0.99.17
+	dtoa-0.4.8
+	dtoa-short-0.3.3
+	futf-0.1.5
+	fxhash-0.2.1
+	getrandom-0.1.16
+	html5ever-0.25.1
+	indoc-1.0.4
+	instant-0.1.12
+	itoa-0.4.8
+	kuchiki-0.8.1
+	lazy_static-1.4.0
+	libc-0.2.121
+	lock_api-0.4.6
+	log-0.4.14
+	mac-0.1.1
+	markup5ever-0.10.1
+	matches-0.1.9
+	new_debug_unreachable-1.0.4
+	nodrop-0.1.14
+	once_cell-1.10.0
+	parking_lot-0.11.2
+	parking_lot_core-0.8.5
+	phf-0.8.0
+	phf_codegen-0.8.0
+	phf_generator-0.8.0
+	phf_macros-0.8.0
+	phf_shared-0.10.0
+	phf_shared-0.8.0
+	ppv-lite86-0.2.16
+	precomputed-hash-0.1.1
+	proc-macro2-1.0.36
+	proc-macro-hack-0.5.19
+	pyo3-0.16.5
+	pyo3-build-config-0.16.5
+	pyo3-ffi-0.16.5
+	pyo3-macros-0.16.5
+	pyo3-macros-backend-0.16.5
+	quote-1.0.16
+	rand-0.7.3
+	rand_chacha-0.2.2
+	rand_core-0.5.1
+	rand_hc-0.2.0
+	rand_pcg-0.2.1
+	redox_syscall-0.2.11
+	rustc_version-0.4.0
+	scopeguard-1.1.0
+	selectors-0.22.0
+	semver-1.0.6
+	serde-1.0.136
+	servo_arc-0.1.1
+	siphasher-0.3.10
+	smallvec-1.8.0
+	stable_deref_trait-1.2.0
+	string_cache-0.8.3
+	string_cache_codegen-0.5.1
+	syn-1.0.89
+	target-lexicon-0.12.3
+	tendril-0.4.3
+	thin-slice-0.1.1
+	unicode-xid-0.2.2
+	unindent-0.1.8
+	utf-8-0.7.6
+	wasi-0.9.0+wasi-snapshot-preview1
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit distutils-r1 cargo
+
+DESCRIPTION="A plugin for setuptools to build Rust Python extensions"
+HOMEPAGE="
+	https://github.com/PyO3/setuptools-rust/
+	https://pypi.org/project/setuptools-rust/
+"
+SRC_URI="
+	https://github.com/PyO3/setuptools-rust/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? ( $(cargo_crate_uris ${CRATES}) )
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/rust
+	<dev-python/semantic_version-3[${PYTHON_USEDEP}]
+	>=dev-python/semantic_version-2.8.2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.7.4.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/cffi[${PYTHON_USEDEP}]
+		' 'python*')
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+src_unpack() {
+	cargo_src_unpack
+}
+
+python_test() {
+	local examples=(
+		html-py-ever
+		namespace_package
+		rust_with_cffi
+	)
+	for example_dir in ${examples[@]}; do
+		pushd examples/${example_dir} >/dev/null || die
+		einfo "Running ${example_dir} test"
+		esetup.py build --build-lib=build/lib
+
+		case ${example_dir} in
+			html-py-ever)
+				pushd tests >/dev/null || die
+				local -x PYTHONPATH=../build/lib
+				${EPYTHON} run_all.py || die "Tests failed with ${EPYTHON}"
+				popd >/dev/null || die
+				;;
+			*)
+				pushd build/lib >/dev/null || die
+				epytest ../../tests
+				popd >/dev/null || die
+				;;
+		esac
+
+		rm -rf build || die
+		popd >/dev/null || die
+	done
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index fa87394f5aaf..72506774cff1 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -4,9 +4,11 @@ DIST setuptools-63.2.0.tar.gz 2605892 BLAKE2B c9475a64fbe22be348277d25582a0c1789
 DIST setuptools-63.3.0.tar.gz 2598685 BLAKE2B 8562824cf6e45f2757cbaf4360c0b7c8e592233875a00e5490de5f2af47ca2d43a6feac5876ca9e866fb840c62dc1b0aa2b2d7c1e5e9baf34741404803b02d31 SHA512 01f3b658862f70e8ce2dd74d9dd82a293216b356f1f3abb3b6b4fa77dd5347156a58959da6e6df349a1c114d58f617890e4bc8c6603f06be0fb3caec9bf21fe2
 DIST setuptools-63.4.1.tar.gz 2598515 BLAKE2B ae75b12d18e35c0d7d48c43eaf8f114dafc739253f672eb3ff2646a8951d0895df95c2d46fd77bb42aeca49a460e652eff41ac109fff24460fbcf02f7400faa1 SHA512 525bba1c07370a633c827629879bd4bf0147aec461ed2d935eaade21635527515eef6bdd1c8809304522cc890929ae0b12a5357e0035807d04cb8fb5a65fbf39
 DIST setuptools-63.4.2.tar.gz 2600520 BLAKE2B e5cedf9f5e58044ec74e45b7232ef64680854ba7be8f2c22e33373c7a8f5fc80578f99c9103eb81bc609fef56021fc7a311b03682842facea019d14387031f89 SHA512 a9cb002f3c9fd3e8ed189f800c45a9ab7bc51640430585226f290c2d6b24655999fbe827ddcc30fdd7f8a6ebd5e87dfc085d2ae1efbf35968213bb7dc77eeaee
+DIST setuptools-63.4.3.tar.gz 2600453 BLAKE2B 927be74bdc11271589134aca26849e61c5ae23d5780a57c96b9c4a9fe5f93e57fa8a80787c8db1c555f32fab1e007a956e91a374ed285db393e26d9486805ef9 SHA512 f19478921ffcf5441ec60a2af17c695456fee064f287e2130c4ff14d471a1124bd37104ad43adc7623ea0cba4ed170ed4aa37c6883aff8fd811ab960e6d12453
 EBUILD setuptools-63.1.0.ebuild 4077 BLAKE2B df8d3d5974d76cf4ee9089f73dacf365659432ee527e27b394d53311f3cf7ee69b3e612b5f1e8d634d0c30a8875c14924438a48b3466afdfdccb506ffbe5328a SHA512 d2173d8c251e7f2f4dec2e52887674d5ca31a3ba209b7455e9e9871befb96814852da137b5acb9a86364b0d8c1c0b394a306d8c4995aaa517a9eb950553b33bc
 EBUILD setuptools-63.2.0.ebuild 4085 BLAKE2B 3e4892512482fc1bc3adcb90bfc4f1a44b698957d6486f078fb6629ee73d7603eeddd768b072bde066a968a7c48900518d87336318c21b809e5c408623f8013c SHA512 49275430700aa47bb6df62e10d0252190437334078a6728c2cd24e9f8157e00e7266ce4f887aa98789819fa19b5aea1f8997f74686800a98be074c87f711063c
 EBUILD setuptools-63.3.0.ebuild 4153 BLAKE2B f91982c6f07cc0f4ac55572fc6aa1fe06697502e805f045236fc90bca0aae3e2dd2b9fdecf912290cc978be9dfee705d18c43e05c5da78f9030ae1e6bbefd672 SHA512 d047b71d51c1aa37f517649e96968cc1f741b47d7368c2c18b966737e39d29e427b123dcd96f3a0f8f7f19ca9f3264b79269bae2e87eda700233612fb8bd9a19
 EBUILD setuptools-63.4.1.ebuild 4153 BLAKE2B f91982c6f07cc0f4ac55572fc6aa1fe06697502e805f045236fc90bca0aae3e2dd2b9fdecf912290cc978be9dfee705d18c43e05c5da78f9030ae1e6bbefd672 SHA512 d047b71d51c1aa37f517649e96968cc1f741b47d7368c2c18b966737e39d29e427b123dcd96f3a0f8f7f19ca9f3264b79269bae2e87eda700233612fb8bd9a19
 EBUILD setuptools-63.4.2.ebuild 4153 BLAKE2B f91982c6f07cc0f4ac55572fc6aa1fe06697502e805f045236fc90bca0aae3e2dd2b9fdecf912290cc978be9dfee705d18c43e05c5da78f9030ae1e6bbefd672 SHA512 d047b71d51c1aa37f517649e96968cc1f741b47d7368c2c18b966737e39d29e427b123dcd96f3a0f8f7f19ca9f3264b79269bae2e87eda700233612fb8bd9a19
+EBUILD setuptools-63.4.3.ebuild 4153 BLAKE2B f91982c6f07cc0f4ac55572fc6aa1fe06697502e805f045236fc90bca0aae3e2dd2b9fdecf912290cc978be9dfee705d18c43e05c5da78f9030ae1e6bbefd672 SHA512 d047b71d51c1aa37f517649e96968cc1f741b47d7368c2c18b966737e39d29e427b123dcd96f3a0f8f7f19ca9f3264b79269bae2e87eda700233612fb8bd9a19
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-63.4.3.ebuild b/dev-python/setuptools/setuptools-63.4.3.ebuild
new file mode 100644
index 000000000000..e6015c0fc03f
--- /dev/null
+++ b/dev-python/setuptools/setuptools-63.4.3.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+# please bump dev-python/ensurepip-wheels along with this package!
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{8..11} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="
+	https://github.com/pypa/setuptools/
+	https://pypi.org/project/setuptools/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
+			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/pip-run[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	local PATCHES=(
+		# TODO: remove this when we're 100% PEP517 mode
+		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
+	)
+
+	# remove bundled dependencies, setuptools will switch to system deps
+	# automatically
+	rm -r */_vendor || die
+
+	# remove the ugly */extern hack that breaks on unvendored deps
+	rm -r */extern || die
+	find -name '*.py' -exec sed \
+		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
+		-i {} + || die
+
+	distutils-r1_src_prepare
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# network
+		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+		setuptools/tests/test_virtualenv.py::test_clean_env_install
+		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		# TODO
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+		setuptools/tests/test_extern.py::test_distribution_picklable
+		# expects bundled deps in virtualenv
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
+		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
+	)
+
+	epytest -n "$(makeopts_jobs)" setuptools
+}
diff --git a/dev-python/sphinx-basic-ng/Manifest b/dev-python/sphinx-basic-ng/Manifest
index 86b97a4287fa..f3788272d91e 100644
--- a/dev-python/sphinx-basic-ng/Manifest
+++ b/dev-python/sphinx-basic-ng/Manifest
@@ -1,3 +1,5 @@
 DIST sphinx-basic-ng-0.0.1.a11.gh.tar.gz 21539 BLAKE2B 31707bc8f3c6cd0c1af1aeff309543889119d33e5f5ae33194b58f88a0ff6ec424c5b876fef36b64161932ebb69c0f6108801697b49d47e10ad13affcf89e1fa SHA512 e9f9278a360d2c8d25a6679134d2d54b37c9f2e55285592fa910c85b2f8bfd4ab13d117b7078cb67d862703f8054c3d3a3ca68152551d67a26d7c1a8b75952ff
+DIST sphinx-basic-ng-0.0.1.a12.gh.tar.gz 23821 BLAKE2B 905186227d725d6f62c0f4c5b4df49ada8817dd44a4000b23b62e60ce5ca3bef4a4046c9543a07a7b0cc0c12dd5278dc783633324fbe113cf453ee540fa97ff7 SHA512 6df9445306b27ae4b29b338773fa4adcee631b4be04fdde674855dfcb683f7cf7ad3c40124c85353608b63523738b6bc83c6c4f4b2b212cafa41d38462ffcac4
 EBUILD sphinx-basic-ng-0.0.1_alpha11.ebuild 931 BLAKE2B bf63661aacb299ce2c685d940f4f4219caa3037b6f74131d74101152c4ec5264fa387262bee454821e8f7df2ed89be26903a22542010f48c2486a19785ba6ef5 SHA512 311b332f6b3fef12a4e2d0488a4841793fa7f7faf39991ef9b9696b1f76ab62e5c17a81b0b5360ce6a9f02ece335dec52cf5423ab2a0e2ebe4e8676400c2f668
+EBUILD sphinx-basic-ng-0.0.1_alpha12.ebuild 939 BLAKE2B b74d9d5865dbfac8cde9a42fa94db01b2f8fdc7e325a72eba0a37a427aac9c88099f711e1f78f2222df7d4dc8e10557ce4278ef9c138ec376e63c6e3472ec603 SHA512 e1314d676726118f0f62215a957640558da118ee063f4d078c35ce3f93391ed0029106b7b02b6a9ce276292b3bebe064e75e7da235e893d6d22cbef8468b09c8
 MISC metadata.xml 362 BLAKE2B a93dc662c8ab618397c8d0504342e8f1bd74226b131ea4ca07771cdeb75eb8947451b4353c0da16760f07f935ebb75adcdef4f189ff39e0cf707d03e8fa319e2 SHA512 fb27130b3fcff9043b3ad33e34c92f638cae46d526dcbe77cfe088abf80e6b89992edb1e0b571a5a2447bc6c8ba31ae84776d153067a33b5d6d14326149e7f46
diff --git a/dev-python/sphinx-basic-ng/sphinx-basic-ng-0.0.1_alpha12.ebuild b/dev-python/sphinx-basic-ng/sphinx-basic-ng-0.0.1_alpha12.ebuild
new file mode 100644
index 000000000000..e6f2a27ae78a
--- /dev/null
+++ b/dev-python/sphinx-basic-ng/sphinx-basic-ng-0.0.1_alpha12.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=${P/_alpha/.a}
+DESCRIPTION="A modern skeleton for Sphinx themes"
+HOMEPAGE="
+	https://github.com/pradyunsg/sphinx-basic-ng/
+	https://pypi.org/project/sphinx-basic-ng/
+"
+SRC_URI="
+	https://github.com/pradyunsg/sphinx-basic-ng/archive/${PV/_alpha/.a}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/sphinx-6[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/myst_parser[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	local HTML_DOCS=()
+	build_sphinx tests/barebones
+	rm -r tests/barebones/_build || die
+}
diff --git a/dev-python/tomlkit/Manifest b/dev-python/tomlkit/Manifest
index dcdafa2d9033..834f33eac24d 100644
--- a/dev-python/tomlkit/Manifest
+++ b/dev-python/tomlkit/Manifest
@@ -1,5 +1,7 @@
 DIST tomlkit-0.11.1.tar.gz 186422 BLAKE2B 805cf22577a2eb32f4c0183d517886706c23cb925b66a4620d11c4b7f8c6b4314f83403b01d5139695e70e3cb83125923db9e93d651d9bec598fe5fe6ea08038 SHA512 04e8c05ce6ce41a7040fdd02274bebc7ad363f54da9525af06ce39e842d4e7548395dca90a3d1f60956d29d051108719847bebfe6a9db0842a19f400e75481ac
 DIST tomlkit-0.11.2.tar.gz 187584 BLAKE2B 0b18625ab2a1a1caa916961ebedbe943f87a20695b9412ff8d276a39510f897e8df000c45e3b5324e285ce1bf925cb22370e9eef1008639e14f01ce28599692a SHA512 9f8e5f85ae9f408c10a1c64d1ab649db7b42c1b19eb0162a5edcfe894f0a179a0ba39ac7f478eb7bb14267f610169bea1d4e96cde8b9cf62df91218c989d5a2a
+DIST tomlkit-0.11.3.tar.gz 187825 BLAKE2B e58947100a3ff9c2d8d04072c7a244efe554e31e619216683558f0fd51c3156496633256f0ed1ab6f39efb8cb8e65ca9d2f7dc3fb9e4cdb1ad9cb16ea4ac6e29 SHA512 09582776d7472647dadc387521e380056cf0a0d7ba68f7bfd423046caea2ecb068cc24cafceb54cecdc2754be9b3a4ad0cc40c7a0027e27b866491ade5b911c7
 EBUILD tomlkit-0.11.1.ebuild 810 BLAKE2B 37d3168a8b555cc7e4b3116e05dd9f9d554dee22322e0796cd379ceb1f39d7f09036fbee267e82f318da1bc3e5940ebe9e9edbb30fc42265c7c1953ecffc853c SHA512 726e6c2b38ca8d736a1a9fd093092d691d0d750f593be44cc7d79b58873d80c1dbf52e9f85c61413681306581df8abcb79d6c1ed49abca31a0a42f15c56f4490
 EBUILD tomlkit-0.11.2.ebuild 818 BLAKE2B 87ddc686dd14ac5ef59c37878dd1b72c6b6b281ea1d49794c4fb0b481cd458da531ce33cb7ecb0207c66f4510e4a3a1f16b9a56477c16122f2a2acf15e1436ee SHA512 c8d41d025284798c0926e3a64ef45aa9ffd7c5f7a03c85f5f8fa3cfba59b2166dae450327e3b86fc730f7e0b5beb636780ceaa7cea1c44111e1bdf61d22d2012
+EBUILD tomlkit-0.11.3.ebuild 818 BLAKE2B 87ddc686dd14ac5ef59c37878dd1b72c6b6b281ea1d49794c4fb0b481cd458da531ce33cb7ecb0207c66f4510e4a3a1f16b9a56477c16122f2a2acf15e1436ee SHA512 c8d41d025284798c0926e3a64ef45aa9ffd7c5f7a03c85f5f8fa3cfba59b2166dae450327e3b86fc730f7e0b5beb636780ceaa7cea1c44111e1bdf61d22d2012
 MISC metadata.xml 525 BLAKE2B 663169c851817eb7368c49d678119f1f2dfebe642325d3dbc59498f60b452710a257ca5cd5173a4fc8391d33038cce079b3fba112ad7e9c0caf0c1872ee43f13 SHA512 5a6cf412fc06854557d001ae4a6f654b36d351c8c0b4bc08c1a7c40f49d8dceba931598f5eed6c75e1d7797570fcf8fb7799f5f035931f80d05b1e9bd0d258c0
diff --git a/dev-python/tomlkit/tomlkit-0.11.3.ebuild b/dev-python/tomlkit/tomlkit-0.11.3.ebuild
new file mode 100644
index 000000000000..8f575bb2866a
--- /dev/null
+++ b/dev-python/tomlkit/tomlkit-0.11.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Style preserving TOML library"
+HOMEPAGE="
+	https://github.com/sdispater/tomlkit/
+	https://pypi.org/project/tomlkit/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	# use setup.py to avoid circular dep with poetry-core
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["setuptools"]
+		build-backend = "setuptools.build_meta"
+	EOF
+}
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 1dfdf7297013..bf227d026a03 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -2,8 +2,10 @@ DIST trimesh-3.12.7.gh.tar.gz 10756892 BLAKE2B af1f40b5de1eb60ec3241d342b3ed99fc
 DIST trimesh-3.12.8.gh.tar.gz 10758444 BLAKE2B d26fa059d4015bd8b1185665d00da619471908d60dd612a6e761a2334b4f78d21bda5bc25f469be23185964f8b068977208a4e7b41591b20f7669c8f193e926d SHA512 ea6ff5577a72dc56ce89076cdee942b41866ce7bdef1971f86ec680e0ae34fad8c7038741a4a19cb83d355891d415b5e88561ae83ae13d0fc2448c08e06b2ba8
 DIST trimesh-3.12.9.gh.tar.gz 10757706 BLAKE2B a81e01a665a2a80a6a8f5b8bfcd8eb92f4dacb0a62b63209afccde48bea4dc31e05eeef8abcd40f01844cab1c9b7fe644b322c9761257be3f6abdb1858356c88 SHA512 55f9830b7f9016dc9827f5b852e035fa36ce0dafb69618fee627395c12fe40db58ea400d8c66981a313dd9a3293d538d5a0dec1c107e9bbbe691295b1a1f5fc7
 DIST trimesh-3.13.0.gh.tar.gz 10803906 BLAKE2B aa99ecec3d108ca7a7c96183ff354f930d349e1d35f00b689cba1dfed1990d0f8f9dcf93d83bb55173280d31235766052d99ce06c64bb80ecc0bf17b5ea49da4 SHA512 db816f163faed97281dcf8d251d2d57a1b7cb7d4b90ec39d74426e87ef3b22508968cd8701accc49803c3dc73bc39f1f81554feb339a46a9a67bbff5f916f803
+DIST trimesh-3.13.1.gh.tar.gz 10803494 BLAKE2B 73d1f9c7a7610310155e9dd714cdb7dd27b7319b7fa54f092dad7e380484b5c650c4b9aa74235621599ef182043493e56b8ce90f02483a2ba75238fe84bd0c42 SHA512 eca0c6bb2866b2e52c9c92b238f303a0ecbe9e40b7e2109b9a5e714a3d2791bd4fdfb26f06c8e18b8815661d198018e37877f19b2b009efd022080ef87f9b679
 EBUILD trimesh-3.12.7.ebuild 1863 BLAKE2B 7b8f0fc5c878d18b0ac6ff779474555e6ce2eef6f86fdf2da2e8e547351de67485d6d7c0092bc19e0e0be29ea9e0eb9c9180fb387c3075b8ee3f38869d4848d2 SHA512 f015e4269fa2282a8827c764d5d23c5fbbf5f1de5c509e651e29fb91983157114b13fb832c80a3600b6ae2ccf48a0e9b1ac15dd0880d56443c24632980e2b3e7
 EBUILD trimesh-3.12.8.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 EBUILD trimesh-3.12.9.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 EBUILD trimesh-3.13.0.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
+EBUILD trimesh-3.13.1.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 MISC metadata.xml 495 BLAKE2B b8b403f7bfbac53ed234c2ba50324041502a28465d70e9406867f05741e0313845307491fcfd85f05e2993b21daf14117a4b6863b45422fd4c62c6e28902e3ff SHA512 3deec8ab4b513536a7fe182be8f1b96e06fd06b2480d3e516c2b3462cc26fcbdeb1d165b4d0297465e93c0cce584ab40a8f905b81a59dcb4040a39655028783d
diff --git a/dev-python/trimesh/trimesh-3.13.1.ebuild b/dev-python/trimesh/trimesh-3.13.1.ebuild
new file mode 100644
index 000000000000..11e1a73dfac5
--- /dev/null
+++ b/dev-python/trimesh/trimesh-3.13.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="Python library for loading and using triangular meshes"
+HOMEPAGE="
+	https://trimsh.org/
+	https://github.com/mikedh/trimesh/
+	https://pypi.org/project/trimesh/
+"
+SRC_URI="
+	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycollada[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
+	dev-python/svg-path[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/xxhash[${PYTHON_USEDEP}]
+	sci-libs/rtree[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -n "$(makeopts_jobs)"
+}
+
+pkg_postinst() {
+	optfeature_header "${PN} functionality can be extended by installing the following packages:"
+	optfeature "making GUI applications with 3D stuff" dev-python/glooey
+	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
+	optfeature "loading a number of additional mesh formats" dev-python/meshio
+	optfeature "figuring out how much memory we have" dev-python/psutil
+	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
+}
diff --git a/dev-python/trove-classifiers/Manifest b/dev-python/trove-classifiers/Manifest
index 91a150b0d0ee..6aadc2a26f7b 100644
--- a/dev-python/trove-classifiers/Manifest
+++ b/dev-python/trove-classifiers/Manifest
@@ -1,7 +1,9 @@
 DIST trove-classifiers-2022.6.23.gh.tar.gz 14950 BLAKE2B 7203b8edb6f8a8886371a60f3c273b02b7fe045230a3a0c89a7282a896e513535a47fe06834fd6e33b98c480695b69be524dea1402f463f3c82fc80ddf8ac320 SHA512 c2c186b5d13f626a43f29a1eff6ebf2f17f8240af554f27ffdf05b506d428dd59582e7357a85b62f94714e024ae98ea216487726526639371c24c6b46b96df4e
 DIST trove-classifiers-2022.6.26.gh.tar.gz 14966 BLAKE2B 360a8a01d710456a7edf2f56ce5ca4645e0f5e79db09087a888556e6555a15fd6f6b0aa3112bf0f6c2652759fce93e76357775ca57e53615dd99c4f1b929303d SHA512 1857d53e7731ada3ca811222bab2d0734da0e18fdf36dcada166bd15b1f397cf8575963d8432eb2d0de571646da6b0b18299af3bb7e44fb225586aa76f6de35f
 DIST trove-classifiers-2022.7.22.gh.tar.gz 14999 BLAKE2B ba6647b8ccb0a8a791d91c48094f3a748866c7f80f92b28903bd09084b7a216b2ba824657ba5f8ef8988edf242140c0b449804f58d3c1522e857670a1f01d455 SHA512 7d60a18a7ee11e21021f5ccc131e9ca28769083776898d931dd92131ea7edecd7ecad17a7a9d6d2d11e19ab8ff6a6fc2373ff9938fc26567e0f7c4a0e903d3c1
+DIST trove-classifiers-2022.8.7.gh.tar.gz 14999 BLAKE2B e5ec3b122f357e61c62ef9d6bbb16addeeb59aad5d5bced9d7fa2325c545298c9e3fcf619c5b459b2734caa34f2e7281d1b0306b1832c9156223d94ba83a2206 SHA512 61b776e2c4cb79788a14c17cf10f3cafaa3364bce3927e0e328b2129b65efdac9948e54d74e4454df3a094b25e6eb23074b577c5eb5735cc1939342f5c5d06ce
 EBUILD trove-classifiers-2022.6.23.ebuild 659 BLAKE2B c50af928a84398969b7e57b00688ab13dda9ae3a476560222ba27590ded65d6a1eafbe79b2d1730a8fae8e714a7b39ea0b892808b46941e81a862cf02885ec82 SHA512 9081abb9b701b392d6528fc0242c79d72e145a2e6f620b965148e8bbdab7faad10034b23f8557ae16a08ef45b10ce9a9814e386ea0c5e8d6ed82daf710629d34
 EBUILD trove-classifiers-2022.6.26.ebuild 659 BLAKE2B c50af928a84398969b7e57b00688ab13dda9ae3a476560222ba27590ded65d6a1eafbe79b2d1730a8fae8e714a7b39ea0b892808b46941e81a862cf02885ec82 SHA512 9081abb9b701b392d6528fc0242c79d72e145a2e6f620b965148e8bbdab7faad10034b23f8557ae16a08ef45b10ce9a9814e386ea0c5e8d6ed82daf710629d34
 EBUILD trove-classifiers-2022.7.22.ebuild 659 BLAKE2B c50af928a84398969b7e57b00688ab13dda9ae3a476560222ba27590ded65d6a1eafbe79b2d1730a8fae8e714a7b39ea0b892808b46941e81a862cf02885ec82 SHA512 9081abb9b701b392d6528fc0242c79d72e145a2e6f620b965148e8bbdab7faad10034b23f8557ae16a08ef45b10ce9a9814e386ea0c5e8d6ed82daf710629d34
+EBUILD trove-classifiers-2022.8.7.ebuild 659 BLAKE2B c50af928a84398969b7e57b00688ab13dda9ae3a476560222ba27590ded65d6a1eafbe79b2d1730a8fae8e714a7b39ea0b892808b46941e81a862cf02885ec82 SHA512 9081abb9b701b392d6528fc0242c79d72e145a2e6f620b965148e8bbdab7faad10034b23f8557ae16a08ef45b10ce9a9814e386ea0c5e8d6ed82daf710629d34
 MISC metadata.xml 361 BLAKE2B fd91e587a440e18c3030c6ae2992cda3d70ddb506eb78dfdff7b3e8b2d6456fd0cb13b56a7cb360bb80cdb38686d52938b5d6e9d873071e20a0802b11836181e SHA512 d34a508b050c6f1148e8ff6175b7f5f3dfa8aace0be8c02a01dae94b3824e7c1995deef16e5ad518e4260f51814dcab5f2afbc8b13126b1babe117746bf99ab7
diff --git a/dev-python/trove-classifiers/trove-classifiers-2022.8.7.ebuild b/dev-python/trove-classifiers/trove-classifiers-2022.8.7.ebuild
new file mode 100644
index 000000000000..964617661415
--- /dev/null
+++ b/dev-python/trove-classifiers/trove-classifiers-2022.8.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
+HOMEPAGE="
+	https://github.com/pypa/trove-classifiers/
+	https://pypi.org/project/trove-classifiers/
+"
+SRC_URI="
+	https://github.com/pypa/trove-classifiers/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	dev-python/calver[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest
+	"${EPYTHON}" -m tests.lib || die
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index e6088a4c08cc..114263043f58 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/bundler-audit/Manifest b/dev-ruby/bundler-audit/Manifest
index db19f2737216..bb16b7138823 100644
--- a/dev-ruby/bundler-audit/Manifest
+++ b/dev-ruby/bundler-audit/Manifest
@@ -1,5 +1,7 @@
 DIST bundler-audit-0.8.0.gem 44032 BLAKE2B 1d6de8bbca13e1e3b881ccbb4029d000c89f7b7c8f342877baa2a0ea3cf9bf87db93e22c9e622d64a4522afeb6258151293b0196b6ae8a5bbe192785e72956c6 SHA512 6a61fd191f31c153df71320e88ea84e6d93ad4d6ccacfc3f356c9486bf8adb8487aa7c5b3357cfbac0f36b8bb4b65c09845cedc0c8d86814910ea60aac7e92d5
 DIST bundler-audit-0.9.0.1.gem 48128 BLAKE2B 33afa1a7df1cecd0a0c3f155dc631fd1ce25aaa587b5dbe9042ef2983742dbb755914d9c598c832e9b9ca10dc2838bea632f3c79c2fa88a24121cc72787cf93f SHA512 248f7e6b8c7446ff0906d9be6c7bb946f901465dbff079d87aec55ff65a6a7b2e76df600d5d5d1704fd03deec7461cbe3c097bdd4f2d93ebd63c7d1dbf13ae43
+DIST bundler-audit-0.9.1.gem 49152 BLAKE2B a4942a84e8b39b6087960a2c611d5473e41076587a020aadae982c9096f91b0681f312bdbc00d73db1ba034d65e05c970532246deebd4119911ed6abfc6655d6 SHA512 86060dd95669e358d7267799b48a179469fa8aec6d97ce3d3316c974be7aa4652958ad72e5302770e3dd372026bc1054438877f1741a82a63ac6fb0fc14628f0
 EBUILD bundler-audit-0.8.0.ebuild 1215 BLAKE2B a3f9027d3a676c5b9a90a0ca94facb83ca9de09316b4e768637fc2b7c30e0d941d2d8370721dc8843cf00fd790a3a1ac9222f45b8c5d8ad7e7264c8c7f530221 SHA512 879a8685169f7aca3ed1ab1d6d72039732f5f2ae2762b661e3d4a1aeb49ab749df108fbb6013e958d022b3ad0ca3e1405d8fa831eb46f80ea49076d22621e26f
 EBUILD bundler-audit-0.9.0.1.ebuild 1215 BLAKE2B 93baa73ac44a5f9e8dd9f8f511bd0bad511abd7c0f9d9922b32b1532bddf8b9a92b1b068a59881ab8f64640dba343ad6bad6abb3f64b4cef1b7ea31db7c2f169 SHA512 02b0b1c403c04cc152a841440235be7e2ec136fb5958c3885d619e893c9d69296b849b924060bb6d5bcd0e8070af7e9a9fdda07d46f523c302b8bb6ff7e3e579
+EBUILD bundler-audit-0.9.1.ebuild 1000 BLAKE2B f23f001246fec86ff28c001119ca6f60fe69f49a2109f87c9dc12d252fe6cdc9e177d28ca63d162a8f2d8e6c8eb553c5d86176e81f8ee69df5bc75a9f19c7b4c SHA512 024d6fa323d0e3f930670cab0b9cc9975e3a4012b6e1d7399e3d26991fbb2ec473579eb3571686205fb161f8dd318f7c941dfc4c9485c420b58603c8594c4b91
 MISC metadata.xml 338 BLAKE2B ace789d7488589dc1b89c611be2203930260f5062fb29b72c06feef97f3bce137450c2c3196653fcb5dc6d0e52ff0ab21e8d0989324d5a79be181fd1d8e6ad82 SHA512 0b42bf0312a05f3b85da7d9e02d47432ade81bf81047c760679df050d23e6b41f5a4424372d2298a054e62f3cb4f1712712411b99c351b16112d607ff1803740
diff --git a/dev-ruby/bundler-audit/bundler-audit-0.9.1.ebuild b/dev-ruby/bundler-audit/bundler-audit-0.9.1.ebuild
new file mode 100644
index 000000000000..d8a50883e0cc
--- /dev/null
+++ b/dev-ruby/bundler-audit/bundler-audit-0.9.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides patch-level verification for Bundled apps"
+HOMEPAGE="https://github.com/rubysec/bundler-audit"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+#tests are trying to download files
+RESTRICT=test
+
+ruby_add_rdepend "
+	dev-ruby/thor:1
+	dev-ruby/bundler:2
+"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid specs that require network access via 'bundle install'
+	rm spec/{integration,scanner}_spec.rb || die
+
+	# Avoid specs that only work when the source is a git repository
+	sed -i -e '/describe "path"/,/^  end/ s:^:#:' \
+		-e '/describe "update!"/,/^  end/ s:^:#:' \
+		spec/database_spec.rb || die
+}
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index b27aa31c76c1..9fdd4a0d0450 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,6 +1,8 @@
 DIST webmock-3.14.0.gem 126976 BLAKE2B 20dd463c8b784869d4379aeabf892a6b4602091a4cc01a4002161d88f24781bb2bae1e50bd0ce8077c40aab73a2243835d99551bd04d808ffdf019df071c2b01 SHA512 0c9ea5b29446de7619c45d0fb72ab305bf68150c9d657ddc223d0d258a400dc730e3fe401b46c994a5c8eb450db5ee8f7021fe8d2d6c85bc4723c657799c5ccc
 DIST webmock-3.15.0.gem 128000 BLAKE2B 10587fd127fe61076d34a36f71e6e61f43d6019a01d1906e1fa501697791deeb89a8a2cdc5fa92dee1b001cdd22055db913ae20414342faf0ae11cc301bf0e6e SHA512 9f2e6404b617cc1aa67dcaef941046f82e4602eaeef77084714a451be513fdbd6e6c54c090842c5519009d2ca0533b30ad17d225d3738cde526d037d3fe3335b
+DIST webmock-3.17.1.gem 128512 BLAKE2B 176eefbf9523ac7c22e66d6aebc669d91c5545bd5889cd69f5543eac22d06a92e53ec9544f21bc883776ef712d410b0602db81a1e21929d0e02ce826f758aae9 SHA512 3814e8d6d65cea330618fde7ade54e83eee71466354fd295b2acfd8a1a637daad193073d21ec832edf6864fc3019c24501882aab4fba48dddeb9ff2d57cdc9f2
 EBUILD webmock-3.14.0-r1.ebuild 2208 BLAKE2B 844a2c2e80e49ac585198d4c9f367f9c33c75ea8b57d8d9b795a57c0226a0cc2d1914f6d94f5d7519f9a62cdac21013b23b5093e4fb13a958270fae23fa3ac9c SHA512 d1075b29f3d7f24c1d0c84401bd52606f1e2cb8e52af9a71f9618d61e2ac8c7aa5f6129c956b26f4e73b91acc249527d48c08183da5345c38210a652ca98c82b
 EBUILD webmock-3.14.0.ebuild 1993 BLAKE2B 3859ccfeb43a7a4a895b2a3c3b49cf1a8c5f0fd5f9dd2374d90393e8c8828a0206e2da676046069560ee6c9526c33e351e7e1271dcdbc4b46ea9f57d21294eac SHA512 03186e23bee7308be8291d9f673f8ab1ba5f1db7f8feceb11a59b1fd7aa60aa3f32052106e946e7b569629c343cd8fef7d0d0ca44eb4299e717ee0000127dad1
 EBUILD webmock-3.15.0.ebuild 1999 BLAKE2B 62a8abc749c77b2afed5a742295419fe1a6fb96d8c7f587c8057ce71b8ee7ec088e47d59e3631ea2ff5a5770a5adbf1b3efc6b367e5b503e3d9837778b02f897 SHA512 0a2d98ae3ad282b4c18855acd8e5c16e9cf60687cabb79c3ce605f25e4804e5f3e9ba4379241b6aa3240889b1bb2f3f0eab9d1bd3d13bac6ac55017ef27c927f
+EBUILD webmock-3.17.1.ebuild 1999 BLAKE2B 62a8abc749c77b2afed5a742295419fe1a6fb96d8c7f587c8057ce71b8ee7ec088e47d59e3631ea2ff5a5770a5adbf1b3efc6b367e5b503e3d9837778b02f897 SHA512 0a2d98ae3ad282b4c18855acd8e5c16e9cf60687cabb79c3ce605f25e4804e5f3e9ba4379241b6aa3240889b1bb2f3f0eab9d1bd3d13bac6ac55017ef27c927f
 MISC metadata.xml 342 BLAKE2B 0f0b9d59bb3519e6da06fe5d57cc9ce3cc1f3a1f516006a3d43a6cd3c416b3b5d9d2955a7800a588010b9672f3a03fb6a74bc62c3ead8b2e0f0b3ce0f5af5456 SHA512 0c4f9ce8deb018a77c7ec77417a22d3b95d0701263acc1ff07081e4e7ef995051ad2eba387962ee06b4bd810db5da7e2294e1ca7bb9a50704f7d7265b8462997
diff --git a/dev-ruby/webmock/webmock-3.17.1.ebuild b/dev-ruby/webmock/webmock-3.17.1.ebuild
new file mode 100644
index 000000000000..ff18bc5ed6e0
--- /dev/null
+++ b/dev-ruby/webmock/webmock-3.17.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
+HOMEPAGE="https://github.com/bblimke/webmock"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.8.0
+	>=dev-ruby/crack-0.3.2
+	>=dev-ruby/hashdiff-0.4.0:0
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/rspec:3
+	>=dev-ruby/test-unit-3.0.0
+	dev-ruby/rack
+)"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '1igem "test-unit"' test/test_helper.rb || die
+
+	# There is now optional support for curb and typhoeus which we don't
+	# have in Gentoo yet. em_http_request is available in Gentoo but its
+	# version is too old. patron's latest version is not compatible.
+	# httpclient is no longer maintained and has various test failures.
+	sed -i -e '/\(curb\|typhoeus\|em-http\|patron\|httpclient\)/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client,httpclient}/* || die
+
+	# Drop tests for dev-ruby/http for now since this package only works with ruby26
+	sed -i -e '/http_rb/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/acceptance/http_rb/* || die
+
+	# Avoid specs that require network access
+	sed -i -e '/when request is not stubbed/,/^      end/ s:^:#:' spec/acceptance/shared/callbacks.rb
+}
+
+each_ruby_test() {
+	${RUBY} -S rake test NO_CONNECTION=true || die
+	${RUBY} -S rspec-3 spec || die
+
+	einfo "Delay to allow the test server to stop"
+	sleep 10
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index ac785502c974..5494af0ebc1d 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index b99d8ca55bdd..ad66ee686fa4 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -1,7 +1,10 @@
 AUX 60bcc.env 32 BLAKE2B dbbfb31408af7f3375b02981113d81d71075d339fded45db24b2168baa9f3ffe51205447c12eb9c3f06188fd32db591f21bce41edaff473a40b10320067447cd SHA512 a040c762df54a0218fb3fc4a6609b0e924003be689eaff629fabe69e1ed224fc38fdaac377624944718e5b174ac413edf3730cd0a228bd73bf8ef8678e97d73c
 AUX bcc-0.14.0-cmakelists.patch 444 BLAKE2B 3832bdfe3fdb3946889fb614c3f89220dae7b319329ad45649edda0f7c9cbd8c8e90ce200c6f7df4913c3eceb0cc729e83d90b7dcc8af991e3f59b5a772f9cc8 SHA512 05f2c50e7daabe9118ea4e6dfd6d8dc155bb0311fbb2fbc491c2740d6f5081cc95ec7cb8faf19751eb161bcf60d30be87e0b6c88d032bf88ecae48af5119e0df
 AUX bcc-0.23.0-man-compress.patch 704 BLAKE2B 0eceb68e7d7a09b948d24e98c833031751421c829ba99564499b4e4ded9f0bc505b60a2648de7287185d85d847b65f3b929dd08b3fe9f97b1a7aaf9868750ec4 SHA512 7f7c4f4292ab5334201506ba523adc1c9a8e87cd3656a896cf31fe7f48f25e84bb52552f7d02d12442784a72cf7bcb01dec8a63eb2679aa9d84ff935f94d1863
+AUX bcc-0.25.0-cmakelists.patch 358 BLAKE2B 0159aa6e483bd5fab0bc920e8416a94a43809d99a29344b17321bc92890614f99cba1bb8bea02522b890be456904250ef2875d2d88b3f6d55022ad2d4ad2910e SHA512 9521e22cb9318b56601e1d27362903d63fcd8954b7539e6e92db267406d8aed6be8261b62f02d186edb82d548d64578bd99674f93c86e36e1fdd43332dc1552a
 AUX bcc-0.9.0-no-luajit-automagic-dep.patch 463 BLAKE2B 286ed298055cbdb22d9c3f3f064c77da685cf75cc8c0ab0cad4d4b473f0eac0b1533ca8eb7e6159108d184d16db7a264b0ea9d30ccdc3d988d88bab28be7310d SHA512 6e5c20de22547410ffa566cb8226a47ee0e8c91183bc5b70eb22637a08fe55cfc96fde169ef3ab8d6e8d7c9e356c35e61b164b3ad675835d3ea8d5239a448979
 DIST bcc-0.24.0.tar.gz 4640711 BLAKE2B 91d333c21c55de6a0ae78f9bb0b003803578525746e63ca5047896c0b2ed03ee880e03a84511470576e888e46559c67a8ebfdfe49d8785d094e2361bb20c5c2e SHA512 951672e3a8e5ad56eedf513477317ec3d3b4cf2d594bbfce20f3d19ddf7ce255e9dcfc69d9b05bb765a16e769c8e42d7c57071ddb86fb32437f527d3d25d19b6
+DIST bcc-0.25.0.tar.gz 4984989 BLAKE2B 7547e3db293c1eef617b3bb58231f40a4bd3d58f425666dcb58bf77a69d74b468f07d07e01cdf2be89820318c9f3c213047b2d6dd654e08e6a60a3ecc2573252 SHA512 9f71f6c21d1f66054985562168d5848352f5029383e9c65c907a6f044258bc23df842cc65db20bfaaf33789e69c9b8e7b606a32dc882cbdf093b71768c8b521d
 EBUILD bcc-0.24.0-r1.ebuild 3059 BLAKE2B c3461a5ecefbec5f6fc562c99ff805c82da52f009fe387d03417e36d4b3b9b1375fe113000b24f394586fd6a7a15ec835980cb2f9f480140f591d49b6e0a101e SHA512 4ac0e89395db194ac1ff5a2a18db37e4d18bebc49ed46266d2438622e98e58b86f6d466d440f20d99167b282b543acb1e4973192eba9aa9060469077bcacf6e9
+EBUILD bcc-0.25.0.ebuild 3059 BLAKE2B bd4bb17ca2e69deb8a024762f8cb48013b0b1efdd00101a40ce055a7b73855c196bbdb00c4f458c9df42518ef7d8209bb57b6135f934944bbb5f3333fecc44c7 SHA512 08c2665964fa4d07a932ab90f8777c4d4dbbb85b64d5d3125657b8ae11058abd84a3941c2d2ef5f7e1eecafdf22b89e91a6b9ce15485ac225eeea51f9f2eb51a
 MISC metadata.xml 533 BLAKE2B b34e30baea99e82348b7f925ab1b4899ea9e4119d2f24f59e11b48dd8efc61edb3029580af40184acd0dfa180caa7e558ef0303247658cc1b3136940f7a735f6 SHA512 c7d4a450c8fe534fd9ab3aede95ac1192aa62f94858b9e0b1efc1b8982d49b0546e012f2d60c1aefc96155b8641d6ebba059af8fbea798827cc8dfeee15390e9
diff --git a/dev-util/bcc/bcc-0.25.0.ebuild b/dev-util/bcc/bcc-0.25.0.ebuild
new file mode 100644
index 000000000000..1b1af6260a0c
--- /dev/null
+++ b/dev-util/bcc/bcc-0.25.0.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{8..11} )
+LLVM_MAX_SLOT=14
+
+inherit cmake linux-info llvm lua-single python-r1 toolchain-funcs
+
+DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
+HOMEPAGE="https://iovisor.github.io/bcc/"
+SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+lua test"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	lua? ( ${LUA_REQUIRED_USE} )
+"
+
+# tests need root access
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/elfutils-0.166:=
+	>=dev-libs/libbpf-0.7.0:=[static-libs(-)]
+	sys-kernel/linux-headers
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
+	${PYTHON_DEPS}
+	lua? ( ${LUA_DEPS} )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		|| (
+			net-misc/iputils[arping]
+			net-analyzer/arping
+		)
+		net-analyzer/netperf
+		net-misc/iperf:*
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
+	"${FILESDIR}/bcc-0.25.0-cmakelists.patch"
+	"${FILESDIR}/bcc-0.23.0-man-compress.patch"
+)
+
+pkg_pretend() {
+	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
+		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
+		~KPROBES"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python_setup
+}
+
+src_prepare() {
+	local bpf_link_path
+
+	# this avoids bundling
+	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
+	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
+
+	# bug 811288
+	local script scriptname
+	for script in $(find tools/old -type f -name "*.py" || die); do
+		scriptname=$(basename ${script} || die)
+		mv ${script} tools/old/old-${scriptname} || die
+	done
+
+	cmake_src_prepare
+}
+
+python_add_impl() {
+	bcc_python_impls+="${EPYTHON};"
+}
+
+src_configure() {
+	local bcc_python_impls
+	python_foreach_impl python_add_impl
+
+	local -a mycmakeargs=(
+		-DREVISION=${PV%%_*}
+		-DENABLE_LLVM_SHARED=ON
+		-DCMAKE_USE_LIBBPF_PACKAGE=ON
+		-DLIBBPF_INCLUDE_DIRS="$($(tc-getPKG_CONFIG) --cflags-only-I libbpf | sed 's:-I::g')"
+		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
+		-DPYTHON_CMD="${bcc_python_impls%;}"
+		-Wno-dev
+	)
+	if use lua && use lua_single_target_luajit; then
+		mycmakeargs+=( -DWITH_LUAJIT=1 )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
+	python_foreach_impl python_optimize
+
+	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
+	local -A rename_tools=(
+		[trace]=1
+	)
+
+	local tool name
+	for tool in "${ED}"/usr/share/bcc/tools/*; do
+		[[ ! -x ${tool} && ! -L ${tool} || -d ${tool} ]] && continue
+		name=${tool##*/}
+		[[ -n ${rename_tools[${name}]} ]] && name=bcc-${name}
+		dosym -r "${tool#${ED}}" /usr/sbin/${name}
+	done
+
+	docompress /usr/share/${PN}/man
+
+	newenvd - "70${P}" <<-_EOF_
+		MANPATH="${EPREFIX}/usr/share/${PN}/man"
+	_EOF_
+}
diff --git a/dev-util/bcc/files/bcc-0.25.0-cmakelists.patch b/dev-util/bcc/files/bcc-0.25.0-cmakelists.patch
new file mode 100644
index 000000000000..dc66bafd9e50
--- /dev/null
+++ b/dev-util/bcc/files/bcc-0.25.0-cmakelists.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4a32768f..c938652a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,10 +17,6 @@ if(CMAKE_SANITIZE_TYPE)
+ endif()
+ 
+ 
+-if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+-  set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "path to install" FORCE)
+-endif()
+-
+ enable_testing()
+ 
+ # populate submodules (libbpf)
diff --git a/dev-util/bcpp/Manifest b/dev-util/bcpp/Manifest
index bee5f6bae6dc..04ee5548b05d 100644
--- a/dev-util/bcpp/Manifest
+++ b/dev-util/bcpp/Manifest
@@ -1,3 +1,3 @@
 DIST bcpp-20210108.tgz 150080 BLAKE2B 5614b1e9957d63532ed6ba6d4588ae8b899201c363984bc99726bf48ae49ee9d16a71c407e3988fdeb715fef5e67343bc56c94eb1c8e977a14a6c2b08ee6668a SHA512 46a8fff766bbca4833c898d550ce4f0ac5e6ea64a2e05e63e4680186345a080aa30e54a4a5a3d22d47df8e8c8cbc4e738578fd59ec647d305c32a228d3b01e73
 EBUILD bcpp-20210108.ebuild 903 BLAKE2B 3748ffc0caa34f1a2a64e29bd7f586406ff45ac63ad6b9fa4a5bc6eb90040d71df74eba132ada63340b1e450d90d961de1e02c6e1921d5395d2ff8771eb7a916 SHA512 59c925ed7e6bd7015bdef7febdc9682e424793df4e568f70b5fc641d2fc65f286deb9b5d421af9159496871a64507c97a896274ac03e430a97f95369ae771f07
-MISC metadata.xml 260 BLAKE2B 967f41d5c2e3d0ddec7e7c02760d8a531e94d79c3b9b39870235b2efea9bfa5818137a59a14a691c948d0e831e22edaa63be673b6e887989aab54dd182abb1fa SHA512 d2982e5d2443299dc3ffc6f13b49939abdce3cc2b3a8c7d4c77be0a5db794aba11f6cfa94e387d65b9eedb20714a231328cc88477454f42d23ed8549a261ae33
+MISC metadata.xml 327 BLAKE2B 98cfc008c1157e6c7bf26938ee9cb85afed7b4ca15f625a6bfb4f10a4a7ec9b7ad101c38c6b5bde51ac8ff8f6ebc15ca0cdd2903db65f1d691c13f534f5783e1 SHA512 ebaa5a7e3f02bc91337c50366007ffb65ef5a8a5604c43872d3a45f50a372adca5ac279b84309e3045fd34b81d0a9a138d2f73141955e15f0e827a42fab70673
diff --git a/dev-util/bcpp/metadata.xml b/dev-util/bcpp/metadata.xml
index 64a2f533d433..2ccc0a6e418d 100644
--- a/dev-util/bcpp/metadata.xml
+++ b/dev-util/bcpp/metadata.xml
@@ -4,5 +4,6 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<changelog>https://invisible-island.net/bcpp/CHANGES</changelog>
+		<remote-id type="github">ThomasDickey/bcpp-snapshots</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 91da17754ff8..bac2799428c3 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,3 +1,3 @@
 DIST byacc-20220128.tgz 896513 BLAKE2B a5dd491702274ed84fdddc8b2d2d240d8ddcc9350db82eee067978297ceda012ab99d7c8f53102f8190ce6e6bb3feb8d9beb62969ddf222b4ba967041b746c00 SHA512 e8ae4c56f5be4cc0ef1d281c43f02c6296fdc40f630269f2a61af511f270ae059ad185b9718190b8133018f7b74b7ca6f84ced5d63a359960b52ea2a3ef562ea
 EBUILD byacc-20220128.ebuild 720 BLAKE2B 5f00236b0a431b1fef5cd74b6787434ffa9b226ace40fc4976e55a13d548eb469a362bdd3d55b6a33fab53e244e2f66d47839563b842f72369d023e44ae4f106 SHA512 8c75ad76667fe0cbfe526760b5ccbb6acaa54a95da18e234a3e3d5ef80761f817fef4b281cd79797001f3843a2ce5a9467d5d0d24555317dd81c18e5e7d64324
-MISC metadata.xml 356 BLAKE2B 3f7f63e3c9b146f59f1f5af0d683294a58b264e2945fd1a30635c64d462f4615395a49b6acedaeb3ae6377061e85b2496b898db6d8b39a3b8ac8f3cd800a666c SHA512 6f1890fde8b83fe6821ac2e9d298f4dda67bd1a15b26e54d51de685cba60b7f938e4cea3f335635773bb54f4a7fadc9a41e52dadebbb41897c042b4c995ba634
+MISC metadata.xml 424 BLAKE2B f7c1172e12c784d254658b3743db6fec9d6ef008891fe84114c71c1d0edf24a37f00ad61a1705716bbaf6c912b763756995185f2cffd95c831b8ca57abec6d68 SHA512 8bbdcf35f0499db09f1d55d038d93f8c3aa516e0baa74ec078c7a3032d4885110530be47cdd309de1a44b8c92e6dca3f4353d3ff1d3da04b052d492c91549067
diff --git a/dev-util/byacc/metadata.xml b/dev-util/byacc/metadata.xml
index de03cd291619..8e4415f86e02 100644
--- a/dev-util/byacc/metadata.xml
+++ b/dev-util/byacc/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<changelog>https://invisible-island.net/byacc/CHANGES.html</changelog>
+		<remote-id type="github">ThomasDickey/byacc-snapshots</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/cproto/Manifest b/dev-util/cproto/Manifest
index f539eea7d91e..27c59b5d8afc 100644
--- a/dev-util/cproto/Manifest
+++ b/dev-util/cproto/Manifest
@@ -1,3 +1,3 @@
 DIST cproto-4.7t.tgz 181095 BLAKE2B 60e8fc26acab8a7475d08c413b85bfc68b1fec877845f6302f741665eb3f779faf313d5463ec08f6a41a04737a9c280d3f8d5247bed819a21ea30a3c2d11f197 SHA512 ad5abddeec7e92ec85ac5d19f025a1d3362ed0a082e3a00fbc64545e3ef6e34fbd9cfff36be01276836d1d834c481927d12f747b0904dbc644d43f2e879bd82f
 EBUILD cproto-4.7t.ebuild 422 BLAKE2B 699c94d1629d4e627e0ed1ef5f87f805f558f46cfc93f83ddeab3122949cd4f574e448f1df4299a3ad104fd1c6865ee9face7bd5f9259ed9741c2c382176ad6d SHA512 3d014e139c204a450b8eb39de27d829177c0e6b91f1dc6b562bae70daea6875624c1a65d013ad705993f53f7d28c3c156d1a10f02aa2235dad22a9b160bf4785
-MISC metadata.xml 267 BLAKE2B 5023d0238d968a99a662f6010a8c323fa1018b7fabd06a712c063d4c7541c37e609744c92989885302eb417a1ab76e0e0a262f7b51e8efce55589bf2a7061a10 SHA512 6995ffd57bc3865f565746e7bf48e9f6e08201233273e679369646c75b75b77f378b3d029ac180930b47881a0577c3dc5efbdd4f83df43740fa211b85865096e
+MISC metadata.xml 336 BLAKE2B 45d3b05d925b08b4b9ba679e197b059295c82cfe43bdae1e99739c0f6887c0639845a78d889327f736aaec542fcab50c415f8711b64db58affee810088eefb0b SHA512 7284fa1ca3610bbbf0ac1ed50a23c1b09155ce124eb8d70dce99bac08bafc56f2396aa06e085ffc559ddc0153e94d1e9e6c7c6e5e01a2ee8d392ef1af0a279e6
diff --git a/dev-util/cproto/metadata.xml b/dev-util/cproto/metadata.xml
index 7587b7e8e51b..3af032a14a57 100644
--- a/dev-util/cproto/metadata.xml
+++ b/dev-util/cproto/metadata.xml
@@ -4,5 +4,6 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<changelog>https://invisible-island.net/cproto/CHANGES.html</changelog>
+		<remote-id type="github">ThomasDickey/cproto-snapshots</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index bc95f47fe48b..72a21950dd02 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -4,4 +4,4 @@ DIST dialog-1.3-20220728.tgz 568086 BLAKE2B 086d946f2a8d298f1d26a193b5e99c00991a
 EBUILD dialog-1.3.20220414.ebuild 1290 BLAKE2B 690ab3410effd792a305509ea6e87005f2982a04d13bb5354fae2b9952d0f2e49cb37805f1ce318c7430a28a5fc56b3d7a776461ff761fb05b347902426ee141 SHA512 816bd5d804ac91ab2b1297116cf9a5a8d180dd6c6dddbe9542016fb54fcb7a17f63e39b35ac6811a4f5fd88874fc2718380cc6b6076e6212358f0026712a2f4a
 EBUILD dialog-1.3.20220526.ebuild 1298 BLAKE2B b572d1d099d9ecf5d425dbf8a7b9a10b2f708fc264954c91623a8b0ab4f2bd015ab8118d621b8651208f34e1f01df62e6aa2ef9ef85690d65d6048b58d55df69 SHA512 96f582e1c3ea2296c9f5ab984db020c1745965bd48811920a8f3eb4e45079b5b271737836005cb1bc41dbaa1264ea1d735aa381dff58658f88bf94adb7850f3d
 EBUILD dialog-1.3.20220728.ebuild 1298 BLAKE2B 27aaed922d5bba6d53475aa9c52309e0dcbe98b4fe255579f58d592cc451dd2fce771737811c9eaed574609ac87993803b403938a8e714672dd08d4a2e016ab8 SHA512 d52e80acf62a7e2f0078620af5c516d82d8a46434337af09bee0e2d6105560889e27f12440172edb7c3fa71cdf2f66fc86601160379ef9583451fef1790f5a71
-MISC metadata.xml 461 BLAKE2B 82507f66df52f2e9c4f51c52fc346a517e4244b4902dac4d557b52c01fbcdc9547ec8b0b572870a2860f995932973fd2b97698fcf748fe4762f210e4b12b655c SHA512 b07779508297ef58d1fd0349700cb7c609a1d503ce99c4fc3bda84c5441dd52064116680459510adbc6e1b6d9173d53fccbd3d6c2130caeb1d822dca5082a334
+MISC metadata.xml 530 BLAKE2B 018162b342a7a0462f5087ead1bfaf931a299a2934220afe0d1f2736951b66d05b9985dcae0b3a9039ccbf2df21f3a20271e5718a4f8cc8391daf23f16c0b1cb SHA512 e49c5b6feeabf720469a5d34e7c40b26cec9800eea1cdd54c103407d653b45c22de4fe341d1264d516fa00d8706c6a969ded915f2df24f463b0a8d40072afd40
diff --git a/dev-util/dialog/metadata.xml b/dev-util/dialog/metadata.xml
index 7a9829e938bb..fd93c5744e48 100644
--- a/dev-util/dialog/metadata.xml
+++ b/dev-util/dialog/metadata.xml
@@ -10,5 +10,6 @@
 	</use>
 	<upstream>
 		<changelog>https://invisible-island.net/dialog/CHANGES.html</changelog>
+		<remote-id type="github">ThomasDickey/dialog-snapshots</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/gprof2dot/Manifest b/dev-util/gprof2dot/Manifest
index 61cdce77eb17..edb5529f3ba6 100644
--- a/dev-util/gprof2dot/Manifest
+++ b/dev-util/gprof2dot/Manifest
@@ -1,6 +1,8 @@
 DIST gprof2dot-2019.11.30.tar.gz 31388 BLAKE2B 1781f59e5daa8315d3fd9defb6e28290272c4ddca01312e9af4acac494f3c7b29a437e3411b0bbb218f2eedbb2acf83d4dfa9c1d47f20b2eedc0fd607f1e4a02 SHA512 06fa8feed23e21d7827bbac19c887f65b9ca6a0cfd5b54c4da373ca33ecf0f11835b961dd1c2237ac2bf9764a8122d3ed9c7f9981c127a14ae74a733fc1275b1
 DIST gprof2dot-2021.2.21.tar.gz 31709 BLAKE2B 49cba606603e3951adad3c1d8f7741750ef958d5df02df5d8a1aeff2ff7407d2fd9eab9628d58244aa20799bf04c9d0e8bafb380d96de1d6b20a3aa54ad3c211 SHA512 e95a5a00d2cfbf31e260e29c22e85aec03d8aea32ed9b05613dd0a33f296df61745a78d1f7311b514a7798f0774e96ad829cf3495ab0c1bdbed61a9bf31975fe
+DIST gprof2dot-2022.7.29.tar.gz 33948 BLAKE2B cc96bcf0cbce2159f6a03bb1b7d3b2e89212a2acdb948fbeb947b8664ed34123102792476d16d11b7b2bdb269aef9ce54a7224a355c5390fe6010e82bc2df189 SHA512 347e24c11f4ca3b5d6b50dfebb158f046e64aa302549b82949c5e089d081c741c9936272d45d378f3828d3d824ed632a98444e6aa3dc1a3b9b86abc27738bcb8
 EBUILD gprof2dot-2019.11.30.ebuild 503 BLAKE2B 7a58899fa9bb90e695f00c841dc049369ad7c7d57a434c2d4f5150a13e43a014101a72f41b7e5181e8720d8d0c0b231e90cbc973235e67903017663d1d2db58a SHA512 11039a3c5dea078cb1ab84012a5b613b944b9989423925d470f695a1367666a82348034686daa020c1ea2be353c7bae503fa57e875ecd9d0008c70bde680f980
 EBUILD gprof2dot-2021.02.21-r1.ebuild 471 BLAKE2B b9dcaf06998f12f29ba3239ebb5852f90fb61efb3ffc48f6b8f6f296b86289f95618d7c30f12da43d13ad5c7f3ae0ae24c80b4be6209cc7b6d305b35f1100dd5 SHA512 b1a92ad7183c75725f9aec7a7f918c57fff9c175842234a03a1d9c41fcc20f1d9831c6f94406f3f924ba0282f3021b252ea9fbb874a4305c2329219d8b1ac1c4
 EBUILD gprof2dot-2021.02.21.ebuild 503 BLAKE2B 620b91d76d9fbfe50b9fc1dd5630831676174bfa6d8e22d1de834c10121d51dee8fbe0d083c664a508c2b77bb64bec215ca084fa09e15ce6a80ee50b05bf7eb3 SHA512 8c5c7f5706f50e747393b06fbfbbb1c528881575c87ae3d8e7ac4d0bda6acf12ef1b3026ee1329c3ff74d2e834e8f558c4db224cf5c39f3b0172498b7ee9f7a7
+EBUILD gprof2dot-2022.07.29.ebuild 471 BLAKE2B 675a3704f39a1b3c9b5c4bbca32a4956090fed81357e8b3bc2877b231afde1f733f9963b5ed83b8cc4bd485ba1fdae3e59a900635fea45b130d378aaf51ab5a4 SHA512 8621567479a257a65bc0a7c51bbb1ff39ada9e1375292e98b8a3481affbdfd2f49427205381796fd42f7a79cb10ca4658a5710604e1255d5e37ddc1df47be44a
 MISC metadata.xml 334 BLAKE2B ff8e238ea00e5fb439ba67694e07856c153933bbe5bdf784eaae06057e0cf8e3a559f94a97555ccbcb542c6c6b574f6185436f95e2e967b418c8c4c431f498f4 SHA512 c39ee4bccc93b7d4ad6b18cf7ad637a262c5aef5accd616c5c0cd331e447741151d56f30293a4d16963491d9b609983e9f832c0376e40157fa9065a8ba7f776b
diff --git a/dev-util/gprof2dot/gprof2dot-2022.07.29.ebuild b/dev-util/gprof2dot/gprof2dot-2022.07.29.ebuild
new file mode 100644
index 000000000000..f488c858ed67
--- /dev/null
+++ b/dev-util/gprof2dot/gprof2dot-2022.07.29.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='xml'
+
+inherit distutils-r1
+
+MY_PV=${PV//.0/.}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="Converts profiling output to dot graphs"
+HOMEPAGE="https://github.com/jrfonseca/gprof2dot"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${MY_P}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 2714aa6b96bc..4a1a7e69bb04 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -6,11 +6,15 @@ AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe08687
 DIST jenkins-bin-2.332.4.war 94930441 BLAKE2B 9502d7fd91d0ffc6871ff0613061883bef98442cf69469ef6bd1cc23fb1849d0b8e70aacf27e2807281a575889c34c574a84caae0226c8fd922fea0bdf334485 SHA512 e187804f8ab1454b56e88b89b258ee57e1c4c2069ef33d87e78e2797252498817edbed15208ec3644a77d51d51afebc0c12e226cb24068bb21a415f21d9727bb
 DIST jenkins-bin-2.346.1.war 91193351 BLAKE2B 21a0f2ec258498e447a25527e82ad6e7e0b061daaa9647f244930471629de4805755648f6a689598e048e3ffa72879d1dba88a7a4d5ce3fe5bff287f6cd395ca SHA512 63a34dcf66714b6db405a46ca6677693458f49cb61ff413c8c4bcffe6e10eff33ead5dc2e4f3eb3560980c33f1dbd67c3f51655d578ce5cbb19e1ddf871aa545
 DIST jenkins-bin-2.346.2.war 91198171 BLAKE2B 074bd7004d6244233da563c3d64626d0532f76b802ebd9056230cbbbef3381503b80daf4bfa0ec8866c3fcf9596cb0f8b53fe725f340452b755b092334437b5a SHA512 c1f579a667cabd1de00bb5b6db82c60b2089a82126ea07efe7bb1c987fff96f1e05bc20c28abc97c7e05be158df59968ac4ed330e8459bc438e3e7169d84a5dc
+DIST jenkins-bin-2.346.3.war 91196986 BLAKE2B 43b84852d84e2dbfc3307bf2ac540d324fd4976c93998ef4062fd73acfcf1b7bcae68938a2b892769ddf02a46cda49b06be1a6820c42a1eba01862cfa8a122c8 SHA512 5b37a4facc53d26771adfad84d03fc43258ea2a60cf5b73555dc50074e8c9b9afbb49875216d2708d1af4c331254acde250dc9364eca0513add43b0bbe09dc76
 DIST jenkins-bin-2.356.war 90781388 BLAKE2B d65e1642a118cfcad66c4585bfe4e30cea8a5e8b598a6ba33b298a158fb2901d0b388aec9087d243648f51067661cccfb610948129f35c40c5c5bba4d3fb89e0 SHA512 2b602cac61101e4f47a23727b682684cec6afac7a867606f5210f5213a78ced0d0b1a2bf10507c26c58e480217a59b906626c80d133504f8d195a6e9e8fed94c
 DIST jenkins-bin-2.361.war 93448807 BLAKE2B 610a29beedb8daa6be624a37a934863857886ac312c3f1b858a83791942bbecc7c34da7e17ac17acf8f67263e8b8466e1d4912f528b29aeafd3b1822748bcff1 SHA512 93cd057b00142df516a5dea61da4cf1bb9b8b682d282528be962689b03a834426611c6547bbcd44fa9a4b7a9296e036c5966c22d791021b311ef6a43692f14fb
+DIST jenkins-bin-2.363.war 93462629 BLAKE2B 7c35594bc03dfd97e93f75b7e05389919ee1634ec2e3a1a4934a2f6215de2420652aaed79ebcde5e7ce9a5e2d8ed7d9495e36f3ee77bcbf6a6d996c2a767c7bb SHA512 4b6207fbd166f6c336181ff224b717b154fbd97a4899e86b94b8e5f3b26d53bb2e3742086a839774edbf6fd56a1d037b14e455474fca7d6f189bb9591b42168c
 EBUILD jenkins-bin-2.332.4.ebuild 1101 BLAKE2B c4912482e9f3287818e01d0b7e9d83591822145d69b39fd91439f5cf31043caa3c91b051cb556ea89129de6ab356600640b9701d538ada8145812dc880b9ada4 SHA512 ecbd288fe8594a97ffb716e582997b1e9f296d2e93754dc7975bed8b682153549e8789def16dea9eb713c73c63192fc7639591a59242c9d7b03ccdf09aade84c
 EBUILD jenkins-bin-2.346.1.ebuild 1123 BLAKE2B 8a494477de627fa4c185d560621ab910783d11320b0b500cfe738ad5cd3bd6820faed9c8b72345ed60aa9984cbb2e4b6060319bc23c9f38f499413df66994ee8 SHA512 b6280a876876976f3380440e7795ae043262d5315bba75e3531abfcaf629dc657e4e77e7e4a31b3473c34095da0bd8af8aa5bebfbb4cbc9171d3029e85036b75
 EBUILD jenkins-bin-2.346.2.ebuild 1123 BLAKE2B 8a494477de627fa4c185d560621ab910783d11320b0b500cfe738ad5cd3bd6820faed9c8b72345ed60aa9984cbb2e4b6060319bc23c9f38f499413df66994ee8 SHA512 b6280a876876976f3380440e7795ae043262d5315bba75e3531abfcaf629dc657e4e77e7e4a31b3473c34095da0bd8af8aa5bebfbb4cbc9171d3029e85036b75
+EBUILD jenkins-bin-2.346.3.ebuild 1123 BLAKE2B 2d98e57521a215f75741831a524c1c5d73928117d6d7685ccda652406b03cbaa663260144d2747bd075090a8a71594a56e4fc0e01fc3fc05465d97530b46a5e7 SHA512 8419df277167a238be4ab10603400256094f36e793e627ae4ad0f4ec885301824bf476a7adf349cb2c78095f59c724761d6ec6df3a3bb7c321de96e5fdf12089
 EBUILD jenkins-bin-2.356.ebuild 1116 BLAKE2B 645d4d7c3df6e0461fc6ddf2579b3c361fedcceeeff651ad9758d0240d66c70b7d0f83e6c8ca59f07df4094b56001f2d610f6fd607e56fe3de93cdc504270776 SHA512 c905cc7fa57702c542ceb856b5420903412ce035270a0c3aba2d5f2282d5fdce5a9dfe0a8750fda034ae0aba6d2b74912f8694ec2159b17d54185a1da008721e
 EBUILD jenkins-bin-2.361.ebuild 1116 BLAKE2B d45aa31094cd29f6eeb71a2cd15ce5209f72c2bfad374e082e0fdb86000161fd69470b436adbcb62696bb0139acbc1eae4996a70660f0434605e6777fef59456 SHA512 1a2d707dbce65435136fbef74cf18c3ce404725d7e8267eab255ee3200fdde3610da9bf78aec33a4c3b6ff8c1bf4c25410269763496895479de49eeb573f6e54
+EBUILD jenkins-bin-2.363.ebuild 1116 BLAKE2B d45aa31094cd29f6eeb71a2cd15ce5209f72c2bfad374e082e0fdb86000161fd69470b436adbcb62696bb0139acbc1eae4996a70660f0434605e6777fef59456 SHA512 1a2d707dbce65435136fbef74cf18c3ce404725d7e8267eab255ee3200fdde3610da9bf78aec33a4c3b6ff8c1bf4c25410269763496895479de49eeb573f6e54
 MISC metadata.xml 398 BLAKE2B 371ef010b09278ac9185194c2431f7026039445de0d9b353b560d4e69a52452b275a5739332bc33029b678c91b76b65f377ea4417ef52cfd242aca91dd505b53 SHA512 f071cbac4947308e68d23ce4d3a14a61deccc1633a31f28d464ebac7d566ff8fb300246fec1a1603823dc2d9f0a13a47cfa84f5423eae3f08e683a4a183699cc
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.346.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.346.3.ebuild
new file mode 100644
index 000000000000..aad8d1e6aa4c
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.346.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+SLOT="lts"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+IUSE=""
+
+DEPEND="acct-group/jenkins
+	acct-user/jenkins"
+
+RDEPEND="acct-group/jenkins
+	acct-user/jenkins
+	media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	|| ( virtual/jre:17 virtual/jre:11 )"
+
+S="${WORKDIR}"
+
+src_install() {
+	local JENKINS_DIR=/var/lib/jenkins
+
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r2.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}-r2.init jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}-r3.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.363.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.363.ebuild
new file mode 100644
index 000000000000..593c0b96ef08
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.363.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+IUSE=""
+
+DEPEND="acct-group/jenkins
+	acct-user/jenkins"
+
+RDEPEND="acct-group/jenkins
+	acct-user/jenkins
+	media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	|| ( virtual/jre:17 virtual/jre:11 )"
+
+S="${WORKDIR}"
+
+src_install() {
+	local JENKINS_DIR=/var/lib/jenkins
+
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r2.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}-r2.init jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}-r3.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index ffc72da59cf7..2e1e50e95e41 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -2,6 +2,6 @@ AUX ninja-cflags.patch 738 BLAKE2B ec025836197d41d96cfcab0a7363ab3bda50cb7fc3f91
 DIST ninja-1.10.2.tar.gz 213959 BLAKE2B b8160ca6d58cfa0edb93d16b7dfb9776d290c42e54b33b78cd925f167c80f8794e4cc30af984a526b8263c7904a734cf0770d3c27283d21d02f18d3e2eb70032 SHA512 895412ae1cbc83c656e92f282602a29300e08274e9dea0da4464202ae556e7a1ab03bec057f23da4756bbd91bd2d744cd7a64b336740fd2782bb4db5c3b7b496
 DIST ninja-1.11.0.tar.gz 229475 BLAKE2B 71c8b6cf9524bdc11cf73f7e761f0d7deef2498a970c1439c10cc7d361e31fed1e3b54bcb185f3c7ed041f15704851a96e42560058af61b8a5df6e918d52ebf3 SHA512 9b9c8dae2251f9ddba50680911271b8504c292994fd90a0da94902f64c69a9edc72212217df5c651ddfc2f79c2ae03e84c99b805497dcd7497c53a1617de83e7
 EBUILD ninja-1.10.2-r1.ebuild 2798 BLAKE2B fae8cb33fbd559d68120a8501fa99e7a6299227c590c9902a1cc402798e892d92718ca1e6248d22f41059e2a1a98ca92bdfb534a33ebc34cadd88615974fe565 SHA512 c26741a21ef5155ef518d219b377fbe70139406b533ff64c2a2f1cf626848f76a2172052f5b2584a7c4a50e3017c7d4ba4ea656141e8925bf8bdb4a9a06b301f
-EBUILD ninja-1.11.0.ebuild 2668 BLAKE2B 1ebdeb5f36dad792201dc119d4e9c82c16c4e64e2a134f36e4562dfb05379015d86cf1aa3c775fd972ea0c86f287a85c11deba92fa44d9eb830c0c4a866852b3 SHA512 b0fa5498451e5f062140684cdcbc7d486e28406468d858c0a4c41b349337bcc899584ae53f26821cab9b523526518f23d19570dee7cfa2e16dc746408d9357a0
+EBUILD ninja-1.11.0.ebuild 2666 BLAKE2B aeb622704dfd0d63da4e6be5806ba158e5fdd48384413104cfc735655775036bc1c5b4a6a5bb700de6791a2e683061f526370cc6dceaa66f9eca0cd1990cc627 SHA512 963e5d9fe6dfe2aa7542ba1d34344018aa399336e1ffcea9fba3630777fcd1bb24a79d9785dfb00d68ce41d9a40968a4b11f85c8fc56e5883cb78883e9900e5a
 EBUILD ninja-9999.ebuild 2672 BLAKE2B 62774b99edc98754f307c8a5576e148534cc21eed8fc0b0e42ac2653b27943f8b86b3368b856743011884a034601e221bcac1da81c45bede2c249b7e42b6783c SHA512 014bc565791220ba3794563973162e38237a5f5cb7247c79fbbd6ef811944d2decf9f67c8f29df2f0a39920f9077f1550625bbb4bbdbac3d2f0f4f642ec2577f
 MISC metadata.xml 345 BLAKE2B 62344dee3d109b90fe9cdc68f581d3dddd9ffee182af72e82509180d9382b6765ecac373680f0c3fc3e1b5c4e9641a689bb036ee877a2117d335ae4e1608718b SHA512 20d5ee6f6448835b6cdcb3ac1f6760d5bc452aa44a1c72de2241cd47432967498c30099c79a5b59a53796cbe1c373291bb62a5d48914996fa20c9e22569d68eb
diff --git a/dev-util/ninja/ninja-1.11.0.ebuild b/dev-util/ninja/ninja-1.11.0.ebuild
index d382bc336382..6dd95b7345e5 100644
--- a/dev-util/ninja/ninja-1.11.0.ebuild
+++ b/dev-util/ninja/ninja-1.11.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
 else
 	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 9c9d17078c66..0ff350302189 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -10,5 +10,5 @@ DIST radare2-5.7.4.tar.gz 9814654 BLAKE2B ae8ed1d7b417236c27ee4857f7c33d657d379b
 DIST radare2-testbins-2fdb78f7f754b3aea90377588d45b774ccb41086.tar.gz 120580683 BLAKE2B ba16206f3c44f43c36fbc3079e43d29cd5b6266f8bd31602d7ec218a2b14601173c9022be9329975bd28de948933deeecc052f56c2acd9d6dfeb5576049ec32f SHA512 2c66c8f68df7c51a52a73b33e854b095a4f5435c60eab2a1456f366376aac0f7c39836699e09eae2918f31e75b7c6562994f0916f45de53ae6a480506da95dcb
 DIST radare2-testbins-a6d1a0331605b4a5db9aa9260386c850d484dc70.tar.gz 118148516 BLAKE2B 9b1a1861b4aea7db1cc364d16577a2b7afe082b0838178d307ed24704710edfa572533bab9b194d38c1b294e5a4fb522d1a93e92a1c577ca6622a16d94209bd5 SHA512 8888fab0d2295e92c4bd0ab4c2ba646951e41cc4c1f9915d501a27fbff21e82d5340d1a9255d998dcf0e209a57bb35fc714adcb31ed7adb58aa412f6202e69c6
 EBUILD radare2-5.6.8-r1.ebuild 2952 BLAKE2B 801856cabca946d58c7861c344b8641263339e55825c75ed075d08473fe31e38726780d53cc4061e503688a81ffb31b2ca5a9b13af0f2e583b0e05bc5e09c4a5 SHA512 15fe3c80c5ce99428b66a10213e2ce5e08a33fa657a89d8c5cad85dd4fe0a556c943bdb2bd69bfb21cf8257b902f43a7b8568c645b90d0d4491ce24f370d55b4
-EBUILD radare2-5.7.4.ebuild 3226 BLAKE2B ff813b6faf623c7ed7434e047fc4d4942afd51311cbb3e298e1c3923b5f7f1efb9b1d3a9d93807a5a1fb03a49014d7f9539d18a6d595071b6e17182547b4cc74 SHA512 20e23821a43a3b25d002d8050596cf15184460625934ea869cd15cf0a910e9c6a833380179f02f5f6d52a830550f2d703bd535a256e9d32a187010cdb7daf1ef
+EBUILD radare2-5.7.4.ebuild 3228 BLAKE2B 651cd352b8b8c2507f2c1952c98af40cf83affb0ecdf8e1aad7b333f6603bffbfdff0e45f94f9cc8002ae2f589696646d19450b62d10181e747e384c4944ba4c SHA512 d2541eb73826e730996ad80b5f151d03055174c53fe770a6df8e7680c672cb5f80463b6a81d918fe804fe680fe6285a4cdec5f030e3fff61875565304a18f7a5
 MISC metadata.xml 397 BLAKE2B 0da99624e778e490f84d0187d28a27b7f73a3c780fc3151619ef3196ca5c01b3758f0e07b6412b9c4f9fddb8738d5005b412d9bce6456b107e24931ba0ea5052 SHA512 02227b3d952b7dadc9f893246b7913cc7910b440ca6c54e7e0f9efcba95db711f691811a767ca1d81fba3e5c073c56b6154361df4beef7fc621fa8176fc05d47
diff --git a/dev-util/radare2/radare2-5.7.4.ebuild b/dev-util/radare2/radare2-5.7.4.ebuild
index e3053ad0136f..26de380f0f15 100644
--- a/dev-util/radare2/radare2-5.7.4.ebuild
+++ b/dev-util/radare2/radare2-5.7.4.ebuild
@@ -82,7 +82,7 @@ src_configure() {
 src_test() {
 	ln -fs "${S}/binr/radare2/radare2" "${S}/binr/radare2/r2" || die
 	LDFLAGS=""
-	for i in ${S}/libr/*; do
+	for i in "${S}"/libr/*; do
 		if [[ -d ${i} ]]; then
 			LDFLAGS+="-R${i} -L${i} "
 			LD_LIBRARY_PATH+=":${i}"
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 448b5a3fea47..8c521abd94c5 100644
Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ
diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest
index 0df490c1253f..6df9d394700f 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,10 +1,6 @@
 AUX supertuxkart-1.1-irrlicht-arch-support.patch 1520 BLAKE2B 14c6fc7615e44c5007eb5828ac7e157f69a41343d6f5affb1c6b5af5afdca4c123bd1fe238c90495c097a5eafed976f557212f1e8d89c787069473cf63218fc0 SHA512 7cdb9582248937a9a48aeb1d66cee565fe1bb3255d58ec5dcfd735ee807fa51d7fc0ba661b74156ca12b036af3aefe7cabdf386e71fef98617d24268da2d0c0e
-AUX supertuxkart-1.2-irrlicht-system-libs.patch 1706 BLAKE2B a3007cbcf9a01b44e385b9fe30183811a7cb2183ea8560b904271bd1df6ed02c827d4d02ee914691fa2fa9c39ecaf5cc2933318563c9ad0f40614adcf0298076 SHA512 b616bfe18d990f881a703c4c7a545f49d47cbf3bb42f0d4d657fa6a837667a316a48aec0bdf0e1ae803abdf536a66c6c8bbf39f9ec5c6008db7030b67337530a
-AUX supertuxkart-1.2-new-sdl.patch 5394 BLAKE2B 67893f5fb29a954205aeaff2d10029d9f98eacb9b67368a0783bf4a0c84a3d14fb7438e87b8f4925f43757782a48606957aaaea569f98a7b9c3665738fa13bf4 SHA512 e3e70f79168e8de5047d5a7fdb5c96815d8cdf19a010c0110ac90a72fa71abd811577ca80db46f08765b5bb53b77a38ef708d153eb76f7d41f627ebc46deb920
 AUX supertuxkart-1.3-irrlicht-system-libs.patch 1825 BLAKE2B fcc6fb41e44ffdf9f872f92b44ad18c492cb5a5f631be1c7a42078b459673f885c100d4dc0ea4fc2e0b6e418b63f038cc6c8f47519a20894c8549d6a08f7c493 SHA512 8b7c5b59067592a68f54c224eccc25509ee0a6c133a093a6d6b61833d8777f1687484a1481986e06ed9708c17691c1fc1b7b42ad3f17b006fa5b66161e628a4d
-DIST SuperTuxKart-1.2-src.tar.xz 614569164 BLAKE2B 5bdaa8dcac12ab6c399e6f0fc3121906070f4cd5c58dba6ccf04229d92b9b21d87a43662f39fc29ac1528ce429aebea87934fa8a180a0933385704f5a43cd6f7 SHA512 bc7079af9b3d85b3e4839ebb3eee293fb8bfe95450165172caa28b8ad1a9e97c59618d77c2208a86090f1840aa9a4b4b6898c1053fa6f5d7dfbfe17b69536835
 DIST SuperTuxKart-1.3-src.tar.xz 627753500 BLAKE2B 3ffc86edf80adb27cd17a6ba796fb14d0660a1c14ff21c7908e5f965609c6f6a6b40270a21690cd1318d1003e07d90b4180c292252b1731d4cd6292fe12e6086 SHA512 42664390c844ebca0be9b2f2aeb3c9197c0c79a7c604707b32e81ef41aec10fa36f5950f06e1540ea6f75f6c7f8a8f7f80aeda48de3d101d991420f5b20530ed
 DIST supertuxkart.png 4435 BLAKE2B b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80 SHA512 a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda
-EBUILD supertuxkart-1.2.ebuild 2195 BLAKE2B 87bc6f5bb0f2ee2dfdd1142b8bcafcdec1415e946418d1b39e0ad7532bbba4c3f2f87bc0916691945d5258e5e4303e79046e95271a727a77749dc7ff1be4e318 SHA512 f4a52a46dd92bd0882e926c23d1af3101746db017cdc515008b06470dfbf2ea9fc69b517321e3073b9e14675bcd56edad712a9f9834a10d126eee743c0011be5
 EBUILD supertuxkart-1.3.ebuild 2175 BLAKE2B 71eed85edb65a6d9b3b801d471d818b8c773c0e079b38937a31581c1f2da1d3fd91f6aad2780f6c9befe1e6e8ceaca8a2234cb42c2cebb3ef0ead96b95426283 SHA512 6a6283615eae76489e18a37e36d1cbcfad907f7005e44c4bfb20fcb9b2a2ba3a55af9a48eed66013d3ebeec33bb59eba9a849adeaa08a9086b3a874b759012c9
 MISC metadata.xml 745 BLAKE2B 6064e59ccfa2826a6cd00a72834b768e2a4de4882e341c4acc9fbb2f5b92e316a97ceee1b836c79c1cebb269add19a0d835048484a4f0d72bf9a7358c3cbae91 SHA512 66ead957f3f61f4796471cc2dd091b35caa601568ef86431658212228671a98ba515026dd576226ce18c25b49d46bc5e4a214a0a4c79533acf08709f72a61b1b
diff --git a/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch b/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch
deleted file mode 100644
index f9681733cfb1..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Subject: [PATCH] debian/use-system-libs
-
-Path to build irrlicht using the system libraries for png,zlib and
-jpeg as well as the glext family of header files.
-
-Signed-off-by: Christoph Egger <debian@christoph-egger.org
-
---- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
-+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
-@@ -35,7 +35,7 @@
- #include <GL/gl.h>
- #ifdef _IRR_OPENGL_USE_EXTPOINTER_
- #define GLX_GLXEXT_PROTOTYPES
--#include "glxext.h"
-+#include <GL/glxext.h>
- #endif
- #endif
- 
---- a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
-+++ b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
-@@ -24,7 +24,7 @@
- 	#define NO_SDL_GLEXT
- 	#include <SDL_video.h>
- 	#include <SDL_opengl.h>
--	#include "glext.h"
-+	#include <GL/glext.h>
- #elif defined(_IRR_WINDOWS_API_)
- 	// include windows headers for HWND
- 	#define WIN32_LEAN_AND_MEAN
-@@ -34,7 +34,7 @@
- 	#endif
- 	#include <GL/gl.h>
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
--		#include "glext.h"
-+		#include <GL/glext.h>
- 	#endif
- 	#include "wglext.h"
- 
-@@ -49,7 +49,7 @@
- 	#endif
- 	#include <OpenGL/gl.h>
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
--		#include "glext.h"
-+		#include <GL/glext.h>
- 	#endif
- #endif
- 
---- a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
-+++ b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
-@@ -12,7 +12,7 @@
- 	#define WIN32_LEAN_AND_MEAN
- 	#include <windows.h>
- 	#include <GL/gl.h>
--	#include "glext.h"
-+	#include <GL/glext.h>
- #else
- #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
- 	#define GL_GLEXT_LEGACY 1
-@@ -26,7 +26,7 @@
- 	#include <GL/gl.h>
- #endif
- #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
--	#include "glext.h"
-+	#include <GL/glext.h>
- #endif
- #endif
- 
diff --git a/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch b/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch
deleted file mode 100644
index 973c75d010fb..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 61833c9c26da5520f2eaa02f2458971ba07f2aad Mon Sep 17 00:00:00 2001
-From: Benau <Benau@users.noreply.github.com>
-Date: Sun, 29 Nov 2020 12:42:11 +0800
-Subject: [PATCH] Fix compilation with latest SDL
-
----
- src/input/gamepad_config.cpp | 55 ++++++++++++++++++------------------
- 1 file changed, 27 insertions(+), 28 deletions(-)
-
-diff --git a/src/input/gamepad_config.cpp b/src/input/gamepad_config.cpp
-index 7c6f632099..c060e7a5a7 100644
---- a/src/input/gamepad_config.cpp
-+++ b/src/input/gamepad_config.cpp
-@@ -32,8 +32,7 @@
- #include "input/sdl_controller.hpp"
- #include <array>
- 
--static_assert(SDL_CONTROLLER_BUTTON_MAX - 1 == SDL_CONTROLLER_BUTTON_DPAD_RIGHT, "non continous name");
--enum AxisWithDirection
-+enum AxisWithDirection : unsigned
- {
-     SDL_CONTROLLER_AXIS_LEFTX_RIGHT = SDL_CONTROLLER_BUTTON_MAX,
-     SDL_CONTROLLER_AXIS_LEFTX_LEFT,
-@@ -140,56 +139,56 @@ void GamepadConfig::setDefaultBinds ()
- core::stringw GamepadConfig::getBindingAsString(const PlayerAction action) const
- {
- #ifndef SERVER_ONLY
--    std::array<core::stringw, SDL_CONTROLLER_AXIS_WITH_DIRECTION_AND_BUTTON_MAX> readable =
-+    std::map<unsigned, core::stringw> readable =
-     {{
--        "A", // SDL_CONTROLLER_BUTTON_A
--        "B", // SDL_CONTROLLER_BUTTON_B
--        "X", // SDL_CONTROLLER_BUTTON_X
--        "Y", // SDL_CONTROLLER_BUTTON_Y
-+        { SDL_CONTROLLER_BUTTON_A, "A" },
-+        { SDL_CONTROLLER_BUTTON_B, "B" },
-+        { SDL_CONTROLLER_BUTTON_X, "X" },
-+        { SDL_CONTROLLER_BUTTON_Y, "Y" },
-         // I18N: name of buttons on gamepads
--        _("Back"), // SDL_CONTROLLER_BUTTON_BACK
-+        { SDL_CONTROLLER_BUTTON_BACK, _("Back") },
-         // I18N: name of buttons on gamepads
--        _("Guide"), // SDL_CONTROLLER_BUTTON_GUIDE
-+        { SDL_CONTROLLER_BUTTON_GUIDE, _("Guide") },
-         // I18N: name of buttons on gamepads
--        _("Start"), // SDL_CONTROLLER_BUTTON_START
-+        { SDL_CONTROLLER_BUTTON_START, _("Start") },
-         // I18N: name of buttons on gamepads
--        _("Left thumbstick press"), // SDL_CONTROLLER_BUTTON_LEFTSTICK
-+        { SDL_CONTROLLER_BUTTON_LEFTSTICK, _("Left thumbstick press") },
-         // I18N: name of buttons on gamepads
--        _("Right thumbstick press"), // SDL_CONTROLLER_BUTTON_RIGHTSTICK
-+        { SDL_CONTROLLER_BUTTON_RIGHTSTICK, _("Right thumbstick press") },
-         // I18N: name of buttons on gamepads
--        _("Left shoulder"), // SDL_CONTROLLER_BUTTON_LEFTSHOULDER
-+        { SDL_CONTROLLER_BUTTON_LEFTSHOULDER, _("Left shoulder") },
-         // I18N: name of buttons on gamepads
--        _("Right shoulder"), // SDL_CONTROLLER_BUTTON_RIGHTSHOULDER
-+        { SDL_CONTROLLER_BUTTON_RIGHTSHOULDER, _("Right shoulder") },
-         // I18N: name of buttons on gamepads
--        _("DPad up"), // SDL_CONTROLLER_BUTTON_DPAD_UP
-+        { SDL_CONTROLLER_BUTTON_DPAD_UP, _("DPad up") },
-         // I18N: name of buttons on gamepads
--        _("DPad down"), // SDL_CONTROLLER_BUTTON_DPAD_DOWN
-+        { SDL_CONTROLLER_BUTTON_DPAD_DOWN, _("DPad down") },
-         // I18N: name of buttons on gamepads
--        _("DPad left"), // SDL_CONTROLLER_BUTTON_DPAD_LEFT
-+        { SDL_CONTROLLER_BUTTON_DPAD_LEFT, _("DPad left") },
-         // I18N: name of buttons on gamepads
--        _("DPad right"), // SDL_CONTROLLER_BUTTON_DPAD_RIGHT
-+        { SDL_CONTROLLER_BUTTON_DPAD_RIGHT, _("DPad right") },
- 
-         // Below are extensions after SDL2 header SDL_CONTROLLER_BUTTON_MAX
-         // I18N: name of buttons on gamepads
--        _("Left thumbstick right"), // SDL_CONTROLLER_AXIS_LEFTX_RIGHT
-+        { SDL_CONTROLLER_AXIS_LEFTX_RIGHT, _("Left thumbstick right") },
-         // I18N: name of buttons on gamepads
--        _("Left thumbstick left"), // SDL_CONTROLLER_AXIS_LEFTX_LEFT
-+        { SDL_CONTROLLER_AXIS_LEFTX_LEFT, _("Left thumbstick left") },
-         // I18N: name of buttons on gamepads
--        _("Left thumbstick down"), // SDL_CONTROLLER_AXIS_LEFTY_DOWN
-+        { SDL_CONTROLLER_AXIS_LEFTY_DOWN, _("Left thumbstick down") },
-         // I18N: name of buttons on gamepads
--        _("Left thumbstick up"), // SDL_CONTROLLER_AXIS_LEFTY_UP
-+        { SDL_CONTROLLER_AXIS_LEFTY_UP, _("Left thumbstick up") },
-         // I18N: name of buttons on gamepads
--        _("Right thumbstick right"), // SDL_CONTROLLER_AXIS_RIGHTX_RIGHT
-+        { SDL_CONTROLLER_AXIS_RIGHTX_RIGHT, _("Right thumbstick right") },
-         // I18N: name of buttons on gamepads
--        _("Right thumbstick left"), // SDL_CONTROLLER_AXIS_RIGHTX_LEFT
-+        { SDL_CONTROLLER_AXIS_RIGHTX_LEFT, _("Right thumbstick left") },
-         // I18N: name of buttons on gamepads
--        _("Right thumbstick down"), // SDL_CONTROLLER_AXIS_RIGHTY_DOWN
-+        { SDL_CONTROLLER_AXIS_RIGHTY_DOWN, _("Right thumbstick down") },
-         // I18N: name of buttons on gamepads
--        _("Right thumbstick up"), // SDL_CONTROLLER_AXIS_RIGHTY_UP
-+        { SDL_CONTROLLER_AXIS_RIGHTY_UP, _("Right thumbstick up") },
-         // I18N: name of buttons on gamepads
--        _("Left trigger"), // SDL_CONTROLLER_AXIS_TRIGGERLEFT_UP
-+        { SDL_CONTROLLER_AXIS_TRIGGERLEFT_UP, _("Left trigger") },
-         // I18N: name of buttons on gamepads
--        _("Right trigger") // SDL_CONTROLLER_AXIS_TRIGGERRIGHT_UP
-+        { SDL_CONTROLLER_AXIS_TRIGGERRIGHT_UP, _("Right trigger") }
-     }};
- 
-     const Binding &b = getBinding(action);
diff --git a/games-action/supertuxkart/supertuxkart-1.2.ebuild b/games-action/supertuxkart/supertuxkart-1.2.ebuild
deleted file mode 100644
index ef10342df4ea..000000000000
--- a/games-action/supertuxkart/supertuxkart-1.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg
-
-MY_P="SuperTuxKart-${PV}-src"
-DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
-HOMEPAGE="https://supertuxkart.net/"
-SRC_URI="https://github.com/${PN}/stk-code/releases/download/${PV}/${MY_P}.tar.xz
-	mirror://gentoo/${PN}.png"
-
-LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="debug nettle recorder sqlite wiimote"
-
-# don't unbundle irrlicht and bullet
-# both are modified and system versions will break the game
-# https://sourceforge.net/p/irrlicht/feature-requests/138/
-
-RDEPEND="
-	dev-cpp/libmcpp
-	sqlite? ( dev-db/sqlite:3 )
-	dev-libs/angelscript:=
-	media-libs/freetype:2
-	media-libs/glew:0=
-	media-libs/harfbuzz:=
-	media-libs/libpng:0=
-	media-libs/libsdl2[opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	net-libs/enet:1.3=
-	net-misc/curl
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/libintl
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXxf86vm
-	nettle? ( dev-libs/nettle:= )
-	!nettle? (
-		>=dev-libs/openssl-1.0.1d:0=
-	)
-	recorder? ( media-libs/libopenglrecorder )
-	wiimote? ( net-wireless/bluez )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1-irrlicht-arch-support.patch
-	"${FILESDIR}"/${PN}-1.2-irrlicht-system-libs.patch
-	"${FILESDIR}"/${P}-new-sdl.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SQLITE3=$(usex sqlite)
-		-DUSE_SYSTEM_ANGELSCRIPT=ON
-		-DUSE_SYSTEM_ENET=ON
-		-DUSE_SYSTEM_GLEW=ON
-		-DUSE_SYSTEM_SQUISH=OFF
-		-DUSE_SYSTEM_WIIUSE=OFF
-		-DUSE_IPV6=OFF # not supported by system enet
-		-DOpenGL_GL_PREFERENCE=GLVND
-		-DUSE_CRYPTO_OPENSSL=$(usex nettle no yes)
-		-DBUILD_RECORDER=$(usex recorder)
-		-DUSE_WIIUSE=$(usex wiimote)
-		-DSTK_INSTALL_BINARY_DIR=bin
-		-DSTK_INSTALL_DATA_DIR=share/${PN}
-		-DBUILD_SHARED_LIBS=OFF # build bundled libsquish as static library
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	dodoc CHANGELOG.md
-
-	doicon -s 64 "${DISTDIR}"/${PN}.png
-}
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 153b7fbbb38c..35a7d73a7ffe 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/emutos/Manifest b/games-emulation/emutos/Manifest
index 84106ca10842..3dc1c11f6f88 100644
--- a/games-emulation/emutos/Manifest
+++ b/games-emulation/emutos/Manifest
@@ -1,13 +1,7 @@
-DIST emutos-1024k-1.1.1.zip 342557 BLAKE2B eff915f0c531296c1c68a73bd96ef9a8b27195c4fdcd957df75b48806cf77ae8483a6a4d7a105cd5a609cb3412754d8de221b20ddf5cde9371a4a89183aa5270 SHA512 76d108a7d0e501552ec49ae14a7d00a334c9f262d0d5fd9d6eb12837e2bd54ec652679c3368bdb4c38560b7621483a44fb386562aa6727235ae8a3c4af07930f
 DIST emutos-1024k-1.2.zip 349307 BLAKE2B cc856a44eeea347b578ae0b2a05a0dfd0ac27c65c434ee87d3688d4f5a9ef999fd75d765b9ab224c7e386ab10ce78e40cac717159a4fffab3ebfb7df9e3590ff SHA512 656ef5abd9e0ef867045151c3178f4ccfe8e5ab49657ccd62072651485a81c5b384c826a254832d4be71eb81b14ddd55b24922428aaf6f6b3aef3e87582fb23a
-DIST emutos-192k-1.1.1.zip 2025455 BLAKE2B 9806be9d886653215d5553d2a908374da69a6982a2ec71ad04d2293c6fa2e4e5ccd651d95b78b4d58cbed45d9bf3ce9d8fc49b9409cb364f3120fb520cc2cfdf SHA512 7ec7ad52aa92553b2b0e61d88aac408ddf3c06d64f50854a02f7b44be99afecf9139906880641bba6bf17e431058c0afa11aae0a23479256c26713b87ec122e4
 DIST emutos-192k-1.2.zip 2021484 BLAKE2B f1ba0cde2000e0a0e0d48127a805c10396d2cc68f0209b4fc7fc34e3f5289f1dee451588cfde225c124386f961f17893c06ddfe7fc494169a4e17fab1d61d02f SHA512 2da55d3855e955e18ba00c0684907a0827a8928f1bddcb09d412b40e2baa560a0701880538007601deaec061bc221693f961bfa2992adb7112cc12104cb4be31
-DIST emutos-256k-1.1.1.zip 2570117 BLAKE2B e5646dea14b8608db1cb49f1d51d21971c36b664f013f2146848b78d9b0b4260029507c2a5e66fba473b4263a673ac59bb40e0ebdf864cdd3efbfc68ecec485a SHA512 62e3dff01733e04a76e669e88268a80423811b579ecd2f9f9d2bb59b9cbe649af0838d4e1cc930a2ba8095f624d374add79dbe3f98f6589bc2b50dece14cec27
 DIST emutos-256k-1.2.zip 2573209 BLAKE2B a26a9099b0afd07ff200982f63fdc4c8a6a8559b850392618886b30be9c84ed985edce789eca76d6e3c66cc5919c754aef8784e30bb600a9b24b4948ca71dc44 SHA512 d476f8cf125accd0a3cde9761d3bf08af26ff88e6f1b7631e903dc777c59d74786fb2e74441db3373d9d01a7573a892d68b243f23774ae156d6598ada55c948c
-DIST emutos-512k-1.1.1.zip 3117851 BLAKE2B 5a691e6b63ae5afb4e9f374580791d8e44feb75244ca287c9de19cd011224bfafb3041321b0f288b2add77d93402a958ac881a8a5200f49df4c81c062745b5ae SHA512 d5dd01e9470844b5c7b87231f021b3c50817517a7dc20f4b96cac51b318a7961dbff8df1534c7e89797f38aa8515c836feb1be4df5f7d0cf09f077d0ea57035a
 DIST emutos-512k-1.2.zip 3193629 BLAKE2B 77fdbf13e039f170b7bb1fe017ec8d4eb3216a6e9b6d528f4680c63e08e596700adbc7c0d9e78e0edcbf9cfbf7d6eefb1387198752871d0c9eb9005d09e09264 SHA512 76dbd9b9805f2ef747efee44b87755c4a519b890e211c6ca26df169ae3fa4562aa1c5dc53d9938ad72e632f33e516826c09b1101b7cf35255ed89b902e1c7cf1
-DIST emutos-aranym-1.1.1.zip 295671 BLAKE2B a4e1b34d851c7a410253ed41fd3b783e1f23d0859eb07cef529dd9f003cc2df77caa0ac0cfab0a80c4ab9421013ba6d6fe38ba849e95e23c4565f25d095d9ca1 SHA512 a4aa1f084e5baca9809f86d216bc45d178822ebe7af1f507ffe243f9e2b217bd3a0ef8b290ade5a5dc54b92991937a2a906fdcf9b1bf890e0f2ee0410d835b85
 DIST emutos-aranym-1.2.zip 301209 BLAKE2B caecd86ea97a6e79d036dd4aabe6adc4749c3f339b7b888086547d658deb94fe2ef1702664a36f3c0fa4a405bedb4a6ec5a019a8f79c3896bc99abc26a06010d SHA512 2bebf3a54f1e874edd473fb97694a16784b04fcc8a707e0540362597d31acf2d6558560968d83ea2691426f44bf1e8fab9920770715bb5d4399d480947676304
-EBUILD emutos-1.1.1.ebuild 1335 BLAKE2B 6b70386dbc0556f6574cf0e02a0bbd0866a588768336ef445f143388ad747f93ceab0a884d463105b994a11d4b8ba5764d3fbe45e5eeb83ebce86a4af3fb3cea SHA512 7df020e2b4ee9647fbd5c237d8d7ade2c0d1fc8570270d1a7ec3ef0ddaf7151cf02ad9e343d1c4faeb2f0c6c7c74dfd9f76027fe68ccbdef73014639ffa7b6bc
 EBUILD emutos-1.2.ebuild 1327 BLAKE2B bba205b21cc546f83f8aae676dd72dfdade656bc30d2422c10b6e11f8714774e53a6878a6bfbd10f20ced54ce027df57b504dd4f5fd5e5328f59322d9b83ef61 SHA512 1c537e38fb75a243f30074e9094b6eaa20c3743c60d0acc422fe0b05f2dffb01af15be3664a7df0fccf89af2ac75e3c46877181acfcf003ca6bd5828b4f1e68d
 MISC metadata.xml 354 BLAKE2B 7d7fb28750a0b529ff40ee9ea32b4f09f2767df55b00d2c0580ad4703deadbbd0b6d735dabb7925739aa20e76b063bff99c8eb41cc4fe78c4232d2c51bf07c4a SHA512 7789f7a0c78aa0215ccea79fc13f136e40eb4ff9857ccd13c328afdc52ac7fee224fabf74dad91cfde336edcb58456182c159893ce8c53c3f1b160fe3db1395b
diff --git a/games-emulation/emutos/emutos-1.1.1.ebuild b/games-emulation/emutos/emutos-1.1.1.ebuild
deleted file mode 100644
index 5ba57a1f38b9..000000000000
--- a/games-emulation/emutos/emutos-1.1.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_L10N=( cs:cz de es fi fr el:gr hu it nl no pl ru sv:se de-CH:sg tr en-GB:uk en:us )
-MY_VERS=( 192k 256k 512k 1024k:etos aranym:emutos- )
-
-DESCRIPTION="Single-user single-tasking operating system for 32-bit Atari computer emulators"
-HOMEPAGE="http://emutos.sourceforge.net"
-SRC_URI="$(printf "mirror://sourceforge/emutos/${PN}-%s-${PV}.zip " "${MY_VERS[@]%:*}")"
-S="${WORKDIR}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="$(printf 'l10n_%s ' "${MY_L10N[@]%:*}")"
-
-BDEPEND="app-arch/unzip"
-
-src_install() {
-	local e list=()
-	for e in "${MY_L10N[@]}"; do
-		use l10n_${e%:*} && list+=( ${e#*:}.img )
-	done
-	(( ${#list[@]} )) || list=( us.img )
-
-	insinto /usr/share/${PN}
-	for e in "${MY_VERS[@]}"; do
-		if [[ ${e} =~ : ]]; then
-			doins ${PN}-${e%:*}-${PV}/${e#*:}${e%:*}.img # multilanguage
-		else
-			doins "${list[@]/#/${PN}-${e}-${PV}/etos${e%k}}" # single
-		fi
-		newdoc ${PN}-${e%:*}-${PV}/readme.txt readme-${e%:*}.txt
-	done
-
-	# These are identical for each, only need once.
-	dodoc ${PN}-${MY_VERS[0]}-${PV}/doc/{announce,authors,bugs,changelog,emudesk,incompatible,status,todo,xhdi}.txt
-
-	# Debug symbols usable by games-emulation/hatari (only provided with 1024k)
-	doins ${PN}-1024k-${PV}/etos1024k.sym
-}
diff --git a/games-emulation/openmsx/Manifest b/games-emulation/openmsx/Manifest
index 115feb36c2ff..2beb264bb7e4 100644
--- a/games-emulation/openmsx/Manifest
+++ b/games-emulation/openmsx/Manifest
@@ -1,5 +1,3 @@
-DIST openmsx-17.0.tar.gz 4045461 BLAKE2B 46c70ce3f853aecebf8bdeddc5786903634d88d013497383490d79b0dbf455f48a70b3658b9913db197cf7e66cbc6f4da37da58b1b24d77c75b731e842c663df SHA512 4fc87efd2bfbcd12bebb4e005b18b1cb2048f5d8f3188ef9b55f1e003c8d021fb47bd67d647137daa6a8640b5656b0db363f3b62158d690ddb5f7bf1af3459e1
 DIST openmsx-18.0.tar.gz 4151084 BLAKE2B 0d5b4e4745c12689e4227408481367b4b4faaa4c7c2830ec0c4b9a5eb90c4b415628cd21834384d39fa4a820c725431848e98f7ef722c437f7bb4f96ae7b14c4 SHA512 f395fae8eac3bcb9334251c1c266a8c4d2951d6510a7c4885ddbc95aaed39f4ef8ae12a177d4a9ff44745ca368055f55f9983029b47441f4fd9731696f79809f
-EBUILD openmsx-17.0.ebuild 2882 BLAKE2B 2aa8a567b5080dd487b9c7c69138df9acf2e3523fe57a57d5cfa74a7659028d1d8eba3aaa04696f941865c8878f175b8bc8249dda1dc5884b61a959c6dc12834 SHA512 4ce326368598aa63b83eb8da63f6f4f5250f4b8c5ba2bc078e4c2fbaaa26a14b9b261885e729c1f16d152fb66ec37c9a4fc36e5200acbde404c9659e824aa896
 EBUILD openmsx-18.0-r1.ebuild 2904 BLAKE2B 127580092641849cb6c0c06dff3c5e4f440f8b0ce23cf4129ed9eb57dd0d1f9540530df69d7d8f62bb44dfa287514175c9d69894e0243e2d48201b6c422f9e0c SHA512 a93334f586608e408e5867eed271a80708f94d356afa0559c606881ef689326af2d9d81bf7f857f95dac097e22a2cb40f98b19fec9dbe8d43e1f8b8825b1d39a
 MISC metadata.xml 442 BLAKE2B 579f3b84332385ce6f79c1f927bb3d4b1b112954695bd30425849946ec3994158a855fc9dbff8407775ad532a105e518ba30b4e72f3e42d3b64e2cadffaa9220 SHA512 a24a4c4cef293439f8ea46ad1261507160ea5024cbc53947915e6306a1356d5682440fa1eb230a98e715214c53024fa7ffe4aa97f1bb3f385c66c1ee69b8323f
diff --git a/games-emulation/openmsx/openmsx-17.0.ebuild b/games-emulation/openmsx/openmsx-17.0.ebuild
deleted file mode 100644
index e64f1d8a6d6c..000000000000
--- a/games-emulation/openmsx/openmsx-17.0.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit desktop flag-o-matic python-any-r1 readme.gentoo-r1 toolchain-funcs xdg
-
-DESCRIPTION="MSX emulator that aims for perfection"
-HOMEPAGE="https://openmsx.org/"
-SRC_URI="https://github.com/openMSX/openMSX/releases/download/RELEASE_${PV//./_}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+joystick"
-
-RDEPEND="dev-lang/tcl:0=
-	media-libs/alsa-lib
-	media-libs/libogg
-	media-libs/libpng:0=
-	media-libs/libsdl2[joystick=,sound,video]
-	media-libs/libtheora
-	media-libs/libvorbis
-	media-libs/sdl2-ttf
-	>=media-libs/glew-1.3.2:0=
-	sys-libs/zlib
-	virtual/opengl"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-DOC_CONTENTS="
-If you want to if you want to emulate real MSX systems and not
-only the free C-BIOS machines, put the system ROMs in one of
-the following directories: /usr/share/${PN}/systemroms
-or ~/.openMSX/share/systemroms
-"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/^LDFLAGS:=/d' \
-		-e '/LINK_FLAGS_PREFIX/d' \
-		-e '/LINK_FLAGS+=/s/-s//' \
-		-e '/LINK_FLAGS+=\$(TARGET_FLAGS)/s/$/ $(LDFLAGS)/' \
-		build/main.mk \
-		|| die
-	sed -i -e '/SYMLINK/s:true:false:' build/custom.mk || die
-	sed -i -e 's/GPL.txt//' doc/node.mk || die
-
-	# Build system only configured to use bundled version - but not from the
-	# directory it's distributed in
-	cp "${S}/Contrib/catch2/catch.hpp" "${S}/src/unittest" || die
-}
-
-src_configure() {
-	tc-export CXX
-
-	# Doesn't compile without this, and build system doesn't consistently add
-	# it properly for all compilers
-	append-cxxflags '-std=c++17'
-
-	default
-}
-
-src_compile() {
-	emake \
-		CXXFLAGS="${CXXFLAGS}" \
-		INSTALL_SHARE_DIR="${EPREFIX}/usr/share/${PN}" \
-		V=1
-}
-
-src_test() {
-	# To get tests, we need to build with OPENMSX_FLAVOUR=unittest and then the
-	# build is stored in a directory of the pattern
-	# ${WORKDIR}/derived/*-unittest/. This is separate from the actual build,
-	# stored in ${WORKDIR}/derived/*-opt. The unittest binary and the workdir
-	# binary are in each of these directories under their `bin` directories.
-	emake \
-		V=1 \
-		CXXFLAGS="${CXXFLAGS}" \
-		OPENMSX_FLAVOUR=unittest
-
-	# There will only ever be one *-unittest directory
-	"${S}"/derived/*-unittest/bin/openmsx || die
-}
-
-src_install() {
-	# To guarantee installing the proper binary in case tests were built,
-	# specify the default OPENMSX_FLAVOUR
-	emake \
-		V=1 \
-		INSTALL_BINARY_DIR="${ED}/usr/bin" \
-		INSTALL_SHARE_DIR="${ED}/usr/share/${PN}" \
-		INSTALL_DOC_DIR="${ED}/usr/share/doc/${PF}" \
-		OPENMSX_FLAVOUR=opt \
-		install
-
-	einstalldocs
-	readme.gentoo_create_doc
-
-	for i in 16 32 48 64 128 256 ; do
-		newicon -s "${i}" "share/icons/openMSX-logo-${i}.png" "${PN}.png"
-	done
-	make_desktop_entry "${PN}" "openMSX"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	xdg_pkg_postinst
-}
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index e4c2b2c2c037..3b4f8b0c16ed 100644
Binary files a/games-engines/Manifest.gz and b/games-engines/Manifest.gz differ
diff --git a/games-engines/stratagus/Manifest b/games-engines/stratagus/Manifest
index 6ed8854a969d..8404c38f94ec 100644
--- a/games-engines/stratagus/Manifest
+++ b/games-engines/stratagus/Manifest
@@ -2,7 +2,9 @@ AUX stratagus-2.3.0-doc.patch 378 BLAKE2B 673afcbcf6131a49d03b683db2b430795b3022
 DIST stratagus-3.2.0.tar.gz 1537172 BLAKE2B cd0ce92a1532cdf57245f6ef234ee1f55418f28f06bb34f358bd623b1e83d21b9a04cfa86e8129931043e480de5a9de0ef6458b75dcb2f8c40c3457d4ef31eef SHA512 7a1b4f99fa3a080905b976439435c62fa885c0895f3f9f7692404a207822520d6b71189f24627c31bec192503d6504bf98485cce393036950f6bac0a49cb17dc
 DIST stratagus-3.3.0.tar.gz 1582643 BLAKE2B 7307ac59dc4ff112f0be8f85165eb14e61b83cbd7fa2e1a58599e1422b025c42cb2527bbb08d3231a45b07b116712f020605b6ec0f79d3696acda8577e3c1e24 SHA512 9510bd85f8dff284d912b68e377041345cf141af32f98298cbd712f932cff88cbf91733f97396b1d0e9671eafddc36897383bc3f39c1497a65d270432dab0876
 DIST stratagus-3.3.1.tar.gz 1582605 BLAKE2B 375769346276c034efdef5fcb7282b89a33fd26266c1d8d56b78dfe33ad301ad85c113eedc7f23c79182da225bf6a4dc07704113f118e35e78db2502d291f466 SHA512 7ee3d31db6f30d1e927a87dd788c035b5cf69b44c914556412d18eb66bdfa252bd905bc341a3fd4c5100466b30e216a05fb678ecde690945a7fe0b1992c6b4f4
+DIST stratagus-3.3.2.tar.gz 1582937 BLAKE2B c39a9f009693c8c6dc7e62b885851a707a25c039b66765ce42dbd851643650b287bd45d0c0ea6fb03a2ddde01a41bf156a1d018ad4f06e0d39e9435a24c79672 SHA512 0e5d0127ba4e1025ceb7f46c91d90b82dc7c1b194030738abf95bd2c9cadc04d7431f333a514fc6d6b300ea3a1f5c7405bea735471f72fa547031634a23b01d1
 EBUILD stratagus-3.2.0.ebuild 1565 BLAKE2B 8e3342dd6cd442acb685693f7baf2dfa21b5d499fcef264c37ee753e2c8da6a1d3481fc3d5f229b9498b7545408ceffd62d2aac8b043b902b73700f21e77d304 SHA512 28bff87b1b29f291a7d29e16382acdc49b7b1a12102c363e8ae79a3125d5c7db459602f3ccbde6f690db5e3ae14373798840ceafa5291ddc165c0fa4482ebee8
 EBUILD stratagus-3.3.0.ebuild 1597 BLAKE2B b5c68b817b23a806caea730752784ea2338188fdb6fb7c28691ee5194c65e9e6f5e50e57acd62957bfa358b6c80945e65770e1cfbb64efd1bddb27f7bbe84f44 SHA512 d7675400fde63a32813e53d077a123307895f5b99a9c71ad3b2f0f35e101202a3733cf0d4d6f75f9aa14381afb38fd106a5b154d1681e2f98c383b102f807c78
 EBUILD stratagus-3.3.1.ebuild 1597 BLAKE2B b5c68b817b23a806caea730752784ea2338188fdb6fb7c28691ee5194c65e9e6f5e50e57acd62957bfa358b6c80945e65770e1cfbb64efd1bddb27f7bbe84f44 SHA512 d7675400fde63a32813e53d077a123307895f5b99a9c71ad3b2f0f35e101202a3733cf0d4d6f75f9aa14381afb38fd106a5b154d1681e2f98c383b102f807c78
+EBUILD stratagus-3.3.2.ebuild 1597 BLAKE2B b5c68b817b23a806caea730752784ea2338188fdb6fb7c28691ee5194c65e9e6f5e50e57acd62957bfa358b6c80945e65770e1cfbb64efd1bddb27f7bbe84f44 SHA512 d7675400fde63a32813e53d077a123307895f5b99a9c71ad3b2f0f35e101202a3733cf0d4d6f75f9aa14381afb38fd106a5b154d1681e2f98c383b102f807c78
 MISC metadata.xml 443 BLAKE2B e38b590d6ffb78fec164e08102dd69c0b1a178754706996c54439505d1ce4d313f5b8fc5e74b119112873cf1dda99c5b4bfae8868af2f5a3516c76a716d31b38 SHA512 5a09ce0416094c63b546b4cd1fbb683574fc1f5b21d9176a8de08d32b5054cfccf712a99716fa7d4d26d3cddf6a08030cb6892ffc8bf05e632a18319ea41ca3f
diff --git a/games-engines/stratagus/stratagus-3.3.2.ebuild b/games-engines/stratagus/stratagus-3.3.2.ebuild
new file mode 100644
index 000000000000..c6eac6df2815
--- /dev/null
+++ b/games-engines/stratagus/stratagus-3.3.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 )
+inherit cmake lua-single optfeature
+
+DESCRIPTION="A realtime strategy game engine"
+HOMEPAGE="
+	https://stratagus.com/stratagus.html
+	https://github.com/Wargus/stratagus/
+"
+SRC_URI="
+	https://github.com/Wargus/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 debug doc mng theora vorbis"
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	theora? ( vorbis )
+"
+
+DEPEND="
+	${LUA_DEPS}
+	dev-db/sqlite:3
+	dev-lua/toluapp[${LUA_SINGLE_USEDEP}]
+	media-libs/libpng:0
+	x11-libs/libX11
+	media-libs/libsdl2[sound,opengl,video]
+	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-image[png]
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	mng? ( media-libs/libmng )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		theora? ( media-libs/libtheora )
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-2.3.0-doc.patch
+)
+
+src_prepare() {
+	sed -i -e 's:-Werror::' CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	# there are in-source switches
+	use debug && CMAKE_BUILD_TYPE=Debug
+
+	local mycmakeargs=(
+		-DGAMEDIR="${EPREFIX}/usr/bin"
+		-DDOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DWITH_BZIP2=$(usex bzip2)
+		-DWITH_MNG=$(usex mng)
+		-DWITH_OGGVORBIS=$(usex vorbis)
+		-DWITH_THEORA=$(usex theora)
+		-DENABLE_DOC=$(usex doc)
+		-DENABLE_DEV=ON
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "MIDI music support" "media-libs/sdl2-mixer[midi]"
+}
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 5c3a8e79308f..c98e19a64265 100644
Binary files a/games-fps/Manifest.gz and b/games-fps/Manifest.gz differ
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 25074c100952..899a0afd6f60 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -10,8 +10,6 @@ DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c
 DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997680ff7550973ed9741e62e78f9a099c1a13f65eaa133076d6551fcdfbf34e28ff59f2ad59f91ece98753e7d39523 SHA512 4b55dcc192cb2aa8830250fd222664272176bea8f6c6e4ac6d488abfecb1332b5793986c164fde78901904e2bde37e6ee4aa020c5eb578002de8f6102f44df15
 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
 DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
-DIST eduke32_src_20220422-10033-3927367ba.tar.xz 20777836 BLAKE2B 7c62a831c8daa5ba2f30e4dd80261aad87cb808eca28d0036f116c537de4d14b3fc2ca6fd325379aca21e7a2a6ab01dccce16907e108d932d5d62e3e0228aca5 SHA512 aac039500e9babc85d50d616868abff145ea145b3f53e9512c905acc084e9a193a7e0bbbd18c9976ad8ad306deccf6e23a66686edb06970b4b943a31938f0229
 DIST eduke32_src_20220702-10113-e27a7b621.tar.xz 20787584 BLAKE2B 977dddf96f54fd2e30de148de16e62a27b736acdb0d17e1d4fef7991b601c141c1242257bb7bed25d50baba4dff04aa3bdc060d4f83ba98fd724342de588c0dc SHA512 fe9ff5444934a4a0c10db9723a3ef317ac7aab55ccbdaf62ffabbd557e91537b92127d16231afff3a4bd9baadae559ff8cd8c3f2d02909a0d8267352fcac01fa
-EBUILD eduke32-20220422.10033.ebuild 5795 BLAKE2B dc357d150bba70b8f67f998dcf6575a734615f04bca237076088f28c2e5f1e89a85d3b20233b413c14499223c72271d305f725a3462d53c955f7905cd61a8ec5 SHA512 9f2412279dad254e49a4282930b908c54a814abf60ae4a475994ea470948a22229a1e9ed40b9df3aad620e2aa68d5d7b9d439610e0c53d10a3e4acfcb09722a1
 EBUILD eduke32-20220702.10113.ebuild 5795 BLAKE2B 65c046a5702fb5e550e7e8b4ad0ac2e51140402f8e4c7a22450beac669f82a50b872e8899473fb17a7a2f72223605823dfe8d01c61fa53205500ac4d2b454951 SHA512 9971dd791f7c841e877d4c70ce54c2880c01bfeea391dd78850f1f4e933985b5aa0e566955c3bbc95d13d1713ab6764fd1d84daa30cd728bd77eb99dff3c0251
 MISC metadata.xml 1696 BLAKE2B 76d8cb27f0b64251519778ed51c1497807772d552eef3972312b8971e606087f4d44e4fda17499fea766233c1b7aa25ccf1467e76cc74bf1aee58d8cd21f158c SHA512 46dbbacbdcc05ef6907431f8d6bf1385af78c2d717653026ae565a26db2d0c8f05f242aaa78f4b14791c16c40862dc2e4d9a02892f650e222ee8fb4222603a8d
diff --git a/games-fps/eduke32/eduke32-20220422.10033.ebuild b/games-fps/eduke32/eduke32-20220422.10033.ebuild
deleted file mode 100644
index e3608e25cc4c..000000000000
--- a/games-fps/eduke32/eduke32-20220422.10033.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop toolchain-funcs xdg-utils
-
-EGIT_COMMIT="3927367ba"
-MY_BUILD="$(ver_cut 2)"
-MY_DATE="$(ver_cut 1)"
-MY_PV_HRP="5.4"
-MY_PV_OFFENSIVE_XXX="1.33"
-MY_PV_OPL="2.01"
-MY_PV_PSX="1.11"
-MY_PV_SC55="4.02"
-MY_PV_VOXELS="1.21"
-
-DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D"
-HOMEPAGE="http://www.eduke32.com/"
-SRC_URI="
-	http://dukeworld.com/eduke32/synthesis/${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}/${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
-	https://www.eduke32.com/images/eduke32_classic.png
-	hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-${MY_PV_HRP}.zip )
-	offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip )
-	opl? ( https://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-${MY_PV_OPL}.zip )
-	psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-${MY_PV_PSX}.zip )
-	sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-${MY_PV_SC55}.zip )
-	voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-${MY_PV_VOXELS}.zip )
-"
-S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}"
-
-LICENSE="BUILDLIC GPL-2 HRP"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="duke3d fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools voidsw voxels vpx xmp"
-REQUIRED_USE="
-	hrp? ( duke3d !voxels )
-	offensive? ( duke3d )
-	opl? ( duke3d !sc-55 )
-	psx? ( duke3d )
-	sc-55? ( duke3d !opl )
-	voxels? ( !hrp )
-	vpx? ( opengl )
-"
-
-# There are no tests,
-# instead it tries to build a test game, which does not compile
-RESTRICT="bindist test"
-
-RDEPEND="
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libsdl2[alsa,joystick,opengl?,sound,video]
-	media-libs/libvorbis
-	media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis]
-	sys-libs/zlib
-	gtk? ( x11-libs/gtk+:2 )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	png? ( media-libs/libpng:0= )
-	vpx? ( media-libs/libvpx:= )
-	xmp? ( media-libs/exempi:2= )
-"
-
-DEPEND="
-	${RDEPEND}
-	timidity? ( media-sound/timidity++ )
-"
-
-BDEPEND="
-	app-arch/unzip
-	x86? ( dev-lang/nasm )
-"
-
-PDEPEND="duke3d? ( games-fps/duke3d-data )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20190820.8043-search-duke3d-path.patch"
-	"${FILESDIR}/${PN}-20200505.8904-gcc10.patch"
-	"${FILESDIR}/${PN}-20220204.9957-log-to-tmpdir.patch"
-)
-
-src_unpack() {
-	# Extract only the eduke32 archive
-	unpack ${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
-
-	# Unpack only the documentation
-	if use hrp; then
-		unzip -q "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip hrp_readme.txt hrp_todo.txt || die
-	fi
-	if use offensive; then
-		unzip -q "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip xxx_readme.txt || die
-	fi
-	if use opl; then
-		unzip -q "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip readme.txt || die
-		mv readme.txt opl_readme.txt || die
-	fi
-	if use sc-55; then
-		unzip -q "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip readme/music_readme.txt || die
-	fi
-	if use voxels; then
-		unzip -q "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip voxelpack_readme.txt || die
-	fi
-}
-
-src_compile() {
-	local myemakeopts=(
-		ALLOCACHE_AS_MALLOC=0
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		CLANG=0
-		CPLUSPLUS=1
-		CUSTOMOPT=""
-		DEBUGANYWAY=0
-		F_JUMP_TABLES=""
-		FORCEDEBUG=0
-		HAVE_FLAC=1
-		HAVE_GTK2=$(usex gtk 1 0)
-		HAVE_XMP=$(usex xmp 1 0)
-		LINKED_GTK=$(usex gtk 1 0)
-		LTO=1
-		LUNATIC=0
-		KRANDDEBUG=0
-		MEMMAP=0
-		MIXERTYPE=SDL
-		NETCODE=$(usex server 1 0)
-		NOASM=0
-		OPTLEVEL=0
-		OPTOPT=""
-		PACKAGE_REPOSITORY=1
-		POLYMER=$(usex opengl 1 0)
-		PRETTY_OUTPUT=0
-		PROFILER=0
-		RELEASE=1
-		RENDERTYPE=SDL
-		SDL_TARGET=2
-		SIMPLE_MENU=0
-		STRIP=""
-		TANDALONE=0
-		STARTUP_WINDOW=$(usex gtk 1 0)
-		USE_OPENGL=$(usex opengl 1 0)
-		USE_LIBVPX=$(usex vpx 1 0)
-		USE_LIBPNG=$(usex png 1 0)
-		USE_LUAJIT_2_1=0
-		WITHOUT_GTK=$(usex gtk 0 1)
-	)
-
-	emake "${myemakeopts[@]}"
-
-	use tools && emake utils "${myemakeopts[@]}"
-	use voidsw && emake sw "${myemakeopts[@]}"
-}
-
-src_install() {
-	dobin eduke32 mapster32 "${FILESDIR}"/eduke32-bin
-	use voidsw && dobin voidsw "${FILESDIR}"/voidsw-bin
-
-	if use tools; then
-		local tools=(
-			arttool
-			bsuite
-			cacheinfo
-			generateicon
-			givedepth
-			ivfrate
-			kextract
-			kgroup
-			kmd2tool
-			makesdlkeytrans
-			map2stl
-			md2tool
-			mkpalette
-			transpal
-			unpackssi
-			wad2art
-			wad2map
-		)
-
-		dobin "${tools[@]}"
-	fi
-
-	keepdir /usr/share/games/eduke32
-	insinto /usr/share/games/eduke32
-
-	use hrp && doins "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip
-	use offensive && doins "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip
-	use opl && doins "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip
-	use psx && doins "${DISTDIR}"/duke3d_psx-${MY_PV_PSX}.zip
-	use sc-55 && doins "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip
-	use sdk && doins -r package/sdk
-	use voxels && doins "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip
-
-	newicon "${DISTDIR}"/eduke32_classic.png eduke32.png
-
-	make_desktop_entry eduke32-bin EDuke32 eduke32 Game
-	make_desktop_entry mapster32 Mapster32 eduke32 Game
-	use voidsw && make_desktop_entry voidsw-bin VoidSW voidsw Game
-
-	local DOCS=( package/sdk/samples/*.txt source/build/doc/*.txt )
-	use hrp && DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt )
-	use offensive && DOCS+=( "${WORKDIR}"/xxx_readme.txt )
-	use opl && DOCS+=( "${WORKDIR}"/opl_readme.txt )
-	use sc-55 && DOCS+=( "${WORKDIR}"/readme/music_readme.txt )
-	use voxels && DOCS+=( "${WORKDIR}"/voxelpack_readme.txt )
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-fps/prboom-plus/Manifest b/games-fps/prboom-plus/Manifest
index 68376fbb5613..62667965a76f 100644
--- a/games-fps/prboom-plus/Manifest
+++ b/games-fps/prboom-plus/Manifest
@@ -1,7 +1,4 @@
-AUX prboom-plus-2.6.1-Guard-OpenGL-call-in-D_Display-with-GL_DOOM.patch 739 BLAKE2B 308d840db294e39fe3d0460f2c493a1e3991a5c016c24640592ef97dfe08c1e56283b3b9be1ba5c17a1d11374b95169036f037cb5f8950df13f4a12d64a6b247 SHA512 3e87b824b5f53da9cd0039deaa476980005185a8da71fcec3cce9c95c7fa1a2cf4ea1eac0b12f7aecdd9233522f0fdfe6e1ea03465d9e38db66eca13a30eacc4
 AUX prboom-plus-2.6.2-Revert-force-overriding-of-the-documentation-install.patch 991 BLAKE2B 7a7fc57c91576b9955e219feffb0953e6c9ce31d4dfaa333f7ca5024a634c72615e409ab42ccc74db09adaa3f2e9b2a8bace401dc7bbc3e0bd1f7e932835ecfd SHA512 46b56b72408c7d72a7849b13832588a350bba9e6d3c3fc93aaf4568eb5ebdea12a7cad1a2c13972016b6e95527d23b0b5db6abf0a848ccaa26671dc87cedb778
-DIST prboom-plus-2.6.1.tar.gz 1555792 BLAKE2B accb919039b966952340a18b3a37b9c2401a20c1f9562829ba531bf4dafc5e876d7d1212e9ba58886c7469a86b3170c48973cbd8af8ab03d1f2d685813c39607 SHA512 6ae628a453930d4fe3901d186a7c450276d023db6b38e678463f52d463a697819cea1022510030f7405bee8244c3dec04d00741fee8de839775e6e0965f0df39
 DIST prboom-plus-2.6.2.tar.gz 1557494 BLAKE2B 1ce63a893ffa6cb0e04fa3bcb34a06fdef47e2d6886f88bb7df9407f9342c81ddee6a245c15b614c15535fbfd889633f63f4532196b7ae46fd3ce32d20dda559 SHA512 7005fa55bdbfffa1b6b24ff470f5e1962e89367eaa28b23e95ebde0d1385dbe14e1c0f2d67d8ebefb1adfeeca8d551ec2b7b04a23a6af3a0f708b36da09613b3
-EBUILD prboom-plus-2.6.1.ebuild 1961 BLAKE2B f46c0c735669f8e2067ff5a1d64d4e9bb70ca6dfd409aac25ed4d9cbb1fb60cef6066a2331978a6191c4b84d05733178219d1763c3f5222c21458398f9c6fdad SHA512 5b00b4fb2e2dafae7ebb3470ea4e218bda8e617dffe2d16d37fe133fcf899273f54c8c47a978d4c0273117806fd17b7bd7b8de0be567e58bfb80c72fc0f3e00f
 EBUILD prboom-plus-2.6.2.ebuild 1966 BLAKE2B bc2777e9d3bfc846025db0928bd974e2c98bb6a50e9565189ba7c3b03fef0a46ce7c6964462554e3542f8a0f5b13309994cc001b217816753cda4e5d678ba582 SHA512 5befa1dcf47002d4739b065e82829e7a810a36c9d615f820cb297bcae363f7a735a52073c8bd29e3489a21781d4e032ecabcb820e21cd5adb8478e5e12b50981
 MISC metadata.xml 1928 BLAKE2B 3e848114401ff845732cab13483cb4692e127b1bee5f8db6ac459ca8f8e5f1a27a3f94c68bef5d50f511ef9a495afff3a8de52f89022522b8a6bed5e3deb805b SHA512 cc3441190920cd7d7cc77f8185412d9c5372a0529656312e37bb28f997dac1753e77ad6b9b13b9ab7441ded48e6e0ce06a83eb7f219e5d05b310c19dd54a6896
diff --git a/games-fps/prboom-plus/files/prboom-plus-2.6.1-Guard-OpenGL-call-in-D_Display-with-GL_DOOM.patch b/games-fps/prboom-plus/files/prboom-plus-2.6.1-Guard-OpenGL-call-in-D_Display-with-GL_DOOM.patch
deleted file mode 100644
index 78a0285703f4..000000000000
--- a/games-fps/prboom-plus/files/prboom-plus-2.6.1-Guard-OpenGL-call-in-D_Display-with-GL_DOOM.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From eca393ffd3c05279150a29e104953c0234a59736 Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray <vilhelm.gray@gmail.com>
-Date: Fri, 27 Aug 2021 12:06:45 +0900
-Subject: [PATCH] Guard OpenGL call in D_Display() with GL_DOOM
-
-Fixes: https://github.com/coelckers/prboom-plus/issues/382
----
- prboom2/src/d_main.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/prboom2/src/d_main.c b/prboom2/src/d_main.c
-index 16a9efc2..4fe97465 100644
---- a/prboom2/src/d_main.c
-+++ b/prboom2/src/d_main.c
-@@ -395,8 +395,10 @@ void D_Display (fixed_t frac)
-       R_DrawViewBorder();
-     HU_Drawer();
- 
-+#ifdef GL_DOOM
-     if (V_GetMode() == VID_MODEGL)
-       gld_ProcessExtraAlpha();
-+#endif
-   }
- 
-   isborderstate      = isborder;
--- 
-2.33.0
-
diff --git a/games-fps/prboom-plus/prboom-plus-2.6.1.ebuild b/games-fps/prboom-plus/prboom-plus-2.6.1.ebuild
deleted file mode 100644
index 4dbc0b9a4876..000000000000
--- a/games-fps/prboom-plus/prboom-plus-2.6.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg
-
-DESCRIPTION="An enhanced clone of the classic first-person shooter Doom"
-HOMEPAGE="https://github.com/coelckers/prboom-plus/"
-SRC_URI="http://deb.debian.org/debian/pool/main/p/prboom-plus/${PN}_${PV}um.orig.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ GPL-3+ BSD BSD-2 BSD-with-disclosure CC-BY-3.0 CC0-1.0 LGPL-2.1+ MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa dumb fluidsynth mad net +opengl +pcre portmidi sdl2-image +sdl2-mixer server vorbis zlib"
-REQUIRED_USE="server? ( net )"
-
-DEPEND="
-	media-libs/libsdl2[opengl?,joystick,sound,video]
-	alsa? ( media-libs/alsa-lib:= )
-	dumb? ( media-libs/dumb:= )
-	fluidsynth? ( media-sound/fluidsynth:= )
-	mad? ( media-libs/libmad )
-	net? ( media-libs/sdl2-net )
-	pcre? ( dev-libs/libpcre:3 )
-	portmidi? ( media-libs/portmidi )
-	sdl2-image? ( media-libs/sdl2-image )
-	sdl2-mixer? ( media-libs/sdl2-mixer[midi] )
-	vorbis? ( media-libs/libvorbis )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}um/prboom2"
-
-src_prepare() {
-	eapply -p2 "${FILESDIR}/${P}-Guard-OpenGL-call-in-D_Display-with-GL_DOOM.patch"
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GL="$(usex opengl)"
-		-DWITH_IMAGE="$(usex sdl2-image)"
-		-DWITH_MIXER="$(usex sdl2-mixer)"
-		-DWITH_NET="$(usex net)"
-		-DWITH_PCRE="$(usex pcre)"
-		-DWITH_ZLIB="$(usex zlib)"
-		-DWITH_MAD="$(usex mad)"
-		-DWITH_FLUIDSYNTH="$(usex fluidsynth)"
-		-DWITH_DUMB="$(usex dumb)"
-		-DWITH_VORBISFILE="$(usex vorbis)"
-		-DWITH_PORTMIDI="$(usex portmidi)"
-		-DWITH_ALSA="$(usex alsa)"
-		-DDOOMWADDIR="${EPREFIX}/usr/share/doom"
-		-DPRBOOMDATADIR="${EPREFIX}/usr/share/${PF}"
-		-DWAD_DATA_PATH="${EPREFIX}/usr/share/doom"
-		-DBUILD_SERVER="$(usex server)"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	doicon -s scalable ICONS/${PN}.svg
-	domenu ICONS/${PN}.desktop
-	cmake_src_install
-}
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 5f13122d99d2..c0c94e7cc738 100644
Binary files a/games-roguelike/Manifest.gz and b/games-roguelike/Manifest.gz differ
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index a49be386fc92..8f8f045c8fb0 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -16,9 +16,9 @@ DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b
 DIST stone_soup-0.26.1.zip 95585384 BLAKE2B 6d1cb99fc44e918cad4144608f259e67a26df444b93c8501590ff209e8856fd08c514d4c8c78cb0848d8e6127cdf4360b47d21ced5d919da982421934b46102d SHA512 637f1a07e9f35e18eda10c17dc28449364c56aee8456497e30552acb55608a9433cff8b64af877049c21cb2a42eb2fcad28f58a7e57a1d835eb8c252e580205d
 DIST stone_soup-0.27.1.zip 96934633 BLAKE2B 8821920a4faad9474f08a34ae3c272cb9dcd3ddeb9029e033c22eb8e6650ef20bbc30e0c0ca1556d08c1b7b898fdbdd3667a3ac9a8527e0c322cd8c78ab391bb SHA512 845dafc9895ada3712903de63b95cca9eeb66160e4a04ba21193d916447fca8e7248b851f1e938f43b8d3937cf4f4437443bdc4fe2da893fe3918fed4e0b5204
 DIST stone_soup-0.28.0.zip 98876317 BLAKE2B 10f554ea004778b6a2537caa2f994c8e7b12e190ddaaf55f9fb5d2499b91ee6d15d63a9d50167528c1625058bc262c5cba8ba08235fc377e83329ba5f80158be SHA512 7316175ccf6efea376a8a9157f9c4d1786f59c544af39e5ff28a9fcd889e23ef58c2a3680df46807c84b2ce0feb347e661c929195e8affb3d3f98c24832b17e0
-EBUILD stone-soup-0.25.1-r103.ebuild 5045 BLAKE2B dd667e1a7aec2c09754368bcc5615d8414bcc1cc35196a22fe2bf91ee15a9caec22def457838b1cc2391dd18537da2031674b6ff6cd5f6c87ce5fa3cdd943cd0 SHA512 9ba30cfdf08045689e4d7d2492cd710c4d15b00bdd57bdc64424ec1a415ccfae7da9c5a1eab7ec1c759310458dd3903b07e5fe18803a724b5f0a427c5c44afaf
-EBUILD stone-soup-0.26.1-r2.ebuild 5258 BLAKE2B ee0d6bbfd5de52ac1e5b2bc3518220a3607f8999d1f9d5974690bede75ea4791878f561f5df4d185dc3985a57008c5bd153a369b1e86c5cf88b1c1a603661267 SHA512 c0c2186645788bb0a1e3828f8128af490e4ba9b83998de8e32015b49b42a6cf46cc4eb08e1b14e30e5d574d5bb17f11882959074a5686d6faae3bb9d1ceccd5b
-EBUILD stone-soup-0.27.1-r1.ebuild 5045 BLAKE2B 8e4b3dba98685164149d18286c2ff099fe8a056a8109753eed3b5739802365c7f724c17cce70809bbcbdb990d6cc6ec11b1b9dea2b7e02b537fa6189221a389c SHA512 679f39c530dea70ac4ad9d80aae30bd0163f61f7507b2886121a0db5c28919fc583724ba92ae2c777bdc7f0d99a580592c5e0b3f7434442554632ea348ece2f5
-EBUILD stone-soup-0.28.0-r1.ebuild 5642 BLAKE2B 94fc53cce648497c8a322909a124fd0cd76d35118bf79298321b21098d391f97eab34df479beab53ee3f96505984e89a969ee9dd74e5915692e214bb555509c8 SHA512 a7a9ef2963243322926b33d3fb36956924a8f1b4086bbd5aa69661d3042ed50761a749b59ab4b7af2a35db3fb9623a04aa0b57d81c02453e82f520206e2bca8e
-EBUILD stone-soup-0.29.0_pre20220701.ebuild 5684 BLAKE2B a9da6b0296448bfe1b17643ac19880ae982ee50dd6dbc33e92c702540e66b58acf66bcfa3580498deb3215bd7d15791c755c182f66ded009e2224e22f6fad039 SHA512 723c3a4e4f37da62143111624b1fdda29192995d17645db4488015b06922cc981a3963aa9cc7410fd5386423c14ea2e6fa09fd5cc28619e84a29e5adfa3f675e
+EBUILD stone-soup-0.25.1-r103.ebuild 5051 BLAKE2B 893477dcb97c3c347236cf057a3d081758bbfceae5fbdc0fb5ae2b921378eb9c1d0b8220bb77a16d8b63602ac0b30367d33e94ace5c69554a0f82e3955055a9f SHA512 8716388a2a2f3cf2232308cabab54e9cc4f226370ee6f92353fefd797ce73ae7e48d1b42c74e31a26d393024e4c9b39c5b995418266c12d83f3190011312be07
+EBUILD stone-soup-0.26.1-r2.ebuild 5264 BLAKE2B 14d01ff96467b7c7545a0e355425394ee575861202bce96cd646f7b9f648124ec9d9e3bd9f9d2d678beb43753d9fcc3a4fe726d0b6216896e688805f1af41421 SHA512 681397aaba48190bd37b84cef5c1b775d72611e1d07ff72fda5454a654c5edd134be509b268501dd1d74b644ec68905e49aa397e543442b54cde9ac60f75862d
+EBUILD stone-soup-0.27.1-r1.ebuild 5051 BLAKE2B ee032542c1e20a2b8c64e7f82b0a380020879f70b4ebaf1031b19b88b4ee9ac47b72dd2ad863c20a2089e651e794dc3eeafab7248b9efc43f9eb8959885f19f7 SHA512 398c9d87367d531c4f8a4dc92eedcc32847f7e729f2fe989c3d48e8f26112e27659f1ae573e027932b8233579e1ccac0603e1e50066f2cb4716fa6dfe140d585
+EBUILD stone-soup-0.28.0-r1.ebuild 5648 BLAKE2B 4e8c8e6fb8ab801b76e151ca346059c1405b5132b0f61808430800ac872f087e65967704e4b3275ab9096bbbb76e75267b32d1cabf36699e217db57fa4f12250 SHA512 59c228c7a7dcbd518f486c1f2e5c3806f06ecf404a7f9727bce4da5c1644eb62a9b41992d4aec38a0521ebdee38c0b4de9869830b8b57380a0915a28d3d8b61a
+EBUILD stone-soup-0.29.0_pre20220701.ebuild 5690 BLAKE2B 09e08386b49c1c0e8127f948c1a54c0755717e8801976f7b2774d181c39b37f7182ff4bcbcd7251ddcdcf256631914d281097dd82862ec4cc042406e17f31aef SHA512 34f2c3faa936b93192860ed3e19e4fcd93047a6fbd4996b171c1cd7a60a19d123cb012f0d91cbe3b84ec0da5cae6393bd20bc7f2ea2018c7e5c822365d685773
 MISC metadata.xml 1684 BLAKE2B 4d3fe12186ce860f5b049b5b2cdb626f9ab095d688163739a972e0f53a7d835c191dbec0ee4868bb575648cbd3c818ed2fdec44b75730855ea5d8bc3eaf4996c SHA512 9dbe6b3c720b81887c74b0a5e81a0ba5e410d947a6560f66cbb4605c090dfa46a897f8550191e6c6ce7ec06a7460d0e3c625afe7f5ee41e32ab3b800887463cd
diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
index 4c0c3c29ddd9..4e70392680ef 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
@@ -78,11 +78,10 @@ PATCHES=(
 )
 
 python_check_deps() {
-	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
-
 	python-any-r1_pkg_setup
 
 	if use !ncurses && use !tiles ; then
diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
index 4c2d6d1cfdc7..a99ba5143943 100644
--- a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
@@ -78,11 +78,10 @@ PATCHES=(
 )
 
 python_check_deps() {
-	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
-
 	python-any-r1_pkg_setup
 
 	if use !ncurses && use !tiles ; then
diff --git a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
index 92a8dd503ef3..c9995c1ead92 100644
--- a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
@@ -78,11 +78,10 @@ PATCHES=(
 )
 
 python_check_deps() {
-	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
-
 	python-any-r1_pkg_setup
 
 	if use !ncurses && use !tiles ; then
diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
index f0bb11286771..503a00a72353 100644
--- a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
@@ -92,11 +92,10 @@ PATCHES=(
 )
 
 python_check_deps() {
-	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
-
 	python-any-r1_pkg_setup
 
 	if use !ncurses && use !tiles ; then
diff --git a/games-roguelike/stone-soup/stone-soup-0.29.0_pre20220701.ebuild b/games-roguelike/stone-soup/stone-soup-0.29.0_pre20220701.ebuild
index a78e930788f1..a7d13cd0dd2c 100644
--- a/games-roguelike/stone-soup/stone-soup-0.29.0_pre20220701.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.29.0_pre20220701.ebuild
@@ -92,11 +92,10 @@ PATCHES=(
 )
 
 python_check_deps() {
-	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
-
 	python-any-r1_pkg_setup
 
 	if use !ncurses && use !tiles ; then
diff --git a/games-roguelike/zangband/Manifest b/games-roguelike/zangband/Manifest
index f328f31bcba6..96b4d03fcee4 100644
--- a/games-roguelike/zangband/Manifest
+++ b/games-roguelike/zangband/Manifest
@@ -5,5 +5,4 @@ AUX zangband-2.7.4c-tinfo.patch 513 BLAKE2B e095db92aa2d350850032d337dbfa7daf345
 AUX zangband-2.7.4c-tk85.patch 1404 BLAKE2B 88c346359d06439763baa39312e9f65da0acb934427e82754e14781cf8b599afb857689061aff6db4855898573a3bf7436322173242d3a76723316aa9415732c SHA512 41c71ebd62fe0eba51b0a07352729dda67ada6c7ff38a05adc6d66b71128962c324c4e51c7ed20db30fa4438e32704d1c5c32d567d1e115d2b41b1816fcd21f7
 DIST zangband-2.7.4c.tar.gz 2821355 BLAKE2B 5d541ad0e24d61000194beb6d5139b3ff5236de3e48ace9861716c953303f5b37c855c933e7aaab711ff7389a7f81e644654535f88f83cd999484d3e4254f4ad SHA512 491dfeb72b6eb34f7feaa45d5360014da8eaeccd173dd75b3f7a1c2034e4fb634817493957b75babc0d9600077a80d88529cf2e86769948fc86d05e59958356e
 EBUILD zangband-2.7.4c-r1.ebuild 1691 BLAKE2B d0c65eaffedd643bfdf21d9ade6e959c28f580f3af54795c2de454aff54412f8d34294f91ddc14b3d9eec61ae362b6d2fb74a78fa10e3e2a82f4025bb9b07210 SHA512 4685a50c5c0dd74c6fefff20ba71856e9923914b1cd83a54d487f1b2447727f8fec7d26f09d50ea02670ac76ae80c1046f0ee44e369b700fbba1892551916603
-EBUILD zangband-2.7.4c.ebuild 1233 BLAKE2B cda232b9f7a6bb0ce7198485aeae4c45730f32fb51a50b213169d1c44a6e36d6e140cc2d3c59d8b9bcee775cfa18303ca59ae73b64d890f399efb3b4545cd4a1 SHA512 714107a5740ea7a25f994e1793ec22438a6091c2636b36a3c6ae009b2c79045e64280248ea387eef2ccef3ab620be56eb87152acb5f41bee6cda53716692da56
 MISC metadata.xml 377 BLAKE2B a52a4837ae11279fed757c0aba520bd69ecf01cb04bf7886b97dcd662e59a17cfe4a5c1719291351a741dd3434cb8d4614d7d6ace84343454a4e34c5ce9b3284 SHA512 fcc53a968c91652d6c7417133aabd1a8203bb012122bae245ad55e51f05225ef3078a17cf1a2f250eebb960ffbf9efe61e26fbf5afe1685006082692aa5b700a
diff --git a/games-roguelike/zangband/zangband-2.7.4c.ebuild b/games-roguelike/zangband/zangband-2.7.4c.ebuild
deleted file mode 100644
index 211bb818327b..000000000000
--- a/games-roguelike/zangband/zangband-2.7.4c.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="An enhanced version of the Roguelike game Angband"
-HOMEPAGE="http://www.zangband.org/"
-SRC_URI="ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/${P}.tar.gz"
-S="${WORKDIR}"/${PN}
-
-LICENSE="Moria"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tk"
-
-RDEPEND="
-	tk? (
-		dev-lang/tcl:0=
-		dev-lang/tk:0=
-		)
-	x11-libs/libXaw"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-DOCS=( readme z_faq.txt z_update.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tk85.patch
-	"${FILESDIR}"/${P}-rng.patch
-	"${FILESDIR}"/${P}-tinfo.patch
-	"${FILESDIR}"/${P}-configure.patch
-	"${FILESDIR}"/${P}-makefile.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--libdir="${EPREFIX}"/$(get_libdir)/${PN}
-		--with-setgid="nobody"
-		--without-gtk
-		$(use_with tk tcltk)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	# Install the basic files but remove unneeded crap
-	emake DESTDIR="${D}/usr/" installbase
-	rm "${ED}"/usr/{angdos.cfg,readme,z_faq.txt,z_update.txt} || die
-
-	# Install everything else and fix the permissions
-	dobin zangband
-
-	einstalldocs
-}
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 35520a936b6e..c8fd079a654b 100644
Binary files a/games-server/Manifest.gz and b/games-server/Manifest.gz differ
diff --git a/games-server/bedrock-server/Manifest b/games-server/bedrock-server/Manifest
index d0bf64c35127..37442518c030 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -2,6 +2,8 @@ AUX bedrock-server.confd 317 BLAKE2B 47308c295519e0c92653a738aafd3044120c8f86d70
 AUX bedrock-server.initd-r4 1944 BLAKE2B 9870b09a447588ed0dbfe49bdeee928d54e8ea788a50dc834ea761ef8dcbf21696214ff3370f43de3218e202a5ad786b972c77a679a7cd0d2d1ef38f43db67de SHA512 3281e15bf7a4b87cd1b53b755c1695d77f2de0b7ea23ebdedf0bea60013c5d79f563fdbab3de421bfa50c3d2f24e93c39f49525d8157ca9e649d206a1cb80dfd
 DIST bedrock-server-1.19.10.03.zip 73426046 BLAKE2B 8c8c25d0e811509329d3c1ade0e442804ed221530b5a915c0d41e58f249dd2b7863bb2d87d1d871635d2b1468ee0dc6c42727e70013164c2e65fb7f13fc5988f SHA512 f1afffc34a2c4cf4c1ee16cee3dd067c5544ae3ec4337cb26c5047cecbe1c1b9baf6a98d915b3c20629223c27b222e37c1c5e762fe90bcb9fec2ec7990dcafbe
 DIST bedrock-server-1.19.11.01.zip 73425893 BLAKE2B 06f10a24db3205da7f2c83f4646610fb66743145cf9afd1d6d7e0c973c9151aedb335364ceb57dc83f26ebd9640ddb863f46724fe6dc581a75b1b1649ec59cbd SHA512 10c74dc3c511310814b3f28ac55a80b63a476f01259b351e95f3b3bc095441175af2076aa97846c51599a896c08c2d3d202ede417c487482c912e254dfaa1fa5
+DIST bedrock-server-1.19.20.02.zip 75658923 BLAKE2B f137320f5785ddbdd1f4ff550f99448ad70455c0ab70bc8d9ec48c15487503313dd0e887cd8b9a4a1a73b5af82af0b548a6cd13180fdbbd3fb53291f3c5c6ee7 SHA512 f82e50e9180dadab76152bc7860c0306d3ee68091f39345749e4c4268b5c6d53692188373bb366a053abc352b50b1508eab8d662b10fe7ce96cf91485596c1d2
 EBUILD bedrock-server-1.19.10.03.ebuild 1086 BLAKE2B 6febd87ffdf800926bc5232e8b99ac06dc6bc07f9e1ec597e2bef3852b8f422dcebc0d229f6c2e7a6a190475b82227dcc0f860b9b04f53c1fea9cbe6dea5ba43 SHA512 4c8cc6accca6c7ed66737ce01f4f5c5acb583ef2ddd26c1f0563f98bd500f7c3d762cccdef000a4ba70d3ff9783ca5d777e3927ca100e55d0d09984a553e3f6b
 EBUILD bedrock-server-1.19.11.01.ebuild 1087 BLAKE2B 9eaedd798a626d59330e6002c3b85c352825314b4d6f86ef4e8f1cfb06e6585e13731e20e37dd87311f3a00ddfcf28993f767b9e6b5ad043c44e2d0bcbb31bfc SHA512 dbc2691ccb190433c75a1cf5632e2fbeb158b9c8719b496c36134a8bafe53bd27c38701c68d5304994b45e071973143be1dfaa4dd9b007774100f32a03513d1f
+EBUILD bedrock-server-1.19.20.02.ebuild 1087 BLAKE2B 9eaedd798a626d59330e6002c3b85c352825314b4d6f86ef4e8f1cfb06e6585e13731e20e37dd87311f3a00ddfcf28993f767b9e6b5ad043c44e2d0bcbb31bfc SHA512 dbc2691ccb190433c75a1cf5632e2fbeb158b9c8719b496c36134a8bafe53bd27c38701c68d5304994b45e071973143be1dfaa4dd9b007774100f32a03513d1f
 MISC metadata.xml 676 BLAKE2B ae3d24e16c5da237df029cc571c6f7099c0e292524633990f92a16075a901191b0aade76429014bb02c95d8032b08436d79599eaafa4fea16345e63dd9180b94 SHA512 df3a66bb13e34ed64a3c5a7974a1aa6b5b4d8b9589a4f9bc08ac74a6cf6f7f8886373963b4d5532a3ca86a2ca48bd7a6f58500622741109273e8ec670ca290f7
diff --git a/games-server/bedrock-server/bedrock-server-1.19.20.02.ebuild b/games-server/bedrock-server/bedrock-server-1.19.20.02.ebuild
new file mode 100644
index 000000000000..16dd14a8e660
--- /dev/null
+++ b/games-server/bedrock-server/bedrock-server-1.19.20.02.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="The official bedrock (non-java) based server for the sandbox video game"
+HOMEPAGE="https://www.minecraft.net/"
+SRC_URI="https://minecraft.azureedge.net/bin-linux/${P}.zip"
+S="${WORKDIR}"
+
+LICENSE="Mojang"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="
+	acct-group/bedrock
+	acct-user/bedrock
+	app-misc/dtach
+	dev-libs/openssl:0/1.1
+	sys-libs/zlib
+"
+
+BDEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+DOCS=(
+	"bedrock_server_how_to.html"
+	"release-notes.txt"
+)
+
+QA_PREBUILT="opt/bedrock-server/bedrock_server"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	exeinto /opt/bedrock-server
+	doexe bedrock_server
+
+	insinto /opt/bedrock-server
+	doins {allowlist,permissions}.json server.properties
+	doins -r {behavior,resource}_packs definitions structures
+
+	dodir /opt/bin
+	dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server
+
+	newinitd "${FILESDIR}"/bedrock-server.initd-r4 bedrock-server
+	newconfd "${FILESDIR}"/bedrock-server.confd bedrock-server
+
+	einstalldocs
+}
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index b4c0df8c9016..5320cad2b60b 100644
Binary files a/games-simulation/Manifest.gz and b/games-simulation/Manifest.gz differ
diff --git a/games-simulation/corsix-th/Manifest b/games-simulation/corsix-th/Manifest
index f1ad38e07cf1..d3fca3dca95a 100644
--- a/games-simulation/corsix-th/Manifest
+++ b/games-simulation/corsix-th/Manifest
@@ -1,7 +1,5 @@
 AUX corsix-th-0.64-cmake_lua_detection.patch 288 BLAKE2B 90673498871c16f48c752c5581dfec0a290966ef0ec79c977b69575b26a22843829679a7c0225caabe2b570b9b6a38e025115f3a2cf0597b0dad9dc78f01f36d SHA512 52dc61c7aa8c170da225801f2eb06140e9dc28c4d55853eac99b573475a21fb03b945de676898719927abd517b34ecce2aa5c4998ac6e6fcc673cf2aaf7cdb9e
 AUX corsix-th-0.66-cmake_lua_detection.patch 499 BLAKE2B 939992cced1c18dc5a6c53b892e8d2adbe084e9bf028c4c858e3c809a4bc5df0b304aae020994d8b94052bcda60486affb080096c688eb6120950ea626f5db9b SHA512 bcdbbe851610afb863b6c58700ab03f3c426cd6f9a9795d853a819bde3e9ac0d89a1d99eb04f2559f9ac80344c03aa1fc8c99cbc80c7b81e4e3739af6db6bdf4
-DIST corsix-th-0.65.1.tar.gz 4163922 BLAKE2B c1d9255e41521876716b377579642ed46b9fc54823816dc431f7b56ffa532af7091ae0b1e291bb1c4fb74165ca07786e0991a990c90bc3a13e234ba31c6fa706 SHA512 b7e964c22517b94cb1dafb0529368c87a2e58cf1f784062b9f2f72749ba69523b63d4f846ebd582c71cf5ca7e7c437a34717ca3877ad3737139ba2fd6a316577
 DIST corsix-th-0.66.tar.gz 4117046 BLAKE2B 7bceb0d5893849ba906ccd9516ecd52f0a1c54f3a91bff932c0db053f66e71a3d38dfdb55979cb9bb2047c7338b3badbb32defa216a9867fb7166f4ca14bfa75 SHA512 a5cea74e7754132a7edbe188c63c08eb40ba8a8bbef6dc7441e41c5f46e96cacaa077d00bead4f8b3af3b8e07eadb4cfd08b1fb147e1397e2f9aa02642d29105
-EBUILD corsix-th-0.65.1.ebuild 1930 BLAKE2B 03c8ea8fe8c05ce95ac543412c70e2d63ceb1bfebd3369f94ff566ea723466f744a485436adf31d270c40172f49a37dff1f1bcc407f3b730e0486cbc1173f39a SHA512 0c901db2b7f5bcfc5c846fea06654d0580357137e06ff27b3140db4b7b41c13303d72361980b0792a29d140cefe4b36600e3a6bac247fc481a38d31961d6983f
 EBUILD corsix-th-0.66-r1.ebuild 1894 BLAKE2B 4793011e203c1411b577993d48e9dfb0cb90c552d040e6d5b27cec5ddaee0bbea850af09d506c1921ccd81b326c92c9ccdd7fee2a09ce91663a6158da84b4844 SHA512 282855b488d10685b98ed9fb13c87e2b57220fd5b16517ce4129a4e7b0e66c5143b39e87632cdd503bb6a596b2a79883048c52da088c6325559ebd67c1dca635
 MISC metadata.xml 717 BLAKE2B c32582188f6a89239fbec43977d4d126075de2d599c8496ebf01e0a7d919550739913d0290afb24544cc8ea4ff2177a89bbcdaa14ba5e4654d8a7f7db07be294 SHA512 3b3387491e7c51efcc777675e9b996c5648b8e0f5fc7319345a500e60aad08c2a5ca5a9fc0d46928fc60346151232daaf719e7a5ed5fb8a1bc03c40313652ca5
diff --git a/games-simulation/corsix-th/corsix-th-0.65.1.ebuild b/games-simulation/corsix-th/corsix-th-0.65.1.ebuild
deleted file mode 100644
index 3ac363b27b5e..000000000000
--- a/games-simulation/corsix-th/corsix-th-0.65.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit cmake lua-single xdg
-
-MY_PN="CorsixTH"
-
-DESCRIPTION="Open source clone of Theme Hospital"
-HOMEPAGE="https://corsixth.com"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="doc +midi +sound +truetype +videos"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="${LUA_DEPS}
-	$(lua_gen_cond_dep '
-		>=dev-lua/luafilesystem-1.5[${LUA_USEDEP}]
-		>=dev-lua/lpeg-0.9[${LUA_USEDEP}]
-		>=dev-lua/luasocket-3.0_rc1-r4[${LUA_USEDEP}]
-	')
-	media-libs/libsdl2[opengl,video]
-	sound? ( media-libs/sdl2-mixer[midi?] )
-	truetype? ( >=media-libs/freetype-2.5.3:2 )
-	videos? ( >=media-video/ffmpeg-2.2.3:0= )
-"
-
-DEPEND="${RDEPEND}"
-
-# Technically, build-time generation of documentation could use any version
-# of Lua (or to be precise: if in src_configure cmake has been told to use
-# LuaJIT documentation generation looks for LuaJIT, otherwise any
-# dev-lang/lua slot will do; see the first few lines of the bundled file
-# CMake/GenerateDoc.cmake for details) - but since dev-lang/lua conflicts
-# with the other slots of same, try to keep the deptree sane until we get
-# rid of unslotted Lua.
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		${LUA_DEPS}
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.64-cmake_lua_detection.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLUA_VERSION=$(lua_get_version)
-		-DWITH_AUDIO=$(usex sound)
-		-DWITH_FREETYPE2=$(usex truetype)
-		-DWITH_MOVIES=$(usex videos)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	cmake_src_install
-	dodoc {changelog,CONTRIBUTING}.txt
-
-	docinto html
-	use doc && dodoc -r "${BUILD_DIR}"/doc/*
-}
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index 34e724f07f2f..3058f2549e34 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1,6 +1,4 @@
-DIST FlightGear-2020.3.12-data.txz 1787955196 BLAKE2B 648994bb8a70416d9fbf9fbb71c91d6652db4f915ce39938ad870f6de4a745c7f6df36025726fe29d67a598f1ce64718d12b7be5b81ebb83318246cd991fac1a SHA512 7bb97c0b2ee59b300a95f331bfd12e39aaaa7d3320e33cc4e72ea3c5fae196af52e97d9ed7f6af274162ecdd00642e729d96165df5dcbcb95e2853cf7c1df463
 DIST FlightGear-2020.3.13-data.txz 1789344308 BLAKE2B 869ee6fd1d8eb35d6ba4650ea4c1deeafd2e3cc79516711de607c97ade754fcd2a30649f547822778d0599975a71749afa1de5285377a2039c50bea05ef3bad6 SHA512 04a37a0936a8357356147621cff7be2998665356717df13057edb1c3b369c40a389a2fe1a0a35eb5a814b2205ac828bfba2d81a7b844ec1906046a944d65defd
-EBUILD flightgear-data-2020.3.12.ebuild 409 BLAKE2B f818a83911a28b22811e65c4eb154ce1a23056a2c5a226954c461c0041df94fde90ccde3f8f0b3872b47c624943f071cb70c7534a689a68a036c2d7edd944e4c SHA512 4ae3615be1a1e0c96c27b6853f81315286295371f2481487b6aa42853cc573ebe71105832a322c8e70b90b56105aebbf6393a6e324a9c6777fab027538278128
 EBUILD flightgear-data-2020.3.13.ebuild 409 BLAKE2B 915b48a3ce7974d8e750382bb03057159eebba045b4107875b479bb43dcf6eadaf95644f03ff4fa6cd574af10a0de8ecff6ccf61835940c29c9ea98751523053 SHA512 e78f9cb296b29ba5dfb43b886fba644bdbead523dcb2321cec178146b5fb976b9073c0b0ff67875309dee143151cbb5e638128d983653f4df76e3749af3fb9fe
 EBUILD flightgear-data-9999.ebuild 441 BLAKE2B abb508976894bf77fe2fa60c817920481a5dc0487a1379e71ff3104b9ca8cbe19953adc5f4a14ff5a74a0e6900fea89741b446137664104daf8eb119508225da SHA512 f0c40c5eff961a0d8680cf844a1fae4eff777469ae0fbbf9aed6ff088db1ae85a95b6494c7d06539b697d317a4567c534fd8bbe2173f6516e7747d58baded284
 MISC metadata.xml 446 BLAKE2B 47c1c761df5dc2bbbf1972f9541aae416b6758b520f429309fd81e91bc332d78e497c9e6b2504c979fbf6a79287452ba86f060746c57436ec22bba65f177f283 SHA512 f1dc6aa3888410f471884143f136178c890a7bf31c67d61ab049587dca205b966a21a57c670d4c047703264f470955899ccc5f42d8cde5412be8bfc6f52abcaa
diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.12.ebuild b/games-simulation/flightgear-data/flightgear-data-2020.3.12.ebuild
deleted file mode 100644
index f6a2970e8ba8..000000000000
--- a/games-simulation/flightgear-data/flightgear-data-2020.3.12.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="FlightGear data files"
-HOMEPAGE="https://www.flightgear.org/"
-SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.txz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/fgdata
-
-src_install() {
-	insinto /usr/share/flightgear
-	rm -fr .git
-	doins -r *
-}
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 5706c3eac321..c3a846db877e 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,9 +1,7 @@
 AUX ac3d.vim 45 BLAKE2B 04a6e4c70a8be0f7d996f1192289cc05012d4b4cc82a56a14b5d6d2dd7aae8f23f1cd853d29d071a0b9691cf5b8e8b262355b40752f43bccaa318065992d709b SHA512 b691585c6772222525b7f2d67ed41431663400930d9c7deed843a6abe50f67b517bd3180026a0cfe949df29036a49bcaf33ab759dd958ae64d550c271150a7da
 AUX flightgear-2020.3.8-cmake.patch 2050 BLAKE2B 8fa39bd0041556620f79088b6f9ff29eec4b445911f664ac1d3b4a71af479292538d0c44d55b71fa1fbb87771ad9d4917b8c874d5270f716ac63406ec62098aa SHA512 5c1c744c135f422786cab37c0425a143b5e5f078442a051122586fd9fe299bdc953cc6cf9c9c7ab9fb1e5731f3e1f1dac33653e132b95d5ef390a6bc06a1ed2a
 AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
-DIST flightgear-2020.3.12.tar.bz2 8929319 BLAKE2B e84b0519d69f46d5951372deed59f9b1219739710b3374d0bc0041127f8e4b7869c43b20169a9ac3a89d4e121f9da27d01c6db98e683bc3f80da6b1930e1a7c0 SHA512 91e04ae6dc5d12e799bab10b3c4321e77f8d995469453453fdff26a9858f40056dbe8c095423397fcbef307994042c377eb37532af2732674f39e5624c950e9c
 DIST flightgear-2020.3.13.tar.bz2 8930824 BLAKE2B c859614b51d251ce4ac0b5a8a44e80602607902e0bcb00bb35d5b7c419fca9cdde70fccd3013fcced9ef42eafe21d64d91a33525afa0de41f2449d452a59ed82 SHA512 4623af52c0c1fd86ab2bf32bf95bc7be1bc4f867927b7f2ff1d453a4b6e5dbe4c4c094dd23050133e00b3d6b904f77fac396e0d093a99692d18c47823d637f7f
-EBUILD flightgear-2020.3.12.ebuild 4414 BLAKE2B 59bfcae4d1fe678bef067b177987fa78fd780f8b0940d594fee7a508e8de3b800ce19c98cb05cc396529734cabfaf927fd100a38f151325d98f4ff2ae997d520 SHA512 57bb5e467adcd9dbc54df879e33360cb95196ec6dba23bb3d84b261b2c4de3b70b92bed5b232f199586cddecfcf2a9107f1ab12097f1538cf9fba3f86fc09d43
 EBUILD flightgear-2020.3.13.ebuild 4335 BLAKE2B fe91127866cc3adcf29f8c025ba045a8ac364d15a5914f2952311eb7ee914d0b49ae7d93fbcd747f46938667a0786c6d2ca7b2cf7873274433d52efc473cf53a SHA512 37b1843d7b75b63187206c484d6bd81d09369f564c19b512ff9c7b2fb10834dd535a798a5de8e8eb952bf3fc4fe138129102047d3c8601605e0c49c76779bb3b
 EBUILD flightgear-9999.ebuild 4464 BLAKE2B c47c90f174adf357453b0b0714f5093ed9b1f97d1ac0fab3984134495ad49764b1df0eb3c3ca2371a7a99a1c0a77aefcf02f4687893d85631f94139b5e14ad38 SHA512 6e0d779e75c0809f359f19f0abe133fc7e6e890ece6b3c25078f85bcb6744ce38e879ba17cf0b7cda007c69ec7e69ab621b8ead7de7f314d785be4758ef88f2e
 MISC metadata.xml 868 BLAKE2B 304c520696a5a370762f5748b0e90282e7faed02afd2771805f4e842c10e26e7979456e7141caa407edbeead252c3fc959c50aaebe82bdad65d1509b447f7dea SHA512 56373af9228b7943e6be81ca73b1660a4818aaf800f9d3ad02cafe85bdd8e02f3f939a7d5f397396d78f1fe1207f05cdce70da883613c546040e5a7921e2548f
diff --git a/games-simulation/flightgear/flightgear-2020.3.12.ebuild b/games-simulation/flightgear/flightgear-2020.3.12.ebuild
deleted file mode 100644
index 749751eb1080..000000000000
--- a/games-simulation/flightgear/flightgear-2020.3.12.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="Open Source Flight Simulator"
-HOMEPAGE="https://www.flightgear.org/"
-SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="cpu_flags_x86_sse2 dbus debug examples gdal openmp qt5 +udev +utils vim-syntax"
-
-# Needs --fg-root with path to flightgear-data passed to test runner passed,
-# not really worth patching
-RESTRICT="test"
-
-# zlib is some strange auto-dep from simgear
-COMMON_DEPEND="
-	dev-db/sqlite:3
-	dev-games/openscenegraph[jpeg,png]
-	~dev-games/simgear-${PV}[gdal=]
-	media-libs/openal
-	>=media-libs/plib-1.8.5
-	>=media-libs/speex-1.2.0:0
-	media-libs/speexdsp:0
-	media-sound/gsm
-	sys-libs/zlib
-	virtual/glu
-	x11-libs/libX11
-	dbus? ( >=sys-apps/dbus-1.6.18-r1 )
-	gdal? ( >=sci-libs/gdal-2.0.0:0 )
-	qt5? (
-		>=dev-qt/qtcore-5.7.1:5
-		>=dev-qt/qtdeclarative-5.7.1:5
-		>=dev-qt/qtgui-5.7.1:5
-		>=dev-qt/qtnetwork-5.7.1:5
-		>=dev-qt/qtwidgets-5.7.1:5
-	)
-	udev? ( virtual/udev )
-	utils? (
-		media-libs/freeglut
-		media-libs/freetype:2
-		media-libs/glew:0
-		media-libs/libpng:0
-		virtual/opengl
-		qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 )
-	)
-"
-# libXi and libXmu are build-only-deps according to FindGLUT.cmake
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	utils? (
-		x11-libs/libXi
-		x11-libs/libXmu
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	~games-simulation/${PN}-data-${PV}
-"
-BDEPEND="qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2020.3.8-cmake.patch"
-)
-
-DOCS=(AUTHORS ChangeLog NEWS README Thanks)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=OFF
-		-DENABLE_AUTOTESTING=OFF
-		-DENABLE_COMPOSITOR=OFF
-		-DENABLE_FGCOM=$(usex utils)
-		-DENABLE_FGELEV=$(usex utils)
-		-DENABLE_FGJS=$(usex utils)
-		-DENABLE_FGVIEWER=$(usex utils)
-		-DENABLE_GDAL=$(usex gdal)
-		-DENABLE_GPSSMOOTH=$(usex utils)
-		-DENABLE_HID_INPUT=$(usex udev)
-		-DENABLE_JS_DEMO=$(usex utils)
-		-DENABLE_JSBSIM=ON
-		-DENABLE_LARCSIM=ON
-		-DENABLE_METAR=$(usex utils)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PLIB_JOYSTICK=ON # NOTE look for defaults changes in CMake
-		-DENABLE_PROFILE=OFF
-		-DENABLE_QT=$(usex qt5)
-		-DENABLE_RTI=OFF
-		-DENABLE_SIMD=$(usex cpu_flags_x86_sse2)
-		-DENABLE_STGMERGE=ON
-		-DENABLE_SWIFT=OFF # swift pilot client not packaged yet
-		-DENABLE_TERRASYNC=$(usex utils)
-		-DENABLE_TRAFFIC=$(usex utils)
-		-DENABLE_UIUC_MODEL=ON
-		-DENABLE_YASIM=ON
-		-DEVENT_INPUT=$(usex udev)
-		-DFG_BUILD_TYPE=Release
-		-DFG_DATA_DIR=/usr/share/${PN}
-		-DJSBSIM_TERRAIN=ON
-		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
-		-DSP_FDMS=ON
-		-DSYSTEM_CPPUNIT=OFF # NOTE we do not build tests anyway
-		-DSYSTEM_FLITE=OFF
-		-DSYSTEM_HTS_ENGINE=OFF
-		-DSYSTEM_SPEEX=ON
-		-DSYSTEM_GSM=ON
-		-DSYSTEM_SQLITE=ON
-		-DUSE_AEONWAVE=OFF
-		-DUSE_DBUS=$(usex dbus)
-		-DWITH_FGPANEL=$(usex utils)
-	)
-	if use gdal && use utils; then
-		mycmakeargs+=(-DENABLE_DEMCONVERT=ON)
-	else
-		mycmakeargs+=(-DENABLE_DEMCONVERT=OFF)
-	fi
-	if use qt5 && use utils; then
-		mycmakeargs+=(-DENABLE_FGQCANVAS=ON)
-	else
-		mycmakeargs+=(-DENABLE_FGQCANVAS=OFF)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# Install bash completion (TODO zsh)
-	# Uncomment below when scripts stops writing files...
-#	sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
-#		-i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT'
-#	newbashcomp scripts/completion/fg-completion.bash ${PN}
-
-	# Install examples and other misc files
-	if use examples; then
-		docompress -x /usr/share/doc/"${PF}"/{examples,tools}
-		docinto examples
-		dodoc -r scripts/java scripts/perl scripts/python
-		docinto examples/c++
-		dodoc -r scripts/example/*
-		docinto tools
-		dodoc -r scripts/atis scripts/tools/*
-	fi
-
-	# Install nasal script syntax
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/syntax/{ac3d,nasal}.vim
-		insinto /usr/share/vim/vimfiles/ftdetect/
-		doins "${FILESDIR}"/{ac3d,nasal}.vim
-	fi
-}
-
-pkg_postinst() {
-	einfo "Please note that data files location changed to /usr/share/flightgear"
-	if use qt5; then
-		einfo "To use launcher, run fgfs with '--launcher' parameter"
-	fi
-}
diff --git a/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
deleted file mode 100644
index d7b282a68f35..000000000000
--- a/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 2014-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{7..9} )
-inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
-
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="https://play0ad.com/"
-LICENSE="BitstreamVera CC-BY-SA-3.0 GPL-2 LGPL-2.1 LPPL-1.3c MIT ZLIB"
-# Upstream signs releases (and only them) with app-crypt/minisign.
-# The (public) key can be found on https://play0ad.com/download/source.
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/0ad/0ad"
-	S="${WORKDIR}/${P}"
-elif [[ ${PV} == *_pre* ]]; then
-	ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
-	SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
-else
-	# Trailing whitespace for IUSE append below
-	IUSE="verify-sig "
-	MINISIGN_KEY="RWT0hFWv57I2RFoJwLVjxEr44JOq/RkEx1oT0IA3PPPICnSF7HFKW1CT"
-	MY_P="0ad-${PV/_/-}"
-	SRC_URI="
-		http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz
-		https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz
-		verify-sig? (
-			http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz.minisig
-			http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz.minisig
-		)
-	"
-	S="${WORKDIR}/${MY_P}"
-fi
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE+="editor +lobby nvtt pch test"
-
-RESTRICT="test"
-CHECKREQS_DISK_BUILD="9000M" # 8769732 KiB (8.3 GiB) for alpha 25
-CHECKREQS_DISK_USR="3500M" # 3545972 KiB (3.3 GiB)
-
-# Premake adds '-s' to some LDFLAGS. Simply sed'ing it out leads to
-# build and/or startup issues.
-QA_PRESTRIPPED="/usr/lib64/0ad/libCollada.so /usr/bin/0ad"
-
-# virtual/rust is for bundled SpiderMonkey.
-# Build-time Python dependency is for SM, too.
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/premake-5.0.0_alpha12:5
-	virtual/pkgconfig
-	virtual/rust
-	test? ( dev-lang/perl )
-"
-# Upstream uses minisign which is not supported by verify-sign, bug #783066.
-# Signatures are only provided for releases.
-if [[ ( ${PV} != *9999 ) && ( ${PV} != *_p* ) ]]; then
-	BDEPEND+=" app-crypt/minisign"
-fi
-
-# Removed dependency on nvtt as we use the bundled one.
-# bug #768930
-DEPEND="
-	dev-libs/boost:=
-	dev-libs/icu:=
-	dev-libs/libfmt:0=
-	dev-libs/libsodium
-	dev-libs/libxml2
-	media-libs/libpng:0
-	media-libs/libsdl2[X,opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	net-libs/enet:1.3
-	net-libs/miniupnpc:=
-	net-misc/curl
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-	lobby? ( net-libs/gloox )
-"
-RDEPEND="
-	${DEPEND}
-	!games-strategy/0ad-data
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch
-	"${FILESDIR}"/${PN}-0.0.25b_alpha-fix-setuptools.patch
-)
-
-pkg_setup() {
-	use editor && setup-wxwidgets
-
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ( ${PV} != *9999 ) && ( ${PV} != *_p* ) ]]; then
-		if use verify-sig; then
-			elog "Verifying both signatures using app-crypt/minisign."
-			minisign -V \
-				-P "${MINISIGN_KEY}" \
-				-x "${DISTDIR}/${MY_P}-unix-build.tar.xz.minisig" \
-				-m "${DISTDIR}/${MY_P}-unix-build.tar.xz" \
-				|| die "Failed to verify engine distfile using minisign!"
-			minisign -V \
-				-P "${MINISIGN_KEY}" \
-				-x "${DISTDIR}/${MY_P}-unix-data.tar.xz.minisig" \
-				-m "${DISTDIR}/${MY_P}-unix-data.tar.xz" \
-				|| die "Failed to verify data distfile using minisign!"
-		fi
-		# Unpack manually until an eclass supports minisign and unpacks
-		# if signatures match.
-		default
-	else
-		# Unpack distfiles without checking as this is no official release.
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# SpiderMonkey's configure no longer recognises --build for
-	# the build tuple
-	sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
-
-	# Originally from 0ad-data
-	rm binaries/data/tools/fontbuilder/fonts/*.txt || die
-}
-
-src_configure() {
-	# 0AD uses premake:5 to generate the Makefiles, so let's
-	# 1. configure the configure args,
-	# 2. export some toolchain args,
-	# 3. configure premake args,
-	# 4. run premake5.
-	local myconf=(
-		--minimal-flags
-		$(usex nvtt "" "--without-nvtt")
-		$(usex pch "" "--without-pch")
-		$(usex test "" "--without-tests")
-		$(usex editor "--atlas" "")
-		$(usex lobby "" "--without-lobby")
-		--bindir="/usr/bin"
-		--libdir="/usr/$(get_libdir)"/${PN}
-		--datadir="/usr/share/${PN}"
-	)
-
-	tc-export AR CC CXX RANLIB
-
-	local mypremakeargs=(
-		--outpath="../workspace/gcc"
-		--os=linux
-		--verbose
-	)
-
-	cd "${S}/build/premake" || die "Could not enter premake directory"
-
-	/usr/bin/premake5 "${mypremakeargs[@]}" "${myconf[@]}" gmake2 \
-		|| die "Premake failed"
-}
-
-src_compile() {
-	# Build 3rd party fcollada
-	einfo "Building bundled fcollada"
-	emake -C libraries/source/fcollada/src
-
-	# Build bundled NVTT
-	# nvtt is abandoned upstream and 0ad has forked it and added fixes.
-	# Use their copy. bug #768930
-	if use nvtt ; then
-		cd libraries/source/nvtt || die
-		elog "Building bundled NVTT (bug #768930)"
-		JOBS="-j$(makeopts_jobs)" ./build.sh || die "Failed to build bundled NVTT"
-		cd "${S}" || die
-	fi
-
-	# Build bundled SpiderMonkey
-	# We really can't use the system SpiderMonkey right now.
-	# Breakages occur even on minor bumps in upstream SM,
-	# e.g. bug #768840.
-	cd libraries/source/spidermonkey || die
-	elog "Building bundled SpiderMonkey (bug #768840)"
-	XARGS="${EPREFIX}/usr/bin/xargs" \
-		JOBS="-j$(makeopts_jobs)" \
-		./build.sh \
-	|| die "Failed to build bundled SpiderMonkey"
-
-	cd "${S}" || die
-
-	# Build 0ad itself!
-	elog "Building 0ad"
-	JOBS="-j$(makeopts_jobs)" emake -C build/workspace/gcc verbose=1
-
-	# Build assets
-	# (We only do this if we're using a snapshot/non-release)
-	# See bug #771147 (comment 3) and the old 0ad-data ebuild
-	# Warning: fragile!
-	if [[ ${PV} == 9999 || ${PV} == *_pre* ]]; then
-		# source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName() tries to open /proc/self/task/${TID}/comm for writing.
-		addpredict /proc/self/task
-
-		# Based on source/tools/dist/build-archives.sh used by source/tools/dist/build.sh.
-		local archivebuild_input archivebuild_output mod_name
-		for archivebuild_input in binaries/data/mods/[A-Za-z0-9]*; do
-			mod_name="${archivebuild_input##*/}"
-			archivebuild_output="archives/${mod_name}"
-
-			mkdir -p "${archivebuild_output}" || die
-
-			einfo pyrogenesis -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip"
-			LD_LIBRARY_PATH="binaries/system" binaries/system/pyrogenesis \
-				-archivebuild="${archivebuild_input}" \
-				-archivebuild-output="${archivebuild_output}/${mod_name}.zip" \
-			|| die "Failed to build assets"
-
-			if [[ -f "${archivebuild_input}/mod.json" ]]; then
-				cp "${archivebuild_input}/mod.json" "${archivebuild_output}" || die
-			fi
-
-			rm -r "${archivebuild_input}" || die
-			mv "${archivebuild_output}" "${archivebuild_input}" || die
-		done
-
-		# Based on source/tools/dist/build-unix-win32.sh used by source/tools/dist/build.sh.
-		rm binaries/data/config/dev.cfg || die
-		rm -r binaries/data/mods/_test.* || die
-	fi
-}
-
-src_test() {
-	cd binaries/system || die
-	./test -libdir "${S}/binaries/system" || die "Failed tests"
-}
-
-src_install() {
-	newbin binaries/system/pyrogenesis 0ad
-	use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
-
-	# Merged from 0ad-data
-	# bug #771147 (comment 3)
-	insinto /usr/share/${PN}
-	doins -r binaries/data/{l10n,config,mods,tools}
-
-	# Install bundled SpiderMonkey and nvtt
-	# bug #771147 (comment 1)
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe binaries/system/{libCollada,libmozjs78-ps-release}.so
-
-	use nvtt && doexe binaries/system/{libnvtt,libnvcore,libnvimage,libnvmath}.so
-	use editor && doexe binaries/system/libAtlasUI.so
-
-	dodoc binaries/system/readme.txt
-	doicon -s 128 build/resources/${PN}.png
-	make_desktop_entry ${PN}
-}
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index c8da73fd7e3f..39de708357ff 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -7,5 +7,4 @@ DIST 0ad-0.0.25b-alpha-unix-build.tar.xz.minisig 327 BLAKE2B 547a7a1c8a83167fa40
 DIST 0ad-0.0.25b-alpha-unix-data.tar.xz 1249684600 BLAKE2B d77546ba9d21b512f106645c07fa92ecc343e0a01d9a70a83f2a2b3ade912e72d095982f7d4c4cd64e18fb71a67a01c419763744dd4cad1e8c081e5f77ec17c9 SHA512 d6bbe484acb7fbd507d303f5c75f8a2ccbaf8fe9dd30ff408b082f170bfd96eb9235db1b710c15656ef465b44fa5597679a694515e0c153a35fe24c0915f29f1
 DIST 0ad-0.0.25b-alpha-unix-data.tar.xz.minisig 326 BLAKE2B 41975d4c4369780bd36edef448ab928c91ece0d60ddad04fbccd1da0ed5068b56c86fd57708c6158277c5db9faadc768f5e455d97fe5ae3c30a7522005c374e6 SHA512 ad3ef78b785db9eb37d547a86d2bf274e0b6635118a9c512d013adc45e4a0f071b86f0fb5bf696631596e0713b2de153b0ad245cbba86beb3ea153036178b07e
 EBUILD 0ad-0.0.25b_alpha-r1.ebuild 7941 BLAKE2B 045929660f56562edfb71e24d33b9b9c5c44ee87868c73a778838a94577885fd03a983f9c6ead899353fac1ee1761a85e6e88b0b6443cb30b60d777080014d58 SHA512 63c0ce51960713200ee54203c62b245f648cdf5687657c87c087a7e6b53579e843a358ebc9443a1e781d55eaddd14271d035999bf3f8c16de89eae2a89b6922d
-EBUILD 0ad-0.0.25b_alpha.ebuild 7822 BLAKE2B ccdbd4df870acb3cfb41e004156979fac8b0f73f3de307e529131884b1a7514e23a0ffe90e2ab42d2cb9c67fa0778d7400fd88e171cdd66d1efc0ce7227e108c SHA512 8ecbde1520772d00f224c7fc9e3846f23164b886a5e4cf95c70eb793dca633ed1b485cdfebe301f0bf6d31d3c93f3d43c798033b7b19e9f90f0a03383fac9f62
 MISC metadata.xml 667 BLAKE2B 3460d1e769fd9bab7f44c1387b9ccb6acb8b6030e5e307311aca479a0857a3719c22352e3b496dff2569536675e449f98aeccc62999283d2ebd3b3feefe444ee SHA512 65134f211aa3509589f9d333c0b2ceb7cb2dcfe394d3eb84323f5cafb43d8ec6d65738a38552d3c955eab5e7fcb5b71da575df5a1e21e0cbd49dcc4b89fc0f39
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 82d0e8c4ce2d..1e47eb0a76a9 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/games-strategy/augustus/Manifest b/games-strategy/augustus/Manifest
index e1fe5a941c33..8f9785b45256 100644
--- a/games-strategy/augustus/Manifest
+++ b/games-strategy/augustus/Manifest
@@ -1,10 +1,6 @@
 AUX README.gentoo 426 BLAKE2B 803713ea8fe3bd1f20b3a5951cb23135ddb511b916d75ac30c907ef01246a6c365a5f8a50d1a35b1a9e9ca58129828862d2d0b9fc13db5a7e1d3d04071e63957 SHA512 da220fdc16a824044507ea0b69c6e3b165f49e45dc669ab77c79256c271932104293b6e884cd984d7229242113a9431fe77e9ae4e1fd4afc01d68b37399939ae
 AUX augustus-3.0.1-desktop_rename.patch 241 BLAKE2B 8adea277b37e544442cbf38f18387f90d0bf9a3366c5323e2e9bbefda49f517871c173a22dbe937fbf4a1244275c3195f2d008b542c54a778550967726025e7c SHA512 e283524f8e5dafea3bfb890c19be221f586ec6fc70943914eed3d542208c33a4cccf53f06a14fbc8db21be2fdeba6f97b38cea8592a343d11574e094f82cde2e
-AUX augustus-3.0.1-musl-fix-execinfo.patch 567 BLAKE2B 1cd8b9875fc6a0d94411f8838a1a26cfd54efaee1c677e84a549bd1f0add349f62a55815aef6ea79f726ee097f07cff249841d2140ac4dcdfed9c5e95e9327d3 SHA512 ee9e9d6c0bab40f5a934ee9de0c8591ed76a0f3654fb5a52987d8591395b5f69d96486327aa2d8cebce73e41a3c44252a7a8eb36529ebdd90fb05bb92142f7a7
-AUX augustus-3.0.1-uncapped.patch 464 BLAKE2B 074faedf03b64b3e34c15a9412f3d22f3ec93fa638f9d90e910e2b5c203fe3e608ba29de499cedc22fdad6b19194befa5617bb6aa0e1db230873af554f5082f5 SHA512 725df61a3a21433617a672d62a97ab3f64e3bafbc6e619af8a8959de00b3144ec42c8dff747e846affe3ce74eec4dfdf6cd3613c5c07459df51945598585cf76
 AUX augustus-3.1.0-musl-fix-execinfo.patch 457 BLAKE2B f21aeb73e345dfc8e1bac9e9aab3416d9e79a14809f77745ff078461ac279651e94cea94e616c7bf1792a8439175f8722bb7c8a726456ce6f619b30f34bf1575 SHA512 ae070af822663f3e407894ac5ab2d29868733bf53031c2470eeac1abeed17cab1bbad31b9bf2c515f1d05ed47b7f76d7f512522beb3791c24f4fc2a68bd1140d
-DIST augustus-3.0.1.tar.gz 47539500 BLAKE2B 43e808959f176e4024866074c227814e2be75175cbbca60fbc430a7617941766b8a00ae6f56c08239c5ed8cd60d637109e963eba859c78d60f7b37d54079e7c4 SHA512 4929763a4436863525c4d3f93570090ce066ea2abfe56766d991b7ebc03b34fc53fc8c6dcbb7f5c96e2e10d233bb5966581d148db7d7ea2eac5c1435cc4327bd
 DIST augustus-3.1.0.tar.gz 97754907 BLAKE2B 2f30458538a3395b15da1ff1da68e6be4618e51e5e6b0ab89d5215292ff8d67beb5467152caa698bd408bd4c890183ac7109c02a4bbb1e72dc0e94d3c33f6cc3 SHA512 b1831cbaa4d3bac5991aca8fdc1299a4536147d780e328d0e09bb68f71c155eccfd0b087aa9a412868aee6853fd327922481251b8c510a131148d9b31c424536
-EBUILD augustus-3.0.1.ebuild 1231 BLAKE2B e5ff737136dea2ea47d00031d599814de9c1d7dbb63eeef8867e39007691e726e8e8014ae4950268940a4a95b7adf52c2b1bcbce32e7d7996e4b0c13cb63ac48 SHA512 a86f47872d3c8d978416a877f98d6bd76ae226263b34018e615aeb5b8cbdf4e5d4425edfdeb3b979a8240752288b083db2ae506070ed03a3259242a9c0e97097
 EBUILD augustus-3.1.0.ebuild 1111 BLAKE2B 4b440051436255d0cdc7c71c181cfe5064ff779490127d0c2b7d7b2a43d43ed3228b3923f9043d4dcf570ba345bff896f9a459f2cd345420c11b4030f0b72648 SHA512 78f30fb446b0dfd67269ec11b486705feb36c649222e57b562a29540c85a517e9984feca34780d654e74f5d8b69cdf5b529ffa3517a5cc9231fcd89a57b08f76
-MISC metadata.xml 808 BLAKE2B f1092bef61291ecde82d897b232b8a80448aa6a69ff3f43b9e2346252075a81d1b14c3d1815640434dc0357f71a7f314a81ded5fbe33b00f7f2ffb3b7130af00 SHA512 e50e01c64d03e0df6004892b049d8e3c30069f53742ecde6cb46bc8d76cba53a1d45ce4982d48499ba45e7557075d9db62685b5de05240409c723ea9b6f2fdcd
+MISC metadata.xml 737 BLAKE2B 545266b97a0560acf961ea48ec983f14fee0aac60df5223413febe504221ee0028023d8705661ab698a3ad2b60435ca17ed2566126ec5d94e221c45051ddee1e SHA512 f74d9bf34238074add2a02e9442ca968ae5fe83831e71576f17d94a027f748151f4525e0744c0b74fdd2dcfe5a4741c989520f8e44b772e233ceb98eaa7a2d44
diff --git a/games-strategy/augustus/augustus-3.0.1.ebuild b/games-strategy/augustus/augustus-3.0.1.ebuild
deleted file mode 100644
index e9e88193f601..000000000000
--- a/games-strategy/augustus/augustus-3.0.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake readme.gentoo-r1
-
-DESCRIPTION="Feature-enhanced open source re-implementation of Caesar III"
-HOMEPAGE="https://github.com/Keriew/augustus"
-SRC_URI="https://github.com/Keriew/augustus/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE="uncapped"
-
-DEPEND="
-	dev-libs/expat
-	media-libs/libpng:0=
-	media-libs/libsdl2[joystick,video,sound]
-	media-libs/sdl2-mixer
-"
-RDEPEND="
-	${DEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.1-desktop_rename.patch"
-	"${FILESDIR}/${PN}-3.0.1-musl-fix-execinfo.patch"
-)
-
-src_prepare() {
-	use uncapped && eapply "${FILESDIR}"/${PN}-3.0.1-uncapped.patch
-	cmake_src_prepare
-}
-
-src_install() {
-	cmake_src_install
-	dodir /usr/libexec
-	mv "${ED}/usr/bin/augustus"  "${ED}/usr/libexec/augustus-game" ||
-		die "Failed to rename executable (required to set default resources location)."
-	newbin - augustus-game <<-EOF
-		#!/usr/bin/env sh
-		exec "${EPREFIX}/usr/libexec/augustus-game" "\${1:-\${HOME}/.local/share/julius/app}"
-	EOF
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/games-strategy/augustus/files/augustus-3.0.1-musl-fix-execinfo.patch b/games-strategy/augustus/files/augustus-3.0.1-musl-fix-execinfo.patch
deleted file mode 100644
index e79e87702429..000000000000
--- a/games-strategy/augustus/files/augustus-3.0.1-musl-fix-execinfo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/core/backtrace.c b/src/core/backtrace.c
-index 374fcdd..daf5c71 100644
---- a/src/core/backtrace.c
-+++ b/src/core/backtrace.c
-@@ -2,7 +2,7 @@
- 
- #include "core/log.h"
- 
--#if defined(__GNUC__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__vita__) && !defined(__SWITCH__) && !defined(__ANDROID__) && !defined(__HAIKU__)
-+#if defined(__GNUC__) && defined(__GLIBC__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__vita__) && !defined(__SWITCH__) && !defined(__ANDROID__) && !defined(__HAIKU__)
- 
- #include <execinfo.h>
- 
diff --git a/games-strategy/augustus/files/augustus-3.0.1-uncapped.patch b/games-strategy/augustus/files/augustus-3.0.1-uncapped.patch
deleted file mode 100644
index 6bd4f93c1a14..000000000000
--- a/games-strategy/augustus/files/augustus-3.0.1-uncapped.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From 1d3a24d74bbea85198c2c5d739a16dcc139af18b Mon Sep 17 00:00:00 2001
-From: Horea Christian <chr@chymera.eu>
-Date: Sat, 26 Dec 2020 12:59:15 -0500
-Subject: [PATCH] Unlimited number of Grand Temples.
-
---- a/src/building/monument.h
-+++ b/src/building/monument.h
-@@ -6,7 +6,7 @@
-
- #define MONUMENT_FINISHED -1
- #define MONUMENT_START 1
--#define MAX_GRAND_TEMPLES_PER_CITY 2
-+#define MAX_GRAND_TEMPLES_PER_CITY 99
- #define MARS_OFFERING_FREQUENCY 16
-
- typedef enum {
diff --git a/games-strategy/augustus/metadata.xml b/games-strategy/augustus/metadata.xml
index 15f72dff5e6d..70c52d57757d 100644
--- a/games-strategy/augustus/metadata.xml
+++ b/games-strategy/augustus/metadata.xml
@@ -18,7 +18,4 @@
 	<upstream>
 		<remote-id type="github">Keriew/augustus</remote-id>
 	</upstream>
-	<use>
-		<flag name="uncapped">Uncap grand temple count</flag>
-	</use>
 </pkgmetadata>
diff --git a/games-strategy/naev/Manifest b/games-strategy/naev/Manifest
index 8c7aa71a34ff..e2d610ecd914 100644
--- a/games-strategy/naev/Manifest
+++ b/games-strategy/naev/Manifest
@@ -1,5 +1,3 @@
-DIST naev-0.9.3-source.tar.xz 394876456 BLAKE2B 9648ee9a93a02ec5ace552b25033cae16c38a48a869763bc381050f2724445fd5cf08708053ad4c939cdc99a27244126819e9416bc61d8d6148078eeea26e50e SHA512 150091f10ce05cbd5b2c4c434abe83124db56618b80f727994c135d1331c594406c9e8f03596feddb5739061c866e19b115fd0a86a19ea306cc811bb3dd944aa
 DIST naev-0.9.4-source.tar.xz 395461576 BLAKE2B cbfdc443ecb8cb27694769d054f7162c3d1d2bcd8dc28045696d6891abfb46e4a3518ce265c97b55a96b8d000c9900e4bc49ae7b45a16db75f9de48ea0cb702b SHA512 e8efb115d8d623ea92d348854d98ee22e8863aaf6555efa058d6160210f000186ae39f054f5b4f0fa8d92949de83defa35d4acd8216398157a1a42886745ddab
-EBUILD naev-0.9.3.ebuild 2006 BLAKE2B b54a89f7b9f47fe532363e7a258b8bdbf179ff3d46b017c74f5c2ccaa30a32fd5f36c680301fa6c7893ef12a4b079a8e52df691e60b73870d51c90d4c3ca21a1 SHA512 a9261d531725de4b85eeff746b50c9a8f18ab694befcfd2b6ea332afc15b1c8fb928565f223a793f7a702263ebdc06f2a93f378d0760b72c80fbf757108a702c
 EBUILD naev-0.9.4.ebuild 1950 BLAKE2B cc24efda16ce0d3ba48f903d4c8a990f3a662497e924bc5021acfb19b4de39d39bbd79ddc16132e8a6b46999557a8adef4498a0fe84b4ecd8420fb52ba9a6edd SHA512 77c899faad759a40d431433eeb38a657b6bc16df4aa6efcec904e77b0306277ef73de1776640b4c70ff25a717b32f22736aad0f2e58dff9a292e125541c34a2a
 MISC metadata.xml 328 BLAKE2B 2c831943c7eee723e5c707906bcec96e97abd71e5d6fc3256010cca9626aebe95ecd7dca316a9567fe41186f0a656a434d774f83f088f414a95b3aba425c23b9 SHA512 426ac4b34b6cb45db05f5a7768a15947f67f5e90cda1bafa817320988aeb96ade18d774b2aa5e92d12c1fd1fd7a4964ac1bbdacbca6655325ccccc6a9405dfa4
diff --git a/games-strategy/naev/naev-0.9.3.ebuild b/games-strategy/naev/naev-0.9.3.ebuild
deleted file mode 100644
index d13f7615980f..000000000000
--- a/games-strategy/naev/naev-0.9.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{8..10} )
-inherit lua-single meson python-any-r1 virtualx xdg
-
-DESCRIPTION="2D space trading and combat game, in a similar vein to Escape Velocity"
-HOMEPAGE="https://naev.org/"
-SRC_URI="https://github.com/naev/naev/releases/download/v${PV}/${P}-source.tar.xz"
-S="${WORKDIR}/${PN}-0.9.2" # 0.9.3 tarball uses wrong directory
-
-LICENSE="
-	GPL-3+ BSD BSD-2 CC-BY-2.0 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-2.0
-	CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
-	${LUA_DEPS}
-	dev-games/physfs
-	dev-libs/libunibreak:=
-	dev-libs/libxml2
-	media-libs/freetype:2
-	media-libs/libsdl2[joystick,opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	media-libs/sdl2-image[png,webp]
-	sci-libs/cholmod
-	sci-libs/cxsparse
-	sci-libs/openblas
-	sci-libs/suitesparse
-	sci-mathematics/glpk:=
-	virtual/libintl
-	virtual/opengl"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-games/physfs[zip]
-		media-libs/libsdl2[X]
-		media-libs/mesa[llvm]
-	)"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	sys-devel/gettext
-	doc? (
-		app-doc/doxygen[dot]
-		dev-lua/ldoc
-	)"
-
-python_check_deps() {
-	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	lua-single_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	sed -i "s/'lua51'/'lua'/" meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature doc docs_c)
-		$(meson_feature doc docs_lua)
-		$(meson_feature lua_single_target_luajit luajit)
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-src_install() {
-	local DOCS=( CHANGELOG Readme.md )
-	meson_src_install
-
-	if use doc; then
-		dodir /usr/share/doc/${PF}/html
-		mv "${ED}"/usr/{doc/naev/{c,lua},share/doc/${PF}/html} || die
-		rm -r "${ED}"/usr/doc || die
-	fi
-	rm -r "${ED}"/usr/share/doc/naev || die
-}
diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest
index 051e588e34f0..e7c389bbe278 100644
--- a/games-strategy/s25rttr/Manifest
+++ b/games-strategy/s25rttr/Manifest
@@ -1,9 +1,4 @@
-AUX s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch 548 BLAKE2B 0cd4b3cf3fb5b016c3ca01e21ff245042237efb47aa08e8f57fb0b861c7c325b97d0c699de39f2218343f7de3bb7cfc9eee4610a9d4c1d5c8430c77d35a7c649 SHA512 220642d300abd18efb2f69c7b41825341d0985f6d493f03311b557f0e5a81db5284bf4c0868ad8bb09edfa84100cb59309bea1baba94e0abf6b0d4b553336215
 AUX s25rttr-0.9.0_pre20200723-cmake_lua_version.patch 296 BLAKE2B cabdc87d6184e59f0896762f3d3434a137fed4fd1c2dae84d30dbee5d4903e68ba01c30b92d0d5290dec9b371807c317b462213a421cadd172b78b08407f66aa SHA512 074ac3e70fec0da6bd4a9602052989a8b6c26b5cfef669d6330d9177547bbeeeef2a4e6b9d83a9e9cbdf4ec33df7dcce50a862e3c9e533049ad8452df6073816
-AUX s25rttr-0.9.1-cxx-std.patch 1059 BLAKE2B 84e43db33095f8d043c76c381d7477988ababf24959acfe34032c327b1bbd51661e461fc9a5be04aa933d3c40667819eed507326ae8a903069c1903f0366acd0 SHA512 4bdd87fdbcd37c5ee96e3878fd5c690e7186697f947bff8101f36049f6ae1622f2d82944475101c280d3a983150880dcc606d91803d628d8a94e6d8a3e748918
-AUX s25rttr-0.9.1-libsamplerate.patch 1536 BLAKE2B 55fbc0c0b439d98635ca74384033dfe44649605436fec2d61bb0e24e71173572aeeff11de0eb6592e27569f6ff0840867b627cbf6362c418286be39e4e538416 SHA512 9825546d5182a0b57c352fa46b786c8725f828b94ff5504506b79a22d8bce78edc0cf3c4fa7b0c5987a6875d912e27f81be5e5282cad987ac3a730e125db1846
-DIST s25client_src_v0.9.1.tar.gz 31042856 BLAKE2B 296e61467f5ba64f2a833e3f6627844db3757604d9b239d18f3a2b42afc7f46df09ff3b9e8d8a26865e5220f8996b6e78fd4d5fe6252510bbdf8fc238de40bfc SHA512 b7478f76e0246c52a219d9ef5293d56fe682dc87bcd1269d1647417d86c5174632bf05f1fe09e91a9bf9d6738f58e1cac51abdc54df47c00d228687767e19510
 DIST s25client_src_v0.9.5.tar.gz 30305585 BLAKE2B 77857743b5a1693ed373cb048c40fed150a4bf3d59f1314ffbb268f3e03ba8db2f44c20962c390f3a8c5b5b443ee0465d5c7bf726998ddf0334a861304211db8 SHA512 4926653075c7ba01e1e4ca516c52ad1694b46557c40c418e2a1f18d0a8fac9d4b73c20adc5403365ad6ba643823ed23dff5296717b3e057c42b17f1c20feb802
-EBUILD s25rttr-0.9.1.ebuild 2796 BLAKE2B e4a57a16fecf7afc6e7e9b95813525e7a3f6c7ab9b8802a82a75bc91c25d848341d61c0fa40930a0c8e1af73ad4d7ab518c1b547055b271f60891ab89ee352bf SHA512 afb89fcca9ecb5bc89750df151caf5965be0f4d717bb36991a6c21b258d6db182fab9e311f8480cdfb5230e693e23de4058692f24e89d69d16a9c55d3386f104
 EBUILD s25rttr-0.9.5.ebuild 2643 BLAKE2B 9f0353e995f6d3399081eef6aced76dd16cba52cfe7dd14cdaff1add6abd91720ec884daa4f04a0f3b20c8f94ca8752e01aaca2f4994f3f4c24b77a4ae39aa75 SHA512 c4667ed0d1e2a1f8c08914569d235ca8d971411de864db98bd235005f811dd4df90920d2b90a1f1de4ed7cf925c609c2fa856a911d3e8cea3ae7844d40b2c33f
 MISC metadata.xml 348 BLAKE2B bc23c51bcd3458b4f39a6b42dd73f35060319cdae4563a4288ef2ae9dc9e2a85e8bc4b357dff37d70f20abf5d79a4a5c20fb1a8c2ab4c994dd3290ea18d49c34 SHA512 c145a48fb294eb11195885f0cd97095c7258d3286bf1cd926b5d40682aea1767c52a5a163283345fe12416659a9c7500de58993379b0ba3c743f18e172696c6f
diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch
deleted file mode 100644
index 9a69797ea27a..000000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://github.com/Return-To-The-Roots/s25client/pull/1431
-
-From: Sam James <sam@gentoo.org>
-Date: Thu, 19 Aug 2021 02:41:42 +0100
-Subject: [PATCH] Fix build with Boost 1.77 (missing <algorithm> include)
-
-Closes: https://bugs.gentoo.org/808767
---- a/libs/s25main/convertSounds.cpp
-+++ b/libs/s25main/convertSounds.cpp
-@@ -20,6 +20,7 @@
- #include <libsiedler2/ArchivItem_Sound_Wave.h>
- #include <libsiedler2/loadMapping.h>
- #include <s25util/StringConversion.h>
-+#include <algorithm>
- #include <cmath>
- #include <samplerate.hpp>
- #include <sstream>
diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.1-cxx-std.patch b/games-strategy/s25rttr/files/s25rttr-0.9.1-cxx-std.patch
deleted file mode 100644
index cb5ecdf28220..000000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.9.1-cxx-std.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 5db419d044149ab3760c1588b44536febab5d657 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sat, 11 Sep 2021 08:41:57 +0100
-Subject: [PATCH] Set C++ standard (to C++14) using CMake
-
-Not adding the -std flag broke builds with GCC 11 until the code was
-fixed up recently. This should prevent this sort of thing from
-happening in future. It also ensures that the compiler is actually new
-enough.
----
- CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8ab991c97..b55c545a2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -22,6 +22,9 @@ if(DEFINED CMAKE_TOOLCHAIN_FILE)
-     message(STATUS "Used Toolchain definition file '${CMAKE_TOOLCHAIN_FILE}'")
- endif()
- 
-+set(CMAKE_CXX_STANDARD 14)
-+set(CXX_STANDARD_REQUIRED ON)
-+
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules" "${CMAKE_SOURCE_DIR}/external/libutil/cmake")
- if(CMAKE_VERSION VERSION_LESS 3.14)
-     list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/external/libutil/cmake/cmake_3.14")
--- 
-2.32.0
-
diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.1-libsamplerate.patch b/games-strategy/s25rttr/files/s25rttr-0.9.1-libsamplerate.patch
deleted file mode 100644
index 41d6d90e5fd8..000000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.9.1-libsamplerate.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 16cb06c99f78a21b1be2bc681c1f1d85a6caddca Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Fri, 10 Sep 2021 22:59:51 +0100
-Subject: [PATCH] Fix bad channel count handling with libsamplerate 0.2.0
-
-Since libsndfile/libsamplerate@26d92c369394bcd0b0cea488890edce1a0d757d5,
-initialising libsamplerate with 0 channels or less causes a SIGABRT. We
-therefore need to handle this in the C++ wrapper classes.
----
- libs/libsamplerate/include/samplerate.hpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/libs/libsamplerate/include/samplerate.hpp b/libs/libsamplerate/include/samplerate.hpp
-index d0af34317..23e243d91 100644
---- a/libs/libsamplerate/include/samplerate.hpp
-+++ b/libs/libsamplerate/include/samplerate.hpp
-@@ -152,6 +152,8 @@ class State : public detail::StateBase
- {
-     static SRC_STATE* createOrThrow(Converter converter, int channels)
-     {
-+        if (channels <= 0)
-+            throw std::runtime_error("Channel count must be >= 1.");
-         int error;
-         auto* state = src_new(static_cast<int>(converter), channels, &error);
-         if(!state)
-@@ -174,6 +176,8 @@ class StateCallback : public detail::StateBase
- {
-     static SRC_STATE* createOrThrow(Converter converter, int channels, src_callback_t func, void* data)
-     {
-+        if (channels <= 0)
-+            throw std::runtime_error("Channel count must be >= 1.");
-         int error;
-         auto* state = src_callback_new(func, static_cast<int>(converter), channels, &error, data);
-         if(!state)
--- 
-2.32.0
-
diff --git a/games-strategy/s25rttr/s25rttr-0.9.1.ebuild b/games-strategy/s25rttr/s25rttr-0.9.1.ebuild
deleted file mode 100644
index 1cf08d68bd4e..000000000000
--- a/games-strategy/s25rttr/s25rttr-0.9.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-3 )
-
-inherit desktop flag-o-matic lua-single toolchain-funcs xdg cmake
-
-MY_PN="s25client"
-DESCRIPTION="Open source remake of The Settlers II: Gold Edition (needs original data files)"
-HOMEPAGE="https://www.siedler25.org/"
-SRC_URI="https://github.com/Return-To-The-Roots/${MY_PN}/releases/download/v${PV}/${MY_PN}_src_v${PV}.tar.gz"
-LICENSE="GPL-2+ GPL-3 Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="${LUA_DEPS}
-	app-arch/bzip2
-	>=dev-libs/boost-1.73:0=[nls]
-	>=media-libs/libsamplerate-0.1.9
-	>=media-libs/libsdl2-2.0.10-r2[opengl,sound,video]
-	media-libs/libsndfile
-	media-libs/sdl2-mixer[vorbis,wav]
-	net-libs/miniupnpc
-	virtual/opengl
-"
-
-DEPEND="
-	${RDEPEND}
-	test? ( >=sys-devel/clang-5 )
-"
-
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.0_pre20200723-boost-1.77-missing-include.patch
-	"${FILESDIR}"/${PN}-0.9.0_pre20200723-cmake_lua_version.patch
-	"${FILESDIR}"/${PN}-0.9.1-libsamplerate.patch
-	"${FILESDIR}"/${PN}-0.9.1-cxx-std.patch
-)
-
-S="${WORKDIR}/${MY_PN}_v${PV}"
-
-# Build type is checked but blank is valid.
-CMAKE_BUILD_TYPE=
-
-src_prepare() {
-	cmake_src_prepare
-	rm -v external/{kaguya,libutil}/cmake/FindLua.cmake || die
-}
-
-src_configure() {
-	if [[ -f revision.txt ]]; then
-		local RTTR_REVISION="$(< revision.txt)"
-	elif [[ -n ${COMMIT} ]]; then
-		local RTTR_REVISION="${COMMIT}"
-	else
-		die "Could not determine RTTR_REVISION."
-	fi
-
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DCCACHE_PROGRAM=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_ClangFormat=ON
-		-DCMAKE_SKIP_RPATH=ON
-		-DLUA_VERSION=$(lua_get_version)
-		-DRTTR_BUILD_UPDATER=OFF
-		-DRTTR_ENABLE_OPTIMIZATIONS=OFF
-		-DRTTR_ENABLE_SANITIZERS=$(usex test)
-		-DRTTR_ENABLE_WERROR=OFF
-		-DRTTR_INCLUDE_DEVTOOLS=OFF
-		-DRTTR_LIBDIR="$(get_libdir)"
-		-DRTTR_REVISION="${RTTR_REVISION}"
-		-DRTTR_USE_SYSTEM_LIBS=ON
-		-DRTTR_VERSION="${PV##*_pre}" # Tests expect a date for snapshots.
-	)
-
-	if use test && tc-is-gcc; then
-		# Work around libasan and libsandbox both wanting to be first.
-		append-ldflags -static-libasan
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	SDL_AUDIODRIVER=dummy \
-	SDL_VIDEODRIVER=dummy \
-	USER=$(whoami) \
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	doicon -s 64 tools/release/debian/s25rttr.png
-	make_desktop_entry "${MY_PN}" "Return to the Roots"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! has_version -r games-strategy/settlers-2-gold-data; then
-		elog "Install games-strategy/settlers-2-gold-data or manually copy the DATA"
-		elog "and GFX directories from original data files into"
-		elog "${EPREFIX}/usr/share/${PN}/S2."
-	fi
-}
diff --git a/games-strategy/war1gus/Manifest b/games-strategy/war1gus/Manifest
index 9c0c39652772..63c9e7156182 100644
--- a/games-strategy/war1gus/Manifest
+++ b/games-strategy/war1gus/Manifest
@@ -1,7 +1,9 @@
 DIST war1gus-3.2.0.tar.gz 408417 BLAKE2B 8369d380813aa6a5c7484e7b668284ee3b59bd4a914b82b074640344af977c08727260efc284a5ffc7d5c52ef7ae0ab45b484d87d855a088198b02adf5240bac SHA512 2e3509792509730254e9292dce66491e848980a37171281dcd851aaa0662a3dd8911444d97c25486acb61fa5ad913da3bb397ddd599cd7ea1293b0afbfc88bc6
 DIST war1gus-3.3.0.tar.gz 486274 BLAKE2B 90675ce44cab26079c53ebd70377ea24bef3894d1f194f45496a0df6528e1bb63184f3c93f843ab9176ad02c542a9e51fbfa9f4af3bce6018fa7085d31494998 SHA512 9e17101954f7e953ba11cebd2f62eb9e3465217897bd55699846d6290fa5d249574d144f271e08485bc38ef7dd63e5efa05437faa5191148d1ea9341157834ea
 DIST war1gus-3.3.1.tar.gz 486322 BLAKE2B cdf3db536c6cae2327ba044da13f2743c299481503723d00fbfeb8103932a0065afb0771f1719264fa7ed298b876f2189bc9c1def2b4fcc6c1b4a45992d0d322 SHA512 947592a220aeae99840abc88c5086d681afb72971f25f3e42c475d416529bb0341ca409aa5459e049d1dbe4b937cf25c29c6445958c5c61e26a67c4a4dd7ccb0
+DIST war1gus-3.3.2.tar.gz 486326 BLAKE2B 2ea0506bc2dabf8a1a58f52fe3bb0b110f07100b6f6ade29f2273f7718c8ef8572c642e6fba5005894383100190f3b649faa1b06286f11d4b7718cb59833eeb4 SHA512 e4c0b297cf215618edf007d2b1584f7d812607a33587b5254e1620dff6aa7a282b67b464b39eed11cd7405cae34d11f1587f42893b2ccf4ca531dc4c37375d74
 EBUILD war1gus-3.2.0.ebuild 1495 BLAKE2B 10ab67d560010d6147c6e282fa338175cfac6a0123b0615cad5fc1fe8ae09247a9fa784d23ddf043bf595b4583a42ff0e182a338aa80dc43eac589d5aad2c583 SHA512 c8780c26dee696a286fb5370b53a92b90634442f2e9b4554189ab986e9e24fb98bd632a124fd702070e20f448499bbf7a624ad7e32192e06fd2d696e2015fb69
 EBUILD war1gus-3.3.0.ebuild 1498 BLAKE2B 642be81055314d0f2f375d50707c94dbb901bc936527f2b19042ce08fb5e703671ba90626d4db21f4a6842bd6ad004f2a1c98bad83f8946575ece78c1ac45479 SHA512 9092d857009bed0219eb2c9ca9bcbeb75d4663394be94976c4a1ee0eccc0bcee8cee7dd3a81c5b464d4795a3bd227c2e4a62ec04a132ec18a5088a3644115278
 EBUILD war1gus-3.3.1.ebuild 1498 BLAKE2B 642be81055314d0f2f375d50707c94dbb901bc936527f2b19042ce08fb5e703671ba90626d4db21f4a6842bd6ad004f2a1c98bad83f8946575ece78c1ac45479 SHA512 9092d857009bed0219eb2c9ca9bcbeb75d4663394be94976c4a1ee0eccc0bcee8cee7dd3a81c5b464d4795a3bd227c2e4a62ec04a132ec18a5088a3644115278
+EBUILD war1gus-3.3.2.ebuild 1498 BLAKE2B 642be81055314d0f2f375d50707c94dbb901bc936527f2b19042ce08fb5e703671ba90626d4db21f4a6842bd6ad004f2a1c98bad83f8946575ece78c1ac45479 SHA512 9092d857009bed0219eb2c9ca9bcbeb75d4663394be94976c4a1ee0eccc0bcee8cee7dd3a81c5b464d4795a3bd227c2e4a62ec04a132ec18a5088a3644115278
 MISC metadata.xml 327 BLAKE2B 46d81ac16cc61355d8953d219d4fc378cca7390f8b4087410c898f25b3beaf97d8c74af9f99e9201adb92efe737c9fb5c3951a2f9859d24d802b5ecb846996a7 SHA512 6b513ad53703bf295fce142b26ec995fb6a1115a6ecf13813eec0f2cd5318f3d0f0fe01f4c3ef4848a6d00417dbb2558a6ed1879e3890951960c127e7693b1ed
diff --git a/games-strategy/war1gus/war1gus-3.3.2.ebuild b/games-strategy/war1gus/war1gus-3.3.2.ebuild
new file mode 100644
index 000000000000..d61b049b1854
--- /dev/null
+++ b/games-strategy/war1gus/war1gus-3.3.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Warcraft: Orcs & Humans for the Stratagus game engine"
+HOMEPAGE="
+	https://stratagus.com/war1gus.html
+	https://github.com/Wargus/war1gus/
+"
+SRC_URI="
+	https://github.com/Wargus/war1gus/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	=games-engines/stratagus-${PV}*[theora]
+	media-libs/libpng:0=
+	sys-libs/zlib:=
+	x11-libs/gtk+:2
+	x11-libs/libX11
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DGAMEDIR="${EPREFIX}/usr/bin"
+		-DBINDIR="${EPREFIX}/usr/bin"
+		-DSTRATAGUS="${EPREFIX}/usr/bin/stratagus"
+		-DSHAREDIR="${EPREFIX}/usr/share/stratagus/war1gus"
+		-DICONDIR=/usr/share/icons/hicolor/64x64/apps
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	elog "War1gus requires the data from the original game to run.  The game"
+	elog "will ask you for the location of the game data and extract/convert"
+	elog "it automatically on the first run."
+
+	if ! has_version media-video/ffmpeg ||
+		! has_version media-sound/timidity++
+	then
+		elog
+		elog "If you did not convert the game data yet, you may want to install"
+		elog "the following optional dependencies:"
+		elog
+		elog "media-video/ffmpeg -- to convert game videos"
+		elog "media-sound/timidity++ -- to convert game music"
+	fi
+
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-strategy/wargus/Manifest b/games-strategy/wargus/Manifest
index bc25aac8cd0e..8b72455151f3 100644
--- a/games-strategy/wargus/Manifest
+++ b/games-strategy/wargus/Manifest
@@ -1,7 +1,9 @@
 DIST wargus-3.2.0.tar.gz 5062175 BLAKE2B e742c2dae21aa5a8a05ef8a4cefc7d1245707d401aa9e14dfc633aeac0e4e4e54459c0ce07cbd32aed842c3dcf57ea8df39fcfc34a9316211146a61ce71464dc SHA512 bc85304c0994abf778cf157d1013d9dea18e1d761a3b432018641211824bcdb2e424c938842848d8c7a670d8660289b5860342a99be7af259cf8eaf883af1285
 DIST wargus-3.3.0.tar.gz 5094634 BLAKE2B aa0b02d62dc8620ba9517e5c7d1e8193f2c4c0e20b9b96b91cd5aa57fefdfda7354c82d67507aea67704adc7c77d90b858f0f3fb78d2a1bf430b5c4c5251f432 SHA512 3a2bd04aed0ced18a11ab925ca3d4da98f8848b45a0716fe5164ee5e0f9c76a63d7783d9ba94f3de022622e841f0257cb59d507ea772b2cc42419cef01ea8cbc
 DIST wargus-3.3.1.tar.gz 5094251 BLAKE2B b5f3674db93a8973f166e6dd0dcd9adeee330aa3932b97218b10e3540f5bc6123c977f45463d77c1cf6cc8d5dcadf39d799551311e9a891ec91200e668febcd8 SHA512 33a642d87a9a0d407fd8591fbb19d5357b5d7ae2fa3319512776feb0b6dbdc4d403e82de907235a9614302b5b0af466da37af21f7f4093715d39fe7e7da30468
+DIST wargus-3.3.2.tar.gz 5110092 BLAKE2B bbde0931307f7a182086e898ff87e8d559ad0f239b04a019359a30fbca20b82745d598571d8d42353952aade4b96ded3de8e06b92dc947c7a7d9aee00c315c71 SHA512 111d7bc0889f86356226478834d515912b1221a131aa405acf75cbdd16cda4e83c4e900ea30e86c162301504a617755284a9656d6709aaa7ab2baf8f8591dcf8
 EBUILD wargus-3.2.0.ebuild 1938 BLAKE2B dd8622e5021dcb08c3d52838023871eb1cae2f66198d336bbd8e40cb9cb780642b71655211acff480da59e65d25eb594ec9a137fd26471824e8158c3141133b6 SHA512 0a46d7635c3b3a59a18f952df7427b8e8e454bd7c5ac56e232338c88387b050eddefc028f9a1415ec1db76ac3b8c4e86d7c31ce1bc3d697aadd50bf3e14fdcc9
 EBUILD wargus-3.3.0.ebuild 1949 BLAKE2B c9f02b4a29a00843e327fccc84aa2ce9ace4eb2611d4925dae763ec9cfda9cf5759e9e4ee71837445c3580ca9de2573f064e2b837260f5e978c1dc8cf48cdb87 SHA512 80e5ae52de4cae8499b9d904a7f73f35ea7ea13e53c9cb6a2a9576d57afe507fa6c67036e9858949b41056ec006ad17ee5610b82f3e9dd06841a14aa77086f6f
 EBUILD wargus-3.3.1.ebuild 1949 BLAKE2B c9f02b4a29a00843e327fccc84aa2ce9ace4eb2611d4925dae763ec9cfda9cf5759e9e4ee71837445c3580ca9de2573f064e2b837260f5e978c1dc8cf48cdb87 SHA512 80e5ae52de4cae8499b9d904a7f73f35ea7ea13e53c9cb6a2a9576d57afe507fa6c67036e9858949b41056ec006ad17ee5610b82f3e9dd06841a14aa77086f6f
+EBUILD wargus-3.3.2.ebuild 1949 BLAKE2B c9f02b4a29a00843e327fccc84aa2ce9ace4eb2611d4925dae763ec9cfda9cf5759e9e4ee71837445c3580ca9de2573f064e2b837260f5e978c1dc8cf48cdb87 SHA512 80e5ae52de4cae8499b9d904a7f73f35ea7ea13e53c9cb6a2a9576d57afe507fa6c67036e9858949b41056ec006ad17ee5610b82f3e9dd06841a14aa77086f6f
 MISC metadata.xml 536 BLAKE2B 4d7b4b47f8ac2fd71541d4f013b9e9e68a1be97426acdf768bbc2bb75cd16ec583a6542eab31a0cf11f16e3ebfbfcce6bf4b968a7dde059d388d1b8bf18a6048 SHA512 6cb843f123a8e5c5f81e92db2088a64601f00dffbebec293a59f34a6bff16aa763aaecc49d3e7429831bfebc77c72c70d9ae0958ecaf51ae73ea2ff746c4adab
diff --git a/games-strategy/wargus/wargus-3.3.2.ebuild b/games-strategy/wargus/wargus-3.3.2.ebuild
new file mode 100644
index 000000000000..fff6023fa177
--- /dev/null
+++ b/games-strategy/wargus/wargus-3.3.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Warcraft II for the Stratagus game engine"
+HOMEPAGE="
+	https://stratagus.com/
+	https://github.com/Wargus/wargus/
+"
+SRC_URI="
+	https://github.com/Wargus/wargus/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bne"
+
+DEPEND="
+	=games-engines/stratagus-${PV}*[theora]
+	media-libs/libpng:0=
+	sys-libs/zlib:=
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	bne? ( app-arch/stormlib:= )
+	!games-strategy/wargus-data
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+pkg_pretend() {
+	if has_version games-strategy/wargus-data; then
+		ewarn "The system-wide install of game data via games-strategy/wargus-data"
+		ewarn "no longer works.  The old data will be uninstalled after merging"
+		ewarn "this version of Wargus.  If you would like to preserve it, please"
+		ewarn "abort the process and back /usr/share/stratagus/wargus up."
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGAMEDIR="${EPREFIX}/usr/bin"
+		-DBINDIR="${EPREFIX}/usr/bin"
+		-DSTRATAGUS="${EPREFIX}/usr/bin/stratagus"
+		-DSHAREDIR="${EPREFIX}/usr/share/stratagus/wargus"
+		-DICONDIR=/usr/share/icons/hicolor/64x64/apps
+		-DWITH_STORMLIB=$(usex bne)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	elog "Wargus requires the data from the original game to run.  The game"
+	elog "will ask you for the location of the game data and extract/convert"
+	elog "it automatically on the first run."
+
+	if ! has_version media-video/ffmpeg ||
+		! has_version media-sound/cdparanoia
+	then
+		elog
+		elog "If you did not convert the game data yet, you may want to install"
+		elog "the following optional dependencies:"
+		elog
+		elog "media-video/ffmpeg -- to convert game videos"
+		elog "media-sound/cdparanoia -- to rip game music from the CD"
+	fi
+
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index 97b40a92560a..22faebce4be2 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,9 +1,5 @@
 AUX warzone2100-4.1.3-no-compress-manpages.patch 2317 BLAKE2B 00d67b7df0898b1a6343b38ffb7e1655d3f16a94bffe94894f3cff5e25f1e7f426046beda9983eea963bac5fb2a7e49aca473b8b78d141ac00baa250710093c1 SHA512 48b8c3f651bf7d504da88a6351799cc9cd19bf84191f52e9ca5b0c5c60b52a81587c8a03fde5e3d8d19e7770dc7b17dd60b59d8441b47221a7cda5a8008f9558
-DIST warzone2100-4.2.2.tar.xz 338585896 BLAKE2B e90ff6f5843a1750971a2cb7e77aac1e7c03ebeae90ea112d1eb735ea4a9cfee35de860e52f81824cde69543af6172ee630b6451ea39c141c188e4469f9200b9 SHA512 ea02207a27a01114daaf0819a98a63a5189570844dd69f50f493a1caafab7c05d85fb0d5c8a8b1b061ee3a050081e9786a1c090f4490134e93e8bbfa1903bd1b
-DIST warzone2100-4.2.4.tar.xz 338685080 BLAKE2B d83fc41d7bb7ff062ca6d3ce924c5e50560737b309db5a31e9fa81ed4dd5c079cf53aed472d1686daaa2e758583e79c3310575191e95d0b01d0f692786ff015f SHA512 26f470c137d9f53b759d182058080a07b7a505aa900fc0e6ff8349783564e0e298216f162032ff43c15f1e5811a8192e161498f87d8cc624a1a653a4044fcfb7
 DIST warzone2100-4.2.6.tar.xz 338691628 BLAKE2B 234d78feb1fceb0eff23c2c1b8d85a5fd9e5ef8912b324ae159ffdb43be728d6e4aa78bdf01561e60c64826083936bc36c2dfd1cee443aed06a52eaa047e8517 SHA512 5cddeff5b66d9e710b0c4d6d2863100106a901c17815220b7a97633a3980be41eaa192921d39bffff60f547fb5f5358fa1e63a54f41b5083203916314bb3d2a1
 DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6
-EBUILD warzone2100-4.2.2.ebuild 2678 BLAKE2B 4c3db36d5f39189d1e43fbedeb894546bc133fc9d772f6fed8bb5bb7d1b39d84db2d6f66ac337a2c80cd24eef2d7fbd8cb230f1d2f6814d8f26ca658b13fa0ef SHA512 9459049e8aff4cb3a481699fbc1ebc2ba92d780cfe4984e9ddfdda8f03de5a465fb91d1da5b1a4d84d957a2fba23decdb4c7ab917e52b1f8e8367a97f46393d7
-EBUILD warzone2100-4.2.4.ebuild 2678 BLAKE2B eb14053d289202f6c2678b70f56ab28c44608cfc035fcb290dad7aaa003cb35978811c31181e2395f9f3205aa79ce820a744a861e6aef1381cb1eec4cad541d3 SHA512 6ef716767cc4665be642a00281f76c51bbcd7baa18265f8f1f3648da5bc0af4c7207f65fda367f7faff231e5ba566509b11bb303b56a0134972da48124a07302
 EBUILD warzone2100-4.2.6.ebuild 2678 BLAKE2B abbd712501c57c331e199ff6d75ecfba88660576549f181e21e8e769f0525d2096b9781434031a10f1a8990313ccad49a609258ba8099836e4d8499726c396a7 SHA512 f30803098c061db711c06b007cb384d31c9a4888044815308ea74cbaf748cba05db41b3b90ba7a400b32a82155379ceb1f5bddfeda628f160aa19b7a4c5377f2
 MISC metadata.xml 812 BLAKE2B b2b9ab08275974118342f645f9c6fee90fb2f8904a3c6708666d71d57ec71ab86e9f905669cc3fe9424cec8329d434c979e9ae87324f0b47ed313b28c66d6070 SHA512 0af92d46baaf497a9f5aa57e45f0860e94c36f008386c1f483a49d8df50719ef11532a8473b4068a5cc63286d7af72b71e4de2e883b178c278b7aecf27f8389d
diff --git a/games-strategy/warzone2100/warzone2100-4.2.2.ebuild b/games-strategy/warzone2100/warzone2100-4.2.2.ebuild
deleted file mode 100644
index 929af63b820a..000000000000
--- a/games-strategy/warzone2100/warzone2100-4.2.2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="af_ZA bg_BG ca_ES cs da de el en_GB eo es et_EE fa_IR fi fr fy ga he_IL hr hu id_ID id it ko la lt nb nl pl pt_BR pt ro ru sk sl tr tt_RU uk_UA zh_CN zh_TW"
-inherit cmake plocale xdg
-
-MY_PV=$(ver_cut 1-2)
-VIDEOS_PV=2.2
-VIDEOS_P=${PN}-videos-${VIDEOS_PV}.wz
-DESCRIPTION="3D real-time strategy game"
-HOMEPAGE="https://wz2100.net/"
-SRC_URI="mirror://sourceforge/warzone2100/releases/${PV}/${PN}_src.tar.xz -> ${P}.tar.xz
-	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain vulkan? ( GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# Upstream requested debug support
-IUSE="debug discord nls videos vulkan"
-
-CDEPEND="
-	>=dev-games/physfs-2[zip]
-	dev-db/sqlite:3
-	>=dev-libs/libsodium-1.0.14:=
-	media-libs/freetype:2
-	media-libs/harfbuzz:=
-	media-libs/libogg
-	media-libs/libpng:=
-	media-libs/libsdl2[opengl,video,X]
-	media-libs/libtheora
-	media-libs/libvorbis
-	media-libs/openal
-	net-libs/miniupnpc:=
-	net-misc/curl
-	sys-libs/zlib
-	nls? ( virtual/libintl )
-	vulkan? ( media-libs/libsdl2:=[vulkan] )
-"
-DEPEND="
-	${CDEPEND}
-	dev-libs/fribidi
-	media-libs/fontconfig
-"
-RDEPEND="
-	${CDEPEND}
-	media-fonts/dejavu
-"
-BDEPEND="
-	app-arch/zip
-	app-text/asciidoc
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-HTML_DOCS=( doc/quickstartguide.html doc/docbook-xsl.css doc/ScriptingManual.htm )
-DOCS=( README.md doc/images doc/Scripting.md doc/js-globals.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.1.3-no-compress-manpages.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.xz
-}
-
-src_prepare() {
-	sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die
-
-	# Delete translations we're not using
-	cleanup_po() {
-		local locale=${1}
-		einfo "Cleaning up disabled locale: ${locale}"
-		rm po/${locale}.po || die
-	}
-
-	plocale_for_each_disabled_locale cleanup_po
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWZ_DISTRIBUTOR="Gentoo Linux"
-		-DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF
-		-DWZ_ENABLE_BACKEND_VULKAN=$(usex vulkan)
-		-DBUILD_SHARED_LIBS=OFF
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_DISCORD=$(usex discord)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	asciidoc -b html5 doc/quickstartguide.asciidoc || die
-}
-
-src_install() {
-	cmake_src_install
-
-	rm "${ED}"/usr/bin/.portable || die
-
-	# We cover licencing within the ebuild itself
-	rm "${ED}"/usr/share/doc/${PF}/COPYING* \
-		"${ED}"/usr/share/doc/${PF}/copyright || die
-
-	if use videos ; then
-		insinto /usr/share/${PN}
-		newins "${DISTDIR}"/${VIDEOS_P} sequences.wz
-	fi
-}
diff --git a/games-strategy/warzone2100/warzone2100-4.2.4.ebuild b/games-strategy/warzone2100/warzone2100-4.2.4.ebuild
deleted file mode 100644
index e58fc5f270f8..000000000000
--- a/games-strategy/warzone2100/warzone2100-4.2.4.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PLOCALES="af_ZA bg_BG ca_ES cs da de el en_GB eo es et_EE fa_IR fi fr fy ga he_IL hr hu id_ID id it ko la lt nb nl pl pt_BR pt ro ru sk sl tr tt_RU uk_UA zh_CN zh_TW"
-inherit cmake plocale xdg
-
-MY_PV=$(ver_cut 1-2)
-VIDEOS_PV=2.2
-VIDEOS_P=${PN}-videos-${VIDEOS_PV}.wz
-DESCRIPTION="3D real-time strategy game"
-HOMEPAGE="https://wz2100.net/"
-SRC_URI="mirror://sourceforge/warzone2100/releases/${PV}/${PN}_src.tar.xz -> ${P}.tar.xz
-	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain vulkan? ( GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# Upstream requested debug support
-IUSE="debug discord nls videos vulkan"
-
-CDEPEND="
-	>=dev-games/physfs-2[zip]
-	dev-db/sqlite:3
-	>=dev-libs/libsodium-1.0.14:=
-	media-libs/freetype:2
-	media-libs/harfbuzz:=
-	media-libs/libogg
-	media-libs/libpng:=
-	media-libs/libsdl2[opengl,video,X]
-	media-libs/libtheora
-	media-libs/libvorbis
-	media-libs/openal
-	net-libs/miniupnpc:=
-	net-misc/curl
-	sys-libs/zlib
-	nls? ( virtual/libintl )
-	vulkan? ( media-libs/libsdl2:=[vulkan] )
-"
-DEPEND="
-	${CDEPEND}
-	dev-libs/fribidi
-	media-libs/fontconfig
-"
-RDEPEND="
-	${CDEPEND}
-	media-fonts/dejavu
-"
-BDEPEND="
-	app-arch/zip
-	app-text/asciidoc
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-HTML_DOCS=( doc/quickstartguide.html doc/docbook-xsl.css doc/ScriptingManual.htm )
-DOCS=( README.md doc/images doc/Scripting.md doc/js-globals.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.1.3-no-compress-manpages.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.xz
-}
-
-src_prepare() {
-	sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die
-
-	# Delete translations we're not using
-	cleanup_po() {
-		local locale=${1}
-		einfo "Cleaning up disabled locale: ${locale}"
-		rm po/${locale}.po || die
-	}
-
-	plocale_for_each_disabled_locale cleanup_po
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWZ_DISTRIBUTOR="Gentoo Linux"
-		-DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF
-		-DWZ_ENABLE_BACKEND_VULKAN=$(usex vulkan)
-		-DBUILD_SHARED_LIBS=OFF
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_DISCORD=$(usex discord)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	asciidoc -b html5 doc/quickstartguide.asciidoc || die
-}
-
-src_install() {
-	cmake_src_install
-
-	rm "${ED}"/usr/bin/.portable || die
-
-	# We cover licencing within the ebuild itself
-	rm "${ED}"/usr/share/doc/${PF}/COPYING* \
-		"${ED}"/usr/share/doc/${PF}/copyright || die
-
-	if use videos ; then
-		insinto /usr/share/${PN}
-		newins "${DISTDIR}"/${VIDEOS_P} sequences.wz
-	fi
-}
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 02b4436de502..4b853be9461d 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,8 +1,6 @@
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
-DIST wesnoth-1.16.2.tar.gz 517313669 BLAKE2B b1b9a2795a7a298edd1d952547db518a31f217f983aaf39cdde7a14773f2538485c980205e9242d4a1c8f933011a09a7e858de128c7d17c16c552e34b2a59bf3 SHA512 19cb4c64d9cce780ffbb54e357bf88c3cf2eedc835fab7162bd9caa62485a60ab2a1ba68ab0c4b98dc05bab4fb22889f4a8237b9542baa5478fbda08034d9f66
 DIST wesnoth-1.16.3.tar.gz 518049863 BLAKE2B e862de2e6f71a1dfe11b0cb6343ea1da78c0eb035893d7bd16ca86586b689b21f39b5266ba86476829c1c9005f7abc37058c2f0ac8ea1ae2970d609880e0da20 SHA512 7f37a1a16ed51ffa935a457553b1a3890398b928bb5893720b746080b37a121a86e21ae402bdddfe30572adccf71a985bf1e3223a0eb443bf7a696ee213d9bf0
 DIST wesnoth-1.17.5.tar.bz2 418959651 BLAKE2B 3b6e015192a4050e5d16b25b0e67f91894eeae772125e4bbbefa81082b17fc9c479cf0f4c68d3b74afc5e656c8680319d336d1c14f421f875a64df9b6adbd830 SHA512 7033673f058f3114fcaf9e9b0f5f457c4ed2243fdf04cf80775815d2661bead73d7323c00f4aa678ff82f3d2c23000d81aca97c58f33635060341368ef8c4377
-EBUILD wesnoth-1.16.2.ebuild 2241 BLAKE2B 3b85bf93462df6be33d01f54c2105f884b3c73a68de91f464cf3295420ab449d3bc4089a7c88354612242dd96f226c10f72b0cd6344e2c2510ee3932898a54bb SHA512 037e7760f3b474fa8a674b25b78f7503c8b484b2f4c2f30b0ccdbf2eeaa885972eb9d011a5253d801738931cc12c3edf10fb4b2e2c8c538c9d2d9391cdd9f755
 EBUILD wesnoth-1.16.3.ebuild 2241 BLAKE2B 3b85bf93462df6be33d01f54c2105f884b3c73a68de91f464cf3295420ab449d3bc4089a7c88354612242dd96f226c10f72b0cd6344e2c2510ee3932898a54bb SHA512 037e7760f3b474fa8a674b25b78f7503c8b484b2f4c2f30b0ccdbf2eeaa885972eb9d011a5253d801738931cc12c3edf10fb4b2e2c8c538c9d2d9391cdd9f755
 EBUILD wesnoth-1.17.5.ebuild 2214 BLAKE2B da4ccb1c6eab6c3c7c4ae7c863aa4a920b43672acd58fbb2067058f3cd875fec58ea0da4369612bb03667ac62ca835bd344aa62504cd460a5f394da5f9725491 SHA512 bbd9c354e5f7d5fc2b1eb3d40a5aa21f31ea750417b0ee5531104d1acba7a88c004070d4cb5e89c3918bd46c459cf9a34c890d5872daa5ecd92314dcfe28c85f
 MISC metadata.xml 418 BLAKE2B 636dfbbd604111ba7c6241fbbc8ba8bd9a4f1f6e30811c9f3788a3624deadf751ad62dca9e24a74f19709900c32530fd3b12363ba288a94d2d94eb9c7e15b6f1 SHA512 298467b69ae7455c096e186061df02c45dd42aa33241ea12bd672a551589dd62a7cf5d2e383a6e94a6ee1332bc29b24f80e4597cbb0771e64b40d3bee5249102
diff --git a/games-strategy/wesnoth/wesnoth-1.16.2.ebuild b/games-strategy/wesnoth/wesnoth-1.16.2.ebuild
deleted file mode 100644
index 17cdd9a055f7..000000000000
--- a/games-strategy/wesnoth/wesnoth-1.16.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-	https://github.com/wesnoth/wesnoth"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# uneven minor versions are development versions
-if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-IUSE="dbus dedicated doc nls server"
-
-RDEPEND="
-	acct-group/wesnoth
-	acct-user/wesnoth
-	dev-libs/boost:=[bzip2,context,icu,nls,threads(+)]
-	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-	!dedicated? (
-		dev-libs/glib:2
-		dev-libs/openssl:0=
-		>=media-libs/fontconfig-2.4.1
-		>=media-libs/sdl2-image-2.0.0[jpeg,png]
-		>=media-libs/sdl2-mixer-2.0.0[vorbis]
-		media-libs/libvorbis
-		>=x11-libs/pango-1.22.0
-		>=x11-libs/cairo-1.10.0
-		sys-libs/readline:0=
-		dbus? ( sys-apps/dbus )
-	)"
-DEPEND="${RDEPEND}
-	x11-libs/libX11
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	cmake_src_prepare
-
-	if ! use doc ; then
-		sed -i \
-			-e '/manual/d' \
-			doc/CMakeLists.txt || die
-	fi
-
-	# respect LINGUAS (bug #483316)
-	if [[ ${LINGUAS+set} ]] ; then
-		local lang langs=()
-		for lang in $(cat po/LINGUAS) ; do
-			has ${lang} ${LINGUAS} && langs+=( ${lang} )
-		done
-		echo "${langs[@]}" > po/LINGUAS || die
-	fi
-}
-
-src_configure() {
-	filter-flags -ftracer -fomit-frame-pointer
-
-	if use dedicated || use server ; then
-		mycmakeargs=(
-			-DENABLE_CAMPAIGN_SERVER="ON"
-			-DENABLE_SERVER="ON"
-			-DSERVER_UID="${PN}"
-			-DSERVER_GID="${PN}"
-			-DFIFO_DIR="/run/wesnothd"
-			)
-	else
-		mycmakeargs=(
-			-DENABLE_CAMPAIGN_SERVER="OFF"
-			-DENABLE_SERVER="OFF"
-			)
-	fi
-	mycmakeargs+=(
-		-Wno-dev
-		-DENABLE_GAME="$(usex !dedicated)"
-		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_NOTIFICATIONS="$(usex dbus)"
-		-DENABLE_STRICT_COMPILATION="OFF"
-		)
-	cmake_src_configure
-}
-
-src_install() {
-	local DOCS=( README.md changelog.md )
-	cmake_src_install
-	if use dedicated || use server ; then
-		rmdir "${ED}"/run{/wesnothd,} || die
-		newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
-	fi
-}
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index b4cb8fb8bf5f..37fbc008ad03 100644
Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ
diff --git a/games-util/deutex/Manifest b/games-util/deutex/Manifest
index 33bedaf1371d..14094b08abed 100644
--- a/games-util/deutex/Manifest
+++ b/games-util/deutex/Manifest
@@ -1,5 +1,3 @@
-DIST deutex-5.2.0.tar.xz 165772 BLAKE2B 4451e6abc13d3d6e9176a5d8aad6a5d3d986b2b280b2094d89876ec9bea68db5aa9179f8d650932499a2f8853fb57644f723e4214f5a973f217ef34e236e57a9 SHA512 5baa3e06e8562e36e9e520a52a7b4407277e7741deb543eb7b68587a9aab3f409c574415654e8a1ef15d2afb7750aa603189f8de749353666295c6a292b92a33
 DIST deutex-5.2.2.tar.zst 172022 BLAKE2B ad290ce6792425ba7f643cfe6c09c1a3f040ad0a4c95822f9368592dde6d489d28e892a26d78f2ebfefa086c910c948ef37eb3a3047429605653b273f9b567a8 SHA512 5f3c3d3ecad3a7949270a10c3c7e3a8be938389d4846dcac171526a9fd0485e056889323d303f61630e8735e5735edc91df7ad4efaba3d0b2b66a9d719017ebc
-EBUILD deutex-5.2.0.ebuild 565 BLAKE2B 0e507e25b9617714c7e183564af787cb8fc997a08228db79e7b4657764852e695b71ff931652ffb75d0bcdc1436b9f9c5ee453ab9f6ba81e283c5bbdf68f4f7d SHA512 a89f01e8255532877c22bcf0e12232c02e02a6d794fb69cb6734b5f70b69d5d72d4ecd6794342e05d909c72c653e147d3dbf35b3af0fd6b6972fc4bcb3cc1a29
 EBUILD deutex-5.2.2.ebuild 614 BLAKE2B 6324b2e7465e92b9e271e70ad18fca0fc899dfb6b70109c3cc4fcc8065b5ea5b7a6fffee045a9a2e2f1182cec0205443214db4c49d03063e1a5290f9e5e41054 SHA512 0bd0a32acc726a924762be87b991757af68e0ccf733ce7f494390699cbf81efc89defefd0d125bb53658a07a3ad19c3137ed30911819c4fe6aa9c5d7bda5b38b
 MISC metadata.xml 1187 BLAKE2B 11b8abec9790e92c686959f3795da333d8cfa96f8cf02e0216560f035dc68720db00546ce6eb12df7583abd3e12d0ebe5a1a0b0a7bf5c56bd62d53b60b7212f1 SHA512 569065670a257488679cc6a2b4d027a887c42118d5b4ff03e7c87d70071ba809455ffec64d70c019775e7ba2ef7aea0761da1b8564d2a6f36d78e7af56d54af6
diff --git a/games-util/deutex/deutex-5.2.0.ebuild b/games-util/deutex/deutex-5.2.0.ebuild
deleted file mode 100644
index 2edf639b6faa..000000000000
--- a/games-util/deutex/deutex-5.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="WAD composer for Doom, Heretic, Hexen, and Strife"
-HOMEPAGE="https://github.com/Doom-Utils/deutex"
-SRC_URI="https://github.com/Doom-Utils/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2+ HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="man png"
-
-DEPEND="png? ( media-libs/libpng:0= )"
-RDEPEND="${DEPEND}"
-BDEPEND="man? ( app-text/asciidoc )"
-
-src_configure() {
-	econf \
-		$(use_enable man) \
-		$(use_with png libpng)
-}
diff --git a/games-util/lgogdownloader/Manifest b/games-util/lgogdownloader/Manifest
index 9ecdceaf59ae..cab4cac178b0 100644
--- a/games-util/lgogdownloader/Manifest
+++ b/games-util/lgogdownloader/Manifest
@@ -1,6 +1,4 @@
-DIST lgogdownloader-3.8.tar.gz 85271 BLAKE2B ff8e9f80dbec849649b4074ab5890f833a5bfaf120246e7ca5eae83f414af469da29302323dc22632eb0a7259e49e9cf3660ea8953adda75fc7a5308204767bd SHA512 ccc6116f22a5c0bff5e4ef650f6386d5bfc507cc667b7154b021ecdbd45e7553ac33ae6b81531e2cea52a5022ee9c810033518a07374d4e9f7c672344e7ccad3
 DIST lgogdownloader-3.9.tar.gz 86351 BLAKE2B 4ba1a39e2c040910cb3fdef908c229ce8a7def70ba430167977ab4eaa7fdcdfd132a314d256300904dd14052aecffceec92652cfa3eba3c2a54d83b1920ed2b7 SHA512 5ac15776c0ab7416013782652fead180f75e3bd075a3b67c9cb672122c13401ebc91e785daa9e7d332011474240dbb4d8383ddadea2abf0d3bddfc13d6892066
-EBUILD lgogdownloader-3.8.ebuild 824 BLAKE2B 8f66e5a1761eda13849def434d2bfe95d4c06ef0ca222f8b8b986178a59f7c7ce04e7f8c1b73acdaff6dcd58129d5b0376d74e75045f44393e44d1a68f0c1f66 SHA512 6360c6238d29c2033ec40196a4bcbe5c939dfd280107c776108d77b6b9e4fd479c127b7bb16ac3e7a05595b89965abc3f24f8c616ee5111bce9e1b0791aa2f37
 EBUILD lgogdownloader-3.9.ebuild 836 BLAKE2B 9562b45e361db27b3ad1885776f1a78995f7756ff115d9f7aae0133cc138e9d2f88fc6e1af3fdecb17568c5f4a22f43a9df52f8bfc14eeeaff35dd0cb5427a9d SHA512 fdde01bfa79c7930686183830657ab48be929e8f6672cb2935a58634717aea864ce5738240409c21a1dd2b9cb77b302dffdf9cccc689c1b5876e89545ef18bb9
 EBUILD lgogdownloader-9999.ebuild 802 BLAKE2B 7b58e8cdf6ed1e69e9b6d1dd05c23170c5d92d1a70f72b7d3034990cdb3531b106dbc35a71e98ad2da95b9f7fb6c53556d16caa204144c1f5048d887d919aa01 SHA512 239b12971fff5743930a2780327f43b8a9d6ff7396b331fec0001a5ab850d03909ac662c506cf6c49f351a265969a154100230afcb4d8f755eb915648805e723
 MISC metadata.xml 1098 BLAKE2B 154a5ed56c5e935723180acca12ae6e0a14ee2353b1a1626e16e1932922121b8d4b5eb6b5e1f2ade2f707eff696f744677e7d8f9059cdfd6f1357c77a6dc3196 SHA512 b28a6adab900d56756f206983b4fc39f5b0158702cc7a053d4c6a60f926d0dfd5d2853e0df7e99684891d7b6451829b3908c3fe9ff6a320d4fcf51c0910d417e
diff --git a/games-util/lgogdownloader/lgogdownloader-3.8.ebuild b/games-util/lgogdownloader/lgogdownloader-3.8.ebuild
deleted file mode 100644
index 805b3a49d3c0..000000000000
--- a/games-util/lgogdownloader/lgogdownloader-3.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Unofficial GOG.com downloader for Linux"
-HOMEPAGE="https://sites.google.com/site/gogdownloader/"
-SRC_URI="https://sites.google.com/site/gogdownloader/${P}.tar.gz"
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gui"
-
-RDEPEND=">=app-crypt/rhash-1.3.3-r2:0=
-	dev-cpp/htmlcxx:0=
-	dev-libs/boost:0=[zlib]
-	>=dev-libs/jsoncpp-1.7:0=
-	dev-libs/tinyxml2:0=
-	>=net-misc/curl-7.32:0=[ssl]
-	gui? ( dev-qt/qtwebengine:5=[widgets] )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="sys-apps/help2man
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QT_GUI=$(usex gui)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	gunzip "${ED}"/usr/share/man/man1/${PN}.1.gz || die
-}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 6a8540288a30..e5f4f81e454f 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 98d28d330249..2c775d9a86a8 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -2,10 +2,10 @@ AUX 42.0-meson-Add-optionality-for-introspection.patch 3275 BLAKE2B f3629eab79b8
 DIST gnome-desktop-42.2.tar.xz 743268 BLAKE2B 8f8ee5ada3bf8b11f9bd6ddfa9925d50ccc22bb3b02f4cd8caefefe76b162347dbddb5de0d6200768e0bcaf6b60c6c774155dfc3767a827c575c48ddc40380a3 SHA512 6c7d90b539b80e45f729a14dd8bf553abb09f20d16e1a2cda751b81f1e2a52e2dcb98551faab3cd4ad17206300f45c9bc968d160fddab0b71a4933f0adc22e0e
 DIST gnome-desktop-42.3.tar.xz 743196 BLAKE2B bd2c8fc49bec5b40f48f5f85311a1566fd996b2f330dcd8d3b00c2331f4800ec58b7d0281be79d29e859c8731664c6953a9ee27af92ee091d621964ac4eb51b0 SHA512 aa8e492fc09bc409619747ad53dbfd13b80251dc849db9a82fcf15c2373582af9a89f769302c8ae12330580f4a7d068f22f7fce4c42983e7848acbcd9be09d15
 DIST gnome-desktop-42.4.tar.xz 743212 BLAKE2B d0e5ce93aa476b2e2c4252480fb315ce8c1802622857c7fb0af90804a621c3c358772b70957f902941b0fd75c58aa575e36ee7d960ade1409caa1f06df9e958d SHA512 6e2648aee7e7b7800276ba1f6b32a0918f6dfbd35a60a5fd22239efe75b3bd4cbed14458ab2d1b0ad0ad295428feae5342a64f2cf83505196eccb17720a26756
-EBUILD gnome-desktop-42.2-r300.ebuild 1930 BLAKE2B 8ff065ab7b72b046349107f4b86a326500a28d64f34fb1b4e95876eb2d6261b1aaa94a2eed2f5ed7dbc863d097a4a75992334f7dd89e47162d7ad0679d994356 SHA512 3a97c4bc9211a9d362291d8dfae6811d2de4424bcfd296eeebde7087c1345d02367464636f628a8e3bb14c82d951c2ce30a7bf6280d77b220f0a8bcabbb7462f
+EBUILD gnome-desktop-42.2-r300.ebuild 1934 BLAKE2B 6920f1ce50aa1edd89676b5be034d01c8d71df6e687dddea1db296064ab63549448ebde729705710ea0a17756855261efbd5c0ee07e733e2c2181d3ba4693b7e SHA512 d16202197817d69c3280f703f287218c8af3e16ecb05a2e165a5018258009a61dfb723c6994272ee2ac67c7220f7584ec176be33d1938a589de062d283eef2d1
 EBUILD gnome-desktop-42.2-r400.ebuild 1894 BLAKE2B 3f52d48e3318f77055131351ad2d32de9c601ee9ef8227663dcc0c2f43e5aa8d3dee3ae911c3cf0efe1bd92c5044cf8de7af0a0ee036053e8de8931e479fc761 SHA512 c321c9fb0da94b23077be2362cca5d219512cf6f590cdc2f80088cc1f20163c3f81d531aff2f159e72fd7f5acb67473a9d76288a7a4a1a1b7c205fe3160300d4
-EBUILD gnome-desktop-42.3-r300.ebuild 1930 BLAKE2B 8ff065ab7b72b046349107f4b86a326500a28d64f34fb1b4e95876eb2d6261b1aaa94a2eed2f5ed7dbc863d097a4a75992334f7dd89e47162d7ad0679d994356 SHA512 3a97c4bc9211a9d362291d8dfae6811d2de4424bcfd296eeebde7087c1345d02367464636f628a8e3bb14c82d951c2ce30a7bf6280d77b220f0a8bcabbb7462f
+EBUILD gnome-desktop-42.3-r300.ebuild 1934 BLAKE2B 6920f1ce50aa1edd89676b5be034d01c8d71df6e687dddea1db296064ab63549448ebde729705710ea0a17756855261efbd5c0ee07e733e2c2181d3ba4693b7e SHA512 d16202197817d69c3280f703f287218c8af3e16ecb05a2e165a5018258009a61dfb723c6994272ee2ac67c7220f7584ec176be33d1938a589de062d283eef2d1
 EBUILD gnome-desktop-42.3-r400.ebuild 1749 BLAKE2B a38edb5e5388c49417f1e117867de92bdd17bdd9ff088156561c966f195a335a029e719366414ddfc7b7b9b3a8d36d07f17ffea68119511bdaad06e33b2a2969 SHA512 d0c864187121ea620fbfed9492537476527885a54e8c7b03a6fd024bb50919c6747bb262e402e9466a7835523043c68d3a837216842ec4f0f7b7ad26ae9bb3d3
-EBUILD gnome-desktop-42.4-r300.ebuild 1933 BLAKE2B bd31d5ce6639e07a12a477cda29b4187e0b47e6ee75b4a6154c555373dd7d7f551914fc2f2864e4a4c7527be84f2abba57158385941e49b3c97cc6d062971c79 SHA512 1432bd1e60983bad1c7596090d26cbe7271e4737f6057b69270b8c1d8894f15fec399683786a542bf1ab0de79688a6ed0192f9144be133534b68b610a5f4fc34
+EBUILD gnome-desktop-42.4-r300.ebuild 1937 BLAKE2B 12e2328b29928a220a5c1a96019e7a18599a91d5823b0088708d90e82584f28d86e59453bb1992f560116ede2df042f722865abd265a3d57102bc3f11b57e825 SHA512 2950d080b7302eded5e2074d290bdda13ece012cf5b9193662da4bc4ddb55fe6fb389f03c49711344d5774cfa474eba9eda9a9e39323866a4c3fadcfdd9c89e1
 EBUILD gnome-desktop-42.4-r400.ebuild 1752 BLAKE2B b5b24c6374680cef8d95a6afd35421cf1b6dfa81115a8bb44989b7e287449e94ff898c77be14b9547f57dccb51f3a1007b91b8409236437bbbdb828abba65d29 SHA512 c4d8e0280ec55091745dbfb0db1505cbf28b7fb8cbc9d325eea12ae854f939057fe10c366a4e18a0b0e3f49bddded1eadb1d060fe51806ef1aba20812cc9734d
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-base/gnome-desktop/gnome-desktop-42.2-r300.ebuild b/gnome-base/gnome-desktop/gnome-desktop-42.2-r300.ebuild
index c6eef4f66f57..213db2dcf6c5 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-42.2-r300.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-42.2-r300.ebuild
@@ -74,7 +74,7 @@ src_install() {
 	meson_src_install
 
 	rm -r \
-		${ED}/usr/share/gnome/gnome-version.xml \
-		${ED}/usr/share/locale \
+		"${ED}"/usr/share/gnome/gnome-version.xml \
+		"${ED}"/usr/share/locale \
 		|| die
 }
diff --git a/gnome-base/gnome-desktop/gnome-desktop-42.3-r300.ebuild b/gnome-base/gnome-desktop/gnome-desktop-42.3-r300.ebuild
index c6eef4f66f57..213db2dcf6c5 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-42.3-r300.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-42.3-r300.ebuild
@@ -74,7 +74,7 @@ src_install() {
 	meson_src_install
 
 	rm -r \
-		${ED}/usr/share/gnome/gnome-version.xml \
-		${ED}/usr/share/locale \
+		"${ED}"/usr/share/gnome/gnome-version.xml \
+		"${ED}"/usr/share/locale \
 		|| die
 }
diff --git a/gnome-base/gnome-desktop/gnome-desktop-42.4-r300.ebuild b/gnome-base/gnome-desktop/gnome-desktop-42.4-r300.ebuild
index 1c3c7ed2fd59..5106cc05a3b0 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-42.4-r300.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-42.4-r300.ebuild
@@ -74,7 +74,7 @@ src_install() {
 	meson_src_install
 
 	rm -r \
-		${ED}/usr/share/gnome/gnome-version.xml \
-		${ED}/usr/share/locale \
+		"${ED}"/usr/share/gnome/gnome-version.xml \
+		"${ED}"/usr/share/locale \
 		|| die
 }
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 8d05c3038e4f..fea4a78b28a6 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/egl-wayland/Manifest b/gui-libs/egl-wayland/Manifest
index 75fdcf92fb0f..5bb79bfe2120 100644
--- a/gui-libs/egl-wayland/Manifest
+++ b/gui-libs/egl-wayland/Manifest
@@ -2,9 +2,11 @@ AUX 10_nvidia_wayland.json 115 BLAKE2B b10206c742e8966d1192b9b0604137e6b296d2be7
 AUX egl-wayland-1.1.10-revert-defer-resizes.patch 3050 BLAKE2B 5efb52754bffb5d1498cb193fedc41d452c3ac01ff8fb07eb0b368f579d52b0e4fc8bb2a290d1e3a87baaa90bbadecbf4ece40a5fc7110d670fc8d68032f3595 SHA512 58fdfca16e2acc535ba2c16c5a04b72111db339ee15879b7780eb79a2b29d36a3808754c92b290fe50930fcf3b55526d1317f071d28721db86d2a5a4847c6fe4
 AUX egl-wayland-1.1.6-remove-werror.patch 251 BLAKE2B 12a14b185f9b1cb3a42226708642f5b57c2b0eb64d81c96438ee24ac45b950ba588591194648fc8e64e3aa8d2fda9ba2dba63a2f78fc22c00a14d56403bf6839 SHA512 c6c3c4d4f776f44d642d51ab2eed44a0388558b43f2c4c894b6d19bdef40b8a646be43b6b356a3ffa0297e36a48122ef057265db68a8717020abe30906bc8f28
 DIST egl-wayland-1.1.10.tar.gz 60058 BLAKE2B c24cc0d6e45e43868140d4e16ad5092a951bebb71fa0d65e11ef8d4273d85589a435e6d29b73b665630b5a7e28fdbd8e1e02e5eb43eed7d06862caabae7146e9 SHA512 163ee1ae1e629c5d32ffdf335b35ba309d35c009f93a8391e78dcb710a86f64e017a37c1e77325c6f4782c8a5fe048ae44ad1456bd3a20ea651b4192c9102e3c
+DIST egl-wayland-1.1.10_p20220805.tar.gz 60283 BLAKE2B 14c272e4cc084892cc9eb822b85168e420c7cfd5472c9f24fd9aa6cc6a5aef2c75411c8c06e148c48e45c6ee4aa3179784b9e432905f41753840bf1ef576e634 SHA512 ce7aa6cc738dc392dfa9a6cf2c24253968404e011b4e921c6e3bf723fd4bc0eae63ef2050bef025a0726601e5ce2a08987293fd1674fb6c6b6c207969fd15bcb
 DIST egl-wayland-1.1.7.tar.gz 48681 BLAKE2B eebbd0e36045c50b39ef70292156f5cd137a51af2169b56a35d318d90ade3d4a5b94206d86246d52fda0c6c093ff25e389b1a3ccbe60595dc9661d199e30f33b SHA512 edc81d9f2c617587044d5f9d35b3e355db8544e8fa1d861c1b92a5a11bc1af7d994ca8abd49ce6f462a1971f20296b4c757bdf1df0d2bfc981cdafaa839f12af
 DIST egl-wayland-1.1.9_p20211123.tar.gz 58900 BLAKE2B a5a08df06e302b573f1036264495e7b29ec4d3def9be0e9b8037206a42aab5c18d78b79cc3f3ffeede9708916e644f8090fadf34318429cf0040c3623da28ce1 SHA512 8de18c8c0c38ca672688a5197be20534cc90b0fecae9ea2f3d3bc851d5b50d3f148a4ce97b835a9576251c8273ea21f82f2c9694cf2b7bba28fa3b53850c43b2
 EBUILD egl-wayland-1.1.10-r1.ebuild 1091 BLAKE2B 54979a22bd5605c8ac937b8a02a7d8db474790d33ba46072212532b83e84203f50d2d83ff2a8e88ef0f299ea973efd308b7fd7396578528531ebe30f0343067f SHA512 6e94d4f34073a8f5429205cbd8843b6d6af755512b440d1c430ea1b6ffc7f5fdb421729ab0cf999b7f1a3c530e0e5a687141bcfdc1d7a6a92c87f70f098e40c6
-EBUILD egl-wayland-1.1.7-r1.ebuild 1139 BLAKE2B ec726bdb0cacc7653b8c4237383b28579cd3fd306f965e3195722b521a9db49076fd65b01c3568fe5c313a2a8ac135c2cc178d9fa62188418136c254e906d4d6 SHA512 3c39c694076655c0ae38c8eb4571efeb54b28c548deb21fd971bd154cdc92cab07c928137c81c60a0df25b58c7582c6f2eb12c3e840f9eb7450d5a82b9388cb0
-EBUILD egl-wayland-1.1.9_p20211123.ebuild 1111 BLAKE2B b17e574b838d73e58f40ff1620107e781cc2ce8b0378d64be07d76455d0088c27367a14004c79a8fad923eed2b8e7a6945626e65b79c602828cd11a816eb48ec SHA512 63e308b03dce88ae27f5f390c40181ae14bd8e93413a4e7d937f9c7599a8eebac85de4ba4d098aaecd367a59ea113db406f43dbc04def6952457b5090d4e0c21
+EBUILD egl-wayland-1.1.10_p20220805.ebuild 1147 BLAKE2B 01a86a22b2f2c9dd6202c38f8c8d349f10bc4aa691cb3436c5c9c007e951d2c56ddf0e057815ef0ee62f10df5c6f1532ff1174328e0b2ef76233e0e221c0e863 SHA512 e15f55a0b3860a88134a31e9c45770a48982d56f39d959a81425cf3aaecf9956107dc0ea12c4f855d9a4ee93ce26c2fc12dddff2d98858f8964c77789191a262
+EBUILD egl-wayland-1.1.7-r1.ebuild 988 BLAKE2B ac030502297459062ff6bd939e83812e07e2edf812b5708d76a922083a2af418d098d4d1354cfdd0a022163b6c59f1012ade54ba88b9a33e19342b2db596fb2f SHA512 00180e53ac1efe51e5d50eeeec61e8d2a9cfbc743ed4600b8a68e34d5a957eed294f9c73d20d9f3269ee8c61c7b147c2ad758259f8d81998b50711fdfcda4d0e
+EBUILD egl-wayland-1.1.9_p20211123.ebuild 1129 BLAKE2B ca41e3227547992a663de981c78118b74415fa408f4b0dfb709c018ce5339519cea50ad4ca3520cdf093fecf3ab678394bc4bf5f8f4439942f3ca31ca5547879 SHA512 bab104e19b3f4dfda41631f4710a7fd544aec7a95fea23988bff407c5750ba4405197488f276612689254705127350353970aa925112d30287a7a5c08a597f1d
 MISC metadata.xml 329 BLAKE2B 9763d8fac09a9b4902a2a5d61f0f109659ad580117b52d7f844785e449623480752356d31507d86be1198b56a6e38fa6a6fa20aa2151421f79f3ce94f98865a5 SHA512 ae3d6edba2229abebf7f87b448a3f1eacd592d28f6ff3bf80e50e14d8718f15e5a67ec8496cdf03f86532f9525638c3dab5020ba9f62d2a9a4495a16a617d4d4
diff --git a/gui-libs/egl-wayland/egl-wayland-1.1.10_p20220805.ebuild b/gui-libs/egl-wayland/egl-wayland-1.1.10_p20220805.ebuild
new file mode 100644
index 000000000000..48773892aa79
--- /dev/null
+++ b/gui-libs/egl-wayland/egl-wayland-1.1.10_p20220805.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+EGLWAYLAND_HASH="885f0a5e91fe9cfbfbcd98ff01f6b83503decef3"
+
+DESCRIPTION="EGLStream-based Wayland external platform"
+HOMEPAGE="https://github.com/NVIDIA/egl-wayland"
+SRC_URI="https://github.com/NVIDIA/egl-wayland/archive/${EGLWAYLAND_HASH}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${EGLWAYLAND_HASH}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	dev-libs/wayland
+	!<x11-drivers/nvidia-drivers-470.57.02[wayland(-)]"
+DEPEND="
+	${RDEPEND}
+	dev-libs/wayland-protocols
+	gui-libs/eglexternalplatform
+	>=media-libs/libglvnd-1.3.4
+	x11-libs/libdrm"
+BDEPEND="dev-util/wayland-scanner"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.6-remove-werror.patch
+)
+
+src_install() {
+	meson_src_install
+
+	insinto /usr/share/egl/egl_external_platform.d
+	doins "${FILESDIR}"/10_nvidia_wayland.json
+}
+
+pkg_postinst() {
+	if has_version "<x11-drivers/nvidia-drivers-391"; then
+		ewarn "<=nvidia-drivers-390.xx may not work properly with this version of"
+		ewarn "egl-wayland, it is recommended to use nouveau drivers for wayland."
+	fi
+}
diff --git a/gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild b/gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild
index be21463cf525..5b4dc823c52e 100644
--- a/gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild
+++ b/gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit flag-o-matic meson
+inherit meson
 
 DESCRIPTION="EGLStream-based Wayland external platform"
 HOMEPAGE="https://github.com/NVIDIA/egl-wayland"
@@ -19,20 +19,13 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	gui-libs/eglexternalplatform
-	media-libs/libglvnd"
+	>=media-libs/libglvnd-1.3.4"
 BDEPEND="dev-util/wayland-scanner"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.6-remove-werror.patch
 )
 
-src_configure() {
-	# EGLStream is not intended for X11, always build without (bug #777558)
-	append-cppflags -DEGL_NO_X11
-
-	meson_src_configure
-}
-
 src_install() {
 	meson_src_install
 
diff --git a/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild b/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild
index 62302305e3f4..984ad1e0b540 100644
--- a/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild
+++ b/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild
@@ -5,12 +5,12 @@ EAPI=8
 
 inherit meson
 
-MY_COMMIT="582b2d345abaa0e313cf16c902e602084ea59551"
+EGLWAYLAND_HASH="582b2d345abaa0e313cf16c902e602084ea59551"
 
 DESCRIPTION="EGLStream-based Wayland external platform"
 HOMEPAGE="https://github.com/NVIDIA/egl-wayland"
-SRC_URI="https://github.com/NVIDIA/egl-wayland/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
+SRC_URI="https://github.com/NVIDIA/egl-wayland/archive/${EGLWAYLAND_HASH}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${EGLWAYLAND_HASH}"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/gui-libs/wpebackend-fdo/Manifest b/gui-libs/wpebackend-fdo/Manifest
index 40be7c365ae7..d5b99e679ffe 100644
--- a/gui-libs/wpebackend-fdo/Manifest
+++ b/gui-libs/wpebackend-fdo/Manifest
@@ -1,3 +1,5 @@
 DIST wpebackend-fdo-1.12.0.tar.xz 43080 BLAKE2B 0ef0e537d430b60841732e9b350d46b44317c2ee9833d6f382cc792a7aaf6e93b5eb782c4913c6bd7af5e30a08cac348430d4d383bce247415babf48f1f4322f SHA512 856885394872ad3f205b600caecbae48ae0c51185a8e19e66add93222e49bb1b060cdc77f5c9269d43509a0b85af0b5642c27f951d1c9836d8616aa51a9180a5
+DIST wpebackend-fdo-1.12.1.tar.xz 43148 BLAKE2B 3d666cdcd68c3b9356ec58020502bf4d61c0d8651b9dcc646f50ba63aa336e475a47627712678e4a192e0502cd86ea030613199503b056efe4c7afa3a49e0490 SHA512 0464ab4eb634390591b8cc09bc3db6a3a816c68aef6f9140012230e8dba9550e44bdc4f9008ea3fecfcc5f441306d6c4d91e6f693398179ee8bf7516dd58875b
 EBUILD wpebackend-fdo-1.12.0.ebuild 660 BLAKE2B ff96a893f6ada3510d52a3dbba54bcbfd701bdb993ca747fde6c213ebeea1e8509fda492a901ac801f80b1c32e63fe6d003206af3d1f5fde62bee993a06696ba SHA512 4547ab5ad0de181f8eddb5b841fdb08abe5c1708b2a3a05f603e0275ae1d0783408b7d010642f95235d4029078012b9a6b6ede64b25867a68bfd46ecb93bdf2f
+EBUILD wpebackend-fdo-1.12.1.ebuild 666 BLAKE2B 29261d1dcc9733e714f9786238542d7ccd82e5f4822449208be3d31868cd6fed46bd4f203bb0b24b9d412fe7c7ea66f6f7b2787d05d193b1a2aed731e56092a3 SHA512 23a26b5b84317d10aa9f019aacdd64023a7e4c0c0b7ade2108a445e1239964b3ddfbf29e95bf0561f740aba21800fff20a7b2ad34bcf5ee02d6052cb19581e86
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.12.1.ebuild b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.12.1.ebuild
new file mode 100644
index 000000000000..0b98d16fc95c
--- /dev/null
+++ b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.12.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="WPE backend designed for Linux desktop systems"
+HOMEPAGE="https://wpewebkit.org/"
+SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="1.0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	media-libs/libepoxy[egl]
+	dev-libs/glib:2
+	>=dev-libs/wayland-1.10
+	>=gui-libs/libwpe-1.6:1.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dbuild_docs=false # hotdoc not packaged
+	)
+
+	meson_src_configure
+}
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index acba020cf574..83a55caa0eba 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index 6d2e319b4039..fe6f7e0fecd0 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1,3 +1,3 @@
 DIST breeze-icons-5.96.0.tar.xz 2153664 BLAKE2B ecb8e1b19674c5bedcd78c2e1c9950c4129f2e422e9ee0b0031fc42c85d4791c572c0bbb01d967ac74f74ae5535e1b5053029a1afa706cf20836a7416312da15 SHA512 116388d8670a1b45c01252fafe2d316bf5045207d8c4d282ac1a9e87882bb512f69419aaea65895cf310112de0f514199f1b698d28a48d0c5074e14add0a25b2
-EBUILD breeze-icons-rcc-5.96.0.ebuild 929 BLAKE2B b221055fa56839122164be0e992464d97ca938e02e2f35c84e6f20898e4144ebe884dcc96dd5dd5c0ecaf547d054d9d955c0924b99045b2a076ac414c3311559 SHA512 a9d7631defafe821fc77fb3132c317d500fbba7f9e4f7d9644ddf7a730460c1c921754b5d407ed06ac78655ae02da89b2ba7fafc7f3a52c822548698e6c8a124
+EBUILD breeze-icons-rcc-5.96.0.ebuild 936 BLAKE2B df538255ca792b6910eaf7297cafcfd1c87cb9006d396ffb9b48ae9d2384cf88b33e892cf53402cff2b9efff6037fd6d5965822bbe9a3a0535eb2fcba696ef45 SHA512 f03e611e72643312706c8718c44f71bae9379c6ebd7b237077d8f7f75a34beb177916a8fdbaf83f6384f606545f9f295ba905c0dd458473b688c55a7858736bb
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.96.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.96.0.ebuild
index 1fd2575626db..05542a7a224c 100644
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.96.0.ebuild
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.96.0.ebuild
@@ -24,7 +24,7 @@ BDEPEND="${PYTHON_DEPS}
 DEPEND="test? ( dev-qt/qttest:5 )"
 
 python_check_deps() {
-	has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
 }
 
 src_prepare() {
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index 67a62ddf1ef3..c0b09f5f3d4e 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,3 +1,3 @@
 DIST breeze-icons-5.96.0.tar.xz 2153664 BLAKE2B ecb8e1b19674c5bedcd78c2e1c9950c4129f2e422e9ee0b0031fc42c85d4791c572c0bbb01d967ac74f74ae5535e1b5053029a1afa706cf20836a7416312da15 SHA512 116388d8670a1b45c01252fafe2d316bf5045207d8c4d282ac1a9e87882bb512f69419aaea65895cf310112de0f514199f1b698d28a48d0c5074e14add0a25b2
-EBUILD breeze-icons-5.96.0.ebuild 1135 BLAKE2B cbd6eea741157404b8268e19caffca4209fbf328aeec22d767f2c90c8f2f5568a4196711e79c1ed4492e6d818d9edeb78aa50dbdef3ede70cd0f6807f9f53dee SHA512 82ce79448466831d54cc9be0dca12ac3d146ee7d404fb8fa452dd70a4fc836b08eb6ef8b710e00264801351ae8b5a39d3e0235cfc834b6dbb4da58050cb2fc84
+EBUILD breeze-icons-5.96.0.ebuild 1142 BLAKE2B 38dc3f0638aa1edd9aa48f4b9b68ffb732a2dfe752b341b8e307f33b3e13b619a2938abc08153ab1b844700dfa364675b28a4985aee0292d7376fc5087a01462 SHA512 0840636695bb77102dd3bbd87c7d8e9b2326d948334761270bcd9ac312a460d0df90668d5049f7e3fddb7770be0d651971b3c1fc1896da478e48308a1dce1169
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.96.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.96.0.ebuild
index dea46b00974a..9e2d562c15d4 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-5.96.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.96.0.ebuild
@@ -24,7 +24,7 @@ BDEPEND="${PYTHON_DEPS}
 "
 
 python_check_deps() {
-	has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
 }
 
 src_prepare() {
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 24ccd034f6f7..cfbfe9a31850 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -2,5 +2,5 @@ AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed926
 AUX extra-cmake-modules-5.93.0-disable-qmlplugindump.patch 3151 BLAKE2B f10ceecfbfdad60f628cf1b0c0972f8ebc8db615938b23f300f80855bcc77a6f21d35cb56130df760e3e893ee025689869023048434a3f6329f25181304b4eb6 SHA512 8f046619df65df32736a217ca94439e9c567f6a84a3c736507259b20958c1972d21ee7dcda79b11cc220713010fbfb69f516f0ea1ea2b730e5efb7c32a2fdd04
 AUX extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch 1703 BLAKE2B 71d07fcfb3a93caf5f73f818cff7f0139c4866ef3a1abaede189e171217ec9a4e6825ec6d37c344ab8d94989493647f4d7b5749d3db1767b54bb9c6e328ca571 SHA512 8b015810e455aa0a54535f594668595900b0b2d700685c952cbb9a2dd46e3c413815b33fef69f4251bb20c93e4c3a4e6b9691680b3ffcf1bac5cf48931bb5e3b
 DIST extra-cmake-modules-5.96.0.tar.xz 331584 BLAKE2B 7fc907d9feff750d45c6ddedea223ae632d4a70b437df8f9638e6e7ae08c0bf0422ec2696eaea1b1632b472aef50bf71cc3e9e559d9206828ff3d425dcb308a8 SHA512 55625f68453c88b2a5a8ebb6b8ab0b480e9c3681bebdafdf66816499e38dd815cd919bf15b16120be0a2ee8bf50fb3c67e2aa1d652083639ed87fc7ad8c2f705
-EBUILD extra-cmake-modules-5.96.0.ebuild 1836 BLAKE2B 843aca5530bbee8af90c7d5a6960b12f82e48b101f45c90db1af489e02bb1e14d2ab0baf08016a318b181448e7b3a576bc57c22946561b794db729d51c67974b SHA512 84258fdc12eb0ef7d941e4f30ef451667253161bdbe942cef7c61a3c0e2f308f8c785170fef38921668b52a98dc41a35ee30b07d036beb9cfa0f0e53a5f254b8
+EBUILD extra-cmake-modules-5.96.0.ebuild 1843 BLAKE2B cc463a200c4b3dbaab18bd2bbb2f65d4c1b44ae4f70a48a3e9a2fb0d18dd500d43cd57439f643dea6cea885d6b9c3eebdddc866a790c8f47edfa19218c1e7f38 SHA512 cb1bceb3fee14678d9bdd25ac42d0924746b07d7b37ec986ff5e4da3e482637c9f69f68ab16418b592d298085c3463208574c63cd8ac54977d2c136a2a05ec5e
 MISC metadata.xml 480 BLAKE2B ab8e3f4e0a74a0e856bba9cf47e40254738c6d545a569bf12fae38e8e6d1e5d0cfd5a0ffaf6d5266a1532ea455d5f7f5421f1b88fa09539af6e31d2e85e170ad SHA512 0161373d45e5fd9a1c3c4f47892fcf1173419481f8de3ee73cc029ac628d36551516d0b99acc8b227b336ec5ce138844fd2654555edff3a73b8c07dbd931e468
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild
index 1b4ae376bf48..83620fe6072e 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild
@@ -38,7 +38,7 @@ PATCHES=(
 )
 
 python_check_deps() {
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index a441053936bc..be5137bc1393 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index ecdab79c1929..1630571f0210 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-gtk-5.24.6.tar.xz 43820 BLAKE2B d051e74984c111ff247c55730d7904e8db80f41cb4aacdc86def93819d140d2d0535bf4c45051908cbaf0c2b2ad19b8810fb8072db3a70cacad929a59df1971e SHA512 b9677e672435b8c459573180d151466ae6f56a0760a0d6933b85ebcb8cf9855201e98440f28ecd555ef44ebdc0610ed25f86c07e7f72aba108ccfe512db641e6
 DIST breeze-gtk-5.25.4.tar.xz 45816 BLAKE2B a9ebcde7caf0732930b06369c38bbf7a33ff78e4ec1514899c7256bbe6eedff68320d4d009ceda6bcc2e846e9bbd76b24d74ad4319138f7585180bc449cd40fb SHA512 c634244324384fed95592477eebe31eb8425533f38af6edc6de8f9d9ba944f16d41c0f73c2751119faa962340bdedc5593bfc8b70ac54ef7ed74a369eedb0952
-EBUILD breeze-gtk-5.24.6.ebuild 788 BLAKE2B 674f6a4e2bbbb5990edc3170500a4abf3ce11f19164de63ab829c4503763a8e578e5f10e99c4cca8677965386c7550a27ebee0b9d245cf853f2c623dd45f6a58 SHA512 5ee61556d0bec47bf4095ddcc0e96b2ea35d92dcd02e4d889ff0a497a274c6cd267a34d9b52a3a072c756bfec201d36653df2238cf2b47b45ecd3274095c4faf
-EBUILD breeze-gtk-5.25.4.ebuild 791 BLAKE2B a48cd21f49a19ce0a93926dc11eaaa6461bd37e28ddb3aa7a2573823ce8da69381a0757d1192ec8f0e743da9a1126b89077d684fc764138b699d19f87f983a43 SHA512 ae35f35959836fe27a56794f32103ae558a34b350866d72c5587f147b936090f7dbc7341c311c96773a7f05c437e859488d3aa63e9a74c5593bb5bc2869e5e82
+EBUILD breeze-gtk-5.24.6.ebuild 795 BLAKE2B 30860b7d202ef688705dccee482abf67cc589e278600fb4af75522a8828c17ee4277d4b3692dfb371bbc0b9fa522fb2076c47db65fd767c7cd8716078ad19e22 SHA512 6c22e98418a85e35b8fc1b0a125f4d06d3bfc7d365a2a02b8d651943141e4fddd8c264b0471dc61e999be2e0a4057964ee88f86a9fcaae3ee2e19854fbf9fd80
+EBUILD breeze-gtk-5.25.4.ebuild 798 BLAKE2B 3f618e5514293a3ab6eb0981cc984f17ffe312867d1835d64e789a27cad3ccc40862f4f44371ad7dd0cedf695209c7b89bc005f755aa60c04945864c15d9a390 SHA512 fffb6c7f8ba7cc29c3cc51ff04c062b272b96307f507568f49ddb14879a7869729d1dd263eff190b4198009bf62cca7ea1efee2f8dca2495b0afb52ba60a81b6
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.24.6.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.24.6.ebuild
index 87341153f987..1cb679512383 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.24.6.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.24.6.ebuild
@@ -22,7 +22,7 @@ BDEPEND="${PYTHON_DEPS}
 "
 
 python_check_deps() {
-	has_version "dev-python/pycairo[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/pycairo[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.25.4.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.25.4.ebuild
index 375d2e9c5949..0ae80b7ef65c 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.25.4.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.25.4.ebuild
@@ -22,7 +22,7 @@ BDEPEND="${PYTHON_DEPS}
 "
 
 python_check_deps() {
-	has_version "dev-python/pycairo[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/pycairo[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index dc2b7e462d2a..fde7424dec50 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 17b6a163e472..74148c9073b0 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -2,6 +2,7 @@ AUX blender-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch 877 BLAKE2B 9
 AUX blender-3.0.1-openexr.patch 4868 BLAKE2B eccd615d26ba6963220dd9128294d996890f5909707cae5b8b39a0b1e35147618ff2d92348c8e8613cea45c974442665be5036884c33737ccf4041eec5f0135c SHA512 f44288212a3e8e2ed04ced2e574ac240a18f90c3f6e28fabc9dc855545c9b28b216f9cc3ad70721dca754a0d032100fe2aa430eff54049f672219747728d5657
 AUX blender-3.0.1-openimageio-2.3.patch 927 BLAKE2B 02ed40bf291ac6ec935a7412c8c1681023fb1fac3bfe7a6ecdbaddfd895f48557274f466849f1aa35900c66dbba6724a29b7d5553fe914e5a3df0f93a9791acd SHA512 0edd3e3c3265694593b242db5c96d3c123630819ff07b906b7f86c15cdf60e4bf1e8b61d555241eadf842a2a33c1f4f1ad4cce0e7d07c8d7308d8a9d536bf512
 DIST blender-2.93.0-tests.tar.bz2 286918586 BLAKE2B a2c2c2e900e401a470208e8e5d0082d45e2f8db13b45213f31808d50ae5ea330360702b8e775bdb3307eb753aa7c3264803e9e470b3fb778f8bd87272cd72513 SHA512 0e5e4c67944c4f76df62cdbaf26ba284c415675074e66685c01ec9584a544c47f616bae8fb2ff2b7e03290620d54dc1033b4b0fc617acb1232a90439e96325fe
+DIST blender-2.93.10.tar.xz 43036752 BLAKE2B c08560246fe9e494cf43df6afff2535d166f5faf920728b9b2d787a1029fabe027db3ef5ae5c55b0ec3ea2849c4948cc96f8f9243f19c66ff7b72c2ea81a6e5b SHA512 ff1cee2ab48a9409e3fb3ae73e60aa5514cc8060e31e9a1d9f5c1725dec6f583d482db4cdc765806da2c7529fdaaf7bebe714e148183d5ef16170160fb103ab7
 DIST blender-2.93.9.tar.xz 43035004 BLAKE2B 3d3e316794d0ee5ec3500c84247f4d9cc37d9c490e82321a10e8b020eb148f8d71480ce45e5d2098ef8d6c6657eb5d9f8a34807f93e8ad25650bd4e65cc559d7 SHA512 605eedabd7f164138076c0c91ca9ee3a1e26616c2539602ebba07c014a989738b973a908cbc0a062b3942f3e36754b2f88e2abcabae18017749b409aeaa2f97e
 DIST blender-3.0.1-ffmpeg-5.0.patch.bz2 8198 BLAKE2B 2acb1e441bd17cf2d972f981358981d42742ad37656366a52b0adb52efb3f1a6cda0479e1c79d9327b51c8fd3d2c6cb291552adc7716e6a1938ac27b237186b9 SHA512 c09ca2d5a5b99652abcae827965304506e354fc6fc4d6d59c9433c8246e865a0622ddac3118009ad433292690212292a86f7e43e764583525555ca6d653da809
 DIST blender-3.1.0-tests.tar.bz2 643279044 BLAKE2B acbf0800c384f881c215ea22140b02e8e61c7395eb35fdb76fad3c785c565ecfc6c59d74848bdd3f9f9b762f86328f6b60cb7871e6ef4615db1ef03f2749b655 SHA512 9fd202c582576d170c29c8adbc9bc4a62b6d67a4a1500f6980201e3d904f4a4a15e5680530663382c34672bd634543dd330c5f75523cf0058928a549ff4a0782
@@ -9,9 +10,12 @@ DIST blender-3.1.2.tar.xz 41014760 BLAKE2B 1e1476b7185005616fe3a647d5beea2c6cf97
 DIST blender-3.2.0-tests.tar.xz 213772908 BLAKE2B 7a4713a3c1bb9f6bfe80b154b913a525b620bb389c2e6b4cf2d1d9bfc74d0c3703b439d77186d18b43766d1db219eb64d22ac84a08fdc859dac074025afdd49f SHA512 4d6e9ed3b646e77737f625ca1beae9b531a528c32d81c9d06749aa8f87126ef4a2a0893d0ecf2a2cce7b7dbe508dbc9568e353b7213842cfa85ea27ebcc0a2d8
 DIST blender-3.2.0.tar.xz 41520000 BLAKE2B ff68c18bfef1ca6a989e46c8c9d3afa1cc13d6d70dfb6311d9d0742829af0a525531077f48c6a390667e266963e1e8671e370c475a9a8a21bc936d4feb04d248 SHA512 2e9c502fad6bbad7618caad393dfd21d2adc6df0a2de8581cea904cfe3588d783564f2d7ec5600d99d10307a81eb6bb56b31209bf34aae072fbc9a0d8ce54f81
 DIST blender-3.2.1.tar.xz 41497540 BLAKE2B bb9651a7135c3b8ebe03a6dee31b8681d548fc12c56d9de076510f22ff0c94e88b814b57d888ee83a6749c4c79a89288a6717f5fd50f430c88edd3c8411457b8 SHA512 fb496c47b2aebd403e00954d55d140ee9f0dc7733e1013b1665f9db83a132ad63a09226edc662871c8c1b6e2fbd8870954d86cb1324d0c44230f79d2b46aecef
-EBUILD blender-2.93.9.ebuild 12582 BLAKE2B b51cec0e76435bf0ba2ae5f4b7a1833ca186b43edd0200f25eeceb55eeb8a4ccd7936a02ba0332da2cbdf2c3368723630221ecd40fb2e94e2074b45c9bc3ead6 SHA512 402d4770d041dba7ff7de64c8d06cfcc2308525ab7ca5bd0e361d51911af82a1e43d25171b2c69f101600628dbb41343d4585adf3dae0d847ee4384dd15f11ef
-EBUILD blender-3.1.2.ebuild 12675 BLAKE2B 66f32f101bb4776aaa3bbe3655ba95c9bb3756202c145222ed00e769ed0ec2b2079b3d0d08ec61b9d3d40cad87313263ed95c8ade3ab7f9b7dd1534c796bb261 SHA512 1a99e8b98e443e24e346bb2ca052386f9b1274be139821fb90c3a9385e9f7d48f0138186fbab7b249e01fbd3a1a7101c317b78472885588c5382cc4e3ee5109c
-EBUILD blender-3.2.0.ebuild 12672 BLAKE2B d5920d6a57f92f375ce876f8f08dbb28414780495d81fc6f7a316cd4d21af0dc698482c01274d1d25b3ab792994233f0f4c08784324c32349db72ac1c08479c4 SHA512 267a2c5b5dd147a23366671086f0ea915f1051e1336ab67b891257068404e316b4463fcd7c3e3a7c0c983510ab0b876c2696b7f92bb5f358c31a702ac665ce4c
-EBUILD blender-3.2.1.ebuild 12672 BLAKE2B d5920d6a57f92f375ce876f8f08dbb28414780495d81fc6f7a316cd4d21af0dc698482c01274d1d25b3ab792994233f0f4c08784324c32349db72ac1c08479c4 SHA512 267a2c5b5dd147a23366671086f0ea915f1051e1336ab67b891257068404e316b4463fcd7c3e3a7c0c983510ab0b876c2696b7f92bb5f358c31a702ac665ce4c
-EBUILD blender-9999.ebuild 12674 BLAKE2B a127ee0c38aa45df907330631f502c4547ec5acb1d1510aba15251f855539ab4a7508360addface1af45f9c31c2e03dd6c18a7a29dfafa111400e77daaf211e2 SHA512 9eb67fd27ae89be064e30c3f9d0e32ff683c1ee10e2fc0c753fd1d2ba753aef7a188131153d860121b754f37829ccfea9964847358a99829737893b5de6b4b46
+DIST blender-3.2.2.tar.xz 41510144 BLAKE2B 3859ad2625822a8b73009c4aa6e7ae41d6d9032d0e80027e9bc7c1d71225eebfd3ff539cd4ce6766ef90a5e3672a80b5fc0d44ac9b5e2100116a55b173c53d62 SHA512 963c8f6510503f861c55d900480c5e4cd643974fc88439a62c672c96e049ff222422ddb20d8e82932fd829c078aafd9ea6a7fcc16434d115f49f61b4943c0c04
+EBUILD blender-2.93.10.ebuild 12568 BLAKE2B 309bc8f5730ed25b3b0d57503bf0d0dbc0cc465189257c382061ca16627b726b59b62ec0cc43490439fbff71c18ce7cf91487ec070e6e33f634c869377981430 SHA512 080e2d37224a24f1d40c0408159535145694a098967c714d5cdd266575b2e38245dad2e93c3e1d83c09ae0aea06ecab941a6a61b9ee6cdfdb48670b707d748f6
+EBUILD blender-2.93.9.ebuild 12567 BLAKE2B 4166c365ab82c29e822007467b3bb8f216a5585e0f2ba314f22a5652751ab433b4f6b7d20c32dd281b63741f4b7af0171142af5296cda53730791add76e35923 SHA512 d0b49bf279fff4105cc8b7bc63133dd1ef4e4265cf707ec3418f801551e17452f43306158bbf7f44b1969db941f14a649b733e8034d49ae63dcd3f7436fe437e
+EBUILD blender-3.1.2.ebuild 12668 BLAKE2B b10fec9888760b4c74efc7075f0bad32f82355997cb0e56c3e1c4dc63d57429fca162d4dd2f37cf9b0e0aa8a82f0f163f6c18d8c13c3ee8966879b30925aab22 SHA512 2316b7f9001885af988d06c694852c10ac4614ce45860208bd8d3f8ccac5454fb7241aa1a4c8190665547eb57bcc62ec15898941df864212393d0af4d266dc22
+EBUILD blender-3.2.0.ebuild 12667 BLAKE2B 9f88c5faa5c2b1ae38ab0d88bd3ed4857a0db03fc714c304fd6a367717fcdfb93daa4c53f91766f27a939cce6ea6e70fe0d6ee2065370916ecd46aae79851446 SHA512 6277f2e95cd08d3539f448086b018db3cdb67293183411a9b19f92a1b000de3030e2fd39600f773f22741dce7ac75717aef9e81e27c76fb6b8e91fdaa969a7d6
+EBUILD blender-3.2.1.ebuild 12671 BLAKE2B 0809971af87433cf8169ffc0f70db1de113e50146d0709c291a97ef6759dcf6a6eb8a2d90876a6d3f3996494e9020d8b657e1ac49292af69316d93016d52caac SHA512 32b8e1b8653bc7d03b490987a38f5da4742c319c2f6de16be2fdc51384b67ccaf0025e40afc9f6411a24a6ba59897ea9927ce907aa953de275c33dd4d3a613af
+EBUILD blender-3.2.2.ebuild 12671 BLAKE2B 0809971af87433cf8169ffc0f70db1de113e50146d0709c291a97ef6759dcf6a6eb8a2d90876a6d3f3996494e9020d8b657e1ac49292af69316d93016d52caac SHA512 32b8e1b8653bc7d03b490987a38f5da4742c319c2f6de16be2fdc51384b67ccaf0025e40afc9f6411a24a6ba59897ea9927ce907aa953de275c33dd4d3a613af
+EBUILD blender-9999.ebuild 12675 BLAKE2B de44471779f56eba0784bddc62ec5abce8644fdea12fa528baa32a91b9bff60222cd004c36395eccbd1f6be5697a725a036e6016e4d3b5c2a9fbff0cd5cbb15d SHA512 fc71e655e86f4a041cfc6d2b3c974b1bbe69469278bf17d9a404fed216109a0eb3f4a9965431e41d9818a16423fae95f64828772da3a77bfdefe26db72447176
 MISC metadata.xml 2998 BLAKE2B 46de114ec2a0f5ed454d9879e6c5c11f06c386a73f8f692635cea26fc813f1d8489bf9fbf5d45c3fd43502784e02047613420e9de8d17e0e637586194e369d8f SHA512 533fdfbe7ded02391d808b42edf26ba8218c086e279a67c168bf7c654075a9608aae46439a9a98e8d650cc429fb0f0d45d0dc584861ef13c39df4f288e93bfb1
diff --git a/media-gfx/blender/blender-2.93.10.ebuild b/media-gfx/blender/blender-2.93.10.ebuild
new file mode 100644
index 000000000000..cc7b5600cb7f
--- /dev/null
+++ b/media-gfx/blender/blender-2.93.10.ebuild
@@ -0,0 +1,400 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_9 python3_10 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+if [[ ${PV} = *9999* ]] ; then
+	# Subversion is needed for downloading unit test files
+	inherit git-r3 subversion
+	EGIT_REPO_URI="https://git.blender.org/blender.git"
+else
+	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.0.1-ffmpeg-5.0.patch.bz2"
+
+	TEST_TARBALL_VERSION=2.93.0
+	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )"
+	KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+SLOT="${PV%.*}"
+LICENSE="|| ( GPL-3 BL )"
+IUSE="+bullet +dds +fluid +openexr +tbb \
+	alembic collada +color-management cuda +cycles \
+	debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
+	man ndof nls openal opencl +oidn +openimageio +openmp +opensubdiv \
+	+openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alembic? ( openexr )
+	cuda? ( cycles )
+	cycles? ( openexr tiff openimageio )
+	fluid? ( tbb )
+	opencl? ( cycles )
+	openvdb? ( tbb )
+	osl? ( cycles )
+	test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source directory in:
+# build_files/build_environment/install_deps.sh
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=[nls?,threads(+)]
+	dev-libs/lzo:2=
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+	media-libs/freetype:=
+	media-libs/glew:*
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/libintl
+	virtual/opengl
+	alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
+	collada? ( >=media-libs/opencollada-1.6.68 )
+	color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	embree? ( >=media-libs/embree-3.10.0[raymask] )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+	fftw? ( sci-libs/fftw:3.0= )
+	gmp? ( dev-libs/gmp )
+	!headless? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	opencl? ( virtual/opencl )
+	oidn? ( >=media-libs/oidn-1.3.0 )
+	openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= )
+	openexr? (
+		>=dev-libs/imath-3.1.4-r2:=
+		>=media-libs/openexr-3:0=
+	)
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
+	openvdb? (
+		>=media-gfx/openvdb-8.2.0-r2:=
+		dev-libs/c-blosc:=
+	)
+	osl? ( >=media-libs/osl-1.11.16.0-r3:= )
+	pdf? ( media-libs/libharu )
+	potrace? ( media-gfx/potrace )
+	pugixml? ( dev-libs/pugixml )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tbb? ( <dev-cpp/tbb-2021.4.0:= )
+	tiff? ( media-libs/tiff )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch
+	"${FILESDIR}"/${PN}-3.0.1-openexr.patch
+	"${FILESDIR}"/${PN}-3.0.1-openimageio-2.3.patch
+	"${WORKDIR}"/${PN}-3.0.1-ffmpeg-5.0.patch
+)
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+blender_get_version() {
+	# Get blender version from blender itself.
+	BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert)
+	if ((${BV:0:1} < 3)) ; then
+		# Add period (290 -> 2.90).
+		BV=${BV:0:1}.${BV:1}
+	else
+		# Add period and strip last number (300 -> 3.0)
+		BV=${BV:0:1}.${BV:1:1}
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+
+	if use test; then
+		mkdir -p lib || die
+		mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	blender_get_version
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+		-i doc/doxygen/Doxyfile || die
+
+	# Prepare icons and .desktop files for slotting.
+	sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender-thumbnailer.py|blender-${BV}-thumbnailer.py|" -i source/creator/CMakeLists.txt || die
+
+	sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+
+	mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die
+	mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die
+	mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die
+	mv release/bin/blender-thumbnailer.py release/bin/blender-${BV}-thumbnailer.py || die
+
+	if use test; then
+		# Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests.
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i tests/CMakeLists.txt || die
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die
+	fi
+}
+
+src_configure() {
+	append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DWITH_ALEMBIC=$(usex alembic)
+		-DWITH_ASSERT_ABORT=$(usex debug)
+		-DWITH_BOOST=ON
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl)
+		-DWITH_CYCLES_EMBREE=$(usex embree)
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_CYCLES_STANDALONE=OFF
+		-DWITH_CYCLES_STANDALONE_GUI=OFF
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GMP=$(usex gmp)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_HARU=$(usex pdf)
+		-DWITH_HEADLESS=$(usex headless)
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DOPENEXR_ROOT_DIR="${ESYSROOT}/usr/$(get_libdir)/OpenEXR-3"
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+		-DWITH_MOD_FLUID=$(usex fluid)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_NANOVDB=OFF
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENIMAGEDENOISE=$(usex oidn)
+		-DWITH_OPENIMAGEIO=$(usex openimageio)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_POTRACE=$(usex potrace)
+		-DWITH_PUGIXML=$(usex pugixml)
+		-DWITH_PULSEAUDIO=$(usex pulseaudio)
+		-DWITH_PYTHON_INSTALL=OFF
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_TBB=$(usex tbb)
+		-DWITH_USD=OFF
+		-DWITH_XR_OPENXR=OFF
+	)
+	append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
+
+	if tc-is-gcc ; then
+		# These options only exist when GCC is detected.
+		# We disable these to respect the user's choice of linker.
+		mycmakeargs+=(
+			-DWITH_LINKER_GOLD=OFF
+			-DWITH_LINKER_LLD=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# A lot of tests needs to have access to the installed data files.
+	# So install them into the image directory now.
+	cmake_src_install
+
+	blender_get_version
+	# Define custom blender data/script file paths not be able to find them otherwise during testing.
+	# (Because the data is in the image directory and it will default to look in /usr/share)
+	export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+	export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+	cmake_src_test
+
+	# Clean up the image directory for src_install
+	rm -fr "${ED}"/* || die
+}
+
+src_install() {
+	blender_get_version
+
+	# Pax mark blender for hardened support.
+	pax-mark m "${BUILD_DIR}"/bin/blender
+
+	cmake_src_install
+
+	if use man; then
+		# Slot the man page
+		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
+	fi
+
+	if use doc; then
+		# Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building.
+		# (Because the data is in the image directory and it will default to look in /usr/share)
+		export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+		export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	# Fix doc installdir
+	docinto html
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED}"/usr/share/doc/blender || die
+
+	python_fix_shebang "${ED}/usr/bin/blender-${BV}-thumbnailer.py"
+	python_optimize "${ED}/usr/share/blender/${BV}/scripts"
+
+	mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherent risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "changing the 'Temporary Files' directory in Blender preferences."
+	elog
+	ewarn
+	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+	ewarn "libraries which are shipped with blender. Note that"
+	ewarn "these have caused security issues in the past."
+	ewarn "If you are concerned about security, file a bug upstream:"
+	ewarn "  https://developer.blender.org/"
+	ewarn
+
+	if ! use python_single_target_python3_9; then
+		elog "You are building Blender with a newer python version than"
+		elog "supported by this version upstream."
+		elog "If you experience breakages with e.g. plugins, please switch to"
+		elog "python_single_target_python3_9 instead."
+		elog "Bug: https://bugs.gentoo.org/737388"
+		elog
+	fi
+
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${SLOT}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/blender/blender-2.93.9.ebuild b/media-gfx/blender/blender-2.93.9.ebuild
index 1587ab1f1a50..7beda8bcbee3 100644
--- a/media-gfx/blender/blender-2.93.9.ebuild
+++ b/media-gfx/blender/blender-2.93.9.ebuild
@@ -90,7 +90,7 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-libs/imath-3.1.4-r2:=
 		>=media-libs/openexr-3:0=
 	)
-	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
 	openvdb? (
 		>=media-gfx/openvdb-8.2.0-r2:=
 		dev-libs/c-blosc:=
diff --git a/media-gfx/blender/blender-3.1.2.ebuild b/media-gfx/blender/blender-3.1.2.ebuild
index ea2bbb13c8a5..b5d76235c5fe 100644
--- a/media-gfx/blender/blender-3.1.2.ebuild
+++ b/media-gfx/blender/blender-3.1.2.ebuild
@@ -88,7 +88,7 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-libs/imath-3.1.4-r2:=
 		>=media-libs/openexr-3:0=
 	)
-	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] )
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
 	openvdb? (
 		>=media-gfx/openvdb-9.0.0:=[nanovdb?]
 		dev-libs/c-blosc:=
diff --git a/media-gfx/blender/blender-3.2.0.ebuild b/media-gfx/blender/blender-3.2.0.ebuild
index 9fcc16b94ddf..779c65dfd679 100644
--- a/media-gfx/blender/blender-3.2.0.ebuild
+++ b/media-gfx/blender/blender-3.2.0.ebuild
@@ -88,7 +88,7 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-libs/imath-3.1.4-r2:=
 		>=media-libs/openexr-3:0=
 	)
-	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] )
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
 	openvdb? (
 		>=media-gfx/openvdb-9.0.0:=[nanovdb?]
 		dev-libs/c-blosc:=
@@ -297,7 +297,7 @@ src_test() {
 	cmake_src_test
 
 	# Clean up the image directory for src_install
-	rm -fr ${ED}/* || die
+	rm -fr "${ED}"/* || die
 }
 
 src_install() {
diff --git a/media-gfx/blender/blender-3.2.1.ebuild b/media-gfx/blender/blender-3.2.1.ebuild
index 9fcc16b94ddf..8c82138b1e5a 100644
--- a/media-gfx/blender/blender-3.2.1.ebuild
+++ b/media-gfx/blender/blender-3.2.1.ebuild
@@ -88,7 +88,7 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-libs/imath-3.1.4-r2:=
 		>=media-libs/openexr-3:0=
 	)
-	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] )
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
 	openvdb? (
 		>=media-gfx/openvdb-9.0.0:=[nanovdb?]
 		dev-libs/c-blosc:=
@@ -286,8 +286,8 @@ src_test() {
 	blender_get_version
 	# Define custom blender data/script file paths not be able to find them otherwise during testing.
 	# (Because the data is in the image directory and it will default to look in /usr/share)
-	export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
-	export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+	export BLENDER_SYSTEM_SCRIPTS="${ED}"/usr/share/blender/${BV}/scripts
+	export BLENDER_SYSTEM_DATAFILES="${ED}"/usr/share/blender/${BV}/datafiles
 
 	# Sanity check that the script and datafile path is valid.
 	# If they are not vaild, blender will fallback to the default path which is not what we want.
@@ -297,7 +297,7 @@ src_test() {
 	cmake_src_test
 
 	# Clean up the image directory for src_install
-	rm -fr ${ED}/* || die
+	rm -fr "${ED}"/* || die
 }
 
 src_install() {
diff --git a/media-gfx/blender/blender-3.2.2.ebuild b/media-gfx/blender/blender-3.2.2.ebuild
new file mode 100644
index 000000000000..8c82138b1e5a
--- /dev/null
+++ b/media-gfx/blender/blender-3.2.2.ebuild
@@ -0,0 +1,399 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+if [[ ${PV} = *9999* ]] ; then
+	# Subversion is needed for downloading unit test files
+	inherit git-r3 subversion
+	EGIT_REPO_URI="https://git.blender.org/blender.git"
+else
+	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+	# Update these between major releases.
+	TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
+	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )"
+	KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+SLOT="${PV%.*}"
+LICENSE="|| ( GPL-3 BL )"
+IUSE="+bullet +dds +fluid +openexr +tbb \
+	alembic collada +color-management cuda +cycles \
+	debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
+	man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
+	+openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alembic? ( openexr )
+	cuda? ( cycles )
+	cycles? ( openexr tiff openimageio )
+	fluid? ( tbb )
+	openvdb? ( tbb )
+	osl? ( cycles )
+	test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source directory in:
+# build_files/build_environment/install_deps.sh
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=[nls?,threads(+)]
+	dev-libs/lzo:2=
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
+	')
+	media-libs/freetype:=
+	media-libs/glew:*
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/libintl
+	virtual/opengl
+	alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
+	collada? ( >=media-libs/opencollada-1.6.68 )
+	color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	embree? ( >=media-libs/embree-3.10.0[raymask] )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+	fftw? ( sci-libs/fftw:3.0= )
+	gmp? ( dev-libs/gmp )
+	!headless? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	oidn? ( >=media-libs/oidn-1.4.1 )
+	openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= )
+	openexr? (
+		>=dev-libs/imath-3.1.4-r2:=
+		>=media-libs/openexr-3:0=
+	)
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
+	openvdb? (
+		>=media-gfx/openvdb-9.0.0:=[nanovdb?]
+		dev-libs/c-blosc:=
+	)
+	osl? ( >=media-libs/osl-1.11.16.0-r3:= )
+	pdf? ( media-libs/libharu )
+	potrace? ( media-gfx/potrace )
+	pugixml? ( dev-libs/pugixml )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tbb? ( dev-cpp/tbb:= )
+	tiff? ( media-libs/tiff )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )
+"
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+blender_get_version() {
+	# Get blender version from blender itself.
+	BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert)
+	if ((${BV:0:1} < 3)) ; then
+		# Add period (290 -> 2.90).
+		BV=${BV:0:1}.${BV:1}
+	else
+		# Add period and skip the middle number (301 -> 3.1)
+		BV=${BV:0:1}.${BV:2}
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		git-r3_src_unpack
+		if use test; then
+			TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
+			subversion_fetch ${TESTS_SVN_URL} ../lib/tests
+		fi
+	else
+		default
+		if use test; then
+			#The tests are downloaded from: https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
+			mkdir -p lib || die
+			mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die
+		fi
+	fi
+
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	blender_get_version
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+		-i doc/doxygen/Doxyfile || die
+
+	# Prepare icons and .desktop files for slotting.
+	sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die
+
+	sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+
+	mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die
+	mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die
+	mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die
+
+	if use test; then
+		# Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests.
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i tests/CMakeLists.txt || die
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die
+	fi
+}
+
+src_configure() {
+	append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DWITH_ALEMBIC=$(usex alembic)
+		-DWITH_ASSERT_ABORT=$(usex debug)
+		-DWITH_BOOST=ON
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES_EMBREE=$(usex embree)
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_CYCLES_STANDALONE=OFF
+		-DWITH_CYCLES_STANDALONE_GUI=OFF
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GMP=$(usex gmp)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_HARU=$(usex pdf)
+		-DWITH_HEADLESS=$(usex headless)
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+		-DWITH_MOD_FLUID=$(usex fluid)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_NANOVDB=$(usex nanovdb)
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENIMAGEDENOISE=$(usex oidn)
+		-DWITH_OPENIMAGEIO=$(usex openimageio)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_POTRACE=$(usex potrace)
+		-DWITH_PUGIXML=$(usex pugixml)
+		-DWITH_PULSEAUDIO=$(usex pulseaudio)
+		-DWITH_PYTHON_INSTALL=OFF
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_FREETYPE=ON
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_TBB=$(usex tbb)
+		-DWITH_USD=OFF
+		-DWITH_XR_OPENXR=OFF
+	)
+
+	append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
+
+	if tc-is-gcc ; then
+		# These options only exist when GCC is detected.
+		# We disable these to respect the user's choice of linker.
+		mycmakeargs+=(
+			-DWITH_LINKER_GOLD=OFF
+			-DWITH_LINKER_LLD=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# A lot of tests needs to have access to the installed data files.
+	# So install them into the image directory now.
+	cmake_src_install
+
+	blender_get_version
+	# Define custom blender data/script file paths not be able to find them otherwise during testing.
+	# (Because the data is in the image directory and it will default to look in /usr/share)
+	export BLENDER_SYSTEM_SCRIPTS="${ED}"/usr/share/blender/${BV}/scripts
+	export BLENDER_SYSTEM_DATAFILES="${ED}"/usr/share/blender/${BV}/datafiles
+
+	# Sanity check that the script and datafile path is valid.
+	# If they are not vaild, blender will fallback to the default path which is not what we want.
+	[ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is invalid, fix the ebuild!"
+	[ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is invalid, fix the ebuild!"
+
+	cmake_src_test
+
+	# Clean up the image directory for src_install
+	rm -fr "${ED}"/* || die
+}
+
+src_install() {
+	blender_get_version
+
+	# Pax mark blender for hardened support.
+	pax-mark m "${BUILD_DIR}"/bin/blender
+
+	cmake_src_install
+
+	if use man; then
+		# Slot the man page
+		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
+	fi
+
+	if use doc; then
+		# Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building.
+		# (Because the data is in the image directory and it will default to look in /usr/share)
+		export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+		export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	# Fix doc installdir
+	docinto html
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED}"/usr/share/doc/blender || die
+
+	python_optimize "${ED}/usr/share/blender/${BV}/scripts"
+
+	mv "${ED}/usr/bin/blender-thumbnailer" "${ED}/usr/bin/blender-${BV}-thumbnailer" || die
+	mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherent risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "changing the 'Temporary Files' directory in Blender preferences."
+	elog
+	ewarn
+	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+	ewarn "libraries which are shipped with blender. Note that"
+	ewarn "these have caused security issues in the past."
+	ewarn "If you are concerned about security, file a bug upstream:"
+	ewarn "  https://developer.blender.org/"
+	ewarn
+
+	if ! use python_single_target_python3_10; then
+		elog "You are building Blender with a newer python version than"
+		elog "supported by this version upstream."
+		elog "If you experience breakages with e.g. plugins, please switch to"
+		elog "python_single_target_python3_10 instead."
+		elog "Bug: https://bugs.gentoo.org/737388"
+		elog
+	fi
+
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${SLOT}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild
index bbdce08e2010..80452e025729 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-9999.ebuild
@@ -51,7 +51,7 @@ RDEPEND="${PYTHON_DEPS}
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/zstandard[${PYTHON_USEDEP}]
 	')
-	media-libs/freetype:=
+	media-libs/freetype:=[brotli]
 	media-libs/glew:*
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
@@ -88,7 +88,7 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-libs/imath-3.1.4-r2:=
 		>=media-libs/openexr-3:0=
 	)
-	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] )
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
 	openvdb? (
 		>=media-gfx/openvdb-9.0.0:=[nanovdb?]
 		dev-libs/c-blosc:=
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 05091a34ea99..b5eaa17fc5ab 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -2,5 +2,5 @@ AUX fontforge-doc-no-warn-error.patch 834 BLAKE2B c8bd1cfcf320b7831cc64d67d8de52
 DIST fontforge-20201107.tar.xz 14163424 BLAKE2B 8ce9148eef6e5b7206ab5c70310ff36fac67c392117e3c0b28060803a54306bf21c179b62b98734e11253739eac29e2ea8bcf3014c09432bb3a0b2b0f3ec631a SHA512 cf9666395405ab02943f0160959f04251bd2a80e279a8f60431089ad19a4c5a232efd42097050ed9f6c1fb39d01488176262949fd81f5f0960fe853b497437dc
 DIST fontforge-20220308.tar.xz 13719032 BLAKE2B 66939a77014b086b95ea21c3af2a2c910c19ebba000d50e514000667a6b193f5a90fc55b6046793811cac3a7330c479973746ac09041f21b0237047105f4d305 SHA512 9975cffec8aa47bcb8c22405bea544cd263dc939b253e8fba2fbaa3b90a60e05b98eaf58365db8ae854d1fff8e641866a7e2e027003ae03a77104d6650dafb6c
 EBUILD fontforge-20201107.ebuild 2863 BLAKE2B 1c6ca7f18f00c3f09f145593d391f074d9d76d6aec893fe4f871b554b053bbfa870901c49b182ef4c34176e5a2e793f88369746794ecdd94b0096378722a0ec5 SHA512 8f5baa9a193d1cd047fc33e6d9848f1cb4bb0be16a351c838ad0a0be0cae3a77c534f7638b4e6e93cfb2d7def79692e1222f91fd122f54950a1a07fe0454b645
-EBUILD fontforge-20220308.ebuild 2780 BLAKE2B fa71375144bb5102cb2670a2a9781fc70194d5378a620cf1c1210cd4f8dae94cdbc28a84e780602a00677a6e09e634ad2fe4fa6feddefc75e33becde5895d94e SHA512 d3c0f8904616b6fa3348206e6e638515a984a39857bee949e87c42a18dbbdd68da43b479237297bdb2ea1dd67495a5ddbcfb08caa8dda433d0d204c0af441712
+EBUILD fontforge-20220308.ebuild 2779 BLAKE2B 5271351893f2e2c3d53f1fad4b3ab521b7325ecd1ab4e264b063af354e2da10347994976f6dcc694501925faf80e68ab4a664f0bed082643d001e9a329497240 SHA512 2604e269fad1a91ad7b07d0dd1acc81b8b97436175da2157593f26a40c26c9b397960c8ec8defbf2ad5590f1cad36b877fadeac2e143a09c7ccb2f1e093e10b5
 MISC metadata.xml 863 BLAKE2B 6a87762712128bf3d57122277839008c4ef057491ae1c1680a166194037ed00e66816f2c0c09be8a17909843ad49b807c06405b95332684dbee3b8d60d30d7ae SHA512 8f33c7d38f031fbf85c82b9743db80c2a3c85ddddeb4deb631fbb911a8e6c2e97b43560b82539ac93df0c577abe74ef743fd4ca1a3e2e2f978b7edfd94cba280
diff --git a/media-gfx/fontforge/fontforge-20220308.ebuild b/media-gfx/fontforge/fontforge-20220308.ebuild
index c34da438b9d1..bafa7a5fa7cb 100644
--- a/media-gfx/fontforge/fontforge-20220308.ebuild
+++ b/media-gfx/fontforge/fontforge-20220308.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforg
 
 LICENSE="BSD GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg woff2 X"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest
index fbdd9d33c0c7..87563e5721e6 100644
--- a/media-gfx/superslicer/Manifest
+++ b/media-gfx/superslicer/Manifest
@@ -6,5 +6,5 @@ AUX superslicer-2.4.58.3-openexr3.patch 2357 BLAKE2B 0d8c889817aaa7ddcdfd9ee434a
 AUX superslicer-2.4.58.3-wxgtk3-wayland.patch 485 BLAKE2B a6a12b7b6b0da28593ee417e45bc97d9c297ce40b8f4a3adb3defa237ca4849238d82f58b4e8e7a4432d3167613845dd828db37529db6dbc9626bb89aa29437c SHA512 515c9b4b00cdfdc268febba8614fe9d2f33c5721ab17935a19055a25ef870ec04a51fc9af801f159dd48fb1a2d882695df373ee3b28dc676ac50f0fbaf73d474
 DIST superslicer-2.4.58.3-profiles.tar.gz 15322406 BLAKE2B cfa89697e832e0601746cb21250e258617bcc0966dd111c82ae43a9720b3ffb760f57827a1f35c8ad57a23a7ffb4c78e48ec76d6e40b364f321d0f83c4d10939 SHA512 bbdc6bfa8e21a4bdbca903a367f033f9cb5a1966bd0688bcc81314ba9ee45fee37cb892c82be35e865137c4df7c1fabceb8e6de46316338df2af4a590de91c76
 DIST superslicer-2.4.58.3.tar.gz 45203382 BLAKE2B 822af2a1cb8978b21f8efdc0eb4841ec1d86517fd07782a8dfa6be2a58514dc3e772221dca40ff62808cb798fc4f51484b24e847328a7a6f154708431f0c4d3b SHA512 00302fba9ada1cc5df3c58f42fdb7f98322f94de7b78876c6a54a2229ae289e785082ea7a69f67bee54321fc4d97811675eeb70932e5774ab78ca8859343dd4d
-EBUILD superslicer-2.4.58.3-r1.ebuild 2124 BLAKE2B c9062d3cfe23f0ecff29c883a84c7c8c33f84e87ed9a54e2e064e0b3bf229ebe515f5f5ddc1f621e37cfcba2d9a76b639dd2064c3d50848090af685fca7d3a26 SHA512 334a4c40fea8afb218adc6bf70b07ca23252390075dd703572c13ed5a7669aa804b37379321e0c17246f6a10a2744d6f9238d62954d04a806ffb947397ee8fa5
+EBUILD superslicer-2.4.58.3-r1.ebuild 2125 BLAKE2B 75b0f72a96f7f454c1cb49080bb57c64296b4504bb9b417fe832d60be5828b3ac0850f1891dd68a989de20e44d20712fe9d99fa8023e284c28949e161e3f9590 SHA512 54cb72e00f37dd760da19e15d4f4560d9934344f09b365376e38ecae324720962b68cd9c15cfe240228992dfd572aa6b48dd6a281356936740a7210af3db27a3
 MISC metadata.xml 413 BLAKE2B a43550366844e53b0ebed37197d33bf38efb555eee344f053f90e35e939263e3959301fdd072d5b6925d1e3e0d1fd629e2f459356e2f227006f8784a4364fc11 SHA512 8e1abc223f2e24cca551b08cbc37910f2a43319fce7299e52dd586dd6454c83e98e59b8d14c18613c8894fdca33d04297affa2da1f4aa001a5e200e4b5f2c331
diff --git a/media-gfx/superslicer/superslicer-2.4.58.3-r1.ebuild b/media-gfx/superslicer/superslicer-2.4.58.3-r1.ebuild
index 25e24b5db12a..54a336980045 100644
--- a/media-gfx/superslicer/superslicer-2.4.58.3-r1.ebuild
+++ b/media-gfx/superslicer/superslicer-2.4.58.3-r1.ebuild
@@ -22,7 +22,7 @@ IUSE="test"
 
 RESTRICT="test"
 
-# No dep on sci-libs/libigl, in-tree version cannot build 
+# No dep on sci-libs/libigl, in-tree version cannot build
 # static library currently. Using bundled one.
 RDEPEND="
 	dev-cpp/eigen:3
@@ -66,7 +66,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 src_unpack() {
 	default
 
-	mv slic3r-profiles-*/* ${S}/resources/profiles/ || die
+	mv slic3r-profiles-*/* "${S}"/resources/profiles/ || die
 }
 
 src_configure() {
diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index 2e180b8e78c5..84d86a7d0c80 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -1,7 +1,9 @@
 AUX xpaint-3.1.3-gentoo-prefix.patch 3605 BLAKE2B c513a72991ec83b99fc12d90c112c743a0fec456ae09ad77ecee887e67d2891efd200d8d08bad594472060515b56b02b9097951c5ad285ddfebd3d46acc4265a SHA512 d231237fa1512637c5448b1c8c7a1dcffa1383a0dd24f6606215643ce51932ef58e994bfbc3f24d3376acdd9cc06d713d453c643d4d00e9d00af0e011e55762d
 AUX xpaint-3.1.3-gentoo-qa.patch 1480 BLAKE2B 43b80854e8d0bb68566f86116444507852bf61807846ec97238a90fefc8a86f9be3978858c12af3278b787b14f805edb628327ae411b8b6fbdcd7530ee72cbd5 SHA512 cfa7057625f3086b573f9109a89f29e1cf17c15d253a0c903bd0f315e4aac3d8111df899ef98d0a3416486d81305f0a041f061985d31d435ccbd24b0fc5a57b3
 AUX xpaint-3.1.3-libtool-clang.patch 1434 BLAKE2B d89978f8c925a64fa62ff2a0788ed81ca5faee6a71afda069930a7381e2bb095bbad3c1236c3594532afc5441ef789bf6ea0571b4bb25065e2cbef7fdc52ebe3 SHA512 f4027619c4eda686953fc33c62518a7ef12db09e6160f5e038179aa06f64629d2ad28b373ec332fe3266fd7e15af77577b6a60cfdffb165afe1358519201c399
+AUX xpaint-3.1.4-gentoo-lto.patch 670 BLAKE2B 851334824d813029f2a78fb2b3698c85eee3cc79bd63f3db222f6c32fa75bd3f7af85f00fc898ee71e3f5851c1c8181b2f3e798865d7516f2bebbba794783e38 SHA512 d2211c291fca46c102ecb820eeda7e4441326e856e91819c6e3adadfde9dd02e1bda8610b305bb2fe056bd6c5d4ad8e1e6b52015dafad86c76005ef5d166e7de
 AUX xpaint-3.1.4-gentoo-shared-lib.patch 503 BLAKE2B 12bae42eb3a119c8acb3c5a6436191bf65c9697f6d743531633f0d64f5cdb26270f659eb0725a26efcc780cc06f91cf7f4e4f5032cf72f21614f3f7e48615b25 SHA512 971fb77386f2a896605d05346c4cf65fd68bdcc7b2f82e1319059f1c4ac37b0d76585c8ff0ce6d5841639bd94b420ac29b2e5275fe9309b31549cc540f2a9833
 DIST xpaint-3.1.4.tar.bz2 1630009 BLAKE2B 6090156f0c27742487edfd24e803e814d7f2801c3847a5435a896e575ee3bf0b17f498e8ba8f4b7a87536780dd7c15ec7e0c0e0acb28b225d95ed0c835abfa97 SHA512 ea81f0f0eaad2072fe487efba933b6f0a4f2a4d8ae7548169b8e765cf1232c9944149a822173350af91309535d8f3625b8e58814811a5f4491fa3e2fcdf92e1d
+EBUILD xpaint-3.1.4-r1.ebuild 1722 BLAKE2B a0f24b55e5374d2d84a8a16e83d97e99f29a67ce2644bc38f50563893543cc6b10c3361308ee94c2de9e65a4c7610ed49f0407c16bc8539b9270de17b6f245ba SHA512 5fd04cdcf7cd6cd74ae45ca141f716f5c17215aea7acdbc83fcd9419cd9e004aa24afc5c93e9e44cc31637318011295815b4346963722f69c5914ad53fa98e88
 EBUILD xpaint-3.1.4.ebuild 1831 BLAKE2B b58a61ef1b8713afd3483f0222aef890c88a439551ef417d1cd3b88f5429eecba6b141485ad60856083b5794acebb8a91f3dbe4c2668ab419656d7f3393b45b7 SHA512 f8c103d2e97011cece1ca579b12d186eefd10478f591269b234297edd6c2a6f166384fb329fb92fcf920d717c2a6011aaa5cf023fad771e1d1cb7296d338ab4a
 MISC metadata.xml 1440 BLAKE2B 54c11ed5ec99921d5ff28f23ee6be2df1fb2d21b3a994c92a94f0edfb2b69116620767bb51811c095736c1f1a7fb4205d6f1971997d81ca9f3c17c6c394d3068 SHA512 34c889965c22aa055b0205d0f93b45f51572958bf0ac992a781a3a5c679303081c368e4af35fa4c4699e8ac4724e125b4048b2d2856c408092cd4c7859728880
diff --git a/media-gfx/xpaint/files/xpaint-3.1.4-gentoo-lto.patch b/media-gfx/xpaint/files/xpaint-3.1.4-gentoo-lto.patch
new file mode 100644
index 000000000000..abdb51967fbc
--- /dev/null
+++ b/media-gfx/xpaint/files/xpaint-3.1.4-gentoo-lto.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/859820
+
+dynFinish is declared as double, but always used as int (actually Boolean).
+
+--- a/dynPenOp.c
++++ b/dynPenOp.c
+@@ -35,7 +35,8 @@
+ 
+ #define XTIMEOUT 20
+ 
+-double dynWidth = 10, dynMass = 600, dynDrag = 15, dynFinish = 0;
++double dynWidth = 10, dynMass = 600, dynDrag = 15;
++Boolean dynFinish = 0;
+ 
+ typedef struct {
+ 	double	startx, starty;
+--- a/ops.h
++++ b/ops.h
+@@ -26,7 +26,7 @@
+ extern double tickSize, tickAngle;
+ extern double brushOpacity;
+ extern double dynWidth, dynMass, dynDrag;
+-extern int dynFinish;
++extern Boolean dynFinish;
+ extern int sprayRadius, sprayDensity, sprayRate;
+ extern int boxSize;
+ extern double boxRatio;
diff --git a/media-gfx/xpaint/xpaint-3.1.4-r1.ebuild b/media-gfx/xpaint/xpaint-3.1.4-r1.ebuild
new file mode 100644
index 000000000000..65557236f490
--- /dev/null
+++ b/media-gfx/xpaint/xpaint-3.1.4-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop toolchain-funcs xdg
+
+DESCRIPTION="Image editor with tiff, jpeg and png support"
+HOMEPAGE="http://sf-xpaint.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pgf tiff"
+# jpeg2k disabled for blocking media-libs/openjpeg:0 security cleanup, bug 735592
+
+RDEPEND="
+	media-libs/fontconfig
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	media-libs/netpbm
+	x11-libs/libX11
+	>=x11-libs/libXaw3dXft-1.6.2h[unicode]
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	pgf? ( media-libs/libpgf )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.3-libtool-clang.patch
+	"${FILESDIR}"/${PN}-3.1.3-gentoo-qa.patch
+	"${FILESDIR}"/${PN}-3.1.3-gentoo-prefix.patch
+	"${FILESDIR}"/${P}-gentoo-shared-lib.patch
+	"${FILESDIR}"/${P}-gentoo-lto.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable tiff) \
+		--disable-libdvipgm \
+		--disable-libopenjpeg
+}
+
+src_compile() {
+	# clean up
+	emake clean
+	emake -C util clean
+
+	# parallel make still fails sometimes
+	emake substads
+	emake xpaint.1
+
+	default
+	emake \
+		WITH_PGF="$(usex pgf "yes" "no")" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		includedir="${EPREFIX}"/usr/include \
+		-C util
+}
+
+src_install() {
+	default
+	emake \
+		WITH_PGF="$(usex pgf "yes" "no")" \
+		DESTDIR="${ED}" \
+		-C util install
+	doicon icons/xpaint.svg
+	make_desktop_entry "${PN}"
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index e30b936619ff..7948b3ec5c22 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest
index 19dedc764bdd..f37a6d791aa0 100644
--- a/media-libs/embree/Manifest
+++ b/media-libs/embree/Manifest
@@ -1,7 +1,10 @@
+AUX embree-3.13.4-fix-openimageio-test.patch 4663 BLAKE2B 2b6a5422f51977317c1149673bc8624f56d363d8362f2d3678c86e661d1f9eb6a2319df241d736a0da8e586d86fa6ff524c3fc98fe564f511551efe756b80d7c SHA512 b3b414f8068af8f45ceca91653b9e8cd2f06cfd7cafbd25a9b97ac6e3f30a27f22bbb121be34ee154e9910d3668f798d226199a843316762486ae85685a2ee9d
 DIST embree-3.13.0.tar.gz 13708421 BLAKE2B bace1866d9d6907308d38370347d23b4edb3fe287d093acf35367be1d4548d1df064ed9d46ef928f17af99e335d5fcd7b7285a2bd95707361440547544782080 SHA512 3fc4f00151cb9558810c643bf77f3135465d65c4523e08d5289a0fdcb18d4c63a8e805647e4ce208556c4679d44373d817761c1003b1e9dc65a39d5ebf17926f
 DIST embree-3.13.2.tar.gz 13716621 BLAKE2B 8fd770ea9984a9f5b532f114c7901a67105f95c98a1bad45ed9dc2e312062e22aee26d54bd54ac3c9593fed14d34b03903ac186516682890cfaf9e0714743cce SHA512 9e4912f52c503d8d1fe0c3c81bf8108f1af044bf08d76111e4c1ab434c6a38d33bae9aacfd60c874da76bcc2f909ad1f3f171d458adb7973644cdbfd3693dc0f
 DIST embree-3.13.3.tar.gz 13712462 BLAKE2B 02edef26b4c4f3676e792c06490e5947d3a2cedd4ce1bbf4731e60feea0b3714bf4bbf9d859d464f179674e4e0c9462d1565869713c5612705df273baa41923f SHA512 eef8d9101f0bf95d6706a495a9aa628c10749862aeb2baa6bba2f82fcc3a96467a28ca1f522d672eb5aa7b29824363674feda25832724da361b3334334a218cd
+DIST embree-3.13.4.tar.gz 13733908 BLAKE2B 4c6c24f62ee88a09149bd930716c71e91d54563eea5cc103c0346d3808c693e8470fc7ea98651e0df9e4423bda565d7ab1a23e16c9d0441c79e9ec9c8571b0fa SHA512 685c3935fabe1bfa7260ef148df26b686b085b75011d72011461471cbcef786a5ce7a0e85c57b2df05798489a2d4e80a8d3ee5df986029edad7df7511d99c0ca
 EBUILD embree-3.13.0-r2.ebuild 3632 BLAKE2B f444cb044ee4ccf93e943c7407d3c03c792ab45dbe7b29c985438de9686ee56d9885541b97eeab9fa1e8bda3c1966a7a8aa0b7f9149ed85963cfb227396920e8 SHA512 72ee5506cc0e7e4b834bc5952cce2627d07c545d380f94e41084db1646191b6ce10821c136f6d3efdd5bc0bfca9fe08831b0716b5b077bd0b5a826f33a7e76d7
 EBUILD embree-3.13.2.ebuild 3736 BLAKE2B c9990a93eee76ca97d72e6c4cd6ea93973e5af49bf2bfaeaada48d892f3e6d452b15904550c7fdfc9e8162e4eb59991c2a4bdd5b93c21c8fe14ea474431ae372 SHA512 2581de305e8fd4b963ee2ba7c8af5d86d0ab50eba8d29c20aaf2d9b203fbcf813fc3fad7cb14d003d8aa3b23294c061984ac8beded50d7923d58a0a72492bdc5
 EBUILD embree-3.13.3.ebuild 3736 BLAKE2B c9990a93eee76ca97d72e6c4cd6ea93973e5af49bf2bfaeaada48d892f3e6d452b15904550c7fdfc9e8162e4eb59991c2a4bdd5b93c21c8fe14ea474431ae372 SHA512 2581de305e8fd4b963ee2ba7c8af5d86d0ab50eba8d29c20aaf2d9b203fbcf813fc3fad7cb14d003d8aa3b23294c061984ac8beded50d7923d58a0a72492bdc5
+EBUILD embree-3.13.4.ebuild 3740 BLAKE2B 090214e0c2ae5c321b556caece7c22bf9383636060365742cb628aedc2e2cb73c7ac45a9af88d17e296f6a32657ef269e44961deccaf6703f37537ca7b716272 SHA512 3b19ca4ba5ac7964d2cd32f92b4ab7b2ffbed33a669b50b67ec771f5b04c7a9b82a886f1febf1527eda697d439ff80a9305447d7fc5cab499aebb1afa5c29637
 MISC metadata.xml 1705 BLAKE2B 2785c8b8752e5730e014ce6edfdd1702a20565ab12c9ebee14c3cf603e267a63360eaa0428afb9e178091edad40fe82ea55e2a872339da744113e480b4eda6c2 SHA512 ebfa1a6d3f8a8fe6acc0cc06f54ad62efb86942b55e985542a049fde421663adddcffe2a78c7309774df9bbc714a2bb11dad73c94b89bf2d1cdf56b69d334f59
diff --git a/media-libs/embree/embree-3.13.4.ebuild b/media-libs/embree/embree-3.13.4.ebuild
new file mode 100644
index 000000000000..10b3cb8db86e
--- /dev/null
+++ b/media-libs/embree/embree-3.13.4.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic linux-info
+
+DESCRIPTION="Collection of high-performance ray tracing kernels"
+HOMEPAGE="https://github.com/embree/embree"
+SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+X86_CPU_FLAGS=( sse2:sse2 sse4_2:sse4_2 avx:avx avx2:avx2 avx512dq:avx512dq )
+CPU_FLAGS=( cpu_flags_arm_neon ${X86_CPU_FLAGS[@]/#/cpu_flags_x86_} )
+IUSE="+compact-polys ispc +raymask ssp +tbb tutorial ${CPU_FLAGS[@]%:*}"
+# Let's be explicit here even though we could simplify it.
+REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )
+	x86? ( cpu_flags_x86_sse2 )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=media-libs/glfw-3.2.1
+	virtual/opengl
+	ispc? ( dev-lang/ispc )
+	tbb? ( dev-cpp/tbb:= )
+	tutorial? (
+		media-libs/libjpeg-turbo
+		>=media-libs/libpng-1.6.34:0=
+		>=media-libs/openimageio-1.8.7:0=
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md readme.pdf )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.13.4-fix-openimageio-test.patch
+)
+
+pkg_setup() {
+	CONFIG_CHECK="~TRANSPARENT_HUGEPAGE"
+	WARNING_TRANSPARENT_HUGEPAGE="Not enabling Transparent Hugepages (CONFIG_TRANSPARENT_HUGEPAGE) will impact rendering performance."
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# disable RPM package building
+	sed -e 's|CPACK_RPM_PACKAGE_RELEASE 1|CPACK_RPM_PACKAGE_RELEASE 0|' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	# NOTE: You can make embree accept custom CXXFLAGS by turning off
+	# EMBREE_IGNORE_CMAKE_CXX_FLAGS. However, the linking will fail if you use
+	# any "m*" compile flags. This is because embree builds modules for the
+	# different supported ISAs and picks the correct one at runtime.
+	# "m*" will pull in cpu instructions that shouldn't be in specific modules
+	# and it fails to link properly.
+	# https://github.com/embree/embree/issues/115
+
+	filter-flags -m*
+
+	local mycmakeargs=(
+		# Currently Intel only host their test files on their internal network.
+		# So it seems like users can't easily get a hold of these and do
+		# regression testing on their own.
+		-DBUILD_TESTING:BOOL=OFF
+		-DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON
+
+		# default
+		-DEMBREE_BACKFACE_CULLING=OFF
+		-DEMBREE_COMPACT_POLYS=$(usex compact-polys)
+
+		# default
+		-DEMBREE_FILTER_FUNCTION=ON
+		# default
+		-DEMBREE_GEOMETRY_CURVE=ON
+		# default
+		-DEMBREE_GEOMETRY_GRID=ON
+		# default
+		-DEMBREE_GEOMETRY_INSTANCE=ON
+		# default
+		-DEMBREE_GEOMETRY_POINT=ON
+		# default
+		-DEMBREE_GEOMETRY_QUAD=ON
+		# default
+		-DEMBREE_GEOMETRY_SUBDIVISION=ON
+		# default
+		-DEMBREE_GEOMETRY_TRIANGLE=ON
+		# default
+		-DEMBREE_GEOMETRY_USER=ON
+		# default
+		-DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF
+		# default
+		-DEMBREE_IGNORE_INVALID_RAYS=OFF
+
+		# Set to NONE so we can manually switch on ISAs below
+		-DEMBREE_MAX_ISA:STRING="NONE"
+		-DEMBREE_ISA_AVX=$(usex cpu_flags_x86_avx)
+		-DEMBREE_ISA_AVX2=$(usex cpu_flags_x86_avx2)
+		-DEMBREE_ISA_AVX512=$(usex cpu_flags_x86_avx512dq)
+		-DEMBREE_ISA_NEON=$(usex cpu_flags_arm_neon)
+		-DEMBREE_ISA_SSE2=$(usex cpu_flags_x86_sse2)
+		-DEMBREE_ISA_SSE42=$(usex cpu_flags_x86_sse4_2)
+		-DEMBREE_ISPC_SUPPORT=$(usex ispc)
+		-DEMBREE_RAY_MASK=$(usex raymask)
+		# default
+		-DEMBREE_RAY_PACKETS=ON
+		-DEMBREE_STACK_PROTECTOR=$(usex ssp)
+		-DEMBREE_STATIC_LIB=OFF
+		-DEMBREE_STAT_COUNTERS=OFF
+		-DEMBREE_TASKING_SYSTEM:STRING=$(usex tbb "TBB" "INTERNAL")
+		-DEMBREE_TUTORIALS=$(usex tutorial))
+
+	# Disable asserts
+	append-cppflags -DNDEBUG
+
+	if use tutorial; then
+		mycmakeargs+=(
+			-DEMBREE_TUTORIALS_LIBJPEG=ON
+			-DEMBREE_TUTORIALS_LIBPNG=ON
+			-DEMBREE_TUTORIALS_OPENIMAGEIO=ON
+		)
+	fi
+
+	cmake_src_configure
+}
diff --git a/media-libs/embree/files/embree-3.13.4-fix-openimageio-test.patch b/media-libs/embree/files/embree-3.13.4-fix-openimageio-test.patch
new file mode 100644
index 000000000000..9c9893815bc7
--- /dev/null
+++ b/media-libs/embree/files/embree-3.13.4-fix-openimageio-test.patch
@@ -0,0 +1,71 @@
+diff --git a/common/cmake/FindOpenImageIO.cmake b/common/cmake/FindOpenImageIO.cmake
+index 086b91183..5816f3bc5 100644
+--- a/common/cmake/FindOpenImageIO.cmake
++++ b/common/cmake/FindOpenImageIO.cmake
+@@ -53,6 +53,7 @@ SET(OPENIMAGEIO_HINTS
+   )
+ SET(OPENIMAGEIO_PATHS PATHS /usr/lib /usr/lib64 /lib /lib64)
+ FIND_LIBRARY(OPENIMAGEIO_LIBRARY OpenImageIO ${OPENIMAGEIO_HINTS} ${OPENIMAGEIO_PATHS})
++FIND_LIBRARY(OPENIMAGEIO_UTIL_LIBRARY OpenImageIO_Util ${OPENIMAGEIO_HINTS} ${OPENIMAGEIO_PATHS})
+ 
+ SET(OPENIMAGEIO_ROOT_LAST ${OPENIMAGEIO_ROOT} CACHE INTERNAL "Last value of OPENIMAGEIO_ROOT to detect changes")
+ 
+@@ -68,8 +69,9 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenImageIO
+ 
+ IF (OPENIMAGEIO_FOUND)
+   SET(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR})
+-  SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY})
++  SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY} ${OPENIMAGEIO_UTIL_LIBRARY})
+ ENDIF()
+ 
+ MARK_AS_ADVANCED(OPENIMAGEIO_INCLUDE_DIR)
+ MARK_AS_ADVANCED(OPENIMAGEIO_LIBRARY)
++MARK_AS_ADVANCED(OPENIMAGEIO_UTIL_LIBRARY)
+diff --git a/common/cmake/clang.cmake b/common/cmake/clang.cmake
+index 01480ac73..4380823ed 100644
+--- a/common/cmake/clang.cmake
++++ b/common/cmake/clang.cmake
+@@ -86,7 +86,6 @@ ELSE()
+   ENDIF()
+   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")                       # generate position independent code suitable for shared libraries
+   SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fPIC")                       # generate position independent code suitable for shared libraries
+-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")                  # enables C++11 features
+   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")         # makes all symbols hidden by default
+   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") # makes all inline symbols hidden by default
+   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")        # disables strict aliasing rules
+diff --git a/common/cmake/dpcpp.cmake b/common/cmake/dpcpp.cmake
+index aecb35169..fcdfb4ce4 100644
+--- a/common/cmake/dpcpp.cmake
++++ b/common/cmake/dpcpp.cmake
+@@ -83,7 +83,6 @@ ELSE()
+   ENDIF()
+   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")                       # generate position independent code suitable for shared libraries
+   SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fPIC")                       # generate position independent code suitable for shared libraries
+-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")                  # enables C++11 features
+   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")         # makes all symbols hidden by default
+   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") # makes all inline symbols hidden by default
+   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")        # disables strict aliasing rules
+diff --git a/common/cmake/gnu.cmake b/common/cmake/gnu.cmake
+index 1b2682d9e..cb96ecb64 100644
+--- a/common/cmake/gnu.cmake
++++ b/common/cmake/gnu.cmake
+@@ -44,7 +44,6 @@ IF (NOT APPLE)
+ ENDIF()
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")                       # generate position independent code suitable for shared libraries
+ SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fPIC")                       # generate position independent code suitable for shared libraries
+-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")                  # enables C++11 features
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")         # makes all symbols hidden by default
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") # makes all inline symbols hidden by default
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")        # disables strict aliasing rules
+diff --git a/common/cmake/intel.cmake b/common/cmake/intel.cmake
+index 2c8e86e6c..abdffba90 100644
+--- a/common/cmake/intel.cmake
++++ b/common/cmake/intel.cmake
+@@ -120,7 +120,6 @@ ELSE()
+   ENDIF()
+   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")                       # generate position independent code suitable for shared libraries
+   SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fPIC")                       # generate position independent code suitable for shared libraries
+-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")                  # enables C++11 features
+   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")         # makes all symbols hidden by default
+   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") # makes all inline symbols hidden by default
+   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -no-ansi-alias")              # disables strict aliasing rules
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index eeadf6939d5d..c1df1ddde933 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -7,6 +7,6 @@ DIST freetype-doc-2.12.1.tar.xz 2038632 BLAKE2B 81225caf1a2c586a8a282a22eaaf2341
 DIST ft2demos-2.12.0.tar.xz 263612 BLAKE2B d0cc154084a28a965798ba34c00368d70163d748f52fe360a6bd920bc9b6b962492efe05b7206b9bc4c4fd4770aa7db4279a287d6ba65a81daf7fc2b7a679a96 SHA512 70176ad89eab0121e9f5610f777da7e2f8478e24fbe9aded7f7fc3d7685019d40a0d0d6b586f3499f8589a2923082e3a9bc8ddc66482b8898642230bff5eaae2
 DIST ft2demos-2.12.1.tar.xz 263656 BLAKE2B fd48dc68bd832e7532e9fae869a19699ab3337e599118bb9f1b76c3bcdcecec3cd3f55f7387508d29baf85b8de4a549aaa0e8af34d988743b1737458e255bdcf SHA512 cd9356152a64d807c75b797d005ca1dd0bde69cc2fadedec101d125cb54b2aaff1f7afa2f20839caba7db66325df7c11ed4883b7e906110356b28d9900caaae7
 EBUILD freetype-2.12.0-r1.ebuild 7567 BLAKE2B 4754c8239a201e8ed1fb307887c6ac513aae84521b2632a99a176e43d16596a1d2ddfb260a598ae11a935d512e9f09dbae652f95f0bb06b49ea411dd26266fe5 SHA512 0dd511f51361c3d6aef8dd4da09d2ca53c704bdd7dd57e91191f884f7e1f5af681c0237a7da8ee1c792a979978104f7f6653cd08897fd43ebd079413efc041a8
-EBUILD freetype-2.12.1.ebuild 7443 BLAKE2B 81c8ac3926228c2a231511b3450304e1813938763ca18f186d773f757e3313b38164b3634008723f1678dc314302efe487f876dbeacc950ef7bf0de4efce743a SHA512 d93ee93d382dc9264cc7cf5d343603c0d018621100fc2b9328e4c7f46468b91a98b4c8708bcf160ce0f6f48c4d7629cd34653fc4b46b5b9e2bfae36af7bc529e
+EBUILD freetype-2.12.1.ebuild 7442 BLAKE2B a98c832f2d55564272429366df968204991d050c3f81795a9ff456fdb5137d6ea50b3d8e9143e43287a4d8abe7a273f393dd2c376046d472cd0f6e855b6d4c97 SHA512 297d15eb967909935af0c4a3902174a76770e77110807c62fe63fbdc4e473e3e92d3e8e9b8fae4c25ed3d5070046904359865c2175d5e02366b9445c1ce3d17b
 EBUILD freetype-9999.ebuild 7107 BLAKE2B 49c7d1ac429480f097baceba37ba0953b0a7a81a68636a9facee191643e8dce6c794f96e2250e5a17a72972bc8fcc400c24bb7f88f34162176490ab251d8076a SHA512 c4ecfed508b10a050c4d5957583d5fb370110f06753b1d439feedea1f859d11520a6dd2b7c26a0b3d0513ec2d6b6dd40dd13cf143531c548d9f533aa72384730
 MISC metadata.xml 1306 BLAKE2B db0f9487a62f002883a1850bbf90f5df4007215ce432440023a9c637ec79333576db4ebe4d3275f088a9225848eb508ef1b409c4c67ade051663d822ad5cb9ec SHA512 464c6f6810572f9f9194adba7b85ed8dfbe1c1b3dccafd5370fb555547b7a708768e2f302baa437cd5ab06a9da34a00d5aec7a48bc2903b24b8dab9f42aaa493
diff --git a/media-libs/freetype/freetype-2.12.1.ebuild b/media-libs/freetype/freetype-2.12.1.ebuild
index de3944e757a2..ec80b6fe47c6 100644
--- a/media-libs/freetype/freetype-2.12.1.ebuild
+++ b/media-libs/freetype/freetype-2.12.1.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
-	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 ~x86-winnt"
+	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 ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit git-r3
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index b7cd3ff1dcaa..ea67d45f90d5 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -1,9 +1,5 @@
 DIST glfw-3.3.5.tar.gz 776593 BLAKE2B ce92a42ef7361ae2580c9d6722d340106f9ca26e7fb436b9a4be2f25bf4a15d2b08d82ff71ad4ce4cd6a59e31d934d0fe6ab0e546474a3e7de38e229795ee0e8 SHA512 cbb8ebf25d3d826eb1daeff3ad2e0e965ce9def3352955f297743d918f625d96bc05bf87c90f7b57ec53376a0f2f6ce62f80b57fac4e81e023400de275e97beb
-DIST glfw-3.3.6.tar.gz 776716 BLAKE2B 6bd3ef60e637e96dc71013ce8caada2ad0aba47eb72fd35a7b3060344f604f497ea87d17689723f4bd968098f9b3828c258f35cb3a6128d1a8b649c523dd3287 SHA512 4c295c5f4c02f6ede125fce67c52a97450f552f3985b664745bd8a836c1d6d69c04727c956fd26ec61f1e5fd9c074a28dcf6b1d1800f118444eef066f048b201
-DIST glfw-3.3.7.tar.gz 779531 BLAKE2B f8ea04a6556ca35631d354f92f298c8942a0491e4a96ebcf56a5a88ce5ae68931f7c9cd638ce1951407ed8cb09e9e86272a944d85e1e8010dd6e68135c38de37 SHA512 7b71a5a564633c3617bb0e765566069de9d54e0381fb828959a77a42ca94546623fda514292adee72ddacacc305b219a2e6c4bb799bfab8186010642bc2dffe8
 DIST glfw-3.3.8.tar.gz 803789 BLAKE2B e06b319f4b5c1aaa27b32895c39fb1759adc0576a1e4c3fef095b31f204709d7ec6a89a915604b39daaa9f481a2bf2dbff165948ab2074b8a0b12c2afe913c0e SHA512 70d6d99fb7e7616990516070c9a430915dc68d89ec4fe785570f0b35f5c9606a34121e0cd57c0a7debb50e87e2a8e8d97d81a6d52d65ef454f7fd191bd9f679f
 EBUILD glfw-3.3.5.ebuild 1130 BLAKE2B 31fcf6d5552672d702966981b39ad09f2cd3f2b314543aa86ba3bb3e5a34c9b36fb35dbf53dfe1907b4f6260d14b78f3da6003022508cc87bbadf244bcd3c1da SHA512 2a366687fc283b0247c7137487d5c28d218fc75491918ef0ab02f0c1d46ddc709a09c69f1bc63cf1825381676d6869ef5eefc2b71f35b4fc98616d036703ec5c
-EBUILD glfw-3.3.6.ebuild 1139 BLAKE2B e79aee6746365d62eab5d88bec04a998f1874c09e1d56a0ed60355e249bc8997f18f24f6a1e511300b9887421e6bc57c8bac87dfe466f5eecbd44622db68cd8e SHA512 996a68b3a419747399c604a1eec2ea75bb5f376551d205ff6f2b0ad10aa0125fc61e09ed35be347814648d1d69278e1c0da669e1f36fe8c6cb21d09566648ff0
-EBUILD glfw-3.3.7.ebuild 1139 BLAKE2B e79aee6746365d62eab5d88bec04a998f1874c09e1d56a0ed60355e249bc8997f18f24f6a1e511300b9887421e6bc57c8bac87dfe466f5eecbd44622db68cd8e SHA512 996a68b3a419747399c604a1eec2ea75bb5f376551d205ff6f2b0ad10aa0125fc61e09ed35be347814648d1d69278e1c0da669e1f36fe8c6cb21d09566648ff0
 EBUILD glfw-3.3.8.ebuild 1139 BLAKE2B e79aee6746365d62eab5d88bec04a998f1874c09e1d56a0ed60355e249bc8997f18f24f6a1e511300b9887421e6bc57c8bac87dfe466f5eecbd44622db68cd8e SHA512 996a68b3a419747399c604a1eec2ea75bb5f376551d205ff6f2b0ad10aa0125fc61e09ed35be347814648d1d69278e1c0da669e1f36fe8c6cb21d09566648ff0
 MISC metadata.xml 486 BLAKE2B d62ee825d2d51b6090cd5de87ffcde75a6dea4e109f144ed1a8305e1fad19b578549118dc3f803069289341f6fb4b95772d34e7a5cd2faff8f84d99b29165c83 SHA512 e1225c91492f76382b91acf579c9fce1be411638ce82186b729bea4a9cb18eb73b6c97d4d6e84b42877faae97c8628cb61176e1fc32589a0f419146aca268d9a
diff --git a/media-libs/glfw/glfw-3.3.6.ebuild b/media-libs/glfw/glfw-3.3.6.ebuild
deleted file mode 100644
index 32cac19f8453..000000000000
--- a/media-libs/glfw/glfw-3.3.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="Portable OpenGL FrameWork"
-HOMEPAGE="https://www.glfw.org/"
-SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86"
-IUSE="wayland-only"
-
-RDEPEND="
-	media-libs/libglvnd[${MULTILIB_USEDEP}]
-	wayland-only? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
-	!wayland-only? (
-		media-libs/libglvnd[X]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-	)"
-DEPEND="
-	${RDEPEND}
-	wayland-only? (
-		dev-libs/wayland-protocols
-		x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
-	)
-	!wayland-only? (
-		x11-base/xorg-proto
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXinerama[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	)"
-BDEPEND="
-	wayland-only? (
-		dev-util/wayland-scanner
-		kde-frameworks/extra-cmake-modules
-	)"
-
-src_configure() {
-	local mycmakeargs=(
-		-DGLFW_BUILD_EXAMPLES=no
-		-DGLFW_USE_WAYLAND=$(usex wayland-only)
-	)
-
-	cmake-multilib_src_configure
-}
diff --git a/media-libs/glfw/glfw-3.3.7.ebuild b/media-libs/glfw/glfw-3.3.7.ebuild
deleted file mode 100644
index 32cac19f8453..000000000000
--- a/media-libs/glfw/glfw-3.3.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="Portable OpenGL FrameWork"
-HOMEPAGE="https://www.glfw.org/"
-SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86"
-IUSE="wayland-only"
-
-RDEPEND="
-	media-libs/libglvnd[${MULTILIB_USEDEP}]
-	wayland-only? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
-	!wayland-only? (
-		media-libs/libglvnd[X]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-	)"
-DEPEND="
-	${RDEPEND}
-	wayland-only? (
-		dev-libs/wayland-protocols
-		x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
-	)
-	!wayland-only? (
-		x11-base/xorg-proto
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXinerama[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	)"
-BDEPEND="
-	wayland-only? (
-		dev-util/wayland-scanner
-		kde-frameworks/extra-cmake-modules
-	)"
-
-src_configure() {
-	local mycmakeargs=(
-		-DGLFW_BUILD_EXAMPLES=no
-		-DGLFW_USE_WAYLAND=$(usex wayland-only)
-	)
-
-	cmake-multilib_src_configure
-}
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index 5eecb6688ff0..c85fb43aa277 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -2,5 +2,5 @@ DIST libjxl-0.7.0_pre20220329.tar.gz 21282311 BLAKE2B 8ced9811adba47e5ccac4d55cb
 DIST libjxl-0.7.0_pre20220511.tar.gz 1488860 BLAKE2B 63cc0d8161eb83efbae9c4ef238ec7300a8354ee7e030fafb96efca9c50216edfaf45bf276403df41a1bf4add533cb7031074c62faafc2f8d2e499290525f332 SHA512 605299cd4294c524b703bd163c083cb04c1f247aab5a6756d2e68482dab98c8d9585f248c03290e67c6cadf8692ead0c00abce7162d8dd7bf26b2cd4bfd1f736
 EBUILD libjxl-0.7.0_pre20220329.ebuild 1966 BLAKE2B 471819d39ffda2fde94c3e9567df095a60fde5c6bd7fe8da6c7f37f5a187abf2da900c2def6560049d8728d375aef98708c1ae53725fd45f5e0531a60cf68fa0 SHA512 e5b77fe41bfe6ae7063fcbe2cba6b2cde3147e9ebc266a597df9807af47dc5afb2ff9821fb0235a2e1f423a48c1013e2b29b2a4366c3231cd0c54b4c495ac276
 EBUILD libjxl-0.7.0_pre20220511.ebuild 1818 BLAKE2B 82d7db772a702fdedad0a1c7c009273082b8211df5a1bd7c821d0992429b33780d13134665caabba1f744fb2420abd6c108ae793d9d43ddcbed699f461bc57ee SHA512 554e7ffaffd6394ebad6bb5cf57c269a8bbdb95e03fb51b2fc8529963bd0e16d39d6c53136957f0d88d678725e94535c507d4e01f351bf39bd8aa5a98179fd22
-EBUILD libjxl-9999.ebuild 1826 BLAKE2B 1a0f9655b2fe44f61c8bb277dc96b4412855051dd53284815f04a577bb73c5c106b004d69648cb370c7bbb179da82df63f788317624656f76c91a0bc7443e556 SHA512 19af8aef31c90e326162425509b652be0c0f1be81750d090dff2ce1407dcf302cfcae2034ff6bf57d4f1d9b50330d97ff7c87cc1fc14254c20bae70342e69130
+EBUILD libjxl-9999.ebuild 1825 BLAKE2B f25b4b4c41b7c2bd1f97bfbba975a6e9a61a4550c4e02425354e39c125dd1dc07d5c65814655e6525704c556757949c0295a4e47766cd95c82b44e56e0b0b936 SHA512 92a8a2918fdb31b73603e3ec17fd8c4b30555457969e4c0820fad7b3ab1800611c1d90abb626d70b8a2c62c50dd5e69fb7aa1125fdf4c6acb8aa8514e90afc15
 MISC metadata.xml 737 BLAKE2B c6d720ad6e51168ebab6cc33b8c3af44149f19a8331f1b834fcf4e33f9b90050fae96bdd03202a83960ec7d01d9427e6eaf0be51d47efa736533b8bb5affaac5 SHA512 6b461b43818da3626a59c7d040c7f3cf470624b6205001445a0ede4ceffa4f1ad6233ea85cf3616dd4bfd7cbbd50ce28e0f509e13ec06b64ba4b724e2a90d602
diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
index 88ff53d84586..a2269bfc62ec 100644
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -17,7 +17,7 @@ IUSE="gdk-pixbuf gimp210 openexr"
 
 DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
 	dev-cpp/gflags:=[${MULTILIB_USEDEP}]
-	>=dev-cpp/highway-0.16.0[${MULTILIB_USEDEP}]
+	>=dev-cpp/highway-1.0.0[${MULTILIB_USEDEP}]
 	media-libs/giflib:=[${MULTILIB_USEDEP}]
 	media-libs/libpng:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index e0b9d99d4c04..42ec7a6eda9a 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -2,9 +2,11 @@ DIST mesa-22.0.5.tar.xz 15777136 BLAKE2B 9622193bebea643a973e4ffa94b86aef1b2a9de
 DIST mesa-22.1.2.tar.xz 15992280 BLAKE2B bb2929e6c7dd0384b8e58b2a0ab6f91eabec9b29b77349868ea737c2c8b8c0e33febb9836c6259601caa3ba4c6ab67f2c4df4d2677cdfab359bbce53d8df316f SHA512 2bcce3dcb6f151de7717153a0745c1c754dec7e63dae6923a2123d2149562f13ef8faaa0f15e54c434e80b0562932a8cf8be007d181777c82ccf7a1b1bb621cc
 DIST mesa-22.1.3.tar.xz 16016520 BLAKE2B 3f9838022914b4ecc8882bc648bdd99a81aab2c6ebd4d9a3ce74655d6ec718d09abc6424bdb4b84a5430dcc51113d67bfd3368af4a3f390d3c574733b8ade4b0 SHA512 e7348839eb37de89c90d21277a7cbb42ee673ad6c656177853f6d35db99556dbac29867712222342d902b4fa67df5687c9d543bad99c81bcd0ecfb7f08f37480
 DIST mesa-22.1.5.tar.xz 16072928 BLAKE2B c182af7855e3e04cdd7f7b25c1df62d13306c17f1973bb5b68eae3939a3cc640841bb37003f00f298033b666b7165c3e2639ff4bfa991123e165a73ac8cae203 SHA512 1aa72cd5b61635d489904944e5d80b1d923a38ffbd295341e6b30c492e469463bc4d0b63f74b071580572aec3a2cdfe19b3f2919ebc0fb4bcc35e114db925abc
+DIST mesa-22.1.6.tar.xz 16071404 BLAKE2B 2059aaedba4d74d5250a71a5a25ffb5a6b92314fb0bd2c8a99480459c79c6b7fcf93ee60a0d0baf9c198a3b00dd428060647a6c1a0534b73c6a66a8417bbeaa9 SHA512 3b2a0bb781c3d540401e6f51e3cf0d87d4e22923b6a5a4ea9d8ce5c79b4a2d5e8b1c237a36325d7d7178448ae102470ebefb312644dc09818cce91fd5439cb07
 EBUILD mesa-22.0.5.ebuild 12064 BLAKE2B 51531f4eda83c55fc660e0e0af4ecd56dd27f3a63e4e9edd682c2b59dba3fc9b5d807ba83e58ba72027238c39a8230746aaa8e274181998233b76e0059d6a7b4 SHA512 e07146df6d58f19f336dd9f791d1216394c9ceec2a8d91c78c9948af5071e13bea02c856b8c1f6237595530b471b01640a1abfccbfc658edd7675e2578efca12
 EBUILD mesa-22.1.2.ebuild 12083 BLAKE2B 0098256a7a32c52540258dcc1d531a701ad531891d2f6f4ca2f4cf0c1cdc364c4a8fb6487a6b8f0b6efe46d6fd06ff951e194ae4d64ab0b51d58140d95d1ac93 SHA512 b1f9f47fc0cf720a7be0193c7c11e0ec63dd3408aa284690ced9b58761c94520961b2bcb2b00ec0cf7e2b0d66b0d41b77b886069fd605ab08cfc0cee8ed6c3a9
 EBUILD mesa-22.1.3.ebuild 12081 BLAKE2B f9828aabd49e42d535be46a3b7d67b44de3e37587534b6d72b55cac4c48729c87829a0e642ed755eb08de2d824506bd2deb7e23d34f1f93dbdd2ffe8ecb5c6a0 SHA512 3ef778f79efc8c3f46920e11ec948ab512392873e54c44790baeeefe2bf786a12782640e5344d527ed1ecda7c9b5474a5f0cb9a2ed954229df07f8a375546962
 EBUILD mesa-22.1.5.ebuild 12043 BLAKE2B 2c84c59bb325ae48c615f4bcf9383b7e02436221bd1fd189753ca804a7c57a85c54ac99289f52d1fdd01170e17b3301488ad7ebd535f747bc57be86f57c6276d SHA512 d91bfae247e8cf49e0a1a0d4cf821955eef4c5094c595848adbad28ef6127251601e7ccdcef041a4986d8d097094710f530d2244d17a9ea930543e0f2dc4214f
+EBUILD mesa-22.1.6.ebuild 12043 BLAKE2B 2c84c59bb325ae48c615f4bcf9383b7e02436221bd1fd189753ca804a7c57a85c54ac99289f52d1fdd01170e17b3301488ad7ebd535f747bc57be86f57c6276d SHA512 d91bfae247e8cf49e0a1a0d4cf821955eef4c5094c595848adbad28ef6127251601e7ccdcef041a4986d8d097094710f530d2244d17a9ea930543e0f2dc4214f
 EBUILD mesa-9999.ebuild 12152 BLAKE2B c8c46b10699c28cc48a061f088aa99a24b1a943361a5ef794bad0a2575218d79b915c97e25da7a788fbba1553b389d70eb2d5acfd7890621c63c63318459fd3f SHA512 bebc380d05050a8cc072f28c96f008d4454d7614b56f371d6d6a389b4d30189ff84d11f7b1258932b83c6a7aaf21a7d44feb8e8b18b6ee0459620cd5594755bd
 MISC metadata.xml 1638 BLAKE2B 693f9dccb9933167cf5910541eff88b872bed49915574ffdf1776e430ef1e42f2a5a4aef5767a65927250a5e884c444fdf1340665a1f88105c1337ae8677dd59 SHA512 e304809d792e03ff480bd00f83358a6e33ad688cf45dd41fd5526a080bce6316148d838fc8d880f776501fb56524798a7e8a0a3b28105402ae3151ce7dda1909
diff --git a/media-libs/mesa/mesa-22.1.6.ebuild b/media-libs/mesa/mesa-22.1.6.ebuild
new file mode 100644
index 000000000000..97c13b468175
--- /dev/null
+++ b/media-libs/mesa/mesa-22.1.6.ebuild
@@ -0,0 +1,460 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit llvm meson-multilib python-any-r1 linux-info
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!test? ( test )"
+
+RADEON_CARDS="r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
+	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa xvmc zink +zstd"
+
+REQUIRED_USE="
+	d3d9?   ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	vulkan? ( video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_radeonsi?   ( llvm )
+	xa? ( X )
+	xvmc? ( X )
+	zink? ( vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110"
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		video_cards_radeonsi? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_radeon? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+	opencl? (
+				>=virtual/opencl-3[${MULTILIB_USEDEP}]
+				dev-libs/libclc
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+	vaapi? (
+		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+	)
+	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	)
+	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="14"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:14[${MULTILIB_USEDEP}]
+		sys-devel/llvm:13[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+	wayland? ( >=dev-libs/wayland-protocols-1.24 )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	wayland? ( dev-util/wayland-scanner )
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_intel &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain freedreno, intel, radeonsi, or v3d"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+
+	if use osmesa && ! use llvm; then
+		ewarn "OSMesa will be slow without enabling USE=llvm"
+	fi
+}
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_intel ||
+	   use video_cards_radeonsi; then
+		if kernel_is -ge 5 11 3; then
+			CONFIG_CHECK="~KCMP"
+		elif kernel_is -ge 5 11; then
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		elif kernel_is -ge 5 10 20; then
+			CONFIG_CHECK="~KCMP"
+		else
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use video_cards_intel ||
+	   use video_cards_r300 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau ||
+	   use video_cards_vmware; then
+		emesonargs+=($(meson_use d3d9 gallium-nine))
+	else
+		emesonargs+=(-Dgallium-nine=false)
+	fi
+
+	if use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau; then
+		emesonargs+=($(meson_feature vaapi gallium-va))
+		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+	else
+		emesonargs+=(-Dgallium-va=disabled)
+	fi
+
+	if use video_cards_r300 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau; then
+		emesonargs+=($(meson_feature vdpau gallium-vdpau))
+	else
+		emesonargs+=(-Dgallium-vdpau=disabled)
+	fi
+
+	if use video_cards_freedreno ||
+	   use video_cards_nouveau ||
+	   use video_cards_vmware; then
+		emesonargs+=($(meson_feature xa gallium-xa))
+	else
+		emesonargs+=(-Dgallium-xa=disabled)
+	fi
+
+	if use video_cards_r600 ||
+	   use video_cards_nouveau; then
+		emesonargs+=($(meson_feature xvmc gallium-xvmc))
+	else
+		emesonargs+=(-Dgallium-xvmc=disabled)
+	fi
+
+	if use video_cards_freedreno ||
+	   use video_cards_lima ||
+	   use video_cards_panfrost ||
+	   use video_cards_v3d ||
+	   use video_cards_vc4 ||
+	   use video_cards_vivante; then
+		gallium_enable -- kmsro
+	fi
+
+	gallium_enable -- swrast
+	gallium_enable video_cards_freedreno freedreno
+	gallium_enable video_cards_intel crocus i915 iris
+	gallium_enable video_cards_lima lima
+	gallium_enable video_cards_nouveau nouveau
+	gallium_enable video_cards_panfrost panfrost
+	gallium_enable video_cards_v3d v3d
+	gallium_enable video_cards_vc4 vc4
+	gallium_enable video_cards_virgl virgl
+	gallium_enable video_cards_vivante etnaviv
+	gallium_enable video_cards_vmware svga
+	gallium_enable zink zink
+
+	gallium_enable video_cards_r300 r300
+	gallium_enable video_cards_r600 r600
+	gallium_enable video_cards_radeonsi radeonsi
+	if ! use video_cards_r300 && \
+		! use video_cards_r600; then
+		gallium_enable video_cards_radeon r300 r600
+	fi
+
+	# opencl stuff
+	emesonargs+=(
+		-Dgallium-opencl="$(usex opencl icd disabled)"
+	)
+
+	if use vulkan; then
+		vulkan_enable video_cards_freedreno freedreno
+		vulkan_enable video_cards_intel intel
+		vulkan_enable video_cards_radeonsi amd
+		vulkan_enable video_cards_v3d broadcom
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	local vulkan_layers
+	use vulkan && vulkan_layers+="device-select"
+	use vulkan-overlay && vulkan_layers+=",overlay"
+	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=enabled
+		-Ddri3=enabled
+		-Degl=enabled
+		-Dgbm=enabled
+		-Dglvnd=true
+		$(meson_feature gles1)
+		$(meson_feature gles2)
+		$(meson_feature llvm)
+		$(meson_feature lm-sensors lmsensors)
+		$(meson_use osmesa)
+		$(meson_use selinux)
+		$(meson_feature unwind libunwind)
+		$(meson_feature zstd)
+		$(meson_use cpu_flags_x86_sse2 sse2)
+		-Dvalgrind=$(usex valgrind auto disabled)
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index c8e6e01d5740..f5e8314d833a 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -3,5 +3,5 @@ AUX rubberband-3.0.0-build.patch 6150 BLAKE2B 2548de747697e04988e55483f08afd1c8e
 DIST rubberband-2.0.2.tar.bz2 178974 BLAKE2B 602d7eb76791d431a65bd5ef0d53ea0c2672e67aaa566594b3b2bb026cdf1b8879380818c3626a2c6d51cd6366bd47a52c69c110da566aa234fb7b37b19f027b SHA512 87dc5d59995bf949c35b885bb2eced067d84775bab76692da1202ae7554cb1b8404ca7371c264363e6d55c8978762ed32b446535746061f09e90cfc599adc0a0
 DIST rubberband-3.0.0.tar.bz2 213089 BLAKE2B 74afdf1f7c3360b711b365d73e12fe84afa5abc8ddb6a10a3d31392a621e9fca67e8b4c0292238b0e5726c56242438e1b2ef1d7d6ea6979a360cc7ecab45de75 SHA512 d8ce300a2cca7e35c548f9cd9f2f77f9b730b0e9427214d4a825b32ea9c90769e229f91db5846b90ff11a1513e8f68447fb598aa2684f67f10b4b9414b9ad748
 EBUILD rubberband-2.0.2.ebuild 1580 BLAKE2B 63d0645884bbbf9b033c42c257477c57b794f95a6dad529e707db3c4319b6ff9be4b62a42f17f2fd8528ffcf3998653bae2b3eaa72a2448d1fcbbda30b3b2438 SHA512 708a74df246ca65f6ea0f384ada9870b88c4db42d92d03758daf232d7f2bb6d35de6c50b3291ac4a5bbfb1aac82ecce38d33c0785d6a5df5e107479cd39093a6
-EBUILD rubberband-3.0.0.ebuild 1576 BLAKE2B 51cc98632c8385d4e1c87f1d455eb9885eec7ff700179320becc4c044a31faa172295d20a7d37652e054f865d5b7cfd60f0c64717e4e9f63f4f5aaea54878899 SHA512 9092b516cf33c59591fea47cfa1f790fce89d58749ef4e19d1ba4f14ca233fd8b3c3d2799f47deefcda2f0f4f39c1088f884e6ec76449ecee4fc7f272754b699
+EBUILD rubberband-3.0.0.ebuild 1574 BLAKE2B 51dc0b8bd83226eda15a5d35c5f1f589f0a009664c01ebd697febd75ea8e1a2a5997deee7c4f20950f2b3eb74ae8a5d22aba90abfb6bb3580636ee91abf5478c SHA512 640cf1c42eabfa6a6f5dc153d0e028bd9a3c74f36cd8b7dd0496627f0da4e4b6fe193118443c98aa6f84181b8bf29169e16ebe541cfc944ece5aa58b1880e3d9
 MISC metadata.xml 491 BLAKE2B bda0db771d95de138274eb35f4c135f3bd9fb3a1b75ce60a8c57ad71e0c0a894924bb52060c8ca87e689f2a0f581213639de2ca5615a134dfecfa4f008698b2a SHA512 c549bcf465808927153a79f145b222379270d2813e150606382dcb1c15980a37a89d7f0178d3fee2fd3eb7216dd6ad989efe0a24e398f67af95872f6c92d570a
diff --git a/media-libs/rubberband/rubberband-3.0.0.ebuild b/media-libs/rubberband/rubberband-3.0.0.ebuild
index 60f6b4ff34a5..ca9a1e974112 100644
--- a/media-libs/rubberband/rubberband-3.0.0.ebuild
+++ b/media-libs/rubberband/rubberband-3.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="ladspa jni static-libs +programs vamp"
 
 BDEPEND="
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index f817e3c310e4..03195d068e7b 100644
Binary files a/media-radio/Manifest.gz and b/media-radio/Manifest.gz differ
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index c2587c6905b6..2a110c91e4ec 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -1,4 +1,6 @@
 AUX flrig-1.4.4-musl.patch 618 BLAKE2B e03367cea46747325ab98a9a9b2a7bb2b977e21e430d648e4ad2c8dd95665fc78d98b0d3fd3253953c9e714f5edc80031f5a236435e5b4ff5472e700809086fa SHA512 9d46857614b82053f64153ecf17e2d5ce89c419972d233d17ae5d237b0e7a2fa0756602adbf80bfc9a990978fbff5fbaeb56f186904490499055684a980e3d86
 DIST flrig-1.4.5.tar.gz 995774 BLAKE2B 7853c38521c880cd0b1622dae339f6e5120ca9679e7f661e9b0aacc9b3bb12708c3c9a8b1204db0ebe69358bf0dd0daa0a5989163cc304b43c6906cc1872da4d SHA512 f4bd283900975f59b82208e21d9258b25901ed893e339cfc80eb27ce464439eb9df7b04af855a2c87b73cc477d327f965fd48d89589539bdf0da907078f765d3
+DIST flrig-1.4.7.tar.gz 1042848 BLAKE2B a1cb9ccd57466dc1d2b387dd8a4e9784f937a2f0227a0e394b10a25b40d06c4c9566dff2b4e5f7b09b5564b13b8fa604a0618f7909b992053f8d7ec6f0aa4c7c SHA512 6d213e15e0a81808491509e10c84e6f90b5f22483a9a327a4a1a56fdd1b773f2ddfa615470e5e5458747bf4d7a2087f2753951b25e6d2169dcf26aed7f50d87d
 EBUILD flrig-1.4.5.ebuild 580 BLAKE2B 736959be898c2c019f981b73efeb1959855e77dc69b7be94d78010395e7b863140744df973509a677f3753c484e652246ff603ff5eaeade68f71f3d639334d5b SHA512 ae7ad3a79af61d473426a6f28a6677ed42c7563584cc8c95a575d7a799beabdf83f64363be6b7bcd133b8d80a9835bc27c96b0b377dd0fafdc9b734666013fd3
+EBUILD flrig-1.4.7.ebuild 582 BLAKE2B b09dfce22f77aa2d6d5a6438c17ef42e0bddb9789c32abf5adf457af92008637f3ccc2d567aa4b4ebb4961cfcad3362619c69f0408f347f97259a32a6c1fec77 SHA512 f3a0722ae497b9d4c28d35ff26b77294de34cd131b01ee2a5118023638996b4f93e5de661fe4b2bd5b11c1a0938ea47918a0b26cb57ca8888e932ec85ec94816
 MISC metadata.xml 326 BLAKE2B fb57e943fa61222b3967939ff95da7bb17aae2651e55d960a9c405e6d5965843ed0ec9e6fadd0df1f41602c0f3c90c78c6ca2ab12ea72b515484f7c2ec34ec68 SHA512 e48dc185e9eaa074ed92d1ed27920e41b72760cd3e878fd40583efdca0a6997598a7d82221a33c7987fb19dea090f92eee070b9e89ea452ddce028d88db7bf9c
diff --git a/media-radio/flrig/flrig-1.4.7.ebuild b/media-radio/flrig/flrig-1.4.7.ebuild
new file mode 100644
index 000000000000..fa8591685185
--- /dev/null
+++ b/media-radio/flrig/flrig-1.4.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Transceiver control program for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
+SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+DOCS=(AUTHORS ChangeLog README)
+
+RDEPEND="x11-libs/libX11
+	x11-libs/fltk:1
+	x11-misc/xdg-utils"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}/${PN}-1.4.4-musl.patch" )
+
+src_prepare() {
+	eapply ${PATCHES[@]}
+	eapply_user
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 58900185a190..91ec475dab39 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 99791d15f290..392db5f2dbea 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,5 +1,5 @@
 DIST fluidsynth-2.2.7.tar.gz 1748897 BLAKE2B fd53603947ddf5a76676cfc3d77b1d904146ec7c30ab6e54a2c32cae0e76ec4b66397506072cac277febdd1b799801d5b13c7b37cc0ea4a545fae26077a1d881 SHA512 62709f96fa07bbafb9b907438da7376abdf1a4e679cd2b105c5bca257f1ff62c18bd4c646ef2ccba64ca5273604da996fb2caaf61eeee44686bf45fef1ed83a7
 DIST fluidsynth-2.2.8.tar.gz 1751615 BLAKE2B 7eaee4cc1c2f49e464cda2852890ec8e96bd86c258a39246ec5c84ea3e57c9869d1e88963daecc3fa8957df1d55ff6c6633a4900de3d6fc0a1adf830865adda0 SHA512 8173f2d368a214cf1eb7faae2f6326db43fb094ec9c83e652f953290c3f29c34ebd0b92cbb439bea8d814d3a7e4f9dc0c18c648df1d414989d5d8b4700c79535
 EBUILD fluidsynth-2.2.7.ebuild 3411 BLAKE2B cf562d000e5f356f19726938c25725b46fafb5e89cf38284f06b22698c8b862223d36a50aca668442646883ec9f276233388c6ead9bd1e4552960e7f1297c8c3 SHA512 005178c5da24a8d97d75743235db5ea4dd6c7f08896b06af3dca8ee14f0b8acd05009ba28f0a5fa7c40a0507d7b9bb164117b92ceb00d3574eb8345ccab33dfc
-EBUILD fluidsynth-2.2.8.ebuild 3418 BLAKE2B d06ccfb0efd1626bf3ad273d7b743fc549a1a4d7d8f1bfb24dfbb303e2141370510d9326b34912995bd5604c4824fb7293919e98faeae7a57af69caf29e731c1 SHA512 c401e9ab73e94457be436e4adf6a0c438000743da19a57e299e5e6844ec1bea8ef294f9a4428186601b5c1b33be9b245d0a851055d4d41f1699d3a1214026ee2
+EBUILD fluidsynth-2.2.8.ebuild 3413 BLAKE2B 0b37909e267fcb08c8726e5b6012f01b2d5987d2ac6046e36f2df77bfe21783b3f696d064df171251ac09b4f3be55c56d493a6eb2d22706efbb26ae83171ed28 SHA512 5bead39e2f8a80de14bc4b18dd240709816227649f19dd3dea8b4bc2c3d3e7c044a960dd63416c57bb757f37bf76f2804842e4a30610fb0b06568936ce19efb3
 MISC metadata.xml 431 BLAKE2B f739f538274e2e63b1977673b0766a594db59982ab71d6552d1e841434c4040bb7af29d441b1d9e8ce61385dbdb8e522b5591f6826a4c52f085bf004f9fe8426 SHA512 c8085e7652a504610fb841e302ee380de58a67a16a9b874447c00ee20c2d56119254eed954704e8bd4cf8e574980da2dd2f90baa5c99e59cd534e26245af67bb
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.8.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.8.ebuild
index 51908c546139..29d582572fd6 100644
--- a/media-sound/fluidsynth/fluidsynth-2.2.8.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.2.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc ~x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index b4fc4f53967e..fa90da42eeae 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 8d8ea8b14772..1276f9043f3a 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -29,5 +29,5 @@ DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 19b98d51a69f52ecda5500f51ef1741a8397953
 EBUILD vdr-2.2.0-r6.ebuild 8172 BLAKE2B e6823542e56a5ae3bd4cb5d61840522b25ba9c0d1cb600b8a035a5e79f19c530e478751634130199aff157a8d32adc9b154b3d67d863eb54bfc0a8a4dcde8ed6 SHA512 f67d2c299f7e45cb398294735bdaf6fe2c23b06900aad8b9520bd7bab426cffff99d5be2861dfd0a9ac85215324c52b8a4130fd2b4ae6597c3d459f2c179fe3f
 EBUILD vdr-2.2.0-r7.ebuild 8240 BLAKE2B 4ce894b7b579a3d2d9e6c0d3f30b8aac6600479152f2d0d7377d7ae829b35d98ecf7b269a1889084d1cd2c09ece2dbf6c372607d944978e37e11dc2717c3efd4 SHA512 7bed97818724be9f25ebafe1e1256ec0b683ad908306eaceea32a47efaea6b1d5ac5ca43163587d0de7158691b63d61fc88a23ca3a79bb53356f6255f35c4f4f
 EBUILD vdr-2.4.7-r1.ebuild 6171 BLAKE2B 4ee4c05630a0a0133def40460d97839fe2c9346b162f7b9415c48e544c476cf4cf94a66e905f6176dc23478567aec2f0bf5a738cb1b5fe4a9e005f168e75e751 SHA512 c2e97f014040c1f0af8c56e1aeec947b3cd9f428bda0d8897f2de4531445593fabd53dca7e33c0be958147f7cdbb31f9fc8a15e91923d6317ddaf4f8a54f2e1a
-EBUILD vdr-2.6.1.ebuild 5514 BLAKE2B aa69dce8d2bc25ce00ec6eb8b01c71b5d7a67726d6bb4190f3e9d628750d4739df62592d82c3e3a76f14935e7324d8b7ac03aa14cd7cf7879c19082436a1466b SHA512 84fc30ca547d9e4cc70c91f67eed91b838b059f853eceee7d1ca51b5ca4c088e3db1c58c16676af498f478044ee91df7b96c9cce2b3c1025a48662ff820d6a21
+EBUILD vdr-2.6.1.ebuild 5516 BLAKE2B 983bd7cdde7db48a66cf4ccf6da220a2eeee13bba343c6fb88e56d82ea82ecda2a621d134b452017407be3c942332c60ed91c69741c23459c544c2d37c27023d SHA512 1912ecabbbc95c369c99ac769b8728de1018f7aba9d63e27fc9c97dfd4c04dc81784f1cdf5328150ea7aa94936221f1ac5977366123c87b810463379e960a1a5
 MISC metadata.xml 1780 BLAKE2B 179a1948c96a7b237b500a08861799c25ae084d5b9cd6702921acd04cfbf0111bbb11170e4d14bf31ad7355ef0899f285857350131badc411548a3611593ecb6 SHA512 6c8c2073c55f327d4dfe52cb22ae1622d936c43503caf2964594656e1281b07110187c139216a73ed10abd625b43509ecdfe41edb7439950653e038991abfb31
diff --git a/media-video/vdr/vdr-2.6.1.ebuild b/media-video/vdr/vdr-2.6.1.ebuild
index 306bbb8b220f..d6ef75f71242 100644
--- a/media-video/vdr/vdr-2.6.1.ebuild
+++ b/media-video/vdr/vdr-2.6.1.ebuild
@@ -58,7 +58,7 @@ add_cap() {
 }
 
 lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
+	LING_PO=$( ls "${S}"/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
 }
 
 src_prepare() {
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index b81b8980f746..826ad144cbd9 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index a03a3a561952..5782a557b641 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Aug 2022 06:39:56 +0000
+Thu, 11 Aug 2022 12:40:04 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 3b31a2898f90..c7290d2d2461 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 520976 BLAKE2B 7dfaf17999dad5e80e78ca82a3453bad0d1dd93080c368421ff47c3671435b97874f1120a4f79883a4be6eef4c4ca625a2780e2baa63a836f2c65b64d721932b SHA512 b7a8242e7f468835252f7166256d06fc326a7b57876a83546b977c0010c88282d7526387515ddfdc846408f5965fd794a2d8be4351a3422ce499e998eaf2eb90
-TIMESTAMP 2022-08-10T06:40:01Z
+MANIFEST Manifest.files.gz 521770 BLAKE2B c2acb8c863b2efce05519b69900dc397016a5ee5af4af18fda8ac25353a157eb4632e81d3a44a9e724b472ac3f520214dc9c6708619ea63041d0b272f7a9be10 SHA512 6eb592a988ac90c24adf99f6fcb0f9a848c75aa47fdc37e5dbf4ebafea5daf193d2bf7928130322630437e54a2d9a93d5dd6a6ed7658bde2da05b340db2721c7
+TIMESTAMP 2022-08-11T12:40:07Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKSBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLzUsFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL0+KdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAf8A/2Ll3bnLdG5rVjUf4BFHaJkwKD/N2oLkaqHSN/P5FwCjuxkIXoR8Ufn8an
-OniZ9kPpyNNTDXYljRdRvlC+P8NjATTM/omp3Zsc2/P9R/KtqF4a/3c6/P5tkN+p
-vNcvrEfUvXx6i9hoYW3Y3nGrN21OuIP6jqvfNPguOxs1zPMnknouvb9MW0w1jsiy
-WpBGUtq9ciIINICrqNex1fxbhpl41CyggdE8wQsNBHj/2ae+KI7sfh+5mj34y5gs
-MyB0vMyU3uutRWk5NoHUJlZ1KHr0p48+d/lfRF3GIdjqC98YkdyEan72BbWauo03
-vOIToOHK70HiE1FxMgEGvemNe+4UFDGPVYsEQ6TEcJ6evMWwId8FqtdzY4uIsGv4
-+P6uzYV8Gm2QMYXLtorrvRf9yV9kHFwdfS7JJtQEWU8kl/a6ypj38L7LSQ275cLl
-L7YHEdgD0urIuzK/zyT0FF2p5t6PhrtmFPczwjkaYBkBy1PJJCH8o5pcy8YKkK8Y
-ckA9nvVLkjn5uzNlfKL4p9gRspu1a1J4hhBZZ2LlMlXcgWMOUgKIBAg/nsf739Hj
-zMwZykwhhAOaqODZBnxKgJnodRa8ZioXtO8VXG/JpevsC5W+BZ9dZhv3ilzgIDob
-SHv4qhyFLaO2/ZsUr1WJKrRqxtVKhAAMKZvfwvTJZKQ74oSU/w==
-=sz+k
+klCudg//dr5wG0EFcbO04M3mM5MdSqDnfRl3hxwgzCH9o3U6X5nuXxxUEsirzpTB
+3zU1QGO3Gur8QGyHIfGN78JbOU1yIu1QECp5krLFjh8lwiSExGGvBKz5/bpIDKdb
+28Bgdd2+/0HiFWNrcwtvRnBluT+u8Hi4np4kKbsbAI47soPjyNoMiV1dFrpgc1zK
+7/+gvxk1b+2gk5WD5eAM4GKQ4XUUe/XotgOtJi4lIqGd7hk+qCFygMUVLMFPPfoh
+j6ptH2lrCueDojVBe79XJSWLouNSfq0ozhtf08xrv2bUSuG81iJiFm9vW/X4KKWm
+pF2woHVrkWdeAvhbQ9rcC2mFXBMd034l8SzyplKHKAtd5nluKjEp65Nwwt6fjZSX
+XhlmHG1PwEgzVQXyWiAQshzITa3MB8EdEFNFYCc4lZEDHw/+hBP5ifLgVBxvk6tj
+n+CBZDaflwGIgkNflHZKf/lEhfOlfIUBbP9H4uj6q7KkQir3A0ukY13M26pflAPw
+nlyq4KJD0j7WjE8TLJe1kNAJPDd2OVdhX8sJZtg5QCGCyzbx4lnFoWx220Nm4ELp
+cVXNygXpwJ0qeqIZQo5lYQvhfRGZDPXvDNMSZUAJDL6OHKNiLGl7WdLGikOllhkt
+UlexxeCXfRb71Y2WbqQxoK3e6vD/LdVEZgCYU7WkocqqHH5Fczs=
+=bgbZ
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 2b18dab9db4f..9bf88c2b1bab 100644
Binary files a/metadata/glsa/Manifest.files.gz and b/metadata/glsa/Manifest.files.gz differ
diff --git a/metadata/glsa/glsa-202208-15.xml b/metadata/glsa/glsa-202208-15.xml
new file mode 100644
index 000000000000..dd408fc6a01c
--- /dev/null
+++ b/metadata/glsa/glsa-202208-15.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202208-15">
+    <title>isync: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been discovered in isync, the worst of which could result in arbitrary code execution.</synopsis>
+    <product type="ebuild">isync</product>
+    <announced>2022-08-10</announced>
+    <revised count="1">2022-08-10</revised>
+    <bug>771738</bug>
+    <bug>794772</bug>
+    <bug>826902</bug>
+    <access>remote</access>
+    <affected>
+        <package name="net-mail/isync" auto="yes" arch="*">
+            <unaffected range="ge">1.4.4</unaffected>
+            <vulnerable range="lt">1.4.4</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>isync is an IMAP and MailDir mailbox synchronizer.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in isync. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="normal">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All isync users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=net-mail/isync-1.4.4"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3578">CVE-2021-3578</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3657">CVE-2021-3657</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-20247">CVE-2021-20247</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-44143">CVE-2021-44143</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-08-10T22:30:18.734099Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-08-10T22:30:18.742070Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/glsa-202208-16.xml b/metadata/glsa/glsa-202208-16.xml
new file mode 100644
index 000000000000..54bf4f2056ad
--- /dev/null
+++ b/metadata/glsa/glsa-202208-16.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202208-16">
+    <title>faac: Denial of service</title>
+    <synopsis>A vulnerability in faac could result in denial of service.</synopsis>
+    <product type="ebuild">faac</product>
+    <announced>2022-08-10</announced>
+    <revised count="1">2022-08-10</revised>
+    <bug>762505</bug>
+    <access>remote</access>
+    <affected>
+        <package name="media-libs/faac" auto="yes" arch="*">
+            <unaffected range="ge">1.30</unaffected>
+            <vulnerable range="lt">1.30</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>faac contains free MPEG-4 audio codecs by AudioCoding.com.</p>
+    </background>
+    <description>
+        <p>An invalid pointer can be dereferenced in the huffcode function of libfaac/huff2.c, leading to a crash.</p>
+    </description>
+    <impact type="low">
+        <p>An attacker with the ability to provide crafted input to faac could cause a denial of service.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All faac users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=media-libs/faac-1.30"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-19886">CVE-2018-19886</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-08-10T22:30:58.155858Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-08-10T22:30:58.161210Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/glsa-202208-17.xml b/metadata/glsa/glsa-202208-17.xml
new file mode 100644
index 000000000000..c4ead642720f
--- /dev/null
+++ b/metadata/glsa/glsa-202208-17.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202208-17">
+    <title>Nextcloud: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been found in Nextcloud, the worst of which could result in denial of service.</synopsis>
+    <product type="ebuild">nextcloud</product>
+    <announced>2022-08-10</announced>
+    <revised count="1">2022-08-10</revised>
+    <bug>848873</bug>
+    <bug>835073</bug>
+    <bug>834803</bug>
+    <bug>820368</bug>
+    <bug>812443</bug>
+    <bug>802096</bug>
+    <bug>797253</bug>
+    <access>remote</access>
+    <affected>
+        <package name="www-apps/nextcloud" auto="yes" arch="*">
+            <unaffected range="ge">23.0.4</unaffected>
+            <vulnerable range="lt">23.0.4</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>Nextcloud is a personal cloud that runs on your own server.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in Nextcloud. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="low">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All Nextcloud users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=www-apps/nextcloud-23.0.4"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-32653">CVE-2021-32653</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-32654">CVE-2021-32654</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-32655">CVE-2021-32655</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-32656">CVE-2021-32656</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-32657">CVE-2021-32657</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-32678">CVE-2021-32678</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-32679">CVE-2021-32679</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-32680">CVE-2021-32680</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-32688">CVE-2021-32688</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-32703">CVE-2021-32703</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-32705">CVE-2021-32705</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-32725">CVE-2021-32725</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-32726">CVE-2021-32726</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-32734">CVE-2021-32734</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-32800">CVE-2021-32800</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-32801">CVE-2021-32801</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-32802">CVE-2021-32802</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-41177">CVE-2021-41177</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-41178">CVE-2021-41178</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-41239">CVE-2021-41239</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-41241">CVE-2021-41241</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-24741">CVE-2022-24741</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-24888">CVE-2022-24888</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-24889">CVE-2022-24889</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-29243">CVE-2022-29243</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-08-10T22:31:11.259654Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-08-10T22:31:11.265242Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/glsa-202208-18.xml b/metadata/glsa/glsa-202208-18.xml
new file mode 100644
index 000000000000..b1bb9fed495e
--- /dev/null
+++ b/metadata/glsa/glsa-202208-18.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202208-18">
+    <title>Motion: Denial of service</title>
+    <synopsis>A vulnerability in Motion allows a remote attacker to cause denial of service.</synopsis>
+    <product type="ebuild">motion</product>
+    <announced>2022-08-10</announced>
+    <revised count="1">2022-08-10</revised>
+    <bug>760714</bug>
+    <access>remote</access>
+    <affected>
+        <package name="media-video/motion" auto="yes" arch="*">
+            <unaffected range="ge">4.3.2</unaffected>
+            <vulnerable range="lt">4.3.2</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>Motion is a program that monitors the video signal from one or more cameras and is able to detect motions.</p>
+    </background>
+    <description>
+        <p>The Motion HTTP server does not correctly perform URL decoding. If the HTTP server receives a request for a URL containing an incomplete percent-encoded character, a flaw in parsing results in an infinite loop trying to parse the rest of the character, which eventually results in a denial of service condition when reading out-of-bounds.</p>
+    </description>
+    <impact type="low">
+        <p>A remote attacker can trigger a denial of service condition in Motion.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All Motion users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=media-video/motion-4.3.2"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-26566">CVE-2020-26566</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-08-10T22:31:25.890188Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-08-10T22:31:25.895137Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/glsa-202208-19.xml b/metadata/glsa/glsa-202208-19.xml
new file mode 100644
index 000000000000..8011cbc8a817
--- /dev/null
+++ b/metadata/glsa/glsa-202208-19.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202208-19">
+    <title>aiohttp: Open redirect vulnerability</title>
+    <synopsis>An open redirect vulnerability has been discovered in aiohttp.</synopsis>
+    <product type="ebuild">aiohttp</product>
+    <announced>2022-08-10</announced>
+    <revised count="1">2022-08-10</revised>
+    <bug>772932</bug>
+    <access>remote</access>
+    <affected>
+        <package name="dev-python/aiohttp" auto="yes" arch="*">
+            <unaffected range="ge">3.7.4</unaffected>
+            <vulnerable range="lt">3.7.4</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>aiohttp is an asynchronous HTTP client/server framework for asyncio and Python.</p>
+    </background>
+    <description>
+        <p>A bug in aiohttp.web_middlewares.normalize_path_middleware creates an open redirect vulnerability.</p>
+    </description>
+    <impact type="low">
+        <p>An attacker use this vulnerability to craft a link that, while appearing to be a link to an aiohttp-based website, redirects users to an arbitrary attacker-controlled URL.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All aiohttp users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=dev-python/aiohttp-3.7.4"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-21330">CVE-2021-21330</uri>
+        <uri>GHSA-v6wp-4m6f-gcjg</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-08-10T22:31:38.516415Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-08-10T22:31:38.521134Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index a03a3a561952..5782a557b641 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Aug 2022 06:39:56 +0000
+Thu, 11 Aug 2022 12:40:04 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 605b15893661..dd66ec0994e1 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-8856093f804feeda5fe9097d49ba3307aaefc9c2 1660105056 2022-08-10T04:17:36+00:00
+39083bb85acf1f7a1d43ba6502dcfae335e3bf80 1660170801 2022-08-10T22:33:21+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index da37b3e8e479..7abc50030980 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index b082b4c849e8..c62f64b74d9e 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.49 b/metadata/md5-cache/app-admin/awscli-1.25.49
new file mode 100644
index 000000000000..2620915d3d07
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.25.49
@@ -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.49[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
+INHERIT=bash-completion-r1 distutils-r1 multiprocessing
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.49[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.49.tar.gz -> aws-cli-1.25.49.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=0fd6a2cdd4f5b854d8449e5fd0580e2b
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2106.0-r1 b/metadata/md5-cache/app-admin/rsyslog-8.2106.0-r1
deleted file mode 100644
index 92e7c264c9e1..000000000000
--- a/metadata/md5-cache/app-admin/rsyslog-8.2106.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig elibc_musl? ( sys-libs/queue-standalone ) test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( www-servers/civetweb ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] ) elibc_musl? ( sys-libs/queue-standalone ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] )
-DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
-EAPI=7
-HOMEPAGE=https://www.rsyslog.com/
-INHERIT=autotools linux-info python-any-r1 systemd
-IUSE=clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp impcap jemalloc kafka kerberos kubernetes mdblookup mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl systemd test usertools +uuid xxhash zeromq
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
-LICENSE=GPL-3 LGPL-3 Apache-2.0
-RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( www-servers/civetweb ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] )
-REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2106.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2106.0.tar.gz )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	529bb8cd5756c8476d37ba89dd41e635	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a0751a36d751f7c6ff5906da5e26789a
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2108.0-r1 b/metadata/md5-cache/app-admin/rsyslog-8.2108.0-r1
deleted file mode 100644
index 50c01fa6c8a3..000000000000
--- a/metadata/md5-cache/app-admin/rsyslog-8.2108.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( www-servers/civetweb ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] ) elibc_musl? ( sys-libs/queue-standalone ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] )
-DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
-EAPI=7
-HOMEPAGE=https://www.rsyslog.com/
-INHERIT=autotools linux-info python-any-r1 systemd
-IUSE=clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp impcap jemalloc kafka kerberos kubernetes mdblookup mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl systemd test usertools +uuid xxhash zeromq
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
-LICENSE=GPL-3 LGPL-3 Apache-2.0
-RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( www-servers/civetweb ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] )
-REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2108.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2108.0.tar.gz )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	529bb8cd5756c8476d37ba89dd41e635	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=34cfaef58cb6e90862f2613939f89fc2
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2208.0 b/metadata/md5-cache/app-admin/rsyslog-8.2208.0
new file mode 100644
index 000000000000..7fc6dc79f0c4
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rsyslog-8.2208.0
@@ -0,0 +1,17 @@
+BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] ) elibc_musl? ( sys-libs/queue-standalone )
+DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
+EAPI=8
+HOMEPAGE=https://www.rsyslog.com/
+INHERIT=autotools linux-info python-any-r1 systemd
+IUSE=clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp impcap jemalloc kafka kerberos kubernetes mdblookup mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl systemd test usertools +uuid xxhash zeromq
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~x86
+LICENSE=GPL-3 LGPL-3 Apache-2.0
+RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] )
+REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2208.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2208.0.tar.gz )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	529bb8cd5756c8476d37ba89dd41e635	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=ef7301882cf2b1c27c3317c1c51637e5
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 797e21019b3b..55ee72b2edd4 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/bacula-13.0.1 b/metadata/md5-cache/app-backup/bacula-13.0.1
new file mode 100644
index 000000000000..4672bf119956
--- /dev/null
+++ b/metadata/md5-cache/app-backup/bacula-13.0.1
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/postgresql:=[threads] ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) sqlite? ( dev-db/sqlite:3 ) ) dev-libs/gmp:0 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) readline? ( sys-libs/readline:0 ) static? ( dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] acl? ( virtual/acl[static-libs(+)] ) ssl? ( dev-libs/openssl:0=[static-libs] ) ) !static? ( dev-libs/lzo sys-libs/ncurses:= sys-libs/zlib acl? ( virtual/acl ) ssl? ( dev-libs/openssl:0= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-util/patchelf
+DESCRIPTION=Featureful client/server network backup suite
+EAPI=8
+HOMEPAGE=https://www.bacula.org/
+INHERIT=desktop libtool qmake-utils systemd
+IUSE=acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=AGPL-3
+RDEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/postgresql:=[threads] ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) sqlite? ( dev-db/sqlite:3 ) ) dev-libs/gmp:0 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) readline? ( sys-libs/readline:0 ) static? ( dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] acl? ( virtual/acl[static-libs(+)] ) ssl? ( dev-libs/openssl:0=[static-libs] ) ) !static? ( dev-libs/lzo sys-libs/ncurses:= sys-libs/zlib acl? ( virtual/acl ) ssl? ( dev-libs/openssl:0= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-util/patchelf acct-user/bacula acct-group/bacula !bacula-clientonly? ( !bacula-nosd? ( app-arch/mt-st sys-block/mtx ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
+SLOT=0
+SRC_URI=mirror://sourceforge/bacula/bacula-13.0.1.tar.gz
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=2456d16e4bffde85d95727726d1b0464
diff --git a/metadata/md5-cache/app-backup/dar-2.7.6 b/metadata/md5-cache/app-backup/dar-2.7.6
index f6e421d41213..c9729cab065d 100644
--- a/metadata/md5-cache/app-backup/dar-2.7.6
+++ b/metadata/md5-cache/app-backup/dar-2.7.6
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://dar.linux.free.fr/
 INHERIT=flag-o-matic
 IUSE=argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync threads xattr
-KEYWORDS=~amd64 ~ppc sparc ~x86 ~amd64-linux
+KEYWORDS=amd64 ~ppc sparc x86 ~amd64-linux
 LICENSE=GPL-2+
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils app-arch/zstd:= sys-libs/libcap >=sys-libs/zlib-1.2.3:= argon2? ( app-crypt/argon2:= ) curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gpg? ( app-crypt/gpgme:= ) lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:2 ) nls? ( virtual/libintl ) rsync? ( net-libs/librsync:= ) threads? ( dev-libs/libthreadar ) xattr? ( sys-apps/attr )
 REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/dar/dar-2.7.6.tar.gz
 _eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0e1a7a58bb669254a44a5198e1951cec
+_md5_=c073d76280e50a6e37c9a7e440054e26
diff --git a/metadata/md5-cache/app-backup/dar-2.7.7 b/metadata/md5-cache/app-backup/dar-2.7.7
new file mode 100644
index 000000000000..01d7244a8903
--- /dev/null
+++ b/metadata/md5-cache/app-backup/dar-2.7.7
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure install
+DEPEND=app-arch/bzip2:= app-arch/xz-utils app-arch/zstd:= sys-libs/libcap >=sys-libs/zlib-1.2.3:= argon2? ( app-crypt/argon2:= ) curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gpg? ( app-crypt/gpgme:= ) lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:2 ) nls? ( virtual/libintl ) rsync? ( net-libs/librsync:= ) threads? ( dev-libs/libthreadar ) xattr? ( sys-apps/attr )
+DESCRIPTION=A full featured backup tool, aimed for disks
+EAPI=8
+HOMEPAGE=http://dar.linux.free.fr/
+INHERIT=flag-o-matic
+IUSE=argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync threads xattr
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2+
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils app-arch/zstd:= sys-libs/libcap >=sys-libs/zlib-1.2.3:= argon2? ( app-crypt/argon2:= ) curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gpg? ( app-crypt/gpgme:= ) lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:2 ) nls? ( virtual/libintl ) rsync? ( net-libs/librsync:= ) threads? ( dev-libs/libthreadar ) xattr? ( sys-apps/attr )
+REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/dar/dar-2.7.7.tar.gz
+_eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=b9ccde0a68b1ece262bd3986ef4e39b6
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 881765344362..299cce8c4851 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.17.1-r1 b/metadata/md5-cache/app-crypt/gpgme-1.17.1-r1
index 0935a2740eb3..47e5baeeb84f 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.17.1-r1
+++ b/metadata/md5-cache/app-crypt/gpgme-1.17.1-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error-1.36:= python? ( 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 ) ) qt5? ( dev-qt/qtcore:5 ) test? ( qt5? ( dev-qt/qttest:5 ) )
 DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use
 EAPI=8
-HOMEPAGE=http://www.gnupg.org/related_software/gpgme
+HOMEPAGE=https://www.gnupg.org/related_software/gpgme
 INHERIT=distutils-r1 libtool flag-o-matic qmake-utils toolchain-funcs verify-sig
 IUSE=common-lisp static-libs +cxx python qt5 test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 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
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=1/11.6.15
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.17.1.tar.bz2 verify-sig? ( mirror://gnupg/gpgme/gpgme-1.17.1.tar.bz2.sig )
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=5a1f921a7a11e95aa57346ee7fa462d8
+_md5_=960f004f3ded96b47952ee8f53dc92ca
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index f46bb932899d..cb8635835da7 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/emacs-28.1 b/metadata/md5-cache/app-editors/emacs-28.1
index ed110d3eae3b..d3b3aaca0c4a 100644
--- a/metadata/md5-cache/app-editors/emacs-28.1
+++ b/metadata/md5-cache/app-editors/emacs-28.1
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
 INHERIT=elisp-common readme.gentoo-r1 toolchain-funcs
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 RESTRICT=test
 SLOT=28
 SRC_URI=mirror://gnu/emacs/emacs-28.1.tar.xz
 _eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ab0202a4d97e1defb431d9a9b2670637
+_md5_=75777fff271eb748565a54c6280baeac
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 7c00060fa6fd..1477d5938c65 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/citar-1.0 b/metadata/md5-cache/app-emacs/citar-1.0
new file mode 100644
index 000000000000..2df9ffc21375
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/citar-1.0
@@ -0,0 +1,13 @@
+BDEPEND=app-emacs/citeproc-el app-emacs/parsebib >=app-editors/emacs-27.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=Emacs package to quickly find and act on bibliographic references
+EAPI=8
+HOMEPAGE=https://github.com/emacs-citar/citar/
+INHERIT=elisp
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=app-emacs/citeproc-el app-emacs/parsebib >=app-editors/emacs-27.1:*
+SLOT=0
+SRC_URI=https://github.com/emacs-citar/citar/archive/v1.0.tar.gz -> citar-1.0.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=a169af51debec25e0653beee004c1c2f
diff --git a/metadata/md5-cache/app-emacs/citeproc-el-0.9.1 b/metadata/md5-cache/app-emacs/citeproc-el-0.9.1
new file mode 100644
index 000000000000..89d0a0622f01
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/citeproc-el-0.9.1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-editors/emacs-26:*[libxml2] app-emacs/dash app-emacs/f app-emacs/parsebib app-emacs/queue app-emacs/s app-emacs/string-inflection test? ( app-emacs/ht app-emacs/yaml ) >=app-editors/emacs-26:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=CSL 1.0.2 Citation Processor for Emacs
+EAPI=8
+HOMEPAGE=https://github.com/andras-simonyi/citeproc-el
+INHERIT=elisp
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-26:*[libxml2] app-emacs/dash app-emacs/f app-emacs/parsebib app-emacs/queue app-emacs/s app-emacs/string-inflection >=app-editors/emacs-26:*
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/andras-simonyi/citeproc-el/archive/0.9.1.tar.gz -> citeproc-el-0.9.1.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=97d03043107578c98c258906effcee53
diff --git a/metadata/md5-cache/app-emacs/string-inflection-1.0.16 b/metadata/md5-cache/app-emacs/string-inflection-1.0.16
new file mode 100644
index 000000000000..2bec4be92ef4
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/string-inflection-1.0.16
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-23.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=Convert symbol names between different naming conventions
+EAPI=8
+HOMEPAGE=https://github.com/akicho8/string-inflection/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-editors/emacs-23.1:*
+SLOT=0
+SRC_URI=https://github.com/akicho8/string-inflection/archive/v1.0.16.tar.gz -> string-inflection-1.0.16.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=e751cd638166ccfb54c7b0f3e2dc1dce
diff --git a/metadata/md5-cache/app-emacs/yaml-0.5.1 b/metadata/md5-cache/app-emacs/yaml-0.5.1
new file mode 100644
index 000000000000..790643cbe38d
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/yaml-0.5.1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-25.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=YAML parser in Emacs Lisp
+EAPI=8
+HOMEPAGE=https://github.com/zkry/yaml.el/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-25.1:*
+SLOT=0
+SRC_URI=https://github.com/zkry/yaml.el/archive/v0.5.1.tar.gz -> yaml-0.5.1.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=26548ee7a937507b25c835ef403f6580
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 87e1c16072ea..442a55221fae 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/transifex-client-1.2.0 b/metadata/md5-cache/app-i18n/transifex-client-1.3.0
similarity index 63%
rename from metadata/md5-cache/app-i18n/transifex-client-1.2.0
rename to metadata/md5-cache/app-i18n/transifex-client-1.3.0
index e5aa12e18924..4ad4612c1cce 100644
--- a/metadata/md5-cache/app-i18n/transifex-client-1.2.0
+++ b/metadata/md5-cache/app-i18n/transifex-client-1.3.0
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=Apache-2.0 BSD BSD-2 ISC LGPL-3 MIT MPL-2.0
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://github.com/transifex/cli/archive/refs/tags/v1.2.0.tar.gz -> transifex-client-1.2.0.tar.gz https://gitlab.com/api/v4/projects/35204985/packages/generic/transifex-client/1.2.0/transifex-client-1.2.0-deps.tar.bz
+SRC_URI=https://github.com/transifex/cli/archive/refs/tags/v1.3.0.tar.gz -> transifex-client-1.3.0.tar.gz https://gitlab.com/api/v4/projects/35204985/packages/generic/transifex-client/1.3.0/transifex-client-1.3.0-deps.tar.bz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
 _md5_=8ff5a1c8c170282d399684f4765874bf
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 6a45aee1e28b..e7ae94073b3c 100644
Binary files a/metadata/md5-cache/app-metrics/Manifest.gz and b/metadata/md5-cache/app-metrics/Manifest.gz differ
diff --git a/metadata/md5-cache/app-metrics/prometheus-2.36.2 b/metadata/md5-cache/app-metrics/prometheus-2.36.2
index a725898cd4a3..478124f2576b 100644
--- a/metadata/md5-cache/app-metrics/prometheus-2.36.2
+++ b/metadata/md5-cache/app-metrics/prometheus-2.36.2
@@ -12,4 +12,4 @@ RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/prometheus/prometheus/archive/v2.36.2.tar.gz -> prometheus-2.36.2.tar.gz https://dev.gentoo.org/~williamh/dist/prometheus-2.36.2-deps.tar.xz https://dev.gentoo.org/~williamh/dist/prometheus-2.36.2-assets.tar.xz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8cf5429051a8a7c4e4d42e0fade8310f
+_md5_=5e973c0a828775f551f5d168ef0a29f2
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 2e67cc465363..8fd5026eed7a 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/cpuid2cpuflags-12 b/metadata/md5-cache/app-portage/cpuid2cpuflags-12
index bd126e786056..e3619b861a6a 100644
--- a/metadata/md5-cache/app-portage/cpuid2cpuflags-12
+++ b/metadata/md5-cache/app-portage/cpuid2cpuflags-12
@@ -1,9 +1,9 @@
 DEFINED_PHASES=-
 DESCRIPTION=Tool to guess CPU_FLAGS_* flags for the host
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/cpuid2cpuflags/
+HOMEPAGE=https://github.com/projg2/cpuid2cpuflags/
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 SLOT=0
-SRC_URI=https://github.com/mgorny/cpuid2cpuflags/releases/download/v12/cpuid2cpuflags-12.tar.bz2
-_md5_=fa1ae5e2506df9da5d1e0e9409ae628c
+SRC_URI=https://github.com/projg2/cpuid2cpuflags/releases/download/v12/cpuid2cpuflags-12.tar.bz2
+_md5_=83039200c8e80644997bb2b19cb3831f
diff --git a/metadata/md5-cache/app-portage/diffmask-0.3.3-r4 b/metadata/md5-cache/app-portage/diffmask-0.3.3-r4
deleted file mode 100644
index e26456f904eb..000000000000
--- a/metadata/md5-cache/app-portage/diffmask-0.3.3-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A utility to maintain package.unmask entries up-to-date with masks
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/diffmask/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=sys-apps/portage[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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/mgorny/diffmask/releases/download/diffmask-0.3.3/diffmask-0.3.3.tar.bz2
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8704990890ce1daf0bad1aac5f729b78
diff --git a/metadata/md5-cache/app-portage/diffmask-0.3.3-r5 b/metadata/md5-cache/app-portage/diffmask-0.3.3-r5
index 90be588f898b..1054a2a7bb86 100644
--- a/metadata/md5-cache/app-portage/diffmask-0.3.3-r5
+++ b/metadata/md5-cache/app-portage/diffmask-0.3.3-r5
@@ -2,7 +2,7 @@ BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_target
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A utility to maintain package.unmask entries up-to-date with masks
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/diffmask/
+HOMEPAGE=https://github.com/projg2/diffmask/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux
@@ -10,6 +10,6 @@ LICENSE=BSD
 RDEPEND=sys-apps/portage[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 )
 SLOT=0
-SRC_URI=https://github.com/mgorny/diffmask/releases/download/diffmask-0.3.3/diffmask-0.3.3.tar.bz2
+SRC_URI=https://github.com/projg2/diffmask/releases/download/diffmask-0.3.3/diffmask-0.3.3.tar.bz2
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6d6399854666b30f56707bc61b4f1493
+_md5_=244fa61d76881dff069ccc7262652b72
diff --git a/metadata/md5-cache/app-portage/flaggie-0.2.1-r1 b/metadata/md5-cache/app-portage/flaggie-0.2.1-r1
deleted file mode 100644
index 52945b027659..000000000000
--- a/metadata/md5-cache/app-portage/flaggie-0.2.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A smart CLI mangler for package.* files
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/flaggie/
-INHERIT=bash-completion-r1 distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=sys-apps/portage[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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/mgorny/flaggie/releases/download/flaggie-0.2.1/flaggie-0.2.1.tar.bz2
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=10681e8480705db1ff9331574920dcae
diff --git a/metadata/md5-cache/app-portage/flaggie-0.2.1-r2 b/metadata/md5-cache/app-portage/flaggie-0.2.1-r2
index 0993830d939b..cb36cbf8c809 100644
--- a/metadata/md5-cache/app-portage/flaggie-0.2.1-r2
+++ b/metadata/md5-cache/app-portage/flaggie-0.2.1-r2
@@ -2,7 +2,7 @@ BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_target
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=A smart CLI mangler for package.* files
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/flaggie/
+HOMEPAGE=https://github.com/projg2/flaggie/
 INHERIT=bash-completion-r1 distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
@@ -10,6 +10,6 @@ LICENSE=BSD
 RDEPEND=sys-apps/portage[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 )
 SLOT=0
-SRC_URI=https://github.com/mgorny/flaggie/releases/download/flaggie-0.2.1/flaggie-0.2.1.tar.bz2
+SRC_URI=https://github.com/projg2/flaggie/releases/download/flaggie-0.2.1/flaggie-0.2.1.tar.bz2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1b45a22e192b05e453d08f4fe4bdb596
+_md5_=70f24117223b34b3fea2f84f9124c47b
diff --git a/metadata/md5-cache/app-portage/gander-0.0.1-r2 b/metadata/md5-cache/app-portage/gander-0.0.1-r2
index 8fd7edfb012d..f8ff7afdc53f 100644
--- a/metadata/md5-cache/app-portage/gander-0.0.1-r2
+++ b/metadata/md5-cache/app-portage/gander-0.0.1-r2
@@ -2,7 +2,7 @@ BDEPEND=test? ( dev-python/responses[python_targets_python3_8(-)?,python_targets
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Statistic submission client for Goose (anser.gentoo.org)
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/gander/
+HOMEPAGE=https://github.com/projg2/gander/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
@@ -11,6 +11,6 @@ RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/mgorny/gander/archive/v0.0.1.tar.gz -> gander-0.0.1.tar.gz
+SRC_URI=https://github.com/projg2/gander/archive/v0.0.1.tar.gz -> gander-0.0.1.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0a6f66b4b1a439628b71d4cbad68c404
+_md5_=db1a778105db56702e0aad124de4ae47
diff --git a/metadata/md5-cache/app-portage/gemato-16.2 b/metadata/md5-cache/app-portage/gemato-16.2
index 75aa9b5c7089..b4a37474502c 100644
--- a/metadata/md5-cache/app-portage/gemato-16.2
+++ b/metadata/md5-cache/app-portage/gemato-16.2
@@ -2,7 +2,7 @@ BDEPEND=test? ( >=app-crypt/gnupg-2.2.20-r1 >=dev-python/pytest-5[python_targets
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Stand-alone Manifest generation & verification tool
 EAPI=7
-HOMEPAGE=https://github.com/mgorny/gemato
+HOMEPAGE=https://github.com/projg2/gemato
 INHERIT=distutils-r1
 IUSE=+gpg tools test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gemato/gemato-16.2.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0b3f6e77d78b9333eb4a25c8de668bf5
+_md5_=750bc83b0adcc4783ce87eb181db0df5
diff --git a/metadata/md5-cache/app-portage/gemato-9999 b/metadata/md5-cache/app-portage/gemato-9999
index 2a09f62080c0..4459b2f4ea24 100644
--- a/metadata/md5-cache/app-portage/gemato-9999
+++ b/metadata/md5-cache/app-portage/gemato-9999
@@ -2,7 +2,7 @@ BDEPEND=test? ( >=app-crypt/gnupg-2.2.20-r1 >=dev-python/pytest-5[python_targets
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Stand-alone Manifest generation & verification tool
 EAPI=7
-HOMEPAGE=https://github.com/mgorny/gemato
+HOMEPAGE=https://github.com/projg2/gemato
 INHERIT=distutils-r1 git-r3
 IUSE=+gpg tools test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=BSD-2
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c681e221ea2a3d6713719e8c89999576
+_md5_=6356a3cb401009144a857835c94186b3
diff --git a/metadata/md5-cache/app-portage/gentoopm-0.4 b/metadata/md5-cache/app-portage/gentoopm-0.4
index 6f43fbf53282..7876c15b3a9e 100644
--- a/metadata/md5-cache/app-portage/gentoopm-0.4
+++ b/metadata/md5-cache/app-portage/gentoopm-0.4
@@ -2,7 +2,7 @@ BDEPEND=test? ( || ( >=sys-apps/pkgcore-0.9.4[python_targets_pypy3(-)?,python_ta
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A common interface to Gentoo package managers
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/gentoopm/
+HOMEPAGE=https://github.com/projg2/gentoopm/
 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 ~mips ~sparc x86 ~x64-macos
@@ -12,6 +12,6 @@ RDEPEND=|| ( >=sys-apps/pkgcore-0.9.4[python_targets_pypy3(-)?,python_targets_py
 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/mgorny/gentoopm/archive/v0.4.tar.gz -> gentoopm-0.4.tar.gz
+SRC_URI=https://github.com/projg2/gentoopm/archive/v0.4.tar.gz -> gentoopm-0.4.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=37a8c1d8fa795b05e1b19a150ac17ba1
+_md5_=d612933cf0a0d7e75d3f21c5e929eb45
diff --git a/metadata/md5-cache/app-portage/gentoopm-9999 b/metadata/md5-cache/app-portage/gentoopm-9999
index cb4c31c49f2e..8e723bf291b7 100644
--- a/metadata/md5-cache/app-portage/gentoopm-9999
+++ b/metadata/md5-cache/app-portage/gentoopm-9999
@@ -2,7 +2,7 @@ BDEPEND=test? ( || ( >=sys-apps/pkgcore-0.9.4[python_targets_pypy3(-)?,python_ta
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A common interface to Gentoo package managers
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/gentoopm/
+HOMEPAGE=https://github.com/projg2/gentoopm/
 INHERIT=distutils-r1 git-r3
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=BSD-2
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2807eea930b81f1a568ed07d9b746f89
+_md5_=f09ac0bc897712ee6bf6fa6e0dc6f97c
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.8.2 b/metadata/md5-cache/app-portage/gpyutils-0.8.2
index 9320c4af9812..57c022c83e64 100644
--- a/metadata/md5-cache/app-portage/gpyutils-0.8.2
+++ b/metadata/md5-cache/app-portage/gpyutils-0.8.2
@@ -2,7 +2,7 @@ BDEPEND=test? ( >=app-portage/gentoopm-0.3.2[python_targets_python3_8(-)?,python
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Utitilies for maintaining Python packages
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/gpyutils/ https://pypi.org/project/gpyutils/
+HOMEPAGE=https://github.com/projg2/gpyutils/ https://pypi.org/project/gpyutils/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 x86
@@ -11,6 +11,6 @@ RDEPEND=>=app-portage/gentoopm-0.3.2[python_targets_python3_8(-)?,python_targets
 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/mgorny/gpyutils/archive/v0.8.2.tar.gz -> gpyutils-0.8.2.gh.tar.gz
+SRC_URI=https://github.com/projg2/gpyutils/archive/v0.8.2.tar.gz -> gpyutils-0.8.2.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=19a3d08af13fc8ba94fedb97270b66d8
+_md5_=3223d8b17dd4336a63a647305fd694c6
diff --git a/metadata/md5-cache/app-portage/gverify-2 b/metadata/md5-cache/app-portage/gverify-2
index b28884e949c6..3956ac0cd8af 100644
--- a/metadata/md5-cache/app-portage/gverify-2
+++ b/metadata/md5-cache/app-portage/gverify-2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install setup
 DEPEND=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 )
 DESCRIPTION=gentoo.git signature verification tool
 EAPI=7
-HOMEPAGE=https://github.com/mgorny/gverify
+HOMEPAGE=https://github.com/projg2/gverify
 INHERIT=python-single-r1
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86
@@ -10,6 +10,6 @@ LICENSE=BSD-2
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) app-crypt/gnupg sec-keys/openpgp-keys-gentoo-auth dev-vcs/git
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
-SRC_URI=https://github.com/mgorny/gverify/archive/v2.tar.gz -> gverify-2.tar.gz
+SRC_URI=https://github.com/projg2/gverify/archive/v2.tar.gz -> gverify-2.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f9ba98af72077b9e461e470de5f9d59f
+_md5_=391f5eeaf335e6f637121c48dcd62171
diff --git a/metadata/md5-cache/app-portage/kuroneko-0.1.0 b/metadata/md5-cache/app-portage/kuroneko-0.1.0
deleted file mode 100644
index 169f430d0df6..000000000000
--- a/metadata/md5-cache/app-portage/kuroneko-0.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/bracex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/pkgcore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] scraper? ( dev-python/bracex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/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/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Vulnerability checker using data scraped from Gentoo Bugzilla
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/kuroneko/
-INHERIT=distutils-r1
-IUSE=scraper test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/pkgcore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] scraper? ( dev-python/bracex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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/mgorny/kuroneko/archive/v0.1.0.tar.gz -> kuroneko-0.1.0.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ec7619c11e7ca093f990a0dda9e827d1
diff --git a/metadata/md5-cache/app-portage/kuroneko-0.1.1 b/metadata/md5-cache/app-portage/kuroneko-0.1.1
deleted file mode 100644
index e7699b617d73..000000000000
--- a/metadata/md5-cache/app-portage/kuroneko-0.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/bracex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/pkgcore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] scraper? ( dev-python/bracex[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/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Vulnerability checker using data scraped from Gentoo Bugzilla
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/kuroneko/
-INHERIT=distutils-r1
-IUSE=scraper test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/pkgcore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] scraper? ( dev-python/bracex[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/mgorny/kuroneko/archive/v0.1.1.tar.gz -> kuroneko-0.1.1.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7133bf273231886b860a4eb450f0a0e2
diff --git a/metadata/md5-cache/app-portage/kuroneko-0.1.2 b/metadata/md5-cache/app-portage/kuroneko-0.1.2
deleted file mode 100644
index 021bea515fc3..000000000000
--- a/metadata/md5-cache/app-portage/kuroneko-0.1.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/bracex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/pkgcore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] scraper? ( dev-python/bracex[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/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Vulnerability checker using data scraped from Gentoo Bugzilla
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/kuroneko/
-INHERIT=distutils-r1
-IUSE=scraper test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/pkgcore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] scraper? ( dev-python/bracex[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/mgorny/kuroneko/archive/v0.1.2.tar.gz -> kuroneko-0.1.2.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7133bf273231886b860a4eb450f0a0e2
diff --git a/metadata/md5-cache/app-portage/kuroneko-0.1.3 b/metadata/md5-cache/app-portage/kuroneko-0.1.3
index 732065d2dfc5..4939572123b5 100644
--- a/metadata/md5-cache/app-portage/kuroneko-0.1.3
+++ b/metadata/md5-cache/app-portage/kuroneko-0.1.3
@@ -2,7 +2,7 @@ BDEPEND=test? ( dev-python/bracex[python_targets_python3_8(-)?,python_targets_py
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Vulnerability checker using data scraped from Gentoo Bugzilla
 EAPI=7
-HOMEPAGE=https://github.com/mgorny/kuroneko/
+HOMEPAGE=https://github.com/projg2/kuroneko/
 INHERIT=distutils-r1
 IUSE=scraper test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
@@ -11,6 +11,6 @@ RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/mgorny/kuroneko/archive/v0.1.3.tar.gz -> kuroneko-0.1.3.tar.gz
+SRC_URI=https://github.com/projg2/kuroneko/archive/v0.1.3.tar.gz -> kuroneko-0.1.3.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7133bf273231886b860a4eb450f0a0e2
+_md5_=f0a320b35742b849a153108e8cfdccdc
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-21 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-21
index 5b44ee49cc06..cd7a05d27f5b 100644
--- a/metadata/md5-cache/app-portage/mgorny-dev-scripts-21
+++ b/metadata/md5-cache/app-portage/mgorny-dev-scripts-21
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Handy scripts for ebuild development and more
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/mgorny-dev-scripts
+HOMEPAGE=https://github.com/projg2/mgorny-dev-scripts
 KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=app-portage/gentoolkit dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils !dev-util/pkgdiff
 SLOT=0
-SRC_URI=https://github.com/mgorny/mgorny-dev-scripts/archive/v21.tar.gz -> mgorny-dev-scripts-21.tar.gz
-_md5_=d28b785881c6d7953f568a12ae38952f
+SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v21.tar.gz -> mgorny-dev-scripts-21.tar.gz
+_md5_=e56fc15d3ee9398f1e40e3a9c5955b35
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-22 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-22
index 2fd2f1ded0ad..c76a97159ce1 100644
--- a/metadata/md5-cache/app-portage/mgorny-dev-scripts-22
+++ b/metadata/md5-cache/app-portage/mgorny-dev-scripts-22
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Handy scripts for ebuild development and more
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/mgorny-dev-scripts
+HOMEPAGE=https://github.com/projg2/mgorny-dev-scripts
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=app-portage/gentoolkit dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils !dev-util/pkgdiff
 SLOT=0
-SRC_URI=https://github.com/mgorny/mgorny-dev-scripts/archive/v22.tar.gz -> mgorny-dev-scripts-22.tar.gz
-_md5_=68a6f896712d0d20630235500698e9ff
+SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v22.tar.gz -> mgorny-dev-scripts-22.tar.gz
+_md5_=b0e72ae6229ed2fc7c229891080a8e70
diff --git a/metadata/md5-cache/app-portage/nattka-0.3.1 b/metadata/md5-cache/app-portage/nattka-0.3.1
index 6f74bda10749..bda7fd31af4d 100644
--- a/metadata/md5-cache/app-portage/nattka-0.3.1
+++ b/metadata/md5-cache/app-portage/nattka-0.3.1
@@ -2,7 +2,7 @@ BDEPEND=>=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A New Arch Tester Toolkit -- open-source stable-bot replacement
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/nattka/
+HOMEPAGE=https://github.com/projg2/nattka/
 INHERIT=distutils-r1
 IUSE=depgraph-order doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
@@ -11,6 +11,6 @@ RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/mgorny/nattka/archive/v0.3.1.tar.gz -> nattka-0.3.1.tar.gz
+SRC_URI=https://github.com/projg2/nattka/archive/v0.3.1.tar.gz -> nattka-0.3.1.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=08b675743b009bc36527bc27d5a88738
+_md5_=802818ed7af75f5fdd967492d76fec8e
diff --git a/metadata/md5-cache/app-portage/pram-10 b/metadata/md5-cache/app-portage/pram-10
index 6d5d0c333887..2775bffb81c7 100644
--- a/metadata/md5-cache/app-portage/pram-10
+++ b/metadata/md5-cache/app-portage/pram-10
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install test
 DEPEND=test? ( dev-vcs/git net-misc/wget[ssl] virtual/editor !dev-perl/Gentoo-App-Pram app-crypt/gnupg sys-apps/diffutils )
 DESCRIPTION=Tool to ease merging Pull Requests and git patches
 EAPI=7
-HOMEPAGE=https://github.com/mgorny/pram
+HOMEPAGE=https://github.com/projg2/pram
 INHERIT=meson
 IUSE=test
 KEYWORDS=amd64 ~arm64 ppc64 ~riscv x86 ~x64-macos
@@ -11,6 +11,6 @@ LICENSE=BSD-2
 RDEPEND=dev-vcs/git net-misc/wget[ssl] virtual/editor !dev-perl/Gentoo-App-Pram
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/mgorny/pram/archive/v10.tar.gz -> pram-10.tar.gz
+SRC_URI=https://github.com/projg2/pram/archive/v10.tar.gz -> pram-10.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=277df8d6d5b51c19fdb379cd24f15577
+_md5_=05b970fed419b0cee6097dcf988cf126
diff --git a/metadata/md5-cache/app-portage/smart-live-rebuild-1.4.0 b/metadata/md5-cache/app-portage/smart-live-rebuild-1.4.0
index 65d8c2f9d4a8..2b1a9fd88c70 100644
--- a/metadata/md5-cache/app-portage/smart-live-rebuild-1.4.0
+++ b/metadata/md5-cache/app-portage/smart-live-rebuild-1.4.0
@@ -2,7 +2,7 @@ BDEPEND=test? ( >=app-portage/gentoopm-0.2.1[python_targets_pypy3(-)?,python_tar
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Check live packages for updates and emerge them as necessary
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/smart-live-rebuild/
+HOMEPAGE=https://github.com/projg2/smart-live-rebuild/
 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 ~mips ~sparc x86 ~x64-macos
@@ -11,6 +11,6 @@ RDEPEND=>=app-portage/gentoopm-0.2.1[python_targets_pypy3(-)?,python_targets_pyt
 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/mgorny/smart-live-rebuild/archive/v1.4.0.tar.gz -> smart-live-rebuild-1.4.0.tar.gz
+SRC_URI=https://github.com/projg2/smart-live-rebuild/archive/v1.4.0.tar.gz -> smart-live-rebuild-1.4.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e5ccbcb2bcdcf57c9144e838001ec64f
+_md5_=7143694f8940d08cb5c6a410f75d21d8
diff --git a/metadata/md5-cache/app-portage/smart-live-rebuild-9999 b/metadata/md5-cache/app-portage/smart-live-rebuild-9999
index 8fbf398ee283..a1dbc50db2a3 100644
--- a/metadata/md5-cache/app-portage/smart-live-rebuild-9999
+++ b/metadata/md5-cache/app-portage/smart-live-rebuild-9999
@@ -2,7 +2,7 @@ BDEPEND=test? ( >=app-portage/gentoopm-0.2.1[python_targets_pypy3(-)?,python_tar
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Check live packages for updates and emerge them as necessary
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/smart-live-rebuild/
+HOMEPAGE=https://github.com/projg2/smart-live-rebuild/
 INHERIT=distutils-r1 git-r3
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=BSD-2
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3f2bc5308ebbd195041e41edabec36b7
+_md5_=5b3e9ed784dc5164405c3aa65d64dc2a
diff --git a/metadata/md5-cache/app-portage/unsymlink-lib-20 b/metadata/md5-cache/app-portage/unsymlink-lib-20
index cb05bbb532a7..ee9b49342f3a 100644
--- a/metadata/md5-cache/app-portage/unsymlink-lib-20
+++ b/metadata/md5-cache/app-portage/unsymlink-lib-20
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install setup
 DESCRIPTION=Convert your system to SYMLINK_LIB=no
 EAPI=7
-HOMEPAGE=https://github.com/mgorny/unsymlink-lib
+HOMEPAGE=https://github.com/projg2/unsymlink-lib
 INHERIT=python-single-r1
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ppc64
@@ -10,6 +10,6 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/mgorny/unsymlink-lib/archive/v20.tar.gz -> unsymlink-lib-20.tar.gz
+SRC_URI=https://github.com/projg2/unsymlink-lib/archive/v20.tar.gz -> unsymlink-lib-20.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e4d8a0a229998e52c96791dc3a429446
+_md5_=c2615c235f44778636ba66406842eaa0
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index dbe9c589555d..8a83979dddf1 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/fish-3.4.0 b/metadata/md5-cache/app-shells/fish-3.4.0
index 85aae454ff70..068c8868db21 100644
--- a/metadata/md5-cache/app-shells/fish-3.4.0
+++ b/metadata/md5-cache/app-shells/fish-3.4.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/3.4.0/fish-3.4.0.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9012a7745658674cbc47b7b5e2bdcfdf
+_md5_=18cd97328f085c06337d6a2fc89a2b03
diff --git a/metadata/md5-cache/app-shells/fish-3.4.1 b/metadata/md5-cache/app-shells/fish-3.4.1
index c2a2738ea4dc..b7b9c6f8f14b 100644
--- a/metadata/md5-cache/app-shells/fish-3.4.1
+++ b/metadata/md5-cache/app-shells/fish-3.4.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/3.4.1/fish-3.4.1.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=977a23c3825b4016f898505f037316e2
+_md5_=ad0d2d96db0b4ddbe8e2f1bd328aa0c3
diff --git a/metadata/md5-cache/app-shells/fish-3.5.0 b/metadata/md5-cache/app-shells/fish-3.5.0
index a98bdaf43e91..9994d8c04b84 100644
--- a/metadata/md5-cache/app-shells/fish-3.5.0
+++ b/metadata/md5-cache/app-shells/fish-3.5.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/3.5.0/fish-3.5.0.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ae26a9489f691edcd25f5f7488b7153c
+_md5_=46171aba9c9b8f3bdd5522e03833b267
diff --git a/metadata/md5-cache/app-shells/fish-9999 b/metadata/md5-cache/app-shells/fish-9999
index 376cf64ccdf3..f294bbd0a884 100644
--- a/metadata/md5-cache/app-shells/fish-9999
+++ b/metadata/md5-cache/app-shells/fish-9999
@@ -12,4 +12,4 @@ RDEPEND=>=dev-libs/libpcre2-10.32:=[pcre32] sys-apps/coreutils sys-libs/ncurses:
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ae26a9489f691edcd25f5f7488b7153c
+_md5_=46171aba9c9b8f3bdd5522e03833b267
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index b6648790e73b..e4ad70ff7653 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/htmltidy-5.8.0-r1 b/metadata/md5-cache/app-text/htmltidy-5.8.0-r1
index a76472e0781c..236882b61153 100644
--- a/metadata/md5-cache/app-text/htmltidy-5.8.0-r1
+++ b/metadata/md5-cache/app-text/htmltidy-5.8.0-r1
@@ -1,14 +1,14 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/thor[ruby_targets_ruby26(-)] dev-ruby/tty-editor[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/thor[ruby_targets_ruby27(-)] dev-ruby/tty-editor[ruby_targets_ruby27(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/thor[ruby_targets_ruby26(-)] dev-ruby/tty-editor[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/thor[ruby_targets_ruby27(-)] dev-ruby/tty-editor[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/thor[ruby_targets_ruby30(-)] dev-ruby/tty-editor[ruby_targets_ruby30(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DESCRIPTION=Tidy the layout and correct errors in HTML and XML documents
 EAPI=7
 HOMEPAGE=https://www.html-tidy.org/
 INHERIT=cmake ruby-ng
-IUSE=deprecated test ruby_targets_ruby26 ruby_targets_ruby27
+IUSE=deprecated test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/58
 SRC_URI=https://github.com/htacg/tidy-html5/archive/refs/tags/5.8.0.tar.gz -> htmltidy-5.8.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	ruby-ng	55326c3bb01904e05d55c73c84c85d07	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=916979dccf380b5e8ee6aaf044a0eb36
+_md5_=92caf711db601e3f4044773a01fc3e51
diff --git a/metadata/md5-cache/app-text/mupdf-1.20.0 b/metadata/md5-cache/app-text/mupdf-1.20.0
index f46b2191986f..ffe915000bc9 100644
--- a/metadata/md5-cache/app-text/mupdf-1.20.0
+++ b/metadata/md5-cache/app-text/mupdf-1.20.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git
 INHERIT=desktop flag-o-matic toolchain-funcs xdg
 IUSE=+javascript opengl ssl X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86
 LICENSE=AGPL-3
 RDEPEND=dev-libs/gumbo media-libs/freetype:2= media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= >=media-libs/libjpeg-turbo-1.5.3-r2:0 javascript? ( >=dev-lang/mujs-1.0.7:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) X? ( x11-libs/libX11 x11-libs/libXext )
 REQUIRED_USE=opengl? ( javascript )
 SLOT=0/1.20.0
 SRC_URI=https://mupdf.com/downloads/archive/mupdf-1.20.0-source.tar.gz
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1b34ba9662be2f93ebb7413047e9db1b
+_md5_=4f4f1b09e506fc1bf869b8e997b2db61
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 74c2716562fe..0a9622d5a560 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/highway-1.0.0 b/metadata/md5-cache/dev-cpp/highway-1.0.0
new file mode 100644
index 000000000000..5d8f38722ef8
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/highway-1.0.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-cpp/gtest[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=Performance-portable, length-agnostic SIMD with runtime dispatch
+EAPI=8
+HOMEPAGE=https://github.com/google/highway
+INHERIT=cmake-multilib
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/google/highway/archive/refs/tags/1.0.0.tar.gz -> highway-1.0.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a236474985a60e719ebe87a8ba649be2
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index cb7641ae6df9..ea2b90047ba5 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.27-r1 b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.27-r1
index 81aacc084d7a..7d9f178c046c 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.27-r1
+++ b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.27-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://dev.mysql.com/downloads/
 INHERIT=cmake-multilib flag-o-matic
 IUSE=ldap 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-arch/lz4-0_p131:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] ldap? ( dev-libs/cyrus-sasl:=[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/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<dev-db/mysql-5.6.45-r1 !=dev-db/mysql-5.7.23* !=dev-db/mysql-5.7.24* !=dev-db/mysql-5.7.25* !=dev-db/mysql-5.7.26-r0 !=dev-db/mysql-5.7.27-r0 !<dev-db/percona-server-5.7.26.29-r1
 SLOT=0/21
 SRC_URI=https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-8.0.27.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a257af84439a424da322fa3ccaddb1a3
+_md5_=069ae13fa5a6c6007f7d791c24b3bf8c
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index f94576d21e98..911b031a28fc 100644
Binary files a/metadata/md5-cache/dev-games/Manifest.gz and b/metadata/md5-cache/dev-games/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-games/ode-0.11.1 b/metadata/md5-cache/dev-games/ode-0.11.1
deleted file mode 100644
index e44a7cd5174c..000000000000
--- a/metadata/md5-cache/dev-games/ode-0.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install prepare
-DEPEND=examples? ( virtual/opengl )
-DESCRIPTION=Open Dynamics Engine SDK
-EAPI=7
-HOMEPAGE=http://ode.org/
-IUSE=debug doc double-precision examples gyroscopic static-libs
-KEYWORDS=amd64 x86
-LICENSE=|| ( LGPL-2.1 BSD )
-RDEPEND=examples? ( virtual/opengl )
-SLOT=0
-SRC_URI=mirror://sourceforge/opende/ode-0.11.1.tar.bz2
-_md5_=df1aa050705a479b15b5bb624d6d5a1a
diff --git a/metadata/md5-cache/dev-games/ode-0.12 b/metadata/md5-cache/dev-games/ode-0.12
deleted file mode 100644
index 55648c4163c7..000000000000
--- a/metadata/md5-cache/dev-games/ode-0.12
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install prepare
-DEPEND=examples? ( virtual/opengl )
-DESCRIPTION=Open Dynamics Engine SDK
-EAPI=7
-HOMEPAGE=http://ode.org/
-IUSE=debug doc double-precision examples gyroscopic static-libs
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( LGPL-2.1 BSD )
-RDEPEND=examples? ( virtual/opengl )
-SLOT=0
-SRC_URI=mirror://sourceforge/opende/ode-0.12.tar.bz2
-_md5_=7b31482e8993062e50f5da16c5ed13e1
diff --git a/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r101 b/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r101
deleted file mode 100644
index fecea09ee8c0..000000000000
--- a/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r101
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) >=dev-libs/boost-1.37.0:* x11-base/xorg-proto
-DESCRIPTION=Open source high performance 3D graphics toolkit
-EAPI=7
-HOMEPAGE=http://www.openscenegraph.org/
-INHERIT=cmake flag-o-matic lua-single wxwidgets
-IUSE=curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xrandr +zlib +lua_single_target_lua5-1
-KEYWORDS=amd64 ~arm64 ~hppa ppc64 x86
-LICENSE=wxWinLL-3 LGPL-2.1
-RDEPEND=media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=dicom? ( zlib ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) openexr? ( zlib ) sdl2? ( sdl )
-SLOT=0/161
-SRC_URI=https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.6.5.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a14774e78f30a5bb49e3ec09252023bf
diff --git a/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r110 b/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r110
deleted file mode 100644
index 77901e2ce54b..000000000000
--- a/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r110
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext collada? ( dev-libs/collada-dom:= ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) dev-libs/boost x11-base/xorg-proto
-DESCRIPTION=Open source high performance 3D graphics toolkit
-EAPI=7
-HOMEPAGE=http://www.openscenegraph.org/
-INHERIT=cmake flag-o-matic lua-single wxwidgets
-IUSE=collada curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xrandr +zlib +lua_single_target_lua5-1
-KEYWORDS=~amd64 ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=wxWinLL-3 LGPL-2.1
-RDEPEND=media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext collada? ( dev-libs/collada-dom:= ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=dicom? ( zlib ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) openexr? ( zlib ) sdl2? ( sdl )
-SLOT=0/161
-SRC_URI=https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.6.5.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f02087e885a56152a0a73cfd831ba2bc
diff --git a/metadata/md5-cache/dev-games/openscenegraph-openmw-3.6_p20211017 b/metadata/md5-cache/dev-games/openscenegraph-openmw-3.6_p20211017
deleted file mode 100644
index aae924a3f41e..000000000000
--- a/metadata/md5-cache/dev-games/openscenegraph-openmw-3.6_p20211017
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!dev-games/openscenegraph dev-libs/glib:2 media-libs/fontconfig media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext collada? ( dev-libs/collada-dom:= ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler:=[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) x11-base/xorg-proto
-DESCRIPTION=OpenMW-specific fork of OpenSceneGraph
-EAPI=8
-HOMEPAGE=https://github.com/OpenMW/osg
-INHERIT=cmake flag-o-matic lua-single wxwidgets
-IUSE=+collada curl dicom debug doc egl examples +ffmpeg fltk fox gdal gif glut gstreamer +jpeg las lua openexr openinventor osgapps pdf +png +sdl sdl2 +svg tiff +truetype vnc wxwidgets xrandr +zlib +lua_single_target_lua5-1
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=wxWinLL-3 LGPL-2.1
-RDEPEND=!dev-games/openscenegraph dev-libs/glib:2 media-libs/fontconfig media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext collada? ( dev-libs/collada-dom:= ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler:=[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=dicom? ( zlib ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) openexr? ( zlib ) sdl2? ( sdl )
-SLOT=0/162
-SRC_URI=https://github.com/OpenMW/osg/archive/bbe61c3bc510a4f5bb4aea21cce506519c2d24e6.tar.gz -> openscenegraph-openmw-3.6_p20211017.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=900e00aef79ab10f4ca94a1b7851e278
diff --git a/metadata/md5-cache/dev-games/simgear-2020.3.12 b/metadata/md5-cache/dev-games/simgear-2020.3.12
deleted file mode 100644
index 142c0eb85ebb..000000000000
--- a/metadata/md5-cache/dev-games/simgear-2020.3.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=app-arch/xz-utils dev-libs/expat dev-games/openscenegraph media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) gdal? ( sci-libs/gdal ) >=dev-libs/boost-1.44
-DESCRIPTION=Development library for simulation games
-EAPI=7
-HOMEPAGE=https://www.flightgear.org/
-INHERIT=cmake toolchain-funcs
-IUSE=cpu_flags_x86_sse2 +dns debug gdal openmp subversion test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/xz-utils dev-libs/expat dev-games/openscenegraph media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) gdal? ( sci-libs/gdal ) subversion? ( dev-vcs/subversion )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/flightgear/simgear-2020.3.12.tar.bz2
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c169960b646af04660cefd01831202e3
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 55672b3b0e62..d84c8a8da983 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/byte-buddy-1.12.13 b/metadata/md5-cache/dev-java/byte-buddy-1.12.13
new file mode 100644
index 000000000000..d8faa879f8c1
--- /dev/null
+++ b/metadata/md5-cache/dev-java/byte-buddy-1.12.13
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* dev-java/asm:9 dev-java/findbugs-annotations:0 dev-java/jna:4 dev-java/jsr305:0 test? ( dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Offers convenience for attaching an agent to the local or a remote VM
+EAPI=8
+HOMEPAGE=https://bytebuddy.net
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/raphw/byte-buddy/archive/byte-buddy-1.12.13.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=f063757109fa2915474066f3f634bdcf
diff --git a/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1 b/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1
index bebff2661794..6838658f1f14 100644
--- a/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1
+++ b/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j/istack-commons/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86
 LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-istack-commons/archive/4.1.1.tar.gz -> jaxb-istack-commons-istack-commons-runtime-4.1.1.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=1c1c306097611f6efc71a12188bff5c2
+_md5_=0ead086a1cf17e6812986ec9d2d793a4
diff --git a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.1 b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.1
index 3142c5f9084a..a0e5a50ad9b4 100644
--- a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.1
+++ b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/tomcat/jakartaee-migration/v1.0.1/source/jakartaee-migration-1.0.1-src.tar.gz -> jakartaee-migration-1.0.1-sources.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=5d04d5fbc0787b9752ad18dfaa7b93ed
+_md5_=4e0f4dc5eb097f8dcc3beed91ba51a5c
diff --git a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50 b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50
index a8eadee497e4..c36f5fc302e0 100644
--- a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50
+++ b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://download.tanukisoftware.com/wrapper/3.5.50/wrapper_3.5.50_src.tar.gz
 _eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7f36a6435eeb9a3ef08e93c1fc0dcda6
+_md5_=06216ebb0040718c783b75372dfed603
diff --git a/metadata/md5-cache/dev-java/log4j-core-2.18.0-r1 b/metadata/md5-cache/dev-java/log4j-core-2.18.0-r1
new file mode 100644
index 000000000000..4529729015eb
--- /dev/null
+++ b/metadata/md5-cache/dev-java/log4j-core-2.18.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/commons-compress:0 dev-java/commons-csv:0 dev-java/conversant-disruptor:0 dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/jackson-dataformat-xml:0 dev-java/jackson-dataformat-yaml:0 dev-java/jansi:2 dev-java/javax-mail:0 dev-java/jctools-core:3 dev-java/jeromq:0 dev-java/kafka-clients:0 dev-java/lmax-disruptor:0 ~dev-java/log4j-api-2.18.0:2 dev-java/slf4j-api:0 dev-java/woodstox-core:0 dev-java/jakarta-activation-api:1 dev-java/jakarta-mail-api:0 dev-java/javax-jms-api:0 dev-java/osgi-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=The Apache Log4j Implementation
+EAPI=8
+HOMEPAGE=https://logging.apache.org/log4j/2.x/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/commons-compress:0 dev-java/commons-csv:0 dev-java/conversant-disruptor:0 dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/jackson-dataformat-xml:0 dev-java/jackson-dataformat-yaml:0 dev-java/jansi:2 dev-java/javax-mail:0 dev-java/jctools-core:3 dev-java/jeromq:0 dev-java/kafka-clients:0 dev-java/lmax-disruptor:0 ~dev-java/log4j-api-2.18.0:2 dev-java/slf4j-api:0 dev-java/woodstox-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=2
+SRC_URI=mirror://apache/logging/log4j/2.18.0/apache-log4j-2.18.0-src.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=a466561d59ca52ac52c3f36756a5201b
diff --git a/metadata/md5-cache/dev-java/snappy-1.1.7.8-r1 b/metadata/md5-cache/dev-java/snappy-1.1.7.8-r1
new file mode 100644
index 000000000000..a4fd59e93ea3
--- /dev/null
+++ b/metadata/md5-cache/dev-java/snappy-1.1.7.8-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/osgi-core:0 app-arch/snappy dev-libs/bitshuffle test? ( dev-java/ant-junit4:0 dev-java/commons-io:1 dev-java/commons-lang:2.1 dev-java/plexus-classworlds:0 dev-java/xerial-core:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Snappy compressor/decompressor for Java
+EAPI=8
+HOMEPAGE=https://github.com/xerial/snappy-java/
+INHERIT=java-pkg-2 java-ant-2 toolchain-funcs
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/osgi-core:0 app-arch/snappy dev-libs/bitshuffle >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=1.1
+SRC_URI=https://github.com/xerial/snappy-java/archive/1.1.7.8.tar.gz -> snappy-java-1.1.7.8.tar.gz
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8d1eee5f4ff7f176979b66360b337ec3
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 00f8ce87a6b6..c1343c9335e0 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/python-3.10.6_p2 b/metadata/md5-cache/dev-lang/python-3.10.6_p2
new file mode 100644
index 000000000000..5e05876635ed
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.10.6_p2
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_10(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
+INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
+IUSE=bluetooth build +ensurepip examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk +xml verify-sig
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_10(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.10
+SRC_URI=https://www.python.org/ftp/python/3.10.6/Python-3.10.6.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.6_p2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.6/Python-3.10.6.tar.xz.asc )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=4b3ece6ea9293e1623a0c42a0aaaf43b
diff --git a/metadata/md5-cache/dev-lang/python-3.8.13_p6 b/metadata/md5-cache/dev-lang/python-3.8.13_p6
new file mode 100644
index 000000000000..05fc6880f2e1
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.8.13_p6
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_8(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
+INHERIT=autotools flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
+IUSE=bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml verify-sig
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_8(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.8
+SRC_URI=https://www.python.org/ftp/python/3.8.13/Python-3.8.13.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.13_p6.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.13/Python-3.8.13.tar.xz.asc )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=232121970d0c3058b5a69eb0eb5abd6d
diff --git a/metadata/md5-cache/dev-lang/python-3.9.13_p4 b/metadata/md5-cache/dev-lang/python-3.9.13_p4
new file mode 100644
index 000000000000..b010df12a294
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.9.13_p4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_9(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
+INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
+IUSE=bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk +xml verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_9(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.9
+SRC_URI=https://www.python.org/ftp/python/3.9.13/Python-3.9.13.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.13_p4.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.13/Python-3.9.13.tar.xz.asc )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=06ab4f5e5a9f30d1897fa5df262b9a82
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r10 b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r10
deleted file mode 100644
index 760901ecd1ee..000000000000
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/nspr-4.7.0 sys-libs/readline:0= x64-macos? ( dev-libs/jemalloc ) || ( >=dev-lang/python-2.7.10_p15:2.7[threads(+)] ) app-arch/zip virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
-DESCRIPTION=Stand-alone JavaScript C library
-EAPI=6
-HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
-INHERIT=autotools toolchain-funcs multilib python-any-r1 versionator pax-utils
-IUSE=debug minimal static-libs test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~x64-macos
-LICENSE=NPL-1.1
-RDEPEND=>=dev-libs/nspr-4.7.0 sys-libs/readline:0= x64-macos? ( dev-libs/jemalloc )
-RESTRICT=!test? ( test )
-SLOT=0/mozjs185
-SRC_URI=https://archive.mozilla.org/pub/js/js185-1.0.0.tar.gz https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot0-patches-02.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a95f5fbc1dd6a693ba3876febdf4526a
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 4df62f51b196..a63c6861e4d7 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/appstream-glib-0.8.1 b/metadata/md5-cache/dev-libs/appstream-glib-0.8.1
new file mode 100644
index 000000000000..99e31c633795
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/appstream-glib-0.8.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gperf dev-libs/libxml2:2 app-text/docbook-xml-dtd:4.2 dev-libs/libxslt gtk-doc? ( >=dev-util/gtk-doc-1.9 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=>=dev-libs/glib-2.58.0:2 sys-apps/util-linux app-arch/libarchive:= >=net-misc/curl-7.56.0 >=dev-libs/json-glib-1.1.2 >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] fonts? ( x11-libs/gtk+:3 >=media-libs/freetype-2.4:2 ) >=media-libs/fontconfig-2.11:1.0 dev-libs/libyaml stemmer? ( dev-libs/snowball-stemmer:= ) x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+DESCRIPTION=Provides GObjects and helper methods to read and write AppStream metadata
+EAPI=8
+HOMEPAGE=https://people.freedesktop.org/~hughsient/appstream-glib/ https://github.com/hughsie/appstream-glib
+INHERIT=xdg meson
+IUSE=gtk-doc fonts +introspection stemmer
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.58.0:2 sys-apps/util-linux app-arch/libarchive:= >=net-misc/curl-7.56.0 >=dev-libs/json-glib-1.1.2 >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] fonts? ( x11-libs/gtk+:3 >=media-libs/freetype-2.4:2 ) >=media-libs/fontconfig-2.11:1.0 dev-libs/libyaml stemmer? ( dev-libs/snowball-stemmer:= ) x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+SLOT=0/8
+SRC_URI=https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-0.8.1.tar.xz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=bba6d9e98f10d2b47075982ae035ee2e
diff --git a/metadata/md5-cache/dev-libs/foma-0.10.0_p20220612 b/metadata/md5-cache/dev-libs/foma-0.10.0_p20220612
new file mode 100644
index 000000000000..a112027c7165
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/foma-0.10.0_p20220612
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/bison sys-devel/flex >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/readline:= sys-libs/zlib
+DESCRIPTION=Multi-purpose finite-state toolkit
+EAPI=8
+HOMEPAGE=https://fomafst.github.io/ https://github.com/mhulden/foma
+INHERIT=cmake
+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	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2abfab5b6117af1f949ef745e90c7ad8
diff --git a/metadata/md5-cache/dev-libs/icinga-php-thirdparty-0.11.0 b/metadata/md5-cache/dev-libs/icinga-php-thirdparty-0.11.0
index 509e4f65fd77..8ca0517bd396 100644
--- a/metadata/md5-cache/dev-libs/icinga-php-thirdparty-0.11.0
+++ b/metadata/md5-cache/dev-libs/icinga-php-thirdparty-0.11.0
@@ -3,9 +3,9 @@ DEPEND=dev-lang/php:*
 DESCRIPTION=Icinga PHP libraries for Icinga Web 2
 EAPI=7
 HOMEPAGE=https://github.com/Icinga/icinga-php-thirdparty
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:*
 SLOT=0
 SRC_URI=https://github.com/Icinga/icinga-php-thirdparty/archive/refs/tags/v0.11.0.tar.gz -> icinga-php-thirdparty-0.11.0.tar.gz
-_md5_=50e8e5d6458918faddd13a9c3c2221d2
+_md5_=bd535436525418e923c7cd42e879198c
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.0.9999 b/metadata/md5-cache/dev-libs/libclc-16.0.0.9999
index 80d2f8e26127..995bd7c3d8a1 100644
--- a/metadata/md5-cache/dev-libs/libclc-16.0.0.9999
+++ b/metadata/md5-cache/dev-libs/libclc-16.0.0.9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( sys-devel/clang:15 sys-devel/clang:14 sys-devel/clang:13 sys-devel/clang:12 sys-devel/clang:11 sys-devel/clang:10 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( sys-devel/clang:16 sys-devel/clang:15 sys-devel/clang:14 sys-devel/clang:13 sys-devel/clang:12 sys-devel/clang:11 sys-devel/clang:10 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=!!sys-devel/llvm:0
 DESCRIPTION=OpenCL C library
@@ -11,4 +11,4 @@ PROPERTIES=live
 REQUIRED_USE=|| ( video_cards_nvidia video_cards_r600 video_cards_radeonsi )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f2851c04e2af32f344d76afa7b84d4a0
+_md5_=56870294b6aff821ddff2152c5dbee3b
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-compat-1.5.6 b/metadata/md5-cache/dev-libs/libgcrypt-compat-1.5.6
index 2c484d6622ac..07bdda6fcdab 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-compat-1.5.6
+++ b/metadata/md5-cache/dev-libs/libgcrypt-compat-1.5.6
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/libgpg-error-1.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/libgcrypt:0/11 !dev-libs/libgcrypt:11/11
 DESCRIPTION=Old version of libgcrypt needed by some binaries
 EAPI=7
-HOMEPAGE=http://www.gnupg.org/
+HOMEPAGE=https://www.gnupg.org/
 INHERIT=autotools multilib-minimal
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
@@ -12,4 +12,4 @@ RDEPEND=>=dev-libs/libgpg-error-1.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 SLOT=11
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.5.6.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2407a0041665ec9de836c5402e45deb0
+_md5_=e6e662ee709fc29e4dd9edbffdf71de3
diff --git a/metadata/md5-cache/dev-libs/libical-3.0.14-r1 b/metadata/md5-cache/dev-libs/libical-3.0.14-r1
index c387f306b6b7..591e62a1a64d 100644
--- a/metadata/md5-cache/dev-libs/libical-3.0.14-r1
+++ b/metadata/md5-cache/dev-libs/libical-3.0.14-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/libical/libical/releases/download/v3.0.14/libical-3.0.14.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	vala	1c07e7167d9ef851ad187f5f3f02d34d	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=87d008d2aa1ceee73a009960a6a9a2b3
+_md5_=c1d853d000e998593a9f5df3d0d6c6e6
diff --git a/metadata/md5-cache/dev-libs/libksba-1.5.0 b/metadata/md5-cache/dev-libs/libksba-1.5.0
index 30aa1dd8e43f..91b18bb43642 100644
--- a/metadata/md5-cache/dev-libs/libksba-1.5.0
+++ b/metadata/md5-cache/dev-libs/libksba-1.5.0
@@ -3,11 +3,11 @@ DEFINED_PHASES=configure install
 DEPEND=>=dev-libs/libgpg-error-1.8
 DESCRIPTION=X.509 and CMS (PKCS#7) library
 EAPI=7
-HOMEPAGE=http://www.gnupg.org/related_software/libksba
+HOMEPAGE=https://www.gnupg.org/related_software/libksba
 IUSE=static-libs
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3+ GPL-2+ GPL-3
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
 SRC_URI=mirror://gnupg/libksba/libksba-1.5.0.tar.bz2
-_md5_=dfc22bd0ae25a8d3879303a8b9242eac
+_md5_=8d601acf8ffda13aac3adebf27ffed34
diff --git a/metadata/md5-cache/dev-libs/libksba-1.5.1 b/metadata/md5-cache/dev-libs/libksba-1.5.1
index 7fbcdab6631c..a53f22905f01 100644
--- a/metadata/md5-cache/dev-libs/libksba-1.5.1
+++ b/metadata/md5-cache/dev-libs/libksba-1.5.1
@@ -3,11 +3,11 @@ DEFINED_PHASES=configure install
 DEPEND=>=dev-libs/libgpg-error-1.8
 DESCRIPTION=X.509 and CMS (PKCS#7) library
 EAPI=7
-HOMEPAGE=http://www.gnupg.org/related_software/libksba
+HOMEPAGE=https://www.gnupg.org/related_software/libksba
 IUSE=static-libs
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3+ GPL-2+ GPL-3
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
 SRC_URI=mirror://gnupg/libksba/libksba-1.5.1.tar.bz2
-_md5_=dfc22bd0ae25a8d3879303a8b9242eac
+_md5_=8d601acf8ffda13aac3adebf27ffed34
diff --git a/metadata/md5-cache/dev-libs/libksba-1.6.0 b/metadata/md5-cache/dev-libs/libksba-1.6.0
index 2b0758865a17..4f9337d76fd0 100644
--- a/metadata/md5-cache/dev-libs/libksba-1.6.0
+++ b/metadata/md5-cache/dev-libs/libksba-1.6.0
@@ -3,11 +3,11 @@ DEFINED_PHASES=configure install
 DEPEND=>=dev-libs/libgpg-error-1.8
 DESCRIPTION=X.509 and CMS (PKCS#7) library
 EAPI=7
-HOMEPAGE=http://www.gnupg.org/related_software/libksba
+HOMEPAGE=https://www.gnupg.org/related_software/libksba
 IUSE=static-libs
 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=LGPL-3+ GPL-2+ GPL-3
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
 SRC_URI=mirror://gnupg/libksba/libksba-1.6.0.tar.bz2
-_md5_=2ff3d325f7c70dda9690a8d279f9e72c
+_md5_=9e2a117f0103c51766c3107bbfa5987a
diff --git a/metadata/md5-cache/dev-libs/libstrophe-0.12.0 b/metadata/md5-cache/dev-libs/libstrophe-0.12.0
index e05369393c70..711b03457ddd 100644
--- a/metadata/md5-cache/dev-libs/libstrophe-0.12.0
+++ b/metadata/md5-cache/dev-libs/libstrophe-0.12.0
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install test
+DEFINED_PHASES=compile configure install
 DEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= ) dev-libs/openssl:0=
 DESCRIPTION=A simple, lightweight C library for writing XMPP clients
 EAPI=7
@@ -10,4 +10,4 @@ LICENSE=|| ( MIT GPL-3 )
 RDEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= ) dev-libs/openssl:0=
 SLOT=0/0.1
 SRC_URI=https://github.com/strophe/libstrophe/releases/download/0.12.0/libstrophe-0.12.0.tar.xz
-_md5_=7ea1818f22d3162bb2c4b7d2013e7dc9
+_md5_=cd9392a0bc2b08c2eb2850ec6cad0eff
diff --git a/metadata/md5-cache/dev-libs/libstrophe-0.12.1 b/metadata/md5-cache/dev-libs/libstrophe-0.12.1
index 80f7bebb5908..d931ac14fbbb 100644
--- a/metadata/md5-cache/dev-libs/libstrophe-0.12.1
+++ b/metadata/md5-cache/dev-libs/libstrophe-0.12.1
@@ -1,13 +1,13 @@
 BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install test
+DEFINED_PHASES=compile configure install
 DEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= )
 DESCRIPTION=A simple, lightweight C library for writing XMPP clients
 EAPI=7
 HOMEPAGE=http://strophe.im/libstrophe/
 IUSE=doc expat gnutls
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( MIT GPL-3 )
 RDEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= )
 SLOT=0/0.1
 SRC_URI=https://github.com/strophe/libstrophe/releases/download/0.12.1/libstrophe-0.12.1.tar.xz
-_md5_=9b5da6bedd71cbe5380f1438f9e84f5f
+_md5_=62a85cbb95e88281d3be05692eaf1a93
diff --git a/metadata/md5-cache/dev-libs/libstrophe-0.12.2 b/metadata/md5-cache/dev-libs/libstrophe-0.12.2
new file mode 100644
index 000000000000..a0ed1922be1e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libstrophe-0.12.2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install
+DEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= )
+DESCRIPTION=A simple, lightweight C library for writing XMPP clients
+EAPI=7
+HOMEPAGE=http://strophe.im/libstrophe/
+IUSE=doc expat gnutls
+KEYWORDS=~amd64
+LICENSE=|| ( MIT GPL-3 )
+RDEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= )
+SLOT=0/0.1
+SRC_URI=https://github.com/strophe/libstrophe/releases/download/0.12.2/libstrophe-0.12.2.tar.xz
+_md5_=384f3aa8d7e2bc756c6c005c7da4fe30
diff --git a/metadata/md5-cache/dev-libs/voikko-fi-2.5 b/metadata/md5-cache/dev-libs/voikko-fi-2.5-r1
similarity index 89%
rename from metadata/md5-cache/dev-libs/voikko-fi-2.5
rename to metadata/md5-cache/dev-libs/voikko-fi-2.5-r1
index 37840f43dd62..92101432aed9 100644
--- a/metadata/md5-cache/dev-libs/voikko-fi-2.5
+++ b/metadata/md5-cache/dev-libs/voikko-fi-2.5-r1
@@ -1,6 +1,6 @@
 BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) dev-libs/libvoikko verify-sig? ( sec-keys/openpgp-keys-voikko ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile install setup unpack
-DEPEND=dev-libs/foma dev-libs/libvoikko
+DEPEND=dev-libs/foma:= dev-libs/libvoikko
 DESCRIPTION=Finnish dictionary for libvoikko based spell checkers (vvfst format)
 EAPI=8
 HOMEPAGE=https://voikko.puimula.org/
@@ -8,8 +8,8 @@ INHERIT=python-any-r1 verify-sig
 IUSE=verify-sig
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=dev-libs/foma dev-libs/libvoikko
+RDEPEND=dev-libs/foma:= dev-libs/libvoikko
 SLOT=0
 SRC_URI=https://www.puimula.org/voikko-sources/voikko-fi/voikko-fi-2.5.tar.gz verify-sig? ( https://www.puimula.org/voikko-sources/voikko-fi/voikko-fi-2.5.tar.gz.asc )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=fb68fee132f78a7ccaeed65002c5c52e
+_md5_=4cc14508b52012b93c4cf8544c727baa
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index c51d189ec839..cedcebc127c9 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/asttokens-2.0.7 b/metadata/md5-cache/dev-python/asttokens-2.0.7
new file mode 100644
index 000000000000..652838ca4a92
--- /dev/null
+++ b/metadata/md5-cache/dev-python/asttokens-2.0.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/astroid[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/six[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=Annotate Python AST trees with source text and token information
+EAPI=8
+HOMEPAGE=https://github.com/gristlabs/asttokens/ https://pypi.org/project/asttokens/
+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 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[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/gristlabs/asttokens/archive/2.0.7.tar.gz -> asttokens-2.0.7.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f7de428acf406a190317359c54536113
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.49 b/metadata/md5-cache/dev-python/boto3-1.24.49
new file mode 100644
index 000000000000..a06cccf88fbf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.24.49
@@ -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.49[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.49[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.49.tar.gz -> boto3-1.24.49.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.49 b/metadata/md5-cache/dev-python/botocore-1.27.49
new file mode 100644
index 000000000000..6d6432102df7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.27.49
@@ -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.49.tar.gz -> botocore-1.27.49.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=b81d1890717c7eec6242fb986ac35277
diff --git a/metadata/md5-cache/dev-python/cachecontrol-0.12.11 b/metadata/md5-cache/dev-python/cachecontrol-0.12.11
index e18cbe35f799..e702cb03118e 100644
--- a/metadata/md5-cache/dev-python/cachecontrol-0.12.11
+++ b/metadata/md5-cache/dev-python/cachecontrol-0.12.11
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/cherrypy[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lockfile[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/msgpack-0.5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_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 ) >=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(-)?]
+BDEPEND=test? ( dev-python/cherrypy[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lockfile[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/msgpack-0.5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=httplib2 caching for requests
 EAPI=8
 HOMEPAGE=https://pypi.org/project/CacheControl/ https://github.com/ionrock/cachecontrol/
 INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/msgpack-0.5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-python/msgpack-0.5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[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/ionrock/cachecontrol/archive/v0.12.11.tar.gz -> cachecontrol-0.12.11.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=35d3463e3c8623bceedab7cba482a7bf
+_md5_=e59e16b81422e8cdfdbea0039880710b
diff --git a/metadata/md5-cache/dev-python/construct-2.10.68 b/metadata/md5-cache/dev-python/construct-2.10.68
index 2aa4a6052ecc..bf2d993c0897 100644
--- a/metadata/md5-cache/dev-python/construct-2.10.68
+++ b/metadata/md5-cache/dev-python/construct-2.10.68
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/arrow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lz4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.15.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=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(-)?]
+BDEPEND=test? ( dev-python/arrow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lz4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.15.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.2[python_targets_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 postinst prepare test
 DESCRIPTION=A powerful declarative parser for binary data
 EAPI=8
 HOMEPAGE=https://construct.readthedocs.io/en/latest/ https://pypi.org/project/construct/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/construct/construct/archive/v2.10.68.tar.gz -> construct-2.10.68.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5c0f54c55abc55b371ebf330ec677425
+_md5_=180709faf54440a8edd599219b529f1e
diff --git a/metadata/md5-cache/dev-python/css-parser-1.0.7-r1 b/metadata/md5-cache/dev-python/css-parser-1.0.7-r1
index f9f2b12206da..9821a986a66b 100644
--- a/metadata/md5-cache/dev-python/css-parser-1.0.7-r1
+++ b/metadata/md5-cache/dev-python/css-parser-1.0.7-r1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/unittest-or-fail[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(-)?]
+BDEPEND=test? ( dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( 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=A CSS Cascading Style Sheets library (fork of cssutils)
 EAPI=8
 HOMEPAGE=https://pypi.org/project/css-parser/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=LGPL-2.1+
-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 )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/css-parser/css-parser-1.0.7.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=69b8eca6a4fd20e9fc98b89cc4eeeb8e
+_md5_=4d3ae82c092cd69fd3256f4f67fcb07d
diff --git a/metadata/md5-cache/dev-python/ddt-1.6.0 b/metadata/md5-cache/dev-python/ddt-1.6.0
new file mode 100644
index 000000000000..d0e0dd227862
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ddt-1.6.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Data-Driven/Decorated Tests
+EAPI=8
+HOMEPAGE=https://pypi.org/project/ddt/ https://github.com/datadriventests/ddt/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/datadriventests/ddt/archive/1.6.0.tar.gz -> ddt-1.6.0.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=78ce0605fa1e8ef85f1503946ac26554
diff --git a/metadata/md5-cache/dev-python/debugpy-1.6.2 b/metadata/md5-cache/dev-python/debugpy-1.6.2
index d68a7c069f72..1980ddc8a1a9 100644
--- a/metadata/md5-cache/dev-python/debugpy-1.6.2
+++ b/metadata/md5-cache/dev-python/debugpy-1.6.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pydevd[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 )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/microsoft/debugpy/archive/v1.6.2.tar.gz -> debugpy-1.6.2.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0ff0edc7e34ba4d747e84f66e66f62f3
+_md5_=2fd59aad2821c6ee503a22e8cc6db616
diff --git a/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.3-r1 b/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.3-r1
index 6e0e8effee62..b19328d79b35 100644
--- a/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.3-r1
+++ b/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.3-r1
@@ -1,16 +1,16 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Clone of EditorConfig core written in Python
 EAPI=7
 HOMEPAGE=https://editorconfig.org/
 INHERIT=cmake distutils-r1
-IUSE=cli test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=cli test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=PYTHON BSD-4
-RDEPEND=!<app-vim/editorconfig-vim-0.3.3-r1 cli? ( !app-text/editorconfig-core-c[cli] ) 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 )
+RDEPEND=!<app-vim/editorconfig-vim-0.3.3-r1 cli? ( !app-text/editorconfig-core-c[cli] ) 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/editorconfig/editorconfig-core-py/archive/v0.12.3.tar.gz -> editorconfig-core-py-0.12.3.tar.gz test? ( https://github.com/editorconfig/editorconfig-core-test/archive/abb579e00f2deeede91cb485e53512efab9c6474.tar.gz -> editorconfig-core-test-abb579e00f2deeede91cb485e53512efab9c6474.tar.gz )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7de256f386f3153ec86ef07745d98023
+_md5_=ab8eb19590b57afe946e6dd7b0969d8b
diff --git a/metadata/md5-cache/dev-python/ensurepip-wheels-63.3.0.22.2.1 b/metadata/md5-cache/dev-python/ensurepip-wheels-63.3.0.22.2.1
deleted file mode 100644
index c91f9c5a6ed9..000000000000
--- a/metadata/md5-cache/dev-python/ensurepip-wheels-63.3.0.22.2.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Shared wheels for ensurepip Python module
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pip/ https://pypi.org/project/setuptools/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/py3/p/pip/pip-22.2.1-py3-none-any.whl https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-63.3.0-py3-none-any.whl
-_md5_=38599eac27c58e664ba46672b8e33827
diff --git a/metadata/md5-cache/dev-python/ensurepip-wheels-63.4.2.22.2.2 b/metadata/md5-cache/dev-python/ensurepip-wheels-63.4.2.22.2.2
index 898a8bc9d9a9..2d5d8da9821e 100644
--- a/metadata/md5-cache/dev-python/ensurepip-wheels-63.4.2.22.2.2
+++ b/metadata/md5-cache/dev-python/ensurepip-wheels-63.4.2.22.2.2
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Shared wheels for ensurepip Python module
 EAPI=8
 HOMEPAGE=https://pypi.org/project/pip/ https://pypi.org/project/setuptools/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/py3/p/pip/pip-22.2.2-py3-none-any.whl https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-63.4.2-py3-none-any.whl
-_md5_=38599eac27c58e664ba46672b8e33827
+_md5_=527f526d64326d70aacfe3c064f894b9
diff --git a/metadata/md5-cache/dev-python/ensurepip-wheels-63.4.1.22.2.2 b/metadata/md5-cache/dev-python/ensurepip-wheels-63.4.3.22.2.2
similarity index 90%
rename from metadata/md5-cache/dev-python/ensurepip-wheels-63.4.1.22.2.2
rename to metadata/md5-cache/dev-python/ensurepip-wheels-63.4.3.22.2.2
index 3e8f1e713cfc..40dabb0cc9f8 100644
--- a/metadata/md5-cache/dev-python/ensurepip-wheels-63.4.1.22.2.2
+++ b/metadata/md5-cache/dev-python/ensurepip-wheels-63.4.3.22.2.2
@@ -5,5 +5,5 @@ HOMEPAGE=https://pypi.org/project/pip/ https://pypi.org/project/setuptools/
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2
 SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/py3/p/pip/pip-22.2.2-py3-none-any.whl https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-63.4.1-py3-none-any.whl
+SRC_URI=https://files.pythonhosted.org/packages/py3/p/pip/pip-22.2.2-py3-none-any.whl https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-63.4.3-py3-none-any.whl
 _md5_=38599eac27c58e664ba46672b8e33827
diff --git a/metadata/md5-cache/dev-python/exam-0.10.6 b/metadata/md5-cache/dev-python/exam-0.10.6
index 3d8752210d93..c1d83ec828e9 100644
--- a/metadata/md5-cache/dev-python/exam-0.10.6
+++ b/metadata/md5-cache/dev-python/exam-0.10.6
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[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/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/mock[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/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Helpers for better testing
 EAPI=8
 HOMEPAGE=https://github.com/fluxx/exam
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-python/mock[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 )
+RDEPEND=dev-python/mock[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/e/exam/exam-0.10.6.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=95bad0f8a232d8d280e79ede29278e87
+_md5_=8b8e6da976c9d09aa8e61f33e35da43b
diff --git a/metadata/md5-cache/dev-python/filelock-3.8.0 b/metadata/md5-cache/dev-python/filelock-3.8.0
new file mode 100644
index 000000000000..d1923047a530
--- /dev/null
+++ b/metadata/md5-cache/dev-python/filelock-3.8.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/setuptools_scm-7.0.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A platform independent file lock for Python
+EAPI=8
+HOMEPAGE=https://github.com/tox-dev/py-filelock/ https://pypi.org/project/filelock/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Unlicense
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tox-dev/py-filelock/archive/3.8.0.tar.gz -> py-filelock-3.8.0.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=e096e20210f2a871b5d9b7a20a213a4c
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.54.2 b/metadata/md5-cache/dev-python/hypothesis-6.54.2
new file mode 100644
index 000000000000..fcea95ee91f7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.54.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),sqlite] ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),sqlite] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.54.2.tar.gz -> hypothesis-6.54.2.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f2ad4a02a4a15b7c57e327b8c93b6043
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.15.0 b/metadata/md5-cache/dev-python/ipykernel-6.15.0
deleted file mode 100644
index efd2a07a8c22..000000000000
--- a/metadata/md5-cache/dev-python/ipykernel-6.15.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipyparallel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hatchling-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=IPython Kernel for Jupyter
-EAPI=8
-HOMEPAGE=https://github.com/ipython/ipykernel
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipykernel/ipykernel-6.15.0.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f6438878ef76e477020d5fd7aff04bb1
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.15.1 b/metadata/md5-cache/dev-python/ipykernel-6.15.1
index 54583e32bdd0..f091b130cc6c 100644
--- a/metadata/md5-cache/dev-python/ipykernel-6.15.1
+++ b/metadata/md5-cache/dev-python/ipykernel-6.15.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ipython/ipykernel
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipykernel/ipykernel-6.15.1.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b8dca97c37f5e4527036b5d4729db0fe
+_md5_=f6438878ef76e477020d5fd7aff04bb1
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.5.3 b/metadata/md5-cache/dev-python/matplotlib-3.5.3
new file mode 100644
index 000000000000..7f3d6f93e8ca
--- /dev/null
+++ b/metadata/md5-cache/dev-python/matplotlib-3.5.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[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/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=www-servers/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/pkgconfig doc? ( >=app-text/dvipng-1.15-r1 >=dev-python/colorspacious-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpydoc-0.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-gallery-0.3.1-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xlwt-1.3.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended dev-texlive/texlive-luatex dev-texlive/texlive-xetex >=media-gfx/graphviz-2.42.3[cairo] ) test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[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(-)?] >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=www-servers/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) test? ( dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[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/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=www-servers/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[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_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[tk?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[tk?,threads(+)] ) >=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(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pure python plotting library with matlab like syntax
+EAPI=8
+HOMEPAGE=https://matplotlib.org/ https://github.com/matplotlib/matplotlib/ https://pypi.org/project/matplotlib/
+INHERIT=distutils-r1 flag-o-matic multiprocessing prefix toolchain-funcs virtualx
+IUSE=cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
+RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[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/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=www-servers/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[tk?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[tk?,threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/matplotlib/matplotlib-3.5.3.tar.gz test? ( https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz )
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=b5d9e512d3b91f1546205f600edd69a5
diff --git a/metadata/md5-cache/dev-python/nbconvert-6.5.2 b/metadata/md5-cache/dev-python/nbconvert-6.5.2
new file mode 100644
index 000000000000..4faa09f412f2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nbconvert-6.5.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pebble[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/jupyter_client-4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bleach[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/entrypoints-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyterlab_pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markupsafe-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mistune-2.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tinycss2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.1[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(-)?] www-servers/tornado[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 postinst prepare test
+DESCRIPTION=Converting Jupyter Notebooks
+EAPI=8
+HOMEPAGE=https://nbconvert.readthedocs.io/ https://github.com/jupyter/nbconvert/ https://pypi.org/project/nbconvert/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bleach[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/entrypoints-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyterlab_pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markupsafe-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mistune-2.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tinycss2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.1[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(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/n/nbconvert/nbconvert-6.5.2.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=5cf988e2065ec73d907d1656b01e06cc
diff --git a/metadata/md5-cache/dev-python/nuitka-1.0.3 b/metadata/md5-cache/dev-python/nuitka-1.0.3
new file mode 100644
index 000000000000..ee9333af51f3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nuitka-1.0.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-util/ccache ) 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 postinst prepare test
+DESCRIPTION=Python to native compiler
+EAPI=8
+HOMEPAGE=https://www.nuitka.net
+INHERIT=distutils-r1 flag-o-matic optfeature
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~loong ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-util/scons[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://nuitka.net/releases/Nuitka-1.0.3.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=a74a9f966bba95c284e57252c51c882a
diff --git a/metadata/md5-cache/dev-python/podman-py-4.2.0 b/metadata/md5-cache/dev-python/podman-py-4.2.0
new file mode 100644
index 000000000000..c3b788225efd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/podman-py-4.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.24[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/toml-0.10.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.24.2[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=A library to interact with a Podman server
+EAPI=8
+HOMEPAGE=https://github.com/containers/podman-py/ https://pypi.org/project/podman/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.24[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/toml-0.10.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.24.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 )
+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/containers/podman-py/archive/v4.2.0.tar.gz -> podman-py-4.2.0.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=1dfa8a47de2b8af06e4cae1d1772c7f2
diff --git a/metadata/md5-cache/dev-python/progressbar2-4.0.0 b/metadata/md5-cache/dev-python/progressbar2-4.0.0
index 8e2b3e92cccc..254944e750ae 100644
--- a/metadata/md5-cache/dev-python/progressbar2-4.0.0
+++ b/metadata/md5-cache/dev-python/progressbar2-4.0.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-utils-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/progressbar >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/python-utils-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/progressbar >=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/setuptools-42.0.2[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=Text progressbar library for python
 EAPI=8
 HOMEPAGE=https://progressbar-2.readthedocs.io/ https://pypi.org/project/progressbar2/
 INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-python/python-utils-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/progressbar 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 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-python/python-utils-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/progressbar 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/p/progressbar2/progressbar2-4.0.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=10846de6ff558f5abcf4b7765cf85a80
+_md5_=c8390c7a78db749635cc099fee47cc3b
diff --git a/metadata/md5-cache/dev-python/proto-plus-1.22.0 b/metadata/md5-cache/dev-python/proto-plus-1.22.0
new file mode 100644
index 000000000000..c8c5cd9a6806
--- /dev/null
+++ b/metadata/md5-cache/dev-python/proto-plus-1.22.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/google-api-core-1.31.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/grpcio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( <dev-python/protobuf-python-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) 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=Beautiful, Pythonic protocol buffers
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/proto-plus-python/ https://pypi.org/project/proto-plus/
+INHERIT=distutils-r1
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/protobuf-python-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/googleapis/proto-plus-python/archive/v1.22.0.tar.gz -> proto-plus-1.22.0.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=e28ede09fc6a9ef63907c50d0599b5b1
diff --git a/metadata/md5-cache/dev-python/pyelftools-0.29 b/metadata/md5-cache/dev-python/pyelftools-0.29
new file mode 100644
index 000000000000..709484f62c0e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyelftools-0.29
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-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=pure-Python library for analyzing ELF files and DWARF debugging information
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pyelftools/ https://github.com/eliben/pyelftools/
+INHERIT=distutils-r1
+IUSE=examples 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
+LICENSE=public-domain
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/eliben/pyelftools/archive/v0.29.tar.gz -> pyelftools-0.29.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=d0b5b4f2a846abeee8a824792ef9594d
diff --git a/metadata/md5-cache/dev-python/pyhamcrest-2.0.4 b/metadata/md5-cache/dev-python/pyhamcrest-2.0.4
new file mode 100644
index 000000000000..539f832a6dc5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyhamcrest-2.0.4
@@ -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(-)?] doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p1:0 >=dev-python/sphinx-4.5.0-r1[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/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=Hamcrest framework for matcher objects
+EAPI=8
+HOMEPAGE=https://github.com/hamcrest/PyHamcrest/ https://pypi.org/project/PyHamcrest/
+INHERIT=distutils-r1
+IUSE=examples doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hamcrest/PyHamcrest/archive/V2.0.4.tar.gz -> PyHamcrest-2.0.4.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=065339336fb84d2f8d9745b493b4859c
diff --git a/metadata/md5-cache/dev-python/pyphen-0.12.0-r1 b/metadata/md5-cache/dev-python/pyphen-0.12.0-r1
index 2f0806e19b7e..0c9befe8185c 100644
--- a/metadata/md5-cache/dev-python/pyphen-0.12.0-r1
+++ b/metadata/md5-cache/dev-python/pyphen-0.12.0-r1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_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/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_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/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python module for hyphenation using hunspell dictionaries
 EAPI=8
 HOMEPAGE=https://github.com/Kozea/Pyphen
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-2+ LGPL-2+ MPL-1.1
-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 )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Kozea/Pyphen/archive/0.12.0.tar.gz -> Pyphen-0.12.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e20f62e97802712596c2785325dd5a6a
+_md5_=d9fc2ba5d17ec14f13438d9ce56bc979
diff --git a/metadata/md5-cache/dev-python/pypy-7.3.9-r1 b/metadata/md5-cache/dev-python/pypy-7.3.9-r1
new file mode 100644
index 000000000000..e6936c15e273
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy-7.3.9-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=|| ( >=dev-python/pypy-exe-7.3.9:7.3.9[bzip2?,ncurses?] >=dev-python/pypy-exe-bin-7.3.9:7.3.9 ) dev-libs/openssl:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy-bin-7.3.0:0
+DESCRIPTION=A fast, compliant alternative implementation of the Python language
+EAPI=8
+HOMEPAGE=https://www.pypy.org/
+INHERIT=pax-utils python-utils-r1
+IUSE=bzip2 full-stdlib gdbm +jit ncurses sqlite tk
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=|| ( >=dev-python/pypy-exe-7.3.9:7.3.9[bzip2?,ncurses?] >=dev-python/pypy-exe-bin-7.3.9:7.3.9 ) dev-libs/openssl:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy-bin-7.3.0:0
+SLOT=0/73
+SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.9-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy2.7-gentoo-patches-7.3.9.tar.xz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=0c1391aacdacd714b43583e931959c78
diff --git a/metadata/md5-cache/dev-python/pypy3-7.3.9_p5 b/metadata/md5-cache/dev-python/pypy3-7.3.9_p5
new file mode 100644
index 000000000000..ba6b376270de
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-7.3.9_p5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=|| ( >=dev-python/pypy3-exe-7.3.9_p3:3.9-7.3.9[bzip2?,ncurses?] >=dev-python/pypy3-exe-bin-7.3.9_p3:3.9-7.3.9 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0 test? ( || ( >=dev-lang/python-2.7.10_p15:2.7 ) !!dev-python/pytest-forked )
+DESCRIPTION=A fast, compliant alternative implementation of the Python (3.9) language
+EAPI=8
+HOMEPAGE=https://www.pypy.org/ https://foss.heptapod.net/pypy/pypy/
+INHERIT=pax-utils python-any-r1 toolchain-funcs
+IUSE=bzip2 +ensurepip gdbm +jit ncurses sqlite test tk
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=|| ( >=dev-python/pypy3-exe-7.3.9_p3:3.9-7.3.9[bzip2?,ncurses?] >=dev-python/pypy3-exe-bin-7.3.9_p3:3.9-7.3.9 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0
+RESTRICT=test
+SLOT=0/pypy39-pp73-336
+SRC_URI=https://buildbot.pypy.org/pypy/pypy3.9-v7.3.9-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.9-gentoo-patches-7.3.9_p5.tar.xz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8ee5a5e555ecdc3516b4f08a672ddddd
diff --git a/metadata/md5-cache/dev-python/pyspnego-0.5.4 b/metadata/md5-cache/dev-python/pyspnego-0.5.4
new file mode 100644
index 000000000000..b03da820c2d3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyspnego-0.5.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/gssapi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/krb5-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/cryptography[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 postinst prepare test
+DESCRIPTION=Library to handle SPNEGO and CredSSP authentication
+EAPI=8
+HOMEPAGE=https://github.com/jborean93/pyspnego/ https://pypi.org/project/pyspnego/
+INHERIT=distutils-r1 optfeature
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=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/p/pyspnego/pyspnego-0.5.4.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8234cf103c40a1133e5b6f05927b8df7
diff --git a/metadata/md5-cache/dev-python/pyte-0.8.1 b/metadata/md5-cache/dev-python/pyte-0.8.1
index b53b8a87edde..d82c785f7b5b 100644
--- a/metadata/md5-cache/dev-python/pyte-0.8.1
+++ b/metadata/md5-cache/dev-python/pyte-0.8.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/wcwidth[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(-)?]
+BDEPEND=test? ( dev-python/wcwidth[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=Simple VTXXX-compatible terminal emulator
 EAPI=8
 HOMEPAGE=https://pypi.org/project/pyte/ https://github.com/selectel/pyte
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
-RDEPEND=dev-python/wcwidth[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 )
+RDEPEND=dev-python/wcwidth[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/selectel/pyte/archive/0.8.1.tar.gz -> pyte-0.8.1.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3058d2cb857f90ec1fe4d4b35a22a443
+_md5_=ef4a2f9750bff59506aa4ea48c12ae4d
diff --git a/metadata/md5-cache/dev-python/pytest-bdd-5.0.0-r1 b/metadata/md5-cache/dev-python/pytest-bdd-5.0.0-r1
deleted file mode 100644
index 9e7cec958eab..000000000000
--- a/metadata/md5-cache/dev-python/pytest-bdd-5.0.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/glob2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parse_type[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/py[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=BDD library for the pytest runner
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pytest-bdd/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/glob2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parse_type[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/py[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/pytest-dev/pytest-bdd/archive/refs/tags/5.0.0.tar.gz -> pytest-bdd-5.0.0.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f3b29cbd6cabe9fbe318aa35dbc99465
diff --git a/metadata/md5-cache/dev-python/python-ldap-3.4.2 b/metadata/md5-cache/dev-python/python-ldap-3.4.2
index 956d680e5ba3..e04844d829f1 100644
--- a/metadata/md5-cache/dev-python/python-ldap-3.4.2
+++ b/metadata/md5-cache/dev-python/python-ldap-3.4.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.python-ldap.org/en/latest/ https://pypi.org/project/python-ldap/ https://github.com/python-ldap/python-ldap/
 INHERIT=distutils-r1
 IUSE=examples sasl ssl test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86 ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86 ~x86-solaris
 LICENSE=MIT PSF-2
 RDEPEND=>=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-nds/openldap:=[sasl?,ssl?] 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-ldap/python-ldap/archive/python-ldap-3.4.2.tar.gz -> python-ldap-3.4.2.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ce30e7133a4115baa0718e1294e48dd3
+_md5_=5e8d8af55d8d04c7534979559949ce12
diff --git a/metadata/md5-cache/dev-python/pyxattr-0.7.2 b/metadata/md5-cache/dev-python/pyxattr-0.7.2
index 8bc25ad879d2..a60f5fa51294 100644
--- a/metadata/md5-cache/dev-python/pyxattr-0.7.2
+++ b/metadata/md5-cache/dev-python/pyxattr-0.7.2
@@ -1,17 +1,17 @@
-BDEPEND=test? ( sys-apps/attr:= >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,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/recommonmark[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/recommonmark[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/recommonmark[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p1:0 >=dev-python/sphinx-4.5.0-r1[python_targets_pypy3(-)] dev-python/recommonmark[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( sys-apps/attr:= >=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(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/recommonmark[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/recommonmark[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/recommonmark[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/recommonmark[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p1:0 >=dev-python/sphinx-4.5.0-r1[python_targets_pypy3(-)] dev-python/recommonmark[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/setuptools-42.0.2[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
 DEPEND=sys-apps/attr:=
 DESCRIPTION=Python interface to xattr
 EAPI=7
 HOMEPAGE=https://pyxattr.k1024.org/
 INHERIT=distutils-r1
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
-RDEPEND=sys-apps/attr:= 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 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=sys-apps/attr:= 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/p/pyxattr/pyxattr-0.7.2.tar.gz https://pyxattr.k1024.org/downloads/pyxattr-0.7.2.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5cb9a687ab5c80420aba10c414e70ef9
+_md5_=9eb39cd42e8c5a96f46f34c94db1d5c5
diff --git a/metadata/md5-cache/dev-python/regex-2022.7.9 b/metadata/md5-cache/dev-python/regex-2022.7.9
index 26227c56d464..4961d4676410 100644
--- a/metadata/md5-cache/dev-python/regex-2022.7.9
+++ b/metadata/md5-cache/dev-python/regex-2022.7.9
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex/ https://pypi.org/project/regex/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/regex/regex-2022.7.9.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=662449497a58d2cf1e627e48f52c0d51
+_md5_=36f9f00e649dbb18c9fc9cbea83f4485
diff --git a/metadata/md5-cache/dev-python/requests-credssp-2.0.0 b/metadata/md5-cache/dev-python/requests-credssp-2.0.0
index 7ac584215956..8d5e175faed3 100644
--- a/metadata/md5-cache/dev-python/requests-credssp-2.0.0
+++ b/metadata/md5-cache/dev-python/requests-credssp-2.0.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/gssapi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/krb5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyspnego-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) 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(-)?]
+BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/gssapi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/krb5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyspnego-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=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=HTTPS CredSSP authentication with the requests library
 EAPI=8
-HOMEPAGE=https://pypi.org/project/requests-credssp/ https://github.com/jborean93/requests-credssp
+HOMEPAGE=https://pypi.org/project/requests-credssp/ https://github.com/jborean93/requests-credssp/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~riscv
 LICENSE=MIT
-RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/gssapi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/krb5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyspnego-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/gssapi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/krb5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyspnego-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jborean93/requests-credssp/archive/refs/tags/v2.0.0.tar.gz -> requests-credssp-2.0.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b064768c8b2dea94992e3f0d62bdb653
+_md5_=726b0042ef78e32ad5c4597a573f6d32
diff --git a/metadata/md5-cache/dev-python/requests-kerberos-0.14.0-r1 b/metadata/md5-cache/dev-python/requests-kerberos-0.14.0-r1
index 7c4970d440b3..2669fd6c4544 100644
--- a/metadata/md5-cache/dev-python/requests-kerberos-0.14.0-r1
+++ b/metadata/md5-cache/dev-python/requests-kerberos-0.14.0-r1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyspnego[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/gssapi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/krb5[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(-)?]
+BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyspnego[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/gssapi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/krb5[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=A Kerberos authentication handler for python-requests
 EAPI=8
-HOMEPAGE=https://github.com/requests/requests-kerberos/
+HOMEPAGE=https://github.com/requests/requests-kerberos/ https://pypi.org/project/requests-kerberos/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=ISC
-RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyspnego[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/gssapi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/krb5[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 )
+RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyspnego[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/gssapi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/krb5[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/requests/requests-kerberos/archive/v0.14.0.tar.gz -> requests-kerberos-0.14.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b476fbfe7dddef73d930df30d2d98ccb
+_md5_=15507632e72ba78c9716d24ab39b111e
diff --git a/metadata/md5-cache/dev-python/scandir-1.10.0-r3 b/metadata/md5-cache/dev-python/scandir-1.10.0-r3
new file mode 100644
index 000000000000..13d07960fed7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/scandir-1.10.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-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 better directory iterator and faster os.walk()
+EAPI=8
+HOMEPAGE=https://github.com/benhoyt/scandir
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/s/scandir/scandir-1.10.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=675455021a163ff84a9ce0590dc89cdd
diff --git a/metadata/md5-cache/dev-python/setuptools-63.4.3 b/metadata/md5-cache/dev-python/setuptools-63.4.3
new file mode 100644
index 000000000000..ac1fc000b80a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools-63.4.3
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_python3_8(-)?] ) >=dev-python/wheel-0.37.1-r1[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/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] ) >=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=Collection of extensions to Distutils
+EAPI=7
+HOMEPAGE=https://github.com/pypa/setuptools/ https://pypi.org/project/setuptools/
+INHERIT=distutils-r1 multiprocessing
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+RDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] )
+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/s/setuptools/setuptools-63.4.3.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=d5ae2b91b9b45ba4076b007f56ee26ba
diff --git a/metadata/md5-cache/dev-python/setuptools-rust-1.4.1 b/metadata/md5-cache/dev-python/setuptools-rust-1.4.1
index 8726d9748911..35a379c82b20 100644
--- a/metadata/md5-cache/dev-python/setuptools-rust-1.4.1
+++ b/metadata/md5-cache/dev-python/setuptools-rust-1.4.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/PyO3/setuptools-rust/ https://pypi.org/project/setuptools-rust/
 INHERIT=distutils-r1 cargo
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=MIT
 RDEPEND=virtual/rust <dev-python/semantic_version-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/semantic_version-2.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.7.4.3[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools-rust/setuptools-rust-1.4.1.tar.gz test? ( https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/convert_case/0.4.0/download -> convert_case-0.4.0.crate https://crates.io/api/v1/crates/cssparser/0.27.2/download -> cssparser-0.27.2.crate https://crates.io/api/v1/crates/cssparser-macros/0.6.0/download -> cssparser-macros-0.6.0.crate https://crates.io/api/v1/crates/derive_more/0.99.17/download -> derive_more-0.99.17.crate https://crates.io/api/v1/crates/dtoa/0.4.8/download -> dtoa-0.4.8.crate https://crates.io/api/v1/crates/dtoa-short/0.3.3/download -> dtoa-short-0.3.3.crate https://crates.io/api/v1/crates/futf/0.1.5/download -> futf-0.1.5.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/html5ever/0.25.1/download -> html5ever-0.25.1.crate https://crates.io/api/v1/crates/indoc/1.0.4/download -> indoc-1.0.4.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/kuchiki/0.8.1/download -> kuchiki-0.8.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.121/download -> libc-0.2.121.crate https://crates.io/api/v1/crates/lock_api/0.4.6/download -> lock_api-0.4.6.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/mac/0.1.1/download -> mac-0.1.1.crate https://crates.io/api/v1/crates/markup5ever/0.10.1/download -> markup5ever-0.10.1.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/new_debug_unreachable/1.0.4/download -> new_debug_unreachable-1.0.4.crate https://crates.io/api/v1/crates/nodrop/0.1.14/download -> nodrop-0.1.14.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_macros/0.8.0/download -> phf_macros-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/precomputed-hash/0.1.1/download -> precomputed-hash-0.1.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.36/download -> proc-macro2-1.0.36.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/pyo3/0.16.5/download -> pyo3-0.16.5.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.5/download -> pyo3-build-config-0.16.5.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.5/download -> pyo3-ffi-0.16.5.crate https://crates.io/api/v1/crates/pyo3-macros/0.16.5/download -> pyo3-macros-0.16.5.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.16.5/download -> pyo3-macros-backend-0.16.5.crate https://crates.io/api/v1/crates/quote/1.0.16/download -> quote-1.0.16.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.11/download -> redox_syscall-0.2.11.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/selectors/0.22.0/download -> selectors-0.22.0.crate https://crates.io/api/v1/crates/semver/1.0.6/download -> semver-1.0.6.crate https://crates.io/api/v1/crates/serde/1.0.136/download -> serde-1.0.136.crate https://crates.io/api/v1/crates/servo_arc/0.1.1/download -> servo_arc-0.1.1.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/stable_deref_trait/1.2.0/download -> stable_deref_trait-1.2.0.crate https://crates.io/api/v1/crates/string_cache/0.8.3/download -> string_cache-0.8.3.crate https://crates.io/api/v1/crates/string_cache_codegen/0.5.1/download -> string_cache_codegen-0.5.1.crate https://crates.io/api/v1/crates/syn/1.0.89/download -> syn-1.0.89.crate https://crates.io/api/v1/crates/target-lexicon/0.12.3/download -> target-lexicon-0.12.3.crate https://crates.io/api/v1/crates/tendril/0.4.3/download -> tendril-0.4.3.crate https://crates.io/api/v1/crates/thin-slice/0.1.1/download -> thin-slice-0.1.1.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/unindent/0.1.8/download -> unindent-0.1.8.crate https://crates.io/api/v1/crates/utf-8/0.7.6/download -> utf-8-0.7.6.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate )
 _eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=eae3d73de018080e747bfed53cef2afa
+_md5_=0b62cf0bfcc6dba2c823fdaf47ee818a
diff --git a/metadata/md5-cache/dev-python/setuptools-rust-1.5.0 b/metadata/md5-cache/dev-python/setuptools-rust-1.5.0
new file mode 100644
index 000000000000..de19f2aa4a23
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools-rust-1.5.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/setuptools-62.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( virtual/rust <dev-python/semantic_version-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/semantic_version-2.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.7.4.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/beautifulsoup4[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/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=A plugin for setuptools to build Rust Python extensions
+EAPI=8
+HOMEPAGE=https://github.com/PyO3/setuptools-rust/ https://pypi.org/project/setuptools-rust/
+INHERIT=distutils-r1 cargo
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=virtual/rust <dev-python/semantic_version-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/semantic_version-2.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.7.4.3[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/PyO3/setuptools-rust/archive/v1.5.0.tar.gz -> setuptools-rust-1.5.0.gh.tar.gz test? ( https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/convert_case/0.4.0/download -> convert_case-0.4.0.crate https://crates.io/api/v1/crates/cssparser/0.27.2/download -> cssparser-0.27.2.crate https://crates.io/api/v1/crates/cssparser-macros/0.6.0/download -> cssparser-macros-0.6.0.crate https://crates.io/api/v1/crates/derive_more/0.99.17/download -> derive_more-0.99.17.crate https://crates.io/api/v1/crates/dtoa/0.4.8/download -> dtoa-0.4.8.crate https://crates.io/api/v1/crates/dtoa-short/0.3.3/download -> dtoa-short-0.3.3.crate https://crates.io/api/v1/crates/futf/0.1.5/download -> futf-0.1.5.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/html5ever/0.25.1/download -> html5ever-0.25.1.crate https://crates.io/api/v1/crates/indoc/1.0.4/download -> indoc-1.0.4.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/kuchiki/0.8.1/download -> kuchiki-0.8.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.121/download -> libc-0.2.121.crate https://crates.io/api/v1/crates/lock_api/0.4.6/download -> lock_api-0.4.6.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/mac/0.1.1/download -> mac-0.1.1.crate https://crates.io/api/v1/crates/markup5ever/0.10.1/download -> markup5ever-0.10.1.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/new_debug_unreachable/1.0.4/download -> new_debug_unreachable-1.0.4.crate https://crates.io/api/v1/crates/nodrop/0.1.14/download -> nodrop-0.1.14.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_macros/0.8.0/download -> phf_macros-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/precomputed-hash/0.1.1/download -> precomputed-hash-0.1.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.36/download -> proc-macro2-1.0.36.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/pyo3/0.16.5/download -> pyo3-0.16.5.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.5/download -> pyo3-build-config-0.16.5.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.5/download -> pyo3-ffi-0.16.5.crate https://crates.io/api/v1/crates/pyo3-macros/0.16.5/download -> pyo3-macros-0.16.5.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.16.5/download -> pyo3-macros-backend-0.16.5.crate https://crates.io/api/v1/crates/quote/1.0.16/download -> quote-1.0.16.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.11/download -> redox_syscall-0.2.11.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/selectors/0.22.0/download -> selectors-0.22.0.crate https://crates.io/api/v1/crates/semver/1.0.6/download -> semver-1.0.6.crate https://crates.io/api/v1/crates/serde/1.0.136/download -> serde-1.0.136.crate https://crates.io/api/v1/crates/servo_arc/0.1.1/download -> servo_arc-0.1.1.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/stable_deref_trait/1.2.0/download -> stable_deref_trait-1.2.0.crate https://crates.io/api/v1/crates/string_cache/0.8.3/download -> string_cache-0.8.3.crate https://crates.io/api/v1/crates/string_cache_codegen/0.5.1/download -> string_cache_codegen-0.5.1.crate https://crates.io/api/v1/crates/syn/1.0.89/download -> syn-1.0.89.crate https://crates.io/api/v1/crates/target-lexicon/0.12.3/download -> target-lexicon-0.12.3.crate https://crates.io/api/v1/crates/tendril/0.4.3/download -> tendril-0.4.3.crate https://crates.io/api/v1/crates/thin-slice/0.1.1/download -> thin-slice-0.1.1.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/unindent/0.1.8/download -> unindent-0.1.8.crate https://crates.io/api/v1/crates/utf-8/0.7.6/download -> utf-8-0.7.6.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate )
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=fa0c28912ad9e9c68bbf69cce5a0be15
diff --git a/metadata/md5-cache/dev-python/sphinx-basic-ng-0.0.1_alpha12 b/metadata/md5-cache/dev-python/sphinx-basic-ng-0.0.1_alpha12
new file mode 100644
index 000000000000..40ea67aeaa9f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-basic-ng-0.0.1_alpha12
@@ -0,0 +1,16 @@
+BDEPEND=test? ( <dev-python/sphinx-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/myst_parser[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A modern skeleton for Sphinx themes
+EAPI=8
+HOMEPAGE=https://github.com/pradyunsg/sphinx-basic-ng/ https://pypi.org/project/sphinx-basic-ng/
+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 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=<dev-python/sphinx-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pradyunsg/sphinx-basic-ng/archive/0.0.1.a12.tar.gz -> sphinx-basic-ng-0.0.1.a12.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=bab474986a8d219c0147f24b3b1d639d
diff --git a/metadata/md5-cache/dev-python/tomlkit-0.11.3 b/metadata/md5-cache/dev-python/tomlkit-0.11.3
new file mode 100644
index 000000000000..b938326138c6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tomlkit-0.11.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Style preserving TOML library
+EAPI=8
+HOMEPAGE=https://github.com/sdispater/tomlkit/ https://pypi.org/project/tomlkit/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=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/t/tomlkit/tomlkit-0.11.3.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f07c48cac8eed20330eec89b7a4c9139
diff --git a/metadata/md5-cache/dev-python/trimesh-3.13.1 b/metadata/md5-cache/dev-python/trimesh-3.13.1
new file mode 100644
index 000000000000..089e0a35b2a4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/trimesh-3.13.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorlog[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycollada[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyglet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/svg-path[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xxhash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/rtree[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 postinst prepare test
+DESCRIPTION=Python library for loading and using triangular meshes
+EAPI=8
+HOMEPAGE=https://trimsh.org/ https://github.com/mikedh/trimesh/ https://pypi.org/project/trimesh/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorlog[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycollada[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyglet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/svg-path[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xxhash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/rtree[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/mikedh/trimesh/archive/3.13.1.tar.gz -> trimesh-3.13.1.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=838f01dcebb4615d2db7ea9115b9431e
diff --git a/metadata/md5-cache/dev-python/trove-classifiers-2022.8.7 b/metadata/md5-cache/dev-python/trove-classifiers-2022.8.7
new file mode 100644
index 000000000000..bc8fc465547b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/trove-classifiers-2022.8.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/calver[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Canonical source for classifiers on PyPI (pypi.org)
+EAPI=8
+HOMEPAGE=https://github.com/pypa/trove-classifiers/ https://pypi.org/project/trove-classifiers/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pypa/trove-classifiers/archive/2022.8.7.tar.gz -> trove-classifiers-2022.8.7.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8e59a55e5c5dad5a3500f535658cefd7
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 752d8ffba22d..86f6cbb2aad6 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/bundler-audit-0.9.1 b/metadata/md5-cache/dev-ruby/bundler-audit-0.9.1
new file mode 100644
index 000000000000..c6001efd32de
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/bundler-audit-0.9.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/thor:1[ruby_targets_ruby27(-)] dev-ruby/bundler:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/thor:1[ruby_targets_ruby30(-)] dev-ruby/bundler:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/thor:1[ruby_targets_ruby31(-)] dev-ruby/bundler:2[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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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(-)] )
+DESCRIPTION=Provides patch-level verification for Bundled apps
+EAPI=8
+HOMEPAGE=https://github.com/rubysec/bundler-audit
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=ruby_targets_ruby27? ( dev-ruby/thor:1[ruby_targets_ruby27(-)] dev-ruby/bundler:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/thor:1[ruby_targets_ruby30(-)] dev-ruby/bundler:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/thor:1[ruby_targets_ruby31(-)] dev-ruby/bundler:2[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 )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/bundler-audit-0.9.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	55326c3bb01904e05d55c73c84c85d07	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=ba3b09f0ec787c8fa6d47f0a1e63ae91
diff --git a/metadata/md5-cache/dev-ruby/webmock-3.17.1 b/metadata/md5-cache/dev-ruby/webmock-3.17.1
new file mode 100644
index 000000000000..aa2dbfa1d6c4
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/webmock-3.17.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/addressable-2.8.0[ruby_targets_ruby27(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby27(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/addressable-2.8.0[ruby_targets_ruby30(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby30(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/addressable-2.8.0[ruby_targets_ruby31(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby31(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] dev-ruby/rspec:3[ruby_targets_ruby30(-)] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby30(-)] dev-ruby/rack[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby31(-)] dev-ruby/rspec:3[ruby_targets_ruby31(-)] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby31(-)] dev-ruby/rack[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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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(-)] )
+DESCRIPTION=Allows stubbing HTTP requests and setting expectations on HTTP requests
+EAPI=8
+HOMEPAGE=https://github.com/bblimke/webmock
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/addressable-2.8.0[ruby_targets_ruby27(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby27(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/addressable-2.8.0[ruby_targets_ruby30(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby30(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/addressable-2.8.0[ruby_targets_ruby31(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby31(-)] >=dev-ruby/hashdiff-0.4.0:0[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=3
+SRC_URI=https://rubygems.org/gems/webmock-3.17.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	55326c3bb01904e05d55c73c84c85d07	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=5feed6c8f79d141321e3300e3b8e6da4
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 4a0468d8fd4b..4e425c040e1d 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/bcc-0.25.0 b/metadata/md5-cache/dev-util/bcc-0.25.0
new file mode 100644
index 000000000000..3c3c92d11d76
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bcc-0.25.0
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=dev-libs/elfutils-0.166:= >=dev-libs/libbpf-0.7.0:=[static-libs(-)] sys-kernel/linux-headers <sys-devel/clang-15:= <sys-devel/llvm-15:=[llvm_targets_BPF(+)] 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 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) test? ( || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/netperf net-misc/iperf:* ) !!sys-devel/llvm:0
+DESCRIPTION=Tools for BPF-based Linux IO analysis, networking, monitoring, and more
+EAPI=8
+HOMEPAGE=https://iovisor.github.io/bcc/
+INHERIT=cmake linux-info llvm lua-single python-r1 toolchain-funcs
+IUSE=+lua test +lua_single_target_luajit python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/elfutils-0.166:= >=dev-libs/libbpf-0.7.0:=[static-libs(-)] sys-kernel/linux-headers <sys-devel/clang-15:= <sys-devel/llvm-15:=[llvm_targets_BPF(+)] 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 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) lua? ( ^^ ( lua_single_target_luajit ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/iovisor/bcc/archive/v0.25.0.tar.gz -> bcc-0.25.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	529bb8cd5756c8476d37ba89dd41e635	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c330323690bab8d382090bc361afba98
diff --git a/metadata/md5-cache/dev-util/gprof2dot-2022.07.29 b/metadata/md5-cache/dev-util/gprof2dot-2022.07.29
new file mode 100644
index 000000000000..da5d1c587940
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gprof2dot-2022.07.29
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Converts profiling output to dot graphs
+EAPI=8
+HOMEPAGE=https://github.com/jrfonseca/gprof2dot
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/g/gprof2dot/gprof2dot-2022.7.29.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f969601b34e3e6f90973a2048c8364d9
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.346.3 b/metadata/md5-cache/dev-util/jenkins-bin-2.346.3
new file mode 100644
index 000000000000..6c15fd59d6ef
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.346.3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=acct-group/jenkins acct-user/jenkins
+DESCRIPTION=Extensible continuous integration server
+EAPI=8
+HOMEPAGE=https://jenkins.io/
+INHERIT=systemd
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=acct-group/jenkins acct-user/jenkins media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 || ( virtual/jre:17 virtual/jre:11 )
+SLOT=lts
+SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.346.3/jenkins.war -> jenkins-bin-2.346.3.war
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=89f71a7f5d74609d652ca9003a8dcb79
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.363 b/metadata/md5-cache/dev-util/jenkins-bin-2.363
new file mode 100644
index 000000000000..280cc3cba4a7
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.363
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=acct-group/jenkins acct-user/jenkins
+DESCRIPTION=Extensible continuous integration server
+EAPI=8
+HOMEPAGE=https://jenkins.io/
+INHERIT=systemd
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=acct-group/jenkins acct-user/jenkins media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:lts || ( virtual/jre:17 virtual/jre:11 )
+SLOT=0
+SRC_URI=http://mirrors.jenkins-ci.org/war/2.363/jenkins.war -> jenkins-bin-2.363.war
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=89b1792ac3ff25fbf3d7bcc8b74d8118
diff --git a/metadata/md5-cache/dev-util/ninja-1.11.0 b/metadata/md5-cache/dev-util/ninja-1.11.0
index 8d826e621bc7..1a41f307f649 100644
--- a/metadata/md5-cache/dev-util/ninja-1.11.0
+++ b/metadata/md5-cache/dev-util/ninja-1.11.0
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://ninja-build.org/
 INHERIT=bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 IUSE=doc emacs test vim-syntax
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ninja-build/ninja/archive/v1.11.0.tar.gz -> ninja-1.11.0.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6aa9db66b224ce87e604b978d679c361
+_md5_=e1b6d82b25ab67b4bbe8e9095d0e5307
diff --git a/metadata/md5-cache/dev-util/radare2-5.7.4 b/metadata/md5-cache/dev-util/radare2-5.7.4
index 59f6390f590d..e5077cefd57e 100644
--- a/metadata/md5-cache/dev-util/radare2-5.7.4
+++ b/metadata/md5-cache/dev-util/radare2-5.7.4
@@ -13,4 +13,4 @@ RESTRICT=fetch !test? ( test )
 SLOT=0
 SRC_URI=mirror+https://github.com/radareorg/radare2/archive/5.7.4.tar.gz -> radare2-5.7.4.tar.gz mirror+https://github.com/radareorg/vector35-arch-arm64/archive/fddb6d0fb0489c4e797a61b1553ac0d771fbf657.tar.gz -> radare2-5.7.4-vector35-arm64.tar.gz mirror+https://github.com/radareorg/vector35-arch-armv7/archive/dde39f69ffea19fc37e681874b12cb4707bc4f30.tar.gz -> radare2-5.7.4-vector35-armv7.tar.gz test? ( https://github.com/radareorg/radare2-testbins/archive/2fdb78f7f754b3aea90377588d45b774ccb41086.tar.gz -> radare2-testbins-2fdb78f7f754b3aea90377588d45b774ccb41086.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=aae4c8d6bcdd15777c5f244802eff0fe
+_md5_=772e7e890852989d956d4b1cb526440a
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index 346340dc171d..cd5c08254bfc 100644
Binary files a/metadata/md5-cache/games-action/Manifest.gz and b/metadata/md5-cache/games-action/Manifest.gz differ
diff --git a/metadata/md5-cache/games-action/supertuxkart-1.2 b/metadata/md5-cache/games-action/supertuxkart-1.2
deleted file mode 100644
index 1f609b90307b..000000000000
--- a/metadata/md5-cache/games-action/supertuxkart-1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-cpp/libmcpp sqlite? ( dev-db/sqlite:3 ) dev-libs/angelscript:= media-libs/freetype:2 media-libs/glew:0= media-libs/harfbuzz:= media-libs/libpng:0= media-libs/libsdl2[opengl,video] media-libs/libvorbis media-libs/openal net-libs/enet:1.3= net-misc/curl sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/libintl virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm nettle? ( dev-libs/nettle:= ) !nettle? ( >=dev-libs/openssl-1.0.1d:0= ) recorder? ( media-libs/libopenglrecorder ) wiimote? ( net-wireless/bluez ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A kart racing game starring Tux, the linux penguin (TuxKart fork)
-EAPI=7
-HOMEPAGE=https://supertuxkart.net/
-INHERIT=cmake desktop xdg
-IUSE=debug nettle recorder sqlite wiimote
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB
-RDEPEND=dev-cpp/libmcpp sqlite? ( dev-db/sqlite:3 ) dev-libs/angelscript:= media-libs/freetype:2 media-libs/glew:0= media-libs/harfbuzz:= media-libs/libpng:0= media-libs/libsdl2[opengl,video] media-libs/libvorbis media-libs/openal net-libs/enet:1.3= net-misc/curl sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/libintl virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm nettle? ( dev-libs/nettle:= ) !nettle? ( >=dev-libs/openssl-1.0.1d:0= ) recorder? ( media-libs/libopenglrecorder ) wiimote? ( net-wireless/bluez )
-SLOT=0
-SRC_URI=https://github.com/supertuxkart/stk-code/releases/download/1.2/SuperTuxKart-1.2-src.tar.xz mirror://gentoo/supertuxkart.png
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f7f48a3916b34b8118cfb793dfa34b37
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index e71252e42581..09ed58d753df 100644
Binary files a/metadata/md5-cache/games-emulation/Manifest.gz and b/metadata/md5-cache/games-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-emulation/emutos-1.1.1 b/metadata/md5-cache/games-emulation/emutos-1.1.1
deleted file mode 100644
index ed6554480fd6..000000000000
--- a/metadata/md5-cache/games-emulation/emutos-1.1.1
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Single-user single-tasking operating system for 32-bit Atari computer emulators
-EAPI=8
-HOMEPAGE=http://emutos.sourceforge.net
-IUSE=l10n_cs l10n_de l10n_es l10n_fi l10n_fr l10n_el l10n_hu l10n_it l10n_nl l10n_no l10n_pl l10n_ru l10n_sv l10n_de-CH l10n_tr l10n_en-GB l10n_en
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/emutos/emutos-192k-1.1.1.zip mirror://sourceforge/emutos/emutos-256k-1.1.1.zip mirror://sourceforge/emutos/emutos-512k-1.1.1.zip mirror://sourceforge/emutos/emutos-1024k-1.1.1.zip mirror://sourceforge/emutos/emutos-aranym-1.1.1.zip
-_md5_=fdbb5b3beba4c5f27bfa4ed6ec782365
diff --git a/metadata/md5-cache/games-emulation/openmsx-17.0 b/metadata/md5-cache/games-emulation/openmsx-17.0
deleted file mode 100644
index a6574d9b7702..000000000000
--- a/metadata/md5-cache/games-emulation/openmsx-17.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-lang/tcl:0= media-libs/alsa-lib media-libs/libogg media-libs/libpng:0= media-libs/libsdl2[joystick=,sound,video] media-libs/libtheora media-libs/libvorbis media-libs/sdl2-ttf >=media-libs/glew-1.3.2:0= sys-libs/zlib virtual/opengl dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=MSX emulator that aims for perfection
-EAPI=7
-HOMEPAGE=https://openmsx.org/
-INHERIT=desktop flag-o-matic python-any-r1 readme.gentoo-r1 toolchain-funcs xdg
-IUSE=+joystick
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/tcl:0= media-libs/alsa-lib media-libs/libogg media-libs/libpng:0= media-libs/libsdl2[joystick=,sound,video] media-libs/libtheora media-libs/libvorbis media-libs/sdl2-ttf >=media-libs/glew-1.3.2:0= sys-libs/zlib virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/openMSX/openMSX/releases/download/RELEASE_17_0/openmsx-17.0.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f8267e074ef42ee23c4131354722ac91
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 15efaa9c2cbd..d065e7362f2c 100644
Binary files a/metadata/md5-cache/games-engines/Manifest.gz and b/metadata/md5-cache/games-engines/Manifest.gz differ
diff --git a/metadata/md5-cache/games-engines/stratagus-3.3.2 b/metadata/md5-cache/games-engines/stratagus-3.3.2
new file mode 100644
index 000000000000..83675efd68bd
--- /dev/null
+++ b/metadata/md5-cache/games-engines/stratagus-3.3.2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-db/sqlite:3 dev-lua/toluapp[lua_single_target_lua5-1(-)?] media-libs/libpng:0 x11-libs/libX11 media-libs/libsdl2[sound,opengl,video] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-image[png] sys-libs/zlib bzip2? ( app-arch/bzip2 ) mng? ( media-libs/libmng ) vorbis? ( media-libs/libogg media-libs/libvorbis theora? ( media-libs/libtheora ) )
+DESCRIPTION=A realtime strategy game engine
+EAPI=8
+HOMEPAGE=https://stratagus.com/stratagus.html https://github.com/Wargus/stratagus/
+INHERIT=cmake lua-single optfeature
+IUSE=bzip2 debug doc mng theora vorbis +lua_single_target_lua5-1
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-db/sqlite:3 dev-lua/toluapp[lua_single_target_lua5-1(-)?] media-libs/libpng:0 x11-libs/libX11 media-libs/libsdl2[sound,opengl,video] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-image[png] sys-libs/zlib bzip2? ( app-arch/bzip2 ) mng? ( media-libs/libmng ) vorbis? ( media-libs/libogg media-libs/libvorbis theora? ( media-libs/libtheora ) )
+REQUIRED_USE=^^ ( lua_single_target_lua5-1 ) theora? ( vorbis )
+SLOT=0/3
+SRC_URI=https://github.com/Wargus/stratagus/archive/v3.3.2.tar.gz -> stratagus-3.3.2.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=4f0b552db67661fb1bd14fd3f9e8ce08
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 7badc8b79c77..95777f7edfd8 100644
Binary files a/metadata/md5-cache/games-fps/Manifest.gz and b/metadata/md5-cache/games-fps/Manifest.gz differ
diff --git a/metadata/md5-cache/games-fps/eduke32-20220422.10033 b/metadata/md5-cache/games-fps/eduke32-20220422.10033
deleted file mode 100644
index 2a726fd94ea1..000000000000
--- a/metadata/md5-cache/games-fps/eduke32-20220422.10033
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=app-arch/unzip x86? ( dev-lang/nasm )
-DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=media-libs/flac media-libs/libogg media-libs/libsdl2[alsa,joystick,opengl?,sound,video] media-libs/libvorbis media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis] sys-libs/zlib gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) vpx? ( media-libs/libvpx:= ) xmp? ( media-libs/exempi:2= ) timidity? ( media-sound/timidity++ )
-DESCRIPTION=An open source engine port of the classic PC first person shooter Duke Nukem 3D
-EAPI=8
-HOMEPAGE=http://www.eduke32.com/
-INHERIT=desktop toolchain-funcs xdg-utils
-IUSE=duke3d fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools voidsw voxels vpx xmp
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=BUILDLIC GPL-2 HRP
-PDEPEND=duke3d? ( games-fps/duke3d-data )
-RDEPEND=media-libs/flac media-libs/libogg media-libs/libsdl2[alsa,joystick,opengl?,sound,video] media-libs/libvorbis media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis] sys-libs/zlib gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) vpx? ( media-libs/libvpx:= ) xmp? ( media-libs/exempi:2= )
-REQUIRED_USE=hrp? ( duke3d !voxels ) offensive? ( duke3d ) opl? ( duke3d !sc-55 ) psx? ( duke3d ) sc-55? ( duke3d !opl ) voxels? ( !hrp ) vpx? ( opengl )
-RESTRICT=bindist test
-SLOT=0
-SRC_URI=http://dukeworld.com/eduke32/synthesis/20220422-10033-3927367ba/eduke32_src_20220422-10033-3927367ba.tar.xz https://www.eduke32.com/images/eduke32_classic.png hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-5.4.zip ) offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-1.33.zip ) opl? ( https://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-2.01.zip ) psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-1.11.zip ) sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-4.02.zip ) voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-1.21.zip )
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b2dd0ead45eb8c01e24758778e7d25d6
diff --git a/metadata/md5-cache/games-fps/prboom-plus-2.6.1 b/metadata/md5-cache/games-fps/prboom-plus-2.6.1
deleted file mode 100644
index 20dbc1584095..000000000000
--- a/metadata/md5-cache/games-fps/prboom-plus-2.6.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=media-libs/libsdl2[opengl?,joystick,sound,video] alsa? ( media-libs/alsa-lib:= ) dumb? ( media-libs/dumb:= ) fluidsynth? ( media-sound/fluidsynth:= ) mad? ( media-libs/libmad ) net? ( media-libs/sdl2-net ) pcre? ( dev-libs/libpcre:3 ) portmidi? ( media-libs/portmidi ) sdl2-image? ( media-libs/sdl2-image ) sdl2-mixer? ( media-libs/sdl2-mixer[midi] ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=An enhanced clone of the classic first-person shooter Doom
-EAPI=7
-HOMEPAGE=https://github.com/coelckers/prboom-plus/
-INHERIT=cmake desktop xdg
-IUSE=alsa dumb fluidsynth mad net +opengl +pcre portmidi sdl2-image +sdl2-mixer server vorbis zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ GPL-3+ BSD BSD-2 BSD-with-disclosure CC-BY-3.0 CC0-1.0 LGPL-2.1+ MIT public-domain
-RDEPEND=media-libs/libsdl2[opengl?,joystick,sound,video] alsa? ( media-libs/alsa-lib:= ) dumb? ( media-libs/dumb:= ) fluidsynth? ( media-sound/fluidsynth:= ) mad? ( media-libs/libmad ) net? ( media-libs/sdl2-net ) pcre? ( dev-libs/libpcre:3 ) portmidi? ( media-libs/portmidi ) sdl2-image? ( media-libs/sdl2-image ) sdl2-mixer? ( media-libs/sdl2-mixer[midi] ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=server? ( net )
-SLOT=0
-SRC_URI=http://deb.debian.org/debian/pool/main/p/prboom-plus/prboom-plus_2.6.1um.orig.tar.gz -> prboom-plus-2.6.1.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=45a6be67b09897399b730485e0cc00f7
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index 191d487951eb..339f0442958e 100644
Binary files a/metadata/md5-cache/games-roguelike/Manifest.gz and b/metadata/md5-cache/games-roguelike/Manifest.gz differ
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r103 b/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r103
index ee6ead89555c..b919e1036a97 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r103
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r103
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0.25
 SRC_URI=https://github.com/crawl/crawl/releases/download/0.25.1/stone_soup-0.25.1.zip https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.25.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.25.svg
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e4af0cd3ece1296130f04f2913839b3e
+_md5_=b562cf8fd2afc9dad89b792f661dc4f1
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.26.1-r2 b/metadata/md5-cache/games-roguelike/stone-soup-0.26.1-r2
index 2b11479fb8a1..30ce86b446bd 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.26.1-r2
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.26.1-r2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0.26
 SRC_URI=https://github.com/crawl/crawl/releases/download/0.26.1/stone_soup-0.26.1.zip https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.26.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.26.svg
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0fde06e9ba09d85536d06d2bd73d8c12
+_md5_=2b888ceeeaec13f7372adec8bf7ae5c4
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.27.1-r1 b/metadata/md5-cache/games-roguelike/stone-soup-0.27.1-r1
index 4579de727ff2..ee05eed558d1 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.27.1-r1
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.27.1-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0.27
 SRC_URI=https://github.com/crawl/crawl/releases/download/0.27.1/stone_soup-0.27.1.zip https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.27.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.27.svg
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=38146bd7f0907b77ae91c9da6fa3f266
+_md5_=4fc562ead2dbff29d49753a23747081b
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.28.0-r1 b/metadata/md5-cache/games-roguelike/stone-soup-0.28.0-r1
index 5b91e1e3d609..183041f617de 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.28.0-r1
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.28.0-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0.28
 SRC_URI=https://github.com/crawl/crawl/releases/download/0.28.0/stone_soup-0.28.0.zip https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.28.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.28.svg
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3c69bdb9b94aaf27fe5a577cccf3bd94
+_md5_=e02eeb9cfe581cc8132ad5b11a06390e
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.29.0_pre20220701 b/metadata/md5-cache/games-roguelike/stone-soup-0.29.0_pre20220701
index 5e4eedbac676..e666575ba33d 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.29.0_pre20220701
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.29.0_pre20220701
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0.29
 SRC_URI=https://github.com/crawl/crawl/archive/40bbea3e7347d6647ea791ba38964496f292cc81.tar.gz -> stone-soup-0.29.0_pre20220701.tar.gz https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.29.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.29.svg
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=00fd05f73d8419c4b773b600dca6c4ec
+_md5_=eac71e2e19f151d985a871435020d0d2
diff --git a/metadata/md5-cache/games-roguelike/zangband-2.7.4c b/metadata/md5-cache/games-roguelike/zangband-2.7.4c
deleted file mode 100644
index 0b204a08c78c..000000000000
--- a/metadata/md5-cache/games-roguelike/zangband-2.7.4c
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=tk? ( dev-lang/tcl:0= dev-lang/tk:0= ) x11-libs/libXaw x11-base/xorg-proto
-DESCRIPTION=An enhanced version of the Roguelike game Angband
-EAPI=7
-HOMEPAGE=http://www.zangband.org/
-INHERIT=autotools
-IUSE=tk
-KEYWORDS=~amd64 ~x86
-LICENSE=Moria
-RDEPEND=tk? ( dev-lang/tcl:0= dev-lang/tk:0= ) x11-libs/libXaw
-SLOT=0
-SRC_URI=ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/zangband-2.7.4c.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=728c3a72a73b17714bb50d9fa128e5ba
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index b8fb250e2e3d..488d1044d942 100644
Binary files a/metadata/md5-cache/games-server/Manifest.gz and b/metadata/md5-cache/games-server/Manifest.gz differ
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.19.20.02 b/metadata/md5-cache/games-server/bedrock-server-1.19.20.02
new file mode 100644
index 000000000000..62dbc0698b63
--- /dev/null
+++ b/metadata/md5-cache/games-server/bedrock-server-1.19.20.02
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install
+DESCRIPTION=The official bedrock (non-java) based server for the sandbox video game
+EAPI=8
+HOMEPAGE=https://www.minecraft.net/
+KEYWORDS=-* ~amd64
+LICENSE=Mojang
+RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 sys-libs/zlib
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.19.20.02.zip
+_md5_=aaf5f776bcbb8fa9b6ce8732514ba237
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index ddac74946bdf..413e48c1e602 100644
Binary files a/metadata/md5-cache/games-simulation/Manifest.gz and b/metadata/md5-cache/games-simulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-simulation/corsix-th-0.65.1 b/metadata/md5-cache/games-simulation/corsix-th-0.65.1
deleted file mode 100644
index 3fb46fdcb7ed..000000000000
--- a/metadata/md5-cache/games-simulation/corsix-th-0.65.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] 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 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=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 ) lua_single_target_lua5-1? ( >=dev-lua/luafilesystem-1.5[lua_targets_lua5-1(-)] >=dev-lua/lpeg-0.9[lua_targets_lua5-1(-)] >=dev-lua/luasocket-3.0_rc1-r4[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( >=dev-lua/luafilesystem-1.5[lua_targets_lua5-3(-)] >=dev-lua/lpeg-0.9[lua_targets_lua5-3(-)] >=dev-lua/luasocket-3.0_rc1-r4[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( >=dev-lua/luafilesystem-1.5[lua_targets_lua5-4(-)] >=dev-lua/lpeg-0.9[lua_targets_lua5-4(-)] >=dev-lua/luasocket-3.0_rc1-r4[lua_targets_lua5-4(-)] ) media-libs/libsdl2[opengl,video] sound? ( media-libs/sdl2-mixer[midi?] ) truetype? ( >=media-libs/freetype-2.5.3:2 ) videos? ( >=media-video/ffmpeg-2.2.3:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Open source clone of Theme Hospital
-EAPI=7
-HOMEPAGE=https://corsixth.com
-INHERIT=cmake lua-single xdg
-IUSE=doc +midi +sound +truetype +videos lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=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 ) lua_single_target_lua5-1? ( >=dev-lua/luafilesystem-1.5[lua_targets_lua5-1(-)] >=dev-lua/lpeg-0.9[lua_targets_lua5-1(-)] >=dev-lua/luasocket-3.0_rc1-r4[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( >=dev-lua/luafilesystem-1.5[lua_targets_lua5-3(-)] >=dev-lua/lpeg-0.9[lua_targets_lua5-3(-)] >=dev-lua/luasocket-3.0_rc1-r4[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( >=dev-lua/luafilesystem-1.5[lua_targets_lua5-4(-)] >=dev-lua/lpeg-0.9[lua_targets_lua5-4(-)] >=dev-lua/luasocket-3.0_rc1-r4[lua_targets_lua5-4(-)] ) media-libs/libsdl2[opengl,video] sound? ( media-libs/sdl2-mixer[midi?] ) truetype? ( >=media-libs/freetype-2.5.3:2 ) videos? ( >=media-video/ffmpeg-2.2.3:0= )
-REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 )
-SLOT=0
-SRC_URI=https://github.com/CorsixTH/CorsixTH/archive/v0.65.1.tar.gz -> corsix-th-0.65.1.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=57f4db241872e08075c6e385fd540360
diff --git a/metadata/md5-cache/games-simulation/flightgear-2020.3.12 b/metadata/md5-cache/games-simulation/flightgear-2020.3.12
deleted file mode 100644
index f7fb22a8ee88..000000000000
--- a/metadata/md5-cache/games-simulation/flightgear-2020.3.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=qt5? ( >=dev-qt/linguist-tools-5.7.1:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=dev-db/sqlite:3 dev-games/openscenegraph[jpeg,png] ~dev-games/simgear-2020.3.12[gdal=] media-libs/openal >=media-libs/plib-1.8.5 >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) dev-libs/boost utils? ( x11-libs/libXi x11-libs/libXmu )
-DESCRIPTION=Open Source Flight Simulator
-EAPI=7
-HOMEPAGE=https://www.flightgear.org/
-INHERIT=cmake bash-completion-r1 toolchain-funcs
-IUSE=cpu_flags_x86_sse2 dbus debug examples gdal openmp qt5 +udev +utils vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-db/sqlite:3 dev-games/openscenegraph[jpeg,png] ~dev-games/simgear-2020.3.12[gdal=] media-libs/openal >=media-libs/plib-1.8.5 >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) ~games-simulation/flightgear-data-2020.3.12
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/flightgear/flightgear-2020.3.12.tar.bz2
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b0894497536041d29aeed9c35f0bdf07
diff --git a/metadata/md5-cache/games-simulation/flightgear-data-2020.3.12 b/metadata/md5-cache/games-simulation/flightgear-data-2020.3.12
deleted file mode 100644
index 30633a9e303e..000000000000
--- a/metadata/md5-cache/games-simulation/flightgear-data-2020.3.12
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=FlightGear data files
-EAPI=7
-HOMEPAGE=https://www.flightgear.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/flightgear/FlightGear-2020.3.12-data.txz
-_md5_=c163d32e22e63c6c1852b49825b3ff0a
diff --git a/metadata/md5-cache/games-strategy/0ad-0.0.25b_alpha b/metadata/md5-cache/games-strategy/0ad-0.0.25b_alpha
deleted file mode 100644
index 7d4b7b4c17eb..000000000000
--- a/metadata/md5-cache/games-strategy/0ad-0.0.25b_alpha
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/premake-5.0.0_alpha12:5 virtual/pkgconfig virtual/rust test? ( dev-lang/perl ) app-crypt/minisign
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/boost:= dev-libs/icu:= dev-libs/libfmt:0= dev-libs/libsodium dev-libs/libxml2 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/libvorbis media-libs/openal net-libs/enet:1.3 net-libs/miniupnpc:= net-misc/curl sys-libs/zlib virtual/opengl x11-libs/libX11 editor? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) lobby? ( net-libs/gloox )
-DESCRIPTION=A free, real-time strategy game
-EAPI=8
-HOMEPAGE=https://play0ad.com/
-INHERIT=desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
-IUSE=verify-sig editor +lobby nvtt pch test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=BitstreamVera CC-BY-SA-3.0 GPL-2 LGPL-2.1 LPPL-1.3c MIT ZLIB
-RDEPEND=dev-libs/boost:= dev-libs/icu:= dev-libs/libfmt:0= dev-libs/libsodium dev-libs/libxml2 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/libvorbis media-libs/openal net-libs/enet:1.3 net-libs/miniupnpc:= net-misc/curl sys-libs/zlib virtual/opengl x11-libs/libX11 editor? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) lobby? ( net-libs/gloox ) !games-strategy/0ad-data
-RESTRICT=test
-SLOT=0
-SRC_URI=http://releases.wildfiregames.com/0ad-0.0.25b-alpha-unix-build.tar.xz https://releases.wildfiregames.com/0ad-0.0.25b-alpha-unix-data.tar.xz verify-sig? ( http://releases.wildfiregames.com/0ad-0.0.25b-alpha-unix-build.tar.xz.minisig http://releases.wildfiregames.com/0ad-0.0.25b-alpha-unix-data.tar.xz.minisig )
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c367d277ccfcd2fb41655fbfd57b682f
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 3d73fe95b0bf..f9765894d578 100644
Binary files a/metadata/md5-cache/games-strategy/Manifest.gz and b/metadata/md5-cache/games-strategy/Manifest.gz differ
diff --git a/metadata/md5-cache/games-strategy/augustus-3.0.1 b/metadata/md5-cache/games-strategy/augustus-3.0.1
deleted file mode 100644
index 098187b661d5..000000000000
--- a/metadata/md5-cache/games-strategy/augustus-3.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/expat media-libs/libpng:0= media-libs/libsdl2[joystick,video,sound] media-libs/sdl2-mixer dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Feature-enhanced open source re-implementation of Caesar III
-EAPI=7
-HOMEPAGE=https://github.com/Keriew/augustus
-INHERIT=xdg cmake readme.gentoo-r1
-IUSE=uncapped
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=AGPL-3
-RDEPEND=dev-libs/expat media-libs/libpng:0= media-libs/libsdl2[joystick,video,sound] media-libs/sdl2-mixer
-SLOT=0
-SRC_URI=https://github.com/Keriew/augustus/archive/refs/tags/v3.0.1.tar.gz -> augustus-3.0.1.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=463560dcac4577b7d1e5843cd21a6c32
diff --git a/metadata/md5-cache/games-strategy/naev-0.9.3 b/metadata/md5-cache/games-strategy/naev-0.9.3
deleted file mode 100644
index 696cdba02037..000000000000
--- a/metadata/md5-cache/games-strategy/naev-0.9.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/pyyaml[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/pyyaml[python_targets_python3_8(-)] ) ) sys-devel/gettext doc? ( app-doc/doxygen[dot] dev-lua/ldoc ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-games/physfs dev-libs/libunibreak:= dev-libs/libxml2 media-libs/freetype:2 media-libs/libsdl2[joystick,opengl,video] media-libs/libvorbis media-libs/openal media-libs/sdl2-image[png,webp] sci-libs/cholmod sci-libs/cxsparse sci-libs/openblas sci-libs/suitesparse sci-mathematics/glpk:= virtual/libintl virtual/opengl test? ( dev-games/physfs[zip] media-libs/libsdl2[X] media-libs/mesa[llvm] )
-DESCRIPTION=2D space trading and combat game, in a similar vein to Escape Velocity
-EAPI=8
-HOMEPAGE=https://naev.org/
-INHERIT=lua-single meson python-any-r1 virtualx xdg
-IUSE=doc lua_single_target_luajit lua_single_target_lua5-1 test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ BSD BSD-2 CC-BY-2.0 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 MIT public-domain
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-games/physfs dev-libs/libunibreak:= dev-libs/libxml2 media-libs/freetype:2 media-libs/libsdl2[joystick,opengl,video] media-libs/libvorbis media-libs/openal media-libs/sdl2-image[png,webp] sci-libs/cholmod sci-libs/cxsparse sci-libs/openblas sci-libs/suitesparse sci-mathematics/glpk:= virtual/libintl virtual/opengl
-REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/naev/naev/releases/download/v0.9.3/naev-0.9.3-source.tar.xz
-_eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4e729dbc210b194146f48eb8103ab0e4
diff --git a/metadata/md5-cache/games-strategy/s25rttr-0.9.1 b/metadata/md5-cache/games-strategy/s25rttr-0.9.1
deleted file mode 100644
index 3fdc90a68f1a..000000000000
--- a/metadata/md5-cache/games-strategy/s25rttr-0.9.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) app-arch/bzip2 >=dev-libs/boost-1.73:0=[nls] >=media-libs/libsamplerate-0.1.9 >=media-libs/libsdl2-2.0.10-r2[opengl,sound,video] media-libs/libsndfile media-libs/sdl2-mixer[vorbis,wav] net-libs/miniupnpc virtual/opengl test? ( >=sys-devel/clang-5 )
-DESCRIPTION=Open source remake of The Settlers II: Gold Edition (needs original data files)
-EAPI=8
-HOMEPAGE=https://www.siedler25.org/
-INHERIT=desktop flag-o-matic lua-single toolchain-funcs xdg cmake
-IUSE=test +lua_single_target_lua5-3
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ GPL-3 Boost-1.0
-RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) app-arch/bzip2 >=dev-libs/boost-1.73:0=[nls] >=media-libs/libsamplerate-0.1.9 >=media-libs/libsdl2-2.0.10-r2[opengl,sound,video] media-libs/libsndfile media-libs/sdl2-mixer[vorbis,wav] net-libs/miniupnpc virtual/opengl
-REQUIRED_USE=^^ ( lua_single_target_lua5-3 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Return-To-The-Roots/s25client/releases/download/v0.9.1/s25client_src_v0.9.1.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2e74cd8f25cb32cfe3967569aee80139
diff --git a/metadata/md5-cache/games-strategy/war1gus-3.3.2 b/metadata/md5-cache/games-strategy/war1gus-3.3.2
new file mode 100644
index 000000000000..77e7d4785495
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/war1gus-3.3.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==games-engines/stratagus-3.3.2*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11
+DESCRIPTION=Warcraft: Orcs & Humans for the Stratagus game engine
+EAPI=8
+HOMEPAGE=https://stratagus.com/war1gus.html https://github.com/Wargus/war1gus/
+INHERIT=cmake xdg-utils
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==games-engines/stratagus-3.3.2*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11
+SLOT=0
+SRC_URI=https://github.com/Wargus/war1gus/archive/v3.3.2.tar.gz -> war1gus-3.3.2.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=e7ec42299e3188c526ff1d6ba8d073df
diff --git a/metadata/md5-cache/games-strategy/wargus-3.3.2 b/metadata/md5-cache/games-strategy/wargus-3.3.2
new file mode 100644
index 000000000000..04a369fe0ce3
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/wargus-3.3.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend test
+DEPEND==games-engines/stratagus-3.3.2*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11 bne? ( app-arch/stormlib:= ) !games-strategy/wargus-data
+DESCRIPTION=Warcraft II for the Stratagus game engine
+EAPI=8
+HOMEPAGE=https://stratagus.com/ https://github.com/Wargus/wargus/
+INHERIT=cmake xdg-utils
+IUSE=+bne
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==games-engines/stratagus-3.3.2*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11 bne? ( app-arch/stormlib:= ) !games-strategy/wargus-data
+SLOT=0
+SRC_URI=https://github.com/Wargus/wargus/archive/v3.3.2.tar.gz -> wargus-3.3.2.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=fd7b1aecaf34f8151a6792cf9750955f
diff --git a/metadata/md5-cache/games-strategy/warzone2100-4.2.2 b/metadata/md5-cache/games-strategy/warzone2100-4.2.2
deleted file mode 100644
index f8ed9b3e68af..000000000000
--- a/metadata/md5-cache/games-strategy/warzone2100-4.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/zip app-text/asciidoc virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-games/physfs-2[zip] dev-db/sqlite:3 >=dev-libs/libsodium-1.0.14:= media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libogg media-libs/libpng:= media-libs/libsdl2[opengl,video,X] media-libs/libtheora media-libs/libvorbis media-libs/openal net-libs/miniupnpc:= net-misc/curl sys-libs/zlib nls? ( virtual/libintl ) vulkan? ( media-libs/libsdl2:=[vulkan] ) dev-libs/fribidi media-libs/fontconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=3D real-time strategy game
-EAPI=7
-HOMEPAGE=https://wz2100.net/
-INHERIT=cmake plocale xdg
-IUSE=debug discord nls videos vulkan
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ CC-BY-SA-3.0 public-domain vulkan? ( GPL-3 )
-RDEPEND=>=dev-games/physfs-2[zip] dev-db/sqlite:3 >=dev-libs/libsodium-1.0.14:= media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libogg media-libs/libpng:= media-libs/libsdl2[opengl,video,X] media-libs/libtheora media-libs/libvorbis media-libs/openal net-libs/miniupnpc:= net-misc/curl sys-libs/zlib nls? ( virtual/libintl ) vulkan? ( media-libs/libsdl2:=[vulkan] ) media-fonts/dejavu
-SLOT=0
-SRC_URI=mirror://sourceforge/warzone2100/releases/4.2.2/warzone2100_src.tar.xz -> warzone2100-4.2.2.tar.xz videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/2.2/high-quality-en/sequences.wz -> warzone2100-videos-2.2.wz )
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=dc316e84a0ba19d7dc8b37bb5fd4f8a0
diff --git a/metadata/md5-cache/games-strategy/warzone2100-4.2.4 b/metadata/md5-cache/games-strategy/warzone2100-4.2.4
deleted file mode 100644
index a1741086ffa2..000000000000
--- a/metadata/md5-cache/games-strategy/warzone2100-4.2.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/zip app-text/asciidoc virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-games/physfs-2[zip] dev-db/sqlite:3 >=dev-libs/libsodium-1.0.14:= media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libogg media-libs/libpng:= media-libs/libsdl2[opengl,video,X] media-libs/libtheora media-libs/libvorbis media-libs/openal net-libs/miniupnpc:= net-misc/curl sys-libs/zlib nls? ( virtual/libintl ) vulkan? ( media-libs/libsdl2:=[vulkan] ) dev-libs/fribidi media-libs/fontconfig
-DESCRIPTION=3D real-time strategy game
-EAPI=8
-HOMEPAGE=https://wz2100.net/
-INHERIT=cmake plocale xdg
-IUSE=debug discord nls videos vulkan
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ CC-BY-SA-3.0 public-domain vulkan? ( GPL-3 )
-RDEPEND=>=dev-games/physfs-2[zip] dev-db/sqlite:3 >=dev-libs/libsodium-1.0.14:= media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libogg media-libs/libpng:= media-libs/libsdl2[opengl,video,X] media-libs/libtheora media-libs/libvorbis media-libs/openal net-libs/miniupnpc:= net-misc/curl sys-libs/zlib nls? ( virtual/libintl ) vulkan? ( media-libs/libsdl2:=[vulkan] ) media-fonts/dejavu
-SLOT=0
-SRC_URI=mirror://sourceforge/warzone2100/releases/4.2.4/warzone2100_src.tar.xz -> warzone2100-4.2.4.tar.xz videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/2.2/high-quality-en/sequences.wz -> warzone2100-videos-2.2.wz )
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e61b0a778a807854fb56028947e4a432
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.16.2 b/metadata/md5-cache/games-strategy/wesnoth-1.16.2
deleted file mode 100644
index b1713ad94087..000000000000
--- a/metadata/md5-cache/games-strategy/wesnoth-1.16.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=acct-group/wesnoth acct-user/wesnoth dev-libs/boost:=[bzip2,context,icu,nls,threads(+)] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 dev-libs/openssl:0= >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) ) x11-libs/libX11
-DESCRIPTION=Battle for Wesnoth - A fantasy turn-based strategy game
-EAPI=8
-HOMEPAGE=http://www.wesnoth.org https://github.com/wesnoth/wesnoth
-INHERIT=cmake flag-o-matic xdg
-IUSE=dbus dedicated doc nls server
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/wesnoth acct-user/wesnoth dev-libs/boost:=[bzip2,context,icu,nls,threads(+)] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 dev-libs/openssl:0= >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) )
-SLOT=0
-SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.16.2.tar.gz -> wesnoth-1.16.2.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=faf6c97a716674b649dab3a31454c183
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 2a49d515bc5c..fc8ff15917d4 100644
Binary files a/metadata/md5-cache/games-util/Manifest.gz and b/metadata/md5-cache/games-util/Manifest.gz differ
diff --git a/metadata/md5-cache/games-util/deutex-5.2.0 b/metadata/md5-cache/games-util/deutex-5.2.0
deleted file mode 100644
index 449741ae114b..000000000000
--- a/metadata/md5-cache/games-util/deutex-5.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=man? ( app-text/asciidoc )
-DEFINED_PHASES=configure
-DEPEND=png? ( media-libs/libpng:0= )
-DESCRIPTION=WAD composer for Doom, Heretic, Hexen, and Strife
-EAPI=7
-HOMEPAGE=https://github.com/Doom-Utils/deutex
-IUSE=man png
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2+ LGPL-2+ HPND
-RDEPEND=png? ( media-libs/libpng:0= )
-SLOT=0
-SRC_URI=https://github.com/Doom-Utils/deutex/releases/download/v5.2.0/deutex-5.2.0.tar.xz
-_md5_=a333c658412f8253cd79a4aef1c34f84
diff --git a/metadata/md5-cache/games-util/lgogdownloader-3.8 b/metadata/md5-cache/games-util/lgogdownloader-3.8
deleted file mode 100644
index 84dbc3af1545..000000000000
--- a/metadata/md5-cache/games-util/lgogdownloader-3.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-apps/help2man virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-crypt/rhash-1.3.3-r2:0= dev-cpp/htmlcxx:0= dev-libs/boost:0=[zlib] >=dev-libs/jsoncpp-1.7:0= dev-libs/tinyxml2:0= >=net-misc/curl-7.32:0=[ssl] gui? ( dev-qt/qtwebengine:5=[widgets] )
-DESCRIPTION=Unofficial GOG.com downloader for Linux
-EAPI=8
-HOMEPAGE=https://sites.google.com/site/gogdownloader/
-INHERIT=cmake
-IUSE=gui
-KEYWORDS=~amd64 ~x86
-LICENSE=WTFPL-2
-RDEPEND=>=app-crypt/rhash-1.3.3-r2:0= dev-cpp/htmlcxx:0= dev-libs/boost:0=[zlib] >=dev-libs/jsoncpp-1.7:0= dev-libs/tinyxml2:0= >=net-misc/curl-7.32:0=[ssl] gui? ( dev-qt/qtwebengine:5=[widgets] )
-SLOT=0
-SRC_URI=https://sites.google.com/site/gogdownloader/lgogdownloader-3.8.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2ad01a8c347716b9533c26483bf07998
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 9ba5a706e57f..59e942ae73b8 100644
Binary files a/metadata/md5-cache/gnome-base/Manifest.gz and b/metadata/md5-cache/gnome-base/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-42.2-r300 b/metadata/md5-cache/gnome-base/gnome-desktop-42.2-r300
index 76e54e27671f..c30c3fefd730 100644
--- a/metadata/md5-cache/gnome-base/gnome-desktop-42.2-r300
+++ b/metadata/md5-cache/gnome-base/gnome-desktop-42.2-r300
@@ -12,4 +12,4 @@ RDEPEND=>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[i
 SLOT=3/19
 SRC_URI=mirror://gnome/sources/gnome-desktop/42/gnome-desktop-42.2.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=df129a3320d79122391277b94f4802bf
+_md5_=9fac462aea8a475b53881ead749dec0c
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-42.3-r300 b/metadata/md5-cache/gnome-base/gnome-desktop-42.3-r300
index e0fdd5708ada..aa6a6c4ea907 100644
--- a/metadata/md5-cache/gnome-base/gnome-desktop-42.3-r300
+++ b/metadata/md5-cache/gnome-base/gnome-desktop-42.3-r300
@@ -12,4 +12,4 @@ RDEPEND=>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[i
 SLOT=3/19
 SRC_URI=mirror://gnome/sources/gnome-desktop/42/gnome-desktop-42.3.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=df129a3320d79122391277b94f4802bf
+_md5_=9fac462aea8a475b53881ead749dec0c
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-42.4-r300 b/metadata/md5-cache/gnome-base/gnome-desktop-42.4-r300
index 4915b106dd63..1c87d6745106 100644
--- a/metadata/md5-cache/gnome-base/gnome-desktop-42.4-r300
+++ b/metadata/md5-cache/gnome-base/gnome-desktop-42.4-r300
@@ -12,4 +12,4 @@ RDEPEND=>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[i
 SLOT=3/19
 SRC_URI=mirror://gnome/sources/gnome-desktop/42/gnome-desktop-42.4.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e3dfe862104a309096d4f041bceebab0
+_md5_=2735321c3c35c482fd88d1e24c60b484
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 6ef3fa04eab1..29e1f419daf2 100644
Binary files a/metadata/md5-cache/gui-libs/Manifest.gz and b/metadata/md5-cache/gui-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-libs/egl-wayland-1.1.10_p20220805 b/metadata/md5-cache/gui-libs/egl-wayland-1.1.10_p20220805
new file mode 100644
index 000000000000..2eeda2fd3e84
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/egl-wayland-1.1.10_p20220805
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/wayland-scanner >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=dev-libs/wayland !<x11-drivers/nvidia-drivers-470.57.02[wayland(-)] dev-libs/wayland-protocols gui-libs/eglexternalplatform >=media-libs/libglvnd-1.3.4 x11-libs/libdrm
+DESCRIPTION=EGLStream-based Wayland external platform
+EAPI=8
+HOMEPAGE=https://github.com/NVIDIA/egl-wayland
+INHERIT=meson
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=dev-libs/wayland !<x11-drivers/nvidia-drivers-470.57.02[wayland(-)]
+SLOT=0
+SRC_URI=https://github.com/NVIDIA/egl-wayland/archive/885f0a5e91fe9cfbfbcd98ff01f6b83503decef3.tar.gz -> egl-wayland-1.1.10_p20220805.tar.gz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=436cf9089adc206db220029afdb215fe
diff --git a/metadata/md5-cache/gui-libs/egl-wayland-1.1.7-r1 b/metadata/md5-cache/gui-libs/egl-wayland-1.1.7-r1
index 2f90d9946afe..8ddf7935f21d 100644
--- a/metadata/md5-cache/gui-libs/egl-wayland-1.1.7-r1
+++ b/metadata/md5-cache/gui-libs/egl-wayland-1.1.7-r1
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/wayland-scanner >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst test
-DEPEND=dev-libs/wayland !<x11-drivers/nvidia-drivers-470.57.02[wayland(-)] gui-libs/eglexternalplatform media-libs/libglvnd
+DEPEND=dev-libs/wayland !<x11-drivers/nvidia-drivers-470.57.02[wayland(-)] gui-libs/eglexternalplatform >=media-libs/libglvnd-1.3.4
 DESCRIPTION=EGLStream-based Wayland external platform
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/NVIDIA/egl-wayland
-INHERIT=flag-o-matic meson
+INHERIT=meson
 KEYWORDS=amd64 ~arm64
 LICENSE=MIT
 RDEPEND=dev-libs/wayland !<x11-drivers/nvidia-drivers-470.57.02[wayland(-)]
 SLOT=0
 SRC_URI=https://github.com/NVIDIA/egl-wayland/archive/1.1.7.tar.gz -> egl-wayland-1.1.7.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=843ba9e1daf2731d47f6183827496d34
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=60f9583808e044e5ceb8a4fe67d4fec5
diff --git a/metadata/md5-cache/gui-libs/egl-wayland-1.1.9_p20211123 b/metadata/md5-cache/gui-libs/egl-wayland-1.1.9_p20211123
index ef5faf4d66f1..cc25bfe6b81c 100644
--- a/metadata/md5-cache/gui-libs/egl-wayland-1.1.9_p20211123
+++ b/metadata/md5-cache/gui-libs/egl-wayland-1.1.9_p20211123
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/wayland !<x11-drivers/nvidia-drivers-470.57.02[wayland(-)]
 SLOT=0
 SRC_URI=https://github.com/NVIDIA/egl-wayland/archive/582b2d345abaa0e313cf16c902e602084ea59551.tar.gz -> egl-wayland-1.1.9_p20211123.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ac122a51e5111a9267256b51f5fa2679
+_md5_=2f4ebd44352fb863df619487f23023c0
diff --git a/metadata/md5-cache/gui-libs/wpebackend-fdo-1.12.1 b/metadata/md5-cache/gui-libs/wpebackend-fdo-1.12.1
new file mode 100644
index 000000000000..ec08ad5b85a4
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/wpebackend-fdo-1.12.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/wayland-scanner virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=media-libs/libepoxy[egl] dev-libs/glib:2 >=dev-libs/wayland-1.10 >=gui-libs/libwpe-1.6:1.0
+DESCRIPTION=WPE backend designed for Linux desktop systems
+EAPI=8
+HOMEPAGE=https://wpewebkit.org/
+INHERIT=meson
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=media-libs/libepoxy[egl] dev-libs/glib:2 >=dev-libs/wayland-1.10 >=gui-libs/libwpe-1.6:1.0
+SLOT=1.0
+SRC_URI=https://wpewebkit.org/releases/wpebackend-fdo-1.12.1.tar.xz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=0840f27b946f7270ce1c12a2fd0b2e26
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 167e67560ec5..e68dd4e883b1 100644
Binary files a/metadata/md5-cache/kde-frameworks/Manifest.gz and b/metadata/md5-cache/kde-frameworks/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.96.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.96.0
index 1c9192b3eb1f..0f9f49d23a67 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.96.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.96.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=5/5.96
 SRC_URI=mirror://kde/stable/frameworks/5.96/breeze-icons-5.96.0.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	frameworks.kde.org	c2fd5a72d3ab78b02072d048e723db69	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=13ef0c050122ec1a5396441204aa1d3f
+_md5_=c1ee65c25664c9b1a9881c7d739b0a04
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.96.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.96.0
index ab45c37de15f..8bc0245ccec2 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.96.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.96.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=5/5.96
 SRC_URI=mirror://kde/stable/frameworks/5.96/breeze-icons-5.96.0.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	frameworks.kde.org	c2fd5a72d3ab78b02072d048e723db69	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=111aa436cd3cbdf0d42b6abf2182f2aa
+_md5_=5865949750e6fb4597ef2445ed700eaf
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.96.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.96.0
index 4c96a4b7bd4b..9519605e3bff 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.96.0
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.96.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=5/5.96
 SRC_URI=mirror://kde/stable/frameworks/5.96/extra-cmake-modules-5.96.0.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	frameworks.kde.org	c2fd5a72d3ab78b02072d048e723db69	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c24d09232df0f45dbd07b0aee207d03f
+_md5_=d961f54bc88421b64957cc079df1e8fe
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 51a5e252cfa2..cfb57bacf878 100644
Binary files a/metadata/md5-cache/kde-plasma/Manifest.gz and b/metadata/md5-cache/kde-plasma/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.24.6 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.24.6
index 44468dffb5dd..71c5c7e6ce4f 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.24.6
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.24.6
@@ -12,4 +12,4 @@ RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.6/breeze-gtk-5.24.6.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4c1cc7b16788630f448c4191673e096c
+_md5_=21b67cbb5ea124391e8522b99efc82a6
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.25.4 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.25.4
index 49d1f6ffc824..aac069a47cae 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.25.4
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.25.4
@@ -12,4 +12,4 @@ RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.25.4/breeze-gtk-5.25.4.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9ac7ef40cc719a41d652f4401b848f01
+_md5_=8bb4a7ec01ee69c4998237b0244cea90
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 6b3c76ed593f..6f238c7a7487 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/blender-2.93.10 b/metadata/md5-cache/media-gfx/blender-2.93.10
new file mode 100644
index 000000000000..bba4a4ec5d17
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/blender-2.93.10
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-python/sphinx[latex] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=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/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_9? ( dev-python/cython[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) oidn? ( >=media-libs/oidn-1.3.0 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) openvdb? ( >=media-gfx/openvdb-8.2.0-r2:= dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( <dev-cpp/tbb-2021.4.0:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
+DESCRIPTION=3D Creation/Animation/Publishing System
+EAPI=7
+HOMEPAGE=https://www.blender.org
+INHERIT=check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
+IUSE=+bullet +dds +fluid +openexr +tbb alembic collada +color-management cuda +cycles debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k man ndof nls openal opencl +oidn +openimageio +openmp +opensubdiv +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff valgrind python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=|| ( GPL-3 BL )
+RDEPEND=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/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_9? ( dev-python/cython[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) oidn? ( >=media-libs/oidn-1.3.0 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) openvdb? ( >=media-gfx/openvdb-8.2.0-r2:= dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( <dev-cpp/tbb-2021.4.0:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) alembic? ( openexr ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) fluid? ( tbb ) opencl? ( cycles ) openvdb? ( tbb ) osl? ( cycles ) test? ( color-management )
+RESTRICT=!test? ( test )
+SLOT=2.93
+SRC_URI=https://download.blender.org/source/blender-2.93.10.tar.xz https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-3.0.1-ffmpeg-5.0.patch.bz2 test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-2.93.0-tests.tar.bz2 )
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=91fe85b1957e249a21a08023769ee470
diff --git a/metadata/md5-cache/media-gfx/blender-2.93.9 b/metadata/md5-cache/media-gfx/blender-2.93.9
index 01156dd862cb..81ca5e896ad5 100644
--- a/metadata/md5-cache/media-gfx/blender-2.93.9
+++ b/metadata/md5-cache/media-gfx/blender-2.93.9
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-python/sphinx[latex] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=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/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_9? ( dev-python/cython[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) oidn? ( >=media-libs/oidn-1.3.0 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( >=media-gfx/openvdb-8.2.0-r2:= dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( <dev-cpp/tbb-2021.4.0:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
+DEPEND=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/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_9? ( dev-python/cython[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) oidn? ( >=media-libs/oidn-1.3.0 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) openvdb? ( >=media-gfx/openvdb-8.2.0-r2:= dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( <dev-cpp/tbb-2021.4.0:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
 DESCRIPTION=3D Creation/Animation/Publishing System
 EAPI=7
 HOMEPAGE=https://www.blender.org
@@ -8,10 +8,10 @@ INHERIT=check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs
 IUSE=+bullet +dds +fluid +openexr +tbb alembic collada +color-management cuda +cycles debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k man ndof nls openal opencl +oidn +openimageio +openmp +opensubdiv +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff valgrind python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~arm ~arm64
 LICENSE=|| ( GPL-3 BL )
-RDEPEND=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/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_9? ( dev-python/cython[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) oidn? ( >=media-libs/oidn-1.3.0 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( >=media-gfx/openvdb-8.2.0-r2:= dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( <dev-cpp/tbb-2021.4.0:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
+RDEPEND=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/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_9? ( dev-python/cython[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) oidn? ( >=media-libs/oidn-1.3.0 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) openvdb? ( >=media-gfx/openvdb-8.2.0-r2:= dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( <dev-cpp/tbb-2021.4.0:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) alembic? ( openexr ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) fluid? ( tbb ) opencl? ( cycles ) openvdb? ( tbb ) osl? ( cycles ) test? ( color-management )
 RESTRICT=!test? ( test )
 SLOT=2.93
 SRC_URI=https://download.blender.org/source/blender-2.93.9.tar.xz https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-3.0.1-ffmpeg-5.0.patch.bz2 test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-2.93.0-tests.tar.bz2 )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=abba0163fbc08393e899f71b33a8002d
+_md5_=96edbaa34c79ba16651cf23b4e4db68d
diff --git a/metadata/md5-cache/media-gfx/blender-3.1.2 b/metadata/md5-cache/media-gfx/blender-3.1.2
index ecdef2445948..bd130d444b2c 100644
--- a/metadata/md5-cache/media-gfx/blender-3.1.2
+++ b/metadata/md5-cache/media-gfx/blender-3.1.2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-python/sphinx[latex] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/zstandard[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] ) openvdb? ( >=media-gfx/openvdb-9.0.0:=[nanovdb?] dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
+DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/zstandard[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) openvdb? ( >=media-gfx/openvdb-9.0.0:=[nanovdb?] dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
 DESCRIPTION=3D Creation/Animation/Publishing System
 EAPI=8
 HOMEPAGE=https://www.blender.org
@@ -8,10 +8,10 @@ INHERIT=check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs
 IUSE=+bullet +dds +fluid +openexr +tbb alembic collada +color-management cuda +cycles debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff valgrind +python_single_target_python3_10
 KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=|| ( GPL-3 BL )
-RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/zstandard[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] ) openvdb? ( >=media-gfx/openvdb-9.0.0:=[nanovdb?] dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
+RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/zstandard[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) openvdb? ( >=media-gfx/openvdb-9.0.0:=[nanovdb?] dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
 REQUIRED_USE=^^ ( python_single_target_python3_10 ) alembic? ( openexr ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) fluid? ( tbb ) openvdb? ( tbb ) osl? ( cycles ) test? ( color-management )
 RESTRICT=!test? ( test )
 SLOT=3.1
 SRC_URI=https://download.blender.org/source/blender-3.1.2.tar.xz test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-3.1.0-tests.tar.bz2 )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4e5d648d0639f94d7f209a9363c8840d
+_md5_=3167cc2278c90696f02728a93bb0f559
diff --git a/metadata/md5-cache/media-gfx/blender-3.2.0 b/metadata/md5-cache/media-gfx/blender-3.2.0
index 2c006bd75271..6bf80c263314 100644
--- a/metadata/md5-cache/media-gfx/blender-3.2.0
+++ b/metadata/md5-cache/media-gfx/blender-3.2.0
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-python/sphinx[latex] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/zstandard[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] ) openvdb? ( >=media-gfx/openvdb-9.0.0:=[nanovdb?] dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
+DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/zstandard[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) openvdb? ( >=media-gfx/openvdb-9.0.0:=[nanovdb?] dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
 DESCRIPTION=3D Creation/Animation/Publishing System
 EAPI=8
 HOMEPAGE=https://www.blender.org
@@ -8,10 +8,10 @@ INHERIT=check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs
 IUSE=+bullet +dds +fluid +openexr +tbb alembic collada +color-management cuda +cycles debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff valgrind +python_single_target_python3_10
 KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=|| ( GPL-3 BL )
-RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/zstandard[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] ) openvdb? ( >=media-gfx/openvdb-9.0.0:=[nanovdb?] dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
+RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/zstandard[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) openvdb? ( >=media-gfx/openvdb-9.0.0:=[nanovdb?] dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
 REQUIRED_USE=^^ ( python_single_target_python3_10 ) alembic? ( openexr ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) fluid? ( tbb ) openvdb? ( tbb ) osl? ( cycles ) test? ( color-management )
 RESTRICT=!test? ( test )
 SLOT=3.2
 SRC_URI=https://download.blender.org/source/blender-3.2.0.tar.xz test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-3.2.0-tests.tar.xz )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=323f3ab1e566b9d8c2561bcb9cf930f1
+_md5_=ab19763fc79439f0e0b7a12fb86387f9
diff --git a/metadata/md5-cache/media-gfx/blender-3.2.1 b/metadata/md5-cache/media-gfx/blender-3.2.1
index 05e8619a521b..8dd569e47ecb 100644
--- a/metadata/md5-cache/media-gfx/blender-3.2.1
+++ b/metadata/md5-cache/media-gfx/blender-3.2.1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-python/sphinx[latex] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/zstandard[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] ) openvdb? ( >=media-gfx/openvdb-9.0.0:=[nanovdb?] dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
+DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/zstandard[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) openvdb? ( >=media-gfx/openvdb-9.0.0:=[nanovdb?] dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
 DESCRIPTION=3D Creation/Animation/Publishing System
 EAPI=8
 HOMEPAGE=https://www.blender.org
@@ -8,10 +8,10 @@ INHERIT=check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs
 IUSE=+bullet +dds +fluid +openexr +tbb alembic collada +color-management cuda +cycles debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff valgrind +python_single_target_python3_10
 KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=|| ( GPL-3 BL )
-RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/zstandard[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] ) openvdb? ( >=media-gfx/openvdb-9.0.0:=[nanovdb?] dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
+RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/zstandard[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) openvdb? ( >=media-gfx/openvdb-9.0.0:=[nanovdb?] dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
 REQUIRED_USE=^^ ( python_single_target_python3_10 ) alembic? ( openexr ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) fluid? ( tbb ) openvdb? ( tbb ) osl? ( cycles ) test? ( color-management )
 RESTRICT=!test? ( test )
 SLOT=3.2
 SRC_URI=https://download.blender.org/source/blender-3.2.1.tar.xz test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-3.2.0-tests.tar.xz )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=323f3ab1e566b9d8c2561bcb9cf930f1
+_md5_=659362f15933579625ab438fcf857a7b
diff --git a/metadata/md5-cache/media-gfx/blender-3.2.2 b/metadata/md5-cache/media-gfx/blender-3.2.2
new file mode 100644
index 000000000000..93864ff86cbe
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/blender-3.2.2
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-python/sphinx[latex] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/zstandard[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) openvdb? ( >=media-gfx/openvdb-9.0.0:=[nanovdb?] dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
+DESCRIPTION=3D Creation/Animation/Publishing System
+EAPI=8
+HOMEPAGE=https://www.blender.org
+INHERIT=check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
+IUSE=+bullet +dds +fluid +openexr +tbb alembic collada +color-management cuda +cycles debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff valgrind +python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=|| ( GPL-3 BL )
+RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/zstandard[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) openvdb? ( >=media-gfx/openvdb-9.0.0:=[nanovdb?] dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
+REQUIRED_USE=^^ ( python_single_target_python3_10 ) alembic? ( openexr ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) fluid? ( tbb ) openvdb? ( tbb ) osl? ( cycles ) test? ( color-management )
+RESTRICT=!test? ( test )
+SLOT=3.2
+SRC_URI=https://download.blender.org/source/blender-3.2.2.tar.xz test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-3.2.0-tests.tar.xz )
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=659362f15933579625ab438fcf857a7b
diff --git a/metadata/md5-cache/media-gfx/blender-9999 b/metadata/md5-cache/media-gfx/blender-9999
index 15021f16ecad..4a0f2f8755fa 100644
--- a/metadata/md5-cache/media-gfx/blender-9999
+++ b/metadata/md5-cache/media-gfx/blender-9999
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-python/sphinx[latex] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] dev-vcs/subversion[http(+)] net-misc/rsync
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/zstandard[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] ) openvdb? ( >=media-gfx/openvdb-9.0.0:=[nanovdb?] dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
+DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/zstandard[python_targets_python3_10(-)] ) media-libs/freetype:=[brotli] media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) openvdb? ( >=media-gfx/openvdb-9.0.0:=[nanovdb?] dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
 DESCRIPTION=3D Creation/Animation/Publishing System
 EAPI=8
 HOMEPAGE=https://www.blender.org
@@ -8,9 +8,9 @@ INHERIT=check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs
 IUSE=+bullet +dds +fluid +openexr +tbb alembic collada +color-management cuda +cycles debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff valgrind +python_single_target_python3_10
 LICENSE=|| ( GPL-3 BL )
 PROPERTIES=live live
-RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/zstandard[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] ) openvdb? ( >=media-gfx/openvdb-9.0.0:=[nanovdb?] dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
+RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/zstandard[python_targets_python3_10(-)] ) media-libs/freetype:=[brotli] media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) openvdb? ( >=media-gfx/openvdb-9.0.0:=[nanovdb?] dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
 REQUIRED_USE=^^ ( python_single_target_python3_10 ) alembic? ( openexr ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) fluid? ( tbb ) openvdb? ( tbb ) osl? ( cycles ) test? ( color-management )
 RESTRICT=!test? ( test )
 SLOT=9999
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	subversion	dee31e56422214d05644c2a3c900a148	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d8a6eda3782479c20620c187ea8ca28a
+_md5_=cad710b9d4b9513d6668bfe6d6d69119
diff --git a/metadata/md5-cache/media-gfx/fontforge-20220308 b/metadata/md5-cache/media-gfx/fontforge-20220308
index 0f1935bfbef3..bc15354cd17f 100644
--- a/metadata/md5-cache/media-gfx/fontforge-20220308
+++ b/metadata/md5-cache/media-gfx/fontforge-20220308
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://fontforge.org/
 INHERIT=python-single-r1 xdg cmake
 IUSE=doc truetype-debugger gif gtk jpeg png +python readline test tiff svg woff2 X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD GPL-3+
 RDEPEND=>=dev-libs/glib-2.67:2 dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( >=x11-libs/gtk+-3.10:3 ) !gtk? ( X? ( >=x11-libs/cairo-1.6:0= >=x11-libs/pango-1.10:0=[X] x11-libs/libX11:0= x11-libs/libXi:0= ) ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) readline? ( sys-libs/readline:0= ) woff2? ( media-libs/woff2:0= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fontforge/fontforge/releases/download/20220308/fontforge-20220308.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fd90ad303877e453809275325751f0cb
+_md5_=bdf544b61ad6c9c3df0f071e0aff24b3
diff --git a/metadata/md5-cache/media-gfx/superslicer-2.4.58.3-r1 b/metadata/md5-cache/media-gfx/superslicer-2.4.58.3-r1
index 80546a691194..8cda76dbae79 100644
--- a/metadata/md5-cache/media-gfx/superslicer-2.4.58.3-r1
+++ b/metadata/md5-cache/media-gfx/superslicer-2.4.58.3-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/supermerill/SuperSlicer/archive/refs/tags/2.4.58.3.tar.gz -> superslicer-2.4.58.3.tar.gz https://github.com/slic3r/slic3r-profiles/archive/748fbdfd2ac077e4e415868e7bc963740b92aa8e.tar.gz -> superslicer-2.4.58.3-profiles.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=325a7d9fd5a55eb729593b58bf54c617
+_md5_=3dc4b36ae6a9748cc047a085988c623b
diff --git a/metadata/md5-cache/media-gfx/xpaint-3.1.4-r1 b/metadata/md5-cache/media-gfx/xpaint-3.1.4-r1
new file mode 100644
index 000000000000..89c6b9e7c9bc
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/xpaint-3.1.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=media-libs/fontconfig media-libs/libjpeg-turbo:= media-libs/libpng:0= media-libs/netpbm x11-libs/libX11 >=x11-libs/libXaw3dXft-1.6.2h[unicode] x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXpm x11-libs/libXt pgf? ( media-libs/libpgf ) tiff? ( media-libs/tiff:0 )
+DESCRIPTION=Image editor with tiff, jpeg and png support
+EAPI=8
+HOMEPAGE=http://sf-xpaint.sourceforge.net/
+INHERIT=autotools desktop toolchain-funcs xdg
+IUSE=pgf tiff
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/fontconfig media-libs/libjpeg-turbo:= media-libs/libpng:0= media-libs/netpbm x11-libs/libX11 >=x11-libs/libXaw3dXft-1.6.2h[unicode] x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXpm x11-libs/libXt pgf? ( media-libs/libpgf ) tiff? ( media-libs/tiff:0 )
+SLOT=0
+SRC_URI=mirror://sourceforge/sf-xpaint/xpaint-3.1.4.tar.bz2
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=9aa108077b1ecc3e4ad6299009c4f334
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 52e79e09eaa4..0544412d00e8 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/embree-3.13.4 b/metadata/md5-cache/media-libs/embree-3.13.4
new file mode 100644
index 000000000000..e554b7385f64
--- /dev/null
+++ b/metadata/md5-cache/media-libs/embree-3.13.4
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=media-libs/glfw-3.2.1 virtual/opengl ispc? ( dev-lang/ispc ) tbb? ( dev-cpp/tbb:= ) tutorial? ( media-libs/libjpeg-turbo >=media-libs/libpng-1.6.34:0= >=media-libs/openimageio-1.8.7:0= )
+DESCRIPTION=Collection of high-performance ray tracing kernels
+EAPI=8
+HOMEPAGE=https://github.com/embree/embree
+INHERIT=cmake flag-o-matic linux-info
+IUSE=+compact-polys ispc +raymask ssp +tbb tutorial cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512dq
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=media-libs/glfw-3.2.1 virtual/opengl ispc? ( dev-lang/ispc ) tbb? ( dev-cpp/tbb:= ) tutorial? ( media-libs/libjpeg-turbo >=media-libs/libpng-1.6.34:0= >=media-libs/openimageio-1.8.7:0= )
+REQUIRED_USE=amd64? ( cpu_flags_x86_sse2 ) x86? ( cpu_flags_x86_sse2 )
+SLOT=3
+SRC_URI=https://github.com/embree/embree/archive/v3.13.4.tar.gz -> embree-3.13.4.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	529bb8cd5756c8476d37ba89dd41e635	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=fb01cda5d80c8c50b472aa5134b9bc48
diff --git a/metadata/md5-cache/media-libs/freetype-2.12.1 b/metadata/md5-cache/media-libs/freetype-2.12.1
index 6aae37177a3b..1cd74a3da57e 100644
--- a/metadata/md5-cache/media-libs/freetype-2.12.1
+++ b/metadata/md5-cache/media-libs/freetype-2.12.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.freetype.org/
 INHERIT=autotools flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
 IUSE=X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs svg utils doc 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 ~x86-winnt
+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 ~x86-winnt
 LICENSE=|| ( FTL GPL-2+ )
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] brotli? ( app-arch/brotli[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( svg? ( >=gnome-base/librsvg-2.46.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=2
 SRC_URI=mirror://sourceforge/freetype/freetype-2.12.1.tar.xz mirror://nongnu/freetype/freetype-2.12.1.tar.xz utils? ( mirror://sourceforge/freetype/ft2demos-2.12.1.tar.xz mirror://nongnu/freetype/ft2demos-2.12.1.tar.xz ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.12.1.tar.xz mirror://nongnu/freetype/freetype-doc-2.12.1.tar.xz )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0181648253643ae2f99b7a2b4ede3153
+_md5_=7714efbabcf77b9d80978019139f36b3
diff --git a/metadata/md5-cache/media-libs/glfw-3.3.6 b/metadata/md5-cache/media-libs/glfw-3.3.6
deleted file mode 100644
index ccc399b2875a..000000000000
--- a/metadata/md5-cache/media-libs/glfw-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=wayland-only? ( dev-util/wayland-scanner kde-frameworks/extra-cmake-modules ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland-only? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !wayland-only? ( media-libs/libglvnd[X] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland-only? ( dev-libs/wayland-protocols x11-libs/libxkbcommon[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !wayland-only? ( x11-base/xorg-proto x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[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=Portable OpenGL FrameWork
-EAPI=8
-HOMEPAGE=https://www.glfw.org/
-INHERIT=cmake-multilib
-IUSE=wayland-only abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86
-LICENSE=ZLIB
-RDEPEND=media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland-only? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !wayland-only? ( media-libs/libglvnd[X] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://github.com/glfw/glfw/archive/3.3.6.tar.gz -> glfw-3.3.6.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=54c14c8c6b2ad098cd08bf6d5e213ba2
diff --git a/metadata/md5-cache/media-libs/glfw-3.3.7 b/metadata/md5-cache/media-libs/glfw-3.3.7
deleted file mode 100644
index 1210fc44626a..000000000000
--- a/metadata/md5-cache/media-libs/glfw-3.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=wayland-only? ( dev-util/wayland-scanner kde-frameworks/extra-cmake-modules ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland-only? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !wayland-only? ( media-libs/libglvnd[X] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland-only? ( dev-libs/wayland-protocols x11-libs/libxkbcommon[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !wayland-only? ( x11-base/xorg-proto x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[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=Portable OpenGL FrameWork
-EAPI=8
-HOMEPAGE=https://www.glfw.org/
-INHERIT=cmake-multilib
-IUSE=wayland-only abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86
-LICENSE=ZLIB
-RDEPEND=media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland-only? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !wayland-only? ( media-libs/libglvnd[X] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://github.com/glfw/glfw/archive/3.3.7.tar.gz -> glfw-3.3.7.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=54c14c8c6b2ad098cd08bf6d5e213ba2
diff --git a/metadata/md5-cache/media-libs/libjxl-9999 b/metadata/md5-cache/media-libs/libjxl-9999
index 83b1fef5f451..a55a28553ebc 100644
--- a/metadata/md5-cache/media-libs/libjxl-9999
+++ b/metadata/md5-cache/media-libs/libjxl-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/brotli:=[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-cpp/gflags:=[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-cpp/highway-0.16.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[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/libpng:=[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(-)?] media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-misc/shared-mime-info-2.2 gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) gimp210? ( >=media-gfx/gimp-2.10.28:0/2 ) openexr? ( media-libs/openexr:= )
+DEPEND=app-arch/brotli:=[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-cpp/gflags:=[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-cpp/highway-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[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/libpng:=[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(-)?] media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-misc/shared-mime-info-2.2 gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) gimp210? ( >=media-gfx/gimp-2.10.28:0/2 ) openexr? ( media-libs/openexr:= )
 DESCRIPTION=JPEG XL image format reference implementation
 EAPI=8
 HOMEPAGE=https://github.com/libjxl/libjxl
@@ -8,7 +8,7 @@ INHERIT=cmake-multilib git-r3
 IUSE=gdk-pixbuf gimp210 openexr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=app-arch/brotli:=[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-cpp/gflags:=[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-cpp/highway-0.16.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[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/libpng:=[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(-)?] media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-misc/shared-mime-info-2.2 gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) gimp210? ( >=media-gfx/gimp-2.10.28:0/2 ) openexr? ( media-libs/openexr:= )
+RDEPEND=app-arch/brotli:=[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-cpp/gflags:=[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-cpp/highway-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[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/libpng:=[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(-)?] media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-misc/shared-mime-info-2.2 gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) gimp210? ( >=media-gfx/gimp-2.10.28:0/2 ) openexr? ( media-libs/openexr:= )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=30856d0c2b21a9b500541a5de83b32cd
+_md5_=e6c947438b6aa1de075ac20408c1c381
diff --git a/metadata/md5-cache/media-libs/mesa-22.1.6 b/metadata/md5-cache/media-libs/mesa-22.1.6
new file mode 100644
index 000000000000..2ebad4950bdb
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-22.1.6
@@ -0,0 +1,17 @@
+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 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install pretend setup test
+DEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=8
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+INHERIT=llvm meson-multilib python-any-r1 linux-info
+IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_intel video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
+REQUIRED_USE=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) xa? ( X ) xvmc? ( X ) zink? ( vulkan )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://archive.mesa3d.org/mesa-22.1.6.tar.xz
+_eclasses_=linux-info	529bb8cd5756c8476d37ba89dd41e635	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8325aaf8447af95188265e160c7c658e
diff --git a/metadata/md5-cache/media-libs/rubberband-3.0.0 b/metadata/md5-cache/media-libs/rubberband-3.0.0
index c81bb827926f..4257a76fe60e 100644
--- a/metadata/md5-cache/media-libs/rubberband-3.0.0
+++ b/metadata/md5-cache/media-libs/rubberband-3.0.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.breakfastquay.com/rubberband/
 INHERIT=meson-multilib flag-o-matic
 IUSE=ladspa jni static-libs +programs vamp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jni? ( >=virtual/jdk-1.8:* ) ladspa? ( media-libs/ladspa-sdk ) programs? ( media-libs/libsndfile ) vamp? ( media-libs/vamp-plugin-sdk[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://breakfastquay.com/files/releases/rubberband-3.0.0.tar.bz2
 _eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a50c2e9482323d069723df1ffc021e1d
+_md5_=46f0a1a204ef8ab31a8dd4a8d821a073
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index b4f946e0d84a..6c7d59559607 100644
Binary files a/metadata/md5-cache/media-radio/Manifest.gz and b/metadata/md5-cache/media-radio/Manifest.gz differ
diff --git a/metadata/md5-cache/media-radio/flrig-1.4.7 b/metadata/md5-cache/media-radio/flrig-1.4.7
new file mode 100644
index 000000000000..880c821a4ad2
--- /dev/null
+++ b/metadata/md5-cache/media-radio/flrig-1.4.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils sys-devel/gettext
+DESCRIPTION=Transceiver control program for Amateur Radio use
+EAPI=8
+HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
+SLOT=0
+SRC_URI=mirror://sourceforge/fldigi/flrig-1.4.7.tar.gz
+_md5_=cf9ccd84a683f68505980f614568f9fb
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index a3447ea62875..59f5831fdfba 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/fluidsynth-2.2.8 b/metadata/md5-cache/media-sound/fluidsynth-2.2.8
index 1a92a67d58cf..37e6e89df9ca 100644
--- a/metadata/md5-cache/media-sound/fluidsynth-2.2.8
+++ b/metadata/md5-cache/media-sound/fluidsynth-2.2.8
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.fluidsynth.org
 INHERIT=cmake-multilib systemd toolchain-funcs
 IUSE=alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads 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 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lash? ( media-sound/lash[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ladspa? ( media-libs/ladspa-sdk[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-plugins/cmt-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndfile? ( media-libs/libsndfile[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/3
 SRC_URI=https://github.com/FluidSynth/fluidsynth/archive/v2.2.8.tar.gz -> fluidsynth-2.2.8.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=70595b818cf478a6a710c0732d9e2f89
+_md5_=a05e46d99f32dbe2862ddcdf6a250878
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index f1b8d67666e4..6a90b1ecbb00 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/vdr-2.6.1 b/metadata/md5-cache/media-video/vdr-2.6.1
index b30298f00bd6..fdccbfd99fee 100644
--- a/metadata/md5-cache/media-video/vdr-2.6.1
+++ b/metadata/md5-cache/media-video/vdr-2.6.1
@@ -13,4 +13,4 @@ REQUIRED_USE=permashift? ( !naludump !pinplugin )
 SLOT=0
 SRC_URI=http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/2.6.1;sf=tbz2 -> vdr-2.6.1.tbz2 menuorg? ( https://github.com/vdr-projects/vdr-plugin-menuorg/raw/master/vdr-patch/vdr-menuorg-2.3.x.diff ) ttxtsubs? ( https://md11.it.cx/download/vdr/vdr-2.6.1_ttxtsubs_v2.patch )
 _eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=a6dd5d34878d5d6e09336d34e2defc02
+_md5_=24622c6c286fc3e45f48c7ec78bba5a7
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index a6728de00b19..757f2e2ea1f3 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/openbsd-netcat-1.195-r1 b/metadata/md5-cache/net-analyzer/openbsd-netcat-1.195-r1
index 15ba5473338b..a27e889afffe 100644
--- a/metadata/md5-cache/net-analyzer/openbsd-netcat-1.195-r1
+++ b/metadata/md5-cache/net-analyzer/openbsd-netcat-1.195-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The OpenBSD network swiss army knife
 EAPI=7
 HOMEPAGE=https://cvsweb.openbsd.org/src/usr.bin/nc/ https://salsa.debian.org/debian/netcat-openbsd
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=~amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=!elibc_Darwin? ( dev-libs/libbsd ) !net-analyzer/netcat !net-analyzer/netcat6
 SLOT=0
 SRC_URI=http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.195.orig.tar.gz http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.195-2.debian.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0bd0f44861cb2c7980b89e723af3bb3d
+_md5_=09d0e47ba9e79d4bda8ceca947af1f52
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 42fa018698ec..e2a8958cbb86 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.86 b/metadata/md5-cache/net-dns/dnsmasq-2.86
index 407ee8402861..162fa034b7ff 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.86
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.86
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html
 INHERIT=toolchain-funcs lua-single systemd
 IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2 +loop +inotify ipv6 lua nettlehash nls script selinux static tftp lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=acct-group/dnsmasq acct-user/dnsmasq dbus? ( sys-apps/dbus:= ) idn? ( !libidn2? ( net-dns/libidn:0= ) libidn2? ( >=net-dns/libidn2-2.0:= ) ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) ) conntrack? ( net-libs/libnetfilter_conntrack:= ) nls? ( sys-devel/gettext ) dnssec? ( !static? ( >=dev-libs/nettle-3.4:=[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq )
 REQUIRED_USE=dhcp-tools? ( dhcp ) dnssec? ( !nettlehash ) lua? ( script ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) libidn2? ( idn )
 SLOT=0
 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.86.tar.xz
 _eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=75a5ff8ae7c9f9099ca177c232ef96cd
+_md5_=5f63d2b3eee52c7c201644788a6ffa7f
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 6d3bd4de605b..d9c47c1f8cc6 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/discord-bin-0.0.18 b/metadata/md5-cache/net-im/discord-bin-0.0.19
similarity index 96%
rename from metadata/md5-cache/net-im/discord-bin-0.0.18
rename to metadata/md5-cache/net-im/discord-bin-0.0.19
index 626677bb915f..9c5ff9b08929 100644
--- a/metadata/md5-cache/net-im/discord-bin-0.0.18
+++ b/metadata/md5-cache/net-im/discord-bin-0.0.19
@@ -9,6 +9,6 @@ LICENSE=all-rights-reserved
 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 media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango
 RESTRICT=bindist mirror strip test
 SLOT=0
-SRC_URI=https://dl.discordapp.net/apps/linux/0.0.18/discord-0.0.18.tar.gz
+SRC_URI=https://dl.discordapp.net/apps/linux/0.0.19/discord-0.0.19.tar.gz
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	529bb8cd5756c8476d37ba89dd41e635	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e1931bfa6b64e0769331fc851ea4f78c
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-5.51.0 b/metadata/md5-cache/net-im/signal-desktop-bin-5.54.0
similarity index 96%
rename from metadata/md5-cache/net-im/signal-desktop-bin-5.51.0
rename to metadata/md5-cache/net-im/signal-desktop-bin-5.54.0
index b98e2c7ede3f..e822add8e325 100644
--- a/metadata/md5-cache/net-im/signal-desktop-bin-5.51.0
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-5.54.0
@@ -9,6 +9,6 @@ LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZL
 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 media-libs/alsa-lib media-libs/mesa[X(+)] net-print/cups sys-apps/dbus[X] x11-libs/cairo x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango sound? ( || ( media-sound/pulseaudio media-sound/apulse ) )
 RESTRICT=splitdebug
 SLOT=0
-SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_5.51.0_amd64.deb
+SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_5.54.0_amd64.deb
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5692b7a96938c8917b278493cd7c031d
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 793d542e7329..c103b4480fd6 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/telepathy-qt-0.9.8-r1 b/metadata/md5-cache/net-libs/telepathy-qt-0.9.8-r1
index 5e6ecd03f51c..79748523e16f 100644
--- a/metadata/md5-cache/net-libs/telepathy-qt-0.9.8-r1
+++ b/metadata/md5-cache/net-libs/telepathy-qt-0.9.8-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-0.9.8.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=55356c2c4b0b5d9ffb2f79eb45c88c23
+_md5_=f3e376f5c216cbc83757e39a9a18821e
diff --git a/metadata/md5-cache/net-libs/telepathy-qt-9999 b/metadata/md5-cache/net-libs/telepathy-qt-9999
index 64a8ae6a5308..c61c6d9e0385 100644
--- a/metadata/md5-cache/net-libs/telepathy-qt-9999
+++ b/metadata/md5-cache/net-libs/telepathy-qt-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=test? ( farstream )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b353c963bb5486ba95ce372f7bce2dae
+_md5_=7c211520db6c1ce4583984d8c43c445e
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 74372977cb95..f5660fa00be4 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/chrony-4.3_pre1 b/metadata/md5-cache/net-misc/chrony-4.3_pre1
new file mode 100644
index 000000000000..ec9705c311eb
--- /dev/null
+++ b/metadata/md5-cache/net-misc/chrony-4.3_pre1
@@ -0,0 +1,15 @@
+BDEPEND=html? ( dev-ruby/asciidoctor ) nts? ( virtual/pkgconfig ) sechash? ( nettle? ( virtual/pkgconfig ) nss? ( virtual/pkgconfig ) ) verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare unpack
+DEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss:= ) nts? ( net-libs/gnutls:= ) pps? ( net-misc/pps-tools ) seccomp? ( sys-libs/libseccomp )
+DESCRIPTION=NTP client and server programs
+EAPI=8
+HOMEPAGE=https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git
+INHERIT=edo systemd tmpfiles toolchain-funcs verify-sig
+IUSE=+caps +cmdmon debug html ipv6 libedit libtomcrypt +nettle nss +ntp +nts +phc pps +refclock +rtc samba +seccomp +sechash selinux verify-sig
+LICENSE=GPL-2
+RDEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss:= ) nts? ( net-libs/gnutls:= ) pps? ( net-misc/pps-tools ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-chronyd ) virtual/tmpfiles
+REQUIRED_USE=sechash? ( || ( nettle nss libtomcrypt ) ) nettle? ( !nss ) nss? ( !nettle ) libtomcrypt? ( !nettle !nss ) !sechash? ( !nss ) !sechash? ( !nts? ( !nettle ) )
+SLOT=0
+SRC_URI=https://download.tuxfamily.org/chrony/chrony-4.3-pre1.tar.gz verify-sig? ( https://download.tuxfamily.org/chrony/chrony-4.3-pre1-tar-gz-asc.txt -> chrony-4.3-pre1.tar.gz.asc )
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=46d4682c30ff54cf19afb8a762c1f144
diff --git a/metadata/md5-cache/net-misc/chrony-9999 b/metadata/md5-cache/net-misc/chrony-9999
index 03e8abf4ded3..393515865a4b 100644
--- a/metadata/md5-cache/net-misc/chrony-9999
+++ b/metadata/md5-cache/net-misc/chrony-9999
@@ -2,14 +2,14 @@ BDEPEND=html? ( dev-ruby/asciidoctor ) nts? ( virtual/pkgconfig ) sechash? ( net
 DEFINED_PHASES=compile configure install postinst preinst prepare unpack
 DEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss:= ) nts? ( net-libs/gnutls:= ) pps? ( net-misc/pps-tools ) seccomp? ( sys-libs/libseccomp )
 DESCRIPTION=NTP client and server programs
-EAPI=7
+EAPI=8
 HOMEPAGE=https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git
-INHERIT=systemd tmpfiles toolchain-funcs git-r3
+INHERIT=edo systemd tmpfiles toolchain-funcs git-r3
 IUSE=+caps +cmdmon debug html ipv6 libedit libtomcrypt +nettle nss +ntp +nts +phc pps +refclock +rtc samba +seccomp +sechash selinux
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss:= ) nts? ( net-libs/gnutls:= ) pps? ( net-misc/pps-tools ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-chronyd ) virtual/tmpfiles
 REQUIRED_USE=sechash? ( || ( nettle nss libtomcrypt ) ) nettle? ( !nss ) nss? ( !nettle ) libtomcrypt? ( !nettle !nss ) !sechash? ( !nss ) !sechash? ( !nts? ( !nettle ) ) html
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6eaaa6021b46c035b7b845a3f74af29d
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=46d4682c30ff54cf19afb8a762c1f144
diff --git a/metadata/md5-cache/net-misc/ytfzf-2.4.0 b/metadata/md5-cache/net-misc/ytfzf-2.4.0
deleted file mode 100644
index 55bd331d9235..000000000000
--- a/metadata/md5-cache/net-misc/ytfzf-2.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=Posix script to find and watch youtube videos from the terminal
-EAPI=8
-HOMEPAGE=https://github.com/pystardust/ytfzf/
-INHERIT=optfeature
-IUSE=X minimal
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-misc/jq net-misc/curl[ssl] virtual/awk !minimal? ( X? ( media-gfx/ueberzug ) app-shells/fzf media-video/mpv[lua] net-misc/yt-dlp )
-SLOT=0
-SRC_URI=https://github.com/pystardust/ytfzf/archive/refs/tags/v2.4.0.tar.gz -> ytfzf-2.4.0.tar.gz
-_eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac
-_md5_=fd4ef918b4c9be402206cf9906240ef1
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 48c46a8d145f..ffd5718201ac 100644
Binary files a/metadata/md5-cache/net-vpn/Manifest.gz and b/metadata/md5-cache/net-vpn/Manifest.gz differ
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.9.7 b/metadata/md5-cache/net-vpn/strongswan-5.9.7
new file mode 100644
index 000000000000..1d75ed5c0a4c
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/strongswan-5.9.7
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst setup
+DEPEND=non-root? ( acct-user/ipsec acct-group/ipsec ) dev-libs/glib:2 gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:= ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap:= ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1:3 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns:= ) virtual/linux-sources sys-kernel/linux-headers
+DESCRIPTION=IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE
+EAPI=8
+HOMEPAGE=https://www.strongswan.org/
+INHERIT=linux-info systemd
+IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11 +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_kdf strongswan_plugins_addrblock strongswan_plugins_aesni strongswan_plugins_blowfish strongswan_plugins_bypass-lan strongswan_plugins_ccm strongswan_plugins_chapoly strongswan_plugins_ctr strongswan_plugins_error-notify strongswan_plugins_forecast strongswan_plugins_gcm strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_newhope strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_save-keys strongswan_plugins_unbound strongswan_plugins_whitelist strongswan_plugins_xauth-noauth
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 RSA DES
+RDEPEND=non-root? ( acct-user/ipsec acct-group/ipsec ) dev-libs/glib:2 gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:= ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap:= ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1:3 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns:= ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
+SLOT=0
+SRC_URI=https://download.strongswan.org/strongswan-5.9.7.tar.bz2
+_eclasses_=linux-info	529bb8cd5756c8476d37ba89dd41e635	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8ae0bedfc1f99f534816b4374c47aa3a
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 8480cba0d44c..374d31f64202 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/crackle-0.1-r1 b/metadata/md5-cache/net-wireless/crackle-0.1-r1
index 769439e3971e..30de5ca79277 100644
--- a/metadata/md5-cache/net-wireless/crackle-0.1-r1
+++ b/metadata/md5-cache/net-wireless/crackle-0.1-r1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://lacklustre.net/projects/crackle/crackle-0.1.tgz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=397c0cf83e23343e6dfec0e3cb297003
+_md5_=0ee88174b798d26f2685549ffb496024
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index bc814667eb80..0797dc242031 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/libsc-2.3.1-r1 b/metadata/md5-cache/sci-libs/libsc-2.3.1-r1
index 040c9336cab7..33e250711a72 100644
--- a/metadata/md5-cache/sci-libs/libsc-2.3.1-r1
+++ b/metadata/md5-cache/sci-libs/libsc-2.3.1-r1
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) romio? ( m
 SLOT=0
 SRC_URI=https://github.com/cburstedde/libsc/archive/v2.3.1.tar.gz -> libsc-2.3.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c5c1c2b2ad99162b7a5c64d3a1f75d1f
+_md5_=5a718cbc1df1b20f995f3572d6ac0052
diff --git a/metadata/md5-cache/sci-libs/libsc-2.3.3 b/metadata/md5-cache/sci-libs/libsc-2.3.3
index b471d948021d..af4caa7cefdb 100644
--- a/metadata/md5-cache/sci-libs/libsc-2.3.3
+++ b/metadata/md5-cache/sci-libs/libsc-2.3.3
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) romio? ( m
 SLOT=0
 SRC_URI=https://github.com/cburstedde/libsc/archive/v2.3.3.tar.gz -> libsc-2.3.3.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c5c1c2b2ad99162b7a5c64d3a1f75d1f
+_md5_=5a718cbc1df1b20f995f3572d6ac0052
diff --git a/metadata/md5-cache/sci-libs/p4est-2.3.1-r1 b/metadata/md5-cache/sci-libs/p4est-2.3.1-r1
index 91b7e3bcfc0c..417ab8665bc1 100644
--- a/metadata/md5-cache/sci-libs/p4est-2.3.1-r1
+++ b/metadata/md5-cache/sci-libs/p4est-2.3.1-r1
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) romio? ( m
 SLOT=0
 SRC_URI=https://github.com/cburstedde/p4est/archive/v2.3.1.tar.gz -> p4est-2.3.1.tar.gz https://github.com/cburstedde/libsc/archive/v2.3.1.tar.gz -> libsc-2.3.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ccfdd8ee820e82d398480c8a9d2a39e3
+_md5_=83d7d4fb90e19c8e6bba6e0628e18e3f
diff --git a/metadata/md5-cache/sci-libs/p4est-2.3.3 b/metadata/md5-cache/sci-libs/p4est-2.3.3
index b8bdd23c2645..859302cfbb01 100644
--- a/metadata/md5-cache/sci-libs/p4est-2.3.3
+++ b/metadata/md5-cache/sci-libs/p4est-2.3.3
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) romio? ( m
 SLOT=0
 SRC_URI=https://github.com/cburstedde/p4est/archive/v2.3.3.tar.gz -> p4est-2.3.3.tar.gz https://github.com/cburstedde/libsc/archive/v2.3.3.tar.gz -> libsc-2.3.3.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ccfdd8ee820e82d398480c8a9d2a39e3
+_md5_=83d7d4fb90e19c8e6bba6e0628e18e3f
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 3636f684c80e..aa1931aef4f9 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/nauty-2.7.4 b/metadata/md5-cache/sci-mathematics/nauty-2.7.4
new file mode 100644
index 000000000000..5ea6b7471c58
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/nauty-2.7.4
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/help2man sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/gmp:0 sys-libs/zlib sci-mathematics/cliquer
+DESCRIPTION=Computing automorphism groups of graphs and digraphs
+EAPI=8
+HOMEPAGE=https://pallini.di.uniroma1.it/
+INHERIT=autotools
+IUSE=examples
+KEYWORDS=~amd64 ~arm ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/gmp:0 sys-libs/zlib sci-mathematics/cliquer
+SLOT=0
+SRC_URI=https://pallini.di.uniroma1.it/nauty27r4.tar.gz mirror://debian/pool/main/n/nauty/nauty_2.7r4+ds-1.debian.tar.xz https://src.fedoraproject.org/rpms/nauty/raw/f35/f/nauty-includes.patch
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=608800b3e657aacc49b30b18e9380d83
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.13.4-r1 b/metadata/md5-cache/sci-mathematics/pari-2.13.4-r1
index 7954e2d5e23a..a255947d60f7 100644
--- a/metadata/md5-cache/sci-mathematics/pari-2.13.4-r1
+++ b/metadata/md5-cache/sci-mathematics/pari-2.13.4-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://pari.math.u-bordeaux.fr/
 INHERIT=flag-o-matic toolchain-funcs
 IUSE=data doc fltk gmp test threads X
-KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:0= data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1= ) gmp? ( dev-libs/gmp:0= ) X? ( x11-libs/libX11:0= )
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.13.4.tar.gz
 _eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=eb9f02afb301d05ef3f1f02d705180db
+_md5_=6cfe571c4f21e50a9a1229c16382f929
diff --git a/metadata/md5-cache/sci-mathematics/planarity-3.0.1.1 b/metadata/md5-cache/sci-mathematics/planarity-3.0.1.1
deleted file mode 100644
index 524db578c6a6..000000000000
--- a/metadata/md5-cache/sci-mathematics/planarity-3.0.1.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=The edge addition planarity suite of graph algorithms
-EAPI=8
-HOMEPAGE=https://github.com/graph-algorithms/edge-addition-planarity-suite/
-KEYWORDS=amd64 x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/graph-algorithms/edge-addition-planarity-suite/releases/download/Version_3.0.1.1/planarity-3.0.1.1.tar.gz
-_md5_=08f1fbfdbe3ec615d1acdf8e1c2a7de2
diff --git a/metadata/md5-cache/sci-mathematics/planarity-3.0.2.0 b/metadata/md5-cache/sci-mathematics/planarity-3.0.2.0
index c84d01c30770..ae3601094686 100644
--- a/metadata/md5-cache/sci-mathematics/planarity-3.0.2.0
+++ b/metadata/md5-cache/sci-mathematics/planarity-3.0.2.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=The edge addition planarity suite of graph algorithms
 EAPI=8
 HOMEPAGE=https://github.com/graph-algorithms/edge-addition-planarity-suite/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/graph-algorithms/edge-addition-planarity-suite/releases/download/Version_3.0.2.0/planarity-3.0.2.0.tar.gz
-_md5_=166c8fd57607d5e2197852e217b57311
+_md5_=5dda67a31b3dab9566359c5699901bfa
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index bf7ae0b9bcb3..b639b5c435a5 100644
Binary files a/metadata/md5-cache/sec-keys/Manifest.gz and b/metadata/md5-cache/sec-keys/Manifest.gz differ
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-voikko-20201013 b/metadata/md5-cache/sec-keys/openpgp-keys-voikko-20201013
index 1d8080d93778..b2a1bdd87f39 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-voikko-20201013
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-voikko-20201013
@@ -6,4 +6,4 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://keys.gnupg.net/pks/lookup?op=get&search=0x3D309B604AE3942E -> 4AE3942E.asc.html
-_md5_=01a4fb938c429e037ba432ada847baa8
+_md5_=cfe8d46b152079318014e2abc791976e
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 090cb8b397ea..6b70a2ccbf95 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/accountsservice-22.08.8 b/metadata/md5-cache/sys-apps/accountsservice-22.08.8
index c2beb2a5abf8..a48d77c4f0f5 100644
--- a/metadata/md5-cache/sys-apps/accountsservice-22.08.8
+++ b/metadata/md5-cache/sys-apps/accountsservice-22.08.8
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/accountsservice/accountsservice-22.08.8.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d40e7ee377e7199ea03a43dd49a5276c
+_md5_=f7e97c7b601ce202b3947384a143dffa
diff --git a/metadata/md5-cache/sys-apps/iproute2-5.19.0 b/metadata/md5-cache/sys-apps/iproute2-5.19.0
index ad29c3705374..93f3548bd1c6 100644
--- a/metadata/md5-cache/sys-apps/iproute2-5.19.0
+++ b/metadata/md5-cache/sys-apps/iproute2-5.19.0
@@ -12,4 +12,4 @@ RDEPEND=!net-misc/arpd !minimal? ( net-libs/libmnl:= ) atm? ( net-dialup/linux-a
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-5.19.0.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=cdc4f59a084987e2501d7e771d3090f5
+_md5_=1fa2cc910dbcbb1e05506711bd645ab2
diff --git a/metadata/md5-cache/sys-apps/nvme-cli-2.0 b/metadata/md5-cache/sys-apps/nvme-cli-2.0
index 4e3e383e8394..6b528d2d644a 100644
--- a/metadata/md5-cache/sys-apps/nvme-cli-2.0
+++ b/metadata/md5-cache/sys-apps/nvme-cli-2.0
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linux-nvme/nvme-cli/archive/v2.0.tar.gz -> nvme-cli-2.0.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=d134d448f545a0f7fa941106e5b545c4
+_md5_=2938dac726303b4bf7040097015b678e
diff --git a/metadata/md5-cache/sys-apps/nvme-cli-2.0-r1 b/metadata/md5-cache/sys-apps/nvme-cli-2.0-r1
index 5413cf285057..87a13099c44a 100644
--- a/metadata/md5-cache/sys-apps/nvme-cli-2.0-r1
+++ b/metadata/md5-cache/sys-apps/nvme-cli-2.0-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linux-nvme/nvme-cli/archive/v2.0.tar.gz -> nvme-cli-2.0.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=d889784d201ecb9aa73b21a64988f739
+_md5_=6795e2f20f312dd9d34368038657a211
diff --git a/metadata/md5-cache/sys-apps/nvme-cli-2.1.1 b/metadata/md5-cache/sys-apps/nvme-cli-2.1.1
index 4103aa42b2b0..3765dbdb744b 100644
--- a/metadata/md5-cache/sys-apps/nvme-cli-2.1.1
+++ b/metadata/md5-cache/sys-apps/nvme-cli-2.1.1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linux-nvme/nvme-cli/archive/v2.1.1.tar.gz -> nvme-cli-2.1.1.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=499ee5398b0d892e5f67160510d79002
+_md5_=d46efe0c6b7261490f613a11d08a9f10
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index fde3cbd19d4e..bef15a6dedd2 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-auth/libfprint-1.0 b/metadata/md5-cache/sys-auth/libfprint-1.0
index 3734cdb62b88..6eef4452d345 100644
--- a/metadata/md5-cache/sys-auth/libfprint-1.0
+++ b/metadata/md5-cache/sys-auth/libfprint-1.0
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/glib:2 dev-libs/nss virtual/libusb:1= x11-libs/gtk+:3 x11-libs/
 SLOT=0
 SRC_URI=https://github.com/freedesktop/libfprint/archive/V_1_0.tar.gz -> libfprint-1.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=68f129cf83f3a79be41d4892c640fdac
+_md5_=1b0a7b31d613d15a133222a00c7411b7
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index be99091264a7..a431d5cc3055 100644
Binary files a/metadata/md5-cache/sys-block/Manifest.gz and b/metadata/md5-cache/sys-block/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-block/flashbench-20120606 b/metadata/md5-cache/sys-block/flashbench-20120606
index 406ee4cedcae..8307634f314d 100644
--- a/metadata/md5-cache/sys-block/flashbench-20120606
+++ b/metadata/md5-cache/sys-block/flashbench-20120606
@@ -6,4 +6,4 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bircoph/distfiles/flashbench-20120606.tar.xz
-_md5_=2e2ffc902f73ca0a7dce4d3e9683db10
+_md5_=e4d17e432c5f583adbc55dd24c41b4ab
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index c672435f58b4..04d9f229a08e 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/milo-2.4.18 b/metadata/md5-cache/sys-boot/milo-2.4.18
index bdf9a5af916c..0950577f48bf 100644
--- a/metadata/md5-cache/sys-boot/milo-2.4.18
+++ b/metadata/md5-cache/sys-boot/milo-2.4.18
@@ -10,4 +10,4 @@ RDEPEND=sys-fs/mtools
 SLOT=0
 SRC_URI=http://www.suse.de/~stepan/source/milo-2.2-18.tar.bz2 https://www.kernel.org/pub/linux/kernel/v2.2/linux-2.2.25.tar.bz2 https://dev.gentoo.org/~taviso/milo/ldmilo-patched-20010430 http://ftp.namesys.com/pub/reiserfs-for-2.2/linux-2.2.20-reiserfs-3.5.35.diff.bz2 https://dev.gentoo.org/~taviso/milo/linload.exe http://www.ibiblio.org/pub/Linux/docs/HOWTO/MILO-HOWTO
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=26be7df6be95bbbbd0b6a23d2521ace0
+_md5_=bf6be5fdfdcc00c85d1d39c76347f084
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 4928a8b2cdab..f9acac88a08f 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/c3-4.0.1 b/metadata/md5-cache/sys-cluster/c3-4.0.1
index 56cfaf0feb5b..f162d2abc826 100644
--- a/metadata/md5-cache/sys-cluster/c3-4.0.1
+++ b/metadata/md5-cache/sys-cluster/c3-4.0.1
@@ -6,4 +6,4 @@ KEYWORDS=~amd64 ~x86
 LICENSE=C3
 SLOT=0
 SRC_URI=https://www.csm.ornl.gov/torc/C3/Software/4.0.1/c3-4.0.1.tar.gz
-_md5_=81e95507dbf4de06766163f50834f0cc
+_md5_=1a1af36f889465a12d4a1e6f508f4e0c
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.16 b/metadata/md5-cache/sys-cluster/ceph-15.2.16
deleted file mode 100644
index 2e30a666492e..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-15.2.16
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sphinx dev-util/cunit dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/grep sys-apps/sed sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig test? ( dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make >=dev-util/cmake-3.20.5 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= dev-libs/libnl:3= dev-libs/libxml2:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) ssl? ( dev-libs/openssl:= ) system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) !system-boost? ( <sys-libs/glibc-2.34 ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= )
-DESCRIPTION=Ceph distributed filesystem
-EAPI=8
-HOMEPAGE=https://ceph.com/
-INHERIT=check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles multiprocessing
-IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl +ssl spdk +system-boost systemd +tcmalloc test uring xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_8 python_targets_python3_9
-LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= dev-libs/libnl:3= dev-libs/libxml2:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) ssl? ( dev-libs/openssl:= ) system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) !system-boost? ( <sys-libs/glibc-2.34 ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) virtual/tmpfiles
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) ?? ( jemalloc tcmalloc ) diskprediction? ( mgr !python_targets_python3_8 ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
-RESTRICT=test? ( userpriv ) test
-SLOT=0
-SRC_URI=https://download.ceph.com/tarballs/ceph-15.2.16.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ed5895754f44015054085c0eec50f083
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.17 b/metadata/md5-cache/sys-cluster/ceph-15.2.17
new file mode 100644
index 000000000000..981991f9e7e1
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ceph-15.2.17
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sphinx dev-util/cunit dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/grep sys-apps/sed sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig test? ( dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make >=dev-util/cmake-3.20.5 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) ssl? ( dev-libs/openssl:= ) system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) !system-boost? ( <sys-libs/glibc-2.34 ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= )
+DESCRIPTION=Ceph distributed filesystem
+EAPI=8
+HOMEPAGE=https://ceph.com/
+INHERIT=check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles multiprocessing
+IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl +ssl spdk +system-boost systemd +tcmalloc test uring xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_8 python_targets_python3_9
+LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
+RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) ssl? ( dev-libs/openssl:= ) system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) !system-boost? ( <sys-libs/glibc-2.34 ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) virtual/tmpfiles
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) ?? ( jemalloc tcmalloc ) diskprediction? ( mgr !python_targets_python3_8 ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
+RESTRICT=test? ( userpriv ) test
+SLOT=0
+SRC_URI=https://download.ceph.com/tarballs/ceph-15.2.17.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=377a057aa5eb17d7cced7bc39c144b1d
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.22.12 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.22.12
index 874f8baa17ae..23e94ae33d09 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.22.12
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.22.12
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module systemd
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.12.tar.gz -> kubernetes-1.22.12.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=89fa9836c3db65885a60d2efda5c3d67
+_md5_=efa92a8c33be0c5caf8269377be3467f
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.22.8 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.22.8
deleted file mode 100644
index c2655d6bdebd..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.22.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-DESCRIPTION=Kubernetes API server
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module systemd
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.8.tar.gz -> kubernetes-1.22.8.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=efa92a8c33be0c5caf8269377be3467f
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.5 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.5
deleted file mode 100644
index e99441266f38..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.17 >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-DESCRIPTION=Kubernetes API server
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module systemd
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.5.tar.gz -> kubernetes-1.23.5.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0e2bb4b645b1ad8006c74b2e4046b775
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.9 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.9
index bf17e5548166..b260235baecc 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.9
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.9
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module systemd
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.9.tar.gz -> kubernetes-1.23.9.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=96f2f40b22c5538a7288b51733848246
+_md5_=0e2bb4b645b1ad8006c74b2e4046b775
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.0 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.0
deleted file mode 100644
index 80a605a2e729..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-DESCRIPTION=Kubernetes API server
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module systemd
-IUSE=hardened
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.0.tar.gz -> kubernetes-1.24.0.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=893bcdb912eb65b8fe820892509f6287
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.3 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.3
index 541ee5b482d7..062cd3cb625f 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.3
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module systemd
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.3.tar.gz -> kubernetes-1.24.3.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=893bcdb912eb65b8fe820892509f6287
+_md5_=0ecbfd978938bb1ff79da475abd4b596
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.12 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.12
index fd2e5dda8896..43d3b258ec61 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.12
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.12
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.12.tar.gz -> kubernetes-1.22.12.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=b2de9b053f81cbd49c92269a10084a0e
+_md5_=fdcff15001a376fd7f003c8110dd8ee5
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.8 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.8
deleted file mode 100644
index 435b031ba8bf..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.8.tar.gz -> kubernetes-1.22.8.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=fdcff15001a376fd7f003c8110dd8ee5
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.5 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.5
deleted file mode 100644
index e8dd82cbc08b..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.17 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.5.tar.gz -> kubernetes-1.23.5.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=589d1d8ccc235a4ebf4c58f085a6d34c
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.9 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.9
index 175b98a16db0..20e0d5be4f89 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.9
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.9
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.9.tar.gz -> kubernetes-1.23.9.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=7c5d50a549ed10a54110d5aae5a0f94b
+_md5_=589d1d8ccc235a4ebf4c58f085a6d34c
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.0 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.0
deleted file mode 100644
index b938cab2946c..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.0.tar.gz -> kubernetes-1.24.0.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=d2956d962cf75e7f87969dacc801597f
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.3 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.3
index fbb8ab629bc6..be4452ae09f0 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.3
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.3.tar.gz -> kubernetes-1.24.3.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=d2956d962cf75e7f87969dacc801597f
+_md5_=5d3baf739f712a82d222abe23a4914ef
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.22.12 b/metadata/md5-cache/sys-cluster/kube-proxy-1.22.12
index 0d2bd54557ac..97e6b62e7627 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.22.12
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.22.12
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.12.tar.gz -> kubernetes-1.22.12.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=e26b6327c24c068cc57a04cc4194325d
+_md5_=b45d3c32b1225fc90fc061ae95d81c3b
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.22.8 b/metadata/md5-cache/sys-cluster/kube-proxy-1.22.8
deleted file mode 100644
index 9bbb27ca0daa..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.22.8
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Proxy service
-EAPI=7
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.8.tar.gz -> kubernetes-1.22.8.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=b45d3c32b1225fc90fc061ae95d81c3b
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.23.5 b/metadata/md5-cache/sys-cluster/kube-proxy-1.23.5
deleted file mode 100644
index d6570a5bcf75..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.23.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.17 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Proxy service
-EAPI=7
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.5.tar.gz -> kubernetes-1.23.5.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=c17434a82e6c2af19743bdb7c0821799
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.23.9 b/metadata/md5-cache/sys-cluster/kube-proxy-1.23.9
index 744cb37ab984..1324f9258ea6 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.23.9
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.23.9
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=net-firewall/conntrack-tools
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.9.tar.gz -> kubernetes-1.23.9.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=4ceab05f6dafa180eb2d3d9821f660e8
+_md5_=c17434a82e6c2af19743bdb7c0821799
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.24.0 b/metadata/md5-cache/sys-cluster/kube-proxy-1.24.0
deleted file mode 100644
index 4ecd8f1b38ad..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.24.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Proxy service
-EAPI=7
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.0.tar.gz -> kubernetes-1.24.0.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=d6cc245cbbbaeefb53b1de213061689e
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.24.3 b/metadata/md5-cache/sys-cluster/kube-proxy-1.24.3
index 92c8bd59fea9..b6a23a6de320 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.24.3
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.24.3
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=net-firewall/conntrack-tools
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.3.tar.gz -> kubernetes-1.24.3.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=d6cc245cbbbaeefb53b1de213061689e
+_md5_=bd9f144a2699058397862de61a2e6847
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.22.12 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.22.12
index ab95b6c6be04..a3999c3c26eb 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.22.12
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.22.12
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.12.tar.gz -> kubernetes-1.22.12.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=1f4a53ca7f0fee1dda2eedadbb74eb9f
+_md5_=3a5a8ff3c2f5e93698031db0375e6054
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.22.8 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.22.8
deleted file mode 100644
index 4e38d793d2c3..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.22.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-DESCRIPTION=Kubernetes Scheduler
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.8.tar.gz -> kubernetes-1.22.8.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=3a5a8ff3c2f5e93698031db0375e6054
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.5 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.5
deleted file mode 100644
index e55d47d77eb4..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.17 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-DESCRIPTION=Kubernetes Scheduler
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.5.tar.gz -> kubernetes-1.23.5.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=893906f2c9933daf3a11474a43d60503
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.9 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.9
index 587765df61a3..40436591956f 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.9
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.9
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.9.tar.gz -> kubernetes-1.23.9.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=e8827078bfa0531fac0ba86c94a8fc02
+_md5_=893906f2c9933daf3a11474a43d60503
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.0 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.0
deleted file mode 100644
index bfbc21c0bb99..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-DESCRIPTION=Kubernetes Scheduler
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.0.tar.gz -> kubernetes-1.24.0.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=82db5e596b7bc69f33565bf7aa29c22d
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.3 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.3
index 5d764e1dd751..a73efd4db5a5 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.3
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.3.tar.gz -> kubernetes-1.24.3.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=82db5e596b7bc69f33565bf7aa29c22d
+_md5_=285d3b044dc198f1e84a6f95f328c563
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.22.12 b/metadata/md5-cache/sys-cluster/kubeadm-1.22.12
index 59f6f53c3a08..1c180119cad1 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.22.12
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.22.12
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=!sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.12.tar.gz -> kubernetes-1.22.12.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=61607ca439c903a945818ba8317c2704
+_md5_=93e61ca419b38ee24a0f9f0d93bab666
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.22.8 b/metadata/md5-cache/sys-cluster/kubeadm-1.22.8
deleted file mode 100644
index c616d2895b3b..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.22.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=!sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.8.tar.gz -> kubernetes-1.22.8.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=93e61ca419b38ee24a0f9f0d93bab666
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.23.5 b/metadata/md5-cache/sys-cluster/kubeadm-1.23.5
deleted file mode 100644
index 6ba5f31545be..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.23.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.17 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.5.tar.gz -> kubernetes-1.23.5.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=96ccbcc518727dbf6a5fd42cc4278386
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.23.9 b/metadata/md5-cache/sys-cluster/kubeadm-1.23.9
index 1459d12e3261..dfea34b95e0a 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.23.9
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.23.9
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.9.tar.gz -> kubernetes-1.23.9.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=de36be3af9385a90061f2a1a8c15e201
+_md5_=96ccbcc518727dbf6a5fd42cc4278386
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.24.0 b/metadata/md5-cache/sys-cluster/kubeadm-1.24.0
deleted file mode 100644
index f144004b8a5a..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.24.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.0.tar.gz -> kubernetes-1.24.0.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7818fe291a2a9583eba583dd06c81d4a
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.24.3 b/metadata/md5-cache/sys-cluster/kubeadm-1.24.3
index af786f6da070..82e3ecf25364 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.24.3
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.24.3
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.3.tar.gz -> kubernetes-1.24.3.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7818fe291a2a9583eba583dd06c81d4a
+_md5_=8c8760eff4c0e49d2ff34a43cd946a41
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.22.12 b/metadata/md5-cache/sys-cluster/kubectl-1.22.12
index 9d3ccc8ff8d7..06e9d5009007 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.22.12
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.22.12
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.12.tar.gz -> kubernetes-1.22.12.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5f594a399c4ae6a9e86ab239101ab9c9
+_md5_=eb7d3b86fc42ed8ab9a6f3a04c083866
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.22.8 b/metadata/md5-cache/sys-cluster/kubectl-1.22.8
deleted file mode 100644
index 2ca1cb6d3d21..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.22.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=!sys-cluster/kubernetes
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.8.tar.gz -> kubernetes-1.22.8.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=eb7d3b86fc42ed8ab9a6f3a04c083866
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.23.5 b/metadata/md5-cache/sys-cluster/kubectl-1.23.5
deleted file mode 100644
index 44e51e3c95ce..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.23.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.17 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.5.tar.gz -> kubernetes-1.23.5.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a23e8aae87642a507f622651a93f63ea
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.23.9 b/metadata/md5-cache/sys-cluster/kubectl-1.23.9
index 923a15516736..04ed2c2671c8 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.23.9
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.23.9
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.9.tar.gz -> kubernetes-1.23.9.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=88c58e69ec38a9111b1b4fbad171d56c
+_md5_=a23e8aae87642a507f622651a93f63ea
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.24.0 b/metadata/md5-cache/sys-cluster/kubectl-1.24.0
deleted file mode 100644
index 7b05a91cf806..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.24.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.0.tar.gz -> kubernetes-1.24.0.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=93c8067665939eba64dcb34235370972
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.24.3 b/metadata/md5-cache/sys-cluster/kubectl-1.24.3
index ad23ddbcad78..bfe699a172ae 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.24.3
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.24.3
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.3.tar.gz -> kubernetes-1.24.3.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=93c8067665939eba64dcb34235370972
+_md5_=4826db9b81b2cacf7c1b73ddc0599718
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.22.12 b/metadata/md5-cache/sys-cluster/kubelet-1.22.12
index 6e633be2a53d..1b6b48a1c48b 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.22.12
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.22.12
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module systemd
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=!sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.12.tar.gz -> kubernetes-1.22.12.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3ff3b4106bb9c945d2764d28836e9599
+_md5_=11d1b76e603f4d4b11405abb6858f628
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.22.8 b/metadata/md5-cache/sys-cluster/kubelet-1.22.8
deleted file mode 100644
index 56d6b87cb5a0..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.22.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Node Agent
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module systemd
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=!sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.8.tar.gz -> kubernetes-1.22.8.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=11d1b76e603f4d4b11405abb6858f628
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.23.5 b/metadata/md5-cache/sys-cluster/kubelet-1.23.5
deleted file mode 100644
index b559ac2bdf75..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.23.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.17 >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Node Agent
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module systemd
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.5.tar.gz -> kubernetes-1.23.5.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1914a810ccc022d2444725d30df263c1
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.23.9 b/metadata/md5-cache/sys-cluster/kubelet-1.23.9
index 0f165add6376..7d666044d171 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.23.9
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.23.9
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module systemd
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.9.tar.gz -> kubernetes-1.23.9.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3690c5e2bd5039cdc7ab2505e5cc3495
+_md5_=1914a810ccc022d2444725d30df263c1
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.24.0 b/metadata/md5-cache/sys-cluster/kubelet-1.24.0
deleted file mode 100644
index 9d819caf9102..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.24.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Node Agent
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module systemd
-IUSE=hardened
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.0.tar.gz -> kubernetes-1.24.0.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=aff9f5cfa6fc6bc66372379a4f5f8f66
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.24.3 b/metadata/md5-cache/sys-cluster/kubelet-1.24.3
index 2fd5d1c0b17a..ad036caba71a 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.24.3
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.24.3
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module systemd
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.3.tar.gz -> kubernetes-1.24.3.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=aff9f5cfa6fc6bc66372379a4f5f8f66
+_md5_=3f011fe78ea4d4708099f43dd1ca0b58
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-41.0 b/metadata/md5-cache/sys-cluster/rdma-core-41.0
index 0592e23edfaa..f8dd8bbbc631 100644
--- a/metadata/md5-cache/sys-cluster/rdma-core-41.0
+++ b/metadata/md5-cache/sys-cluster/rdma-core-41.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/linux-rdma/rdma-core
 INHERIT=cmake python-single-r1 udev systemd
 IUSE=neigh python static-libs systemd valgrind python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )
 RDEPEND=dev-lang/perl virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) !sys-fabric/infiniband-diags !sys-fabric/libibverbs !sys-fabric/librdmacm !sys-fabric/libibumad !sys-fabric/ibacm !sys-fabric/libibmad !sys-fabric/srptools !sys-fabric/infinipath-psm !sys-fabric/libcxgb3 !sys-fabric/libcxgb4 !sys-fabric/libmthca !sys-fabric/libmlx4 !sys-fabric/libmlx5 !sys-fabric/libocrdma !sys-fabric/libnes
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 SRC_URI=https://github.com/linux-rdma/rdma-core/archive/v41.0.tar.gz -> rdma-core-41.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fafe230bc475edcb3985c8c6b0a7a4ae
+_md5_=4e0f24f9052a0b04e5101f156044a6e2
diff --git a/metadata/md5-cache/sys-cluster/sanlock-3.8.2 b/metadata/md5-cache/sys-cluster/sanlock-3.8.2
index 321c0baf6409..47fb544a2e07 100644
--- a/metadata/md5-cache/sys-cluster/sanlock-3.8.2
+++ b/metadata/md5-cache/sys-cluster/sanlock-3.8.2
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://releases.pagure.org/sanlock/sanlock-3.8.2.tar.gz
 _eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	eqawarn	c9847c43b3253a276ae2eabddedab3d7	linux-info	529bb8cd5756c8476d37ba89dd41e635	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e68ba5e459950de1530e1053738e15c3
+_md5_=efc620333ecdcdff11e5a82f614956c7
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 7fcfabd5b2ba..04107bce8830 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/binutils-2.38-r2 b/metadata/md5-cache/sys-devel/binutils-2.38-r2
index 3fb0459c6ce8..3d64c7ee0c10 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.38-r2
+++ b/metadata/md5-cache/sys-devel/binutils-2.38-r2
@@ -1,17 +1,17 @@
 BDEPEND=doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu sys-devel/bc ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170815 sys-devel/gnuconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
+DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* )
 DESCRIPTION=Tools necessary to build programs
 EAPI=7
 HOMEPAGE=https://sourceware.org/binutils/
-INHERIT=libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
-IUSE=cet default-gold doc +gold multitarget +nls pgo +plugins static-libs test vanilla
+INHERIT=elisp-common libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
+IUSE=cet default-gold doc emacs +gold multitarget +nls pgo +plugins static-libs test vanilla
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-3+
-RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
+RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* )
 REQUIRED_USE=default-gold? ( gold )
 RESTRICT=!test? ( test )
 SLOT=2.38
 SRC_URI=mirror://gnu/binutils/binutils-2.38.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.38.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.38-patches-4.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=06d016b2f7d4433ba41fcbf7f619eb34
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=b7ece98d4516a2ce1901bf4df42b49d0
diff --git a/metadata/md5-cache/sys-devel/binutils-2.39 b/metadata/md5-cache/sys-devel/binutils-2.39
index 9fbddb9614c5..65525b88cbc1 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.39
+++ b/metadata/md5-cache/sys-devel/binutils-2.39
@@ -1,17 +1,17 @@
 BDEPEND=doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu sys-devel/bc ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170815 sys-devel/gnuconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
+DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* )
 DESCRIPTION=Tools necessary to build programs
 EAPI=7
 HOMEPAGE=https://sourceware.org/binutils/
-INHERIT=libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
-IUSE=cet default-gold doc gold multitarget +nls pgo +plugins static-libs test vanilla
+INHERIT=elisp-common libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
+IUSE=cet default-gold doc emacs gold multitarget +nls pgo +plugins static-libs test vanilla
 KEYWORDS=~loong
 LICENSE=GPL-3+
-RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
+RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* )
 REQUIRED_USE=default-gold? ( gold )
 RESTRICT=!test? ( test )
 SLOT=2.39
 SRC_URI=mirror://gnu/binutils/binutils-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.39-patches-3.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=87499d00cfa4394d18b0d260662f0dd8
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=b3fcc1119034853f0bf847b5132ea239
diff --git a/metadata/md5-cache/sys-devel/binutils-9999 b/metadata/md5-cache/sys-devel/binutils-9999
index de407522b397..d47584361523 100644
--- a/metadata/md5-cache/sys-devel/binutils-9999
+++ b/metadata/md5-cache/sys-devel/binutils-9999
@@ -1,16 +1,16 @@
 BDEPEND=doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu sys-devel/bc ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170815 sys-devel/gnuconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
+DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* )
 DESCRIPTION=Tools necessary to build programs
 EAPI=7
 HOMEPAGE=https://sourceware.org/binutils/
-INHERIT=libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs git-r3
-IUSE=cet default-gold doc gold multitarget +nls pgo +plugins static-libs test vanilla
+INHERIT=elisp-common libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs git-r3
+IUSE=cet default-gold doc emacs +gold multitarget +nls pgo +plugins static-libs test vanilla
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
+RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* )
 REQUIRED_USE=default-gold? ( gold )
 RESTRICT=!test? ( test )
 SLOT=9999
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a2e8d3180c34b839d56fee7a2537b7cf
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=1dc055ebd61778b0a06b50220816a4ea
diff --git a/metadata/md5-cache/sys-devel/gdb-12.1-r2 b/metadata/md5-cache/sys-devel/gdb-12.1-r2
new file mode 100644
index 000000000000..7fcca8028190
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gdb-12.1-r2
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/xz-utils sys-apps/texinfo virtual/yacc nls? ( sys-devel/gettext ) source-highlight? ( virtual/pkgconfig ) test? ( dev-util/dejagnu )
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/mpfr:0= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash )
+DESCRIPTION=GNU debugger
+EAPI=8
+HOMEPAGE=https://sourceware.org/gdb/
+INHERIT=flag-o-matic python-single-r1 strip-linguas toolchain-funcs
+IUSE=cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3+ LGPL-2.1+
+RDEPEND=dev-libs/mpfr:0= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+RESTRICT=ia64? ( test ) !test? ( test ) test
+SLOT=0
+SRC_URI=mirror://gnu/gdb/gdb-12.1.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-12.1.tar.xz
+_eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=d263a883bfaea7a0538da4e3924d7c35
diff --git a/metadata/md5-cache/sys-devel/lld-13.0.1 b/metadata/md5-cache/sys-devel/lld-13.0.1
index 3b0964b9872c..8a117a7e75a7 100644
--- a/metadata/md5-cache/sys-devel/lld-13.0.1
+++ b/metadata/md5-cache/sys-devel/lld-13.0.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=058f6b5ac98542634b097690a2001a5b
+_md5_=9b73b33b70aeeb14f7d2312b161b3444
diff --git a/metadata/md5-cache/sys-devel/lld-14.0.6 b/metadata/md5-cache/sys-devel/lld-14.0.6
index 1b8133d5a8b6..b80e3a6f1963 100644
--- a/metadata/md5-cache/sys-devel/lld-14.0.6
+++ b/metadata/md5-cache/sys-devel/lld-14.0.6
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4b18e80a2088666e13006c7be577e348
+_md5_=46571645d6e537be1ad359c5eaf57aa4
diff --git a/metadata/md5-cache/sys-devel/lld-15.0.0.9999 b/metadata/md5-cache/sys-devel/lld-15.0.0.9999
index c66ec87d901c..ea57b557c12a 100644
--- a/metadata/md5-cache/sys-devel/lld-15.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-15.0.0.9999
@@ -12,4 +12,4 @@ RDEPEND=~sys-devel/llvm-15.0.0.9999
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=aed041cd3879f5ca6d0ae5336b050240
+_md5_=624c7b150157105ae79687f2269cb024
diff --git a/metadata/md5-cache/sys-devel/lld-15.0.0_rc2 b/metadata/md5-cache/sys-devel/lld-15.0.0_rc2
index 96b46e26e59f..819fe968242a 100644
--- a/metadata/md5-cache/sys-devel/lld-15.0.0_rc2
+++ b/metadata/md5-cache/sys-devel/lld-15.0.0_rc2
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.0-rc2/llvm-project-15.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.0-rc2/llvm-project-15.0.0rc2.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=aed041cd3879f5ca6d0ae5336b050240
+_md5_=624c7b150157105ae79687f2269cb024
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.0.9999 b/metadata/md5-cache/sys-devel/lld-16.0.0.9999
index 924dd586c114..972d8ce24a9f 100644
--- a/metadata/md5-cache/sys-devel/lld-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-16.0.0.9999
@@ -12,4 +12,4 @@ RDEPEND=~sys-devel/llvm-16.0.0.9999
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=aed041cd3879f5ca6d0ae5336b050240
+_md5_=624c7b150157105ae79687f2269cb024
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 1dab9ea41d61..46e9cfa3db31 100644
Binary files a/metadata/md5-cache/sys-firmware/Manifest.gz and b/metadata/md5-cache/sys-firmware/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20201112_p20201116-r1 b/metadata/md5-cache/sys-firmware/intel-microcode-20201112_p20201116-r1
deleted file mode 100644
index f1f5b83eedd2..000000000000
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20201112_p20201116-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-apps/iucode_tool-2.3
-DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
-DESCRIPTION=Intel IA32/IA64 microcode update data
-EAPI=7
-HOMEPAGE=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/
-INHERIT=linux-info toolchain-funcs mount-boot
-IUSE=hostonly initramfs +split-ucode vanilla
-KEYWORDS=-* amd64 x86
-LICENSE=intel-ucode
-RDEPEND=hostonly? ( sys-apps/iucode_tool )
-REQUIRED_USE=|| ( initramfs split-ucode )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20201112.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20201116.tar.xz
-_eclasses_=linux-info	529bb8cd5756c8476d37ba89dd41e635	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=df40198abb78fc67087a80c423e0217f
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210221 b/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210221
deleted file mode 100644
index 9f94ad6e763b..000000000000
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210221
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-apps/iucode_tool-2.3
-DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
-DESCRIPTION=Intel IA32/IA64 microcode update data
-EAPI=7
-HOMEPAGE=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/
-INHERIT=linux-info toolchain-funcs mount-boot
-IUSE=hostonly initramfs +split-ucode vanilla
-KEYWORDS=-* amd64 x86
-LICENSE=intel-ucode
-RDEPEND=hostonly? ( sys-apps/iucode_tool )
-REQUIRED_USE=|| ( initramfs split-ucode )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20210216.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20210221.tar.xz
-_eclasses_=linux-info	529bb8cd5756c8476d37ba89dd41e635	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=df40198abb78fc67087a80c423e0217f
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210514 b/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210514
deleted file mode 100644
index 341bcba94698..000000000000
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210514
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-apps/iucode_tool-2.3
-DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
-DESCRIPTION=Intel IA32/IA64 microcode update data
-EAPI=7
-HOMEPAGE=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/
-INHERIT=linux-info toolchain-funcs mount-boot
-IUSE=hostonly initramfs +split-ucode vanilla
-KEYWORDS=-* amd64 x86
-LICENSE=intel-ucode
-RDEPEND=hostonly? ( sys-apps/iucode_tool )
-REQUIRED_USE=|| ( initramfs split-ucode )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20210216.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20210514.tar.xz
-_eclasses_=linux-info	529bb8cd5756c8476d37ba89dd41e635	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=df40198abb78fc67087a80c423e0217f
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20210608_p20210608 b/metadata/md5-cache/sys-firmware/intel-microcode-20210608_p20210608
deleted file mode 100644
index 1a10746cee66..000000000000
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20210608_p20210608
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-apps/iucode_tool-2.3
-DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
-DESCRIPTION=Intel IA32/IA64 microcode update data
-EAPI=7
-HOMEPAGE=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/
-INHERIT=linux-info toolchain-funcs mount-boot
-IUSE=hostonly initramfs +split-ucode vanilla
-KEYWORDS=-* amd64 x86
-LICENSE=intel-ucode
-RDEPEND=hostonly? ( sys-apps/iucode_tool )
-REQUIRED_USE=|| ( initramfs split-ucode )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20210608.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20210608.tar.xz
-_eclasses_=linux-info	529bb8cd5756c8476d37ba89dd41e635	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=df40198abb78fc67087a80c423e0217f
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20220809_p20220809 b/metadata/md5-cache/sys-firmware/intel-microcode-20220809_p20220809
index 9bc8c0c1a900..e3140f7877ef 100644
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20220809_p20220809
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20220809_p20220809
@@ -13,4 +13,4 @@ RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20220809.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~mpagano/dist/intel-microcode/intel-microcode-collection-20220809.tar.xz
 _eclasses_=linux-info	529bb8cd5756c8476d37ba89dd41e635	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ac6aa9c16449b3171642aa62e2fa6461
+_md5_=c9ea4a8fd969e02e5855752756d09a0f
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 932558c7de5c..0a13857eb7b6 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.254 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.255
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.19.254
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.19.255
index 8853e33cbf28..49b94218bc53 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.254
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.255
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.19.254
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.254.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
+SLOT=4.19.255
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.255.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.135 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.136
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.10.135
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.10.136
index 1044bc3043ae..79e76d6e463f 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.135
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.136
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.10.135
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.135.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+SLOT=5.10.136
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.136.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.59 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.60
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.15.59
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.15.60
index 79fc1d545739..0819ccf53ec0 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.59
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.60
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.15.59
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.59.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
+SLOT=5.15.60
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.60.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.18.16 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.18.17
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.18.16
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.18.17
index ae0f445fb1a8..d7f41bfd282f 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.18.16
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.18.17
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.18.16
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.18.16.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz
+SLOT=5.18.17
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.18.17.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.19.0 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.19.1
similarity index 83%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.19.0
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.19.1
index a6608548969e..b71ef947f48e 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.19.0
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.19.1
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.19.0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.19.tar.xz
+SLOT=5.19.1
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.19.1.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.19.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.209 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.210
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.4.209
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.4.210
index 382bb5f9a926..73bdb7dca8bb 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.209
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.210
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.4.209
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.209.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+SLOT=5.4.210
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.210.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index d01f2b73a31a..e7dd38f0153a 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/binutils-libs-2.39 b/metadata/md5-cache/sys-libs/binutils-libs-2.39
new file mode 100644
index 000000000000..5d4037b28ab6
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.39
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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(-)?]
+DESCRIPTION=Core binutils libraries (libbfd, libopcodes, libiberty) for external packages
+EAPI=7
+HOMEPAGE=https://sourceware.org/binutils/
+INHERIT=libtool toolchain-funcs multilib-minimal
+IUSE=64-bit-bfd cet multitarget nls 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
+LICENSE=|| ( GPL-3 LGPL-3 )
+RDEPEND=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(-)?] >=sys-devel/binutils-config-5
+SLOT=0/2.39
+SRC_URI=mirror://gnu/binutils/binutils-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.39-patches-3.tar.xz
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=44b5ace6e21a638c3587c868fc44ff74
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-13.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-13.0.1
index d6789d248433..387df2686d8b 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-13.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-13.0.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=13.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.1.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c8acbdc3b995a078e8905dfbba9f6405
+_md5_=d80f824d13024a14a1cb41c8a306696f
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-14.0.6 b/metadata/md5-cache/sys-libs/compiler-rt-14.0.6
index 4b3cb6d14ecd..edada6b27644 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-14.0.6
+++ b/metadata/md5-cache/sys-libs/compiler-rt-14.0.6
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d4bc8027a6359c4b78ec7974ce81cb25
+_md5_=29ae35e83d1f1467037f6a1bd1731142
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1 b/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
index d72fa0493b82..8db503145ded 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f6e7b55628b204e32ac76105078c035c
+_md5_=81c569dae11df81f1e9789176a6ec4ef
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-15.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-15.0.0.9999
index c8f1526139e6..b7a1640d76eb 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-15.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-15.0.0.9999
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=15.0.0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a87d36a09321823b63c697a84a4f228f
+_md5_=0cf1520b3c5d3a6cf6724baa615c365e
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-15.0.0_rc2 b/metadata/md5-cache/sys-libs/compiler-rt-15.0.0_rc2
index 78892b6c1d63..de5ece1a6d05 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-15.0.0_rc2
+++ b/metadata/md5-cache/sys-libs/compiler-rt-15.0.0_rc2
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=15.0.0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.0-rc2/llvm-project-15.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.0-rc2/llvm-project-15.0.0rc2.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.0-rc2.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d0a89d3de6c0ab5c63da39cb5260485f
+_md5_=fdab4811ca874d43054737acd09738cd
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999
index 863b806da3cb..11fa5c5de2a5 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=16.0.0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a87d36a09321823b63c697a84a4f228f
+_md5_=0cf1520b3c5d3a6cf6724baa615c365e
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.1
index e7d98ffec21e..456f01459494 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !clang? ( test ) !test? ( test )
 SLOT=13.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.1.tar.xz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9e23f33a6c5f82d3af0b157e3e406ad4
+_md5_=a499286c6fb237d782c333676d5953c9
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
index d4e9d82762fd..b1bda57badae 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
@@ -13,4 +13,4 @@ RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r3.tar.xz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3bf93ba1e5601bfe03e018b4123304b1
+_md5_=5b5fba99226f700dc263ce51643306c9
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.0.9999
index d702f344c078..100764cd7230 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.0.9999
@@ -13,4 +13,4 @@ RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=15.0.0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ee4c68884f94dbbf2d570e6d48a5b546
+_md5_=da8d691960c6c96ff4e2a19544b7cf62
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.0_rc2 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.0_rc2
index 97ec2c64404b..63f77c4190fb 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.0_rc2
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.0_rc2
@@ -12,4 +12,4 @@ RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=15.0.0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.0-rc2/llvm-project-15.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.0-rc2/llvm-project-15.0.0rc2.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.0-rc2.tar.xz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=531855f7e0b5391b3738c4219cb9c89d
+_md5_=8e4e9d3fc1fb27c6f869cfdc18dbba16
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0.9999
index ef30343f73c4..ca4b396dd20f 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0.9999
@@ -13,4 +13,4 @@ RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=16.0.0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ee4c68884f94dbbf2d570e6d48a5b546
+_md5_=da8d691960c6c96ff4e2a19544b7cf62
diff --git a/metadata/md5-cache/sys-libs/libcxx-13.0.1 b/metadata/md5-cache/sys-libs/libcxx-13.0.1
index c0ac2e030c42..7d1e9604fed1 100644
--- a/metadata/md5-cache/sys-libs/libcxx-13.0.1
+++ b/metadata/md5-cache/sys-libs/libcxx-13.0.1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.1.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b66fc82ec07c9232e97fae6b29d0a806
+_md5_=4f408407ad713943687d1b542d61b1ed
diff --git a/metadata/md5-cache/sys-libs/libcxx-14.0.6 b/metadata/md5-cache/sys-libs/libcxx-14.0.6
index fe614d0d9fd8..4e1c2ada8100 100644
--- a/metadata/md5-cache/sys-libs/libcxx-14.0.6
+++ b/metadata/md5-cache/sys-libs/libcxx-14.0.6
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=cfda852183d427a96fc44b71653d6e55
+_md5_=0d7bd1c6e248723f9e1fefceb0d6f8b3
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-15.0.0.9999
index 9cccfd214edd..3e41a5660ee6 100644
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-15.0.0.9999
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9c3c4889ef7e62efcb64e85868ca20ff
+_md5_=0193e25ab726672d40ad5e70c5cf52a6
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.0_rc2 b/metadata/md5-cache/sys-libs/libcxx-15.0.0_rc2
index 2bd5418fc65a..1e9a3e0a1b6f 100644
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.0_rc2
+++ b/metadata/md5-cache/sys-libs/libcxx-15.0.0_rc2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.0-rc2/llvm-project-15.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.0-rc2/llvm-project-15.0.0rc2.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.0-rc2.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2324a6a114bc79fb4d00b6a92755cf02
+_md5_=572e503798e0fd658ce19d0d4cb23804
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-16.0.0.9999
index 7e84375616a9..961c43a4bced 100644
--- a/metadata/md5-cache/sys-libs/libcxx-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-16.0.0.9999
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9c3c4889ef7e62efcb64e85868ca20ff
+_md5_=0193e25ab726672d40ad5e70c5cf52a6
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-13.0.1 b/metadata/md5-cache/sys-libs/libcxxabi-13.0.1
index c9b65ec9fb09..be7fb751020b 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-13.0.1
+++ b/metadata/md5-cache/sys-libs/libcxxabi-13.0.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=801155823766df5d95d5097937df30d9
+_md5_=eca953e82e1468d5b8f10876dc9d160c
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-14.0.6 b/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
index 602c32f1b27f..88c639f20d7e 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
+++ b/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0fa4d9b98cb317a13465e52ffd67e4d8
+_md5_=653b942982c151b897195d18bb06955b
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-15.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-15.0.0.9999
index 3342ba90ef29..02b96e90a6dc 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-15.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-15.0.0.9999
@@ -13,4 +13,4 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e374117077274cf48153e6494f4a99f0
+_md5_=929a8a44c28d73e2b71eb15ea38a0c6e
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-15.0.0_rc2 b/metadata/md5-cache/sys-libs/libcxxabi-15.0.0_rc2
index e58b7fcf4b52..795b72c2e2df 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-15.0.0_rc2
+++ b/metadata/md5-cache/sys-libs/libcxxabi-15.0.0_rc2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.0-rc2/llvm-project-15.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.0-rc2/llvm-project-15.0.0rc2.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e374117077274cf48153e6494f4a99f0
+_md5_=929a8a44c28d73e2b71eb15ea38a0c6e
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0.9999
index 3342ba90ef29..02b96e90a6dc 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0.9999
@@ -13,4 +13,4 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e374117077274cf48153e6494f4a99f0
+_md5_=929a8a44c28d73e2b71eb15ea38a0c6e
diff --git a/metadata/md5-cache/sys-libs/libomp-13.0.1 b/metadata/md5-cache/sys-libs/libomp-13.0.1
index 8bddb58846b4..00c6c8a92a9c 100644
--- a/metadata/md5-cache/sys-libs/libomp-13.0.1
+++ b/metadata/md5-cache/sys-libs/libomp-13.0.1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.1.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	529bb8cd5756c8476d37ba89dd41e635	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=16b135510ef4c7cb847bde1272248d40
+_md5_=6b68b06b9a64c740eee804a0e0fc9ec7
diff --git a/metadata/md5-cache/sys-libs/libomp-14.0.6-r1 b/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
index 091aa9465324..f819797b94f5 100644
--- a/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	529bb8cd5756c8476d37ba89dd41e635	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a39cd44b02816221bc6b00755a49901f
+_md5_=902ec329c96cda54cab2eb5f6259c712
diff --git a/metadata/md5-cache/sys-libs/libomp-15.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-15.0.0.9999
index 5080cdd64dd2..e9c7f2cde09f 100644
--- a/metadata/md5-cache/sys-libs/libomp-15.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-15.0.0.9999
@@ -12,4 +12,4 @@ RDEPEND=hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	529bb8cd5756c8476d37ba89dd41e635	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fd866ddcc7b918501b26a7276b74b758
+_md5_=47538bdc5597686e44945c6b851865c9
diff --git a/metadata/md5-cache/sys-libs/libomp-15.0.0_rc2 b/metadata/md5-cache/sys-libs/libomp-15.0.0_rc2
index e0f22fe5316a..450464f57bc2 100644
--- a/metadata/md5-cache/sys-libs/libomp-15.0.0_rc2
+++ b/metadata/md5-cache/sys-libs/libomp-15.0.0_rc2
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.0-rc2/llvm-project-15.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.0-rc2/llvm-project-15.0.0rc2.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.0-rc2.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	529bb8cd5756c8476d37ba89dd41e635	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a6cfb44b139a9cf3fc820345d34f3af1
+_md5_=a15191ec1667175da45d27d6b89ae83b
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-16.0.0.9999
index 349a8d23816e..e3fe736812dc 100644
--- a/metadata/md5-cache/sys-libs/libomp-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-16.0.0.9999
@@ -12,4 +12,4 @@ RDEPEND=hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	529bb8cd5756c8476d37ba89dd41e635	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fd866ddcc7b918501b26a7276b74b758
+_md5_=47538bdc5597686e44945c6b851865c9
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.1 b/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.1
index 29b3e18dea2d..366398b95111 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.1.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=28e7f0ddeb3346867d9da8aed5b1dd89
+_md5_=caa8ebaf79d2123a132afcdbf21b1fa1
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6 b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6
index c0ccea424855..4615c87ce37c 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c8e6047fa804ac283dde474156346531
+_md5_=82a77209a88dedff241f5e46971ee7f2
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.0.9999
index 77b8a32c93a3..a028e9a21bbd 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.0.9999
@@ -13,4 +13,4 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=58163e85a73e50de21dd033c2a234fb3
+_md5_=5d55ed214e826a8d355dbeab0fe84405
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.0_rc2 b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.0_rc2
index fc219889e180..f7914b07db89 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.0_rc2
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.0_rc2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.0-rc2/llvm-project-15.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.0-rc2/llvm-project-15.0.0rc2.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=58163e85a73e50de21dd033c2a234fb3
+_md5_=5d55ed214e826a8d355dbeab0fe84405
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0.9999
index 77b8a32c93a3..a028e9a21bbd 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0.9999
@@ -13,4 +13,4 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	24776ecfde09e4c416429f0cbf406b05	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=58163e85a73e50de21dd033c2a234fb3
+_md5_=5d55ed214e826a8d355dbeab0fe84405
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 269b1d901885..aae53ee2f0f2 100644
Binary files a/metadata/md5-cache/sys-power/Manifest.gz and b/metadata/md5-cache/sys-power/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-power/switcheroo-control-2.6 b/metadata/md5-cache/sys-power/switcheroo-control-2.6
index bf0e6967e1f5..a6167be26cdc 100644
--- a/metadata/md5-cache/sys-power/switcheroo-control-2.6
+++ b/metadata/md5-cache/sys-power/switcheroo-control-2.6
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/hadess/switcheroo-control/uploads/86ea54ac7ddb901b6bf6e915209151f8/switcheroo-control-2.6.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0f281498209b0b3d10b2d2f6bbf7ab47
+_md5_=6ef9f74d13d4bc37fb76e2343013abef
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 49f97967f6cf..3faf893581fe 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.11.0 b/metadata/md5-cache/www-apps/icingaweb2-2.11.0
index 372a06fee5cc..ed46e641a663 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-2.11.0
+++ b/metadata/md5-cache/www-apps/icingaweb2-2.11.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config install postinst setup
-DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) dev-libs/icinga-php-library dev-libs/icinga-php-thirdparty acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
+DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) >=dev-libs/icinga-php-library-0.8.1 >=dev-libs/icinga-php-thirdparty-0.11.0 acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
 DESCRIPTION=Icinga Web 2 - Frontend for icinga2
 EAPI=7
 HOMEPAGE=http://www.icinga.org/
@@ -7,9 +7,9 @@ INHERIT=depend.apache multilib
 IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) dev-libs/icinga-php-library dev-libs/icinga-php-thirdparty acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
+RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) >=dev-libs/icinga-php-library-0.8.1 >=dev-libs/icinga-php-thirdparty-0.11.0 acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
 SLOT=0
 SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.11.0 -> icingaweb2-2.11.0.tar.gz
 _eclasses_=depend.apache	416d1c5005c5f4594e79812fb7323f0d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c800c276d1057bd101658f392d0c225b
+_md5_=be76ff402e41616e2b974582c1a4f1f8
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.11.1 b/metadata/md5-cache/www-apps/icingaweb2-2.11.1
index 4c96f76aeac8..6fd7a0d23381 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-2.11.1
+++ b/metadata/md5-cache/www-apps/icingaweb2-2.11.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config install postinst setup
-DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) dev-libs/icinga-php-library dev-libs/icinga-php-thirdparty acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
+DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) >=dev-libs/icinga-php-library-0.8.1 >=dev-libs/icinga-php-thirdparty-0.11.0 acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
 DESCRIPTION=Icinga Web 2 - Frontend for icinga2
 EAPI=7
 HOMEPAGE=http://www.icinga.org/
@@ -7,9 +7,9 @@ INHERIT=depend.apache multilib
 IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) dev-libs/icinga-php-library dev-libs/icinga-php-thirdparty acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
+RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) >=dev-libs/icinga-php-library-0.8.1 >=dev-libs/icinga-php-thirdparty-0.11.0 acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
 SLOT=0
 SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.11.1 -> icingaweb2-2.11.1.tar.gz
 _eclasses_=depend.apache	416d1c5005c5f4594e79812fb7323f0d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c800c276d1057bd101658f392d0c225b
+_md5_=be76ff402e41616e2b974582c1a4f1f8
diff --git a/metadata/md5-cache/www-apps/icingaweb2-9999 b/metadata/md5-cache/www-apps/icingaweb2-9999
index 7e4d0c3bf067..6c79ef96c16d 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-9999
+++ b/metadata/md5-cache/www-apps/icingaweb2-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=config install postinst setup unpack
-DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) dev-libs/icinga-php-library dev-libs/icinga-php-thirdparty acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
+DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) >=dev-libs/icinga-php-library-0.8.1 >=dev-libs/icinga-php-thirdparty-0.11.0 acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
 DESCRIPTION=Icinga Web 2 - Frontend for icinga2
 EAPI=7
 HOMEPAGE=http://www.icinga.org/
@@ -8,8 +8,8 @@ INHERIT=depend.apache multilib git-r3
 IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) dev-libs/icinga-php-library dev-libs/icinga-php-thirdparty acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
+RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) >=dev-libs/icinga-php-library-0.8.1 >=dev-libs/icinga-php-thirdparty-0.11.0 acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
 SLOT=0
 _eclasses_=depend.apache	416d1c5005c5f4594e79812fb7323f0d	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3d49a82cfd2c8bff9305a7c92d51f7f3
+_md5_=0c9c7ce8f6f00f411a29c21291e5383d
diff --git a/metadata/md5-cache/www-apps/sonarr-3.0.9.1549-r1 b/metadata/md5-cache/www-apps/sonarr-3.0.9.1549-r1
new file mode 100644
index 000000000000..73c9fc21b321
--- /dev/null
+++ b/metadata/md5-cache/www-apps/sonarr-3.0.9.1549-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DESCRIPTION=Sonarr is a Smart PVR for newsgroup and bittorrent users
+EAPI=8
+HOMEPAGE=https://www.sonarr.tv
+INHERIT=systemd
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=acct-group/sonarr acct-user/sonarr >=dev-lang/mono-6.6.0.161 media-video/mediainfo dev-db/sqlite
+RESTRICT=bindist strip test
+SLOT=0
+SRC_URI=https://download.sonarr.tv/v3/main/3.0.9.1549/Sonarr.main.3.0.9.1549.linux.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=c8639d27e95f1de8229281941d1349ca
diff --git a/metadata/md5-cache/www-apps/sonarr-3.0.9.1549-r2 b/metadata/md5-cache/www-apps/sonarr-3.0.9.1549-r2
new file mode 100644
index 000000000000..6d0168075fc0
--- /dev/null
+++ b/metadata/md5-cache/www-apps/sonarr-3.0.9.1549-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DESCRIPTION=Sonarr is a Smart PVR for newsgroup and bittorrent users
+EAPI=8
+HOMEPAGE=https://www.sonarr.tv
+INHERIT=systemd
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=acct-group/sonarr acct-user/sonarr >=dev-lang/mono-6.6.0.161 media-video/mediainfo dev-db/sqlite
+RESTRICT=bindist strip test
+SLOT=0
+SRC_URI=https://download.sonarr.tv/v3/main/3.0.9.1549/Sonarr.main.3.0.9.1549.linux.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=611e2e178ba4a067247acd5273cf0458
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 95e8580409d0..7cf6d433f5a8 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/firefox-103.0.2 b/metadata/md5-cache/www-client/firefox-103.0.2
index 76f873e376da..e6a771647898 100644
--- a/metadata/md5-cache/www-client/firefox-103.0.2
+++ b/metadata/md5-cache/www-client/firefox-103.0.2
@@ -13,4 +13,4 @@ REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wifi? ( dbus ) || ( X wayland )
 SLOT=rapid
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/103.0.2/source/firefox-103.0.2.source.tar.xz -> firefox-103.0.2.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-103-patches-03j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-103-patches-03j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-103-patches-03j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/af.xpi -> firefox-103.0.2-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ar.xpi -> firefox-103.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ast.xpi -> firefox-103.0.2-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/be.xpi -> firefox-103.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/bg.xpi -> firefox-103.0.2-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/br.xpi -> firefox-103.0.2-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ca.xpi -> firefox-103.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/cak.xpi -> firefox-103.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/cs.xpi -> firefox-103.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/cy.xpi -> firefox-103.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/da.xpi -> firefox-103.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/de.xpi -> firefox-103.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/dsb.xpi -> firefox-103.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/el.xpi -> firefox-103.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/en-CA.xpi -> firefox-103.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/en-GB.xpi -> firefox-103.0.2-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/es-AR.xpi -> firefox-103.0.2-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/es-ES.xpi -> firefox-103.0.2-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/et.xpi -> firefox-103.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/eu.xpi -> firefox-103.0.2-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/fi.xpi -> firefox-103.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/fr.xpi -> firefox-103.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/fy-NL.xpi -> firefox-103.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ga-IE.xpi -> firefox-103.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/gd.xpi -> firefox-103.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/gl.xpi -> firefox-103.0.2-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/he.xpi -> firefox-103.0.2-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/hr.xpi -> firefox-103.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/hsb.xpi -> firefox-103.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/hu.xpi -> firefox-103.0.2-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/id.xpi -> firefox-103.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/is.xpi -> firefox-103.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/it.xpi -> firefox-103.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ja.xpi -> firefox-103.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ka.xpi -> firefox-103.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/kab.xpi -> firefox-103.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/kk.xpi -> firefox-103.0.2-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ko.xpi -> firefox-103.0.2-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/lt.xpi -> firefox-103.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/lv.xpi -> firefox-103.0.2-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ms.xpi -> firefox-103.0.2-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/nb-NO.xpi -> firefox-103.0.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/nl.xpi -> firefox-103.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/nn-NO.xpi -> firefox-103.0.2-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/pa-IN.xpi -> firefox-103.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/pl.xpi -> firefox-103.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/pt-BR.xpi -> firefox-103.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/pt-PT.xpi -> firefox-103.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/rm.xpi -> firefox-103.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ro.xpi -> firefox-103.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ru.xpi -> firefox-103.0.2-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/sk.xpi -> firefox-103.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/sl.xpi -> firefox-103.0.2-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/sq.xpi -> firefox-103.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/sr.xpi -> firefox-103.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/sv-SE.xpi -> firefox-103.0.2-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/th.xpi -> firefox-103.0.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/tr.xpi -> firefox-103.0.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/uk.xpi -> firefox-103.0.2-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/uz.xpi -> firefox-103.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/vi.xpi -> firefox-103.0.2-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/zh-CN.xpi -> firefox-103.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/zh-TW.xpi -> firefox-103.0.2-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ach.xpi -> firefox-103.0.2-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/an.xpi -> firefox-103.0.2-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/az.xpi -> firefox-103.0.2-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/bn.xpi -> firefox-103.0.2-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/bs.xpi -> firefox-103.0.2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-103.0.2-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/eo.xpi -> firefox-103.0.2-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/es-CL.xpi -> firefox-103.0.2-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/es-MX.xpi -> firefox-103.0.2-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/fa.xpi -> firefox-103.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ff.xpi -> firefox-103.0.2-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/gn.xpi -> firefox-103.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/gu-IN.xpi -> firefox-103.0.2-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/hi-IN.xpi -> firefox-103.0.2-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/hy-AM.xpi -> firefox-103.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ia.xpi -> firefox-103.0.2-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/km.xpi -> firefox-103.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/kn.xpi -> firefox-103.0.2-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/lij.xpi -> firefox-103.0.2-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/mk.xpi -> firefox-103.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/mr.xpi -> firefox-103.0.2-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/my.xpi -> firefox-103.0.2-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ne-NP.xpi -> firefox-103.0.2-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/oc.xpi -> firefox-103.0.2-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/sco.xpi -> firefox-103.0.2-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/si.xpi -> firefox-103.0.2-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/son.xpi -> firefox-103.0.2-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/szl.xpi -> firefox-103.0.2-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ta.xpi -> firefox-103.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/te.xpi -> firefox-103.0.2-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/tl.xpi -> firefox-103.0.2-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/trs.xpi -> firefox-103.0.2-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ur.xpi -> firefox-103.0.2-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/xh.xpi -> firefox-103.0.2-xh.xpi )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	529bb8cd5756c8476d37ba89dd41e635	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b151e0c1fab00d2bb645c06ff3702ca4
+_md5_=4af02865110f77bee49c85a495fcc559
diff --git a/metadata/md5-cache/www-client/seamonkey-2.53.12 b/metadata/md5-cache/www-client/seamonkey-2.53.12
index 554e8277e637..6f33a720dae2 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.53.12
+++ b/metadata/md5-cache/www-client/seamonkey-2.53.12
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.53.12/source/seamonkey-2.53.12.source.tar.xz -> seamonkey-2.53.12.source.tar.xz https://archive.mozilla.org/pub/seamonkey/releases/2.53.12/source/seamonkey-2.53.12.source-l10n.tar.xz -> seamonkey-2.53.12.source-l10n.tar.xz https://github.com/BioMike/gentoo-seamonkey-patches/archive/refs/tags/2.53.12.tar.gz -> seamonkey-2.53.12-patches.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mozcoreconf-v6	31a6d2316984c386ce9094883a0ba1ee	mozextension	d63ee4e7c8fe4efa03011a91a2d7ff83	mozlinguas-v2	c09206fab700c5657f500fc2c9baeb6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f086aa74042fd74fc72d2e80790e1597
+_md5_=bfd0759e63c654153e4f61e03173d4a2
diff --git a/metadata/md5-cache/www-client/seamonkey-2.53.13 b/metadata/md5-cache/www-client/seamonkey-2.53.13
index fabb33077a27..7930607596b8 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.53.13
+++ b/metadata/md5-cache/www-client/seamonkey-2.53.13
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.53.13/source/seamonkey-2.53.13.source.tar.xz -> seamonkey-2.53.13.source.tar.xz https://archive.mozilla.org/pub/seamonkey/releases/2.53.13/source/seamonkey-2.53.13.source-l10n.tar.xz -> seamonkey-2.53.13.source-l10n.tar.xz https://github.com/BioMike/gentoo-seamonkey-patches/archive/refs/tags/2.53.13.tar.gz -> seamonkey-2.53.13-patches.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mozcoreconf-v6	31a6d2316984c386ce9094883a0ba1ee	mozextension	d63ee4e7c8fe4efa03011a91a2d7ff83	mozlinguas-v2	c09206fab700c5657f500fc2c9baeb6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=27769b3f00afccf2e98e6a53c5095576
+_md5_=45a382b1d30931151faf825d10fb765c
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index db3abd5dcb8f..2af24610f4ca 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.9 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.9
new file mode 100644
index 000000000000..6b5c9af3a6e5
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.9
@@ -0,0 +1,16 @@
+BDEPEND=app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.3 dev-libs/glib:2 dev-libs/libxslt dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.56.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( media-libs/libjpeg-turbo:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+DESCRIPTION=Image loading library for GTK+
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gdk-pixbuf
+INHERIT=gnome.org gnome2-utils meson-multilib multilib xdg
+IUSE=gtk-doc +introspection jpeg test tiff 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=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.56.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( media-libs/libjpeg-turbo:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.9.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3452e696a1e59da51b31517fcc1acece
diff --git a/metadata/md5-cache/x11-libs/libXaw3dXft-1.6.2h b/metadata/md5-cache/x11-libs/libXaw3dXft-1.6.2h
index 780ce5d51495..bbdfe04d08c1 100644
--- a/metadata/md5-cache/x11-libs/libXaw3dXft-1.6.2h
+++ b/metadata/md5-cache/x11-libs/libXaw3dXft-1.6.2h
@@ -1,9 +1,9 @@
-BDEPEND=sys-devel/flex virtual/yacc sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=sys-devel/flex virtual/yacc x11-misc/util-macros sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare unpack
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXt xpm? ( x11-libs/libXpm ) x11-base/xorg-proto
 DESCRIPTION=Xaw3dXft library
 EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/sf-xpaint
+HOMEPAGE=https://sourceforge.net/projects/sf-xpaint/
 INHERIT=xorg-3
 IUSE=unicode xpm
 KEYWORDS=amd64 x86
@@ -12,4 +12,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-lib
 SLOT=0
 SRC_URI=mirror://sourceforge/sf-xpaint/libXaw3dXft-1.6.2h.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=875c671a900edc46eec96eff551b951d
+_md5_=5247537c979b6ce4bb973fcfab9e61d5
diff --git a/metadata/md5-cache/x11-libs/libvdpau-1.5 b/metadata/md5-cache/x11-libs/libvdpau-1.5
index 947b46eae5bf..ec99cbcab31a 100644
--- a/metadata/md5-cache/x11-libs/libvdpau-1.5
+++ b/metadata/md5-cache/x11-libs/libvdpau-1.5
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dri? ( x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x11-base/xorg-proto
 DESCRIPTION=VDPAU wrapper and trace libraries
 EAPI=8
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/VDPAU
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/VDPAU/
 INHERIT=meson-multilib virtualx
 IUSE=doc dri abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
 KEYWORDS=~alpha amd64 arm64 ~riscv x86
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/1.5/libvdpau-1.5.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=7697abfcb98bff4247e5daebefdd59fe
+_md5_=c3ac373a42173636fd1fbc67ef09214c
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index bb27377c8237..0960afc17c50 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/devilspie-0.23-r2 b/metadata/md5-cache/x11-misc/devilspie-0.23-r2
index f9b480220110..80de2109bd86 100644
--- a/metadata/md5-cache/x11-misc/devilspie-0.23-r2
+++ b/metadata/md5-cache/x11-misc/devilspie-0.23-r2
@@ -2,11 +2,11 @@ BDEPEND=dev-util/intltool virtual/pkgconfig
 DEFINED_PHASES=prepare
 DEPEND=dev-libs/glib:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libwnck:3 x11-base/xorg-proto
 DESCRIPTION=Window matching utility similar to Sawfish's Matched Windows
-EAPI=7
-HOMEPAGE=http://www.burtonini.com/blog/tag/devilspie.html
+EAPI=8
+HOMEPAGE=https://www.burtonini.com/blog/tag/devilspie.html
 KEYWORDS=~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libwnck:3
 SLOT=0
-SRC_URI=http://www.burtonini.com/computing/devilspie-0.23.tar.xz
-_md5_=ddbe55af4993f8de02a5883030243919
+SRC_URI=https://www.burtonini.com/computing/devilspie-0.23.tar.xz
+_md5_=185b0d85370519353c1b78ef144b1c73
diff --git a/metadata/md5-cache/x11-misc/vdpauinfo-1.5 b/metadata/md5-cache/x11-misc/vdpauinfo-1.5-r1
similarity index 55%
rename from metadata/md5-cache/x11-misc/vdpauinfo-1.5
rename to metadata/md5-cache/x11-misc/vdpauinfo-1.5-r1
index 0c57dcaa0e32..038f1282b4fc 100644
--- a/metadata/md5-cache/x11-misc/vdpauinfo-1.5
+++ b/metadata/md5-cache/x11-misc/vdpauinfo-1.5-r1
@@ -3,12 +3,12 @@ DEFINED_PHASES=prepare
 DEPEND=>=x11-libs/libvdpau-1.5 x11-libs/libX11 x11-base/xorg-proto
 DESCRIPTION=Displays info about your card's VDPAU support
 EAPI=8
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/VDPAU
-INHERIT=autotools
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/VDPAU/
+INHERIT=autotools flag-o-matic
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=x11-libs/libvdpau-1.5 x11-libs/libX11
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/vdpau/vdpauinfo/-/archive/1.5/vdpauinfo-1.5.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=89b6e0fd6fa86eb2aa2fd9276dcdb41d
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=631d36ef60ad112508ccf0ce0301136c
diff --git a/metadata/md5-cache/x11-misc/wmctrl-1.07-r2 b/metadata/md5-cache/x11-misc/wmctrl-1.07-r2
deleted file mode 100644
index 0bcec319c27c..000000000000
--- a/metadata/md5-cache/x11-misc/wmctrl-1.07-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=-
-DEPEND=dev-libs/glib:2 x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-base/xorg-proto
-DESCRIPTION=Command line tool to interact with an EWMH/NetWM compatible X Window Manager
-EAPI=7
-HOMEPAGE=http://sweb.cz/tripie/utils/wmctrl
-KEYWORDS=amd64 arm64 ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/libX11 x11-libs/libXmu x11-libs/libXt
-SLOT=0
-SRC_URI=http://sweb.cz/tripie/utils/wmctrl/dist/wmctrl-1.07.tar.gz
-_md5_=973af7cd2ff38c10485013161222226c
diff --git a/metadata/md5-cache/x11-misc/wmctrl-1.07-r3 b/metadata/md5-cache/x11-misc/wmctrl-1.07-r3
new file mode 100644
index 000000000000..9fb73db27fa2
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/wmctrl-1.07-r3
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=-
+DEPEND=dev-libs/glib:2 x11-libs/libX11 x11-libs/libXmu x11-base/xorg-proto
+DESCRIPTION=Command line tool to interact with an EWMH/NetWM compatible X Window Manager
+EAPI=8
+HOMEPAGE=http://tripie.sweb.cz/utils/wmctrl/
+KEYWORDS=amd64 arm64 ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=dev-libs/glib:2 x11-libs/libX11 x11-libs/libXmu
+SLOT=0
+SRC_URI=http://tripie.sweb.cz/utils/wmctrl/dist/wmctrl-1.07.tar.gz
+_md5_=9307cd309deaa5ccfb42877220de86a1
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index f4b0f50b8bed..b8c35946b44a 100644
Binary files a/metadata/md5-cache/x11-plugins/Manifest.gz and b/metadata/md5-cache/x11-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-plugins/wmcdplay-1.1-r1 b/metadata/md5-cache/x11-plugins/wmcdplay-1.1-r1
index 4657862726c5..41fe7280692e 100644
--- a/metadata/md5-cache/x11-plugins/wmcdplay-1.1-r1
+++ b/metadata/md5-cache/x11-plugins/wmcdplay-1.1-r1
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmcdplay-1.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=785e4c3efa6262e8947f641b89eb35f1
+_md5_=716b5f64ef060ca836b7100a872ca0fe
diff --git a/metadata/md5-cache/x11-plugins/wmwork-0.2.5-r1 b/metadata/md5-cache/x11-plugins/wmwork-0.2.5-r1
index 50dc0114efe7..c1971eaf1a21 100644
--- a/metadata/md5-cache/x11-plugins/wmwork-0.2.5-r1
+++ b/metadata/md5-cache/x11-plugins/wmwork-0.2.5-r1
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/libXext-1.0.3 >=x11-libs/libX11-1.1.1-r1 >=x11-libs/libXpm-3.5.6
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmwork-0.2.5.tar.gz
-_md5_=3a00c86d03c2cfe8a48e8f2b97e8c299
+_md5_=98994d543d71eb4b2dbd176d23aa6a7a
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 4456f2841fa4..e89eb790dc57 100644
Binary files a/metadata/md5-cache/x11-terms/Manifest.gz and b/metadata/md5-cache/x11-terms/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-terms/guake-3.8.5 b/metadata/md5-cache/x11-terms/guake-3.8.5-r1
similarity index 98%
rename from metadata/md5-cache/x11-terms/guake-3.8.5
rename to metadata/md5-cache/x11-terms/guake-3.8.5-r1
index 61428e8cfda2..59dd6719fc8a 100644
--- a/metadata/md5-cache/x11-terms/guake-3.8.5
+++ b/metadata/md5-cache/x11-terms/guake-3.8.5-r1
@@ -11,6 +11,6 @@ RDEPEND=python_single_target_python3_8? ( dev-python/dbus-python[python_targets_
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-SRC_URI=https://github.com/Guake/guake/archive/refs/tags/3.8.5.tar.gz -> guake-3.8.5.tar.gz
+SRC_URI=https://github.com/Guake/guake/archive/refs/tags/3.8.5.tar.gz -> guake-3.8.5.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6a9a833180a458f9b8909608ca128946
+_md5_=6da583ce88e64882246c8400cd46a3f4
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 1ab1dfd05942..97f1a41b394f 100644
Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-themes/gentoo-xcursors-0.3.2-r3 b/metadata/md5-cache/x11-themes/gentoo-xcursors-0.3.2-r3
index 31565bc60560..e3f3265f35d8 100644
--- a/metadata/md5-cache/x11-themes/gentoo-xcursors-0.3.2-r3
+++ b/metadata/md5-cache/x11-themes/gentoo-xcursors-0.3.2-r3
@@ -6,4 +6,4 @@ KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://schlomp.space/tastytea/gentoo-xcursors/archive/0.3.2.tar.gz -> gentoo-xcursors-0.3.2.tar.gz
-_md5_=6fc93a78053b3f924c7725e66c619513
+_md5_=d6beed76b523cf61d290ac69225869b4
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 303b7ffb487d..af8bde02d9d9 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/mutter-42.2 b/metadata/md5-cache/x11-wm/mutter-42.2
index e97db960267c..8c7788623a27 100644
--- a/metadata/md5-cache/x11-wm/mutter-42.2
+++ b/metadata/md5-cache/x11-wm/mutter-42.2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=mirror://gnome/sources/mutter/42/mutter-42.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4a9bf844c30520ccecf8074fb3fef68c
+_md5_=604dce9d6464253c29626c0365a517a8
diff --git a/metadata/md5-cache/x11-wm/mutter-42.3 b/metadata/md5-cache/x11-wm/mutter-42.3
index e00c9a3bad35..2b0883b2b083 100644
--- a/metadata/md5-cache/x11-wm/mutter-42.3
+++ b/metadata/md5-cache/x11-wm/mutter-42.3
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=mirror://gnome/sources/mutter/42/mutter-42.3.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8d9f0dcbed7eb80925873dec6f18f743
+_md5_=d2984cc657b282b2289621778e14b5e2
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 1fe1126dcc82..42522647e19e 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-08-10T06:40:01Z
+TIMESTAMP 2022-08-11T12:40:07Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLzUsJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL0+KdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBO9A/6Aw0yWKkxGOyDrdUbsHaGWsRaUQQaSvvL8Y6r1h+mPUb+y2KgVfw3KA7G
-NZI7ImEpOZekDERYrudwPhGWhJc5OUoGP35+2dnlbCxLTfMnbcqHnhppEIykhJbg
-v/WPw6Adh+zdzs987CY/908BJFMIQKqeciGZS6rgcWJ9A5fnCJ/olqS05CTxKCaT
-UY04Tdcj6qnPa/AW04GLwKgogRAkXJGlUM63iZOdoNS9fqUcTULXn75remEQb6/L
-BvGxpOn16r+2SDpT0P3cFk4/NSCUIb34zw8t+Rk4ItsldLyMaU26d0TtUshzrsC+
-S5aRpNeow+9Y6EVDadBNOEsIcsXg9IoIUmx3sOn3PURF1EiRWB1hL/pAm79XCaAJ
-TerQ+FE8d35042M7rRVOxQwcz1GstWzo0Cbl7V47tQXnSBEihIgmGz3BADlZQqLi
-SBkGY9WqlTb1tCMeODrT+65oDOaSH6z92R6guBb317Shiy7+9rN2jwNQS/LvSi+4
-Xy3qS4SmOMmXuA7LdhpqfxsoKVSx7clPiHDhflCXLPce4nlLaNpldMmwLUK0y53H
-trCLD298MG9LaO6hugH6zBJaQ6Gi57esGR1dAW8zNp+gEz+roimSZtyB5MfYJum6
-oWT3+duDDcNZ4/xVGrYU+IeEXqMLmQnDCp9ta95oVWoOk/Hapss=
-=pQYu
+klC4MQ/+MFl2xEMEwMS0fGHXhlbr+sfqt8jKbPWIyJ7v47VTqB0awQKPFPqfEy4f
+WBtor+eNgaprsDMfztNOYS2JGhvTxfpR84xAZDzD1lK7i8zIVvHLgVMhXWVWT3Mo
+LtsAjs3TWSbiJOO0wFiTu9wHL4OXZvWiTN4Fs9GyuFUn7GGSi34m1XIk1NxXK5gx
+QwRbMGWH43etQlrs9mTof5eIW4nQmMuF0qMTu+7QvYTYoGrReYpiJeNx2PfhX45s
+yviacpLcko0EHiCSJ+HgAUs+B9h6tsvbQ2z9j2+3vFtKhhHQw4AeocFHL6wgDddr
+0+Iu3mgefL3P8vJglQ2Btf5CQuum1p6oNAc6qjEUY0DiQkE/Qfo88k6sIfJr585M
+BfhPBB7Bvg+v5rKM7rUBvagqawa1IidWoYmqcrGS1K3YU9usN/jpft2vCINKafNT
+644iIqB8Es04g/kemLOGp6KCcF7sUujmxVek8sdUTfl0tl/xBWqQRJTIr6bnmop8
+nS64K+AbgGCJxHgchfbv7e0rYZ3pmdBnWdC6chKLzXjtIL1lX87KVHurxziKuGik
+SDcODuJOfjiyR1PAzneHKSPl6stfhqXkhX8nukO2pmv0rKukEvUI9ra1W5/tLbk2
+kDKFkUcrmAY+vTqUEvoOca6I4Sjgnomn9oVkxIGZTQqI52x++Qk=
+=H5oV
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a03a3a561952..5782a557b641 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Aug 2022 06:39:56 +0000
+Thu, 11 Aug 2022 12:40:04 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 59e932c1c380..33d8d0d4f0f0 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Aug 10 06:39:56 AM UTC 2022
+Thu Aug 11 12:40:04 PM UTC 2022
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 834aa31626f0..a69dbffd421a 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -979,6 +979,7 @@
 2208091110 ./app-admin/awscli/awscli-1.25.36.ebuild
 2208050940 ./app-admin/awscli/awscli-1.25.46.ebuild
 2208092110 ./app-admin/awscli/awscli-1.25.47.ebuild
+2208111310 ./app-admin/awscli/awscli-1.25.49.ebuild
 2207050340 ./app-admin/bastille/bastille-3.0.9-r3.ebuild
 2204121639 ./app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.32.1.ebuild
 2207021040 ./app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.6.0.ebuild
@@ -1190,12 +1191,11 @@
 2107302239 ./app-admin/rex/rex-1.13.4.ebuild
 2106121309 ./app-admin/rex/rex-9999.ebuild
 2206190210 ./app-admin/rsyslog/rsyslog-8.2102.0-r1.ebuild
-2206190210 ./app-admin/rsyslog/rsyslog-8.2106.0-r1.ebuild
-2206190210 ./app-admin/rsyslog/rsyslog-8.2108.0-r1.ebuild
 2206190210 ./app-admin/rsyslog/rsyslog-8.2110.0-r1.ebuild
 2206190210 ./app-admin/rsyslog/rsyslog-8.2112.0-r1.ebuild
 2206190210 ./app-admin/rsyslog/rsyslog-8.2204.0-r1.ebuild
 2208051240 ./app-admin/rsyslog/rsyslog-8.2206.0.ebuild
+2208101710 ./app-admin/rsyslog/rsyslog-8.2208.0.ebuild
 2207031410 ./app-admin/ryzen_monitor/ryzen_monitor-1.0.4-r1.ebuild
 2207022340 ./app-admin/ryzen_monitor/ryzen_monitor-1.0.5.ebuild
 2109150109 ./app-admin/ryzen_smu/ryzen_smu-0.1.2.ebuild
@@ -1446,6 +1446,7 @@
 2205211440 ./app-backup/bacula/bacula-11.0.5.ebuild
 2205211440 ./app-backup/bacula/bacula-11.0.6-r1.ebuild
 2207070940 ./app-backup/bacula/bacula-11.0.6-r2.ebuild
+2208111310 ./app-backup/bacula/bacula-13.0.1.ebuild
 2203211309 ./app-backup/bareos/bareos-19.2.12.ebuild
 2203211309 ./app-backup/bareos/bareos-20.0.6.ebuild
 2206101440 ./app-backup/bareos/bareos-21.1.2.ebuild
@@ -1474,7 +1475,8 @@
 2203062310 ./app-backup/consul-backinator/consul-backinator-1.6.6.ebuild
 2201061240 ./app-backup/cpdup/cpdup-1.18.ebuild
 2205211140 ./app-backup/dar/dar-2.7.5.ebuild
-2208100740 ./app-backup/dar/dar-2.7.6.ebuild
+2208101110 ./app-backup/dar/dar-2.7.6.ebuild
+2208101140 ./app-backup/dar/dar-2.7.7.ebuild
 2109162239 ./app-backup/deja-dup/deja-dup-42.7-r1.ebuild
 2109101039 ./app-backup/deja-dup/deja-dup-42.8.ebuild
 2207192040 ./app-backup/dirvish/dirvish-1.2.1-r1.ebuild
@@ -1680,7 +1682,7 @@
 2204230009 ./app-crypt/gorilla/gorilla-1.4-r2.ebuild
 2009031339 ./app-crypt/gpa/gpa-0.10.0.ebuild
 2012311940 ./app-crypt/gpg-ringmgr/gpg-ringmgr-1.12-r1.ebuild
-2207152140 ./app-crypt/gpgme/gpgme-1.17.1-r1.ebuild
+2208101610 ./app-crypt/gpgme/gpgme-1.17.1-r1.ebuild
 2202170139 ./app-crypt/gpgstats/gpgstats-0.5-r2.ebuild
 2104060140 ./app-crypt/hashalot/hashalot-0.3-r2.ebuild
 1809182339 ./app-crypt/hashcat-utils/hashcat-utils-1.9.ebuild
@@ -2573,13 +2575,13 @@
 2205070940 ./app-editors/emacs/emacs-25.3-r11.ebuild
 2205070940 ./app-editors/emacs/emacs-26.3-r7.ebuild
 2206071015 ./app-editors/emacs/emacs-27.2-r5.ebuild
-2206071015 ./app-editors/emacs/emacs-28.1.ebuild
 2206271410 ./app-editors/emacs/emacs-18.59-r14.ebuild
 2207141340 ./app-editors/emacs/emacs-28.1.9999.ebuild
 2207141340 ./app-editors/emacs/emacs-29.0.9999.ebuild
 2207151940 ./app-editors/emacs/emacs-28.1-r2.ebuild
 2207151940 ./app-editors/emacs/emacs-28.1.90-r2.ebuild
 2208022140 ./app-editors/emacs/emacs-28.1.91.ebuild
+2208101110 ./app-editors/emacs/emacs-28.1.ebuild
 2110220439 ./app-editors/emact/emact-2.58.0-r1.ebuild
 2110291639 ./app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild
 2205070040 ./app-editors/fe/fe-2.0-r1.ebuild
@@ -3202,6 +3204,10 @@
 2207170410 ./app-emacs/geiser-chicken/geiser-chicken-0.17.ebuild
 2207170410 ./app-emacs/geiser-gambit/geiser-gambit-0.18.1.ebuild
 2208100040 ./app-emacs/emacs-ccls/emacs-ccls-0_pre20220510-r1.ebuild
+2208101710 ./app-emacs/citar/citar-1.0.ebuild
+2208101710 ./app-emacs/citeproc-el/citeproc-el-0.9.1.ebuild
+2208101710 ./app-emacs/string-inflection/string-inflection-1.0.16.ebuild
+2208101710 ./app-emacs/yaml/yaml-0.5.1.ebuild
 2201021453 ./app-emulation/aqemu/aqemu-0.9.2-r2.ebuild
 2204170010 ./app-emulation/aranym/aranym-1.1.0.ebuild
 1912171039 ./app-emulation/bochs/bochs-2.6.10.ebuild
@@ -3623,7 +3629,7 @@
 2110121639 ./app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r7.ebuild
 2204260910 ./app-i18n/tomoe/tomoe-0.6.0-r6.ebuild
 2205171040 ./app-i18n/transifex-client/transifex-client-1.1.0.ebuild
-2207051210 ./app-i18n/transifex-client/transifex-client-1.2.0.ebuild
+2208101140 ./app-i18n/transifex-client/transifex-client-1.3.0.ebuild
 2104042209 ./app-i18n/translate-shell/translate-shell-0.9.6.11.ebuild
 2201201609 ./app-i18n/translate-shell/translate-shell-0.9.6.12.ebuild
 2009060909 ./app-i18n/uchardet/uchardet-9999.ebuild
@@ -3704,7 +3710,7 @@
 2107031039 ./app-metrics/prometheus-bin/prometheus-bin-2.28.1.ebuild
 2111080009 ./app-metrics/prometheus-bin/prometheus-bin-2.31.1.ebuild
 2202180710 ./app-metrics/prometheus/prometheus-2.31.1.ebuild
-2207240210 ./app-metrics/prometheus/prometheus-2.36.2.ebuild
+2208111410 ./app-metrics/prometheus/prometheus-2.36.2.ebuild
 2205160340 ./app-metrics/pushgateway/pushgateway-1.4.2.ebuild
 2206020610 ./app-metrics/pushgateway/pushgateway-1.4.3.ebuild
 2203202309 ./app-metrics/rabbitmq_exporter/rabbitmq_exporter-0.29.0-r1.ebuild
@@ -4261,9 +4267,8 @@
 2207210140 ./app-pda/usbmuxd/usbmuxd-1.1.1.ebuild
 2204222109 ./app-portage/cfg-update/cfg-update-1.8.9-r2.ebuild
 2105022339 ./app-portage/conf-update/conf-update-1.0.3-r1.ebuild
-2207261010 ./app-portage/cpuid2cpuflags/cpuid2cpuflags-12.ebuild
-2105231109 ./app-portage/diffmask/diffmask-0.3.3-r4.ebuild
-2208082310 ./app-portage/diffmask/diffmask-0.3.3-r5.ebuild
+2208101740 ./app-portage/cpuid2cpuflags/cpuid2cpuflags-12.ebuild
+2208101740 ./app-portage/diffmask/diffmask-0.3.3-r5.ebuild
 2208082310 ./app-portage/distpatch/distpatch-0.1.2-r2.ebuild
 2207260540 ./app-portage/eix/eix-0.36.4.ebuild
 2207301310 ./app-portage/eix/eix-0.36.3.ebuild
@@ -4280,8 +4285,7 @@
 2112121739 ./app-portage/euses/euses-2.6.0.ebuild
 2107301209 ./app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4-r1.ebuild
 2208082310 ./app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4-r2.ebuild
-2109050109 ./app-portage/flaggie/flaggie-0.2.1-r1.ebuild
-2206061010 ./app-portage/flaggie/flaggie-0.2.1-r2.ebuild
+2208101740 ./app-portage/flaggie/flaggie-0.2.1-r2.ebuild
 2107251209 ./app-portage/fquery/fquery-0.2.3-r1.ebuild
 2012311940 ./app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild
 2004110239 ./app-portage/g-cpan/g-cpan-0.17.0.ebuild
@@ -4289,25 +4293,25 @@
 2207040210 ./app-portage/g-cpan/g-cpan-9999.ebuild
 2208082310 ./app-portage/g-octave/g-octave-0.4.1-r7.ebuild
 2207160840 ./app-portage/g-sorcery/g-sorcery-0.2.2-r1.ebuild
-2208082310 ./app-portage/gander/gander-0.0.1-r2.ebuild
-2205150710 ./app-portage/gemato/gemato-16.2.ebuild
-2205150710 ./app-portage/gemato/gemato-9999.ebuild
+2208101740 ./app-portage/gander/gander-0.0.1-r2.ebuild
+2208101740 ./app-portage/gemato/gemato-16.2.ebuild
+2208101740 ./app-portage/gemato/gemato-9999.ebuild
 2110190540 ./app-portage/genlop/genlop-0.30.10-r2.ebuild
 2103212109 ./app-portage/genlop/genlop-9999.ebuild
 2207120410 ./app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild
 2207120410 ./app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild
 2207121110 ./app-portage/gentoolkit/gentoolkit-0.6.1-r3.ebuild
 2207121110 ./app-portage/gentoolkit/gentoolkit-9999.ebuild
-2206051040 ./app-portage/gentoopm/gentoopm-0.4.ebuild
-2206051040 ./app-portage/gentoopm/gentoopm-9999.ebuild
+2208101740 ./app-portage/gentoopm/gentoopm-0.4.ebuild
+2208101740 ./app-portage/gentoopm/gentoopm-9999.ebuild
 1902251309 ./app-portage/golop/golop-9999.ebuild
 2112121739 ./app-portage/golop/golop-0.2.1.ebuild
-2208100040 ./app-portage/gpyutils/gpyutils-0.8.2.ebuild
+2208101740 ./app-portage/gpyutils/gpyutils-0.8.2.ebuild
 2207182310 ./app-portage/grs/grs-0.7.ebuild
 2207251710 ./app-portage/grs/grs-9999.ebuild
 2208012010 ./app-portage/grs/grs-0.8-r1.ebuild
 2207160840 ./app-portage/gs-elpa/gs-elpa-0.2.1-r1.ebuild
-2208082310 ./app-portage/gverify/gverify-2.ebuild
+2208101740 ./app-portage/gverify/gverify-2.ebuild
 2207230511 ./app-portage/hackport/hackport-9999.ebuild
 2207301211 ./app-portage/hackport/hackport-0.7.2.2.ebuild
 2206192340 ./app-portage/iwdevtools/iwdevtools-9999.ebuild
@@ -4315,10 +4319,7 @@
 2208100910 ./app-portage/iwdevtools/iwdevtools-0.11.6.ebuild
 2105041239 ./app-portage/java-ebuilder/java-ebuilder-0.5.1-r1.ebuild
 2105041239 ./app-portage/java-ebuilder/java-ebuilder-9999.ebuild
-2106061039 ./app-portage/kuroneko/kuroneko-0.1.0.ebuild
-2106072009 ./app-portage/kuroneko/kuroneko-0.1.1.ebuild
-2106101409 ./app-portage/kuroneko/kuroneko-0.1.2.ebuild
-2106121639 ./app-portage/kuroneko/kuroneko-0.1.3.ebuild
+2208101740 ./app-portage/kuroneko/kuroneko-0.1.3.ebuild
 2207271340 ./app-portage/kuroo/kuroo-1.2.1-r1.ebuild
 2207271340 ./app-portage/kuroo/kuroo-9999.ebuild
 2204280110 ./app-portage/layman/layman-2.4.3.ebuild
@@ -4329,13 +4330,13 @@
 2205252310 ./app-portage/metagen/metagen-9999.ebuild
 2207311940 ./app-portage/metagen/metagen-0.7.3-r1.ebuild
 2208082310 ./app-portage/metagen/metagen-0.7.3.ebuild
-2207260815 ./app-portage/mgorny-dev-scripts/mgorny-dev-scripts-22.ebuild
-2207271140 ./app-portage/mgorny-dev-scripts/mgorny-dev-scripts-21.ebuild
 2207300810 ./app-portage/mgorny-dev-scripts/mgorny-dev-scripts-24.ebuild
+2208101740 ./app-portage/mgorny-dev-scripts/mgorny-dev-scripts-21.ebuild
+2208101740 ./app-portage/mgorny-dev-scripts/mgorny-dev-scripts-22.ebuild
 2205191040 ./app-portage/mirrorselect/mirrorselect-2.2.6-r2.ebuild
 2207110040 ./app-portage/mirrorselect/mirrorselect-2.3.0-r1.ebuild
 2207110040 ./app-portage/mirrorselect/mirrorselect-9999.ebuild
-2204271440 ./app-portage/nattka/nattka-0.3.1.ebuild
+2208101740 ./app-portage/nattka/nattka-0.3.1.ebuild
 2104031909 ./app-portage/no-distcc-env/no-distcc-env-9999.ebuild
 2101310343 ./app-portage/overlint/overlint-0.5.3-r2.ebuild
 2208082310 ./app-portage/overlint/overlint-0.5.3-r3.ebuild
@@ -4354,7 +4355,7 @@
 2208082310 ./app-portage/porticron/porticron-0.7.1.ebuild
 2205092345 ./app-portage/portpeek/portpeek-3.2.2.ebuild
 2208082310 ./app-portage/portpeek/portpeek-3.2.2-r1.ebuild
-2204212239 ./app-portage/pram/pram-10.ebuild
+2208101740 ./app-portage/pram/pram-10.ebuild
 2101061639 ./app-portage/prefix-toolkit/prefix-toolkit-8.ebuild
 2207112340 ./app-portage/prefix-toolkit/prefix-toolkit-9.ebuild
 2109290309 ./app-portage/recover-broken-vdb/recover-broken-vdb-9999.ebuild
@@ -4362,14 +4363,14 @@
 2008291939 ./app-portage/repo-commit/repo-commit-9999.ebuild
 2208082310 ./app-portage/repo-commit/repo-commit-0.4.1-r1.ebuild
 2207090910 ./app-portage/repoman/repoman-3.0.3-r2.ebuild
-2206051040 ./app-portage/smart-live-rebuild/smart-live-rebuild-1.4.0.ebuild
-2206051040 ./app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
+2208101740 ./app-portage/smart-live-rebuild/smart-live-rebuild-1.4.0.ebuild
+2208101740 ./app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
 2205190610 ./app-portage/tatt/tatt-9999.ebuild
 2207030610 ./app-portage/tatt/tatt-0.8.ebuild
 2207030610 ./app-portage/tatt/tatt-0.9.ebuild
 2012311940 ./app-portage/ufed/ufed-0.96.ebuild
 2003261841 ./app-portage/ufed/ufed-9999.ebuild
-2208081810 ./app-portage/unsymlink-lib/unsymlink-lib-20.ebuild
+2208101740 ./app-portage/unsymlink-lib/unsymlink-lib-20.ebuild
 2201280010 ./app-shells/autojump/autojump-22.5.3-r1.ebuild
 2205071110 ./app-shells/bash-completion/bash-completion-2.11.ebuild
 2205071110 ./app-shells/bash-completion/bash-completion-9999.ebuild
@@ -4393,10 +4394,10 @@
 2201091409 ./app-shells/dash/dash-0.5.11.5.ebuild
 2012271709 ./app-shells/dsh/dsh-0.25.10-r1.ebuild
 2104212309 ./app-shells/esh/esh-0.8.5-r2.ebuild
-2205010512 ./app-shells/fish/fish-3.4.1.ebuild
-2205191240 ./app-shells/fish/fish-3.4.0.ebuild
-2207050040 ./app-shells/fish/fish-3.5.0.ebuild
-2207050040 ./app-shells/fish/fish-9999.ebuild
+2208111410 ./app-shells/fish/fish-3.4.0.ebuild
+2208111410 ./app-shells/fish/fish-3.4.1.ebuild
+2208111410 ./app-shells/fish/fish-3.5.0.ebuild
+2208111410 ./app-shells/fish/fish-9999.ebuild
 2207121010 ./app-shells/fzf/fzf-0.30.0.ebuild
 2207230110 ./app-shells/fzf/fzf-0.31.0.ebuild
 2206192210 ./app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211-r1.ebuild
@@ -4611,7 +4612,7 @@
 2109231839 ./app-text/htmlmin/htmlmin-0.1.12.ebuild
 2205241610 ./app-text/htmlmin/htmlmin-0.1.12-r1.ebuild
 1807070109 ./app-text/htmlrecode/htmlrecode-1.3.1-r1.ebuild
-2205130940 ./app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
+2208110740 ./app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
 2104161439 ./app-text/htp/htp-1.19.ebuild
 2205190840 ./app-text/hunspell/hunspell-1.7.0-r2.ebuild
 2109211939 ./app-text/hyperestraier/hyperestraier-1.4.13-r1.ebuild
@@ -4685,7 +4686,7 @@
 2110060540 ./app-text/mupdf/mupdf-1.18.0-r4.ebuild
 2202051009 ./app-text/mupdf/mupdf-1.19.0.ebuild
 2206011440 ./app-text/mupdf/mupdf-1.19.1.ebuild
-2207241010 ./app-text/mupdf/mupdf-1.20.0.ebuild
+2208101410 ./app-text/mupdf/mupdf-1.20.0.ebuild
 2204130309 ./app-text/mythes/mythes-1.2.4-r1.ebuild
 2110051709 ./app-text/namazu/namazu-2.0.21.ebuild
 2110051709 ./app-text/namazu/namazu-2.0.22_pre8.ebuild
@@ -5416,6 +5417,7 @@
 2206081140 ./dev-cpp/highway/highway-9999.ebuild
 2206151740 ./dev-cpp/highway/highway-0.16.0-r1.ebuild
 2208081610 ./dev-cpp/highway/highway-0.17.0.ebuild
+2208101140 ./dev-cpp/highway/highway-1.0.0.ebuild
 2205051910 ./dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.3.0-r2.ebuild
 2205182210 ./dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.4.0.ebuild
 2205180640 ./dev-cpp/taskflow/taskflow-3.3.0.ebuild
@@ -5503,7 +5505,7 @@
 2202280139 ./dev-db/mysql-connector-c++/mysql-connector-c++-8.0.27.ebuild
 2207030040 ./dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r2.ebuild
 2205171740 ./dev-db/mysql-connector-c/mysql-connector-c-8.0.27.ebuild
-2207151040 ./dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild
+2208111010 ./dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild
 2205191040 ./dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r4.ebuild
 2204050109 ./dev-db/mysql-super-smack/mysql-super-smack-1.3-r5.ebuild
 2206121141 ./dev-db/mysql-workbench/mysql-workbench-8.0.28.ebuild
@@ -5818,18 +5820,13 @@
 2104191309 ./dev-games/mercator/mercator-0.3.3.ebuild
 2203110039 ./dev-games/mygui/mygui-3.4.1.ebuild
 2104062139 ./dev-games/newton/newton-3.14.ebuild
-2104200009 ./dev-games/ode/ode-0.11.1.ebuild
-2104200009 ./dev-games/ode/ode-0.12.ebuild
 2112141209 ./dev-games/ode/ode-0.14-r1.ebuild
 2201160540 ./dev-games/ogre/ogre-1.9.0-r3.ebuild
 2202121539 ./dev-games/ogre/ogre-2.1-r1.ebuild
 2206031540 ./dev-games/ogre/ogre-1.12.9-r2.ebuild
 2112080640 ./dev-games/ois/ois-1.5.1.ebuild
-2112080640 ./dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017.ebuild
 2202180540 ./dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017-r1.ebuild
 2010240239 ./dev-games/openscenegraph-qt/openscenegraph-qt-3.5.7-r1.ebuild
-2112080640 ./dev-games/openscenegraph/openscenegraph-3.6.5-r101.ebuild
-2112080640 ./dev-games/openscenegraph/openscenegraph-3.6.5-r110.ebuild
 2203010309 ./dev-games/openscenegraph/openscenegraph-3.6.5-r112.ebuild
 2011160239 ./dev-games/paklib/paklib-0.3.ebuild
 2002112051 ./dev-games/physfs/physfs-9999.ebuild
@@ -5839,7 +5836,6 @@
 2104052109 ./dev-games/quake4-sdk/quake4-sdk-1.4.2-r1.ebuild
 2112080640 ./dev-games/recastnavigation/recastnavigation-1.5.1_p20210305.ebuild
 2104111239 ./dev-games/simgear/simgear-9999.ebuild
-2204110040 ./dev-games/simgear/simgear-2020.3.12.ebuild
 2205132310 ./dev-games/simgear/simgear-2020.3.13.ebuild
 2106101509 ./dev-games/t4k-common/t4k-common-0.1.1-r1.ebuild
 2207011140 ./dev-games/tiled/tiled-1.8.6.ebuild
@@ -6867,7 +6863,7 @@
 2201281240 ./dev-java/jakarta-regexp/jakarta-regexp-1.5-r1.ebuild
 2203081640 ./dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild
 2202021839 ./dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
-2207111440 ./dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild
+2208111040 ./dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild
 2203171240 ./dev-java/jal/jal-20031117-r6.ebuild
 2112222209 ./dev-java/jansi-native/jansi-native-1.8.ebuild
 2112222209 ./dev-java/jansi/jansi-1.13.ebuild
@@ -6878,7 +6874,7 @@
 2207011110 ./dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild
 2104281209 ./dev-java/java-getopt/java-getopt-1.0.14-r1.ebuild
 2203121509 ./dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild
-2208051010 ./dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
+2208101140 ./dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
 2205171340 ./dev-java/javacc/javacc-5.0-r4.ebuild
 2103262209 ./dev-java/javacup/javacup-0.11b_p20151001-r1.ebuild
 2206081210 ./dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild
@@ -7023,6 +7019,7 @@
 2204252340 ./dev-java/snakeyaml/snakeyaml-1.30.ebuild
 2207281240 ./dev-java/snakeyaml/snakeyaml-1.30-r1.ebuild
 2203181210 ./dev-java/snappy/snappy-1.1.7.8.ebuild
+2208101140 ./dev-java/snappy/snappy-1.1.7.8-r1.ebuild
 2207102240 ./dev-java/sparsebitset/sparsebitset-1.2.ebuild
 2103271109 ./dev-java/spec-alpha/spec-alpha-0.2.194.ebuild
 2112260340 ./dev-java/spec-alpha/spec-alpha-0.1.143.ebuild
@@ -7111,6 +7108,7 @@
 2203170440 ./dev-java/jeromq/jeromq-0.5.2.ebuild
 2207312140 ./dev-java/log4j-core/log4j-core-2.17.2-r1.ebuild
 2208091110 ./dev-java/log4j-core/log4j-core-2.18.0.ebuild
+2208101140 ./dev-java/log4j-core/log4j-core-2.18.0-r1.ebuild
 2205151210 ./dev-java/log4j-12-api/log4j-12-api-2.17.2.ebuild
 2208091110 ./dev-java/log4j-12-api/log4j-12-api-2.18.0.ebuild
 2203312140 ./dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild
@@ -7124,6 +7122,7 @@
 2207071740 ./dev-java/byte-buddy-agent/byte-buddy-agent-1.12.10.ebuild
 2207071740 ./dev-java/byte-buddy/byte-buddy-1.12.10.ebuild
 2207222110 ./dev-java/byte-buddy/byte-buddy-1.12.12.ebuild
+2208101140 ./dev-java/byte-buddy/byte-buddy-1.12.13.ebuild
 2206171610 ./dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild
 2206231010 ./dev-java/janino/janino-3.1.7.ebuild
 2206171610 ./dev-java/logback-classic/logback-classic-1.2.11.ebuild
@@ -7133,7 +7132,7 @@
 2207052310 ./dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0.ebuild
 2207271210 ./dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0-r1.ebuild
 2207242040 ./dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild
-2207111010 ./dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild
+2208101410 ./dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild
 2207242040 ./dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild
 2207242040 ./dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0-r1.ebuild
 2207281040 ./dev-java/saslprep/saslprep-1.1.ebuild
@@ -7323,6 +7322,9 @@
 2208082340 ./dev-lang/python/python-3.11.0_rc1.ebuild
 2208100910 ./dev-lang/python/python-3.8.13_p5.ebuild
 2208100910 ./dev-lang/python/python-3.9.13_p2.ebuild
+2208101940 ./dev-lang/python/python-3.10.6_p2.ebuild
+2208101940 ./dev-lang/python/python-3.8.13_p6.ebuild
+2208101940 ./dev-lang/python/python-3.9.13_p4.ebuild
 2205210910 ./dev-lang/qu-prolog/qu-prolog-10.6.ebuild
 2111290409 ./dev-lang/rakudo/rakudo-2021.06.ebuild
 2111290409 ./dev-lang/rakudo/rakudo-2021.08.ebuild
@@ -7355,7 +7357,6 @@
 2102171309 ./dev-lang/snobol/snobol-1.4.1-r1.ebuild
 2202062109 ./dev-lang/spark/spark-2021.ebuild
 2205260410 ./dev-lang/spidermonkey/spidermonkey-68.12.0-r1.ebuild
-2206161940 ./dev-lang/spidermonkey/spidermonkey-1.8.5-r10.ebuild
 2207011010 ./dev-lang/spidermonkey/spidermonkey-91.11.0.ebuild
 2207270740 ./dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild
 2207310710 ./dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r6.ebuild
@@ -7421,6 +7422,7 @@
 2104040139 ./dev-libs/antlr-c/antlr-c-3.5.2-r1.ebuild
 2108280010 ./dev-libs/appstream-glib/appstream-glib-0.7.18-r1.ebuild
 2207190210 ./dev-libs/appstream-glib/appstream-glib-0.8.0.ebuild
+2208102310 ./dev-libs/appstream-glib/appstream-glib-0.8.1.ebuild
 2204061009 ./dev-libs/appstream/appstream-0.14.6.ebuild
 2205140410 ./dev-libs/apr-util/apr-util-1.6.1-r8.ebuild
 2207011110 ./dev-libs/apr-util/apr-util-1.6.1-r9.ebuild
@@ -7553,6 +7555,7 @@
 2206222141 ./dev-libs/flatbuffers/flatbuffers-2.0.6-r1.ebuild
 2205280910 ./dev-libs/folks/folks-0.15.5.ebuild
 2106190039 ./dev-libs/foma/foma-0.9.18-r1.ebuild
+2208101110 ./dev-libs/foma/foma-0.10.0_p20220612.ebuild
 2101130309 ./dev-libs/freexl/freexl-1.0.5.ebuild
 2108150239 ./dev-libs/freexl/freexl-1.0.6.ebuild
 2205311240 ./dev-libs/fribidi/fribidi-1.0.12.ebuild
@@ -7603,7 +7606,7 @@
 2112260340 ./dev-libs/icinga-php-library/icinga-php-library-0.6.1-r1.ebuild
 2205100410 ./dev-libs/icinga-php-library/icinga-php-library-0.8.1.ebuild
 2205100410 ./dev-libs/icinga-php-thirdparty/icinga-php-thirdparty-0.10.0-r1.ebuild
-2206220810 ./dev-libs/icinga-php-thirdparty/icinga-php-thirdparty-0.11.0.ebuild
+2208110340 ./dev-libs/icinga-php-thirdparty/icinga-php-thirdparty-0.11.0.ebuild
 2206181910 ./dev-libs/icu-layoutex/icu-layoutex-71.1.ebuild
 2108070909 ./dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild
 2207300540 ./dev-libs/icu/icu-71.1-r1.ebuild
@@ -7702,7 +7705,7 @@
 2207311440 ./dev-libs/libclc/libclc-14.0.6.ebuild
 2207311710 ./dev-libs/libclc/libclc-15.0.0.9999.ebuild
 2208092110 ./dev-libs/libclc/libclc-15.0.0_rc2.ebuild
-2208052310 ./dev-libs/libclc/libclc-16.0.0.9999.ebuild
+2208102340 ./dev-libs/libclc/libclc-16.0.0.9999.ebuild
 2104161439 ./dev-libs/libclthreads/libclthreads-2.4.2.ebuild
 2205190840 ./dev-libs/libconfig/libconfig-1.7.3.ebuild
 2205171110 ./dev-libs/libcroco/libcroco-0.6.13-r1.ebuild
@@ -7776,7 +7779,7 @@
 2205150210 ./dev-libs/libg15render/libg15render-9999.ebuild
 2202070709 ./dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
 2002112051 ./dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild
-2104010409 ./dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
+2208101610 ./dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
 2205130610 ./dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild
 2206160010 ./dev-libs/libgcrypt/libgcrypt-1.10.1-r1.ebuild
 2205260840 ./dev-libs/libgdata/libgdata-0.18.1.ebuild
@@ -7801,7 +7804,7 @@
 2110272109 ./dev-libs/libgweather/libgweather-40.0.ebuild
 2205280910 ./dev-libs/libgweather/libgweather-4.0.0.ebuild
 2202100210 ./dev-libs/libhid/libhid-0.2.17-r1.ebuild
-2205181810 ./dev-libs/libical/libical-3.0.14-r1.ebuild
+2208111310 ./dev-libs/libical/libical-3.0.14-r1.ebuild
 2201061240 ./dev-libs/libiconv/libiconv-1.15.ebuild
 2201061240 ./dev-libs/libiconv/libiconv-1.16.ebuild
 2205162310 ./dev-libs/libiconv/libiconv-1.17.ebuild
@@ -7818,9 +7821,9 @@
 2206141640 ./dev-libs/libixion/libixion-0.17.0.ebuild
 2206301310 ./dev-libs/libjcat/libjcat-0.1.11.ebuild
 2207210140 ./dev-libs/libkpass/libkpass-6-r2.ebuild
-2106110139 ./dev-libs/libksba/libksba-1.5.0.ebuild
-2106121909 ./dev-libs/libksba/libksba-1.5.1.ebuild
-2206151140 ./dev-libs/libksba/libksba-1.6.0.ebuild
+2208101610 ./dev-libs/libksba/libksba-1.5.0.ebuild
+2208101610 ./dev-libs/libksba/libksba-1.5.1.ebuild
+2208101610 ./dev-libs/libksba/libksba-1.6.0.ebuild
 2109271809 ./dev-libs/liblinear/liblinear-243.ebuild
 2104031909 ./dev-libs/liblist/liblist-2.4-r1.ebuild
 2105160309 ./dev-libs/liblogging/liblogging-1.0.6.ebuild
@@ -7936,8 +7939,9 @@
 2104221539 ./dev-libs/libspt/libspt-1.1-r4.ebuild
 1912110241 ./dev-libs/libstrl/libstrl-0.5.1-r1.ebuild
 2203231209 ./dev-libs/libstroke/libstroke-0.5.1-r1.ebuild
-2206281115 ./dev-libs/libstrophe/libstrophe-0.12.0.ebuild
-2207091410 ./dev-libs/libstrophe/libstrophe-0.12.1.ebuild
+2208101140 ./dev-libs/libstrophe/libstrophe-0.12.0.ebuild
+2208101140 ./dev-libs/libstrophe/libstrophe-0.12.1.ebuild
+2208101140 ./dev-libs/libstrophe/libstrophe-0.12.2.ebuild
 2207272340 ./dev-libs/libtar/libtar-1.2.20-r5.ebuild
 2207010210 ./dev-libs/libtasn1/libtasn1-4.18.0.ebuild
 2204302110 ./dev-libs/libtecla/libtecla-1.6.3.ebuild
@@ -8301,7 +8305,7 @@
 2105251739 ./dev-libs/vc/vc-1.4.1-r1.ebuild
 2202162309 ./dev-libs/vc/vc-1.4.2.ebuild
 2205231840 ./dev-libs/vc/vc-1.4.3.ebuild
-2206041040 ./dev-libs/voikko-fi/voikko-fi-2.5.ebuild
+2208101110 ./dev-libs/voikko-fi/voikko-fi-2.5-r1.ebuild
 2207021610 ./dev-libs/volume_key/volume_key-0.3.12-r4.ebuild
 2205100440 ./dev-libs/wayland-protocols/wayland-protocols-9999.ebuild
 2205132210 ./dev-libs/wayland-protocols/wayland-protocols-1.25.ebuild
@@ -11220,6 +11224,7 @@
 2207102110 ./dev-python/astroid/astroid-2.11.6.ebuild
 2208091510 ./dev-python/astroid/astroid-2.12.2.ebuild
 2207291340 ./dev-python/asttokens/asttokens-2.0.5.ebuild
+2208111310 ./dev-python/asttokens/asttokens-2.0.7.ebuild
 2112240209 ./dev-python/astunparse/astunparse-1.6.3.ebuild
 2205122240 ./dev-python/async-lru/async-lru-1.0.3.ebuild
 2206121610 ./dev-python/async_generator/async_generator-1.10-r2.ebuild
@@ -11293,11 +11298,13 @@
 2208081540 ./dev-python/boto3/boto3-1.24.36.ebuild
 2208050940 ./dev-python/boto3/boto3-1.24.46.ebuild
 2208092110 ./dev-python/boto3/boto3-1.24.47.ebuild
+2208111310 ./dev-python/boto3/boto3-1.24.49.ebuild
 2207230940 ./dev-python/botocore/botocore-9999.ebuild
 2207301240 ./dev-python/botocore/botocore-1.27.41.ebuild
 2208081540 ./dev-python/botocore/botocore-1.27.36.ebuild
 2208050940 ./dev-python/botocore/botocore-1.27.46.ebuild
 2208092110 ./dev-python/botocore/botocore-1.27.47.ebuild
+2208111310 ./dev-python/botocore/botocore-1.27.49.ebuild
 2206030910 ./dev-python/bottle/bottle-0.12.21.ebuild
 2208041040 ./dev-python/bottle/bottle-0.12.23.ebuild
 2208031110 ./dev-python/bottleneck/bottleneck-1.3.5.ebuild
@@ -11385,7 +11392,7 @@
 2207171040 ./dev-python/confuse/confuse-2.0.0.ebuild
 2203282210 ./dev-python/consonance/consonance-0.1.5-r1.ebuild
 2205131240 ./dev-python/constantly/constantly-15.1.0-r2.ebuild
-2203270940 ./dev-python/construct/construct-2.10.68.ebuild
+2208101610 ./dev-python/construct/construct-2.10.68.ebuild
 2206161240 ./dev-python/cookies/cookies-2.2.1-r2.ebuild
 2204241639 ./dev-python/coreapi/coreapi-2.3.3-r2.ebuild
 2205252110 ./dev-python/coreschema/coreschema-0.0.4-r1.ebuild
@@ -11399,7 +11406,7 @@
 2205122240 ./dev-python/crcmod/crcmod-1.7-r5.ebuild
 2206161840 ./dev-python/croniter/croniter-1.3.5.ebuild
 2207291110 ./dev-python/cryptography/cryptography-37.0.4.ebuild
-2203311540 ./dev-python/css-parser/css-parser-1.0.7-r1.ebuild
+2208101610 ./dev-python/css-parser/css-parser-1.0.7-r1.ebuild
 2206121510 ./dev-python/cssselect/cssselect-1.1.0-r2.ebuild
 2206221010 ./dev-python/cssselect2/cssselect2-0.6.0.ebuild
 2207041340 ./dev-python/cssutils/cssutils-2.4.2.ebuild
@@ -11422,9 +11429,10 @@
 2206171140 ./dev-python/dbfread/dbfread-2.0.7-r1.ebuild
 2205241940 ./dev-python/dbus-python/dbus-python-1.2.18.ebuild
 2206241440 ./dev-python/ddt/ddt-1.5.0.ebuild
+2208111210 ./dev-python/ddt/ddt-1.6.0.ebuild
 2205281910 ./dev-python/debtcollector/debtcollector-2.5.0.ebuild
 2207151040 ./dev-python/debugpy/debugpy-1.6.0.ebuild
-2208091110 ./dev-python/debugpy/debugpy-1.6.2.ebuild
+2208101110 ./dev-python/debugpy/debugpy-1.6.2.ebuild
 2206161210 ./dev-python/decorator/decorator-5.1.1-r1.ebuild
 2205212140 ./dev-python/deepmerge/deepmerge-1.0.1.ebuild
 2206161840 ./dev-python/defcon/defcon-0.10.1.ebuild
@@ -11500,7 +11508,7 @@
 2207031410 ./dev-python/easyprocess/easyprocess-1.1-r1.ebuild
 2205181740 ./dev-python/ecdsa/ecdsa-0.17.0.ebuild
 2207101440 ./dev-python/ecdsa/ecdsa-0.18.0.ebuild
-2106051639 ./dev-python/editorconfig-core-py/editorconfig-core-py-0.12.3-r1.ebuild
+2208101610 ./dev-python/editorconfig-core-py/editorconfig-core-py-0.12.3-r1.ebuild
 2111052039 ./dev-python/elasticsearch-py/elasticsearch-py-7.14.1.ebuild
 2206212210 ./dev-python/elementpath/elementpath-2.5.3.ebuild
 2207171040 ./dev-python/elementpath/elementpath-3.0.0.ebuild
@@ -11519,7 +11527,7 @@
 2205211240 ./dev-python/et_xmlfile/et_xmlfile-1.1.0-r1.ebuild
 2206171010 ./dev-python/eventlet/eventlet-0.33.1.ebuild
 2107071509 ./dev-python/ewmh/ewmh-0.1.6.ebuild
-2108020039 ./dev-python/exam/exam-0.10.6.ebuild
+2208101640 ./dev-python/exam/exam-0.10.6.ebuild
 2206100640 ./dev-python/execnet/execnet-1.9.0-r1.ebuild
 2205080740 ./dev-python/executing/executing-0.8.3.ebuild
 2207251040 ./dev-python/executing/executing-0.9.0.ebuild
@@ -11540,6 +11548,7 @@
 2207242240 ./dev-python/fido2/fido2-1.0.0.ebuild
 2206100640 ./dev-python/fields/fields-5.0.0-r3.ebuild
 2206161240 ./dev-python/filelock/filelock-3.7.1.ebuild
+2208111310 ./dev-python/filelock/filelock-3.8.0.ebuild
 2205311340 ./dev-python/filetype/filetype-1.0.10.ebuild
 2205212140 ./dev-python/findimports/findimports-2.2.0-r1.ebuild
 2201291539 ./dev-python/fitsio/fitsio-1.1.7.ebuild
@@ -11689,6 +11698,7 @@
 2207261740 ./dev-python/hypothesis/hypothesis-6.53.0.ebuild
 2207301310 ./dev-python/hypothesis/hypothesis-6.49.1.ebuild
 2208022010 ./dev-python/hypothesis/hypothesis-6.54.1.ebuild
+2208111310 ./dev-python/hypothesis/hypothesis-6.54.2.ebuild
 2112210709 ./dev-python/icalendar/icalendar-4.0.9.ebuild
 2207112310 ./dev-python/icalendar/icalendar-4.1.0.ebuild
 2205311040 ./dev-python/identify/identify-2.5.1.ebuild
@@ -11731,8 +11741,7 @@
 2205311040 ./dev-python/ioflo/ioflo-2.0.2-r2.ebuild
 2206011110 ./dev-python/ipaddr/ipaddr-2.2.0-r2.ebuild
 2207102010 ./dev-python/ipdb/ipdb-0.13.9-r2.ebuild
-2207091210 ./dev-python/ipykernel/ipykernel-6.15.1.ebuild
-2207102010 ./dev-python/ipykernel/ipykernel-6.15.0.ebuild
+2208101110 ./dev-python/ipykernel/ipykernel-6.15.1.ebuild
 2207291540 ./dev-python/ipyparallel/ipyparallel-8.4.1.ebuild
 2207142310 ./dev-python/ipython/ipython-8.4.0.ebuild
 2203151509 ./dev-python/ipython_genutils/ipython_genutils-0.2.0-r3.ebuild
@@ -11898,6 +11907,7 @@
 2203262039 ./dev-python/matplotlib-inline/matplotlib-inline-0.1.3-r1.ebuild
 2206291240 ./dev-python/matplotlib/matplotlib-3.5.1-r2.ebuild
 2207210010 ./dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild
+2208111210 ./dev-python/matplotlib/matplotlib-3.5.3.ebuild
 2207041010 ./dev-python/matterhook/matterhook-0.2-r2.ebuild
 2110260909 ./dev-python/mccabe/mccabe-0.6.1-r2.ebuild
 2206170210 ./dev-python/mccabe/mccabe-0.7.0.ebuild
@@ -11964,6 +11974,7 @@
 2208022040 ./dev-python/nbclient/nbclient-0.6.6.ebuild
 2206121810 ./dev-python/nbconvert/nbconvert-6.5.0-r1.ebuild
 2208011740 ./dev-python/nbconvert/nbconvert-6.5.0-r2.ebuild
+2208111310 ./dev-python/nbconvert/nbconvert-6.5.2.ebuild
 2206121810 ./dev-python/nbdime/nbdime-3.1.1-r1.ebuild
 2205151140 ./dev-python/nbformat/nbformat-5.4.0.ebuild
 2207102010 ./dev-python/nbsphinx/nbsphinx-0.8.9.ebuild
@@ -11995,6 +12006,7 @@
 2105291139 ./dev-python/ntplib/ntplib-0.4.0.ebuild
 2208042140 ./dev-python/nuitka/nuitka-1.0.1.ebuild
 2208082240 ./dev-python/nuitka/nuitka-1.0.2.ebuild
+2208111310 ./dev-python/nuitka/nuitka-1.0.3.ebuild
 2207251810 ./dev-python/numexpr/numexpr-2.8.3.ebuild
 2201061939 ./dev-python/numpy/numpy-1.22.0-r1.ebuild
 2201150040 ./dev-python/numpy/numpy-1.22.1.ebuild
@@ -12123,6 +12135,7 @@
 2109252309 ./dev-python/pockets/pockets-0.9.1-r2.ebuild
 2205311440 ./dev-python/podcastparser/podcastparser-0.6.8-r1.ebuild
 2203092340 ./dev-python/podman-py/podman-py-4.0.0.ebuild
+2208111210 ./dev-python/podman-py/podman-py-4.2.0.ebuild
 2108030109 ./dev-python/polib/polib-1.1.1.ebuild
 2203250209 ./dev-python/pony/pony-0.7.16.ebuild
 2205150710 ./dev-python/pooch/pooch-1.6.0.ebuild
@@ -12138,10 +12151,11 @@
 2207102010 ./dev-python/process-tests/process-tests-2.1.2-r1.ebuild
 2207102010 ./dev-python/progress/progress-1.6-r1.ebuild
 2201221539 ./dev-python/progressbar/progressbar-2.5.ebuild
-2202131339 ./dev-python/progressbar2/progressbar2-4.0.0.ebuild
+2208101610 ./dev-python/progressbar2/progressbar2-4.0.0.ebuild
 2207161540 ./dev-python/prometheus_client/prometheus_client-0.14.1.ebuild
 2207291540 ./dev-python/prompt_toolkit/prompt_toolkit-3.0.30.ebuild
 2207251040 ./dev-python/proto-plus/proto-plus-1.20.6.ebuild
+2208111210 ./dev-python/proto-plus/proto-plus-1.22.0.ebuild
 2204221509 ./dev-python/protobuf-python/protobuf-python-3.19.3-r2.ebuild
 2205181010 ./dev-python/protobuf-python/protobuf-python-9999.ebuild
 2207102240 ./dev-python/protobuf-python/protobuf-python-3.19.3-r3.ebuild
@@ -12217,6 +12231,7 @@
 2206052110 ./dev-python/pydotplus/pydotplus-2.0.2-r1.ebuild
 2206051940 ./dev-python/pydyf/pydyf-0.2.0.ebuild
 2206052110 ./dev-python/pyelftools/pyelftools-0.28.ebuild
+2208111210 ./dev-python/pyelftools/pyelftools-0.29.ebuild
 2206271140 ./dev-python/pyenchant/pyenchant-3.2.2-r1.ebuild
 2205240940 ./dev-python/pyfakefs/pyfakefs-4.5.6.ebuild
 2207131140 ./dev-python/pyfakefs/pyfakefs-4.6.0.ebuild
@@ -12245,6 +12260,7 @@
 2204211139 ./dev-python/pygresql/pygresql-5.2.4.ebuild
 2205191540 ./dev-python/pyh2o/pyh2o-1-r1.ebuild
 2206131040 ./dev-python/pyhamcrest/pyhamcrest-2.0.3-r1.ebuild
+2208111310 ./dev-python/pyhamcrest/pyhamcrest-2.0.4.ebuild
 2108020039 ./dev-python/pyhcl/pyhcl-0.4.4.ebuild
 2205151410 ./dev-python/pyicu/pyicu-2.9.ebuild
 2107161409 ./dev-python/pyinotify/pyinotify-0.9.6.ebuild
@@ -12299,7 +12315,7 @@
 2203181240 ./dev-python/pypax/pypax-0.9.5-r1.ebuild
 2203181510 ./dev-python/pypax/pypax-9999.ebuild
 2206220940 ./dev-python/pyperclip/pyperclip-1.8.2-r1.ebuild
-2203281240 ./dev-python/pyphen/pyphen-0.12.0-r1.ebuild
+2208101610 ./dev-python/pyphen/pyphen-0.12.0-r1.ebuild
 2207041010 ./dev-python/pypiserver/pypiserver-1.5.0-r2.ebuild
 2205212140 ./dev-python/pypng/pypng-0.0.21-r1.ebuild
 2207161110 ./dev-python/pypng/pypng-0.20220715.0.ebuild
@@ -12311,6 +12327,7 @@
 2205041840 ./dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9.ebuild
 2205041840 ./dev-python/pypy-exe/pypy-exe-7.3.9.ebuild
 2205041840 ./dev-python/pypy/pypy-7.3.9.ebuild
+2208102340 ./dev-python/pypy/pypy-7.3.9-r1.ebuild
 2205041840 ./dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9.ebuild
 2207242140 ./dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3.ebuild
 2205041840 ./dev-python/pypy3-exe/pypy3-exe-7.3.9.ebuild
@@ -12319,6 +12336,7 @@
 2207191640 ./dev-python/pypy3/pypy3-7.3.9_p2.ebuild
 2207242140 ./dev-python/pypy3/pypy3-7.3.9_p3.ebuild
 2208031010 ./dev-python/pypy3/pypy3-7.3.9_p4.ebuild
+2208101240 ./dev-python/pypy3/pypy3-7.3.9_p5.ebuild
 2206221910 ./dev-python/pyqrcode/pyqrcode-1.2.1-r2.ebuild
 2109241409 ./dev-python/pyqt-distutils/pyqt-distutils-0.7.3.ebuild
 2204212209 ./dev-python/pyqtgraph/pyqtgraph-0.12.4.ebuild
@@ -12346,16 +12364,16 @@
 2203152111 ./dev-python/pyspf/pyspf-2.0.14-r3.ebuild
 2205311110 ./dev-python/pyspnego/pyspnego-0.5.2.ebuild
 2207111040 ./dev-python/pyspnego/pyspnego-0.5.3.ebuild
+2208111210 ./dev-python/pyspnego/pyspnego-0.5.4.ebuild
 2206010440 ./dev-python/pysrt/pysrt-9999.ebuild
 2207022141 ./dev-python/pysrt/pysrt-1.1.2-r1.ebuild
 2206051940 ./dev-python/pysvg/pysvg-0.2.2_p3-r1.ebuild
 2208040340 ./dev-python/pysvn/pysvn-1.9.15-r1.ebuild
 2202030009 ./dev-python/pytables/pytables-3.7.0.ebuild
-2205151140 ./dev-python/pyte/pyte-0.8.1.ebuild
+2208101640 ./dev-python/pyte/pyte-0.8.1.ebuild
 2206110940 ./dev-python/pytest-aiohttp/pytest-aiohttp-1.0.4.ebuild
 2205111610 ./dev-python/pytest-asyncio/pytest-asyncio-0.18.3.ebuild
 2207161110 ./dev-python/pytest-asyncio/pytest-asyncio-0.19.0.ebuild
-2206021840 ./dev-python/pytest-bdd/pytest-bdd-5.0.0-r1.ebuild
 2208071710 ./dev-python/pytest-bdd/pytest-bdd-6.0.1.ebuild
 2205111610 ./dev-python/pytest-check/pytest-check-1.0.5.ebuild
 2205142110 ./dev-python/pytest-console-scripts/pytest-console-scripts-1.3.1.ebuild
@@ -12460,7 +12478,7 @@
 2207251740 ./dev-python/python-keyutils/python-keyutils-0.6.ebuild
 2205140610 ./dev-python/python-ldap/python-ldap-9999.ebuild
 2206171010 ./dev-python/python-ldap/python-ldap-3.4.0_p20220420.ebuild
-2208091110 ./dev-python/python-ldap/python-ldap-3.4.2.ebuild
+2208101110 ./dev-python/python-ldap/python-ldap-3.4.2.ebuild
 2205171540 ./dev-python/python-levenshtein/python-levenshtein-0.12.2.ebuild
 2111192339 ./dev-python/python-lhafile/python-lhafile-0.3.0.ebuild
 2207021510 ./dev-python/python-libevdev/python-libevdev-0.11.ebuild
@@ -12529,7 +12547,7 @@
 2205291840 ./dev-python/pyx/pyx-0.15_p1.ebuild
 2204241440 ./dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.7.0.ebuild
 2208071210 ./dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.7.1.ebuild
-2202231139 ./dev-python/pyxattr/pyxattr-0.7.2.ebuild
+2208101610 ./dev-python/pyxattr/pyxattr-0.7.2.ebuild
 2206212140 ./dev-python/pyxdg/pyxdg-0.28.ebuild
 2206170240 ./dev-python/pyyaml/pyyaml-6.0-r1.ebuild
 2205162340 ./dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1-r1.ebuild
@@ -12568,7 +12586,7 @@
 2207061940 ./dev-python/regex/regex-2022.6.2.ebuild
 2207251040 ./dev-python/regex/regex-2022.7.24.ebuild
 2207291340 ./dev-python/regex/regex-2022.7.25.ebuild
-2208091110 ./dev-python/regex/regex-2022.7.9.ebuild
+2208101110 ./dev-python/regex/regex-2022.7.9.ebuild
 2206290940 ./dev-python/rencode/rencode-1.0.6-r3.ebuild
 2205281910 ./dev-python/reno/reno-3.5.0.ebuild
 2203121309 ./dev-python/reportlab/reportlab-3.6.6.ebuild
@@ -12579,10 +12597,10 @@
 2207112310 ./dev-python/reportlab/reportlab-3.6.11.ebuild
 2205221210 ./dev-python/repoze-lru/repoze-lru-0.7-r3.ebuild
 2208022340 ./dev-python/requests-cache/requests-cache-0.9.5.ebuild
-2202211239 ./dev-python/requests-credssp/requests-credssp-2.0.0.ebuild
+2208111210 ./dev-python/requests-credssp/requests-credssp-2.0.0.ebuild
 2206290340 ./dev-python/requests-file/requests-file-1.5.1-r2.ebuild
 2206291110 ./dev-python/requests-futures/requests-futures-1.0.0-r1.ebuild
-2205290040 ./dev-python/requests-kerberos/requests-kerberos-0.14.0-r1.ebuild
+2208111210 ./dev-python/requests-kerberos/requests-kerberos-0.14.0-r1.ebuild
 2206221340 ./dev-python/requests-mock/requests-mock-1.9.3-r1.ebuild
 2203251909 ./dev-python/requests-ntlm/requests-ntlm-1.1.0-r1.ebuild
 2206011040 ./dev-python/requests-oauthlib/requests-oauthlib-1.3.1.ebuild
@@ -12634,6 +12652,7 @@
 2206052140 ./dev-python/sarge/sarge-0.1.7_p1.ebuild
 2201282210 ./dev-python/sarif_om/sarif_om-1.0.4.ebuild
 2106052139 ./dev-python/scandir/scandir-1.10.0-r2.ebuild
+2208101610 ./dev-python/scandir/scandir-1.10.0-r3.ebuild
 2207150410 ./dev-python/scikit-build/scikit-build-0.15.0.ebuild
 2206231210 ./dev-python/scipy/scipy-1.8.1.ebuild
 2208012140 ./dev-python/scipy/scipy-1.9.0-r1.ebuild
@@ -12666,6 +12685,7 @@
 2208032040 ./dev-python/setuptools/setuptools-63.4.1.ebuild
 2208090710 ./dev-python/setuptools/setuptools-63.1.0.ebuild
 2208071110 ./dev-python/setuptools/setuptools-63.4.2.ebuild
+2208111210 ./dev-python/setuptools/setuptools-63.4.3.ebuild
 2207242240 ./dev-python/setuptools_scm/setuptools_scm-7.0.5.ebuild
 2207242240 ./dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.4.ebuild
 2108181109 ./dev-python/setuptools_trial/setuptools_trial-0.6.0-r1.ebuild
@@ -12841,6 +12861,7 @@
 2208020744 ./dev-python/tomli/tomli-2.0.1-r1.ebuild
 2208090710 ./dev-python/tomlkit/tomlkit-0.11.1.ebuild
 2208082240 ./dev-python/tomlkit/tomlkit-0.11.2.ebuild
+2208111310 ./dev-python/tomlkit/tomlkit-0.11.3.ebuild
 2206171440 ./dev-python/toolz/toolz-0.11.2-r1.ebuild
 2207101440 ./dev-python/toolz/toolz-0.12.0.ebuild
 2205162210 ./dev-python/toposort/toposort-1.7-r1.ebuild
@@ -13061,12 +13082,13 @@
 2207150410 ./dev-python/filebytes/filebytes-0.10.2.ebuild
 2207150410 ./dev-python/yara-python/yara-python-4.2.0-r2.ebuild
 2205121410 ./dev-python/autocommand/autocommand-2.2.1_p20211118.ebuild
-2204201109 ./dev-python/cachecontrol/cachecontrol-0.12.11.ebuild
+2208101640 ./dev-python/cachecontrol/cachecontrol-0.12.11.ebuild
 2208082310 ./dev-python/pip-run/pip-run-8.8.1.ebuild
 2207121010 ./dev-python/trimesh/trimesh-3.12.7.ebuild
 2207141040 ./dev-python/trimesh/trimesh-3.12.8.ebuild
 2207181110 ./dev-python/trimesh/trimesh-3.12.9.ebuild
 2208050940 ./dev-python/trimesh/trimesh-3.13.0.ebuild
+2208111210 ./dev-python/trimesh/trimesh-3.13.1.ebuild
 2205011710 ./dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.10.1.ebuild
 2202180139 ./dev-python/mapbox_earcut/mapbox_earcut-1.0.0.ebuild
 2203120440 ./dev-python/meshio/meshio-5.3.4.ebuild
@@ -13120,7 +13142,8 @@
 2207301310 ./dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
 2208091110 ./dev-python/flit_scm/flit_scm-1.7.0.ebuild
 2207291110 ./dev-python/setuptools-rust/setuptools-rust-1.3.0.ebuild
-2208091110 ./dev-python/setuptools-rust/setuptools-rust-1.4.1.ebuild
+2208101410 ./dev-python/setuptools-rust/setuptools-rust-1.4.1.ebuild
+2208111310 ./dev-python/setuptools-rust/setuptools-rust-1.5.0.ebuild
 2206241510 ./dev-python/dirty-equals/dirty-equals-0.4-r1.ebuild
 2206121110 ./dev-python/tpm2-pytss/tpm2-pytss-1.1.0.ebuild
 2206242140 ./dev-python/watchfiles/watchfiles-0.15.0-r1.ebuild
@@ -13178,7 +13201,9 @@
 2206251440 ./dev-python/trove-classifiers/trove-classifiers-2022.6.23.ebuild
 2206290940 ./dev-python/trove-classifiers/trove-classifiers-2022.6.26.ebuild
 2207230940 ./dev-python/trove-classifiers/trove-classifiers-2022.7.22.ebuild
+2208111310 ./dev-python/trove-classifiers/trove-classifiers-2022.8.7.ebuild
 2208040340 ./dev-python/sphinx-basic-ng/sphinx-basic-ng-0.0.1_alpha11.ebuild
+2208111310 ./dev-python/sphinx-basic-ng/sphinx-basic-ng-0.0.1_alpha12.ebuild
 2207021440 ./dev-python/ConfigArgParse/ConfigArgParse-1.5.3.ebuild
 2207021510 ./dev-python/DBUtils/DBUtils-3.0.2-r1.ebuild
 2207021510 ./dev-python/DBUtils/DBUtils-3.0.2.ebuild
@@ -13205,9 +13230,8 @@
 2208032210 ./dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.3.1.ebuild
 2208031710 ./dev-python/PyQt6-sip/PyQt6-sip-13.4.0.ebuild
 2208032210 ./dev-python/PyQt6/PyQt6-6.3.1.ebuild
-2208021610 ./dev-python/ensurepip-wheels/ensurepip-wheels-63.3.0.22.2.1.ebuild
-2208042110 ./dev-python/ensurepip-wheels/ensurepip-wheels-63.4.1.22.2.2.ebuild
-2208071110 ./dev-python/ensurepip-wheels/ensurepip-wheels-63.4.2.22.2.2.ebuild
+2208101110 ./dev-python/ensurepip-wheels/ensurepip-wheels-63.4.2.22.2.2.ebuild
+2208111210 ./dev-python/ensurepip-wheels/ensurepip-wheels-63.4.3.22.2.2.ebuild
 2208070810 ./dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild
 2207042110 ./dev-qt/assistant/assistant-5.15.5.ebuild
 2207042110 ./dev-qt/designer/designer-5.15.5.ebuild
@@ -14619,6 +14643,7 @@
 2205081810 ./dev-ruby/builder/builder-3.2.4-r1.ebuild
 2103111039 ./dev-ruby/bundler-audit/bundler-audit-0.8.0.ebuild
 2111270940 ./dev-ruby/bundler-audit/bundler-audit-0.9.0.1.ebuild
+2208110740 ./dev-ruby/bundler-audit/bundler-audit-0.9.1.ebuild
 2104060140 ./dev-ruby/bundler/bundler-2.1.4.ebuild
 2110172239 ./dev-ruby/bundler/bundler-2.2.18.ebuild
 2107230939 ./dev-ruby/bundler/bundler-2.2.24.ebuild
@@ -15568,6 +15593,7 @@
 2206282010 ./dev-ruby/webmock/webmock-3.14.0.ebuild
 2207290810 ./dev-ruby/webmock/webmock-3.14.0-r1.ebuild
 2208020810 ./dev-ruby/webmock/webmock-3.15.0.ebuild
+2208110740 ./dev-ruby/webmock/webmock-3.17.1.ebuild
 2201250309 ./dev-ruby/webrick/webrick-1.7.0.ebuild
 2205081810 ./dev-ruby/webrick/webrick-1.7.0-r1.ebuild
 2207290910 ./dev-ruby/webrobots/webrobots-0.1.2-r2.ebuild
@@ -15887,6 +15913,7 @@
 2205012210 ./dev-util/bazel/bazel-5.0.0.ebuild
 2111150810 ./dev-util/bbe/bbe-0.2.2-r1.ebuild
 2204182040 ./dev-util/bcc/bcc-0.24.0-r1.ebuild
+2208102310 ./dev-util/bcc/bcc-0.25.0.ebuild
 2102161539 ./dev-util/bcpp/bcpp-20210108.ebuild
 1911091939 ./dev-util/bdelta/bdelta-0.3.1-r1.ebuild
 2204080839 ./dev-util/bear/bear-2.4.4-r1.ebuild
@@ -16162,6 +16189,7 @@
 2101310343 ./dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild
 2110171539 ./dev-util/gprof2dot/gprof2dot-2021.02.21-r1.ebuild
 2102220209 ./dev-util/gprof2dot/gprof2dot-2021.02.21.ebuild
+2208110040 ./dev-util/gprof2dot/gprof2dot-2022.07.29.ebuild
 2205202240 ./dev-util/gtk-builder-convert/gtk-builder-convert-2.24.33.ebuild
 2204291110 ./dev-util/gtk-doc-am/gtk-doc-am-1.33.2.ebuild
 2206280511 ./dev-util/gtk-doc/gtk-doc-1.33.2.ebuild
@@ -16211,6 +16239,8 @@
 2206250940 ./dev-util/jenkins-bin/jenkins-bin-2.346.1.ebuild
 2207140940 ./dev-util/jenkins-bin/jenkins-bin-2.346.2.ebuild
 2207291010 ./dev-util/jenkins-bin/jenkins-bin-2.361.ebuild
+2208110740 ./dev-util/jenkins-bin/jenkins-bin-2.346.3.ebuild
+2208110740 ./dev-util/jenkins-bin/jenkins-bin-2.363.ebuild
 2205160610 ./dev-util/jfrog-cli/jfrog-cli-1.35.3.ebuild
 2207110040 ./dev-util/jfrog-cli/jfrog-cli-2.21.0.ebuild
 2207250210 ./dev-util/jfrog-cli/jfrog-cli-2.21.4.ebuild
@@ -16285,7 +16315,7 @@
 2108120640 ./dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9.ebuild
 2204291110 ./dev-util/ninja/ninja-1.10.2-r1.ebuild
 2207300540 ./dev-util/ninja/ninja-9999.ebuild
-2208092210 ./dev-util/ninja/ninja-1.11.0.ebuild
+2208101110 ./dev-util/ninja/ninja-1.11.0.ebuild
 2207030910 ./dev-util/ninka/ninka-2.0_pre1_p20220619.ebuild
 2201281040 ./dev-util/numdiff/numdiff-5.9.0.ebuild
 2201111640 ./dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-11.5.1.ebuild
@@ -16356,7 +16386,7 @@
 2202111709 ./dev-util/quilt/quilt-9999.ebuild
 2203262039 ./dev-util/quilt/quilt-0.67.ebuild
 2205110544 ./dev-util/radare2/radare2-5.6.8-r1.ebuild
-2207162010 ./dev-util/radare2/radare2-5.7.4.ebuild
+2208111410 ./dev-util/radare2/radare2-5.7.4.ebuild
 2109072039 ./dev-util/ragel/ragel-6.10.ebuild
 2104060140 ./dev-util/ragel/ragel-7.0.0.12.ebuild
 2108291739 ./dev-util/ragel/ragel-7.0.4.ebuild
@@ -16808,7 +16838,6 @@
 2109150609 ./games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r3.ebuild
 2106080809 ./games-action/super-hexagon/super-hexagon-20160217.ebuild
 2108191609 ./games-action/supermariowar/supermariowar-2.0_beta1-r2.ebuild
-2204101409 ./games-action/supertuxkart/supertuxkart-1.2.ebuild
 2207232310 ./games-action/supertuxkart/supertuxkart-1.3.ebuild
 2108230739 ./games-action/swordandsworcery/swordandsworcery-1.02-r2.ebuild
 2111170540 ./games-action/teeworlds/teeworlds-0.7.5-r1.ebuild
@@ -17040,7 +17069,6 @@
 2104041039 ./games-emulation/dosbox/dosbox-0.74.3.ebuild
 2110261539 ./games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
 2104041039 ./games-emulation/dosbox/dosbox-9999.ebuild
-2109031939 ./games-emulation/emutos/emutos-1.1.1.ebuild
 2208072340 ./games-emulation/emutos/emutos-1.2.ebuild
 2106131609 ./games-emulation/fbzx/fbzx-4.8.0.ebuild
 2203241739 ./games-emulation/fceux/fceux-2.6.4.ebuild
@@ -17087,7 +17115,6 @@
 1909151309 ./games-emulation/mupen64plus/mupen64plus-2.5.9.ebuild
 2202092240 ./games-emulation/nestopia/nestopia-1.51.1.ebuild
 2202092210 ./games-emulation/nestopia/nestopia-9999.ebuild
-2106060709 ./games-emulation/openmsx/openmsx-17.0.ebuild
 2207050810 ./games-emulation/openmsx/openmsx-18.0-r1.ebuild
 2205170840 ./games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild
 2208010010 ./games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -17135,6 +17162,7 @@
 2112250210 ./games-engines/stratagus/stratagus-3.2.0.ebuild
 2207292110 ./games-engines/stratagus/stratagus-3.3.0.ebuild
 2208011440 ./games-engines/stratagus/stratagus-3.3.1.ebuild
+2208110010 ./games-engines/stratagus/stratagus-3.3.2.ebuild
 2204021210 ./games-engines/xzip/xzip-1.8.2-r3.ebuild
 2204021210 ./games-engines/zoom/zoom-1.1.5-r1.ebuild
 2206250040 ./games-engines/scrap-engine/scrap-engine-1.2.0.ebuild
@@ -17146,7 +17174,6 @@
 2005172009 ./games-fps/doom-data/doom-data-1.9.ebuild
 2206080240 ./games-fps/doomsday/doomsday-2.3.1.ebuild
 2206251740 ./games-fps/duke3d-data/duke3d-data-1.0-r5.ebuild
-2206251810 ./games-fps/eduke32/eduke32-20220422.10033.ebuild
 2207102340 ./games-fps/eduke32/eduke32-20220702.10113.ebuild
 2201221309 ./games-fps/etqw-bin/etqw-bin-1.5-r4.ebuild
 2201221309 ./games-fps/etqw-data/etqw-data-1.0-r1.ebuild
@@ -17162,7 +17189,6 @@
 2104041039 ./games-fps/industri/industri-1.01.ebuild
 2104041139 ./games-fps/legends/legends-0.4.1.43-r2.ebuild
 2202191040 ./games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild
-2108271309 ./games-fps/prboom-plus/prboom-plus-2.6.1.ebuild
 2202191310 ./games-fps/prboom-plus/prboom-plus-2.6.2.ebuild
 2104070509 ./games-fps/quake1-data/quake1-data-2.40-r1.ebuild
 2104070509 ./games-fps/quake1-demodata/quake1-demodata-1.06-r1.ebuild
@@ -17406,15 +17432,14 @@
 2204142010 ./games-roguelike/nethack/nethack-3.6.6.ebuild
 1710230047 ./games-roguelike/powder/powder-117-r1.ebuild
 2105031239 ./games-roguelike/scourge/scourge-0.21.1-r1.ebuild
-2207022141 ./games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
-2207022141 ./games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
-2207022141 ./games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
-2207022141 ./games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
-2207022141 ./games-roguelike/stone-soup/stone-soup-0.29.0_pre20220701.ebuild
+2208111410 ./games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
+2208111410 ./games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
+2208111410 ./games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
+2208111410 ./games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
+2208111410 ./games-roguelike/stone-soup/stone-soup-0.29.0_pre20220701.ebuild
 2108230739 ./games-roguelike/tome/tome-2.3.5-r1.ebuild
 2012152039 ./games-roguelike/tomenet/tomenet-4.7.3.ebuild
 2006222338 ./games-roguelike/wrogue/wrogue-0.8.0b-r1.ebuild
-2104052109 ./games-roguelike/zangband/zangband-2.7.4c.ebuild
 2207261310 ./games-roguelike/zangband/zangband-2.7.4c-r1.ebuild
 2202120639 ./games-rpg/adonthell/adonthell-0.3.8.ebuild
 2107180839 ./games-rpg/avadon/avadon-1.0.4_p1331768904.ebuild
@@ -17472,6 +17497,7 @@
 2206250110 ./games-rpg/pokete/pokete-0.7.3.ebuild
 2207252210 ./games-server/bedrock-server/bedrock-server-1.19.10.03.ebuild
 2207272210 ./games-server/bedrock-server/bedrock-server-1.19.11.01.ebuild
+2208110210 ./games-server/bedrock-server/bedrock-server-1.19.20.02.ebuild
 2106302209 ./games-server/crossfire-server/crossfire-server-1.71.0-r2.ebuild
 2108230739 ./games-server/etqw-ded/etqw-ded-1.5-r1.ebuild
 1702282250 ./games-server/mednafen-server/mednafen-server-0.5.2-r1.ebuild
@@ -17488,14 +17514,11 @@
 2207011140 ./games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild
 2108230739 ./games-simulation/bcs-demo/bcs-demo-1.3-r1.ebuild
 1805012309 ./games-simulation/cannonsmash/cannonsmash-0.6.6-r1.ebuild
-2110190339 ./games-simulation/corsix-th/corsix-th-0.65.1.ebuild
 2207011310 ./games-simulation/corsix-th/corsix-th-0.66-r1.ebuild
 2107191909 ./games-simulation/crashtest/crashtest-1.1-r2.ebuild
 2201041139 ./games-simulation/crrcsim/crrcsim-0.9.13-r2.ebuild
 2008030139 ./games-simulation/flightgear-data/flightgear-data-9999.ebuild
-2204110040 ./games-simulation/flightgear-data/flightgear-data-2020.3.12.ebuild
 2205132310 ./games-simulation/flightgear-data/flightgear-data-2020.3.13.ebuild
-2205161140 ./games-simulation/flightgear/flightgear-2020.3.12.ebuild
 2205161140 ./games-simulation/flightgear/flightgear-2020.3.13.ebuild
 2205161140 ./games-simulation/flightgear/flightgear-9999.ebuild
 2108021239 ./games-simulation/gl117/gl117-1.3.2-r1.ebuild
@@ -17529,9 +17552,7 @@
 2104120539 ./games-sports/ultimatestunts/ultimatestunts-0.7.7-r1.ebuild
 2012011639 ./games-sports/xmoto/xmoto-0.6.1-r100.ebuild
 2206251140 ./games-sports/skatebird/skatebird-14.ebuild
-2202070739 ./games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
 2206070410 ./games-strategy/0ad/0ad-0.0.25b_alpha-r1.ebuild
-2207150512 ./games-strategy/augustus/augustus-3.0.1.ebuild
 2207191240 ./games-strategy/augustus/augustus-3.1.0.ebuild
 2101150109 ./games-strategy/colobot-data/colobot-data-0.1.12.ebuild
 2108221009 ./games-strategy/colobot-data/colobot-data-0.2.0_alpha.ebuild
@@ -17564,11 +17585,9 @@
 2108021339 ./games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild
 2104161439 ./games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
 2104260009 ./games-strategy/megaglest/megaglest-3.13.0.ebuild
-2204030512 ./games-strategy/naev/naev-0.9.3.ebuild
 2207210910 ./games-strategy/naev/naev-0.9.4.ebuild
 1805022239 ./games-strategy/netherearth/netherearth-0.52-r1.ebuild
 2104130209 ./games-strategy/openra/openra-20190314-r100.ebuild
-2109112110 ./games-strategy/s25rttr/s25rttr-0.9.1.ebuild
 2206081540 ./games-strategy/s25rttr/s25rttr-0.9.5.ebuild
 2108230739 ./games-strategy/satellite-reign/satellite-reign-1.13.06.ebuild
 2104050139 ./games-strategy/scorched3d/scorched3d-44-r2.ebuild
@@ -17582,15 +17601,14 @@
 2112250210 ./games-strategy/war1gus/war1gus-3.2.0.ebuild
 2207292110 ./games-strategy/war1gus/war1gus-3.3.0.ebuild
 2208011440 ./games-strategy/war1gus/war1gus-3.3.1.ebuild
+2208110010 ./games-strategy/war1gus/war1gus-3.3.2.ebuild
 1801271808 ./games-strategy/wargus-data/wargus-data-0-r1.ebuild
 2112250210 ./games-strategy/wargus/wargus-3.2.0.ebuild
 2207292110 ./games-strategy/wargus/wargus-3.3.0.ebuild
 2208011440 ./games-strategy/wargus/wargus-3.3.1.ebuild
+2208110010 ./games-strategy/wargus/wargus-3.3.2.ebuild
 2110050309 ./games-strategy/warmux/warmux-11.04.1-r2.ebuild
-2111240511 ./games-strategy/warzone2100/warzone2100-4.2.2.ebuild
-2112270340 ./games-strategy/warzone2100/warzone2100-4.2.4.ebuild
 2203020609 ./games-strategy/warzone2100/warzone2100-4.2.6.ebuild
-2205170840 ./games-strategy/wesnoth/wesnoth-1.16.2.ebuild
 2206192040 ./games-strategy/wesnoth/wesnoth-1.16.3.ebuild
 2206192140 ./games-strategy/wesnoth/wesnoth-1.17.5.ebuild
 2106180109 ./games-strategy/widelands/widelands-9999.ebuild
@@ -17603,7 +17621,6 @@
 2104041309 ./games-util/biounzip/biounzip-1.1a.ebuild
 2108070909 ./games-util/catcodec/catcodec-1.0.5.ebuild
 2104062139 ./games-util/datutil/datutil-2.46.ebuild
-1909100139 ./games-util/deutex/deutex-5.2.0.ebuild
 2112241310 ./games-util/deutex/deutex-5.2.2.ebuild
 2104050139 ./games-util/dfarc/dfarc-3.14.ebuild
 2105292209 ./games-util/dzip/dzip-2.9-r4.ebuild
@@ -17619,7 +17636,6 @@
 2106290139 ./games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild
 2104212209 ./games-util/gslist/gslist-0.8.11a-r1.ebuild
 2205212340 ./games-util/joystick/joystick-1.8.1.ebuild
-2109041039 ./games-util/lgogdownloader/lgogdownloader-3.8.ebuild
 2109041039 ./games-util/lgogdownloader/lgogdownloader-9999.ebuild
 2202270309 ./games-util/lgogdownloader/lgogdownloader-3.9.ebuild
 2108032009 ./games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild
@@ -17663,12 +17679,12 @@
 2208070840 ./gnome-base/gnome-control-center/gnome-control-center-42.3.ebuild
 2203131809 ./gnome-base/gnome-core-apps/gnome-core-apps-41.3.ebuild
 2203130309 ./gnome-base/gnome-core-libs/gnome-core-libs-41.3.ebuild
-2207190310 ./gnome-base/gnome-desktop/gnome-desktop-42.2-r300.ebuild
 2207190310 ./gnome-base/gnome-desktop/gnome-desktop-42.2-r400.ebuild
-2208070840 ./gnome-base/gnome-desktop/gnome-desktop-42.3-r300.ebuild
 2208070840 ./gnome-base/gnome-desktop/gnome-desktop-42.3-r400.ebuild
-2208081810 ./gnome-base/gnome-desktop/gnome-desktop-42.4-r300.ebuild
 2208081810 ./gnome-base/gnome-desktop/gnome-desktop-42.4-r400.ebuild
+2208111440 ./gnome-base/gnome-desktop/gnome-desktop-42.2-r300.ebuild
+2208111440 ./gnome-base/gnome-desktop/gnome-desktop-42.3-r300.ebuild
+2208111440 ./gnome-base/gnome-desktop/gnome-desktop-42.4-r300.ebuild
 2204110909 ./gnome-base/gnome-extra-apps/gnome-extra-apps-41.0.ebuild
 2204101939 ./gnome-base/gnome-flashback/gnome-flashback-3.44.0-r1.ebuild
 2207210340 ./gnome-base/gnome-keyring/gnome-keyring-42.1.ebuild
@@ -17915,9 +17931,10 @@
 2207190310 ./gui-libs/amtk/amtk-5.4.1.ebuild
 2205100440 ./gui-libs/display-manager-init/display-manager-init-1.0-r3.ebuild
 2207261840 ./gui-libs/display-manager-init/display-manager-init-1.0-r4.ebuild
-2202140409 ./gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild
-2202140409 ./gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild
 2206282040 ./gui-libs/egl-wayland/egl-wayland-1.1.10-r1.ebuild
+2208111440 ./gui-libs/egl-wayland/egl-wayland-1.1.10_p20220805.ebuild
+2208111440 ./gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild
+2208111440 ./gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild
 2202140409 ./gui-libs/eglexternalplatform/eglexternalplatform-1.1.ebuild
 2205311240 ./gui-libs/gdk-pixbuf-loader-webp/gdk-pixbuf-loader-webp-0.0.4.ebuild
 2206101440 ./gui-libs/gdk-pixbuf-loader-webp/gdk-pixbuf-loader-webp-0.0.5.ebuild
@@ -17948,6 +17965,7 @@
 2205260910 ./gui-libs/wlroots/wlroots-0.15.1.ebuild
 2207240810 ./gui-libs/wlroots/wlroots-9999.ebuild
 2201181539 ./gui-libs/wpebackend-fdo/wpebackend-fdo-1.12.0.ebuild
+2208101810 ./gui-libs/wpebackend-fdo/wpebackend-fdo-1.12.1.ebuild
 2205170910 ./gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.4.0.ebuild
 2206240540 ./gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.5.0.ebuild
 2207102310 ./gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.6.0.ebuild
@@ -18199,9 +18217,9 @@
 2208060740 ./kde-frameworks/attica/attica-5.96.0.ebuild
 2208060740 ./kde-frameworks/baloo/baloo-5.96.0.ebuild
 2208060740 ./kde-frameworks/bluez-qt/bluez-qt-5.96.0.ebuild
-2208060740 ./kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.96.0.ebuild
-2208060740 ./kde-frameworks/breeze-icons/breeze-icons-5.96.0.ebuild
-2208060740 ./kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild
+2208111310 ./kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.96.0.ebuild
+2208111310 ./kde-frameworks/breeze-icons/breeze-icons-5.96.0.ebuild
+2208111410 ./kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild
 2208060740 ./kde-frameworks/frameworkintegration/frameworkintegration-5.96.0.ebuild
 2208060740 ./kde-frameworks/kactivities-stats/kactivities-stats-5.96.0.ebuild
 2208060740 ./kde-frameworks/kactivities/kactivities-5.96.0.ebuild
@@ -18313,8 +18331,8 @@
 2208070840 ./kde-plasma/bluedevil/bluedevil-5.24.6.ebuild
 2208022210 ./kde-plasma/breeze-grub/breeze-grub-5.25.4.ebuild
 2208070840 ./kde-plasma/breeze-grub/breeze-grub-5.24.6.ebuild
-2208022210 ./kde-plasma/breeze-gtk/breeze-gtk-5.25.4.ebuild
-2208070840 ./kde-plasma/breeze-gtk/breeze-gtk-5.24.6.ebuild
+2208111410 ./kde-plasma/breeze-gtk/breeze-gtk-5.24.6.ebuild
+2208111410 ./kde-plasma/breeze-gtk/breeze-gtk-5.25.4.ebuild
 2208022210 ./kde-plasma/breeze-plymouth/breeze-plymouth-5.25.4.ebuild
 2208070840 ./kde-plasma/breeze-plymouth/breeze-plymouth-5.24.6.ebuild
 2208022210 ./kde-plasma/breeze/breeze-5.25.4.ebuild
@@ -18944,11 +18962,13 @@
 2206281840 ./media-gfx/asymptote/asymptote-2.81.ebuild
 2102281539 ./media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild
 1912131839 ./media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
-2206161940 ./media-gfx/blender/blender-2.93.9.ebuild
-2206161940 ./media-gfx/blender/blender-3.1.2.ebuild
-2206160410 ./media-gfx/blender/blender-3.2.0.ebuild
-2206161940 ./media-gfx/blender/blender-9999.ebuild
-2207090910 ./media-gfx/blender/blender-3.2.1.ebuild
+2208111040 ./media-gfx/blender/blender-2.93.10.ebuild
+2208111040 ./media-gfx/blender/blender-2.93.9.ebuild
+2208111040 ./media-gfx/blender/blender-3.1.2.ebuild
+2208111410 ./media-gfx/blender/blender-3.2.0.ebuild
+2208111410 ./media-gfx/blender/blender-3.2.1.ebuild
+2208111410 ./media-gfx/blender/blender-3.2.2.ebuild
+2208111040 ./media-gfx/blender/blender-9999.ebuild
 2202201939 ./media-gfx/brscan4/brscan4-0.4.11.1-r1.ebuild
 2203141339 ./media-gfx/cairosvg/cairosvg-2.5.2.ebuild
 2011041109 ./media-gfx/cellwriter/cellwriter-1.3.6.ebuild
@@ -19011,7 +19031,7 @@
 2207250910 ./media-gfx/flameshot/flameshot-12.1.0.ebuild
 2104192239 ./media-gfx/fondu/fondu-20060102-r1.ebuild
 2111221309 ./media-gfx/fontforge/fontforge-20201107.ebuild
-2208092140 ./media-gfx/fontforge/fontforge-20220308.ebuild
+2208101110 ./media-gfx/fontforge/fontforge-20220308.ebuild
 2005210409 ./media-gfx/fotowall/fotowall-1.0.ebuild
 2206080040 ./media-gfx/fotoxx/fotoxx-22.16.ebuild
 2206072240 ./media-gfx/fotoxx/fotoxx-22.18.ebuild
@@ -19254,6 +19274,7 @@
 2112081340 ./media-gfx/xli/xli-1.17.0-r5.ebuild
 2101061739 ./media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
 2112011009 ./media-gfx/xpaint/xpaint-3.1.4.ebuild
+2208101640 ./media-gfx/xpaint/xpaint-3.1.4-r1.ebuild
 2206232340 ./media-gfx/xsane/xsane-0.999-r4.ebuild
 2012311940 ./media-gfx/xv/xv-3.10a-r19.ebuild
 2104192239 ./media-gfx/xzgv/xzgv-0.9.1.ebuild
@@ -19271,7 +19292,7 @@
 2208082140 ./media-gfx/renderdoc/renderdoc-1.21.ebuild
 2207221210 ./media-gfx/ttfautohint/ttfautohint-1.8.4-r3.ebuild
 2207250240 ./media-gfx/skanpage/skanpage-22.04.3.ebuild
-2207150040 ./media-gfx/superslicer/superslicer-2.4.58.3-r1.ebuild
+2208111410 ./media-gfx/superslicer/superslicer-2.4.58.3-r1.ebuild
 2109100839 ./media-libs/Field3D/Field3D-1.7.2.ebuild
 2203010309 ./media-libs/Field3D/Field3D-1.7.2-r3.ebuild
 2104111439 ./media-libs/SoQt/SoQt-1.6.0.ebuild
@@ -19330,6 +19351,7 @@
 2202180610 ./media-libs/embree/embree-3.13.0-r2.ebuild
 2202180610 ./media-libs/embree/embree-3.13.2.ebuild
 2202180610 ./media-libs/embree/embree-3.13.3.ebuild
+2208111040 ./media-libs/embree/embree-3.13.4.ebuild
 2204121040 ./media-libs/esdl/esdl-1.3.1.ebuild
 2108271839 ./media-libs/exempi/exempi-2.4.5-r1.ebuild
 2112220839 ./media-libs/exiftool/exiftool-12.33.ebuild
@@ -19353,7 +19375,7 @@
 2206301010 ./media-libs/freeimage/freeimage-3.18.0-r8.ebuild
 2201080039 ./media-libs/freetype/freetype-9999.ebuild
 2204261710 ./media-libs/freetype/freetype-2.12.0-r1.ebuild
-2208092140 ./media-libs/freetype/freetype-2.12.1.ebuild
+2208101110 ./media-libs/freetype/freetype-2.12.1.ebuild
 2206261210 ./media-libs/freeverb3/freeverb3-3.2.1-r3.ebuild
 2203140209 ./media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
 2108211209 ./media-libs/game-music-emu/game-music-emu-0.6.3.ebuild
@@ -19371,8 +19393,6 @@
 2101061739 ./media-libs/glew/glew-1.6.0-r100.ebuild
 2107141939 ./media-libs/glew/glew-2.2.0.ebuild
 2111290139 ./media-libs/glfw/glfw-3.3.5.ebuild
-2202281039 ./media-libs/glfw/glfw-3.3.6.ebuild
-2204060139 ./media-libs/glfw/glfw-3.3.7.ebuild
 2207221810 ./media-libs/glfw/glfw-3.3.8.ebuild
 2205170440 ./media-libs/glm/glm-0.9.9.8-r1.ebuild
 2003200239 ./media-libs/glpng/glpng-1.46-r1.ebuild
@@ -19699,6 +19719,7 @@
 2207261840 ./media-libs/mesa/mesa-22.1.3.ebuild
 2208060740 ./media-libs/mesa/mesa-22.1.5.ebuild
 2208060740 ./media-libs/mesa/mesa-9999.ebuild
+2208102310 ./media-libs/mesa/mesa-22.1.6.ebuild
 2204101640 ./media-libs/mlt/mlt-7.4.0.ebuild
 2204290740 ./media-libs/mlt/mlt-7.6.0.ebuild
 2207250240 ./media-libs/mlt/mlt-7.8.0.ebuild
@@ -19777,7 +19798,7 @@
 2201072009 ./media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild
 2204101640 ./media-libs/rtaudio/rtaudio-5.2.0.ebuild
 2203061110 ./media-libs/rubberband/rubberband-2.0.2.ebuild
-2208091110 ./media-libs/rubberband/rubberband-3.0.0.ebuild
+2208101110 ./media-libs/rubberband/rubberband-3.0.0.ebuild
 2207211040 ./media-libs/sbc/sbc-2.0.ebuild
 2108250339 ./media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild
 2108211209 ./media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild
@@ -19894,9 +19915,9 @@
 2202190839 ./media-libs/amf-headers/amf-headers-1.4.23.ebuild
 2206031410 ./media-libs/amf-headers/amf-headers-1.4.24.ebuild
 2206161940 ./media-libs/libvmaf/libvmaf-2.3.0-r2.ebuild
-2205140410 ./media-libs/libjxl/libjxl-9999.ebuild
 2206151740 ./media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild
 2208081610 ./media-libs/libjxl/libjxl-0.7.0_pre20220511.ebuild
+2208101140 ./media-libs/libjxl/libjxl-9999.ebuild
 2206300511 ./media-libs/sdl_audiolib/sdl_audiolib-0_p20220622.ebuild
 2206300511 ./media-libs/sdl_audiolib/sdl_audiolib-9999.ebuild
 2207261840 ./media-libs/mesa-amber/mesa-amber-21.3.9.ebuild
@@ -20387,6 +20408,7 @@
 2204280210 ./media-radio/flmsg/flmsg-4.0.19-r1.ebuild
 2206281410 ./media-radio/flmsg/flmsg-4.0.20.ebuild
 2205291740 ./media-radio/flrig/flrig-1.4.5.ebuild
+2208101340 ./media-radio/flrig/flrig-1.4.7.ebuild
 2106190039 ./media-radio/fsync-mdc1200-decode/fsync-mdc1200-decode-1.0.ebuild
 2106190039 ./media-radio/fsync-mdc1200-decode/fsync-mdc1200-decode-9999.ebuild
 2205311210 ./media-radio/gpredict/gpredict-2.3-r1.ebuild
@@ -20529,7 +20551,7 @@
 2006211639 ./media-sound/flake/flake-0.11.ebuild
 2204270740 ./media-sound/fluid-soundfont/fluid-soundfont-3.1.ebuild
 2205271310 ./media-sound/fluidsynth/fluidsynth-2.2.7.ebuild
-2207110740 ./media-sound/fluidsynth/fluidsynth-2.2.8.ebuild
+2208101540 ./media-sound/fluidsynth/fluidsynth-2.2.8.ebuild
 2006211639 ./media-sound/fmdrv/fmdrv-1.0.7.ebuild
 2207271210 ./media-sound/fmit/fmit-1.0.15-r3.ebuild
 2011141839 ./media-sound/fmtools/fmtools-2.0.7.ebuild
@@ -21099,7 +21121,7 @@
 2206161940 ./media-video/vdr/vdr-2.2.0-r6.ebuild
 2206161940 ./media-video/vdr/vdr-2.4.7-r1.ebuild
 2206301710 ./media-video/vdr/vdr-2.2.0-r7.ebuild
-2207031210 ./media-video/vdr/vdr-2.6.1.ebuild
+2208111410 ./media-video/vdr/vdr-2.6.1.ebuild
 2110220239 ./media-video/vdr2jpeg/vdr2jpeg-0.2.0-r5.ebuild
 1911101209 ./media-video/vdrsync/vdrsync-0.1.3_pre050322-r1.ebuild
 2101241539 ./media-video/vdrsync/vdrsync-0.1.3_pre050322-r2.ebuild
@@ -21379,7 +21401,7 @@
 2104032209 ./net-analyzer/oinkmaster/oinkmaster-2.0.ebuild
 2203202209 ./net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild
 2203202209 ./net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild
-2206250010 ./net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
+2208101410 ./net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
 2104130209 ./net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild
 2104130209 ./net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild
 2104130209 ./net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild
@@ -21613,7 +21635,7 @@
 2206251210 ./net-dns/dnsdist/dnsdist-1.7.2.ebuild
 2103050239 ./net-dns/dnshijacker/dnshijacker-1.3-r2.ebuild
 2108090109 ./net-dns/dnsmasq/dnsmasq-2.85.ebuild
-2109150409 ./net-dns/dnsmasq/dnsmasq-2.86.ebuild
+2208111010 ./net-dns/dnsmasq/dnsmasq-2.86.ebuild
 1903151409 ./net-dns/dnssec-check/dnssec-check-2.2.ebuild
 2201260040 ./net-dns/dnssec-root/dnssec-root-20181220-r1.ebuild
 2109101340 ./net-dns/dnssec-tools/dnssec-tools-2.2.3-r3.ebuild
@@ -21798,7 +21820,7 @@
 2202170040 ./net-im/dino/dino-0.2.1-r1.ebuild
 2202170040 ./net-im/dino/dino-9999.ebuild
 2203020240 ./net-im/dino/dino-0.3.0.ebuild
-2207240940 ./net-im/discord-bin/discord-bin-0.0.18.ebuild
+2208110010 ./net-im/discord-bin/discord-bin-0.0.19.ebuild
 2207161810 ./net-im/ejabberd/ejabberd-21.12-r2.ebuild
 2207161810 ./net-im/ejabberd/ejabberd-22.05-r2.ebuild
 2202170109 ./net-im/ekg2/ekg2-0.4_pre20190315-r1.ebuild
@@ -21854,7 +21876,7 @@
 2108161009 ./net-im/signal-cli-bin/signal-cli-bin-0.8.5.ebuild
 2112171639 ./net-im/signal-cli-bin/signal-cli-bin-0.9.2.ebuild
 2205261640 ./net-im/signal-cli-bin/signal-cli-bin-0.10.6.ebuild
-2207231240 ./net-im/signal-desktop-bin/signal-desktop-bin-5.51.0.ebuild
+2208101140 ./net-im/signal-desktop-bin/signal-desktop-bin-5.54.0.ebuild
 2102261739 ./net-im/skype-dbus-mock/skype-dbus-mock-0_pre20181011.ebuild
 2203191510 ./net-im/skypeforlinux/skypeforlinux-8.82.0.403.ebuild
 2205020840 ./net-im/skypeforlinux/skypeforlinux-8.83.0.408.ebuild
@@ -22276,8 +22298,8 @@
 2204101910 ./net-libs/telepathy-farstream/telepathy-farstream-0.6.2-r1.ebuild
 2202030939 ./net-libs/telepathy-glib/telepathy-glib-0.24.2.ebuild
 2109121440 ./net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0.ebuild
-2109230209 ./net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild
-2109230209 ./net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+2208111410 ./net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild
+2208111410 ./net-libs/telepathy-qt/telepathy-qt-9999.ebuild
 2202211309 ./net-libs/tox/tox-0.2.13.ebuild
 2206161940 ./net-libs/tox/tox-9999.ebuild
 2207192140 ./net-libs/tox/tox-0.2.18-r1.ebuild
@@ -22491,8 +22513,9 @@
 2204280640 ./net-misc/cgminer/cgminer-4.10.0-r1.ebuild
 2203120639 ./net-misc/chrome-remote-desktop/chrome-remote-desktop-99.0.4844.11.ebuild
 2206221740 ./net-misc/chrome-remote-desktop/chrome-remote-desktop-103.0.5060.46.ebuild
-2112190139 ./net-misc/chrony/chrony-9999.ebuild
 2204160811 ./net-misc/chrony/chrony-4.2-r1.ebuild
+2208111310 ./net-misc/chrony/chrony-4.3_pre1.ebuild
+2208111310 ./net-misc/chrony/chrony-9999.ebuild
 2204090739 ./net-misc/clockspeed/clockspeed-0.62-r8.ebuild
 2207030210 ./net-misc/clusterssh/clusterssh-4.16.ebuild
 2207030210 ./net-misc/clusterssh/clusterssh-9999.ebuild
@@ -22987,7 +23010,6 @@
 2110271609 ./net-misc/zssh/zssh-1.5c-r1.ebuild
 2110212139 ./net-misc/zsync/zsync-0.6.2-r2.ebuild
 2204030409 ./net-misc/openrdap/openrdap-0.9.0_p20191017-r1.ebuild
-2207151840 ./net-misc/ytfzf/ytfzf-2.4.0.ebuild
 2208061740 ./net-misc/ytfzf/ytfzf-2.4.1.ebuild
 2206271810 ./net-misc/mptcpd/mptcpd-0.10-r1.ebuild
 2206271810 ./net-misc/mptcpd/mptcpd-9999.ebuild
@@ -23322,6 +23344,7 @@
 2203230410 ./net-vpn/strongswan/strongswan-5.9.4-r2.ebuild
 2203230410 ./net-vpn/strongswan/strongswan-5.9.5-r1.ebuild
 2206291840 ./net-vpn/strongswan/strongswan-5.9.6-r1.ebuild
+2208101140 ./net-vpn/strongswan/strongswan-5.9.7.ebuild
 2202271109 ./net-vpn/tailscale/tailscale-1.22.0.ebuild
 2204221309 ./net-vpn/tailscale/tailscale-1.22.2.ebuild
 2206022340 ./net-vpn/tailscale/tailscale-1.24.2.ebuild
@@ -23363,7 +23386,7 @@
 2207091810 ./net-wireless/bluez/bluez-5.64.ebuild
 2104271709 ./net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r6.ebuild
 2105050139 ./net-wireless/bss/bss-0.8-r2.ebuild
-2110212139 ./net-wireless/crackle/crackle-0.1-r1.ebuild
+2208111410 ./net-wireless/crackle/crackle-0.1-r1.ebuild
 2205060310 ./net-wireless/crda/crda-4.14.ebuild
 2108130210 ./net-wireless/dump1090/dump1090-4.0.ebuild
 2110150909 ./net-wireless/dump1090/dump1090-5.0.ebuild
@@ -24403,10 +24426,10 @@
 2204050609 ./sci-libs/libqalculate/libqalculate-3.22.0.ebuild
 2204050539 ./sci-libs/libqalculate/libqalculate-4.1.1.ebuild
 2206291040 ./sci-libs/libqalculate/libqalculate-4.2.0.ebuild
-2108042109 ./sci-libs/libsc/libsc-2.3.1-r1.ebuild
-2111120739 ./sci-libs/libsc/libsc-2.3.3.ebuild
 2202140410 ./sci-libs/libsc/libsc-2.8.3.ebuild
 2202140410 ./sci-libs/libsc/libsc-9999.ebuild
+2208111440 ./sci-libs/libsc/libsc-2.3.1-r1.ebuild
+2208111440 ./sci-libs/libsc/libsc-2.3.3.ebuild
 2205011048 ./sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild
 2205011048 ./sci-libs/libsigrok/libsigrok-9999.ebuild
 2206222210 ./sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
@@ -24475,10 +24498,10 @@
 2108061739 ./sci-libs/orocos_kdl/orocos_kdl-1.5.0.ebuild
 2108061739 ./sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
 2205191540 ./sci-libs/orocos_kdl/orocos_kdl-1.5.1.ebuild
-2108042109 ./sci-libs/p4est/p4est-2.3.1-r1.ebuild
-2111120739 ./sci-libs/p4est/p4est-2.3.3.ebuild
 2204151010 ./sci-libs/p4est/p4est-2.8.0-r1.ebuild
 2204151010 ./sci-libs/p4est/p4est-9999.ebuild
+2208111440 ./sci-libs/p4est/p4est-2.3.1-r1.ebuild
+2208111440 ./sci-libs/p4est/p4est-2.3.3.ebuild
 2205161140 ./sci-libs/parmetis/parmetis-4.0.3-r2.ebuild
 2111192109 ./sci-libs/pastix/pastix-6.0.3.ebuild
 2201290310 ./sci-libs/pastix/pastix-5.2.3.ebuild
@@ -24691,6 +24714,7 @@
 2201241240 ./sci-mathematics/minisat/minisat-2.2.1-r1.ebuild
 2201290310 ./sci-mathematics/msieve/msieve-1.53-r1.ebuild
 2201190139 ./sci-mathematics/nauty/nauty-2.7.3.ebuild
+2208111510 ./sci-mathematics/nauty/nauty-2.7.4.ebuild
 2102010039 ./sci-mathematics/nestedsums/nestedsums-1.5.2-r1.ebuild
 2205150040 ./sci-mathematics/normaliz/normaliz-3.1.3-r1.ebuild
 2205150040 ./sci-mathematics/normaliz/normaliz-3.8.10-r1.ebuild
@@ -24703,11 +24727,10 @@
 2011010339 ./sci-mathematics/otter/otter-3.3-r3.ebuild
 2101061839 ./sci-mathematics/pari-data/pari-data-20191216.ebuild
 2206020410 ./sci-mathematics/pari/pari-2.13.4.ebuild
-2208090940 ./sci-mathematics/pari/pari-2.13.4-r1.ebuild
+2208101110 ./sci-mathematics/pari/pari-2.13.4-r1.ebuild
 2206030710 ./sci-mathematics/petsc/petsc-3.16.0-r1.ebuild
 2206030710 ./sci-mathematics/petsc/petsc-3.17.1-r1.ebuild
-2111021910 ./sci-mathematics/planarity/planarity-3.0.1.1.ebuild
-2206130310 ./sci-mathematics/planarity/planarity-3.0.2.0.ebuild
+2208111110 ./sci-mathematics/planarity/planarity-3.0.2.0.ebuild
 2202071339 ./sci-mathematics/polymake/polymake-4.6.ebuild
 2206152240 ./sci-mathematics/polymake/polymake-4.6-r1.ebuild
 2105192339 ./sci-mathematics/prng/prng-3.0.2-r3.ebuild
@@ -25886,7 +25909,7 @@
 2204120512 ./sec-policy/selinux-secadm/selinux-secadm-2.20220106-r2.ebuild
 2204120512 ./sec-policy/selinux-secadm/selinux-secadm-2.20220106-r3.ebuild
 2204120512 ./sec-policy/selinux-secadm/selinux-secadm-9999.ebuild
-2206291040 ./sys-apps/accountsservice/accountsservice-22.08.8.ebuild
+2208111310 ./sys-apps/accountsservice/accountsservice-22.08.8.ebuild
 2101061839 ./sys-apps/ack/ack-3.4.0.ebuild
 2110161809 ./sys-apps/ack/ack-3.5.0.ebuild
 2204290540 ./sys-apps/acl/acl-2.3.1.ebuild
@@ -26118,8 +26141,8 @@
 2208041110 ./sys-apps/ipmiutil/ipmiutil-3.1.8.ebuild
 2112260040 ./sys-apps/iproute2/iproute2-5.15.0.ebuild
 2205280640 ./sys-apps/iproute2/iproute2-5.18.0-r1.ebuild
-2208092340 ./sys-apps/iproute2/iproute2-5.19.0.ebuild
 2208092340 ./sys-apps/iproute2/iproute2-9999.ebuild
+2208101140 ./sys-apps/iproute2/iproute2-5.19.0.ebuild
 2205051110 ./sys-apps/irqbalance/irqbalance-1.8.0-r1.ebuild
 2205280940 ./sys-apps/irqbalance/irqbalance-1.9.0.ebuild
 2010300209 ./sys-apps/isapnptools/isapnptools-1.27.ebuild
@@ -26201,10 +26224,10 @@
 1706100008 ./sys-apps/noexec/noexec-1.1.0-r1.ebuild
 2003261841 ./sys-apps/nosig/nosig-2.ebuild
 2202131109 ./sys-apps/nvme-cli/nvme-cli-1.16.ebuild
-2205191440 ./sys-apps/nvme-cli/nvme-cli-2.0.ebuild
 2206182110 ./sys-apps/nvme-cli/nvme-cli-1.16-r1.ebuild
-2206182110 ./sys-apps/nvme-cli/nvme-cli-2.0-r1.ebuild
-2208012210 ./sys-apps/nvme-cli/nvme-cli-2.1.1.ebuild
+2208111410 ./sys-apps/nvme-cli/nvme-cli-2.0-r1.ebuild
+2208111440 ./sys-apps/nvme-cli/nvme-cli-2.0.ebuild
+2208111410 ./sys-apps/nvme-cli/nvme-cli-2.1.1.ebuild
 2207100040 ./sys-apps/onerng/onerng-3.7.ebuild
 2111090809 ./sys-apps/opal-utils/opal-utils-6.8.ebuild
 2201140110 ./sys-apps/opal-utils/opal-utils-7.0.ebuild
@@ -26420,9 +26443,9 @@
 2004112309 ./sys-auth/google-authenticator/google-authenticator-1.08.ebuild
 2005261739 ./sys-auth/google-authenticator/google-authenticator-1.09.ebuild
 2004112309 ./sys-auth/google-authenticator/google-authenticator-9999.ebuild
-2103152139 ./sys-auth/libfprint/libfprint-1.0.ebuild
 2204172210 ./sys-auth/libfprint/libfprint-1.94.3.ebuild
 2206230810 ./sys-auth/libfprint/libfprint-1.94.4.ebuild
+2208111410 ./sys-auth/libfprint/libfprint-1.0.ebuild
 2107242209 ./sys-auth/libnss-cache/libnss-cache-0.10.2.ebuild
 2203040040 ./sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r5.ebuild
 2006132027 ./sys-auth/libnss-nis/libnss-nis-3.1.ebuild
@@ -26505,7 +26528,7 @@
 2111070839 ./sys-block/f3/f3-8.0.ebuild
 2204100340 ./sys-block/fio/fio-3.27-r3.ebuild
 2205191040 ./sys-block/fio/fio-3.30.ebuild
-2112271910 ./sys-block/flashbench/flashbench-20120606.ebuild
+2208111410 ./sys-block/flashbench/flashbench-20120606.ebuild
 2009162339 ./sys-block/fwdl/fwdl-1.2.3.ebuild
 2012311940 ./sys-block/gpart/gpart-0.3.ebuild
 2207210340 ./sys-block/gparted/gparted-1.4.0-r1.ebuild
@@ -26612,7 +26635,7 @@
 1911100139 ./sys-boot/makebootfat/makebootfat-1.4.ebuild
 2105131709 ./sys-boot/mbr-gpt/mbr-gpt-0.0.1-r1.ebuild
 1912110241 ./sys-boot/mbr/mbr-1.1.11-r1.ebuild
-2104161439 ./sys-boot/milo/milo-2.4.18.ebuild
+2208111440 ./sys-boot/milo/milo-2.4.18.ebuild
 2106302209 ./sys-boot/mokutil/mokutil-0.3.0_p20170405.ebuild
 2107011009 ./sys-boot/mokutil/mokutil-0.5.0-r1.ebuild
 2202100210 ./sys-boot/netboot/netboot-0.10.2-r3.ebuild
@@ -26652,11 +26675,11 @@
 2010150109 ./sys-boot/yaboot-static/yaboot-static-1.3.17-r2.ebuild
 2010142339 ./sys-boot/yaboot/yaboot-1.3.17-r4.ebuild
 2203040040 ./sys-cluster/ampi/ampi-0_pre20140616.ebuild
-2005081846 ./sys-cluster/c3/c3-4.0.1.ebuild
+2208111410 ./sys-cluster/c3/c3-4.0.1.ebuild
 2207130340 ./sys-cluster/ceph/ceph-16.2.9-r1.ebuild
-2207222340 ./sys-cluster/ceph/ceph-15.2.16.ebuild
 2207222340 ./sys-cluster/ceph/ceph-16.2.10.ebuild
 2208030840 ./sys-cluster/ceph/ceph-17.2.3.ebuild
+2208102340 ./sys-cluster/ceph/ceph-15.2.17.ebuild
 2207051210 ./sys-cluster/charliecloud/charliecloud-0.28.ebuild
 2208050840 ./sys-cluster/charliecloud/charliecloud-0.29.ebuild
 2208050840 ./sys-cluster/charliecloud/charliecloud-9999.ebuild
@@ -26702,72 +26725,51 @@
 2203040040 ./sys-cluster/kronosnet/kronosnet-1.19.ebuild
 2206010340 ./sys-cluster/kronosnet/kronosnet-1.19-r1.ebuild
 2206010340 ./sys-cluster/kronosnet/kronosnet-1.23.ebuild
-2204010810 ./sys-cluster/kube-apiserver/kube-apiserver-1.22.8.ebuild
-2204010810 ./sys-cluster/kube-apiserver/kube-apiserver-1.23.5.ebuild
-2205131940 ./sys-cluster/kube-apiserver/kube-apiserver-1.24.0.ebuild
 2207192040 ./sys-cluster/kube-apiserver/kube-apiserver-1.22.10.ebuild
-2207191810 ./sys-cluster/kube-apiserver/kube-apiserver-1.22.12.ebuild
 2207192040 ./sys-cluster/kube-apiserver/kube-apiserver-1.23.7.ebuild
-2207191840 ./sys-cluster/kube-apiserver/kube-apiserver-1.23.9.ebuild
 2207192040 ./sys-cluster/kube-apiserver/kube-apiserver-1.24.1.ebuild
-2207191940 ./sys-cluster/kube-apiserver/kube-apiserver-1.24.3.ebuild
-2204010810 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.22.8.ebuild
-2204010810 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.23.5.ebuild
-2205131940 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.24.0.ebuild
+2208102040 ./sys-cluster/kube-apiserver/kube-apiserver-1.22.12.ebuild
+2208102040 ./sys-cluster/kube-apiserver/kube-apiserver-1.23.9.ebuild
+2208102040 ./sys-cluster/kube-apiserver/kube-apiserver-1.24.3.ebuild
 2207192040 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.22.10.ebuild
-2207191810 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.22.12.ebuild
 2207192040 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.23.7.ebuild
-2207191840 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.23.9.ebuild
 2207192040 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.24.1.ebuild
-2207191940 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.24.3.ebuild
-2204010810 ./sys-cluster/kube-proxy/kube-proxy-1.22.8.ebuild
-2204010810 ./sys-cluster/kube-proxy/kube-proxy-1.23.5.ebuild
-2205131940 ./sys-cluster/kube-proxy/kube-proxy-1.24.0.ebuild
+2208102040 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.22.12.ebuild
+2208102040 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.23.9.ebuild
+2208102040 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.24.3.ebuild
 2207192040 ./sys-cluster/kube-proxy/kube-proxy-1.22.10.ebuild
-2207191810 ./sys-cluster/kube-proxy/kube-proxy-1.22.12.ebuild
 2207192040 ./sys-cluster/kube-proxy/kube-proxy-1.23.7.ebuild
-2207191840 ./sys-cluster/kube-proxy/kube-proxy-1.23.9.ebuild
 2207192040 ./sys-cluster/kube-proxy/kube-proxy-1.24.1.ebuild
-2207191940 ./sys-cluster/kube-proxy/kube-proxy-1.24.3.ebuild
+2208102040 ./sys-cluster/kube-proxy/kube-proxy-1.22.12.ebuild
+2208102040 ./sys-cluster/kube-proxy/kube-proxy-1.23.9.ebuild
+2208102040 ./sys-cluster/kube-proxy/kube-proxy-1.24.3.ebuild
 2101091409 ./sys-cluster/kube-router/kube-router-1.1.1.ebuild
 2104302109 ./sys-cluster/kube-router/kube-router-1.2.2.ebuild
 2207282340 ./sys-cluster/kube-router/kube-router-1.5.0.ebuild
-2204010810 ./sys-cluster/kube-scheduler/kube-scheduler-1.22.8.ebuild
-2204010810 ./sys-cluster/kube-scheduler/kube-scheduler-1.23.5.ebuild
-2205131940 ./sys-cluster/kube-scheduler/kube-scheduler-1.24.0.ebuild
 2207192040 ./sys-cluster/kube-scheduler/kube-scheduler-1.22.10.ebuild
-2207191810 ./sys-cluster/kube-scheduler/kube-scheduler-1.22.12.ebuild
 2207192040 ./sys-cluster/kube-scheduler/kube-scheduler-1.23.7.ebuild
-2207191840 ./sys-cluster/kube-scheduler/kube-scheduler-1.23.9.ebuild
 2207192040 ./sys-cluster/kube-scheduler/kube-scheduler-1.24.1.ebuild
-2207191940 ./sys-cluster/kube-scheduler/kube-scheduler-1.24.3.ebuild
-2204010810 ./sys-cluster/kubeadm/kubeadm-1.22.8.ebuild
-2204010810 ./sys-cluster/kubeadm/kubeadm-1.23.5.ebuild
-2205131940 ./sys-cluster/kubeadm/kubeadm-1.24.0.ebuild
+2208102040 ./sys-cluster/kube-scheduler/kube-scheduler-1.22.12.ebuild
+2208102040 ./sys-cluster/kube-scheduler/kube-scheduler-1.23.9.ebuild
+2208102040 ./sys-cluster/kube-scheduler/kube-scheduler-1.24.3.ebuild
 2207192040 ./sys-cluster/kubeadm/kubeadm-1.22.10.ebuild
-2207191810 ./sys-cluster/kubeadm/kubeadm-1.22.12.ebuild
 2207192040 ./sys-cluster/kubeadm/kubeadm-1.23.7.ebuild
-2207191840 ./sys-cluster/kubeadm/kubeadm-1.23.9.ebuild
 2207192040 ./sys-cluster/kubeadm/kubeadm-1.24.1.ebuild
-2207191940 ./sys-cluster/kubeadm/kubeadm-1.24.3.ebuild
-2204010810 ./sys-cluster/kubectl/kubectl-1.22.8.ebuild
-2204010810 ./sys-cluster/kubectl/kubectl-1.23.5.ebuild
-2205131940 ./sys-cluster/kubectl/kubectl-1.24.0.ebuild
+2208102040 ./sys-cluster/kubeadm/kubeadm-1.22.12.ebuild
+2208102040 ./sys-cluster/kubeadm/kubeadm-1.23.9.ebuild
+2208102040 ./sys-cluster/kubeadm/kubeadm-1.24.3.ebuild
 2207192040 ./sys-cluster/kubectl/kubectl-1.22.10.ebuild
-2207191810 ./sys-cluster/kubectl/kubectl-1.22.12.ebuild
 2207192040 ./sys-cluster/kubectl/kubectl-1.23.7.ebuild
-2207191840 ./sys-cluster/kubectl/kubectl-1.23.9.ebuild
 2207192040 ./sys-cluster/kubectl/kubectl-1.24.1.ebuild
-2207191940 ./sys-cluster/kubectl/kubectl-1.24.3.ebuild
-2204010810 ./sys-cluster/kubelet/kubelet-1.22.8.ebuild
-2204010810 ./sys-cluster/kubelet/kubelet-1.23.5.ebuild
-2205131940 ./sys-cluster/kubelet/kubelet-1.24.0.ebuild
+2208102040 ./sys-cluster/kubectl/kubectl-1.22.12.ebuild
+2208102040 ./sys-cluster/kubectl/kubectl-1.23.9.ebuild
+2208102040 ./sys-cluster/kubectl/kubectl-1.24.3.ebuild
 2207192040 ./sys-cluster/kubelet/kubelet-1.22.10.ebuild
-2207191810 ./sys-cluster/kubelet/kubelet-1.22.12.ebuild
 2207192040 ./sys-cluster/kubelet/kubelet-1.23.7.ebuild
-2207191840 ./sys-cluster/kubelet/kubelet-1.23.9.ebuild
 2207192040 ./sys-cluster/kubelet/kubelet-1.24.1.ebuild
-2207191940 ./sys-cluster/kubelet/kubelet-1.24.3.ebuild
+2208102040 ./sys-cluster/kubelet/kubelet-1.22.12.ebuild
+2208102040 ./sys-cluster/kubelet/kubelet-1.23.9.ebuild
+2208102040 ./sys-cluster/kubelet/kubelet-1.24.3.ebuild
 2205160640 ./sys-cluster/kubeletctl/kubeletctl-1.6.ebuild
 2112260710 ./sys-cluster/legion/legion-21.09.0-r1.ebuild
 2112260710 ./sys-cluster/legion/legion-9999.ebuild
@@ -26799,12 +26801,12 @@
 2203040040 ./sys-cluster/rdma-core/rdma-core-38.0.ebuild
 2205141010 ./sys-cluster/rdma-core/rdma-core-39.0.ebuild
 2205141010 ./sys-cluster/rdma-core/rdma-core-9999.ebuild
-2208081610 ./sys-cluster/rdma-core/rdma-core-41.0.ebuild
+2208101410 ./sys-cluster/rdma-core/rdma-core-41.0.ebuild
 2104161439 ./sys-cluster/resource-agents/resource-agents-3.9.6.ebuild
 2104161439 ./sys-cluster/resource-agents/resource-agents-4.0.1.ebuild
 2104161439 ./sys-cluster/resource-agents/resource-agents-4.6.1.ebuild
-2203040040 ./sys-cluster/sanlock/sanlock-3.8.2.ebuild
 2206202110 ./sys-cluster/sanlock/sanlock-3.8.4.ebuild
+2208111410 ./sys-cluster/sanlock/sanlock-3.8.2.ebuild
 2207091210 ./sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild
 2207091210 ./sys-cluster/slurm/slurm-20.11.0.1-r105.ebuild
 2012151239 ./sys-cluster/spark-bin/spark-bin-2.4.3.ebuild
@@ -26861,9 +26863,9 @@
 2201062240 ./sys-devel/binutils/binutils-2.36.1-r2.ebuild
 2203181010 ./sys-devel/binutils/binutils-2.37_p1-r2.ebuild
 2203191310 ./sys-devel/binutils/binutils-2.38-r1.ebuild
-2207301211 ./sys-devel/binutils/binutils-2.38-r2.ebuild
-2208080240 ./sys-devel/binutils/binutils-2.39.ebuild
-2208072040 ./sys-devel/binutils/binutils-9999.ebuild
+2208110010 ./sys-devel/binutils/binutils-2.38-r2.ebuild
+2208110010 ./sys-devel/binutils/binutils-2.39.ebuild
+2208110010 ./sys-devel/binutils/binutils-9999.ebuild
 2207281010 ./sys-devel/bison/bison-3.7.6.ebuild
 2207281010 ./sys-devel/bison/bison-3.8.2.ebuild
 2205281910 ./sys-devel/bmake/bmake-20220418.ebuild
@@ -26938,6 +26940,7 @@
 2206121640 ./sys-devel/gdb/gdb-12.1.ebuild
 2207281010 ./sys-devel/gdb/gdb-12.1-r1.ebuild
 2207281010 ./sys-devel/gdb/gdb-9999.ebuild
+2208101110 ./sys-devel/gdb/gdb-12.1-r2.ebuild
 2207011810 ./sys-devel/gettext/gettext-0.21-r3.ebuild
 2204290540 ./sys-devel/gnuconfig/gnuconfig-20210107.ebuild
 2205110740 ./sys-devel/gnuconfig/gnuconfig-99999999.ebuild
@@ -26951,11 +26954,11 @@
 2104060140 ./sys-devel/libtool/libtool-2.4.6-r6.ebuild
 2203250640 ./sys-devel/libtool/libtool-9999.ebuild
 2206170210 ./sys-devel/libtool/libtool-2.4.7.ebuild
-2204212010 ./sys-devel/lld/lld-13.0.1.ebuild
-2207311440 ./sys-devel/lld/lld-14.0.6.ebuild
-2207311710 ./sys-devel/lld/lld-15.0.0.9999.ebuild
-2208092110 ./sys-devel/lld/lld-15.0.0_rc2.ebuild
-2208052310 ./sys-devel/lld/lld-16.0.0.9999.ebuild
+2208111410 ./sys-devel/lld/lld-13.0.1.ebuild
+2208111410 ./sys-devel/lld/lld-14.0.6.ebuild
+2208111410 ./sys-devel/lld/lld-15.0.0.9999.ebuild
+2208111410 ./sys-devel/lld/lld-15.0.0_rc2.ebuild
+2208111410 ./sys-devel/lld/lld-16.0.0.9999.ebuild
 2204212010 ./sys-devel/llvm-common/llvm-common-13.0.1.ebuild
 2204271540 ./sys-devel/llvm-common/llvm-common-15.0.0.9999.ebuild
 2208022310 ./sys-devel/llvm-common/llvm-common-14.0.6.ebuild
@@ -27021,15 +27024,11 @@
 2110082210 ./sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild
 2205191540 ./sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild
 1905300009 ./sys-firmware/firmware-imx/firmware-imx-5.4.ebuild
-2203160940 ./sys-firmware/intel-microcode/intel-microcode-20201112_p20201116-r1.ebuild
-2203160940 ./sys-firmware/intel-microcode/intel-microcode-20210216_p20210221.ebuild
-2203160940 ./sys-firmware/intel-microcode/intel-microcode-20210216_p20210514.ebuild
-2203160940 ./sys-firmware/intel-microcode/intel-microcode-20210608_p20210608.ebuild
 2203160940 ./sys-firmware/intel-microcode/intel-microcode-20210608_p20210830.ebuild
 2203160940 ./sys-firmware/intel-microcode/intel-microcode-20220207_p20220207.ebuild
 2205030010 ./sys-firmware/intel-microcode/intel-microcode-20220419_p20220421.ebuild
 2205102340 ./sys-firmware/intel-microcode/intel-microcode-20220510_p20220508.ebuild
-2208100010 ./sys-firmware/intel-microcode/intel-microcode-20220809_p20220809.ebuild
+2208102010 ./sys-firmware/intel-microcode/intel-microcode-20220809_p20220809.ebuild
 2205260840 ./sys-firmware/ipw2100-firmware/ipw2100-firmware-1.3-r1.ebuild
 2205260840 ./sys-firmware/ipw2200-firmware/ipw2200-firmware-3.1-r1.ebuild
 2104161439 ./sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
@@ -27400,13 +27399,13 @@
 2208051110 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.18.16.ebuild
 2208051110 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.203.ebuild
 2207291840 ./sys-kernel/vanilla-sources/vanilla-sources-4.14.290.ebuild
-2207291840 ./sys-kernel/vanilla-sources/vanilla-sources-4.19.254.ebuild
 2207291840 ./sys-kernel/vanilla-sources/vanilla-sources-4.9.325.ebuild
-2208011240 ./sys-kernel/vanilla-sources/vanilla-sources-5.19.0.ebuild
-2208051610 ./sys-kernel/vanilla-sources/vanilla-sources-5.10.135.ebuild
-2208051610 ./sys-kernel/vanilla-sources/vanilla-sources-5.15.59.ebuild
-2208051610 ./sys-kernel/vanilla-sources/vanilla-sources-5.18.16.ebuild
-2208051610 ./sys-kernel/vanilla-sources/vanilla-sources-5.4.209.ebuild
+2208111540 ./sys-kernel/vanilla-sources/vanilla-sources-4.19.255.ebuild
+2208111540 ./sys-kernel/vanilla-sources/vanilla-sources-5.10.136.ebuild
+2208111540 ./sys-kernel/vanilla-sources/vanilla-sources-5.15.60.ebuild
+2208111540 ./sys-kernel/vanilla-sources/vanilla-sources-5.18.17.ebuild
+2208111540 ./sys-kernel/vanilla-sources/vanilla-sources-5.19.1.ebuild
+2208111540 ./sys-kernel/vanilla-sources/vanilla-sources-5.4.210.ebuild
 2201310039 ./sys-kernel/zen-sources/zen-sources-5.15.10.ebuild
 2208072340 ./sys-kernel/zen-sources/zen-sources-5.18.16.ebuild
 2101091409 ./sys-libs/argp-standalone/argp-standalone-1.3-r2.ebuild
@@ -27418,18 +27417,19 @@
 2203181010 ./sys-libs/binutils-libs/binutils-libs-2.37_p1-r2.ebuild
 2204101410 ./sys-libs/binutils-libs/binutils-libs-2.38-r1.ebuild
 2207301211 ./sys-libs/binutils-libs/binutils-libs-2.38-r2.ebuild
+2208101110 ./sys-libs/binutils-libs/binutils-libs-2.39.ebuild
 2102050539 ./sys-libs/blocksruntime/blocksruntime-0_pre20171027-r1.ebuild
-2204212010 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.ebuild
-2207311710 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.9999.ebuild
-2208052310 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.6.ebuild
-2208092110 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0_rc2.ebuild
-2208052310 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild
-2204212010 ./sys-libs/compiler-rt/compiler-rt-13.0.1.ebuild
-2207311440 ./sys-libs/compiler-rt/compiler-rt-14.0.6.ebuild
-2208040240 ./sys-libs/compiler-rt/compiler-rt-14.0.6-r1.ebuild
-2208072110 ./sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild
-2208092110 ./sys-libs/compiler-rt/compiler-rt-15.0.0_rc2.ebuild
-2208072110 ./sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild
+2208111410 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.ebuild
+2208111410 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.6.ebuild
+2208111410 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.9999.ebuild
+2208111410 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0_rc2.ebuild
+2208111410 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild
+2208111410 ./sys-libs/compiler-rt/compiler-rt-13.0.1.ebuild
+2208111410 ./sys-libs/compiler-rt/compiler-rt-14.0.6-r1.ebuild
+2208111410 ./sys-libs/compiler-rt/compiler-rt-14.0.6.ebuild
+2208111410 ./sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild
+2208111410 ./sys-libs/compiler-rt/compiler-rt-15.0.0_rc2.ebuild
+2208111410 ./sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild
 2205050610 ./sys-libs/cracklib/cracklib-2.9.7.ebuild
 2112131739 ./sys-libs/csu/csu-85-r1.ebuild
 2111271610 ./sys-libs/cygwin-crypt/cygwin-crypt-1.4-r1.ebuild
@@ -27485,16 +27485,16 @@
 2205221140 ./sys-libs/libcap/libcap-2.64.ebuild
 2207200310 ./sys-libs/libcap/libcap-2.65.ebuild
 2203301740 ./sys-libs/libchipcard/libchipcard-5.1.5_rc2.ebuild
-2204212010 ./sys-libs/libcxx/libcxx-13.0.1.ebuild
-2208022310 ./sys-libs/libcxx/libcxx-14.0.6.ebuild
-2207312310 ./sys-libs/libcxx/libcxx-15.0.0.9999.ebuild
-2208092110 ./sys-libs/libcxx/libcxx-15.0.0_rc2.ebuild
-2208052310 ./sys-libs/libcxx/libcxx-16.0.0.9999.ebuild
-2204212010 ./sys-libs/libcxxabi/libcxxabi-13.0.1.ebuild
-2208022310 ./sys-libs/libcxxabi/libcxxabi-14.0.6.ebuild
-2207312310 ./sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild
-2208092110 ./sys-libs/libcxxabi/libcxxabi-15.0.0_rc2.ebuild
-2208052310 ./sys-libs/libcxxabi/libcxxabi-16.0.0.9999.ebuild
+2208111410 ./sys-libs/libcxx/libcxx-13.0.1.ebuild
+2208111410 ./sys-libs/libcxx/libcxx-14.0.6.ebuild
+2208111410 ./sys-libs/libcxx/libcxx-15.0.0.9999.ebuild
+2208111410 ./sys-libs/libcxx/libcxx-15.0.0_rc2.ebuild
+2208111410 ./sys-libs/libcxx/libcxx-16.0.0.9999.ebuild
+2208111410 ./sys-libs/libcxxabi/libcxxabi-13.0.1.ebuild
+2208111410 ./sys-libs/libcxxabi/libcxxabi-14.0.6.ebuild
+2208111410 ./sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild
+2208111410 ./sys-libs/libcxxabi/libcxxabi-15.0.0_rc2.ebuild
+2208111410 ./sys-libs/libcxxabi/libcxxabi-16.0.0.9999.ebuild
 2111210639 ./sys-libs/libfaketime/libfaketime-0.9.6-r4.ebuild
 2205191240 ./sys-libs/libfaketime/libfaketime-0.9.9.ebuild
 2205071040 ./sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild
@@ -27502,11 +27502,11 @@
 2104180939 ./sys-libs/libhx/libhx-3.25.ebuild
 2206222210 ./sys-libs/libieee1284/libieee1284-0.2.11-r8.ebuild
 2009171909 ./sys-libs/libixp/libixp-0.5_p20110208-r3.ebuild
-2204212010 ./sys-libs/libomp/libomp-13.0.1.ebuild
-2207311440 ./sys-libs/libomp/libomp-14.0.6-r1.ebuild
-2207311710 ./sys-libs/libomp/libomp-15.0.0.9999.ebuild
-2208092110 ./sys-libs/libomp/libomp-15.0.0_rc2.ebuild
-2208052310 ./sys-libs/libomp/libomp-16.0.0.9999.ebuild
+2208111410 ./sys-libs/libomp/libomp-13.0.1.ebuild
+2208111410 ./sys-libs/libomp/libomp-14.0.6-r1.ebuild
+2208111410 ./sys-libs/libomp/libomp-15.0.0.9999.ebuild
+2208111410 ./sys-libs/libomp/libomp-15.0.0_rc2.ebuild
+2208111410 ./sys-libs/libomp/libomp-16.0.0.9999.ebuild
 2203081540 ./sys-libs/libosinfo/libosinfo-1.10.0.ebuild
 2205190840 ./sys-libs/libraw1394/libraw1394-2.1.2-r1.ebuild
 2111150410 ./sys-libs/librtas/librtas-2.0.2-r2.ebuild
@@ -27543,11 +27543,11 @@
 2202252209 ./sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
 2205070810 ./sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild
 2207301740 ./sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
-2208050910 ./sys-libs/llvm-libunwind/llvm-libunwind-13.0.1.ebuild
-2208050910 ./sys-libs/llvm-libunwind/llvm-libunwind-14.0.6.ebuild
-2208091640 ./sys-libs/llvm-libunwind/llvm-libunwind-15.0.0.9999.ebuild
-2208092110 ./sys-libs/llvm-libunwind/llvm-libunwind-15.0.0_rc2.ebuild
-2208091640 ./sys-libs/llvm-libunwind/llvm-libunwind-16.0.0.9999.ebuild
+2208111410 ./sys-libs/llvm-libunwind/llvm-libunwind-13.0.1.ebuild
+2208111410 ./sys-libs/llvm-libunwind/llvm-libunwind-14.0.6.ebuild
+2208111410 ./sys-libs/llvm-libunwind/llvm-libunwind-15.0.0.9999.ebuild
+2208111410 ./sys-libs/llvm-libunwind/llvm-libunwind-15.0.0_rc2.ebuild
+2208111410 ./sys-libs/llvm-libunwind/llvm-libunwind-16.0.0.9999.ebuild
 2107081310 ./sys-libs/lwp/lwp-2.8.ebuild
 2205081040 ./sys-libs/mtdev/mtdev-1.1.6.ebuild
 2201012339 ./sys-libs/musl-nscd/musl-nscd-1.1.1-r1.ebuild
@@ -27653,7 +27653,7 @@
 2002231739 ./sys-power/suspend/suspend-1.0_p20190605.ebuild
 2101060939 ./sys-power/suspend/suspend-1.0_p20200924.ebuild
 2203132209 ./sys-power/switcheroo-control/switcheroo-control-2.4.ebuild
-2207201640 ./sys-power/switcheroo-control/switcheroo-control-2.6.ebuild
+2208111310 ./sys-power/switcheroo-control/switcheroo-control-2.6.ebuild
 2207221110 ./sys-power/thermald/thermald-2.4.9.ebuild
 2208011410 ./sys-power/thermald/thermald-2.5.ebuild
 2104272339 ./sys-power/uhubctl/uhubctl-2.4.0.ebuild
@@ -28110,10 +28110,10 @@
 1805270804 ./www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-9999.ebuild
 1702282250 ./www-apps/icingaweb2-module-pnp4nagios/icingaweb2-module-pnp4nagios-1.0.1.ebuild
 1702282250 ./www-apps/icingaweb2-module-pnp4nagios/icingaweb2-module-pnp4nagios-9999.ebuild
-2207010040 ./www-apps/icingaweb2/icingaweb2-9999.ebuild
 2207170640 ./www-apps/icingaweb2/icingaweb2-2.10.3.ebuild
-2208010640 ./www-apps/icingaweb2/icingaweb2-2.11.0.ebuild
-2208090440 ./www-apps/icingaweb2/icingaweb2-2.11.1.ebuild
+2208110340 ./www-apps/icingaweb2/icingaweb2-2.11.0.ebuild
+2208110340 ./www-apps/icingaweb2/icingaweb2-2.11.1.ebuild
+2208110340 ./www-apps/icingaweb2/icingaweb2-9999.ebuild
 2207030240 ./www-apps/ikiwiki/ikiwiki-3.20190228-r1.ebuild
 2207291010 ./www-apps/ikiwiki/ikiwiki-3.20200202.3-r1.ebuild
 2207300910 ./www-apps/ikiwiki/ikiwiki-3.20200202.3.ebuild
@@ -28211,6 +28211,8 @@
 2207202040 ./www-apps/radarr/radarr-4.2.0.6438.ebuild
 2207111610 ./www-apps/sonarr/sonarr-3.0.8.1507.ebuild
 2208091640 ./www-apps/sonarr/sonarr-3.0.9.1549.ebuild
+2208101610 ./www-apps/sonarr/sonarr-3.0.9.1549-r1.ebuild
+2208101640 ./www-apps/sonarr/sonarr-3.0.9.1549-r2.ebuild
 2207201540 ./www-apps/readarr/readarr-0.1.1.1320.ebuild
 2207310940 ./www-client/chromium/chromium-103.0.5060.114.ebuild
 2207310940 ./www-client/chromium/chromium-103.0.5060.134.ebuild
@@ -28236,7 +28238,7 @@
 2207271140 ./www-client/firefox/firefox-103.0.ebuild
 2208011410 ./www-client/firefox/firefox-103.0.1.ebuild
 2208012110 ./www-client/firefox/firefox-91.12.0.ebuild
-2208091240 ./www-client/firefox/firefox-103.0.2.ebuild
+2208102110 ./www-client/firefox/firefox-103.0.2.ebuild
 2208070810 ./www-client/google-chrome-beta/google-chrome-beta-105.0.5195.19-r1.ebuild
 2208070840 ./www-client/google-chrome-unstable/google-chrome-unstable-106.0.5216.6.ebuild
 2208070810 ./www-client/google-chrome/google-chrome-104.0.5112.79-r1.ebuild
@@ -28273,8 +28275,8 @@
 2207201010 ./www-client/qutebrowser/qutebrowser-2.5.2.ebuild
 2207201010 ./www-client/qutebrowser/qutebrowser-9999.ebuild
 2208031710 ./www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
-2206171140 ./www-client/seamonkey/seamonkey-2.53.12.ebuild
-2207191410 ./www-client/seamonkey/seamonkey-2.53.13.ebuild
+2208111440 ./www-client/seamonkey/seamonkey-2.53.12.ebuild
+2208111440 ./www-client/seamonkey/seamonkey-2.53.13.ebuild
 2206091110 ./www-client/surf/surf-2.1-r1.ebuild
 2206091110 ./www-client/surf/surf-9999.ebuild
 2103060139 ./www-client/surfraw/surfraw-2.3.0-r3.ebuild
@@ -28556,6 +28558,7 @@
 2112080640 ./x11-libs/fox/fox-1.7.67.ebuild
 2205131710 ./x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
 2205311240 ./x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.8.ebuild
+2208102310 ./x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.9.ebuild
 2110120139 ./x11-libs/gl2ps/gl2ps-1.4.2.ebuild
 2204101910 ./x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2-r1.ebuild
 2205280440 ./x11-libs/goffice/goffice-0.10.52.ebuild
@@ -28584,7 +28587,7 @@
 2205080640 ./x11-libs/libXau/libXau-1.0.9-r1.ebuild
 2205081210 ./x11-libs/libXaw/libXaw-1.0.14.ebuild
 2205100440 ./x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
-2105240209 ./x11-libs/libXaw3dXft/libXaw3dXft-1.6.2h.ebuild
+2208101640 ./x11-libs/libXaw3dXft/libXaw3dXft-1.6.2h.ebuild
 2205100440 ./x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
 2205280440 ./x11-libs/libXcursor/libXcursor-1.2.1.ebuild
 2205171110 ./x11-libs/libXdamage/libXdamage-1.1.5.ebuild
@@ -28650,7 +28653,7 @@
 2205130940 ./x11-libs/libva/libva-2.14.0.ebuild
 2207040610 ./x11-libs/libva/libva-2.15.0.ebuild
 2207040610 ./x11-libs/libva/libva-9999.ebuild
-2203262039 ./x11-libs/libvdpau/libvdpau-1.5.ebuild
+2208111440 ./x11-libs/libvdpau/libvdpau-1.5.ebuild
 2104150839 ./x11-libs/libwnck/libwnck-2.31.0-r1.ebuild
 2206280511 ./x11-libs/libwnck/libwnck-40.1.ebuild
 2206241410 ./x11-libs/libxcb/libxcb-1.15.ebuild
@@ -28755,7 +28758,7 @@
 2108161139 ./x11-misc/copyq/copyq-4.1.0.ebuild
 2110200610 ./x11-misc/copyq/copyq-5.0.0.ebuild
 2104151009 ./x11-misc/dclock/dclock-2.2.2_p12.ebuild
-2103271939 ./x11-misc/devilspie/devilspie-0.23-r2.ebuild
+2208111440 ./x11-misc/devilspie/devilspie-0.23-r2.ebuild
 2202161010 ./x11-misc/devilspie2/devilspie2-0.44.ebuild
 2106060709 ./x11-misc/dex/dex-0.8.0.ebuild
 2112301009 ./x11-misc/dex/dex-0.9.0.ebuild
@@ -28979,7 +28982,7 @@
 2201041109 ./x11-misc/urxvt-tabbedex/urxvt-tabbedex-21.47.ebuild
 2012251939 ./x11-misc/urxvtconfig/urxvtconfig-1.0-r1.ebuild
 2205081040 ./x11-misc/util-macros/util-macros-1.19.3.ebuild
-2207070540 ./x11-misc/vdpauinfo/vdpauinfo-1.5.ebuild
+2208111440 ./x11-misc/vdpauinfo/vdpauinfo-1.5-r1.ebuild
 2102270409 ./x11-misc/viewglob/viewglob-2.0.4-r1.ebuild
 2205050140 ./x11-misc/virtualgl/virtualgl-3.0-r1.ebuild
 2207201640 ./x11-misc/virtualgl/virtualgl-3.0.1.ebuild
@@ -28991,7 +28994,7 @@
 2106302209 ./x11-misc/wdm/wdm-1.28-r8.ebuild
 2104200509 ./x11-misc/whaw/whaw-0.2.ebuild
 1703211731 ./x11-misc/wininfo/wininfo-0.7-r1.ebuild
-2109211710 ./x11-misc/wmctrl/wmctrl-1.07-r2.ebuild
+2208111440 ./x11-misc/wmctrl/wmctrl-1.07-r3.ebuild
 2109211710 ./x11-misc/wmname/wmname-0.1-r1.ebuild
 2106230209 ./x11-misc/x11vnc/x11vnc-0.9.16-r6.ebuild
 2107210539 ./x11-misc/x11vnc/x11vnc-0.9.16-r7.ebuild
@@ -29229,7 +29232,7 @@
 1811092139 ./x11-plugins/wmcalc/wmcalc-0.6-r1.ebuild
 1809192109 ./x11-plugins/wmcalc/wmcalc-0.7.ebuild
 2203040410 ./x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild
-2207091910 ./x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild
+2208111410 ./x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild
 2203040410 ./x11-plugins/wmcliphist/wmcliphist-2.1-r2.ebuild
 2008252139 ./x11-plugins/wmclock/wmclock-1.0.16-r1.ebuild
 2203040410 ./x11-plugins/wmclockmon/wmclockmon-0.8.1-r1.ebuild
@@ -29303,7 +29306,7 @@
 2101030239 ./x11-plugins/wmweather+/wmweather+-2.18.ebuild
 2203040410 ./x11-plugins/wmweather/wmweather-2.4.7.ebuild
 2203040410 ./x11-plugins/wmwifi/wmwifi-0.6-r1.ebuild
-2001292139 ./x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild
+2208111410 ./x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild
 1809192139 ./x11-plugins/wmxkb/wmxkb-1.2.2-r1.ebuild
 2001292139 ./x11-plugins/wmxres/wmxres-1.2-r1.ebuild
 2009240139 ./x11-plugins/wmxres/wmxres-1.4.ebuild
@@ -29313,7 +29316,7 @@
 2204271010 ./x11-terms/aterm/aterm-1.0.1-r5.ebuild
 2002101039 ./x11-terms/cool-retro-term/cool-retro-term-1.1.1-r2.ebuild
 2207190310 ./x11-terms/gnome-terminal/gnome-terminal-3.44.1.ebuild
-2205162240 ./x11-terms/guake/guake-3.8.5.ebuild
+2208111110 ./x11-terms/guake/guake-3.8.5-r1.ebuild
 2111031010 ./x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
 2206161640 ./x11-terms/kitty-terminfo/kitty-terminfo-0.25.2.ebuild
 2207141010 ./x11-terms/kitty/kitty-0.25.2.ebuild
@@ -29407,7 +29410,7 @@
 2004032241 ./x11-themes/gentoo-artwork-livecd/gentoo-artwork-livecd-2007.0.ebuild
 2102071709 ./x11-themes/gentoo-artwork/gentoo-artwork-0.4.2-r1.ebuild
 2104262339 ./x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2-r1.ebuild
-2207310240 ./x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2-r3.ebuild
+2208111410 ./x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2-r3.ebuild
 2110211409 ./x11-themes/gentoo10-backgrounds/gentoo10-backgrounds-20110309.ebuild
 2002112051 ./x11-themes/geramik/geramik-0.27-r1.ebuild
 1912221309 ./x11-themes/gkrellm-themes/gkrellm-themes-0.1-r1.ebuild
@@ -29566,8 +29569,8 @@
 2203272210 ./x11-wm/metacity/metacity-3.44.0.ebuild
 2205050610 ./x11-wm/muffin/muffin-5.2.0.ebuild
 2104192239 ./x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
-2207190310 ./x11-wm/mutter/mutter-42.2.ebuild
-2208070840 ./x11-wm/mutter/mutter-42.3.ebuild
+2208111410 ./x11-wm/mutter/mutter-42.2.ebuild
+2208111410 ./x11-wm/mutter/mutter-42.3.ebuild
 2206131610 ./x11-wm/notion/notion-4.0.2_p20220613.ebuild
 2206131610 ./x11-wm/notion/notion-9999.ebuild
 2205251440 ./x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -29808,7 +29811,7 @@
 2204291439 ./sec-keys/openpgp-keys-terminator/openpgp-keys-terminator-20210306.ebuild
 2204291439 ./sec-keys/openpgp-keys-tor/openpgp-keys-tor-20210425.ebuild
 2204291439 ./sec-keys/openpgp-keys-tor/openpgp-keys-tor-20220216.ebuild
-2204291439 ./sec-keys/openpgp-keys-voikko/openpgp-keys-voikko-20201013.ebuild
+2208111440 ./sec-keys/openpgp-keys-voikko/openpgp-keys-voikko-20201013.ebuild
 2204291439 ./sec-keys/signify-keys-signify/signify-keys-signify-30.ebuild
 2204291439 ./sec-keys/openpgp-keys-kovidgoyal/openpgp-keys-kovidgoyal-20220106.ebuild
 2204291439 ./sec-keys/openpgp-keys-gnupg/openpgp-keys-gnupg-20220210.ebuild
@@ -31140,7 +31143,6 @@
 2208020744 metadata/md5-cache/app-admin/webapp-config-9999
 2208020744 metadata/md5-cache/app-admin/xkcdpass-1.19.3
 2208020744 metadata/md5-cache/app-admin/yadm-3.2.1
-2208092110 metadata/md5-cache/app-admin/Manifest.gz
 2208091510 metadata/md5-cache/app-admin/ansible-lint-6.4.0
 2208091110 metadata/md5-cache/app-admin/awscli-1.25.36
 2208050940 metadata/md5-cache/app-admin/awscli-1.25.46
@@ -31156,8 +31158,6 @@
 2208080110 metadata/md5-cache/app-admin/rasdaemon-0.6.7
 2208080110 metadata/md5-cache/app-admin/rasdaemon-0.6.7-r1
 2208080110 metadata/md5-cache/app-admin/rsyslog-8.2102.0-r1
-2208080110 metadata/md5-cache/app-admin/rsyslog-8.2106.0-r1
-2208080110 metadata/md5-cache/app-admin/rsyslog-8.2108.0-r1
 2208080110 metadata/md5-cache/app-admin/rsyslog-8.2110.0-r1
 2208080110 metadata/md5-cache/app-admin/rsyslog-8.2112.0-r1
 2208080110 metadata/md5-cache/app-admin/rsyslog-8.2204.0-r1
@@ -31169,6 +31169,9 @@
 2208080110 metadata/md5-cache/app-admin/ulogd-2.0.7-r3
 2208080110 metadata/md5-cache/app-admin/usbview-2.2
 2208080110 metadata/md5-cache/app-admin/usbview-3.0
+2208111310 metadata/md5-cache/app-admin/Manifest.gz
+2208111310 metadata/md5-cache/app-admin/awscli-1.25.49
+2208101710 metadata/md5-cache/app-admin/rsyslog-8.2208.0
 2207260815 metadata/md5-cache/app-antivirus/clamav-0.103.6
 2207270340 metadata/md5-cache/app-antivirus/clamav-0.103.7
 2208040512 metadata/md5-cache/app-antivirus/clamav-0.103.7-r1
@@ -31396,11 +31399,13 @@
 2208020710 metadata/md5-cache/app-backup/kup-0.9.1
 2208020744 metadata/md5-cache/app-backup/rdiff-backup-2.0.5-r1
 2208020744 metadata/md5-cache/app-backup/untangle-https-backup-0.1.0
-2208100740 metadata/md5-cache/app-backup/Manifest.gz
 2208091640 metadata/md5-cache/app-backup/btrbk-0.32.3
 2208100740 metadata/md5-cache/app-backup/burp-2.4.0-r1
 2208100740 metadata/md5-cache/app-backup/burp-2.5.4-r1
-2208100740 metadata/md5-cache/app-backup/dar-2.7.6
+2208111310 metadata/md5-cache/app-backup/Manifest.gz
+2208111310 metadata/md5-cache/app-backup/bacula-13.0.1
+2208101110 metadata/md5-cache/app-backup/dar-2.7.6
+2208101140 metadata/md5-cache/app-backup/dar-2.7.7
 2109012139 metadata/md5-cache/app-benchmarks/bonnie++-2.00a
 1907151840 metadata/md5-cache/app-benchmarks/forkbomb-1.4-r1
 2110300109 metadata/md5-cache/app-benchmarks/geekbench-2.4.2-r1
@@ -31680,7 +31685,6 @@
 2208020744 metadata/md5-cache/app-crypt/gcr-3.41.1
 2208020744 metadata/md5-cache/app-crypt/glep63-check-10
 2208020744 metadata/md5-cache/app-crypt/glep63-check-11
-2208020744 metadata/md5-cache/app-crypt/gpgme-1.17.1-r1
 2208020744 metadata/md5-cache/app-crypt/heimdal-7.7.0-r5
 2208020744 metadata/md5-cache/app-crypt/libsecret-0.20.5-r3
 2208020744 metadata/md5-cache/app-crypt/mit-krb5-1.19.2-r4
@@ -31696,7 +31700,6 @@
 2208020744 metadata/md5-cache/app-crypt/yubikey-manager-4.0.8
 2208020744 metadata/md5-cache/app-crypt/yubikey-manager-qt-1.2.2
 2208020744 metadata/md5-cache/app-crypt/yubioath-desktop-5.1.0-r2
-2208092010 metadata/md5-cache/app-crypt/Manifest.gz
 2208092010 metadata/md5-cache/app-crypt/acme-1.29.0
 2208092010 metadata/md5-cache/app-crypt/certbot-1.29.0
 2208092010 metadata/md5-cache/app-crypt/certbot-apache-1.29.0
@@ -31716,6 +31719,8 @@
 2208081310 metadata/md5-cache/app-crypt/xca-2.4.0-r2
 2208071910 metadata/md5-cache/app-crypt/yubikey-manager-4.0.9
 2208071910 metadata/md5-cache/app-crypt/yubikey-manager-qt-1.2.4
+2208101610 metadata/md5-cache/app-crypt/Manifest.gz
+2208101610 metadata/md5-cache/app-crypt/gpgme-1.17.1-r1
 2109291739 metadata/md5-cache/app-dicts/bookview-3.2.1
 2109291739 metadata/md5-cache/app-dicts/dictd-vera-1.24-r1
 2109291739 metadata/md5-cache/app-dicts/eblook-1.6.1
@@ -32474,7 +32479,6 @@
 2207181923 metadata/md5-cache/app-editors/ee-1.5.2-r1
 2207181923 metadata/md5-cache/app-editors/elvis-2.2.0-r8
 2207181923 metadata/md5-cache/app-editors/emacs-27.2-r5
-2207181923 metadata/md5-cache/app-editors/emacs-28.1
 2207181923 metadata/md5-cache/app-editors/emacs-28.1-r2
 2207181923 metadata/md5-cache/app-editors/emacs-28.1.90-r2
 2207181923 metadata/md5-cache/app-editors/emacs-28.1.9999
@@ -32597,9 +32601,10 @@
 2208020744 metadata/md5-cache/app-editors/vim-9.0.0049
 2208020744 metadata/md5-cache/app-editors/vim-9.0.0099
 2208020744 metadata/md5-cache/app-editors/vim-9999
-2208081310 metadata/md5-cache/app-editors/Manifest.gz
 2208051010 metadata/md5-cache/app-editors/vscode-1.70.0
 2208051540 metadata/md5-cache/app-editors/vscodium-1.70.0
+2208101110 metadata/md5-cache/app-editors/Manifest.gz
+2208101110 metadata/md5-cache/app-editors/emacs-28.1
 2204172340 metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
 2204172340 metadata/md5-cache/app-emacs/adaptive-wrap-0.7
 2204172340 metadata/md5-cache/app-emacs/adaptive-wrap-0.8
@@ -33088,11 +33093,15 @@
 2208021910 metadata/md5-cache/app-emacs/pkg-info-0.6
 2208020744 metadata/md5-cache/app-emacs/pymacs-0.26-r3
 2208041410 metadata/md5-cache/app-emacs/racket-mode-20220804
-2208100040 metadata/md5-cache/app-emacs/Manifest.gz
 2208090540 metadata/md5-cache/app-emacs/autoconf-mode-2.71
 2208090410 metadata/md5-cache/app-emacs/dockerfile-mode-1.7
 2208100040 metadata/md5-cache/app-emacs/emacs-ccls-0_pre20220510-r1
 2208051140 metadata/md5-cache/app-emacs/scala-mode-2.10.3
+2208101710 metadata/md5-cache/app-emacs/Manifest.gz
+2208101710 metadata/md5-cache/app-emacs/citar-1.0
+2208101710 metadata/md5-cache/app-emacs/citeproc-el-0.9.1
+2208101710 metadata/md5-cache/app-emacs/string-inflection-1.0.16
+2208101710 metadata/md5-cache/app-emacs/yaml-0.5.1
 1912171039 metadata/md5-cache/app-emulation/bochs-2.6.10
 2110200512 metadata/md5-cache/app-emulation/bochs-2.7
 1910051539 metadata/md5-cache/app-emulation/dlx-1.0.0
@@ -33405,7 +33414,6 @@
 2205190840 metadata/md5-cache/app-i18n/unicode-data-14.0.0
 2206081740 metadata/md5-cache/app-i18n/skk-jisyo-201905
 2206121710 metadata/md5-cache/app-i18n/ibus-table-others-1.3.13
-2207051210 metadata/md5-cache/app-i18n/transifex-client-1.2.0
 2207161011 metadata/md5-cache/app-i18n/skk-jisyo-999999
 2207181923 metadata/md5-cache/app-i18n/bidiv-1.5_p4
 2207181711 metadata/md5-cache/app-i18n/cstools-3.44
@@ -33536,12 +33544,13 @@
 2208022210 metadata/md5-cache/app-i18n/unicode-emoji-14.0
 2208020744 metadata/md5-cache/app-i18n/xsunpinyin-2.0.4_pre20200306162733
 2208021110 metadata/md5-cache/app-i18n/xvnkb-0.2.11
-2208081810 metadata/md5-cache/app-i18n/Manifest.gz
 2208061510 metadata/md5-cache/app-i18n/ibus-1.5.26-r1
 2208060410 metadata/md5-cache/app-i18n/ibus-m17n-1.4.10
 2208071640 metadata/md5-cache/app-i18n/ibus-table-1.16.11
 2208081810 metadata/md5-cache/app-i18n/ibus-typing-booster-2.18.9
 2208071710 metadata/md5-cache/app-i18n/multiskkserv-20100128
+2208101140 metadata/md5-cache/app-i18n/Manifest.gz
+2208101140 metadata/md5-cache/app-i18n/transifex-client-1.3.0
 2002112051 metadata/md5-cache/app-laptop/hdaps-gl-0.0.7
 2207181923 metadata/md5-cache/app-laptop/dispad-0.3.1-r1
 2207181923 metadata/md5-cache/app-laptop/ibam-0.5.2-r4
@@ -33610,9 +33619,9 @@
 2207230240 metadata/md5-cache/app-metrics/node_exporter-1.3.1
 2207221840 metadata/md5-cache/app-metrics/openvpn_exporter-0.3.0
 2207232010 metadata/md5-cache/app-metrics/postgres_exporter-0.10.1
-2207240210 metadata/md5-cache/app-metrics/prometheus-2.36.2
-2208080110 metadata/md5-cache/app-metrics/Manifest.gz
 2208080110 metadata/md5-cache/app-metrics/collectd-5.12.0-r7
+2208111410 metadata/md5-cache/app-metrics/Manifest.gz
+2208111410 metadata/md5-cache/app-metrics/prometheus-2.36.2
 2104190739 metadata/md5-cache/app-misc/aldo-0.7.7
 1910161339 metadata/md5-cache/app-misc/astrolog-ephemeris-5.40
 2105291809 metadata/md5-cache/app-misc/banner-1.3.5-r1
@@ -34187,18 +34196,14 @@
 2207181923 metadata/md5-cache/app-portage/ufed-0.96
 2207181923 metadata/md5-cache/app-portage/ufed-9999
 2207230511 metadata/md5-cache/app-portage/hackport-9999
-2207261010 metadata/md5-cache/app-portage/cpuid2cpuflags-12
 2207260540 metadata/md5-cache/app-portage/eix-0.36.4
 2207250144 metadata/md5-cache/app-portage/fquery-0.2.3-r1
 2207250144 metadata/md5-cache/app-portage/golop-9999
-2207260815 metadata/md5-cache/app-portage/mgorny-dev-scripts-22
-2207271140 metadata/md5-cache/app-portage/mgorny-dev-scripts-21
 2207270740 metadata/md5-cache/app-portage/portage-utils-0.94.1
 2207270740 metadata/md5-cache/app-portage/portage-utils-9999
 2207301310 metadata/md5-cache/app-portage/eix-0.36.3
 2207301211 metadata/md5-cache/app-portage/hackport-0.7.2.2
 2207300810 metadata/md5-cache/app-portage/mgorny-dev-scripts-24
-2208020744 metadata/md5-cache/app-portage/diffmask-0.3.3-r4
 2208020744 metadata/md5-cache/app-portage/elicense-1.0.2
 2208020744 metadata/md5-cache/app-portage/elogv-0.7.9
 2208020744 metadata/md5-cache/app-portage/elogv-0.7.9-r1
@@ -34206,26 +34211,16 @@
 2208020744 metadata/md5-cache/app-portage/esearch-1.3-r3
 2208020744 metadata/md5-cache/app-portage/esearch-9999
 2208020744 metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4-r1
-2208020744 metadata/md5-cache/app-portage/flaggie-0.2.1-r1
-2208020744 metadata/md5-cache/app-portage/flaggie-0.2.1-r2
 2208020744 metadata/md5-cache/app-portage/g-sorcery-0.2.2-r1
-2208020744 metadata/md5-cache/app-portage/gemato-16.2
-2208020744 metadata/md5-cache/app-portage/gemato-9999
 2208020744 metadata/md5-cache/app-portage/gentoolkit-0.5.0-r3
 2208020744 metadata/md5-cache/app-portage/gentoolkit-0.5.1-r1
 2208020744 metadata/md5-cache/app-portage/gentoolkit-0.6.1-r3
 2208020744 metadata/md5-cache/app-portage/gentoolkit-9999
-2208020744 metadata/md5-cache/app-portage/gentoopm-0.4
-2208020744 metadata/md5-cache/app-portage/gentoopm-9999
 2208020744 metadata/md5-cache/app-portage/gs-elpa-0.2.1-r1
 2208020744 metadata/md5-cache/app-portage/iwdevtools-0.11.5-r1
 2208020744 metadata/md5-cache/app-portage/iwdevtools-9999
 2208021510 metadata/md5-cache/app-portage/java-ebuilder-0.5.1-r1
 2208021510 metadata/md5-cache/app-portage/java-ebuilder-9999
-2208020744 metadata/md5-cache/app-portage/kuroneko-0.1.0
-2208020744 metadata/md5-cache/app-portage/kuroneko-0.1.1
-2208020744 metadata/md5-cache/app-portage/kuroneko-0.1.2
-2208020744 metadata/md5-cache/app-portage/kuroneko-0.1.3
 2208020710 metadata/md5-cache/app-portage/kuroo-1.2.1-r1
 2208020710 metadata/md5-cache/app-portage/kuroo-9999
 2208020744 metadata/md5-cache/app-portage/metagen-0.7.2
@@ -34236,34 +34231,25 @@
 2208020744 metadata/md5-cache/app-portage/mirrorselect-2.2.6-r2
 2208020744 metadata/md5-cache/app-portage/mirrorselect-2.3.0-r1
 2208020744 metadata/md5-cache/app-portage/mirrorselect-9999
-2208020744 metadata/md5-cache/app-portage/nattka-0.3.1
 2208020744 metadata/md5-cache/app-portage/overlint-0.5.3-r2
 2208020744 metadata/md5-cache/app-portage/pfl-3.1-r1
 2208020744 metadata/md5-cache/app-portage/pfl-3.2-r2
 2208020744 metadata/md5-cache/app-portage/pkg-testing-tools-0.1.0
 2208020744 metadata/md5-cache/app-portage/portpeek-3.2.2
-2208020744 metadata/md5-cache/app-portage/pram-10
 2208020744 metadata/md5-cache/app-portage/recover-broken-vdb-1.0.0
 2208020744 metadata/md5-cache/app-portage/recover-broken-vdb-9999
 2208020744 metadata/md5-cache/app-portage/repoman-3.0.3-r2
-2208020744 metadata/md5-cache/app-portage/smart-live-rebuild-1.4.0
-2208020744 metadata/md5-cache/app-portage/smart-live-rebuild-9999
 2208020744 metadata/md5-cache/app-portage/tatt-0.8
 2208020744 metadata/md5-cache/app-portage/tatt-0.9
 2208020744 metadata/md5-cache/app-portage/tatt-9999
-2208100910 metadata/md5-cache/app-portage/Manifest.gz
-2208082310 metadata/md5-cache/app-portage/diffmask-0.3.3-r5
 2208082310 metadata/md5-cache/app-portage/distpatch-0.1.2-r2
 2208082310 metadata/md5-cache/app-portage/emerge-delta-webrsync-3.7.6
 2208082310 metadata/md5-cache/app-portage/epkg-0.4-r2
 2208082310 metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4-r2
 2208082310 metadata/md5-cache/app-portage/g-octave-0.4.1-r7
-2208082310 metadata/md5-cache/app-portage/gander-0.0.1-r2
-2208100040 metadata/md5-cache/app-portage/gpyutils-0.8.2
 2208080110 metadata/md5-cache/app-portage/grs-0.7
 2208080110 metadata/md5-cache/app-portage/grs-0.8-r1
 2208080110 metadata/md5-cache/app-portage/grs-9999
-2208082310 metadata/md5-cache/app-portage/gverify-2
 2208100910 metadata/md5-cache/app-portage/iwdevtools-0.11.6
 2208080110 metadata/md5-cache/app-portage/layman-2.4.3
 2208080110 metadata/md5-cache/app-portage/layman-9999
@@ -34272,7 +34258,25 @@
 2208082310 metadata/md5-cache/app-portage/porticron-0.7.1
 2208082310 metadata/md5-cache/app-portage/portpeek-3.2.2-r1
 2208082310 metadata/md5-cache/app-portage/repo-commit-0.4.1-r1
-2208081810 metadata/md5-cache/app-portage/unsymlink-lib-20
+2208101740 metadata/md5-cache/app-portage/Manifest.gz
+2208101740 metadata/md5-cache/app-portage/cpuid2cpuflags-12
+2208101740 metadata/md5-cache/app-portage/diffmask-0.3.3-r5
+2208101740 metadata/md5-cache/app-portage/flaggie-0.2.1-r2
+2208101740 metadata/md5-cache/app-portage/gander-0.0.1-r2
+2208101740 metadata/md5-cache/app-portage/gemato-16.2
+2208101740 metadata/md5-cache/app-portage/gemato-9999
+2208101740 metadata/md5-cache/app-portage/gentoopm-0.4
+2208101740 metadata/md5-cache/app-portage/gentoopm-9999
+2208101740 metadata/md5-cache/app-portage/gpyutils-0.8.2
+2208101740 metadata/md5-cache/app-portage/gverify-2
+2208101740 metadata/md5-cache/app-portage/kuroneko-0.1.3
+2208101740 metadata/md5-cache/app-portage/mgorny-dev-scripts-21
+2208101740 metadata/md5-cache/app-portage/mgorny-dev-scripts-22
+2208101740 metadata/md5-cache/app-portage/nattka-0.3.1
+2208101740 metadata/md5-cache/app-portage/pram-10
+2208101740 metadata/md5-cache/app-portage/smart-live-rebuild-1.4.0
+2208101740 metadata/md5-cache/app-portage/smart-live-rebuild-9999
+2208101740 metadata/md5-cache/app-portage/unsymlink-lib-20
 2005131639 metadata/md5-cache/app-shells/bashdb-5.0.1.1.2
 2104212309 metadata/md5-cache/app-shells/bashish-2.2.4
 2012271709 metadata/md5-cache/app-shells/dsh-0.25.10-r1
@@ -34354,10 +34358,6 @@
 2208020744 metadata/md5-cache/app-shells/autojump-22.5.3-r1
 2208020744 metadata/md5-cache/app-shells/bash-completion-2.11
 2208020744 metadata/md5-cache/app-shells/bash-completion-9999
-2208020744 metadata/md5-cache/app-shells/fish-3.4.0
-2208020744 metadata/md5-cache/app-shells/fish-3.4.1
-2208020744 metadata/md5-cache/app-shells/fish-3.5.0
-2208020744 metadata/md5-cache/app-shells/fish-9999
 2208020744 metadata/md5-cache/app-shells/ksh-2020.0.0-r1
 2208020744 metadata/md5-cache/app-shells/loksh-7.1
 2208020744 metadata/md5-cache/app-shells/powerline-2.7-r2
@@ -34365,8 +34365,12 @@
 2208030940 metadata/md5-cache/app-shells/starship-1.9.1
 2208020744 metadata/md5-cache/app-shells/thefuck-3.30
 2208020744 metadata/md5-cache/app-shells/thefuck-3.32
-2208062210 metadata/md5-cache/app-shells/Manifest.gz
 2208062210 metadata/md5-cache/app-shells/nushell-0.66.2
+2208111410 metadata/md5-cache/app-shells/Manifest.gz
+2208111410 metadata/md5-cache/app-shells/fish-3.4.0
+2208111410 metadata/md5-cache/app-shells/fish-3.4.1
+2208111410 metadata/md5-cache/app-shells/fish-3.5.0
+2208111410 metadata/md5-cache/app-shells/fish-9999
 2101061709 metadata/md5-cache/app-text/antixls-0.3b
 2111090809 metadata/md5-cache/app-text/bibclean-3.06
 2108250539 metadata/md5-cache/app-text/catdoc-0.95-r1
@@ -34636,7 +34640,6 @@
 2207260815 metadata/md5-cache/app-text/fictionup-0.2.1
 2207250144 metadata/md5-cache/app-text/gtkspell-3.0.10
 2207260815 metadata/md5-cache/app-text/htmlinc-1.0_beta1-r2
-2207260815 metadata/md5-cache/app-text/htmltidy-5.8.0-r1
 2207260815 metadata/md5-cache/app-text/hunspell-1.7.0-r2
 2207242118 metadata/md5-cache/app-text/hyperestraier-1.4.13-r1
 2207250144 metadata/md5-cache/app-text/jabref-bin-3.7
@@ -34663,7 +34666,6 @@
 2207260815 metadata/md5-cache/app-text/mupdf-1.18.0-r4
 2207260815 metadata/md5-cache/app-text/mupdf-1.19.0
 2207260815 metadata/md5-cache/app-text/mupdf-1.19.1
-2207260815 metadata/md5-cache/app-text/mupdf-1.20.0
 2207260815 metadata/md5-cache/app-text/nuspell-5.1.0
 2207260815 metadata/md5-cache/app-text/openjade-1.3.2-r9
 2207260815 metadata/md5-cache/app-text/opensp-1.5.2-r7
@@ -34804,7 +34806,6 @@
 2208020744 metadata/md5-cache/app-text/zathura-ps-0.2.6
 2208020744 metadata/md5-cache/app-text/zathura-ps-0.2.7
 2208020744 metadata/md5-cache/app-text/zathura-ps-9999
-2208081540 metadata/md5-cache/app-text/Manifest.gz
 2208070840 metadata/md5-cache/app-text/gspell-1.11.1
 2208051610 metadata/md5-cache/app-text/html2text-2.1.1
 2208051040 metadata/md5-cache/app-text/po4a-0.66
@@ -34812,6 +34813,9 @@
 2208081540 metadata/md5-cache/app-text/poppler-22.07.0
 2208051840 metadata/md5-cache/app-text/poppler-22.08.0
 2208051840 metadata/md5-cache/app-text/poppler-9999
+2208110740 metadata/md5-cache/app-text/Manifest.gz
+2208110740 metadata/md5-cache/app-text/htmltidy-5.8.0-r1
+2208101410 metadata/md5-cache/app-text/mupdf-1.20.0
 2203240726 metadata/md5-cache/app-vim/vim-spell-cs-20061021-r1
 2203240726 metadata/md5-cache/app-vim/vim-spell-da-20060116-r1
 2203240726 metadata/md5-cache/app-vim/vim-spell-de-20080213-r1
@@ -35330,8 +35334,9 @@
 2208020744 metadata/md5-cache/dev-cpp/pangomm-2.50.0
 2208020744 metadata/md5-cache/dev-cpp/sdbus-c++-0.9.0-r3
 2208020744 metadata/md5-cache/dev-cpp/sdbus-c++-1.1.0-r3
-2208081610 metadata/md5-cache/dev-cpp/Manifest.gz
 2208081610 metadata/md5-cache/dev-cpp/highway-0.17.0
+2208101140 metadata/md5-cache/dev-cpp/Manifest.gz
+2208101140 metadata/md5-cache/dev-cpp/highway-1.0.0
 2107250309 metadata/md5-cache/dev-db/freetds-1.2.18
 2102252239 metadata/md5-cache/dev-db/lmdb++-0.9.14.0
 2102261639 metadata/md5-cache/dev-db/lmdb++-1.0.0
@@ -35450,7 +35455,6 @@
 2207260815 metadata/md5-cache/dev-db/mysql-connector-c++-1.1.12-r2
 2207260815 metadata/md5-cache/dev-db/mysql-connector-c++-8.0.27
 2207260815 metadata/md5-cache/dev-db/mysql-connector-c-8.0.27
-2207260815 metadata/md5-cache/dev-db/mysql-connector-c-8.0.27-r1
 2207260815 metadata/md5-cache/dev-db/mysql-super-smack-1.3-r5
 2207260815 metadata/md5-cache/dev-db/ocp-0.2-r1
 2207260815 metadata/md5-cache/dev-db/opendbx-1.4.5-r2
@@ -35526,7 +35530,6 @@
 2208040340 metadata/md5-cache/dev-db/sqlmap-1.6.6
 2208020744 metadata/md5-cache/dev-db/sqlmap-1.6.7
 2208020744 metadata/md5-cache/dev-db/sqlmap-9999
-2208080140 metadata/md5-cache/dev-db/Manifest.gz
 2208060710 metadata/md5-cache/dev-db/libodbc++-0.2.5-r3
 2208080110 metadata/md5-cache/dev-db/mysql-5.7.36-r1
 2208080110 metadata/md5-cache/dev-db/mysql-8.0.27
@@ -35550,6 +35553,8 @@
 2208080110 metadata/md5-cache/dev-db/postgresql-15_beta2
 2208080110 metadata/md5-cache/dev-db/postgresql-9999
 2208080140 metadata/md5-cache/dev-db/rqlite-7.6.1
+2208111010 metadata/md5-cache/dev-db/Manifest.gz
+2208111010 metadata/md5-cache/dev-db/mysql-connector-c-8.0.27-r1
 2106210925 metadata/md5-cache/dev-dotnet/ndesk-dbus-0.6.1a
 2106210925 metadata/md5-cache/dev-dotnet/ndesk-dbus-glib-0.4.1
 2207181923 metadata/md5-cache/dev-dotnet/monocalendar-0.7.2
@@ -35710,8 +35715,6 @@
 2108131639 metadata/md5-cache/dev-games/irrlicht-headers-1.8.4
 2103170909 metadata/md5-cache/dev-games/libmaitretarot-0.1.98-r2
 2104191309 metadata/md5-cache/dev-games/mercator-0.3.3
-2104200009 metadata/md5-cache/dev-games/ode-0.11.1
-2104200009 metadata/md5-cache/dev-games/ode-0.12
 2204021240 metadata/md5-cache/dev-games/poker-eval-138.0
 2204011845 metadata/md5-cache/dev-games/ps2-packer-0.4.4-r1
 2205241240 metadata/md5-cache/dev-games/irrlicht-mt-headers-1.9.0.5
@@ -35742,16 +35745,12 @@
 2207260815 metadata/md5-cache/dev-games/ogre-1.9.0-r3
 2207260815 metadata/md5-cache/dev-games/ogre-2.1-r1
 2207260815 metadata/md5-cache/dev-games/ois-1.5.1
-2207260815 metadata/md5-cache/dev-games/openscenegraph-3.6.5-r101
-2207260815 metadata/md5-cache/dev-games/openscenegraph-3.6.5-r110
 2207260815 metadata/md5-cache/dev-games/openscenegraph-3.6.5-r112
-2207260815 metadata/md5-cache/dev-games/openscenegraph-openmw-3.6_p20211017
 2207260815 metadata/md5-cache/dev-games/openscenegraph-openmw-3.6_p20211017-r1
 2207260815 metadata/md5-cache/dev-games/openscenegraph-qt-3.5.7-r1
 2207260815 metadata/md5-cache/dev-games/physfs-3.0.2-r1
 2207260815 metadata/md5-cache/dev-games/physfs-9999
 2207260815 metadata/md5-cache/dev-games/recastnavigation-1.5.1_p20210305
-2207260815 metadata/md5-cache/dev-games/simgear-2020.3.12
 2207260815 metadata/md5-cache/dev-games/simgear-2020.3.13
 2207260815 metadata/md5-cache/dev-games/simgear-9999
 2207261740 metadata/md5-cache/dev-games/aseprite-1.2.35
@@ -35759,9 +35758,9 @@
 2208020744 metadata/md5-cache/dev-games/cegui-0.8.7-r100
 2208020744 metadata/md5-cache/dev-games/freecell-solver-6.6.0
 2208020744 metadata/md5-cache/dev-games/tiled-1.8.6
-2208091510 metadata/md5-cache/dev-games/Manifest.gz
 2208091510 metadata/md5-cache/dev-games/irrlicht-mt-1.9.0.7
 2208091510 metadata/md5-cache/dev-games/irrlicht-mt-headers-1.9.0.7
+2208111110 metadata/md5-cache/dev-games/Manifest.gz
 2203240726 metadata/md5-cache/dev-go/fuzzy-0.0.3
 2203240726 metadata/md5-cache/dev-go/fuzzy-0.0.5
 2203240726 metadata/md5-cache/dev-go/go-bindata-assetfs-1.0.0_p20180223
@@ -36851,7 +36850,6 @@
 2208021510 metadata/md5-cache/dev-java/httpcore-4.4.14
 2208021510 metadata/md5-cache/dev-java/icu4j-71.1
 2208021510 metadata/md5-cache/dev-java/iso-relax-20050331-r5
-2208021510 metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1
 2208021510 metadata/md5-cache/dev-java/j2objc-annotations-1.2-r1
 2208021510 metadata/md5-cache/dev-java/j2objc-annotations-2.8
 2208021510 metadata/md5-cache/dev-java/jackcess-4.0.0
@@ -36882,7 +36880,6 @@
 2208021510 metadata/md5-cache/dev-java/jakarta-regexp-1.5-r1
 2208021510 metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r1
 2208021510 metadata/md5-cache/dev-java/jakartaee-migration-1.0.0
-2208021510 metadata/md5-cache/dev-java/jakartaee-migration-1.0.1
 2208021510 metadata/md5-cache/dev-java/jal-20031117-r6
 2208021510 metadata/md5-cache/dev-java/janino-3.1.7
 2208021510 metadata/md5-cache/dev-java/jansi-1.13
@@ -37046,9 +37043,7 @@
 2208021510 metadata/md5-cache/dev-java/xz-java-1.9
 2208021510 metadata/md5-cache/dev-java/zstd-jni-1.5.0.4
 2208021510 metadata/md5-cache/dev-java/zstd-jni-1.5.0.5
-2208100910 metadata/md5-cache/dev-java/Manifest.gz
 2208051040 metadata/md5-cache/dev-java/fec-1.0.4-r4
-2208051010 metadata/md5-cache/dev-java/java-service-wrapper-3.5.50
 2208091110 metadata/md5-cache/dev-java/javax-jms-api-2.0.3
 2208051040 metadata/md5-cache/dev-java/jbitcollider-core-0.8-r1
 2208091110 metadata/md5-cache/dev-java/jctools-core-3.3.0
@@ -37063,6 +37058,13 @@
 2208091110 metadata/md5-cache/dev-java/osgi-core-8.0.0
 2208051140 metadata/md5-cache/dev-java/sbt-0.13.18-r1
 2208050210 metadata/md5-cache/dev-java/xsdlib-2013.6.1
+2208111040 metadata/md5-cache/dev-java/Manifest.gz
+2208101140 metadata/md5-cache/dev-java/byte-buddy-1.12.13
+2208101410 metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1
+2208111040 metadata/md5-cache/dev-java/jakartaee-migration-1.0.1
+2208101140 metadata/md5-cache/dev-java/java-service-wrapper-3.5.50
+2208101140 metadata/md5-cache/dev-java/log4j-core-2.18.0-r1
+2208101140 metadata/md5-cache/dev-java/snappy-1.1.7.8-r1
 2101062239 metadata/md5-cache/dev-lang/cll1h-0.6-r1
 2101070439 metadata/md5-cache/dev-lang/coffee-script-2.5.1
 1702282312 metadata/md5-cache/dev-lang/esco-0.512
@@ -37298,7 +37300,6 @@
 2208020744 metadata/md5-cache/dev-lang/rust-1.62.0
 2208021040 metadata/md5-cache/dev-lang/rust-1.62.1
 2208021040 metadata/md5-cache/dev-lang/rust-bin-1.62.1
-2208020744 metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r10
 2208020744 metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r6
 2208020744 metadata/md5-cache/dev-lang/spidermonkey-68.12.0-r1
 2208020744 metadata/md5-cache/dev-lang/spidermonkey-78.15.0
@@ -37308,7 +37309,6 @@
 2208020710 metadata/md5-cache/dev-lang/tk-8.6.12
 2208020744 metadata/md5-cache/dev-lang/yap-7.0.1
 2208020744 metadata/md5-cache/dev-lang/yap-7.1.0
-2208100910 metadata/md5-cache/dev-lang/Manifest.gz
 2208081540 metadata/md5-cache/dev-lang/clojure-1.11.1
 2208061410 metadata/md5-cache/dev-lang/eisl-2.60
 2208082140 metadata/md5-cache/dev-lang/erlang-25.0.3
@@ -37325,6 +37325,10 @@
 2208100910 metadata/md5-cache/dev-lang/python-3.8.13_p5
 2208100910 metadata/md5-cache/dev-lang/python-3.9.13_p2
 2208051140 metadata/md5-cache/dev-lang/scala-2.12.10
+2208101940 metadata/md5-cache/dev-lang/Manifest.gz
+2208101940 metadata/md5-cache/dev-lang/python-3.10.6_p2
+2208101940 metadata/md5-cache/dev-lang/python-3.8.13_p6
+2208101940 metadata/md5-cache/dev-lang/python-3.9.13_p4
 2007042139 metadata/md5-cache/dev-libs/bemenu-0.5.0
 2105240639 metadata/md5-cache/dev-libs/bemenu-0.6.1
 2011160239 metadata/md5-cache/dev-libs/busybee-0.7.0
@@ -37345,8 +37349,6 @@
 2012311940 metadata/md5-cache/dev-libs/libee-0.4.1
 2009091539 metadata/md5-cache/dev-libs/libg15-1.2.7-r1
 2104281039 metadata/md5-cache/dev-libs/libite-2.4.0
-2106110139 metadata/md5-cache/dev-libs/libksba-1.5.0
-2106121909 metadata/md5-cache/dev-libs/libksba-1.5.1
 2104031909 metadata/md5-cache/dev-libs/liblist-2.4-r1
 2104060140 metadata/md5-cache/dev-libs/liblzw-0.2-r1
 2102190539 metadata/md5-cache/dev-libs/liblzw-0.3
@@ -37407,18 +37409,14 @@
 2205311240 metadata/md5-cache/dev-libs/vala-common-0.56.1
 2206021040 metadata/md5-cache/dev-libs/libpipeline-1.5.6
 2206072340 metadata/md5-cache/dev-libs/linux-syscall-support-2021.05.03
-2206151140 metadata/md5-cache/dev-libs/libksba-1.6.0
 2206200940 metadata/md5-cache/dev-libs/pocketfft-2021.11.23
-2206220810 metadata/md5-cache/dev-libs/icinga-php-thirdparty-0.11.0
 2206232340 metadata/md5-cache/dev-libs/qqwing-1.3.4-r1
 2206260610 metadata/md5-cache/dev-libs/cudnn-8.4.1.50
 2206270810 metadata/md5-cache/dev-libs/libxls-1.6.2
-2206281115 metadata/md5-cache/dev-libs/libstrophe-0.12.0
 2206280740 metadata/md5-cache/dev-libs/pkcs11-helper-1.29.0
 2207031210 metadata/md5-cache/dev-libs/argtable-2.13-r2
 2207031340 metadata/md5-cache/dev-libs/cudnn-frontend-0.6.2
 2207100040 metadata/md5-cache/dev-libs/libmodbus-3.1.7
-2207091410 metadata/md5-cache/dev-libs/libstrophe-0.12.1
 2207170040 metadata/md5-cache/dev-libs/vala-common-0.56.2
 2207181923 metadata/md5-cache/dev-libs/9libs-1.0-r4
 2207181923 metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2-r1
@@ -37541,7 +37539,6 @@
 2207181923 metadata/md5-cache/dev-libs/libg15render-1.2-r2
 2207181923 metadata/md5-cache/dev-libs/libg15render-3.0.4
 2207181923 metadata/md5-cache/dev-libs/libg15render-9999
-2207181923 metadata/md5-cache/dev-libs/libgcrypt-compat-1.5.6
 2207181923 metadata/md5-cache/dev-libs/libgee-0.20.5
 2207181923 metadata/md5-cache/dev-libs/libgpg-error-1.42
 2207181923 metadata/md5-cache/dev-libs/libgpg-error-1.44
@@ -38164,7 +38161,6 @@
 2208020744 metadata/md5-cache/dev-libs/libgusb-0.3.10
 2208020744 metadata/md5-cache/dev-libs/libgweather-4.0.0
 2208020744 metadata/md5-cache/dev-libs/libgweather-40.0
-2208020744 metadata/md5-cache/dev-libs/libical-3.0.14-r1
 2208020710 metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
 2208020710 metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
 2208020744 metadata/md5-cache/dev-libs/libinput-1.21.0-r1
@@ -38242,7 +38238,6 @@
 2208020744 metadata/md5-cache/dev-libs/tre-0.8.0_p20210321-r1
 2208041740 metadata/md5-cache/dev-libs/trio-1.17
 2208020744 metadata/md5-cache/dev-libs/udis86-1.7.2-r1
-2208020744 metadata/md5-cache/dev-libs/voikko-fi-2.5
 2208020744 metadata/md5-cache/dev-libs/volume_key-0.3.12-r4
 2208020744 metadata/md5-cache/dev-libs/wayland-1.20.0
 2208020744 metadata/md5-cache/dev-libs/wayland-1.21.0
@@ -38258,7 +38253,6 @@
 2208020744 metadata/md5-cache/dev-libs/xapian-bindings-1.4.20-r1
 2208020744 metadata/md5-cache/dev-libs/zziplib-0.13.72
 2208020744 metadata/md5-cache/dev-libs/zziplib-0.13.72-r1
-2208092110 metadata/md5-cache/dev-libs/Manifest.gz
 2208051040 metadata/md5-cache/dev-libs/capstone-5.0_rc2-r1
 2208050310 metadata/md5-cache/dev-libs/double-conversion-3.2.1
 2208080110 metadata/md5-cache/dev-libs/ell-0.51
@@ -38275,7 +38269,6 @@
 2208092110 metadata/md5-cache/dev-libs/libclc-14.0.6
 2208092110 metadata/md5-cache/dev-libs/libclc-15.0.0.9999
 2208092110 metadata/md5-cache/dev-libs/libclc-15.0.0_rc2
-2208092110 metadata/md5-cache/dev-libs/libclc-16.0.0.9999
 2208051240 metadata/md5-cache/dev-libs/libestr-0.1.11-r1
 2208060740 metadata/md5-cache/dev-libs/libevdev-1.13.0
 2208051240 metadata/md5-cache/dev-libs/libfastjson-0.99.9-r1
@@ -38318,6 +38311,20 @@
 2208080940 metadata/md5-cache/dev-libs/tllist-1.0.5-r1
 2208082140 metadata/md5-cache/dev-libs/tree-sitter-c-0.20.2
 2208090210 metadata/md5-cache/dev-libs/weston-9999
+2208111310 metadata/md5-cache/dev-libs/Manifest.gz
+2208102310 metadata/md5-cache/dev-libs/appstream-glib-0.8.1
+2208101110 metadata/md5-cache/dev-libs/foma-0.10.0_p20220612
+2208110340 metadata/md5-cache/dev-libs/icinga-php-thirdparty-0.11.0
+2208102340 metadata/md5-cache/dev-libs/libclc-16.0.0.9999
+2208101610 metadata/md5-cache/dev-libs/libgcrypt-compat-1.5.6
+2208111310 metadata/md5-cache/dev-libs/libical-3.0.14-r1
+2208101610 metadata/md5-cache/dev-libs/libksba-1.5.0
+2208101610 metadata/md5-cache/dev-libs/libksba-1.5.1
+2208101610 metadata/md5-cache/dev-libs/libksba-1.6.0
+2208101140 metadata/md5-cache/dev-libs/libstrophe-0.12.0
+2208101140 metadata/md5-cache/dev-libs/libstrophe-0.12.1
+2208101140 metadata/md5-cache/dev-libs/libstrophe-0.12.2
+2208101110 metadata/md5-cache/dev-libs/voikko-fi-2.5-r1
 2203240726 metadata/md5-cache/dev-lisp/ecls-21.2.1-r4
 2205150110 metadata/md5-cache/dev-lisp/hyperspec-7.0-r3
 2207181923 metadata/md5-cache/dev-lisp/abcl-1.8.0
@@ -41253,7 +41260,6 @@
 2208020744 metadata/md5-cache/dev-python/brython-3.9.0
 2208020744 metadata/md5-cache/dev-python/bsddb3-6.2.9
 2208020744 metadata/md5-cache/dev-python/build-0.8.0
-2208020744 metadata/md5-cache/dev-python/cachecontrol-0.12.11
 2208020744 metadata/md5-cache/dev-python/cached-property-1.5.2-r1
 2208020744 metadata/md5-cache/dev-python/cachelib-0.9.0
 2208020744 metadata/md5-cache/dev-python/cachetools-5.2.0
@@ -41330,7 +41336,6 @@
 2208020744 metadata/md5-cache/dev-python/cons-0.4.5
 2208020744 metadata/md5-cache/dev-python/consonance-0.1.5-r1
 2208020744 metadata/md5-cache/dev-python/constantly-15.1.0-r2
-2208020744 metadata/md5-cache/dev-python/construct-2.10.68
 2208020744 metadata/md5-cache/dev-python/cookies-2.2.1-r2
 2208020744 metadata/md5-cache/dev-python/coreapi-2.3.3-r2
 2208020744 metadata/md5-cache/dev-python/coreschema-0.0.4-r1
@@ -41343,7 +41348,6 @@
 2208020744 metadata/md5-cache/dev-python/crcmod-1.7-r5
 2208020744 metadata/md5-cache/dev-python/croniter-1.3.5
 2208020744 metadata/md5-cache/dev-python/cryptography-37.0.4
-2208020744 metadata/md5-cache/dev-python/css-parser-1.0.7-r1
 2208020744 metadata/md5-cache/dev-python/csscompressor-0.9.5-r1
 2208020744 metadata/md5-cache/dev-python/cssselect-1.1.0-r2
 2208020744 metadata/md5-cache/dev-python/cssselect2-0.6.0
@@ -41444,7 +41448,6 @@
 2208020744 metadata/md5-cache/dev-python/ecdsa-0.17.0
 2208020744 metadata/md5-cache/dev-python/ecdsa-0.18.0
 2208020744 metadata/md5-cache/dev-python/editables-0.3
-2208020744 metadata/md5-cache/dev-python/editorconfig-core-py-0.12.3-r1
 2208020744 metadata/md5-cache/dev-python/elasticsearch-py-7.14.1
 2208020744 metadata/md5-cache/dev-python/elementpath-2.5.3
 2208020744 metadata/md5-cache/dev-python/elementpath-3.0.0
@@ -41454,8 +41457,6 @@
 2208020744 metadata/md5-cache/dev-python/emoji-2.0.0
 2208020744 metadata/md5-cache/dev-python/empy-3.3.4-r1
 2208020744 metadata/md5-cache/dev-python/enrich-1.2.7-r1
-2208021610 metadata/md5-cache/dev-python/ensurepip-wheels-63.3.0.22.2.1
-2208042110 metadata/md5-cache/dev-python/ensurepip-wheels-63.4.1.22.2.2
 2208020744 metadata/md5-cache/dev-python/entrypoint2-1.1
 2208020744 metadata/md5-cache/dev-python/entrypoints-0.4
 2208020744 metadata/md5-cache/dev-python/environs-9.5.0-r1
@@ -41467,7 +41468,6 @@
 2208020744 metadata/md5-cache/dev-python/etuples-0.3.5
 2208020744 metadata/md5-cache/dev-python/eventlet-0.33.1
 2208020744 metadata/md5-cache/dev-python/ewmh-0.1.6
-2208020744 metadata/md5-cache/dev-python/exam-0.10.6
 2208020744 metadata/md5-cache/dev-python/exceptiongroup-1.0.0_rc8
 2208020744 metadata/md5-cache/dev-python/execnet-1.9.0-r1
 2208020744 metadata/md5-cache/dev-python/executing-0.8.3
@@ -41687,8 +41687,6 @@
 2208020744 metadata/md5-cache/dev-python/ioflo-2.0.2-r2
 2208020744 metadata/md5-cache/dev-python/ipaddr-2.2.0-r2
 2208020744 metadata/md5-cache/dev-python/ipdb-0.13.9-r2
-2208020744 metadata/md5-cache/dev-python/ipykernel-6.15.0
-2208020744 metadata/md5-cache/dev-python/ipykernel-6.15.1
 2208020744 metadata/md5-cache/dev-python/ipyparallel-8.4.1
 2208020744 metadata/md5-cache/dev-python/ipython-8.4.0
 2208020744 metadata/md5-cache/dev-python/ipython_genutils-0.2.0-r3
@@ -42116,7 +42114,6 @@
 2208020744 metadata/md5-cache/dev-python/process-tests-2.1.2-r1
 2208020744 metadata/md5-cache/dev-python/progress-1.6-r1
 2208020744 metadata/md5-cache/dev-python/progressbar-2.5
-2208020744 metadata/md5-cache/dev-python/progressbar2-4.0.0
 2208020744 metadata/md5-cache/dev-python/prometheus_client-0.14.1
 2208020744 metadata/md5-cache/dev-python/prompt_toolkit-3.0.30
 2208020744 metadata/md5-cache/dev-python/proto-plus-1.20.6
@@ -42282,7 +42279,6 @@
 2208020744 metadata/md5-cache/dev-python/pypax-0.9.5-r1
 2208020744 metadata/md5-cache/dev-python/pypax-9999
 2208020744 metadata/md5-cache/dev-python/pyperclip-1.8.2-r1
-2208020744 metadata/md5-cache/dev-python/pyphen-0.12.0-r1
 2208020744 metadata/md5-cache/dev-python/pypiserver-1.5.0-r2
 2208020744 metadata/md5-cache/dev-python/pypng-0.0.21-r1
 2208020744 metadata/md5-cache/dev-python/pypng-0.20220715.0
@@ -42335,13 +42331,11 @@
 2208020744 metadata/md5-cache/dev-python/pysvg-0.2.2_p3-r1
 2208040340 metadata/md5-cache/dev-python/pysvn-1.9.15-r1
 2208020744 metadata/md5-cache/dev-python/pytables-3.7.0
-2208020744 metadata/md5-cache/dev-python/pyte-0.8.1
 2208020744 metadata/md5-cache/dev-python/pytesseract-0.3.10
 2208020744 metadata/md5-cache/dev-python/pytest-7.1.2
 2208020744 metadata/md5-cache/dev-python/pytest-aiohttp-1.0.4
 2208020744 metadata/md5-cache/dev-python/pytest-asyncio-0.18.3
 2208020744 metadata/md5-cache/dev-python/pytest-asyncio-0.19.0
-2208020744 metadata/md5-cache/dev-python/pytest-bdd-5.0.0-r1
 2208020744 metadata/md5-cache/dev-python/pytest-check-1.0.5
 2208020744 metadata/md5-cache/dev-python/pytest-codeblocks-0.16.1
 2208020744 metadata/md5-cache/dev-python/pytest-console-scripts-1.3.1
@@ -42521,7 +42515,6 @@
 2208020744 metadata/md5-cache/dev-python/pywinrm-0.4.3
 2208020744 metadata/md5-cache/dev-python/pyx-0.15_p1
 2208020744 metadata/md5-cache/dev-python/pyxDamerauLevenshtein-1.7.0
-2208020744 metadata/md5-cache/dev-python/pyxattr-0.7.2
 2208020744 metadata/md5-cache/dev-python/pyxdg-0.28
 2208020744 metadata/md5-cache/dev-python/pyyaml-6.0-r1
 2208020744 metadata/md5-cache/dev-python/pyyaml_env_tag-0.1-r1
@@ -42573,10 +42566,8 @@
 2208020744 metadata/md5-cache/dev-python/repoze-lru-0.7-r3
 2208020744 metadata/md5-cache/dev-python/requests-2.28.1
 2208022340 metadata/md5-cache/dev-python/requests-cache-0.9.5
-2208020744 metadata/md5-cache/dev-python/requests-credssp-2.0.0
 2208020744 metadata/md5-cache/dev-python/requests-file-1.5.1-r2
 2208020744 metadata/md5-cache/dev-python/requests-futures-1.0.0-r1
-2208020744 metadata/md5-cache/dev-python/requests-kerberos-0.14.0-r1
 2208020744 metadata/md5-cache/dev-python/requests-mock-1.9.3-r1
 2208020744 metadata/md5-cache/dev-python/requests-ntlm-1.1.0-r1
 2208020744 metadata/md5-cache/dev-python/requests-oauthlib-1.3.1
@@ -43033,7 +43024,6 @@
 2208020744 metadata/md5-cache/dev-python/zstandard-0.18.0
 2208020744 metadata/md5-cache/dev-python/zstd-1.5.2.5
 2208020744 metadata/md5-cache/dev-python/zxcvbn-4.4.28-r1
-2208092140 metadata/md5-cache/dev-python/Manifest.gz
 2208072240 metadata/md5-cache/dev-python/PyPDF2-2.10.0
 2208091110 metadata/md5-cache/dev-python/PyPDF2-2.4.2
 2208071710 metadata/md5-cache/dev-python/adblock-0.6.0
@@ -43059,11 +43049,9 @@
 2208071110 metadata/md5-cache/dev-python/coverage-6.4.3
 2208091110 metadata/md5-cache/dev-python/dask-2022.7.0
 2208061640 metadata/md5-cache/dev-python/dask-2022.8.0
-2208091110 metadata/md5-cache/dev-python/debugpy-1.6.2
 2208071210 metadata/md5-cache/dev-python/django-4.1
 2208090910 metadata/md5-cache/dev-python/docutils-glep-1.4
 2208082310 metadata/md5-cache/dev-python/dogpile-cache-1.1.8
-2208071110 metadata/md5-cache/dev-python/ensurepip-wheels-63.4.2.22.2.2
 2208092110 metadata/md5-cache/dev-python/flask-2.2.2
 2208091110 metadata/md5-cache/dev-python/flit_scm-1.7.0
 2208092110 metadata/md5-cache/dev-python/google-api-python-client-2.56.0
@@ -43106,10 +43094,8 @@
 2208071910 metadata/md5-cache/dev-python/pyotherside-1.5.9
 2208051540 metadata/md5-cache/dev-python/pyproject-fmt-0.3.4
 2208071710 metadata/md5-cache/dev-python/pytest-bdd-6.0.1
-2208091110 metadata/md5-cache/dev-python/python-ldap-3.4.2
 2208071210 metadata/md5-cache/dev-python/pyxDamerauLevenshtein-1.7.1
 2208071140 metadata/md5-cache/dev-python/readme_renderer-36.0
-2208091110 metadata/md5-cache/dev-python/regex-2022.7.9
 2208091510 metadata/md5-cache/dev-python/resolvelib-0.8.1
 2208052210 metadata/md5-cache/dev-python/sentry-sdk-1.9.1
 2208061640 metadata/md5-cache/dev-python/sentry-sdk-1.9.2
@@ -43117,7 +43103,6 @@
 2208050940 metadata/md5-cache/dev-python/setproctitle-1.3.1
 2208090710 metadata/md5-cache/dev-python/setuptools-63.1.0
 2208071110 metadata/md5-cache/dev-python/setuptools-63.4.2
-2208091110 metadata/md5-cache/dev-python/setuptools-rust-1.4.1
 2208082310 metadata/md5-cache/dev-python/sexpdata-0.0.3-r2
 2208092110 metadata/md5-cache/dev-python/snakeoil-0.9.12
 2208092140 metadata/md5-cache/dev-python/snakeoil-9999
@@ -43134,6 +43119,48 @@
 2208071140 metadata/md5-cache/dev-python/ubelt-1.2.1
 2208092110 metadata/md5-cache/dev-python/werkzeug-2.2.2
 2208061640 metadata/md5-cache/dev-python/zeroconf-0.39.0
+2208111310 metadata/md5-cache/dev-python/Manifest.gz
+2208111310 metadata/md5-cache/dev-python/asttokens-2.0.7
+2208111310 metadata/md5-cache/dev-python/boto3-1.24.49
+2208111310 metadata/md5-cache/dev-python/botocore-1.27.49
+2208101640 metadata/md5-cache/dev-python/cachecontrol-0.12.11
+2208101610 metadata/md5-cache/dev-python/construct-2.10.68
+2208101610 metadata/md5-cache/dev-python/css-parser-1.0.7-r1
+2208111210 metadata/md5-cache/dev-python/ddt-1.6.0
+2208101110 metadata/md5-cache/dev-python/debugpy-1.6.2
+2208101610 metadata/md5-cache/dev-python/editorconfig-core-py-0.12.3-r1
+2208101110 metadata/md5-cache/dev-python/ensurepip-wheels-63.4.2.22.2.2
+2208111210 metadata/md5-cache/dev-python/ensurepip-wheels-63.4.3.22.2.2
+2208101640 metadata/md5-cache/dev-python/exam-0.10.6
+2208111310 metadata/md5-cache/dev-python/filelock-3.8.0
+2208111310 metadata/md5-cache/dev-python/hypothesis-6.54.2
+2208101110 metadata/md5-cache/dev-python/ipykernel-6.15.1
+2208111210 metadata/md5-cache/dev-python/matplotlib-3.5.3
+2208111310 metadata/md5-cache/dev-python/nbconvert-6.5.2
+2208111310 metadata/md5-cache/dev-python/nuitka-1.0.3
+2208111210 metadata/md5-cache/dev-python/podman-py-4.2.0
+2208101610 metadata/md5-cache/dev-python/progressbar2-4.0.0
+2208111210 metadata/md5-cache/dev-python/proto-plus-1.22.0
+2208111210 metadata/md5-cache/dev-python/pyelftools-0.29
+2208111310 metadata/md5-cache/dev-python/pyhamcrest-2.0.4
+2208101610 metadata/md5-cache/dev-python/pyphen-0.12.0-r1
+2208102340 metadata/md5-cache/dev-python/pypy-7.3.9-r1
+2208101240 metadata/md5-cache/dev-python/pypy3-7.3.9_p5
+2208111210 metadata/md5-cache/dev-python/pyspnego-0.5.4
+2208101640 metadata/md5-cache/dev-python/pyte-0.8.1
+2208101110 metadata/md5-cache/dev-python/python-ldap-3.4.2
+2208101610 metadata/md5-cache/dev-python/pyxattr-0.7.2
+2208101110 metadata/md5-cache/dev-python/regex-2022.7.9
+2208111210 metadata/md5-cache/dev-python/requests-credssp-2.0.0
+2208111210 metadata/md5-cache/dev-python/requests-kerberos-0.14.0-r1
+2208101610 metadata/md5-cache/dev-python/scandir-1.10.0-r3
+2208111210 metadata/md5-cache/dev-python/setuptools-63.4.3
+2208101410 metadata/md5-cache/dev-python/setuptools-rust-1.4.1
+2208111310 metadata/md5-cache/dev-python/setuptools-rust-1.5.0
+2208111310 metadata/md5-cache/dev-python/sphinx-basic-ng-0.0.1_alpha12
+2208111310 metadata/md5-cache/dev-python/tomlkit-0.11.3
+2208111210 metadata/md5-cache/dev-python/trimesh-3.13.1
+2208111310 metadata/md5-cache/dev-python/trove-classifiers-2022.8.7
 2207181923 metadata/md5-cache/dev-qt/qt-docs-5.15.2_p202011130614
 2207181923 metadata/md5-cache/dev-qt/qtchooser-66-r2
 2207181923 metadata/md5-cache/dev-qt/qtlockedfile-2.4.1_p20171024
@@ -45561,10 +45588,12 @@
 2208020710 metadata/md5-cache/dev-ruby/ruby-wnck3-3.4.3
 2208020810 metadata/md5-cache/dev-ruby/webmock-3.15.0
 2208021010 metadata/md5-cache/dev-ruby/xml-simple-1.1.9
-2208090910 metadata/md5-cache/dev-ruby/Manifest.gz
 2208080840 metadata/md5-cache/dev-ruby/capistrano-3.17.1
 2208060910 metadata/md5-cache/dev-ruby/liquid-5.4.0
 2208090910 metadata/md5-cache/dev-ruby/parser-3.1.2.1
+2208110740 metadata/md5-cache/dev-ruby/Manifest.gz
+2208110740 metadata/md5-cache/dev-ruby/bundler-audit-0.9.1
+2208110740 metadata/md5-cache/dev-ruby/webmock-3.17.1
 1912150139 metadata/md5-cache/dev-scheme/elk-3.99.8
 2111181609 metadata/md5-cache/dev-scheme/gauche-mecab-1.0.2-r1
 1708031509 metadata/md5-cache/dev-scheme/scmxlate-20090410-r1
@@ -46060,7 +46089,6 @@
 2207181923 metadata/md5-cache/dev-util/quilt-0.67
 2207181923 metadata/md5-cache/dev-util/quilt-9999
 2207181923 metadata/md5-cache/dev-util/radare2-5.6.8-r1
-2207181923 metadata/md5-cache/dev-util/radare2-5.7.4
 2207181923 metadata/md5-cache/dev-util/ragel-6.10
 2207181923 metadata/md5-cache/dev-util/ragel-7.0.0.12
 2207181923 metadata/md5-cache/dev-util/ragel-7.0.4
@@ -46468,7 +46496,6 @@
 2208020744 metadata/md5-cache/dev-util/yamllint-1.26.3-r1
 2208020744 metadata/md5-cache/dev-util/yamllint-1.27.1
 2208020744 metadata/md5-cache/dev-util/ydiff-1.2
-2208100010 metadata/md5-cache/dev-util/Manifest.gz
 2208050210 metadata/md5-cache/dev-util/ROPgadget-6.6
 2208060940 metadata/md5-cache/dev-util/ROPgadget-6.8
 2208061740 metadata/md5-cache/dev-util/Tensile-5.0.2-r2
@@ -46508,7 +46535,6 @@
 2208080111 metadata/md5-cache/dev-util/lttng-tools-2.12.3
 2208091140 metadata/md5-cache/dev-util/maturin-0.13.1
 2208071710 metadata/md5-cache/dev-util/maturin-0.13.2_beta1
-2208092210 metadata/md5-cache/dev-util/ninja-1.11.0
 2208080111 metadata/md5-cache/dev-util/oprofile-1.4.0
 2208080111 metadata/md5-cache/dev-util/perf-5.15-r1
 2208080111 metadata/md5-cache/dev-util/perf-5.17.1
@@ -46546,6 +46572,13 @@
 2208080111 metadata/md5-cache/dev-util/tup-0.7.11
 2208080111 metadata/md5-cache/dev-util/tup-9999
 2208050210 metadata/md5-cache/dev-util/unicorn-2.0.0
+2208111410 metadata/md5-cache/dev-util/Manifest.gz
+2208102310 metadata/md5-cache/dev-util/bcc-0.25.0
+2208110040 metadata/md5-cache/dev-util/gprof2dot-2022.07.29
+2208110740 metadata/md5-cache/dev-util/jenkins-bin-2.346.3
+2208110740 metadata/md5-cache/dev-util/jenkins-bin-2.363
+2208101110 metadata/md5-cache/dev-util/ninja-1.11.0
+2208111410 metadata/md5-cache/dev-util/radare2-5.7.4
 2101070210 metadata/md5-cache/dev-vcs/colorsvn-0.3.3
 1902111809 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
 2103230739 metadata/md5-cache/dev-vcs/cvsutils-0.2.6
@@ -46753,7 +46786,6 @@
 2207260815 metadata/md5-cache/games-action/polymc-1.3.2
 2207260815 metadata/md5-cache/games-action/snipes-1.0.4-r1
 2207260815 metadata/md5-cache/games-action/supermariowar-2.0_beta1-r2
-2207260815 metadata/md5-cache/games-action/supertuxkart-1.2
 2207260815 metadata/md5-cache/games-action/supertuxkart-1.3
 2207260815 metadata/md5-cache/games-action/violetland-0.5
 2207290640 metadata/md5-cache/games-action/polymc-1.4.1
@@ -46764,8 +46796,8 @@
 2208040110 metadata/md5-cache/games-action/hotline-miami-1.0.9a_p20140221-r3
 2208020744 metadata/md5-cache/games-action/teeworlds-0.7.5-r1
 2208040110 metadata/md5-cache/games-action/trine2-2.01.425-r2
-2208091510 metadata/md5-cache/games-action/Manifest.gz
 2208091510 metadata/md5-cache/games-action/minetest-5.6.0
+2208111110 metadata/md5-cache/games-action/Manifest.gz
 2003271309 metadata/md5-cache/games-arcade/jazz2-data-0-r20200327
 2204011845 metadata/md5-cache/games-arcade/gish-demo-1.6-r1
 2206221910 metadata/md5-cache/games-arcade/amphetamine-0.8.10-r1
@@ -46960,7 +46992,6 @@
 2208100540 metadata/md5-cache/games-board/Manifest.gz
 2208100540 metadata/md5-cache/games-board/gnome-chess-42.1
 2208070540 metadata/md5-cache/games-board/tali-40.8
-2109031939 metadata/md5-cache/games-emulation/emutos-1.1.1
 1808150339 metadata/md5-cache/games-emulation/libretro-info-0.0.1_pre20180723
 2106020309 metadata/md5-cache/games-emulation/mastergear-bin-4.9
 1909151309 metadata/md5-cache/games-emulation/mupen64plus-2.5.9
@@ -47039,12 +47070,11 @@
 2208020744 metadata/md5-cache/games-emulation/hatari-2.4.0
 2208020744 metadata/md5-cache/games-emulation/m64py-0.2.5
 2208020744 metadata/md5-cache/games-emulation/m64py-0.2.5_p20211222
-2208020744 metadata/md5-cache/games-emulation/openmsx-17.0
 2208020744 metadata/md5-cache/games-emulation/openmsx-18.0-r1
 2208010010 metadata/md5-cache/games-emulation/pcsx2-9999
 2208020744 metadata/md5-cache/games-emulation/snes9x-1.61
-2208072340 metadata/md5-cache/games-emulation/Manifest.gz
 2208072340 metadata/md5-cache/games-emulation/emutos-1.2
+2208111110 metadata/md5-cache/games-emulation/Manifest.gz
 2204021210 metadata/md5-cache/games-engines/zoom-1.1.5-r1
 2206081210 metadata/md5-cache/games-engines/exult-1.6
 2207181923 metadata/md5-cache/games-engines/dMagnetic-0.32
@@ -47076,7 +47106,8 @@
 2208041740 metadata/md5-cache/games-engines/qtads-3.3.0
 2208020744 metadata/md5-cache/games-engines/scrap-engine-1.2.0
 2208011440 metadata/md5-cache/games-engines/stratagus-3.3.1
-2208091040 metadata/md5-cache/games-engines/Manifest.gz
+2208110010 metadata/md5-cache/games-engines/Manifest.gz
+2208110010 metadata/md5-cache/games-engines/stratagus-3.3.2
 2005172009 metadata/md5-cache/games-fps/doom-data-1.9
 2107291439 metadata/md5-cache/games-fps/freedoom-0.12.1
 2104062139 metadata/md5-cache/games-fps/glxquake-bin-0-r3
@@ -47109,7 +47140,6 @@
 2206221910 metadata/md5-cache/games-fps/worldofpadman-1.6-r2
 2206251740 metadata/md5-cache/games-fps/duke3d-data-1.0-r5
 2207181923 metadata/md5-cache/games-fps/blackshades-20070723-r1
-2207181923 metadata/md5-cache/games-fps/eduke32-20220422.10033
 2207181923 metadata/md5-cache/games-fps/eduke32-20220702.10113
 2207181923 metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r4
 2207181923 metadata/md5-cache/games-fps/industri-1.01
@@ -47135,7 +47165,6 @@
 2207260815 metadata/md5-cache/games-fps/avp-20150214-r1
 2207260815 metadata/md5-cache/games-fps/darkplaces-20140513-r2
 2207260815 metadata/md5-cache/games-fps/gzdoom-4.7.1
-2207260815 metadata/md5-cache/games-fps/prboom-plus-2.6.1
 2207260815 metadata/md5-cache/games-fps/prboom-plus-2.6.2
 2207260815 metadata/md5-cache/games-fps/quakeforge-0.7.2_p20210722
 2207260815 metadata/md5-cache/games-fps/quakeforge-9999
@@ -47147,8 +47176,8 @@
 2208020744 metadata/md5-cache/games-fps/doomsday-2.3.1
 2208020744 metadata/md5-cache/games-fps/freedm-data-0.12.1-r1
 2208020744 metadata/md5-cache/games-fps/freedoom-data-0.12.1-r1
-2208061640 metadata/md5-cache/games-fps/Manifest.gz
 2208061640 metadata/md5-cache/games-fps/gzdoom-4.8.2-r1
+2208111110 metadata/md5-cache/games-fps/Manifest.gz
 2206221910 metadata/md5-cache/games-kids/lletters-0.1.95-r4
 2207181711 metadata/md5-cache/games-kids/tuxmath-2.0.3-r2
 2207181923 metadata/md5-cache/games-kids/tuxtype-1.8.3-r2
@@ -47348,19 +47377,18 @@
 2207181923 metadata/md5-cache/games-roguelike/tome-2.3.5-r1
 2207181923 metadata/md5-cache/games-roguelike/tomenet-4.7.3
 2207181923 metadata/md5-cache/games-roguelike/wrogue-0.8.0b-r1
-2207181923 metadata/md5-cache/games-roguelike/zangband-2.7.4c
 2207260815 metadata/md5-cache/games-roguelike/dwarf-fortress-0.47.05
 2207260815 metadata/md5-cache/games-roguelike/moria-5.7.14-r1
 2207260815 metadata/md5-cache/games-roguelike/nethack-3.6.6
 2207260815 metadata/md5-cache/games-roguelike/powder-117-r1
 2207261310 metadata/md5-cache/games-roguelike/zangband-2.7.4c-r1
 2207282340 metadata/md5-cache/games-roguelike/angband-4.2.4
-2208020744 metadata/md5-cache/games-roguelike/Manifest.gz
-2208020744 metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r103
-2208020744 metadata/md5-cache/games-roguelike/stone-soup-0.26.1-r2
-2208020744 metadata/md5-cache/games-roguelike/stone-soup-0.27.1-r1
-2208020744 metadata/md5-cache/games-roguelike/stone-soup-0.28.0-r1
-2208020744 metadata/md5-cache/games-roguelike/stone-soup-0.29.0_pre20220701
+2208111410 metadata/md5-cache/games-roguelike/Manifest.gz
+2208111410 metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r103
+2208111410 metadata/md5-cache/games-roguelike/stone-soup-0.26.1-r2
+2208111410 metadata/md5-cache/games-roguelike/stone-soup-0.27.1-r1
+2208111410 metadata/md5-cache/games-roguelike/stone-soup-0.28.0-r1
+2208111410 metadata/md5-cache/games-roguelike/stone-soup-0.29.0_pre20220701
 2105200039 metadata/md5-cache/games-rpg/freedink-data-1.08.20170409-r1
 2104161439 metadata/md5-cache/games-rpg/xu4-0.9-r1
 2205122041 metadata/md5-cache/games-rpg/the-longest-journey-hd-1.02
@@ -47429,12 +47457,12 @@
 2207260815 metadata/md5-cache/games-server/pvpgn-1.99.7.2.1-r1
 2207272210 metadata/md5-cache/games-server/bedrock-server-1.19.11.01
 2207272240 metadata/md5-cache/games-server/minecraft-server-1.19.1
-2208052040 metadata/md5-cache/games-server/Manifest.gz
 2208052040 metadata/md5-cache/games-server/minecraft-server-1.19.2
+2208110210 metadata/md5-cache/games-server/Manifest.gz
+2208110210 metadata/md5-cache/games-server/bedrock-server-1.19.20.02
 2104161439 metadata/md5-cache/games-simulation/senken-0.3.0-r1
 2202261509 metadata/md5-cache/games-simulation/simutrans-paksets-123.0.1
 2203240726 metadata/md5-cache/games-simulation/flightgear-data-9999
-2204110040 metadata/md5-cache/games-simulation/flightgear-data-2020.3.12
 2205132310 metadata/md5-cache/games-simulation/flightgear-data-2020.3.13
 2206221910 metadata/md5-cache/games-simulation/cannonsmash-0.6.6-r1
 2206221910 metadata/md5-cache/games-simulation/gl117-1.3.2-r1
@@ -47449,9 +47477,7 @@
 2207181923 metadata/md5-cache/games-simulation/train-valley-1.3.31403
 2207260815 metadata/md5-cache/games-simulation/EmptyEpsilon-2021.06.23-r1
 2207260815 metadata/md5-cache/games-simulation/EmptyEpsilon-2022.03.16
-2207260815 metadata/md5-cache/games-simulation/corsix-th-0.65.1
 2207260815 metadata/md5-cache/games-simulation/corsix-th-0.66-r1
-2207260815 metadata/md5-cache/games-simulation/flightgear-2020.3.12
 2207260815 metadata/md5-cache/games-simulation/flightgear-2020.3.13
 2207260815 metadata/md5-cache/games-simulation/flightgear-9999
 2207260815 metadata/md5-cache/games-simulation/openrct2-0.4.0
@@ -47462,8 +47488,8 @@
 2207260815 metadata/md5-cache/games-simulation/searchandrescue-1.7.0-r1
 2207260815 metadata/md5-cache/games-simulation/simutrans-0.122.0-r1
 2207260815 metadata/md5-cache/games-simulation/simutrans-123.0.1-r1
-2208020744 metadata/md5-cache/games-simulation/Manifest.gz
 2208020744 metadata/md5-cache/games-simulation/singularity-1.00-r1
+2208111110 metadata/md5-cache/games-simulation/Manifest.gz
 2010031709 metadata/md5-cache/games-sports/gracer-0.1.5-r2
 2203240726 metadata/md5-cache/games-sports/trophy-2.0.4
 2206221910 metadata/md5-cache/games-sports/billardgl-1.75-r2
@@ -47505,7 +47531,6 @@
 2207181923 metadata/md5-cache/games-strategy/uqm-0.8.0
 2207181923 metadata/md5-cache/games-strategy/warmux-11.04.1-r2
 2207181923 metadata/md5-cache/games-strategy/xbattleai-1.2.2-r2
-2207260815 metadata/md5-cache/games-strategy/augustus-3.0.1
 2207260815 metadata/md5-cache/games-strategy/augustus-3.1.0
 2207260815 metadata/md5-cache/games-strategy/colobot-0.1.12
 2207260815 metadata/md5-cache/games-strategy/colobot-0.2.0_alpha
@@ -47517,21 +47542,16 @@
 2207260815 metadata/md5-cache/games-strategy/maxr-0.2.9
 2207260815 metadata/md5-cache/games-strategy/megaglest-data-3.11.1-r1
 2207260815 metadata/md5-cache/games-strategy/megaglest-data-3.13.0
-2207260815 metadata/md5-cache/games-strategy/s25rttr-0.9.1
 2207260815 metadata/md5-cache/games-strategy/s25rttr-0.9.5
 2207260815 metadata/md5-cache/games-strategy/scorched3d-44-r2
 2207260815 metadata/md5-cache/games-strategy/ufoai-2.5.0_p20180603-r1
 2207260815 metadata/md5-cache/games-strategy/war1gus-3.2.0
 2207260815 metadata/md5-cache/games-strategy/wargus-3.2.0
-2207260815 metadata/md5-cache/games-strategy/warzone2100-4.2.2
-2207260815 metadata/md5-cache/games-strategy/warzone2100-4.2.4
 2207260815 metadata/md5-cache/games-strategy/warzone2100-4.2.6
-2207260815 metadata/md5-cache/games-strategy/wesnoth-1.16.2
 2207260815 metadata/md5-cache/games-strategy/wesnoth-1.16.3
 2207260815 metadata/md5-cache/games-strategy/wesnoth-1.17.5
 2207292110 metadata/md5-cache/games-strategy/war1gus-3.3.0
 2207292110 metadata/md5-cache/games-strategy/wargus-3.3.0
-2208020744 metadata/md5-cache/games-strategy/0ad-0.0.25b_alpha
 2208020744 metadata/md5-cache/games-strategy/0ad-0.0.25b_alpha-r1
 2208020744 metadata/md5-cache/games-strategy/colobot-data-0.1.12
 2208020744 metadata/md5-cache/games-strategy/colobot-data-0.2.0_alpha
@@ -47540,14 +47560,14 @@
 2208020744 metadata/md5-cache/games-strategy/freeorion-9999
 2208020710 metadata/md5-cache/games-strategy/megaglest-3.11.1-r100
 2208020710 metadata/md5-cache/games-strategy/megaglest-3.13.0
-2208020744 metadata/md5-cache/games-strategy/naev-0.9.3
 2208020744 metadata/md5-cache/games-strategy/naev-0.9.4
 2208011440 metadata/md5-cache/games-strategy/war1gus-3.3.1
 2208011440 metadata/md5-cache/games-strategy/wargus-3.3.1
 2208020744 metadata/md5-cache/games-strategy/widelands-1.0
 2208020744 metadata/md5-cache/games-strategy/widelands-9999
-2208071710 metadata/md5-cache/games-strategy/Manifest.gz
-1909100139 metadata/md5-cache/games-util/deutex-5.2.0
+2208111110 metadata/md5-cache/games-strategy/Manifest.gz
+2208110010 metadata/md5-cache/games-strategy/war1gus-3.3.2
+2208110010 metadata/md5-cache/games-strategy/wargus-3.3.2
 2011222009 metadata/md5-cache/games-util/etswitch-0.1.14-r1
 2104212209 metadata/md5-cache/games-util/xgame-1.7.1-r1
 1707090139 metadata/md5-cache/games-util/xgame-gtk2-2.0.2-r1
@@ -47582,7 +47602,6 @@
 2207260815 metadata/md5-cache/games-util/antimicro-2.23
 2207260815 metadata/md5-cache/games-util/dfarc-3.14
 2207260815 metadata/md5-cache/games-util/grfcodec-6.0.6_p20210310
-2207260815 metadata/md5-cache/games-util/lgogdownloader-3.8
 2207260815 metadata/md5-cache/games-util/lgogdownloader-3.9
 2207260815 metadata/md5-cache/games-util/lgogdownloader-9999
 2207260815 metadata/md5-cache/games-util/qjoypad-4.3.1
@@ -47593,7 +47612,6 @@
 2208020744 metadata/md5-cache/games-util/nml-0.6.1
 2208020744 metadata/md5-cache/games-util/pyfa-2.43.0
 2208020744 metadata/md5-cache/games-util/pyfa-9999
-2208080111 metadata/md5-cache/games-util/Manifest.gz
 2208061710 metadata/md5-cache/games-util/gamemode-1.7
 2208061710 metadata/md5-cache/games-util/gamemode-9999
 2208080111 metadata/md5-cache/games-util/joycond-0.1.0_p20210730-r1
@@ -47604,6 +47622,7 @@
 2208080111 metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118-r1
 2208080111 metadata/md5-cache/games-util/xpadneo-0.9.4
 2208080111 metadata/md5-cache/games-util/xpadneo-9999
+2208111110 metadata/md5-cache/games-util/Manifest.gz
 2108271840 metadata/md5-cache/gnome-base/gnome-light-40.0
 2202080810 metadata/md5-cache/gnome-base/gnome-40.0
 2203131809 metadata/md5-cache/gnome-base/gnome-core-apps-41.3
@@ -47623,7 +47642,6 @@
 2208020744 metadata/md5-cache/gnome-base/gconf-3.2.6-r5
 2208020744 metadata/md5-cache/gnome-base/gdm-42.0
 2208020744 metadata/md5-cache/gnome-base/gnome-control-center-42.2
-2208020744 metadata/md5-cache/gnome-base/gnome-desktop-42.2-r300
 2208020744 metadata/md5-cache/gnome-base/gnome-desktop-42.2-r400
 2208020744 metadata/md5-cache/gnome-base/gnome-keyring-42.1
 2208020744 metadata/md5-cache/gnome-base/gnome-session-42.0
@@ -47636,14 +47654,15 @@
 2208020710 metadata/md5-cache/gnome-base/libgnomecanvas-2.30.3-r1
 2208020744 metadata/md5-cache/gnome-base/librsvg-2.54.4
 2208020744 metadata/md5-cache/gnome-base/nautilus-42.2
-2208081810 metadata/md5-cache/gnome-base/Manifest.gz
 2208070840 metadata/md5-cache/gnome-base/gnome-control-center-42.3
-2208070840 metadata/md5-cache/gnome-base/gnome-desktop-42.3-r300
 2208070840 metadata/md5-cache/gnome-base/gnome-desktop-42.3-r400
-2208081810 metadata/md5-cache/gnome-base/gnome-desktop-42.4-r300
 2208081810 metadata/md5-cache/gnome-base/gnome-desktop-42.4-r400
 2208070840 metadata/md5-cache/gnome-base/gnome-settings-daemon-42.2-r1
 2208070840 metadata/md5-cache/gnome-base/gnome-shell-42.3.1
+2208111440 metadata/md5-cache/gnome-base/Manifest.gz
+2208111440 metadata/md5-cache/gnome-base/gnome-desktop-42.2-r300
+2208111440 metadata/md5-cache/gnome-base/gnome-desktop-42.3-r300
+2208111440 metadata/md5-cache/gnome-base/gnome-desktop-42.4-r300
 2203240726 metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.38.1
 2205050610 metadata/md5-cache/gnome-extra/cinnamon-translations-5.2.2
 2205181110 metadata/md5-cache/gnome-extra/polkit-gnome-0.105-r2
@@ -47879,8 +47898,6 @@
 2208020744 metadata/md5-cache/gui-libs/amtk-5.4.1
 2208020744 metadata/md5-cache/gui-libs/egl-gbm-1.1.0
 2208020744 metadata/md5-cache/gui-libs/egl-wayland-1.1.10-r1
-2208020744 metadata/md5-cache/gui-libs/egl-wayland-1.1.7-r1
-2208020744 metadata/md5-cache/gui-libs/egl-wayland-1.1.9_p20211123
 2208020744 metadata/md5-cache/gui-libs/gdk-pixbuf-loader-webp-0.0.4
 2208020744 metadata/md5-cache/gui-libs/gdk-pixbuf-loader-webp-0.0.5
 2208020744 metadata/md5-cache/gui-libs/gdk-pixbuf-loader-webp-0.0.6
@@ -47911,11 +47928,15 @@
 2208020744 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.5.0
 2208020744 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.6.0
 2208020744 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-9999
-2208071710 metadata/md5-cache/gui-libs/Manifest.gz
 2208070840 metadata/md5-cache/gui-libs/gtk-4.6.6
 2208070840 metadata/md5-cache/gui-libs/libadwaita-1.1.3
 2208060540 metadata/md5-cache/gui-libs/libadwaita-1.1.4
 2208070840 metadata/md5-cache/gui-libs/libhandy-1.6.3
+2208111440 metadata/md5-cache/gui-libs/Manifest.gz
+2208111440 metadata/md5-cache/gui-libs/egl-wayland-1.1.10_p20220805
+2208111440 metadata/md5-cache/gui-libs/egl-wayland-1.1.7-r1
+2208111440 metadata/md5-cache/gui-libs/egl-wayland-1.1.9_p20211123
+2208101810 metadata/md5-cache/gui-libs/wpebackend-fdo-1.12.1
 2207181923 metadata/md5-cache/gui-wm/hikari-2.3.3
 2208020744 metadata/md5-cache/gui-wm/sway-1.7
 2208020744 metadata/md5-cache/gui-wm/sway-1.7-r1
@@ -48158,14 +48179,10 @@
 2208050740 metadata/md5-cache/kde-apps/messagelib-22.04.3-r1
 2208061110 metadata/md5-cache/kde-apps/yakuake-22.04.3
 2205251440 metadata/md5-cache/kde-frameworks/kf-env-5
-2208081810 metadata/md5-cache/kde-frameworks/Manifest.gz
 2208060740 metadata/md5-cache/kde-frameworks/attica-5.96.0
 2208060740 metadata/md5-cache/kde-frameworks/baloo-5.96.0
 2208060740 metadata/md5-cache/kde-frameworks/bluez-qt-5.96.0
-2208060740 metadata/md5-cache/kde-frameworks/breeze-icons-5.96.0
-2208060740 metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.96.0
 2208060740 metadata/md5-cache/kde-frameworks/countryflags-5.96.0
-2208060740 metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.96.0
 2208060740 metadata/md5-cache/kde-frameworks/frameworkintegration-5.96.0
 2208060740 metadata/md5-cache/kde-frameworks/kactivities-5.96.0
 2208060740 metadata/md5-cache/kde-frameworks/kactivities-stats-5.96.0
@@ -48242,6 +48259,10 @@
 2208060740 metadata/md5-cache/kde-frameworks/syndication-5.96.0
 2208060740 metadata/md5-cache/kde-frameworks/syntax-highlighting-5.96.0
 2208060740 metadata/md5-cache/kde-frameworks/threadweaver-5.96.0
+2208111410 metadata/md5-cache/kde-frameworks/Manifest.gz
+2208111310 metadata/md5-cache/kde-frameworks/breeze-icons-5.96.0
+2208111310 metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.96.0
+2208111410 metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.96.0
 2207260815 metadata/md5-cache/kde-misc/kshutdown-5.2
 2208020710 metadata/md5-cache/kde-misc/basket-2.49b
 2208020710 metadata/md5-cache/kde-misc/colord-kde-0.5.0-r2
@@ -48275,7 +48296,6 @@
 2208022210 metadata/md5-cache/kde-plasma/bluedevil-5.25.4
 2208022210 metadata/md5-cache/kde-plasma/breeze-5.25.4
 2208022210 metadata/md5-cache/kde-plasma/breeze-grub-5.25.4
-2208022210 metadata/md5-cache/kde-plasma/breeze-gtk-5.25.4
 2208022210 metadata/md5-cache/kde-plasma/breeze-plymouth-5.25.4
 2208022210 metadata/md5-cache/kde-plasma/discover-5.25.4
 2208022210 metadata/md5-cache/kde-plasma/drkonqi-5.25.4
@@ -48325,11 +48345,9 @@
 2208022210 metadata/md5-cache/kde-plasma/systemsettings-5.25.4
 2208022210 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.25.4
 2208022210 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.25.4
-2208080010 metadata/md5-cache/kde-plasma/Manifest.gz
 2208070840 metadata/md5-cache/kde-plasma/bluedevil-5.24.6
 2208070840 metadata/md5-cache/kde-plasma/breeze-5.24.6-r1
 2208070840 metadata/md5-cache/kde-plasma/breeze-grub-5.24.6
-2208070840 metadata/md5-cache/kde-plasma/breeze-gtk-5.24.6
 2208070840 metadata/md5-cache/kde-plasma/breeze-plymouth-5.24.6
 2208070840 metadata/md5-cache/kde-plasma/discover-5.24.6-r1
 2208070840 metadata/md5-cache/kde-plasma/drkonqi-5.24.6
@@ -48380,6 +48398,9 @@
 2208070840 metadata/md5-cache/kde-plasma/systemsettings-5.24.6
 2208070840 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.24.6
 2208070840 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.24.6-r1
+2208111410 metadata/md5-cache/kde-plasma/Manifest.gz
+2208111410 metadata/md5-cache/kde-plasma/breeze-gtk-5.24.6
+2208111410 metadata/md5-cache/kde-plasma/breeze-gtk-5.25.4
 2107230909 metadata/md5-cache/lxde-base/lxappearance-obconf-0.2.3-r1
 2107211809 metadata/md5-cache/lxde-base/lxde-common-0.99.2-r1
 2107211809 metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r7
@@ -49110,7 +49131,6 @@
 2207260815 metadata/md5-cache/media-gfx/rawtherapee-5.8-r1
 2207260815 metadata/md5-cache/media-gfx/sfftobmp-3.1.2-r1
 2207260815 metadata/md5-cache/media-gfx/solvespace-3.0-r2
-2207260815 metadata/md5-cache/media-gfx/superslicer-2.4.58.3-r1
 2207260815 metadata/md5-cache/media-gfx/tgif-4.2.5-r2
 2207260815 metadata/md5-cache/media-gfx/tintii-2.10.0-r1
 2207250144 metadata/md5-cache/media-gfx/viewer-0.8.0-r1
@@ -49130,11 +49150,6 @@
 2208020744 metadata/md5-cache/media-gfx/asymptote-2.78
 2208020744 metadata/md5-cache/media-gfx/asymptote-2.80
 2208020744 metadata/md5-cache/media-gfx/asymptote-2.81
-2208020744 metadata/md5-cache/media-gfx/blender-2.93.9
-2208020744 metadata/md5-cache/media-gfx/blender-3.1.2
-2208020744 metadata/md5-cache/media-gfx/blender-3.2.0
-2208020744 metadata/md5-cache/media-gfx/blender-3.2.1
-2208020744 metadata/md5-cache/media-gfx/blender-9999
 2208020744 metadata/md5-cache/media-gfx/cairosvg-2.5.2
 2208020744 metadata/md5-cache/media-gfx/cropgui-0.4.1
 2208020744 metadata/md5-cache/media-gfx/cropgui-0.5
@@ -49234,9 +49249,7 @@
 2208020744 metadata/md5-cache/media-gfx/yafaray-3.4.1
 2208020744 metadata/md5-cache/media-gfx/yafaray-3.5.1-r1
 2208021340 metadata/md5-cache/media-gfx/zbar-0.23.90
-2208092140 metadata/md5-cache/media-gfx/Manifest.gz
 2208070540 metadata/md5-cache/media-gfx/eog-42.3
-2208092140 metadata/md5-cache/media-gfx/fontforge-20220308
 2208080111 metadata/md5-cache/media-gfx/iscan-plugin-network-nt-1.1.3
 2208051840 metadata/md5-cache/media-gfx/krita-5.1.0_rc1
 2208070110 metadata/md5-cache/media-gfx/nomacs-3.16.224-r2
@@ -49245,6 +49258,17 @@
 2208051440 metadata/md5-cache/media-gfx/prusaslicer-2.5.0_alpha2-r1
 2208082140 metadata/md5-cache/media-gfx/renderdoc-1.21
 2208070840 metadata/md5-cache/media-gfx/shotwell-0.30.16
+2208111410 metadata/md5-cache/media-gfx/Manifest.gz
+2208111040 metadata/md5-cache/media-gfx/blender-2.93.10
+2208111040 metadata/md5-cache/media-gfx/blender-2.93.9
+2208111040 metadata/md5-cache/media-gfx/blender-3.1.2
+2208111410 metadata/md5-cache/media-gfx/blender-3.2.0
+2208111410 metadata/md5-cache/media-gfx/blender-3.2.1
+2208111410 metadata/md5-cache/media-gfx/blender-3.2.2
+2208111040 metadata/md5-cache/media-gfx/blender-9999
+2208101110 metadata/md5-cache/media-gfx/fontforge-20220308
+2208111410 metadata/md5-cache/media-gfx/superslicer-2.4.58.3-r1
+2208101640 metadata/md5-cache/media-gfx/xpaint-3.1.4-r1
 2109230439 metadata/md5-cache/media-libs/alsa-topology-conf-1.2.4
 1802221208 metadata/md5-cache/media-libs/blib-1.1.7-r2
 2012270139 metadata/md5-cache/media-libs/cimg-2.9.3
@@ -49546,8 +49570,6 @@
 2207260815 metadata/md5-cache/media-libs/game-music-emu-0.6.3
 2207260815 metadata/md5-cache/media-libs/gd-2.3.2-r1
 2207260815 metadata/md5-cache/media-libs/glfw-3.3.5
-2207260815 metadata/md5-cache/media-libs/glfw-3.3.6
-2207260815 metadata/md5-cache/media-libs/glfw-3.3.7
 2207260815 metadata/md5-cache/media-libs/glfw-3.3.8
 2207260815 metadata/md5-cache/media-libs/glm-0.9.9.8-r1
 2207260815 metadata/md5-cache/media-libs/glpng-1.46-r1
@@ -49592,7 +49614,6 @@
 2207260815 metadata/md5-cache/media-libs/libjpeg-turbo-2.1.1-r2
 2207260815 metadata/md5-cache/media-libs/libjpeg-turbo-2.1.3
 2207260815 metadata/md5-cache/media-libs/libjxl-0.7.0_pre20220329
-2207260815 metadata/md5-cache/media-libs/libjxl-9999
 2207260815 metadata/md5-cache/media-libs/libkeyfinder-2.2.7
 2207260815 metadata/md5-cache/media-libs/liblastfm-1.1.0_pre20190625
 2207260815 metadata/md5-cache/media-libs/libldac-2.0.2.3-r1
@@ -49852,12 +49873,10 @@
 2208020744 metadata/md5-cache/media-libs/waffle-1.7.0-r2
 2208020744 metadata/md5-cache/media-libs/waffle-9999
 2208020744 metadata/md5-cache/media-libs/webrtc-audio-processing-1.0
-2208092340 metadata/md5-cache/media-libs/Manifest.gz
 2208080111 metadata/md5-cache/media-libs/embree-3.13.0-r2
 2208080111 metadata/md5-cache/media-libs/embree-3.13.2
 2208080111 metadata/md5-cache/media-libs/embree-3.13.3
 2208080940 metadata/md5-cache/media-libs/fcft-3.1.2-r1
-2208092140 metadata/md5-cache/media-libs/freetype-2.12.1
 2208092340 metadata/md5-cache/media-libs/gmmlib-22.1.5
 2208051040 metadata/md5-cache/media-libs/libavif-0.10.1
 2208081540 metadata/md5-cache/media-libs/libdmtx-0.7.7
@@ -49874,9 +49893,14 @@
 2208080111 metadata/md5-cache/media-libs/mesa-22.1.5
 2208080111 metadata/md5-cache/media-libs/mesa-9999
 2208080111 metadata/md5-cache/media-libs/mesa-amber-21.3.9
-2208091110 metadata/md5-cache/media-libs/rubberband-3.0.0
 2208080111 metadata/md5-cache/media-libs/svgalib-1.9.25-r8
 2208081610 metadata/md5-cache/media-libs/svt-av1-1.1.0
+2208111110 metadata/md5-cache/media-libs/Manifest.gz
+2208111040 metadata/md5-cache/media-libs/embree-3.13.4
+2208101110 metadata/md5-cache/media-libs/freetype-2.12.1
+2208101140 metadata/md5-cache/media-libs/libjxl-9999
+2208102310 metadata/md5-cache/media-libs/mesa-22.1.6
+2208101110 metadata/md5-cache/media-libs/rubberband-3.0.0
 2109230909 metadata/md5-cache/media-plugins/audacious-plugins-4.0.5
 2011090239 metadata/md5-cache/media-plugins/gimp-lqr-0.7.2-r1
 2006152009 metadata/md5-cache/media-plugins/gmpc-alarm-11.8.16
@@ -50385,9 +50409,10 @@
 2207260815 metadata/md5-cache/media-radio/unixcw-3.6.0
 2207260815 metadata/md5-cache/media-radio/xastir-2.1.8
 2207260815 metadata/md5-cache/media-radio/xastir-2.1.8-r1
-2208081310 metadata/md5-cache/media-radio/Manifest.gz
 2208081310 metadata/md5-cache/media-radio/svxlink-19.09.2
 2208081310 metadata/md5-cache/media-radio/wsjtx-2.5.4
+2208101340 metadata/md5-cache/media-radio/Manifest.gz
+2208101340 metadata/md5-cache/media-radio/flrig-1.4.7
 2008082009 metadata/md5-cache/media-sound/cdstatus-0.97.03
 1912100409 metadata/md5-cache/media-sound/cdtool-2.1.8-r1
 2008082009 metadata/md5-cache/media-sound/chordii-4.5.3
@@ -50628,7 +50653,6 @@
 2207260815 metadata/md5-cache/media-sound/deadbeef-1.9.1-r1
 2207260815 metadata/md5-cache/media-sound/drumstick-2.6.1
 2207260815 metadata/md5-cache/media-sound/fluidsynth-2.2.7
-2207260815 metadata/md5-cache/media-sound/fluidsynth-2.2.8
 2207260815 metadata/md5-cache/media-sound/gigedit-1.2.0-r1
 2207260815 metadata/md5-cache/media-sound/gigedit-9999
 2207250144 metadata/md5-cache/media-sound/gmpc-11.8.16-r2
@@ -50817,7 +50841,6 @@
 2208020744 metadata/md5-cache/media-sound/whipper-0.10.0
 2208020744 metadata/md5-cache/media-sound/whipper-0.9.0
 2208020744 metadata/md5-cache/media-sound/xmms2-0.9.1
-2208100940 metadata/md5-cache/media-sound/Manifest.gz
 2208081540 metadata/md5-cache/media-sound/cmus-2.10.0
 2208100940 metadata/md5-cache/media-sound/exaile-4.1.2
 2208100940 metadata/md5-cache/media-sound/exaile-9999
@@ -50836,6 +50859,8 @@
 2208070840 metadata/md5-cache/media-sound/rhythmbox-3.4.6
 2208081110 metadata/md5-cache/media-sound/schismtracker-20220807
 2208052010 metadata/md5-cache/media-sound/teamspeak-client-5.0.0_beta70
+2208101540 metadata/md5-cache/media-sound/Manifest.gz
+2208101540 metadata/md5-cache/media-sound/fluidsynth-2.2.8
 2101060224 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20171003
 2101060224 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20190922
 2110160409 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20210430
@@ -51045,7 +51070,6 @@
 2207260815 metadata/md5-cache/media-video/vdr-2.2.0-r6
 2207260815 metadata/md5-cache/media-video/vdr-2.2.0-r7
 2207260815 metadata/md5-cache/media-video/vdr-2.4.7-r1
-2207260815 metadata/md5-cache/media-video/vdr-2.6.1
 2207260815 metadata/md5-cache/media-video/x264-encoder-0.0.20190903
 2207260815 metadata/md5-cache/media-video/x264-encoder-0.0.20220222
 2207260815 metadata/md5-cache/media-video/x264-encoder-9999
@@ -51107,7 +51131,6 @@
 2208020744 metadata/md5-cache/media-video/wireplumber-0.4.11-r2
 2208020744 metadata/md5-cache/media-video/wireplumber-9999
 2208020744 metadata/md5-cache/media-video/yle-dl-20220704
-2208080940 metadata/md5-cache/media-video/Manifest.gz
 2208080111 metadata/md5-cache/media-video/droidcam-1.8.2
 2208080111 metadata/md5-cache/media-video/makemkv-1.17.1
 2208080940 metadata/md5-cache/media-video/pipewire-0.3.51-r2
@@ -51117,6 +51140,8 @@
 2208080111 metadata/md5-cache/media-video/sonic-snap-1.7-r1
 2208080111 metadata/md5-cache/media-video/v4l2loopback-0.12.5-r1
 2208080111 metadata/md5-cache/media-video/v4l2loopback-9999
+2208111410 metadata/md5-cache/media-video/Manifest.gz
+2208111410 metadata/md5-cache/media-video/vdr-2.6.1
 2110212239 metadata/md5-cache/net-analyzer/arptools-1.0.2-r1
 1906051110 metadata/md5-cache/net-analyzer/authforce-0.9.9-r2
 2101201239 metadata/md5-cache/net-analyzer/authforce-0.9.9-r3
@@ -51306,7 +51331,6 @@
 2207181923 metadata/md5-cache/net-analyzer/odhcploc-20111021-r1
 2207181923 metadata/md5-cache/net-analyzer/openbsd-netcat-1.190
 2207181923 metadata/md5-cache/net-analyzer/openbsd-netcat-1.195
-2207181923 metadata/md5-cache/net-analyzer/openbsd-netcat-1.195-r1
 2207181923 metadata/md5-cache/net-analyzer/ostinato-1.1-r2
 2207182110 metadata/md5-cache/net-analyzer/p0f-3.09_beta-r1
 2207181923 metadata/md5-cache/net-analyzer/packit-1.7
@@ -51512,7 +51536,6 @@
 2208020744 metadata/md5-cache/net-analyzer/wireshark-3.6.6
 2208020744 metadata/md5-cache/net-analyzer/wireshark-3.6.7
 2208020744 metadata/md5-cache/net-analyzer/wireshark-9999
-2208091110 metadata/md5-cache/net-analyzer/Manifest.gz
 2208080111 metadata/md5-cache/net-analyzer/bmon-4.0
 2208080111 metadata/md5-cache/net-analyzer/bmon-999
 2208061610 metadata/md5-cache/net-analyzer/nagios-plugins-2.4.0-r1
@@ -51525,6 +51548,8 @@
 2208091110 metadata/md5-cache/net-analyzer/zabbix-5.0.25
 2208091110 metadata/md5-cache/net-analyzer/zabbix-6.0.6-r1
 2208091110 metadata/md5-cache/net-analyzer/zabbix-6.2.0-r1
+2208101410 metadata/md5-cache/net-analyzer/Manifest.gz
+2208101410 metadata/md5-cache/net-analyzer/openbsd-netcat-1.195-r1
 1704281609 metadata/md5-cache/net-dialup/dial-1.2-r2
 2104161439 metadata/md5-cache/net-dialup/sercd-3.0.0-r2
 2111292209 metadata/md5-cache/net-dialup/pppconfig-2.3.21
@@ -51582,7 +51607,6 @@
 2207181923 metadata/md5-cache/net-dns/dnrd-2.20.3-r3
 2207181923 metadata/md5-cache/net-dns/dnscrypt-proxy-2.1.1
 2207181923 metadata/md5-cache/net-dns/dnshijacker-1.3-r2
-2207181923 metadata/md5-cache/net-dns/dnsmasq-2.86
 2207181923 metadata/md5-cache/net-dns/dnssec-check-2.2
 2207181923 metadata/md5-cache/net-dns/dnssec-tools-2.2.3-r3
 2207181923 metadata/md5-cache/net-dns/dnssec-validator-2.2.3-r2
@@ -51633,7 +51657,6 @@
 2207260815 metadata/md5-cache/net-dns/resolv_wrapper-1.1.7
 2207301710 metadata/md5-cache/net-dns/c-ares-1.18.1
 2207301310 metadata/md5-cache/net-dns/libidn-1.41
-2208030610 metadata/md5-cache/net-dns/Manifest.gz
 2208020744 metadata/md5-cache/net-dns/avahi-0.8-r5
 2208020744 metadata/md5-cache/net-dns/bind-9.16.27-r1
 2208020744 metadata/md5-cache/net-dns/bind-9.16.29
@@ -51651,6 +51674,8 @@
 2208020744 metadata/md5-cache/net-dns/unbound-1.13.2-r1
 2208020744 metadata/md5-cache/net-dns/unbound-1.15.0
 2208020744 metadata/md5-cache/net-dns/unbound-1.16.0
+2208111010 metadata/md5-cache/net-dns/Manifest.gz
+2208111010 metadata/md5-cache/net-dns/dnsmasq-2.86
 1902190039 metadata/md5-cache/net-firewall/ipkungfu-0.6.1-r1
 2001260341 metadata/md5-cache/net-firewall/lutelwall-0.99-r1
 2207181923 metadata/md5-cache/net-firewall/arno-iptables-firewall-2.1.1
@@ -51806,7 +51831,6 @@
 2207181923 metadata/md5-cache/net-im/slack-4.23.0
 2207181711 metadata/md5-cache/net-im/telegram-desktop-bin-3.7.3
 2207181711 metadata/md5-cache/net-im/telegram-desktop-bin-4.0.2
-2207231240 metadata/md5-cache/net-im/signal-desktop-bin-5.51.0
 2207201810 metadata/md5-cache/net-im/zoom-5.11.3.3882
 2207260815 metadata/md5-cache/net-im/biboumi-9.0-r4
 2207250144 metadata/md5-cache/net-im/bitlbee-steam-1.4.2
@@ -51864,8 +51888,6 @@
 2208020744 metadata/md5-cache/net-im/toxic-0.11.3
 2208020744 metadata/md5-cache/net-im/transwhat-0.2.2_p20190426-r3
 2208020744 metadata/md5-cache/net-im/yowsup-3.3.0
-2208080111 metadata/md5-cache/net-im/Manifest.gz
-2208080111 metadata/md5-cache/net-im/discord-bin-0.0.18
 2208070840 metadata/md5-cache/net-im/gajim-1.4.7
 2208080111 metadata/md5-cache/net-im/rocketchat-desktop-bin-3.8.7
 2208080111 metadata/md5-cache/net-im/skypeforlinux-8.82.0.403
@@ -51879,6 +51901,9 @@
 2208080111 metadata/md5-cache/net-im/teams-1.5.00.10453
 2208080111 metadata/md5-cache/net-im/wazzapp-bin-0.4.2-r1
 2208080111 metadata/md5-cache/net-im/whatsapp-desktop-bin-0.5.2
+2208110010 metadata/md5-cache/net-im/Manifest.gz
+2208110010 metadata/md5-cache/net-im/discord-bin-0.0.19
+2208101140 metadata/md5-cache/net-im/signal-desktop-bin-5.54.0
 2106302209 metadata/md5-cache/net-irc/bnc-2.9.4-r2
 2002230040 metadata/md5-cache/net-irc/ircmap-0.99-r1
 2106302209 metadata/md5-cache/net-irc/muh-2.2a-r2
@@ -52252,14 +52277,11 @@
 2208020744 metadata/md5-cache/net-libs/telepathy-accounts-signon-2.1
 2208020744 metadata/md5-cache/net-libs/telepathy-glib-0.24.2
 2208020744 metadata/md5-cache/net-libs/telepathy-logger-qt-17.09.0
-2208020744 metadata/md5-cache/net-libs/telepathy-qt-0.9.8-r1
-2208020744 metadata/md5-cache/net-libs/telepathy-qt-9999
 2208020744 metadata/md5-cache/net-libs/webkit-gtk-2.36.3
 2208020744 metadata/md5-cache/net-libs/webkit-gtk-2.36.4
 2208020744 metadata/md5-cache/net-libs/xrootd-5.0.3-r1
 2208020744 metadata/md5-cache/net-libs/xrootd-5.4.3
 2208020744 metadata/md5-cache/net-libs/xrootd-5.4.3-r1
-2208100440 metadata/md5-cache/net-libs/Manifest.gz
 2208051040 metadata/md5-cache/net-libs/NativeThread-0_pre20190914-r1
 2208051240 metadata/md5-cache/net-libs/czmq-4.2.1
 2208070840 metadata/md5-cache/net-libs/glib-networking-2.72.1
@@ -52294,6 +52316,9 @@
 2208070840 metadata/md5-cache/net-libs/uhttpmock-0.5.5
 2208051040 metadata/md5-cache/net-libs/webkit-gtk-2.36.5-r1
 2208080340 metadata/md5-cache/net-libs/webkit-gtk-2.36.6
+2208111410 metadata/md5-cache/net-libs/Manifest.gz
+2208111410 metadata/md5-cache/net-libs/telepathy-qt-0.9.8-r1
+2208111410 metadata/md5-cache/net-libs/telepathy-qt-9999
 2104060140 metadata/md5-cache/net-mail/autorespond-2.0.4
 2007210509 metadata/md5-cache/net-mail/autorespond-2.0.5
 2009050439 metadata/md5-cache/net-mail/email-3.1.3-r1
@@ -52553,7 +52578,6 @@
 2207181923 metadata/md5-cache/net-misc/cadaver-0.23.3-r1
 2207181923 metadata/md5-cache/net-misc/cfengine-3.6.2-r1
 2207181923 metadata/md5-cache/net-misc/chrony-4.2-r1
-2207181923 metadata/md5-cache/net-misc/chrony-9999
 2207181711 metadata/md5-cache/net-misc/clusterssh-4.16
 2207181711 metadata/md5-cache/net-misc/clusterssh-9999
 2207181923 metadata/md5-cache/net-misc/cmst-2022.05.01
@@ -52707,7 +52731,6 @@
 2207181923 metadata/md5-cache/net-misc/x11-ssh-askpass-1.2.4.1-r2
 2207181923 metadata/md5-cache/net-misc/x2goserver-4.1.0.3-r1
 2207181923 metadata/md5-cache/net-misc/yandex-disk-0.1.6.1074_p1
-2207181711 metadata/md5-cache/net-misc/ytfzf-2.4.0
 2207181923 metadata/md5-cache/net-misc/zssh-1.5c-r1
 2207181923 metadata/md5-cache/net-misc/zsync-0.6.2-r2
 2207191210 metadata/md5-cache/net-misc/gsasl-2.0.1
@@ -52936,7 +52959,6 @@
 2208080111 metadata/md5-cache/net-misc/AQtion-2.2.7-r1
 2208080111 metadata/md5-cache/net-misc/AQtion-2.3.1-r1
 2208080111 metadata/md5-cache/net-misc/AQtion-2.3.4-r1
-2208091510 metadata/md5-cache/net-misc/Manifest.gz
 2208080111 metadata/md5-cache/net-misc/asterisk-13.38.3-r3
 2208080111 metadata/md5-cache/net-misc/asterisk-16.22.0-r1
 2208080111 metadata/md5-cache/net-misc/asterisk-16.23.0-r1
@@ -52991,6 +53013,9 @@
 2208071310 metadata/md5-cache/net-misc/usbip-5.15
 2208090511 metadata/md5-cache/net-misc/yt-dlp-2022.8.8
 2208061740 metadata/md5-cache/net-misc/ytfzf-2.4.1
+2208111310 metadata/md5-cache/net-misc/Manifest.gz
+2208111310 metadata/md5-cache/net-misc/chrony-4.3_pre1
+2208111310 metadata/md5-cache/net-misc/chrony-9999
 1911091712 metadata/md5-cache/net-nds/led-1.111
 2203040040 metadata/md5-cache/net-nds/gssproxy-0.8.4-r2
 2203282310 metadata/md5-cache/net-nds/phpldapadmin-1.2.5
@@ -53316,7 +53341,6 @@
 2208020744 metadata/md5-cache/net-vpn/riseup-vpn-0.21.11
 2208020744 metadata/md5-cache/net-vpn/tor-0.4.6.10
 2208020744 metadata/md5-cache/net-vpn/tor-0.4.7.8
-2208100140 metadata/md5-cache/net-vpn/Manifest.gz
 2208051010 metadata/md5-cache/net-vpn/i2p-1.7.0
 2208080111 metadata/md5-cache/net-vpn/iodine-0.7.0-r3
 2208080111 metadata/md5-cache/net-vpn/isatapd-0.9.7-r2
@@ -53340,6 +53364,8 @@
 2208080111 metadata/md5-cache/net-vpn/wireguard-modules-1.0.20220627
 2208080111 metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210424
 2208080111 metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210914
+2208101140 metadata/md5-cache/net-vpn/Manifest.gz
+2208101140 metadata/md5-cache/net-vpn/strongswan-5.9.7
 2004041439 metadata/md5-cache/net-wireless/bluez-hcidump-2.5
 2009240309 metadata/md5-cache/net-wireless/hidclient-20120728
 2008032109 metadata/md5-cache/net-wireless/kismetmobiledashboard-1.5_beta1-r2
@@ -53360,7 +53386,6 @@
 2207181923 metadata/md5-cache/net-wireless/b43-fwcutter-019
 2207181923 metadata/md5-cache/net-wireless/bluez-tools-0_p20201025
 2207181923 metadata/md5-cache/net-wireless/bss-0.8-r2
-2207181923 metadata/md5-cache/net-wireless/crackle-0.1-r1
 2207181923 metadata/md5-cache/net-wireless/dump1090-4.0
 2207181923 metadata/md5-cache/net-wireless/dump1090-5.0
 2207181923 metadata/md5-cache/net-wireless/dump1090-6.1
@@ -53476,7 +53501,6 @@
 2208030010 metadata/md5-cache/net-wireless/unifi-7.2.91
 2208020744 metadata/md5-cache/net-wireless/urh-2.9.3
 2208020744 metadata/md5-cache/net-wireless/urh-9999
-2208092340 metadata/md5-cache/net-wireless/Manifest.gz
 2208080111 metadata/md5-cache/net-wireless/blueman-2.2.5
 2208080111 metadata/md5-cache/net-wireless/blueman-2.3.1
 2208080111 metadata/md5-cache/net-wireless/blueman-2.3.2
@@ -53502,6 +53526,8 @@
 2208080111 metadata/md5-cache/net-wireless/wavemon-0.9.4
 2208080111 metadata/md5-cache/net-wireless/wpa_supplicant-2.10-r1
 2208080111 metadata/md5-cache/net-wireless/wpa_supplicant-9999
+2208111410 metadata/md5-cache/net-wireless/Manifest.gz
+2208111410 metadata/md5-cache/net-wireless/crackle-0.1-r1
 2207181711 metadata/md5-cache/perl-core/CPAN-2.290.0-r1
 2207181711 metadata/md5-cache/perl-core/Compress-Raw-Zlib-2.201.0
 2207181711 metadata/md5-cache/perl-core/Encode-3.120.0
@@ -54294,8 +54320,6 @@
 2207181923 metadata/md5-cache/sci-libs/libqalculate-3.22.0
 2207181923 metadata/md5-cache/sci-libs/libqalculate-4.1.1
 2207181923 metadata/md5-cache/sci-libs/libqalculate-4.2.0
-2207181923 metadata/md5-cache/sci-libs/libsc-2.3.1-r1
-2207181923 metadata/md5-cache/sci-libs/libsc-2.3.3
 2207181923 metadata/md5-cache/sci-libs/libxc-5.1.7
 2207181923 metadata/md5-cache/sci-libs/linbox-1.6.3-r1
 2207181923 metadata/md5-cache/sci-libs/lrslib-071b
@@ -54465,8 +54489,6 @@
 2207260815 metadata/md5-cache/sci-libs/orocos_kdl-1.5.0
 2207260815 metadata/md5-cache/sci-libs/orocos_kdl-1.5.1
 2207260815 metadata/md5-cache/sci-libs/orocos_kdl-9999
-2207260815 metadata/md5-cache/sci-libs/p4est-2.3.1-r1
-2207260815 metadata/md5-cache/sci-libs/p4est-2.3.3
 2207260815 metadata/md5-cache/sci-libs/p4est-2.8.0-r1
 2207260815 metadata/md5-cache/sci-libs/p4est-9999
 2207260815 metadata/md5-cache/sci-libs/parmetis-4.0.3-r2
@@ -54601,7 +54623,6 @@
 2208020744 metadata/md5-cache/sci-libs/vtk-9.0.3-r4
 2208020744 metadata/md5-cache/sci-libs/vtk-9.0.3-r5
 2208020744 metadata/md5-cache/sci-libs/vtk-9.1.0-r2
-2208081340 metadata/md5-cache/sci-libs/Manifest.gz
 2208060710 metadata/md5-cache/sci-libs/coinor-vol-1.5.4
 2208060610 metadata/md5-cache/sci-libs/dlib-19.24
 2208080940 metadata/md5-cache/sci-libs/fplll-5.4.2
@@ -54609,11 +54630,15 @@
 2208061740 metadata/md5-cache/sci-libs/rocBLAS-5.0.2-r2
 2208061740 metadata/md5-cache/sci-libs/rocFFT-5.0.2-r1
 2208061740 metadata/md5-cache/sci-libs/rocThrust-5.0.2-r1
+2208111440 metadata/md5-cache/sci-libs/Manifest.gz
+2208111440 metadata/md5-cache/sci-libs/libsc-2.3.1-r1
+2208111440 metadata/md5-cache/sci-libs/libsc-2.3.3
+2208111440 metadata/md5-cache/sci-libs/p4est-2.3.1-r1
+2208111440 metadata/md5-cache/sci-libs/p4est-2.3.3
 2111031339 metadata/md5-cache/sci-mathematics/eclib-20210625
 2101061839 metadata/md5-cache/sci-mathematics/flintqs-1.0
 2101061839 metadata/md5-cache/sci-mathematics/lrcalc-1.2
 2101061839 metadata/md5-cache/sci-mathematics/pari-data-20191216
-2111021909 metadata/md5-cache/sci-mathematics/planarity-3.0.1.1
 2105261009 metadata/md5-cache/sci-mathematics/rw-0.9
 2111220639 metadata/md5-cache/sci-mathematics/octave-epstk-2.4
 2112061039 metadata/md5-cache/sci-mathematics/gp2c-0.0.12
@@ -54631,7 +54656,6 @@
 2205072010 metadata/md5-cache/sci-mathematics/easycrypt-1.0_pre20220303-r1
 2205072010 metadata/md5-cache/sci-mathematics/easycrypt-2022.04-r1
 2205072010 metadata/md5-cache/sci-mathematics/easycrypt-2022.04_p20220505
-2206130310 metadata/md5-cache/sci-mathematics/planarity-3.0.2.0
 2206182010 metadata/md5-cache/sci-mathematics/num-utils-0.5-r2
 2206210511 metadata/md5-cache/sci-mathematics/alt-ergo-2.3.0-r1
 2206211940 metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0-r1
@@ -54773,16 +54797,18 @@
 2208020744 metadata/md5-cache/sci-mathematics/z3-4.10.2
 2208022310 metadata/md5-cache/sci-mathematics/z3-4.8.17
 2208020744 metadata/md5-cache/sci-mathematics/z3-4.9.1-r1
-2208090940 metadata/md5-cache/sci-mathematics/Manifest.gz
 2208090410 metadata/md5-cache/sci-mathematics/lean-3.46.0
 2208082040 metadata/md5-cache/sci-mathematics/mathematica-13.0.1
 2208082040 metadata/md5-cache/sci-mathematics/mathematica-13.1.0
-2208090940 metadata/md5-cache/sci-mathematics/pari-2.13.4-r1
 2208061640 metadata/md5-cache/sci-mathematics/primecount-7.3
 2208061640 metadata/md5-cache/sci-mathematics/primesieve-7.9
 2208090010 metadata/md5-cache/sci-mathematics/stp-2.3.3-r2
 2208070310 metadata/md5-cache/sci-mathematics/vampire-4.6.1-r1
 2208070310 metadata/md5-cache/sci-mathematics/vampire-4.7
+2208111510 metadata/md5-cache/sci-mathematics/Manifest.gz
+2208111510 metadata/md5-cache/sci-mathematics/nauty-2.7.4
+2208101110 metadata/md5-cache/sci-mathematics/pari-2.13.4-r1
+2208111110 metadata/md5-cache/sci-mathematics/planarity-3.0.2.0
 2104180939 metadata/md5-cache/sci-misc/ViSP-images-3.3.0
 2203231439 metadata/md5-cache/sci-misc/flashdot-1.1.4-r1
 2207071340 metadata/md5-cache/sci-misc/ViSP-images-3.5.0
@@ -56275,7 +56301,6 @@
 2207290515 metadata/md5-cache/sys-apps/osinfo-db-20220727
 2207311710 metadata/md5-cache/sys-apps/qdirstat-1.8.1
 2207311240 metadata/md5-cache/sys-apps/uutils-0.0.14
-2208020744 metadata/md5-cache/sys-apps/accountsservice-22.08.8
 2208020744 metadata/md5-cache/sys-apps/apparmor-utils-3.0.3
 2208020744 metadata/md5-cache/sys-apps/apparmor-utils-3.0.4
 2208020744 metadata/md5-cache/sys-apps/baobab-41.0
@@ -56312,9 +56337,6 @@
 2208020744 metadata/md5-cache/sys-apps/kmscon-9.0.0
 2208042110 metadata/md5-cache/sys-apps/man-db-2.10.2-r1
 2208042110 metadata/md5-cache/sys-apps/man-db-9999
-2208020744 metadata/md5-cache/sys-apps/nvme-cli-2.0
-2208020744 metadata/md5-cache/sys-apps/nvme-cli-2.0-r1
-2208020744 metadata/md5-cache/sys-apps/nvme-cli-2.1.1
 2208020744 metadata/md5-cache/sys-apps/onerng-3.7
 2208020744 metadata/md5-cache/sys-apps/openrc-0.44.10
 2208020744 metadata/md5-cache/sys-apps/openrc-0.45.1
@@ -56345,7 +56367,6 @@
 2208020744 metadata/md5-cache/sys-apps/util-linux-2.37.4
 2208020744 metadata/md5-cache/sys-apps/util-linux-2.38
 2208020744 metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.4
-2208100010 metadata/md5-cache/sys-apps/Manifest.gz
 2208080111 metadata/md5-cache/sys-apps/bolt-0.9.1
 2208080111 metadata/md5-cache/sys-apps/bolt-0.9.2
 2208080111 metadata/md5-cache/sys-apps/bubblewrap-0.6.2
@@ -56370,7 +56391,6 @@
 2208080111 metadata/md5-cache/sys-apps/hd-idle-1.05-r1
 2208050410 metadata/md5-cache/sys-apps/hdparm-9.64
 2208091410 metadata/md5-cache/sys-apps/hwinfo-22.0
-2208092340 metadata/md5-cache/sys-apps/iproute2-5.19.0
 2208092340 metadata/md5-cache/sys-apps/iproute2-9999
 2208080111 metadata/md5-cache/sys-apps/irqbalance-1.8.0-r1
 2208080111 metadata/md5-cache/sys-apps/irqbalance-1.9.0
@@ -56420,6 +56440,12 @@
 2208080111 metadata/md5-cache/sys-apps/x86info-1.31
 2208081540 metadata/md5-cache/sys-apps/xdg-desktop-portal-1.14.6
 2208070840 metadata/md5-cache/sys-apps/xdg-desktop-portal-gnome-42.3
+2208111440 metadata/md5-cache/sys-apps/Manifest.gz
+2208111310 metadata/md5-cache/sys-apps/accountsservice-22.08.8
+2208101140 metadata/md5-cache/sys-apps/iproute2-5.19.0
+2208111440 metadata/md5-cache/sys-apps/nvme-cli-2.0
+2208111410 metadata/md5-cache/sys-apps/nvme-cli-2.0-r1
+2208111410 metadata/md5-cache/sys-apps/nvme-cli-2.1.1
 2110110009 metadata/md5-cache/sys-auth/libyubikey-1.13
 2108271840 metadata/md5-cache/sys-auth/nss-myhostname-0.3-r1
 2011160239 metadata/md5-cache/sys-auth/ykclient-2.15
@@ -56478,7 +56504,6 @@
 2207260815 metadata/md5-cache/sys-auth/yubico-piv-tool-2.2.1
 2207260815 metadata/md5-cache/sys-auth/yubico-piv-tool-2.3.0
 2208020744 metadata/md5-cache/sys-auth/fprintd-1.94.1
-2208020744 metadata/md5-cache/sys-auth/libfprint-1.0
 2208020744 metadata/md5-cache/sys-auth/libfprint-1.94.3
 2208020744 metadata/md5-cache/sys-auth/libfprint-1.94.4
 2208020744 metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.12-r1
@@ -56494,7 +56519,6 @@
 2208020744 metadata/md5-cache/sys-auth/solo1-0.1.1
 2208020744 metadata/md5-cache/sys-auth/ssh-import-id-5.11
 2208020744 metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.4.0
-2208080940 metadata/md5-cache/sys-auth/Manifest.gz
 2208080111 metadata/md5-cache/sys-auth/elogind-246.10-r1
 2208080111 metadata/md5-cache/sys-auth/elogind-246.10-r2
 2208080940 metadata/md5-cache/sys-auth/pambase-20210201.1
@@ -56505,6 +56529,8 @@
 2208080111 metadata/md5-cache/sys-auth/sssd-2.5.2-r3
 2208080111 metadata/md5-cache/sys-auth/sssd-2.6.0-r2
 2208080111 metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
+2208111410 metadata/md5-cache/sys-auth/Manifest.gz
+2208111410 metadata/md5-cache/sys-auth/libfprint-1.0
 1910191339 metadata/md5-cache/sys-block/devio-1.2
 1911072009 metadata/md5-cache/sys-block/endpoint-0.1.0-r1
 1702282333 metadata/md5-cache/sys-block/hdrecover-0.5
@@ -56518,7 +56544,6 @@
 1702282333 metadata/md5-cache/sys-block/spindown-0.4.0-r5
 1911072009 metadata/md5-cache/sys-block/tapecat-1.0.0-r1
 1911121409 metadata/md5-cache/sys-block/viaideinfo-0.5-r1
-2112271910 metadata/md5-cache/sys-block/flashbench-20120606
 2201051309 metadata/md5-cache/sys-block/sas2ircu-20
 2201051309 metadata/md5-cache/sys-block/sas3flash-15
 2201051309 metadata/md5-cache/sys-block/sas3flash-15-r1
@@ -56599,7 +56624,6 @@
 2208020710 metadata/md5-cache/sys-block/partitionmanager-22.04.3
 2208020744 metadata/md5-cache/sys-block/seekwatcher-0.13
 2208020744 metadata/md5-cache/sys-block/targetcli-fb-2.1.54
-2208080111 metadata/md5-cache/sys-block/Manifest.gz
 2208080111 metadata/md5-cache/sys-block/arcconf-2.01.22270-r2
 2208080111 metadata/md5-cache/sys-block/arcconf-3.07.23971-r1
 2208080111 metadata/md5-cache/sys-block/arcconf-4.01.24763
@@ -56607,6 +56631,8 @@
 2208080111 metadata/md5-cache/sys-block/open-iscsi-2.1.4-r2
 2208080111 metadata/md5-cache/sys-block/open-iscsi-2.1.7
 2208062040 metadata/md5-cache/sys-block/tgt-1.0.84
+2208111410 metadata/md5-cache/sys-block/Manifest.gz
+2208111410 metadata/md5-cache/sys-block/flashbench-20120606
 1907151840 metadata/md5-cache/sys-boot/bootcreator-1.2
 1911100139 metadata/md5-cache/sys-boot/makebootfat-1.4
 1912110241 metadata/md5-cache/sys-boot/mbr-1.1.11-r1
@@ -56655,7 +56681,6 @@
 2207260815 metadata/md5-cache/sys-boot/grub-2.06-r1
 2207260815 metadata/md5-cache/sys-boot/grub-2.06-r2
 2207260815 metadata/md5-cache/sys-boot/lilo-24.2-r1
-2207260815 metadata/md5-cache/sys-boot/milo-2.4.18
 2207250144 metadata/md5-cache/sys-boot/shim-15.5-r1
 2207260815 metadata/md5-cache/sys-boot/silo-1.4.14_p20200602
 2207260815 metadata/md5-cache/sys-boot/unetbootin-700
@@ -56665,10 +56690,10 @@
 2207280540 metadata/md5-cache/sys-boot/efibootmgr-18
 2208020744 metadata/md5-cache/sys-boot/grub-9999
 2208020744 metadata/md5-cache/sys-boot/systemd-boot-249.9
-2208062040 metadata/md5-cache/sys-boot/Manifest.gz
 2208062040 metadata/md5-cache/sys-boot/plymouth-22.02.122-r1
 2208062040 metadata/md5-cache/sys-boot/plymouth-9999
-2005081846 metadata/md5-cache/sys-cluster/c3-4.0.1
+2208111440 metadata/md5-cache/sys-boot/Manifest.gz
+2208111440 metadata/md5-cache/sys-boot/milo-2.4.18
 2002230040 metadata/md5-cache/sys-cluster/fake-1.1.10
 2103132309 metadata/md5-cache/sys-cluster/libcircle-0.3.0
 1804020008 metadata/md5-cache/sys-cluster/pmix-2.1.1
@@ -56677,17 +56702,8 @@
 2203240726 metadata/md5-cache/sys-cluster/zookeepercli-1.0.12
 2203282310 metadata/md5-cache/sys-cluster/ganglia-web-3.7.3-r2
 2204150511 metadata/md5-cache/sys-cluster/k9scli-0.25.18
-2204150511 metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.8
-2204150511 metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.5
-2204150511 metadata/md5-cache/sys-cluster/kube-proxy-1.22.8
-2204150511 metadata/md5-cache/sys-cluster/kube-proxy-1.23.5
 2204150511 metadata/md5-cache/sys-cluster/kube-router-1.1.1
 2204150511 metadata/md5-cache/sys-cluster/kube-router-1.2.2
-2204150511 metadata/md5-cache/sys-cluster/kube-scheduler-1.22.8
-2204150511 metadata/md5-cache/sys-cluster/kube-scheduler-1.23.5
-2205131940 metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.0
-2205131940 metadata/md5-cache/sys-cluster/kube-proxy-1.24.0
-2205131940 metadata/md5-cache/sys-cluster/kube-scheduler-1.24.0
 2205150610 metadata/md5-cache/sys-cluster/kops-1.23.2
 2205160640 metadata/md5-cache/sys-cluster/kubeletctl-1.6
 2206010340 metadata/md5-cache/sys-cluster/kronosnet-1.23
@@ -56710,18 +56726,6 @@
 2207181923 metadata/md5-cache/sys-cluster/keepalived-2.2.7
 2207181923 metadata/md5-cache/sys-cluster/kronosnet-1.19
 2207181923 metadata/md5-cache/sys-cluster/kronosnet-1.19-r1
-2207181923 metadata/md5-cache/sys-cluster/kube-apiserver-1.22.8
-2207181923 metadata/md5-cache/sys-cluster/kube-apiserver-1.23.5
-2207181923 metadata/md5-cache/sys-cluster/kube-apiserver-1.24.0
-2207181923 metadata/md5-cache/sys-cluster/kubeadm-1.22.8
-2207181923 metadata/md5-cache/sys-cluster/kubeadm-1.23.5
-2207181923 metadata/md5-cache/sys-cluster/kubeadm-1.24.0
-2207181923 metadata/md5-cache/sys-cluster/kubectl-1.22.8
-2207181923 metadata/md5-cache/sys-cluster/kubectl-1.23.5
-2207181923 metadata/md5-cache/sys-cluster/kubectl-1.24.0
-2207181923 metadata/md5-cache/sys-cluster/kubelet-1.22.8
-2207181923 metadata/md5-cache/sys-cluster/kubelet-1.23.5
-2207181923 metadata/md5-cache/sys-cluster/kubelet-1.24.0
 2207181923 metadata/md5-cache/sys-cluster/libqb-2.0.1-r1
 2207181923 metadata/md5-cache/sys-cluster/libqb-2.0.4
 2207181923 metadata/md5-cache/sys-cluster/libquo-1.3.1-r1
@@ -56740,47 +56744,26 @@
 2207181923 metadata/md5-cache/sys-cluster/ucx-1.10.0_rc5
 2207181923 metadata/md5-cache/sys-cluster/vzctl-4.9.4
 2207192040 metadata/md5-cache/sys-cluster/kube-apiserver-1.22.10
-2207191810 metadata/md5-cache/sys-cluster/kube-apiserver-1.22.12
 2207192040 metadata/md5-cache/sys-cluster/kube-apiserver-1.23.7
-2207191840 metadata/md5-cache/sys-cluster/kube-apiserver-1.23.9
 2207192040 metadata/md5-cache/sys-cluster/kube-apiserver-1.24.1
-2207191940 metadata/md5-cache/sys-cluster/kube-apiserver-1.24.3
 2207192040 metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.10
-2207191810 metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.12
 2207192040 metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.7
-2207191840 metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.9
 2207192040 metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.1
-2207191940 metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.3
 2207192040 metadata/md5-cache/sys-cluster/kube-proxy-1.22.10
-2207191810 metadata/md5-cache/sys-cluster/kube-proxy-1.22.12
 2207192040 metadata/md5-cache/sys-cluster/kube-proxy-1.23.7
-2207191840 metadata/md5-cache/sys-cluster/kube-proxy-1.23.9
 2207192040 metadata/md5-cache/sys-cluster/kube-proxy-1.24.1
-2207191940 metadata/md5-cache/sys-cluster/kube-proxy-1.24.3
 2207192040 metadata/md5-cache/sys-cluster/kube-scheduler-1.22.10
-2207191810 metadata/md5-cache/sys-cluster/kube-scheduler-1.22.12
 2207192040 metadata/md5-cache/sys-cluster/kube-scheduler-1.23.7
-2207191840 metadata/md5-cache/sys-cluster/kube-scheduler-1.23.9
 2207192040 metadata/md5-cache/sys-cluster/kube-scheduler-1.24.1
-2207191940 metadata/md5-cache/sys-cluster/kube-scheduler-1.24.3
 2207192040 metadata/md5-cache/sys-cluster/kubeadm-1.22.10
-2207191810 metadata/md5-cache/sys-cluster/kubeadm-1.22.12
 2207192040 metadata/md5-cache/sys-cluster/kubeadm-1.23.7
-2207191840 metadata/md5-cache/sys-cluster/kubeadm-1.23.9
 2207192040 metadata/md5-cache/sys-cluster/kubeadm-1.24.1
-2207191940 metadata/md5-cache/sys-cluster/kubeadm-1.24.3
 2207192040 metadata/md5-cache/sys-cluster/kubectl-1.22.10
-2207191810 metadata/md5-cache/sys-cluster/kubectl-1.22.12
 2207192040 metadata/md5-cache/sys-cluster/kubectl-1.23.7
-2207191840 metadata/md5-cache/sys-cluster/kubectl-1.23.9
 2207192040 metadata/md5-cache/sys-cluster/kubectl-1.24.1
-2207191940 metadata/md5-cache/sys-cluster/kubectl-1.24.3
 2207192040 metadata/md5-cache/sys-cluster/kubelet-1.22.10
-2207191810 metadata/md5-cache/sys-cluster/kubelet-1.22.12
 2207192040 metadata/md5-cache/sys-cluster/kubelet-1.23.7
-2207191840 metadata/md5-cache/sys-cluster/kubelet-1.23.9
 2207192040 metadata/md5-cache/sys-cluster/kubelet-1.24.1
-2207191940 metadata/md5-cache/sys-cluster/kubelet-1.24.3
 2207231910 metadata/md5-cache/sys-cluster/lmod-8.5.6
 2207260815 metadata/md5-cache/sys-cluster/charm-6.8.2
 2207260815 metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-r2
@@ -56799,7 +56782,6 @@
 2207250144 metadata/md5-cache/sys-cluster/teleport-9999
 2207260815 metadata/md5-cache/sys-cluster/wulfware-2.6.0
 2207282340 metadata/md5-cache/sys-cluster/kube-router-1.5.0
-2208020744 metadata/md5-cache/sys-cluster/ceph-15.2.16
 2208020744 metadata/md5-cache/sys-cluster/ceph-16.2.10
 2208020744 metadata/md5-cache/sys-cluster/ceph-16.2.9-r1
 2208030840 metadata/md5-cache/sys-cluster/ceph-17.2.3
@@ -56824,7 +56806,6 @@
 2208020744 metadata/md5-cache/sys-cluster/rdma-core-38.0
 2208020744 metadata/md5-cache/sys-cluster/rdma-core-39.0
 2208020744 metadata/md5-cache/sys-cluster/rdma-core-9999
-2208100740 metadata/md5-cache/sys-cluster/Manifest.gz
 2208050840 metadata/md5-cache/sys-cluster/charliecloud-0.29
 2208050840 metadata/md5-cache/sys-cluster/charliecloud-9999
 2208052110 metadata/md5-cache/sys-cluster/cilium-cli-0.12.1
@@ -56838,11 +56819,35 @@
 2208080111 metadata/md5-cache/sys-cluster/k3s-1.24.3_p1
 2208080111 metadata/md5-cache/sys-cluster/knem-1.1.4
 2208080111 metadata/md5-cache/sys-cluster/knem-9999
-2208081610 metadata/md5-cache/sys-cluster/rdma-core-41.0
 2208100740 metadata/md5-cache/sys-cluster/rocm-k8s-device-plugin-0.3.0
-2208080111 metadata/md5-cache/sys-cluster/sanlock-3.8.2
 2208080111 metadata/md5-cache/sys-cluster/sanlock-3.8.4
 2208080111 metadata/md5-cache/sys-cluster/torque-6.0.4-r2
+2208111410 metadata/md5-cache/sys-cluster/Manifest.gz
+2208111410 metadata/md5-cache/sys-cluster/c3-4.0.1
+2208102340 metadata/md5-cache/sys-cluster/ceph-15.2.17
+2208102040 metadata/md5-cache/sys-cluster/kube-apiserver-1.22.12
+2208102040 metadata/md5-cache/sys-cluster/kube-apiserver-1.23.9
+2208102040 metadata/md5-cache/sys-cluster/kube-apiserver-1.24.3
+2208102040 metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.12
+2208102040 metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.9
+2208102040 metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.3
+2208102040 metadata/md5-cache/sys-cluster/kube-proxy-1.22.12
+2208102040 metadata/md5-cache/sys-cluster/kube-proxy-1.23.9
+2208102040 metadata/md5-cache/sys-cluster/kube-proxy-1.24.3
+2208102040 metadata/md5-cache/sys-cluster/kube-scheduler-1.22.12
+2208102040 metadata/md5-cache/sys-cluster/kube-scheduler-1.23.9
+2208102040 metadata/md5-cache/sys-cluster/kube-scheduler-1.24.3
+2208102040 metadata/md5-cache/sys-cluster/kubeadm-1.22.12
+2208102040 metadata/md5-cache/sys-cluster/kubeadm-1.23.9
+2208102040 metadata/md5-cache/sys-cluster/kubeadm-1.24.3
+2208102040 metadata/md5-cache/sys-cluster/kubectl-1.22.12
+2208102040 metadata/md5-cache/sys-cluster/kubectl-1.23.9
+2208102040 metadata/md5-cache/sys-cluster/kubectl-1.24.3
+2208102040 metadata/md5-cache/sys-cluster/kubelet-1.22.12
+2208102040 metadata/md5-cache/sys-cluster/kubelet-1.23.9
+2208102040 metadata/md5-cache/sys-cluster/kubelet-1.24.3
+2208101410 metadata/md5-cache/sys-cluster/rdma-core-41.0
+2208111410 metadata/md5-cache/sys-cluster/sanlock-3.8.2
 2104060140 metadata/md5-cache/sys-devel/autoconf-2.69-r5
 2105131939 metadata/md5-cache/sys-devel/autoconf-archive-2021.02.19
 2109100910 metadata/md5-cache/sys-devel/autoconf-archive-2021.02.19-r1
@@ -56940,7 +56945,6 @@
 2207270740 metadata/md5-cache/sys-devel/llvmgold-13-r2
 2207301310 metadata/md5-cache/sys-devel/autoconf-2.69-r6
 2207300810 metadata/md5-cache/sys-devel/autogen-5.18.16-r1
-2207301211 metadata/md5-cache/sys-devel/binutils-2.38-r2
 2207281210 metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1
 2207311040 metadata/md5-cache/sys-devel/bmake-20220726
 2207281340 metadata/md5-cache/sys-devel/mold-1.3.1
@@ -56959,9 +56963,6 @@
 2208020744 metadata/md5-cache/sys-devel/gdb-9999
 2208022310 metadata/md5-cache/sys-devel/llvmgold-14
 2208020744 metadata/md5-cache/sys-devel/rust-std-1.59.0
-2208092110 metadata/md5-cache/sys-devel/Manifest.gz
-2208080240 metadata/md5-cache/sys-devel/binutils-2.39
-2208072040 metadata/md5-cache/sys-devel/binutils-9999
 2208092110 metadata/md5-cache/sys-devel/clang-13.0.1
 2208092110 metadata/md5-cache/sys-devel/clang-14.0.6-r1
 2208092110 metadata/md5-cache/sys-devel/clang-15.0.0.9999
@@ -57006,11 +57007,6 @@
 2208071410 metadata/md5-cache/sys-devel/kgcc64-11.3.0
 2208071410 metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
 2208071410 metadata/md5-cache/sys-devel/kgcc64-9.4.0
-2208092110 metadata/md5-cache/sys-devel/lld-13.0.1
-2208092110 metadata/md5-cache/sys-devel/lld-14.0.6
-2208092110 metadata/md5-cache/sys-devel/lld-15.0.0.9999
-2208092110 metadata/md5-cache/sys-devel/lld-15.0.0_rc2
-2208092110 metadata/md5-cache/sys-devel/lld-16.0.0.9999
 2208092110 metadata/md5-cache/sys-devel/llvm-13.0.1
 2208092110 metadata/md5-cache/sys-devel/llvm-14.0.6-r2
 2208092110 metadata/md5-cache/sys-devel/llvm-15.0.0.9999
@@ -57024,6 +57020,16 @@
 2208052310 metadata/md5-cache/sys-devel/llvmgold-16
 2208082140 metadata/md5-cache/sys-devel/mold-1.4.0
 2208080111 metadata/md5-cache/sys-devel/pmake-1.111.3.3
+2208111410 metadata/md5-cache/sys-devel/Manifest.gz
+2208110010 metadata/md5-cache/sys-devel/binutils-2.38-r2
+2208110010 metadata/md5-cache/sys-devel/binutils-2.39
+2208110010 metadata/md5-cache/sys-devel/binutils-9999
+2208101110 metadata/md5-cache/sys-devel/gdb-12.1-r2
+2208111410 metadata/md5-cache/sys-devel/lld-13.0.1
+2208111410 metadata/md5-cache/sys-devel/lld-14.0.6
+2208111410 metadata/md5-cache/sys-devel/lld-15.0.0.9999
+2208111410 metadata/md5-cache/sys-devel/lld-15.0.0_rc2
+2208111410 metadata/md5-cache/sys-devel/lld-16.0.0.9999
 2207181923 metadata/md5-cache/sys-fabric/Manifest.gz
 2207181923 metadata/md5-cache/sys-fabric/mstflint-4.18.0_p1-r1
 2207181923 metadata/md5-cache/sys-fabric/mstflint-4.20.0_p1
@@ -57074,21 +57080,17 @@
 2208020744 metadata/md5-cache/sys-firmware/seabios-1.14.0
 2208020744 metadata/md5-cache/sys-firmware/seabios-1.14.0-r1
 2208020744 metadata/md5-cache/sys-firmware/seabios-1.14.0-r2
-2208100010 metadata/md5-cache/sys-firmware/Manifest.gz
-2208080111 metadata/md5-cache/sys-firmware/intel-microcode-20201112_p20201116-r1
-2208080111 metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210221
-2208080111 metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210514
-2208080111 metadata/md5-cache/sys-firmware/intel-microcode-20210608_p20210608
 2208080111 metadata/md5-cache/sys-firmware/intel-microcode-20210608_p20210830
 2208080111 metadata/md5-cache/sys-firmware/intel-microcode-20220207_p20220207
 2208080111 metadata/md5-cache/sys-firmware/intel-microcode-20220419_p20220421
 2208080111 metadata/md5-cache/sys-firmware/intel-microcode-20220510_p20220508
-2208100010 metadata/md5-cache/sys-firmware/intel-microcode-20220809_p20220809
 2208080111 metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p2
 2208080111 metadata/md5-cache/sys-firmware/iwl3160-ucode-0.16.242414-r1
 2208080111 metadata/md5-cache/sys-firmware/iwl7260-ucode-0.16.242414-r1
 2208080111 metadata/md5-cache/sys-firmware/iwl8000-ucode-16.242414.0
 2208080111 metadata/md5-cache/sys-firmware/midisport-firmware-1.2-r1
+2208102040 metadata/md5-cache/sys-firmware/Manifest.gz
+2208102010 metadata/md5-cache/sys-firmware/intel-microcode-20220809_p20220809
 1907071039 metadata/md5-cache/sys-fs/aufs-headers-4.14_p20190603
 1805272138 metadata/md5-cache/sys-fs/autorun-3.17
 2102161539 metadata/md5-cache/sys-fs/avfs-1.1.3
@@ -57339,7 +57341,6 @@
 2208032310 metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.135
 2208032340 metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.59
 2208032310 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.209
-2208080111 metadata/md5-cache/sys-kernel/Manifest.gz
 2208080111 metadata/md5-cache/sys-kernel/cryptodev-1.11
 2208080111 metadata/md5-cache/sys-kernel/cryptodev-1.12
 2208080111 metadata/md5-cache/sys-kernel/cryptodev-9999
@@ -57423,15 +57424,16 @@
 2208051110 metadata/md5-cache/sys-kernel/vanilla-kernel-5.18.16
 2208051110 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.203
 2208071310 metadata/md5-cache/sys-kernel/vanilla-sources-4.14.290
-2208071310 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.254
 2208071310 metadata/md5-cache/sys-kernel/vanilla-sources-4.9.325
-2208071310 metadata/md5-cache/sys-kernel/vanilla-sources-5.10.135
-2208071310 metadata/md5-cache/sys-kernel/vanilla-sources-5.15.59
-2208071310 metadata/md5-cache/sys-kernel/vanilla-sources-5.18.16
-2208071310 metadata/md5-cache/sys-kernel/vanilla-sources-5.19.0
-2208071310 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.209
 2208071310 metadata/md5-cache/sys-kernel/zen-sources-5.15.10
 2208072340 metadata/md5-cache/sys-kernel/zen-sources-5.18.16
+2208111540 metadata/md5-cache/sys-kernel/Manifest.gz
+2208111540 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.255
+2208111540 metadata/md5-cache/sys-kernel/vanilla-sources-5.10.136
+2208111540 metadata/md5-cache/sys-kernel/vanilla-sources-5.15.60
+2208111540 metadata/md5-cache/sys-kernel/vanilla-sources-5.18.17
+2208111540 metadata/md5-cache/sys-kernel/vanilla-sources-5.19.1
+2208111540 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.210
 2106100309 metadata/md5-cache/sys-libs/fortify-headers-1.1
 1908101709 metadata/md5-cache/sys-libs/libservicelog-1.1.18
 2107081310 metadata/md5-cache/sys-libs/lwp-2.8
@@ -57604,43 +57606,44 @@
 2208020744 metadata/md5-cache/sys-libs/tevent-0.12.0
 2208020744 metadata/md5-cache/sys-libs/tevent-0.12.1
 2208040240 metadata/md5-cache/sys-libs/uid_wrapper-1.2.9
-2208092110 metadata/md5-cache/sys-libs/Manifest.gz
-2208092110 metadata/md5-cache/sys-libs/compiler-rt-13.0.1
-2208092110 metadata/md5-cache/sys-libs/compiler-rt-14.0.6
-2208092110 metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
-2208092110 metadata/md5-cache/sys-libs/compiler-rt-15.0.0.9999
-2208092110 metadata/md5-cache/sys-libs/compiler-rt-15.0.0_rc2
-2208092110 metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999
-2208092110 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.1
-2208092110 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
-2208092110 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.0.9999
-2208092110 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.0_rc2
-2208092110 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0.9999
 2208071110 metadata/md5-cache/sys-libs/glibc-2.36
 2208080111 metadata/md5-cache/sys-libs/gpm-1.20.7-r4
 2208080111 metadata/md5-cache/sys-libs/gpm-1.20.7-r5
-2208092110 metadata/md5-cache/sys-libs/libcxx-13.0.1
-2208092110 metadata/md5-cache/sys-libs/libcxx-14.0.6
-2208092110 metadata/md5-cache/sys-libs/libcxx-15.0.0.9999
-2208092110 metadata/md5-cache/sys-libs/libcxx-15.0.0_rc2
-2208092110 metadata/md5-cache/sys-libs/libcxx-16.0.0.9999
-2208092110 metadata/md5-cache/sys-libs/libcxxabi-13.0.1
-2208092110 metadata/md5-cache/sys-libs/libcxxabi-14.0.6
-2208092110 metadata/md5-cache/sys-libs/libcxxabi-15.0.0.9999
-2208092110 metadata/md5-cache/sys-libs/libcxxabi-15.0.0_rc2
-2208092110 metadata/md5-cache/sys-libs/libcxxabi-16.0.0.9999
-2208092110 metadata/md5-cache/sys-libs/libomp-13.0.1
-2208092110 metadata/md5-cache/sys-libs/libomp-14.0.6-r1
-2208092110 metadata/md5-cache/sys-libs/libomp-15.0.0.9999
-2208092110 metadata/md5-cache/sys-libs/libomp-15.0.0_rc2
-2208092110 metadata/md5-cache/sys-libs/libomp-16.0.0.9999
 2208050910 metadata/md5-cache/sys-libs/libunwind-1.6.2-r1
-2208092110 metadata/md5-cache/sys-libs/llvm-libunwind-13.0.1
-2208092110 metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6
-2208092110 metadata/md5-cache/sys-libs/llvm-libunwind-15.0.0.9999
-2208092110 metadata/md5-cache/sys-libs/llvm-libunwind-15.0.0_rc2
-2208092110 metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0.9999
 2208061810 metadata/md5-cache/sys-libs/musl-1.2.3
+2208111410 metadata/md5-cache/sys-libs/Manifest.gz
+2208101110 metadata/md5-cache/sys-libs/binutils-libs-2.39
+2208111410 metadata/md5-cache/sys-libs/compiler-rt-13.0.1
+2208111410 metadata/md5-cache/sys-libs/compiler-rt-14.0.6
+2208111410 metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
+2208111410 metadata/md5-cache/sys-libs/compiler-rt-15.0.0.9999
+2208111410 metadata/md5-cache/sys-libs/compiler-rt-15.0.0_rc2
+2208111410 metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999
+2208111410 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.1
+2208111410 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
+2208111410 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.0.9999
+2208111410 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.0_rc2
+2208111410 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0.9999
+2208111410 metadata/md5-cache/sys-libs/libcxx-13.0.1
+2208111410 metadata/md5-cache/sys-libs/libcxx-14.0.6
+2208111410 metadata/md5-cache/sys-libs/libcxx-15.0.0.9999
+2208111410 metadata/md5-cache/sys-libs/libcxx-15.0.0_rc2
+2208111410 metadata/md5-cache/sys-libs/libcxx-16.0.0.9999
+2208111410 metadata/md5-cache/sys-libs/libcxxabi-13.0.1
+2208111410 metadata/md5-cache/sys-libs/libcxxabi-14.0.6
+2208111410 metadata/md5-cache/sys-libs/libcxxabi-15.0.0.9999
+2208111410 metadata/md5-cache/sys-libs/libcxxabi-15.0.0_rc2
+2208111410 metadata/md5-cache/sys-libs/libcxxabi-16.0.0.9999
+2208111410 metadata/md5-cache/sys-libs/libomp-13.0.1
+2208111410 metadata/md5-cache/sys-libs/libomp-14.0.6-r1
+2208111410 metadata/md5-cache/sys-libs/libomp-15.0.0.9999
+2208111410 metadata/md5-cache/sys-libs/libomp-15.0.0_rc2
+2208111410 metadata/md5-cache/sys-libs/libomp-16.0.0.9999
+2208111410 metadata/md5-cache/sys-libs/llvm-libunwind-13.0.1
+2208111410 metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6
+2208111410 metadata/md5-cache/sys-libs/llvm-libunwind-15.0.0.9999
+2208111410 metadata/md5-cache/sys-libs/llvm-libunwind-15.0.0_rc2
+2208111410 metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0.9999
 2110201309 metadata/md5-cache/sys-power/acpi-1.7-r1
 2104252209 metadata/md5-cache/sys-power/acpitool-0.5.1-r2
 1901132309 metadata/md5-cache/sys-power/hibernate-script-2.0-r6
@@ -57670,13 +57673,11 @@
 2207260815 metadata/md5-cache/sys-power/pmtools-20110323-r1
 2208020744 metadata/md5-cache/sys-power/acpilight-1.2-r4
 2208020744 metadata/md5-cache/sys-power/switcheroo-control-2.4
-2208020744 metadata/md5-cache/sys-power/switcheroo-control-2.6
 2208011410 metadata/md5-cache/sys-power/thermald-2.5
 2208020744 metadata/md5-cache/sys-power/upower-0.99.17
 2208020744 metadata/md5-cache/sys-power/upower-0.99.18
 2208020744 metadata/md5-cache/sys-power/upower-0.99.19
 2208020744 metadata/md5-cache/sys-power/upower-0.99.20
-2208080111 metadata/md5-cache/sys-power/Manifest.gz
 2208080111 metadata/md5-cache/sys-power/acpi_call-1.2.2
 2208080111 metadata/md5-cache/sys-power/acpi_call-9999
 2208080111 metadata/md5-cache/sys-power/acpid-2.0.33
@@ -57687,6 +57688,8 @@
 2208080111 metadata/md5-cache/sys-power/powernowd-1.00-r5
 2208080111 metadata/md5-cache/sys-power/powertop-2.14
 2208080111 metadata/md5-cache/sys-power/powertop-9999
+2208111310 metadata/md5-cache/sys-power/Manifest.gz
+2208111310 metadata/md5-cache/sys-power/switcheroo-control-2.6
 2005291309 metadata/md5-cache/sys-process/minicoredumper-2.0.1-r1
 2002112051 metadata/md5-cache/sys-process/supervise-scripts-4.0-r1
 2009171809 metadata/md5-cache/sys-process/xjobs-20200726
@@ -58151,7 +58154,6 @@
 2207181923 metadata/md5-cache/www-apps/hugo-0.101.0
 2207181923 metadata/md5-cache/www-apps/hugo-0.99.1
 2207181923 metadata/md5-cache/www-apps/icingaweb2-2.10.3
-2207181923 metadata/md5-cache/www-apps/icingaweb2-9999
 2207181923 metadata/md5-cache/www-apps/icingaweb2-module-director-1.8.1
 2207181923 metadata/md5-cache/www-apps/icingaweb2-module-director-9999
 2207181711 metadata/md5-cache/www-apps/ikiwiki-3.20190228-r1
@@ -58216,7 +58218,6 @@
 2208020744 metadata/md5-cache/www-apps/blohg-9999
 2208020744 metadata/md5-cache/www-apps/cgit-1.2.3-r200
 2208020744 metadata/md5-cache/www-apps/cgit-1.2.3-r201
-2208010640 metadata/md5-cache/www-apps/icingaweb2-2.11.0
 2208020410 metadata/md5-cache/www-apps/jellyfin-10.8.3
 2208020744 metadata/md5-cache/www-apps/klaus-1.5.2
 2208020744 metadata/md5-cache/www-apps/nikola-8.2.2-r1
@@ -58231,9 +58232,7 @@
 2208020744 metadata/md5-cache/www-apps/roundup-2.1.0-r1
 2208042010 metadata/md5-cache/www-apps/tt-rss-99999999
 2208020744 metadata/md5-cache/www-apps/xpra-html5-5.0
-2208100910 metadata/md5-cache/www-apps/Manifest.gz
 2208061210 metadata/md5-cache/www-apps/element-1.11.2
-2208090440 metadata/md5-cache/www-apps/icingaweb2-2.11.1
 2208090440 metadata/md5-cache/www-apps/icingaweb2-module-director-1.9.1
 2208090440 metadata/md5-cache/www-apps/icingaweb2-module-incubator-0.17.0
 2208091110 metadata/md5-cache/www-apps/mediawiki-1.37.4
@@ -58241,6 +58240,12 @@
 2208090010 metadata/md5-cache/www-apps/nextcloud-23.0.7
 2208090010 metadata/md5-cache/www-apps/nextcloud-24.0.3
 2208091640 metadata/md5-cache/www-apps/sonarr-3.0.9.1549
+2208110340 metadata/md5-cache/www-apps/Manifest.gz
+2208110340 metadata/md5-cache/www-apps/icingaweb2-2.11.0
+2208110340 metadata/md5-cache/www-apps/icingaweb2-2.11.1
+2208110340 metadata/md5-cache/www-apps/icingaweb2-9999
+2208101610 metadata/md5-cache/www-apps/sonarr-3.0.9.1549-r1
+2208101640 metadata/md5-cache/www-apps/sonarr-3.0.9.1549-r2
 1703072138 metadata/md5-cache/www-client/fetch-1.0-r3
 2104121139 metadata/md5-cache/www-client/fetch-1.0-r4
 2107180040 metadata/md5-cache/www-client/lynx-2.9.0_pre6-r2
@@ -58279,9 +58284,6 @@
 2208020744 metadata/md5-cache/www-client/qutebrowser-2.5.2
 2208031710 metadata/md5-cache/www-client/qutebrowser-3.0.0_pre9999
 2208020744 metadata/md5-cache/www-client/qutebrowser-9999
-2208020744 metadata/md5-cache/www-client/seamonkey-2.53.12
-2208020744 metadata/md5-cache/www-client/seamonkey-2.53.13
-2208100910 metadata/md5-cache/www-client/Manifest.gz
 2208080111 metadata/md5-cache/www-client/chromium-103.0.5060.114
 2208080111 metadata/md5-cache/www-client/chromium-103.0.5060.134
 2208080111 metadata/md5-cache/www-client/chromium-104.0.5112.12
@@ -58293,7 +58295,6 @@
 2208080111 metadata/md5-cache/www-client/firefox-102.0.1
 2208080111 metadata/md5-cache/www-client/firefox-103.0
 2208080111 metadata/md5-cache/www-client/firefox-103.0.1
-2208091240 metadata/md5-cache/www-client/firefox-103.0.2
 2208080111 metadata/md5-cache/www-client/firefox-91.11.0
 2208080111 metadata/md5-cache/www-client/firefox-91.12.0
 2208090940 metadata/md5-cache/www-client/firefox-bin-103.0.2
@@ -58320,6 +58321,10 @@
 2208080111 metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2753.19
 2208091140 metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2753.21
 2208100910 metadata/md5-cache/www-client/w3m-0.5.3_p20220429
+2208111440 metadata/md5-cache/www-client/Manifest.gz
+2208102110 metadata/md5-cache/www-client/firefox-103.0.2
+2208111440 metadata/md5-cache/www-client/seamonkey-2.53.12
+2208111440 metadata/md5-cache/www-client/seamonkey-2.53.13
 2104161439 metadata/md5-cache/www-misc/awstats-7.8-r1
 1910071209 metadata/md5-cache/www-misc/profile-sync-daemon-5.75
 1910090839 metadata/md5-cache/www-misc/profile-sync-daemon-6.35
@@ -58646,7 +58651,6 @@
 2207260815 metadata/md5-cache/x11-libs/libXau-1.0.9-r1
 2207260815 metadata/md5-cache/x11-libs/libXaw-1.0.14
 2207260815 metadata/md5-cache/x11-libs/libXaw3d-1.6.3
-2207260815 metadata/md5-cache/x11-libs/libXaw3dXft-1.6.2h
 2207260815 metadata/md5-cache/x11-libs/libXcomposite-0.4.5
 2207260815 metadata/md5-cache/x11-libs/libXcursor-1.2.1
 2207260815 metadata/md5-cache/x11-libs/libXdamage-1.1.5
@@ -58732,7 +58736,6 @@
 2208020744 metadata/md5-cache/x11-libs/libva-2.15.0
 2208020744 metadata/md5-cache/x11-libs/libva-9999
 2208020512 metadata/md5-cache/x11-libs/libva-intel-media-driver-22.5.1
-2208020744 metadata/md5-cache/x11-libs/libvdpau-1.5
 2208020744 metadata/md5-cache/x11-libs/libwnck-40.1
 2208020744 metadata/md5-cache/x11-libs/libxcb-1.15
 2208020744 metadata/md5-cache/x11-libs/libxcb-1.15-r1
@@ -58746,12 +58749,14 @@
 2208020710 metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1
 2208020744 metadata/md5-cache/x11-libs/vte-0.68.0
 2208020744 metadata/md5-cache/x11-libs/xapp-2.2.8
-2208070840 metadata/md5-cache/x11-libs/Manifest.gz
 2208070840 metadata/md5-cache/x11-libs/pango-1.50.8
+2208111440 metadata/md5-cache/x11-libs/Manifest.gz
+2208102310 metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.9
+2208101640 metadata/md5-cache/x11-libs/libXaw3dXft-1.6.2h
+2208111440 metadata/md5-cache/x11-libs/libvdpau-1.5
 1703221038 metadata/md5-cache/x11-misc/3dfm-1.0-r1
 1805220439 metadata/md5-cache/x11-misc/autocutsel-0.10.0
 1910111911 metadata/md5-cache/x11-misc/bblaunch-0.0.3
-2103271939 metadata/md5-cache/x11-misc/devilspie-0.23-r2
 2002230040 metadata/md5-cache/x11-misc/dxpc-3.9.2-r2
 2103160039 metadata/md5-cache/x11-misc/efax-gtk-3.2.15
 1702282335 metadata/md5-cache/x11-misc/ftmenu-0.4.0-r1
@@ -58780,7 +58785,6 @@
 2004261039 metadata/md5-cache/x11-misc/urxvt-perls-2.3-r1
 2104200509 metadata/md5-cache/x11-misc/whaw-0.2
 1703211738 metadata/md5-cache/x11-misc/wininfo-0.7-r1
-2109211710 metadata/md5-cache/x11-misc/wmctrl-1.07-r2
 2002112051 metadata/md5-cache/x11-misc/x2vnc-1.7.2-r1
 2012030239 metadata/md5-cache/x11-misc/xautomation-1.09-r1
 2005270839 metadata/md5-cache/x11-misc/xbindkeys-1.8.6-r1
@@ -58928,7 +58932,6 @@
 2207181923 metadata/md5-cache/x11-misc/unclutter-8-r4
 2207181923 metadata/md5-cache/x11-misc/unclutter-xfixes-1.6
 2207181923 metadata/md5-cache/x11-misc/urxvtconfig-1.0-r1
-2207181923 metadata/md5-cache/x11-misc/vdpauinfo-1.5
 2207181923 metadata/md5-cache/x11-misc/viewglob-2.0.4-r1
 2207181923 metadata/md5-cache/x11-misc/vnc2swf-0.5.0-r1
 2207181923 metadata/md5-cache/x11-misc/vym-2.7.1
@@ -59136,12 +59139,15 @@
 2208020744 metadata/md5-cache/x11-misc/zim-0.74.1
 2208020744 metadata/md5-cache/x11-misc/zim-0.74.2
 2208020744 metadata/md5-cache/x11-misc/zim-0.74.3
-2208091610 metadata/md5-cache/x11-misc/Manifest.gz
 2208091610 metadata/md5-cache/x11-misc/lightdm-1.32.0
 2208080111 metadata/md5-cache/x11-misc/read-edid-3.0.2-r1
 2208080111 metadata/md5-cache/x11-misc/sddm-0.18.1-r6
 2208080111 metadata/md5-cache/x11-misc/spacefm-1.0.6-r1
 2208080111 metadata/md5-cache/x11-misc/spacefm-9999
+2208111440 metadata/md5-cache/x11-misc/Manifest.gz
+2208111440 metadata/md5-cache/x11-misc/devilspie-0.23-r2
+2208111440 metadata/md5-cache/x11-misc/vdpauinfo-1.5-r1
+2208111440 metadata/md5-cache/x11-misc/wmctrl-1.07-r3
 1908180209 metadata/md5-cache/x11-plugins/e16-epplets-0.16
 1905230009 metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
 2104120442 metadata/md5-cache/x11-plugins/guifications-2.16
@@ -59172,7 +59178,6 @@
 2006151909 metadata/md5-cache/x11-plugins/wmnd-0.4.18
 2002030239 metadata/md5-cache/x11-plugins/wmping-0.2.1-r1
 2002250109 metadata/md5-cache/x11-plugins/wmweather+-2.17
-2001292139 metadata/md5-cache/x11-plugins/wmwork-0.2.5-r1
 2009240139 metadata/md5-cache/x11-plugins/wmxres-1.4
 2201140310 metadata/md5-cache/x11-plugins/wmstickynotes-0.7
 2202150840 metadata/md5-cache/x11-plugins/wmmp-0.10.0-r1
@@ -59281,7 +59286,6 @@
 2207181923 metadata/md5-cache/x11-plugins/wmbio-1.02
 2207181923 metadata/md5-cache/x11-plugins/wmcalc-0.6-r1
 2207181923 metadata/md5-cache/x11-plugins/wmcalendar-0.5.2-r2
-2207181923 metadata/md5-cache/x11-plugins/wmcdplay-1.1-r1
 2207181923 metadata/md5-cache/x11-plugins/wmcliphist-2.1-r2
 2207181923 metadata/md5-cache/x11-plugins/wmclock-1.0.16-r1
 2207181923 metadata/md5-cache/x11-plugins/wmclockmon-0.8.1-r1
@@ -59344,8 +59348,10 @@
 2207250144 metadata/md5-cache/x11-plugins/wmtop-0.85
 2208011310 metadata/md5-cache/x11-plugins/e16-epplets-0.17
 2208020744 metadata/md5-cache/x11-plugins/enigmail-2.2.4
-2208100010 metadata/md5-cache/x11-plugins/Manifest.gz
 2208100010 metadata/md5-cache/x11-plugins/wmsysmon-0.8.0
+2208111410 metadata/md5-cache/x11-plugins/Manifest.gz
+2208111410 metadata/md5-cache/x11-plugins/wmcdplay-1.1-r1
+2208111410 metadata/md5-cache/x11-plugins/wmwork-0.2.5-r1
 2201091240 metadata/md5-cache/x11-terms/st-terminfo-0.8.5
 2203240726 metadata/md5-cache/x11-terms/kitty-terminfo-9999
 2203240726 metadata/md5-cache/x11-terms/st-terminfo-9999
@@ -59377,12 +59383,10 @@
 2207260815 metadata/md5-cache/x11-terms/tilda-1.5.4
 2207260815 metadata/md5-cache/x11-terms/xterm-372
 2207262210 metadata/md5-cache/x11-terms/xfce4-terminal-1.0.4
-2208021910 metadata/md5-cache/x11-terms/Manifest.gz
 2208020744 metadata/md5-cache/x11-terms/alacritty-0.10.1
 2208020744 metadata/md5-cache/x11-terms/alacritty-0.9.0-r1
 2208020744 metadata/md5-cache/x11-terms/alacritty-9999
 2208020744 metadata/md5-cache/x11-terms/gnome-terminal-3.44.1
-2208020744 metadata/md5-cache/x11-terms/guake-3.8.5
 2208020744 metadata/md5-cache/x11-terms/kitty-0.25.2
 2208020744 metadata/md5-cache/x11-terms/kitty-9999
 2208021910 metadata/md5-cache/x11-terms/mlterm-3.9.2
@@ -59391,6 +59395,8 @@
 2208020744 metadata/md5-cache/x11-terms/terminology-1.11.0
 2208020744 metadata/md5-cache/x11-terms/terminology-1.12.1-r1
 2208020744 metadata/md5-cache/x11-terms/zutty-0.12
+2208111110 metadata/md5-cache/x11-terms/Manifest.gz
+2208111110 metadata/md5-cache/x11-terms/guake-3.8.5-r1
 2104262239 metadata/md5-cache/x11-themes/blueglass-xcursors-0.4-r1
 2107020739 metadata/md5-cache/x11-themes/comix-xcursors-0.9.2
 2012311940 metadata/md5-cache/x11-themes/commonbox-styles-0.6
@@ -59540,8 +59546,6 @@
 2207250144 metadata/md5-cache/x11-themes/vertex-theme-20170128-r1
 2207260815 metadata/md5-cache/x11-themes/xcursor-themes-1.0.6-r1
 2207270840 metadata/md5-cache/x11-themes/mate-icon-theme-1.26.0
-2207310240 metadata/md5-cache/x11-themes/gentoo-xcursors-0.3.2-r3
-2208022110 metadata/md5-cache/x11-themes/Manifest.gz
 2208020744 metadata/md5-cache/x11-themes/adwaita-icon-theme-42.0_p2
 2208020744 metadata/md5-cache/x11-themes/arc-theme-20210412
 2208020744 metadata/md5-cache/x11-themes/arc-theme-20220223
@@ -59554,6 +59558,8 @@
 2208022110 metadata/md5-cache/x11-themes/papirus-icon-theme-20220606
 2208022110 metadata/md5-cache/x11-themes/papirus-icon-theme-20220710
 2208020744 metadata/md5-cache/x11-themes/zuki-themes-4.0
+2208111410 metadata/md5-cache/x11-themes/Manifest.gz
+2208111410 metadata/md5-cache/x11-themes/gentoo-xcursors-0.3.2-r3
 2011261339 metadata/md5-cache/x11-wm/oroborus-2.0.20-r1
 2204011845 metadata/md5-cache/x11-wm/jwm-2.3.7
 2207132140 metadata/md5-cache/x11-wm/page-1.9.10
@@ -59638,7 +59644,6 @@
 2208020744 metadata/md5-cache/x11-wm/i3-gaps-4.20
 2208020744 metadata/md5-cache/x11-wm/i3-gaps-4.20.1
 2208020710 metadata/md5-cache/x11-wm/muffin-5.2.0
-2208020744 metadata/md5-cache/x11-wm/mutter-42.2
 2208020744 metadata/md5-cache/x11-wm/openbox-3.6.1-r3
 2208020744 metadata/md5-cache/x11-wm/openbox-9999
 2208020744 metadata/md5-cache/x11-wm/qtile-0.16.1
@@ -59648,10 +59653,11 @@
 2208020744 metadata/md5-cache/x11-wm/xpra-4.3.3
 2208020744 metadata/md5-cache/x11-wm/xpra-4.3.4
 2208020744 metadata/md5-cache/x11-wm/xpra-9999
-2208100810 metadata/md5-cache/x11-wm/Manifest.gz
 2208050810 metadata/md5-cache/x11-wm/fvwm-2.6.9-r1
 2208100810 metadata/md5-cache/x11-wm/jwm-2.4.2
-2208070840 metadata/md5-cache/x11-wm/mutter-42.3
+2208111410 metadata/md5-cache/x11-wm/Manifest.gz
+2208111410 metadata/md5-cache/x11-wm/mutter-42.2
+2208111410 metadata/md5-cache/x11-wm/mutter-42.3
 2107251109 metadata/md5-cache/xfce-base/xfce4-meta-4.16-r2
 2203240726 metadata/md5-cache/xfce-base/garcon-0.8.0
 2203240726 metadata/md5-cache/xfce-base/xfce4-appfinder-4.16.1
@@ -59896,7 +59902,6 @@
 2204291439 metadata/md5-cache/sec-keys/openpgp-keys-tor-20220216
 2204291439 metadata/md5-cache/sec-keys/openpgp-keys-unbound-20220316
 2204291439 metadata/md5-cache/sec-keys/openpgp-keys-unrealircd-20220407
-2204291439 metadata/md5-cache/sec-keys/openpgp-keys-voikko-20201013
 2204291439 metadata/md5-cache/sec-keys/openpgp-keys-waynedavison-20220329
 2204291439 metadata/md5-cache/sec-keys/openpgp-keys-weechat-20220316
 2204291439 metadata/md5-cache/sec-keys/openpgp-keys-wget-20220407
@@ -59917,7 +59922,8 @@
 2208020744 metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20220711
 2208020744 metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20220718
 2208020744 metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-99999999
-2208092110 metadata/md5-cache/sec-keys/Manifest.gz
 2208060940 metadata/md5-cache/sec-keys/openpgp-keys-aacid-20220603
 2208092110 metadata/md5-cache/sec-keys/openpgp-keys-llvm-15
-2208100940 metadata/md5-cache/Manifest.gz
+2208111440 metadata/md5-cache/sec-keys/Manifest.gz
+2208111440 metadata/md5-cache/sec-keys/openpgp-keys-voikko-20201013
+2208111540 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 60fdaf0d0103..c63789582179 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Aug 2022 07:00:01 +0000
+Thu, 11 Aug 2022 13:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 400695bd14af..edd75bf50c0a 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-e793c8eeba9ada4be595b43295e2289b348eb66e 1660112303 2022-08-10T06:18:23+00:00
+e11ae782cab090dd8ad7512d507f436bdeb19d22 1660220955 2022-08-11T12:29:15+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3a95f5a9645f..290da13b2d05 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1660113601 Wed 10 Aug 2022 06:40:01 AM UTC
+1660221601 Thu 11 Aug 2022 12:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index a03a3a561952..5782a557b641 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Aug 2022 06:39:56 +0000
+Thu, 11 Aug 2022 12:40:04 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index d71e2190d052..234f17a7ebbf 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest
index d735235b6fbd..845dd7daa60a 100644
--- a/net-analyzer/openbsd-netcat/Manifest
+++ b/net-analyzer/openbsd-netcat/Manifest
@@ -7,6 +7,6 @@ DIST netcat-openbsd_1.190.orig.tar.gz 22384 BLAKE2B c3e83106f53a0214f71c805b1dfe
 DIST netcat-openbsd_1.195-2.debian.tar.xz 35984 BLAKE2B eedac24eedc243ad1d58576be76f4f98392e1f455863fa3cdc06bde2714612819b7dfa98dd45c1739a65680469460410f5e4b2f4144f4c24fea04b59dda4d0da SHA512 2a5cc6d04112fdde007be4b9adb3aee44060570c0cb2ae0e33e54af3d37c0b2ff4d6c96edf1f16047365106c7c3720195b38417af3c332226c9be81d49caa552
 DIST netcat-openbsd_1.195.orig.tar.gz 22480 BLAKE2B 53c750c168d7ea5dc2ca653598e42700e2b3ee888d946a09503a22fa3bcbc2c73658f38787314bef628d609ad370223f6889b7019760bf51817f73fc570e1dcc SHA512 ea95cda028f2759835ea8832db0174c178b002d5a917f4c51594445a5377a30d6114ac261071eea98d3d0b60ae1ec72102609db1625dbc5a6e57c67e28d2ff51
 EBUILD openbsd-netcat-1.190.ebuild 1518 BLAKE2B 901b4c5b0f4c58c6b542667e0740d3058a7e22003805a3520555f7f1b843d5e1338a47db60900db527acc47cb91c3b99d292e34a768fa75dcb44a7f3fc229f2b SHA512 1c26caaa2c5978ddb0348e1c6c2e2855736f8df3517020930ee3dfeb6e24edd08b88e665258a80aeb38d845b6aac5bf20c085edea6450e600c1027a1e836ccd7
-EBUILD openbsd-netcat-1.195-r1.ebuild 1730 BLAKE2B 4b9df7b86c4231f3f7b6fe0a87ae7ed2ea0220a60ff64496bd392ed2a78f88ca84ff5d7e4d51a578fbc205619d332c5443885582deaa5c6f32604ebcad007334 SHA512 93d77dc56c65ad792cc963d6c0edf0ca8c2684356a8624231178fde8c5d08e1cdb814c537bccbf8a8b156952c4c2b2bac7ac0ef1f6aca830cd8a394f7fd07158
+EBUILD openbsd-netcat-1.195-r1.ebuild 1728 BLAKE2B a1776606b68c34fce2b374f92249bac99ab522d0b53f166ab3d9480d19dc0e70ab4ef5aad4a40c78c74b1c9ea5756c64c9d0f14dfef1c21842e44fe54a47f3a2 SHA512 eef4cc16181b12f0ec170efd17aee003a75c9edfd1135dc9be879a3eff0abc0185ae73a81d5e11da250a35d518a0762863196d620f8fddf64dad1540e11cd2fe
 EBUILD openbsd-netcat-1.195.ebuild 1524 BLAKE2B e0d11d336a9a2d3ab6bd67c5eb30106a0a58b80f4f0c656853f6f1826167dfc94c62f291b5029a4cf5707ea61547c458916bbfc40f5fbb767ac0f8028bad237e SHA512 2b76e272f75e54a52a30b1debda6aaab7df03be3f054cf3d17234c04bdd881a720c9c74f1c2dde61c1da9c445c2826124d735b909f8d5f2ccb159c6f30b60f3f
 MISC metadata.xml 245 BLAKE2B ac72ef778f5d556deab2ebcf80116f69791bc0590fea00ad21d361df28a3d1b96fb42db2de7f7545ad6f38137b9c26510efa2a2a251ca5646f77476dfb27d339 SHA512 ad4d8a54ad37031eaf3e1f1a06d53b85f504bdeeda433eee0a6101c2ccbc5b8da2d33725c9b0dfd013c3c5ad218171f6010722f443f81124086bc8c54a216b06
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
index 10daf4381959..170292950a45 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 860d329e3082..bd20214624e6 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 4dae2d694d97..6e5cab4c8689 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -6,5 +6,5 @@ AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8
 DIST dnsmasq-2.85.tar.xz 518316 BLAKE2B b7c081132c65d67b65f797bdbc603930c1509717bc1b5209b12f72fa3f01b4bae2f26a5387f95ef20317cd3d60e097c0b8bef5e019a35013f3ed2acce9fe9e89 SHA512 8beefe76b46f7d561f40d0900ba68b260a199cb62ab5b653746e3a1104c04fb8899b9e7a160a1be4fe8782bfb1607b556e9ffb9c25c4e99653e4bc74fcc03b09
 DIST dnsmasq-2.86.tar.xz 531404 BLAKE2B 27307c70cc90d6e27dbf8e87589b8c72622e93f402c3a431e06facc58a62af46a478d1fdbfb9808a91ff3d2f5da88a8d12de9755009b558d685903e4d2a34de3 SHA512 487eae0afbc8bb3d5282a729ffb0cb2c9bdc7d8e46e2e8aa114cd7c5d82e0fd66f49926e7fa4028577548d6f57e8a865aca17f33963a589874584d608ab2deaf
 EBUILD dnsmasq-2.85.ebuild 4662 BLAKE2B 00d035ccdec6d3b15059c2ba6dcbcf6557eb12ccbb5d568f521e43f399fee9a84953d0081c03b4d6e7108f8acfa1e2be252cfc75d005d080a0d1fae4aed331b2 SHA512 ffc524a54141bd7aca4b9b19a3f583d0d7c27f88e1792a45e6736a24a211575682888fce4785232d4e1245e9fe88b9925fc7ce02f559696b97fd6b2c940e0adf
-EBUILD dnsmasq-2.86.ebuild 4684 BLAKE2B db5e4dfbdd5d1eec009f553a44eca64cd4a44b0fd038c11f4f43e0a9d8ddffba1ed64b47686a4ffd3ace4dc5fca242e13333c1fd0fd2d4f2b59d0e7c24db5fe3 SHA512 c172e3e21980308aae00ccabbb7cc508a919a409cd8a018d0c59a479747717b95eb7215769cd94305838028d2a9c23eca270f7c0d4a731241ed2842557516f5d
+EBUILD dnsmasq-2.86.ebuild 4682 BLAKE2B edad0d22013a8cc14ec8fd001bfef912392a5abee3ffe77bb8d892961d992608d175848c8e1a65badd08d94f5c85a531b49141861c33a0c825bc77b0ff81493a SHA512 bb43f405afe8167fa1ebebefbefdf1162758bf42677be0cc6678d8a50123e6e74e83c7b0f35947bb764a4929ca903e67fde0bdb372bbab84bdd302374b8a9baf
 MISC metadata.xml 1449 BLAKE2B 532b630e5c03652df74dec95bbb6c1c03b0d8a8fbc78ed1b2d40f47fdfbc20ce21172259f630acb5d14eb32b849d1d5b34482ffe77d4b5eee64051e839f17607 SHA512 e58549ceaf7a252f0b8b4c3a678cbc57bca66bf749bffbf8ec5544e79a380af695e3412c8d59d941bd08ed6cb95ab27bc2a13fbc46a4f5368d9e209e3e33bc99
diff --git a/net-dns/dnsmasq/dnsmasq-2.86.ebuild b/net-dns/dnsmasq/dnsmasq-2.86.ebuild
index 24c56481d2a6..7cc85152f7aa 100644
--- a/net-dns/dnsmasq/dnsmasq-2.86.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.86.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
 IUSE+=" +loop +inotify ipv6 lua nettlehash nls script selinux static tftp"
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 35f12c4039f6..90173a16aba8 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/discord-bin/Manifest b/net-im/discord-bin/Manifest
index e2c8235239fe..5d96af39036e 100644
--- a/net-im/discord-bin/Manifest
+++ b/net-im/discord-bin/Manifest
@@ -1,3 +1,3 @@
-DIST discord-0.0.18.tar.gz 77398558 BLAKE2B e25ad448dd9f89e460a4380cde850506298a443be2b70fb243b92ab6a139815fea36260b879ece044c5c607561fde6adf36a188c186c48c34052ec105b23d732 SHA512 a9c5de48186542fa4385c5cf4ffb54484dee008cde5230a9f8a0e71a84e1e7ce680e170aca2018ad2217618ed2d4a4882836a408a5d0a5cab054c0954c1b55be
-EBUILD discord-bin-0.0.18.ebuild 3216 BLAKE2B 557715d894b490d4409316877c45c3b04c3e3a5b15306e83a123e5bb4a13fa01c5d67cb3f6152d21e8ebbcd13f3afdf9b0d311c66c9eb5131343e12259fa2b43 SHA512 102f70a49d60bf71add56aae6b857f72b5aec6f76ef83d715ba9bf7363cdd4a77798d549cd53b726f39de478ab9ad5be32de34e1b3b855deee17ddf8c4448951
+DIST discord-0.0.19.tar.gz 77400663 BLAKE2B 2bfbc32739d7af69f437a54fe75140451cdac68453d8554ccf76b1e12e7118b163465742c8c4e8743d4c7de4e493fcbd313c7cff316514b78e8b7288d5fe3a8c SHA512 5b73f0f968ce61f5a844940e1525da80e7b2ce3779cf2050ca3c2b0b7dbee20f16e2bf203f0673d1e275d1e55075b83eb63700731be8324587b3c58c64d3a0e8
+EBUILD discord-bin-0.0.19.ebuild 3216 BLAKE2B 557715d894b490d4409316877c45c3b04c3e3a5b15306e83a123e5bb4a13fa01c5d67cb3f6152d21e8ebbcd13f3afdf9b0d311c66c9eb5131343e12259fa2b43 SHA512 102f70a49d60bf71add56aae6b857f72b5aec6f76ef83d715ba9bf7363cdd4a77798d549cd53b726f39de478ab9ad5be32de34e1b3b855deee17ddf8c4448951
 MISC metadata.xml 401 BLAKE2B bfadde60f5ced8839f9268c03217b5908e6f5cf4ecf3069cbca236b1d8f7c56a3a887655a4afebc74f18cc11584079620828ebe15b9e2ee6879730d90fc603e7 SHA512 77bc1c0db6255f39790b7a9a87dabcec7352142f341b9d7a41c7e073118a7613948e63f65dad9ec672f6ed5026188cdbf1b09cb4073ff67c49ddac3fff2301dd
diff --git a/net-im/discord-bin/discord-bin-0.0.18.ebuild b/net-im/discord-bin/discord-bin-0.0.19.ebuild
similarity index 100%
rename from net-im/discord-bin/discord-bin-0.0.18.ebuild
rename to net-im/discord-bin/discord-bin-0.0.19.ebuild
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 7636e62308f6..9791c7a1a746 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_5.51.0_amd64.deb 117048710 BLAKE2B 2f1fc0a779608fac7ac345437b703d96dc8bcc090fe6fcfcfdf3447e1192b97a8e3273d8db10498dbb4779b4072063355d2f55d8e5bd0c55c7436e6ff42e66ce SHA512 8ca14b347439968c7e91cc93c1d828ee63308ca2551aa3249624f29462b16c5d41538a8f24c131a8e9d09ceafb277c08ca54dc6b4f39d939951bbf2b5248457b
-EBUILD signal-desktop-bin-5.51.0.ebuild 2404 BLAKE2B 705f2fa98a1ec6e87fd8aec7611662e96827b945a1c00f0d4e31408a6ae67786d8363fbf97655c357b3bfbf3098bbc98043b8289d49b90ffa4724dbe8e2ea148 SHA512 b2530373fab90f2dafc251acdcb502b39291d142fe5c5c2af992a3eea1888a9081581bb95c45b31e1ffef22d62ce6526092e5200a33d0cc8d2651810e13542be
+DIST signal-desktop_5.54.0_amd64.deb 117370322 BLAKE2B ba05b1e51aebaeead237d746ffe908e75fce0dfd0617ed2e594f4ebc55605488bd8e2aac08fcdd532f329beacffa7018a072174660142716ebe149b1ec6e32b8 SHA512 e8a6a60e8f8799aa83c02457576034271c3ee74b9925b218545b50959d9e53dde880883936097296d1a5d80e493b45dd04c303ca7c21a83696dd379ff593518e
+EBUILD signal-desktop-bin-5.54.0.ebuild 2404 BLAKE2B 705f2fa98a1ec6e87fd8aec7611662e96827b945a1c00f0d4e31408a6ae67786d8363fbf97655c357b3bfbf3098bbc98043b8289d49b90ffa4724dbe8e2ea148 SHA512 b2530373fab90f2dafc251acdcb502b39291d142fe5c5c2af992a3eea1888a9081581bb95c45b31e1ffef22d62ce6526092e5200a33d0cc8d2651810e13542be
 MISC metadata.xml 397 BLAKE2B 8b09559d9ab0428415fb6301596386acc0983bb312f099c6c5299492043f59d6b2e1145f29885e9fc429f4e0d28fccac19cdd7afb5c5ed5f70383a9075d0e466 SHA512 8fa1b372993842145229779dc730c574f688411efd3da415b00928d81947a91c1dabb7c53412aa3c413a5e1071d113b182c54b113a933c0d5ddf3de08869267b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.51.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.54.0.ebuild
similarity index 100%
rename from net-im/signal-desktop-bin/signal-desktop-bin-5.51.0.ebuild
rename to net-im/signal-desktop-bin/signal-desktop-bin-5.54.0.ebuild
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index ea73119098c4..fb52a853dfed 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest
index 61c20b9971f5..22f2edfb9a42 100644
--- a/net-libs/telepathy-qt/Manifest
+++ b/net-libs/telepathy-qt/Manifest
@@ -1,4 +1,4 @@
 DIST telepathy-qt-0.9.8.tar.gz 6448686 BLAKE2B 7554b812c35a09aabc0ff92fea43f633b5c2f87784c8e7b387545b31c1c92eb02f9e416930c635202fe0205c4e26c1fd63c3b4a668cf0ceeb602d8a777891cd9 SHA512 fad662c02417c8e4e239d438ea3549226e589442aea8418c8922a6b78ff88422a36c1cc0d2e3591240fac115390a7fbdb1b4deea98187051cc811175b60b9e8b
-EBUILD telepathy-qt-0.9.8-r1.ebuild 1566 BLAKE2B 5fb33334028b660833b49333dda86b5328ed109b6d496515c919119e4594618d872a0ba013a9c33f3b580eea69f0ff4489af05ac6ca75a03fe400caf2ce3b436 SHA512 23f78e3944c9533a8a2ed683e11d206474ccd3ee4f747aee36d34bcae204d1a0542bf1d32f22d8572ef9cd7b9e72966f89f9dfaa3dd145ff44872f0863ad64ae
-EBUILD telepathy-qt-9999.ebuild 1695 BLAKE2B 06213ffcd802462de773309f5fc6c623a241761adee8438c97e7d8ed8c6a7eda8fb26f4524821c241d163e0f36bf996bc18447d16a0bcaed9686c2837f15aa1c SHA512 9858a71afe6653cf2782f906bbf7e746411ff8443f7bffe0582f8afd3993e3c9deb4f961246573d13df583acf74ccb91338a924d250d3c142a96d43cb5ec072d
+EBUILD telepathy-qt-0.9.8-r1.ebuild 1573 BLAKE2B 6902a26da268b730cfc4df71e95fb64eb967d48beaab175289f330011f70da740ac00429f8e87ce0d908f8e26132fc98c49f12718b4c3e360e647ae47c8b5330 SHA512 5d7c8da155b8dd4f38831e2ed8ae2c8600bce3f8b51cb57c19f5a6733257c9ff7e4d2dfc43af3bc49a545ba16c89b6d0cbba889e3c867c623941f1f4eec0af23
+EBUILD telepathy-qt-9999.ebuild 1702 BLAKE2B c06acb0e6b487ab578d3fe56b3a3cf30a5bbd336e89744c3a067a4568e4306124f4102ac721a6a365d6514fec954d6f6032f7895a58487c2d3fcdd8d4d984d2e SHA512 8f7cb36796235a46cab3df2071cd1e4118a0ae212e99508350b279d72d786e8517042847ddc35aae513ab254acd790cbe8b1a462e63a15c2de9dd2ae50f9ee52
 MISC metadata.xml 722 BLAKE2B d17eb48d784f9128e24be8dbc68237870291a2b758b0d3009b6aaf0fec4396421f10a332ffac927b4e83dbb3a95bfa9376fe1831d633a38dc3cf1ee8e7f44733 SHA512 ec1dff533720d3f77cfc194332740fb200db1e2d024d2ea64ef13e831911f7ca700b7588bf263be2a24e3b606c2dfa580220b9feda064c2551ebd81a33c9ae5c
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild
index 9f392ed86abb..af50e027063c 100644
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -49,7 +49,7 @@ BDEPEND="${PYTHON_DEPS}
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index 4ae1fc73d370..806f66f84703 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -55,7 +55,7 @@ DEPEND="${RDEPEND}
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a26ad16d74cc..3a132efb2276 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 6b880206794b..019c0d012758 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -7,6 +7,9 @@ AUX chronyd.conf-r3 390 BLAKE2B aa193e6bcf62cc305620139b7c198d39358feea710635608
 AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da
 DIST chrony-4.2.tar.gz 578411 BLAKE2B 6eac4f144f5811d0f83a9827e2b5113dead1ff96952f6e6d32dcea9858e04512f635d70237fe6faced095991204b0f62bcb0e9d1a4b34e8778f205058afdfb45 SHA512 7f946b27de605b3ebea62cf23916dfad77c99e8b2338ba239ede6b8216ce436b3d4d87770f371c8d8e006507c51d5c831b51f067957abd2935adfdec3f5aa67d
 DIST chrony-4.2.tar.gz.asc 833 BLAKE2B 41cb83f62dd58489313438672d209cc65fdbb5f8f595ea38f990d5e15194f91532d3f3221c6c38581467d62e95d23853a4fc438d32b99606def5f06db0031969 SHA512 d8ae4b540ce3529a5a72e10c14765a33ca6fc41529b6fdc9928fb171f25bd6fb87f930b7783638892f42f4cbcfaab4cb1064c930bae1d5204a71babad72b6e10
+DIST chrony-4.3-pre1.tar.gz 592966 BLAKE2B 26811ff6ebd55720cc39ce8cb9d4ddd2e70a9919dbc9a8416728bb81ad02b53dcb895a68aa696c4a063930661f533c5a219c98d67e3b93920351e7160022dca4 SHA512 6a97b11cd7604808aa57db8cd67ae854391ef2bca84bb0256c043464e33683e15682a8ebadec3d2fcca83203d2c731953dfd4972976fe193246ca4af7fb7e0e7
+DIST chrony-4.3-pre1.tar.gz.asc 833 BLAKE2B 40b80f6fdcc749077d1548e7861ff4f55dcfa8c8a84bd197d89f3f25626d5dd3a2b36dbb8b907f3f0f61444e1e3b908631529a7a1665f95b499c70c899249ade SHA512 3a9cd53fcd0f2842241817d5bdeb3c6151eec9e1d0864ae4a89a2d7b93924ac28be7d4f090a32b99ab4b229437d027c2663bb552433182a97eca347175138164
 EBUILD chrony-4.2-r1.ebuild 6719 BLAKE2B 9dbf927768234a5e9f4a38463815395ae78b982c784cf25be1d6e78c0b268a6b9ed327d9de71505a4c1c4f158be50c15e6ecdff691369fb25f6ff664d73dce55 SHA512 12c3470d09c3b98f81649b8d16c58b53f9a2721540ae4fb376f4aea9a1f144540e0e415f94d08aceee9d69afddf1571855798c7ee175a278096f63fc32dcb0ab
-EBUILD chrony-9999.ebuild 6645 BLAKE2B 36e2fa322fd75673afe913a472ba65d6aa6610700a149545107e381106950fcddcf0e30e077f95d169b12d550faad8c8526e8c2f782b75126ce7aaea4cac87ee SHA512 5817e255eb667f7bf788bf7b42d99851583cca22178c4a5301b071fdb30e0c53dbc9f4c6951f36aea2b9de6bb6352265920450455103234be8fe711c8e428fb9
+EBUILD chrony-4.3_pre1.ebuild 6610 BLAKE2B 321b8fb250d5f8c9600196b98fbc1552c346da7c26653e7a122b8b8e31d45574da3e8272beb5df7a7837278e9b36e2b9f5e1f0b6781c71a272765bf2887cc3f8 SHA512 810ae6585376833b2bf91e84cc11fa8b36e00a2f6845e297fa81b567b217abddeedcc50ef09b32d7126cdaf3b49295c90ed6a1e027f91959537514fb1fcfb482
+EBUILD chrony-9999.ebuild 6610 BLAKE2B 321b8fb250d5f8c9600196b98fbc1552c346da7c26653e7a122b8b8e31d45574da3e8272beb5df7a7837278e9b36e2b9f5e1f0b6781c71a272765bf2887cc3f8 SHA512 810ae6585376833b2bf91e84cc11fa8b36e00a2f6845e297fa81b567b217abddeedcc50ef09b32d7126cdaf3b49295c90ed6a1e027f91959537514fb1fcfb482
 MISC metadata.xml 2300 BLAKE2B 8d0e8822361fef70945eab4eb365fee2f0c278fb36ad0641520310bf895d04202fce88d485149d021ebf577ee848b408cf46f4141f8606ff020d2483370c3b16 SHA512 57c813c655fa7a5083f26f908d7476dd165284feef014c750e845c60830af7baffe91e9444915d3994b053498714b4e717bfe7a2af34e90de50d823542c913d0
diff --git a/net-misc/chrony/chrony-4.3_pre1.ebuild b/net-misc/chrony/chrony-4.3_pre1.ebuild
new file mode 100644
index 000000000000..c52e4bdbf30f
--- /dev/null
+++ b/net-misc/chrony/chrony-4.3_pre1.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/mlichvar.asc
+	inherit verify-sig
+
+	SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
+
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	fi
+fi
+
+S="${WORKDIR}/${P/_/-}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+caps +cmdmon debug html ipv6 libedit libtomcrypt +nettle nss +ntp +nts +phc pps +refclock +rtc samba +seccomp +sechash selinux"
+# nettle > nss > libtomcrypt in configure
+REQUIRED_USE="
+	sechash? ( || ( nettle nss libtomcrypt ) )
+	nettle? ( !nss )
+	nss? ( !nettle )
+	libtomcrypt? ( !nettle !nss )
+	!sechash? ( !nss )
+	!sechash? ( !nts? ( !nettle ) )
+"
+
+DEPEND="
+	caps? (
+		acct-group/ntp
+		acct-user/ntp
+		sys-libs/libcap
+	)
+	libedit? ( dev-libs/libedit )
+	!libedit? ( sys-libs/readline:= )
+	nettle? ( dev-libs/nettle:= )
+	nss? ( dev-libs/nss:= )
+	nts? ( net-libs/gnutls:= )
+	pps? ( net-misc/pps-tools )
+	seccomp? ( sys-libs/libseccomp )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-chronyd )
+"
+BDEPEND="
+	html? ( dev-ruby/asciidoctor )
+	nts? ( virtual/pkgconfig )
+	sechash? (
+		nettle? ( virtual/pkgconfig )
+		nss? ( virtual/pkgconfig )
+	)
+"
+
+if [[ ${PV} == 9999 ]] ; then
+	# Needed for doc generation in 9999
+	REQUIRED_USE+=" html"
+	BDEPEND+=" virtual/w3m"
+else
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
+	"${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
+		doc/* examples/* || die
+
+	cp "${FILESDIR}"/chronyd.conf-r3 "${T}"/chronyd.conf || die
+}
+
+src_configure() {
+	if ! use caps ; then
+		sed -i \
+			-e 's/ -u ntp//' \
+			"${T}"/chronyd.conf examples/chronyd.service || die
+	fi
+
+	if ! use seccomp ; then
+		sed -i \
+			-e 's/ -F 2//' \
+			"${T}"/chronyd.conf examples/chronyd.service || die
+	fi
+
+	tc-export CC PKG_CONFIG
+
+	# Update from time to time with output from "date +%s"
+	# on a system that is time-synced.
+	export SOURCE_DATE_EPOCH=1607976314
+
+	# Not an autotools generated script
+	local myconf=(
+		$(use_enable seccomp scfilter)
+
+		$(usex caps '' '--disable-linuxcaps')
+		$(usex cmdmon '' '--disable-cmdmon')
+		$(usex debug '--enable-debug' '')
+		$(usex ipv6 '' '--disable-ipv6')
+		$(usex libedit '' '--without-editline')
+		$(usex libtomcrypt '' '--without-tomcrypt')
+		$(usex nettle '' '--without-nettle')
+		$(usex nss '' '--without-nss')
+		$(usex ntp '' '--disable-ntp')
+		$(usex nts '' '--disable-nts')
+		$(usex nts '' '--without-gnutls')
+		$(usex phc '' '--disable-phc')
+		$(usex pps '' '--disable-pps')
+		$(usex refclock '' '--disable-refclock')
+		$(usex rtc '' '--disable-rtc')
+		$(usex samba '--enable-ntp-signd' '')
+		$(usex sechash '' '--disable-sechash')
+
+		--chronysockdir="${EPREFIX}/run/chrony"
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--mandir="${EPREFIX}/usr/share/man"
+		--prefix="${EPREFIX}/usr"
+		--sysconfdir="${EPREFIX}/etc/chrony"
+		--with-hwclockfile="${EPREFIX}/etc/adjtime"
+		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
+
+		${EXTRA_ECONF}
+	)
+
+	# Print the ./configure call
+	edo ./configure "${myconf[@]}" || die
+}
+
+src_compile() {
+	if [[ ${PV} == 9999 ]] ; then
+		# Uses w3m
+		emake -C doc man txt
+	fi
+
+	emake all docs $(usex html '' 'ADOC=true')
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/chronyd.init-r2 chronyd
+	newconfd "${T}"/chronyd.conf chronyd
+
+	insinto /etc/${PN}
+	newins examples/chrony.conf.example1 chrony.conf
+
+	docinto examples
+	dodoc examples/*.example*
+
+	newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')"
+
+	if use html ; then
+		docinto html
+		dodoc doc/*.html
+	fi
+
+	keepdir /var/{lib,log}/chrony
+
+	if use caps ; then
+		# Prepare a directory for the chrony.drift file (a la ntpsec)
+		# Ensures the environment is sane on new installs
+		# bug #711058
+		fowners ntp:ntp /var/{lib,log}/chrony
+		fperms 770 /var/lib/chrony
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
+
+	systemd_dounit examples/chronyd.service
+	systemd_dounit examples/chrony-wait.service
+	systemd_enable_ntpunit 50-chrony chronyd.service
+}
+
+pkg_preinst() {
+	HAD_CAPS=0
+	HAD_SECCOMP=0
+	HAD_PRE_NEW_SECCOMP_LEVEL=0
+
+	# See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5
+	# in "Ebuild Phases" for an explanation of why we need to save the variable beforehand
+	if has_version 'net-misc/chrony[caps]' ; then
+		HAD_CAPS=1
+	fi
+
+	if has_version 'net-misc/chrony[seccomp]' ; then
+		HAD_SECCOMP=1
+	fi
+
+	if has_version '>=net-misc/chrony-4.1[seccomp]' ; then
+		# This version introduced a new filter level: -F 2
+		# It's a limited set of seccomp filters designed to be 'bare minimum'
+		HAD_PRE_NEW_SECCOMP_LEVEL=1
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process chronyd.conf
+
+	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+		if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; then
+			# bug #719876
+			ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
+			ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
+			ewarn "This is necessary for chrony to drop privileges"
+		elif ! use caps && [[ ${HAD_CAPS} -eq 0 ]] ; then
+			ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root"
+		fi
+	fi
+
+	# See bug #783915 for general discussion on enabling seccomp filtering
+	# by default.
+	local show_seccomp_enable_msg=0
+
+	# Was seccomp disabled before and now enabled?
+	if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then
+		show_seccomp_enable_msg=1
+	fi
+
+	# Are we coming from an old version without the new 'minimal' filter?
+	# (-F 2)
+	if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then
+		show_seccomp_enable_msg=1
+	fi
+
+	if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then
+		elog "To enable seccomp in a stricter mode, please modify:"
+		elog "- /etc/conf.d/chronyd for OpenRC"
+		elog "- systemctl edit chronyd for systemd"
+		elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)"
+		elog "By default, we now use -F 2 which is a baseline/minimal filter."
+	fi
+}
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index 57c2893c3532..c52e4bdbf30f 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit systemd tmpfiles toolchain-funcs
+inherit edo systemd tmpfiles toolchain-funcs
 
 DESCRIPTION="NTP client and server programs"
 HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git"
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
 	inherit git-r3
 else
@@ -19,7 +19,7 @@ else
 	SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
 
 	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	fi
 fi
 
@@ -65,7 +65,7 @@ BDEPEND="
 	)
 "
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	# Needed for doc generation in 9999
 	REQUIRED_USE+=" html"
 	BDEPEND+=" virtual/w3m"
@@ -141,12 +141,11 @@ src_configure() {
 	)
 
 	# Print the ./configure call
-	echo sh ./configure "${myconf[@]}" >&2
-	sh ./configure "${myconf[@]}" || die
+	edo ./configure "${myconf[@]}" || die
 }
 
 src_compile() {
-	if [[ ${PV} == "9999" ]] ; then
+	if [[ ${PV} == 9999 ]] ; then
 		# Uses w3m
 		emake -C doc man txt
 	fi
diff --git a/net-misc/ytfzf/Manifest b/net-misc/ytfzf/Manifest
index 170361b29be9..b4a639ee6c6b 100644
--- a/net-misc/ytfzf/Manifest
+++ b/net-misc/ytfzf/Manifest
@@ -1,5 +1,3 @@
-DIST ytfzf-2.4.0.tar.gz 3253168 BLAKE2B e25bd13c01f5b035378dd6657358bc2ec67ff29f1db42fc8c07f0f820252efa4e6da6342265ea4107ec3179d317ac9742646a641a1c9e4e2a84360b39df6bf3d SHA512 9b66d8b56bb8a35baf04a5d34614882f8302e2f543d12182188438c50a76cca1182d7ac3a4a7a3d80d7c924478fd3af7968701e5d5ab8531a9d6f4ed5b731ece
 DIST ytfzf-2.4.1.tar.gz 3256903 BLAKE2B e95fc86d1ed2099aeb96d8daf808861e279865e17758dc8b0b5fa4c349dd819371012d13073f89b94469f1d69f00b66bb01860e3190e324baadc30e2cbae8074 SHA512 f0be168d5fd32cc75f95d0533a093cb9e3aa238d39e024271d69f078b974da51504bd1fd65a34378085a148f1ddae68f6c2fdc15c7a56c2353ec3d6695451771
-EBUILD ytfzf-2.4.0.ebuild 1421 BLAKE2B 15a4578d3332238ff71b4a8c9c5eb86f10307b6fb6d8a03a0650af27d0a30bc0311010e3d15a6497d77ac4c861f18889930232495920fc7accfe76fce41b37a3 SHA512 2b1bea0a13a963e5eff2b473b2c124c5fb6488462095f9c9d584e643ed39386a03f411ea887deb7610c20ed511a7c4374f0b6b51e8bb0e71727a3c6d6c7054f2
 EBUILD ytfzf-2.4.1.ebuild 1421 BLAKE2B 15a4578d3332238ff71b4a8c9c5eb86f10307b6fb6d8a03a0650af27d0a30bc0311010e3d15a6497d77ac4c861f18889930232495920fc7accfe76fce41b37a3 SHA512 2b1bea0a13a963e5eff2b473b2c124c5fb6488462095f9c9d584e643ed39386a03f411ea887deb7610c20ed511a7c4374f0b6b51e8bb0e71727a3c6d6c7054f2
 MISC metadata.xml 498 BLAKE2B 465ce6a83a75395c9021b7208a156bc91f55fe2522279a781509bc490e832611e89718317c88d4e2986f16f6ea1f8bc457d2f5978efa011e62c56cef756cf0ed SHA512 49f6d3c039246622d687f63b703390eef0d4fef51f485a091ccdb767da1b2cd8a380275cabe6117465add0e15acf6f6533033a5b17c751091abe462a43044884
diff --git a/net-misc/ytfzf/ytfzf-2.4.0.ebuild b/net-misc/ytfzf/ytfzf-2.4.0.ebuild
deleted file mode 100644
index 36a2a31e9d01..000000000000
--- a/net-misc/ytfzf/ytfzf-2.4.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit optfeature
-
-DESCRIPTION="Posix script to find and watch youtube videos from the terminal"
-HOMEPAGE="https://github.com/pystardust/ytfzf/"
-SRC_URI="https://github.com/pystardust/ytfzf/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X minimal"
-
-RDEPEND="
-	app-misc/jq
-	net-misc/curl[ssl]
-	virtual/awk
-	!minimal? (
-		X? ( media-gfx/ueberzug )
-		app-shells/fzf
-		media-video/mpv[lua]
-		net-misc/yt-dlp
-	)"
-
-src_prepare() {
-	default
-
-	sed -i "/^: ...YTFZF_SYSTEM_ADDON_DIR/s|/usr/local|${EPREFIX}/usr|" ytfzf || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	local emakeargs=(
-		DESTDIR="${D}"
-		PREFIX="${EPREFIX}"/usr
-		DOCDIR="${EPREFIX}"/usr/share/doc/${PF}
-	)
-
-	emake "${emakeargs[@]}" addons doc install
-	einstalldocs
-
-	rm -r "${ED}"/usr/share/licenses || die
-}
-
-pkg_postinst() {
-	optfeature "external menu support" x11-misc/dmenu
-	optfeature "desktop notifications" x11-libs/libnotify
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "Note that ${PN} supports many methods to display menus/thumbnails."
-		elog "This ebuild primarily covers defaults and major features, additional"
-		elog "dependencies may be needed for others. Set USE=minimal if want full"
-		elog "control over optional dependencies (e.g. fzf is optional if use dmenu)."
-	fi
-}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 89c8f77b653b..43f6fcff1651 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index 3a1ef7113ac7..e113b6d2aad8 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -4,8 +4,10 @@ DIST strongswan-5.9.2.tar.bz2 4607281 BLAKE2B 84f5457bc970f49c9bc99d0ef41182d815
 DIST strongswan-5.9.4.tar.bz2 4651000 BLAKE2B 071a0a0a144b369a7e4069d92340cecca9eef0c004949d91993c8f1cc0f39f7868749020d6e135fa59d5899d146f39172f87eb32a26ad788cb8a4c160597e328 SHA512 796356c1d5c1ad410f0ed944ab4a131076d26f120ec6fa57796fe4060b0741201199625883ddc9ebd8a7ad299495f073cec76a6780ebd8f375605aae16750cf3
 DIST strongswan-5.9.5.tar.bz2 4722123 BLAKE2B 8b3adc44d5f5eb3824845ce9eda75e7b75f0f7394fbe84f827f4a8177e5299ca7170103ee6cd76e1e18aef85d7f124a43a505ceaf41ec4ed575eb214ebb6af21 SHA512 3b11c4edb1ffccf0ea5b8b843acfe2eb18dcd3857fc2818b8481c4febe7959261e1b2804c3af29068319df469fa0b784682d3ba4d49a3eb580841ff3c34e33a1
 DIST strongswan-5.9.6.tar.bz2 4750894 BLAKE2B 4021a10611e66f9e2e4e432bdfb9de0f94d27ba1be1b7d4e4b8bf3cd797c123658993e60eb3d49c424b479558e9581bb069a345a70f55850d1faf5abaa401246 SHA512 8efb7a55b074485b874e941e42462e97a404b4f84e2f90ed18ef66274731b22d167a571f6fd028dccc1f199f2e591c82616d0a832a5084e1981c6b867fe5bb6a
+DIST strongswan-5.9.7.tar.bz2 4741967 BLAKE2B 062f80431aefabfa4ba03454c3ab80e278772ebbd2bdeb69de98796f6e1bd7fc17d161e23b74bb238378eedc005079ff14e64e9a8967e2bf4f159a076e9f6384 SHA512 6e28a8ae0e4606a55661ae63a61d7bca445e8f62e91b37d32c957f03300d27ba05e099891c1160aae477b1f93ef844b66bb46da6cce5553eb03206c87e5e0d9a
 EBUILD strongswan-5.9.2-r3.ebuild 9206 BLAKE2B 95f105fcce29680c9d8dfcdf645bc00ee84747c83eeb13106b54b216963fc8c8f442f4a45e02507b521db3b1fea54c1020186c6a555f0dfc29173d6d13f25409 SHA512 f34d860ce53c62225ba6c1868f368a920c5164a2fdfb8554ba6e3611ca02b1356bc68f121f9c126131c0381f59c2f1d9d1203c029b1c1513ef0d88257be654e5
 EBUILD strongswan-5.9.4-r2.ebuild 9264 BLAKE2B 7ccb1b346acbbc88f80f0a1b96b28e28955773af78ddc946e72eda3097df2e45f5067e40406520cbbe41360209f406a0ef4ec7acd49edb2591b97effec739183 SHA512 29548972e0463c8dcab82c27e48c43519ddd813a5bf4e05211a83fb2f27ad9ee0a03226d777199972cb02f417263e647eee4561568807ffa9f91d19dfc90f7c4
 EBUILD strongswan-5.9.5-r1.ebuild 9244 BLAKE2B cd9406736089a9fb075974418655203120964a0030a4e761a603100dcc23cb66482d4832e631f2910369021618042d2dc1b9e79960a2d612168aa462f351f8b7 SHA512 d30ef479396196dce01c074f2e23d2f4b50c48f67a6d7c02f61edaa118ef9666ba9959400a38ef93c88b0c918829cc898bfc048ad9c115b2e72ef57006bbe9cf
 EBUILD strongswan-5.9.6-r1.ebuild 9610 BLAKE2B f132b0e96a6321118e936601ad7518a756cd4d739913bae1ac79b5ab32c19541e18d424af8722c4b7d2c9d470dea89a5bf43b163bd07c1db744eccaf37cc7fbf SHA512 a9667f354ee632c03a77c647e57734c0d14813ffbf22eb6af9a85b6692065336ed996155e9916e67b5df6db60b9eac884361654ccf960461918499aca42e0b08
+EBUILD strongswan-5.9.7.ebuild 9557 BLAKE2B 25bfda7f859b6b37bafb5a54f82e03e270cb659daa28bb0ec23fece44ba9de03358d93a491b8244f13c4970df9c72c736e7547b75b15f2ee19eb9b8ab8399b82 SHA512 0be4ea58a6725ec9a5440e24e1732c86624c3923e69555bbf9cdfa1a77eeb2a52f3d4786235f6ad20640af68552ce38e01bf47705eb8fffb82621ebbf3244e89
 MISC metadata.xml 4888 BLAKE2B ffb26d9fec8ad8c5fbb68ae92a92efbf32c40b4a0a4b829d8fd287ebc80d135e3ca95ca50663acb6fc7d629570ed7f4264921a8838e2ff0a8e5dbbadb3f0fc50 SHA512 84491cbd33b325b1d960c32eafb479927d5651244fb13ee9ec8b2abddfff71f1b90b18524e044dd0cc63ccd49ef9bb0c2437ab6cf504994b8ad0a9137cd04fb4
diff --git a/net-vpn/strongswan/strongswan-5.9.7.ebuild b/net-vpn/strongswan/strongswan-5.9.7.ebuild
new file mode 100644
index 000000000000..d5b5767e6d03
--- /dev/null
+++ b/net-vpn/strongswan/strongswan-5.9.7.ebuild
@@ -0,0 +1,318 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+inherit linux-info systemd
+
+DESCRIPTION="IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE"
+HOMEPAGE="https://www.strongswan.org/"
+SRC_URI="https://download.strongswan.org/${P}.tar.bz2"
+
+LICENSE="GPL-2 RSA DES"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11"
+
+STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
+STRONGSWAN_PLUGINS_OPT_DISABLE="kdf"
+STRONGSWAN_PLUGINS_OPT="addrblock aesni blowfish bypass-lan ccm chapoly ctr error-notify forecast gcm
+ha ipseckey newhope ntru padlock rdrand save-keys unbound whitelist
+xauth-noauth"
+for mod in $STRONGSWAN_PLUGINS_STD; do
+	IUSE="${IUSE} +strongswan_plugins_${mod}"
+done
+
+for mod in $STRONGSWAN_PLUGINS_OPT_DISABLE; do
+	IUSE="${IUSE} strongswan_plugins_${mod}"
+done
+
+for mod in $STRONGSWAN_PLUGINS_OPT; do
+	IUSE="${IUSE} strongswan_plugins_${mod}"
+done
+
+COMMON_DEPEND="non-root? (
+		acct-user/ipsec
+		acct-group/ipsec
+	)
+	dev-libs/glib:2
+	gmp? ( >=dev-libs/gmp-4.1.5:= )
+	gcrypt? ( dev-libs/libgcrypt:= )
+	caps? ( sys-libs/libcap )
+	curl? ( net-misc/curl )
+	ldap? ( net-nds/openldap:= )
+	openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] )
+	mysql? ( dev-db/mysql-connector-c:= )
+	sqlite? ( >=dev-db/sqlite-3.3.1:3 )
+	systemd? ( sys-apps/systemd )
+	networkmanager? ( net-misc/networkmanager )
+	pam? ( sys-libs/pam )
+	strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns:= )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/linux-sources
+	sys-kernel/linux-headers"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/logger
+	sys-apps/iproute2
+	!net-vpn/libreswan
+	selinux? ( sec-policy/selinux-ipsec )"
+
+UGID="ipsec"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	elog "Linux kernel version: ${KV_FULL}"
+
+	if ! kernel_is -ge 2 6 16; then
+		eerror
+		eerror "This ebuild currently only supports ${PN} with the"
+		eerror "native Linux 2.6 IPsec stack on kernels >= 2.6.16."
+		eerror
+	fi
+
+	if kernel_is -lt 2 6 34; then
+		ewarn
+		ewarn "IMPORTANT KERNEL NOTES: Please read carefully..."
+		ewarn
+
+		if kernel_is -lt 2 6 29; then
+			ewarn "[ < 2.6.29 ] Due to a missing kernel feature, you have to"
+			ewarn "include all required IPv6 modules even if you just intend"
+			ewarn "to run on IPv4 only."
+			ewarn
+			ewarn "This has been fixed with kernels >= 2.6.29."
+			ewarn
+		fi
+
+		if kernel_is -lt 2 6 33; then
+			ewarn "[ < 2.6.33 ] Kernels prior to 2.6.33 include a non-standards"
+			ewarn "compliant implementation for SHA-2 HMAC support in ESP and"
+			ewarn "miss SHA384 and SHA512 HMAC support altogether."
+			ewarn
+			ewarn "If you need any of those features, please use kernel >= 2.6.33."
+			ewarn
+		fi
+
+		if kernel_is -lt 2 6 34; then
+			ewarn "[ < 2.6.34 ] Support for the AES-GMAC authentification-only"
+			ewarn "ESP cipher is only included in kernels >= 2.6.34."
+			ewarn
+			ewarn "If you need it, please use kernel >= 2.6.34."
+			ewarn
+		fi
+	fi
+}
+
+src_configure() {
+	local myconf=""
+
+	if use non-root; then
+		myconf="${myconf} --with-user=${UGID} --with-group=${UGID}"
+	fi
+
+	# If a user has already enabled db support, those plugins will
+	# most likely be desired as well. Besides they don't impose new
+	# dependencies and come at no cost (except for space).
+	if use mysql || use sqlite; then
+		myconf="${myconf} --enable-attr-sql --enable-sql"
+	fi
+
+	# strongSwan builds and installs static libs by default which are
+	# useless to the user (and to strongSwan for that matter) because no
+	# header files or alike get installed... so disabling them is safe.
+	if use pam && use eap; then
+		myconf="${myconf} --enable-eap-gtc"
+	else
+		myconf="${myconf} --disable-eap-gtc"
+	fi
+
+	for mod in $STRONGSWAN_PLUGINS_STD; do
+		if use strongswan_plugins_${mod}; then
+			myconf+=" --enable-${mod}"
+		fi
+	done
+
+	for mod in $STRONGSWAN_PLUGINS_OPT_DISABLE; do
+		if ! use strongswan_plugins_${mod}; then
+			myconf+=" --disable-${mod}"
+		fi
+	done
+
+	for mod in $STRONGSWAN_PLUGINS_OPT; do
+		if use strongswan_plugins_${mod}; then
+			myconf+=" --enable-${mod}"
+		fi
+	done
+
+	econf \
+		--disable-static \
+		--enable-ikev1 \
+		--enable-ikev2 \
+		--enable-swanctl \
+		--enable-socket-dynamic \
+		--enable-cmd \
+		$(use_enable curl) \
+		$(use_enable constraints) \
+		$(use_enable ldap) \
+		$(use_enable debug leak-detective) \
+		$(use_enable dhcp) \
+		$(use_enable eap eap-sim) \
+		$(use_enable eap eap-sim-file) \
+		$(use_enable eap eap-simaka-sql) \
+		$(use_enable eap eap-simaka-pseudonym) \
+		$(use_enable eap eap-simaka-reauth) \
+		$(use_enable eap eap-identity) \
+		$(use_enable eap eap-md5) \
+		$(use_enable eap eap-aka) \
+		$(use_enable eap eap-aka-3gpp2) \
+		$(use_enable eap md4) \
+		$(use_enable eap eap-mschapv2) \
+		$(use_enable eap eap-radius) \
+		$(use_enable eap eap-tls) \
+		$(use_enable eap eap-ttls) \
+		$(use_enable eap xauth-eap) \
+		$(use_enable eap eap-dynamic) \
+		$(use_enable farp) \
+		$(use_enable gmp) \
+		$(use_enable gcrypt) \
+		$(use_enable mysql) \
+		$(use_enable networkmanager nm) \
+		$(use_enable openssl) \
+		$(use_enable pam xauth-pam) \
+		$(use_enable pkcs11) \
+		$(use_enable sqlite) \
+		$(use_enable systemd) \
+		$(use_with caps capabilities libcap) \
+		--with-piddir=/run \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if ! use systemd; then
+		rm -rf "${ED}"/lib/systemd || die "Failed removing systemd lib."
+	fi
+
+	doinitd "${FILESDIR}"/ipsec
+
+	local dir_ugid
+	if use non-root; then
+		fowners ${UGID}:${UGID} \
+			/etc/ipsec.conf \
+			/etc/strongswan.conf
+
+		dir_ugid="${UGID}"
+	else
+		dir_ugid="root"
+	fi
+
+	diropts -m 0750 -o ${dir_ugid} -g ${dir_ugid}
+	dodir /etc/ipsec.d \
+		/etc/ipsec.d/aacerts \
+		/etc/ipsec.d/acerts \
+		/etc/ipsec.d/cacerts \
+		/etc/ipsec.d/certs \
+		/etc/ipsec.d/crls \
+		/etc/ipsec.d/ocspcerts \
+		/etc/ipsec.d/private \
+		/etc/ipsec.d/reqs
+
+	dodoc NEWS README TODO
+
+	# shared libs are used only internally and there are no static libs,
+	# so it's safe to get rid of the .la files
+	find "${D}" -name '*.la' -delete || die "Failed to remove .la files."
+}
+
+pkg_preinst() {
+	has_version "<net-vpn/strongswan-4.3.6-r1"
+	upgrade_from_leq_4_3_6=$(( !$? ))
+
+	has_version "<net-vpn/strongswan-4.3.6-r1[-caps]"
+	previous_4_3_6_with_caps=$(( !$? ))
+}
+
+pkg_postinst() {
+	if ! use openssl && ! use gcrypt; then
+		elog
+		elog "${PN} has been compiled without both OpenSSL and libgcrypt support."
+		elog "Please note that this might effect availability and speed of some"
+		elog "cryptographic features. You are advised to enable the OpenSSL plugin."
+	elif ! use openssl; then
+		elog
+		elog "${PN} has been compiled without the OpenSSL plugin. This might effect"
+		elog "availability and speed of some cryptographic features. There will be"
+		elog "no support for Elliptic Curve Cryptography (Diffie-Hellman groups 19-21,"
+		elog "25, 26) and ECDSA."
+	fi
+
+	if [[ $upgrade_from_leq_4_3_6 == 1 ]]; then
+		chmod 0750 "${ROOT}"/etc/ipsec.d \
+			"${ROOT}"/etc/ipsec.d/aacerts \
+			"${ROOT}"/etc/ipsec.d/acerts \
+			"${ROOT}"/etc/ipsec.d/cacerts \
+			"${ROOT}"/etc/ipsec.d/certs \
+			"${ROOT}"/etc/ipsec.d/crls \
+			"${ROOT}"/etc/ipsec.d/ocspcerts \
+			"${ROOT}"/etc/ipsec.d/private \
+			"${ROOT}"/etc/ipsec.d/reqs
+
+		ewarn
+		ewarn "The default permissions for /etc/ipsec.d/* have been tightened for"
+		ewarn "security reasons. Your system installed directories have been"
+		ewarn "updated accordingly. Please check if necessary."
+		ewarn
+
+		if [[ $previous_4_3_6_with_caps == 1 ]]; then
+			if ! use non-root; then
+				ewarn
+				ewarn "IMPORTANT: You previously had ${PN} installed without root"
+				ewarn "privileges because it was implied by the 'caps' USE flag."
+				ewarn "This has been changed. If you want ${PN} with user privileges,"
+				ewarn "you have to re-emerge it with the 'non-root' USE flag enabled."
+				ewarn
+			fi
+		fi
+	fi
+	if ! use caps && ! use non-root; then
+		ewarn
+		ewarn "You have decided to run ${PN} with root privileges and built it"
+		ewarn "without support for POSIX capability dropping. It is generally"
+		ewarn "strongly suggested that you reconsider- especially if you intend"
+		ewarn "to run ${PN} as server with a public ip address."
+		ewarn
+		ewarn "You should re-emerge ${PN} with at least the 'caps' USE flag enabled."
+		ewarn
+	fi
+	if use non-root; then
+		elog
+		elog "${PN} has been installed without superuser privileges (USE=non-root)."
+		elog "This imposes a few limitations mainly to the daemon 'charon' in"
+		elog "regards of the use of iptables."
+		elog
+		elog "Please carefully read: http://wiki.strongswan.org/projects/strongswan/wiki/ReducedPrivileges"
+		elog
+		elog "Thus if you require to specify a custom updown"
+		elog "script to charon which requires superuser privileges, you"
+		elog "can work around this limitation by using sudo to grant the"
+		elog "user \"ipsec\" the appropriate rights."
+		elog "For example (the default case):"
+		elog "/etc/sudoers:"
+		elog "  ipsec ALL=(ALL) NOPASSWD: SETENV: /usr/sbin/ipsec"
+		elog "Under the specific connection block in /etc/ipsec.conf:"
+		elog "  leftupdown=\"sudo -E ipsec _updown iptables\""
+		elog
+	fi
+	elog
+	elog "Make sure you have _all_ required kernel modules available including"
+	elog "the appropriate cryptographic algorithms. A list is available at:"
+	elog "  https://wiki.strongswan.org/projects/strongswan/wiki/KernelModules"
+	elog
+	elog "The up-to-date manual is available online at:"
+	elog "  https://wiki.strongswan.org/"
+	elog
+}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 9bfc96804843..c3dfa73e10a4 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/crackle/Manifest b/net-wireless/crackle/Manifest
index 3de92c9fe359..0688d341f55c 100644
--- a/net-wireless/crackle/Manifest
+++ b/net-wireless/crackle/Manifest
@@ -1,4 +1,4 @@
 AUX flags.patch 545 BLAKE2B 74c5fa412bf924efadc64ed8cd67ab92df7f141953caa08b65aa417aec217007e49d3ae62eda5a90b4bad6bcb632b9fa4f6c9e5e46468007daf197017d7afed4 SHA512 b229062f011559fce843bb5c47ae3b0cf03f30467ff51c3015d2ef39d61dc3625233625a869084f3e8bad8310332335817609fefb6cbcfcd78767158c50d158b
 DIST crackle-0.1.tgz 27015 BLAKE2B 90cf55c24afd2327f0400d5fa0418a7d6f73f5c81dfe04bd795b76bd6f437b1c9ce11a139c8e0076b3752e3c73d66d3610ea7421e08cbce9e77260551e27bc89 SHA512 e60341e1fae6a3212028714a7bdba2c8f65d4b92d3d670194954df0e11e1f69a1bb6a5bcbdd5c4db54774cfe60955d50fbd2bfaff5fa615bf253f57283cfa17b
-EBUILD crackle-0.1-r1.ebuild 533 BLAKE2B 2c5faf0e910c4c27b99740eafbd33b32c515ad43966f4e511f33be25a4522d3939d6a0380c12c38b232a3ee55d12b2b3e46e07eaf12a99757ef7854372866ac9 SHA512 1857b1b84d419fbe258fa6237c9a9817fa9a5b8055bdb28070d515a080722cc2484ef00cf02f1d81263db3329c02879d3c61e646e5473db6eb46c035c5dfb7ed
+EBUILD crackle-0.1-r1.ebuild 533 BLAKE2B 5ff66bbc49fd05feaaf9f7db5da2de4c769c4e7f485a0d52373539275b4c68b49f653602ddc32401fb2f79c09a772cd9199e22c8f453115c9ea4a14f8045f560 SHA512 72096e87fb2ace65bbfb59e7d0dbd59b49c0d1c05e318aaa600278149311b866672e09266a7d7d359fe136c78e1cc142d9832fe827b8a1af7932ebc81f367b32
 MISC metadata.xml 242 BLAKE2B 759698f297aa1433159cc8d44fc0f8e77e3b9d1e812a023acbd581f105ed1e9d69eb5117e3da5961fb59e9120af6e584b92b0ae554518a6c4cfc171ae16ad48e SHA512 f80486dfc128933ad7de3d0105385fad5cc3566b4f901c3faa58168fcfef2d2827c9599e5b4d1fd164ee61609a9ec20730c8e11fa1ae010ee5862e6e5510e5dc
diff --git a/net-wireless/crackle/crackle-0.1-r1.ebuild b/net-wireless/crackle/crackle-0.1-r1.ebuild
index 9bcfc7aa0696..6c0f1f76dee8 100644
--- a/net-wireless/crackle/crackle-0.1-r1.ebuild
+++ b/net-wireless/crackle/crackle-0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ RDEPEND="${DEPEND}"
 RESTRICT="test"
 
 PATCHES=(
-	${FILESDIR}"/flags.patch"
+	"${FILESDIR}"/flags.patch
 )
 
 src_configure() {
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 94862b487679..cf07fa139821 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/package.mask b/profiles/package.mask
index 631254d92c79..23d2ee7c1f6c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,21 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2022-08-11)
+# Niche library with no revdeps left.  Last commit in 2015.
+# Removal on 2022-09-10.  Bug #864889.
+dev-libs/libdivsufsort
+
+# John Helmert III <ajak@gentoo.org> (2022-08-10)
+# Root privilege escalation vulnerability, many open bugs. Removal in 30
+# days, bug 630752
+net-analyzer/sguil-sensor
+
+# John Helmert III <ajak@gentoo.org> (2022-08-10)
+# Root privilege escalation vulnerability, unmaintained since the git
+# transition, multiple open bugs. Removal in 30 days, bug 630752
+app-admin/logcheck
+
 # Matthew Smith <matthew@gentoo.org> (2022-08-09)
 # Please update to Erlang/OTP 24 or 25. Removal in 30 days.
 # See following link for breaking changes:
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index db363c686ffc..140a5896fb3d 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2463,6 +2463,7 @@ dev-python/pyocr:cuneiform - Enable support for the app-text/cuneiform OCR engin
 dev-python/pyocr:tesseract - Enable support for the app-text/tesseract OCR engine
 dev-python/pypax:ptpax - Enable PT_PAX_FLAGS support.
 dev-python/pypax:xtpax - Enable XATTR_PAX_FLAGS support.
+dev-python/pypy:full-stdlib - Install complete stdlib as necessary to use PyPy for general purpose programs. By default, only a limited subset that is used when building dev-python/pypy3-exe is installed. Note that PyPy2.7's stdlib contains multiple known vulnerabilities.
 dev-python/pypy-exe:low-memory - Build using PyPy with the engine configured towards low memory footprint. This makes it possible to build PyPy using ~3.5G of RAM on amd64 and ~half of that on x86, at the cost of lengthened build time.
 dev-python/pypy3:ensurepip - Install the ensurepip module that uses bundled wheels to bootstrap pip and setuptools (if disabled, it will be only possible to use venv `--without-pip`)
 dev-python/pypy3-exe:low-memory - Build using PyPy with the engine configured towards low memory footprint. This makes it possible to build PyPy using ~3.5G of RAM on amd64 and ~half of that on x86, at the cost of lengthened build time.
@@ -3260,7 +3261,6 @@ games-sports/xmoto:double-precision - more precise calculations at the expense o
 games-strategy/0ad:editor - Include Atlas scenario editor projects
 games-strategy/0ad:lobby - Enable the use of net-libs/gloox and the multiplayer lobby
 games-strategy/0ad:nvtt - Support for some uncompressed data formats (might be needed for some mods)
-games-strategy/augustus:uncapped - Uncap grand temple count
 games-strategy/colobot:devbuild - TODO
 games-strategy/colobot:tools - Build tools
 games-strategy/colobot-data:music - Enable music support
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 8d95a0e96190..e5be4435d372 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/fplll/Manifest b/sci-libs/fplll/Manifest
index 4052ec8c2093..c976b079cc54 100644
--- a/sci-libs/fplll/Manifest
+++ b/sci-libs/fplll/Manifest
@@ -1,4 +1,3 @@
-AUX fplll-5.4.0-gcc11.patch 623 BLAKE2B 230fcf908c4a6604f6da3800927b9bfee0d9c8b979d0b4cfeba5bf5ae68256f1d457bade2d62c30f2a7e7c07d8433374b19459a3f6d37ba71766b73e1cb189bc SHA512 35b1589267cadddbb7aef7859a748eb171f4545ed42037645588d44df0e404a3ec5f21419ad4a1e34dd5fd037cdceeb927ec7b7a770e4a24eecdbdee6b3176bd
 AUX fplll-5.4.2-with-qd-fix.patch 942 BLAKE2B 3335262a47db7cc8fe48d79f2638882a8522ea026f55bbcd9b612457ef6186b84e673e0d9b0b9a022f4a3915dff830ab28ab47a5093fc3364fa4d4fc1317ef8f SHA512 4fcfb3aea3fe72d8072996c2bc6e5f626b4972448871578a29119cd10325d0451186d410f6732d58f96eb18ae040ed8410213228b63aa3012dba63a1916e68bd
 DIST fplll-5.4.2.tar.gz 2618377 BLAKE2B e730c8646b9afb68515a23e533ea8ef833439d69f2130157bd6e38b1efab9116817535c261721c98b23410185271ffc323c687630e3ba262adb97fa5f69be787 SHA512 45324d89d0efeb269c1d1400332a51432e5d09f7bf0a6d651650e0941bb718493cbb66d65056b98691691236eaf348b2cae686ee06761f64380df98b6206c004
 EBUILD fplll-5.4.2.ebuild 766 BLAKE2B d7862862614674ee233c8e9dc336d85098699c6743e8b1e0b8363bb11130b2e246972301373cb50dec1c3b0b373bb02fec90616c2619e9572e35a7a1e83d0668 SHA512 a115045f6e5ceeb501714775db7a08b15928096100b23b89a597eef41cc61768a9add4dfd53b16974794ab7cd47a5296824dc02a5341a55115f478b827a4e127
diff --git a/sci-libs/fplll/files/fplll-5.4.0-gcc11.patch b/sci-libs/fplll/files/fplll-5.4.0-gcc11.patch
deleted file mode 100644
index 935d342cda14..000000000000
--- a/sci-libs/fplll/files/fplll-5.4.0-gcc11.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 1d7dded000e425bb103841e68c79f81b335b7271 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Bissey?= <frp.bissey@gmail.com>
-Date: Sat, 1 May 2021 08:19:41 +1200
-Subject: [PATCH] minimal change to compile with gcc-11
-
----
- fplll/enum/enumerate_ext_api.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/fplll/enum/enumerate_ext_api.h b/fplll/enum/enumerate_ext_api.h
-index 387a1461..803c870e 100644
---- a/fplll/enum/enumerate_ext_api.h
-+++ b/fplll/enum/enumerate_ext_api.h
-@@ -18,6 +18,7 @@
- #define FPLLL_ENUMERATE_EXT_API_H
- 
- #include <array>
-+#include <cstdint>
- #include <functional>
- #include <memory>
- 
diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest
index 0ded9d4834a8..2c239ec1fd43 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -6,8 +6,8 @@ AUX libsc-9999-set_version.patch 1517 BLAKE2B 64fecf32b07b37616ec6f80fbed0203df5
 DIST libsc-2.3.1.tar.gz 344456 BLAKE2B cee44d07372162aecc8104257d1c5d4935d60030ceae4041ae4c5110f491b48b7709c55af0286b2a1fc5df2d7883b2ab4499c3884162b779fb9aaa86fbc5822c SHA512 02e160ad6fb4e674a9de2a41cfef6727d470a17c184e7b0310fe3e39f1112f4c643ca35a62377562caf1e8cc753cd5c0f5f996fba24b115498b01d16c140080a
 DIST libsc-2.3.3.tar.gz 345177 BLAKE2B c9077cfe7af3eb8bfb34cf655fa8e49658f1ce0b866b58398fc7bae305ac276b002c83d930a20df1bdf52a22645ebb1698d51a937ce56db993d36ef68d640e8a SHA512 b51d08a987d7c8a83eaae0be98a078a4a9160b9141b482015110534ddac075337c81f54f3efa4f8a8bce54e31565a6323aad37e35674c1d40686d4ab3747ed6b
 DIST libsc-2.8.3.tar.gz 360755 BLAKE2B 2d7e3a16b97de551678ebb33f362e1ef7ebb0bcbf8d00b1a5317bfbf6732cf7bb9be2d215c79395809f3c616c23da5236c4f0f436a7b8bb07171141aaf08bbb3 SHA512 9def8850898f2d7d7a6ffaffd0872bc18af28026407356a1fe10f2b4f6d4a32ae6febe59c91cfa8817969624f995d48f64e0d5424b475e3a4c501338f4de70de
-EBUILD libsc-2.3.1-r1.ebuild 2329 BLAKE2B 0e76824c176255a9f3f5d3094f07d5ad8fbcc721f069ea2b0981ddffbc821fcc5eee5f0780a074ed828e4344ab76d8d64426cbf79918a3044dcdeddbf2fef490 SHA512 9094098895f555dc8cb62c78b2fd600b1b563dfb0412bff14f593c1706dd96b633eb76aeaaf205d527ec3e842c0fff04a35997f368c52a30ed90c0f0930fd47a
-EBUILD libsc-2.3.3.ebuild 2329 BLAKE2B 0e76824c176255a9f3f5d3094f07d5ad8fbcc721f069ea2b0981ddffbc821fcc5eee5f0780a074ed828e4344ab76d8d64426cbf79918a3044dcdeddbf2fef490 SHA512 9094098895f555dc8cb62c78b2fd600b1b563dfb0412bff14f593c1706dd96b633eb76aeaaf205d527ec3e842c0fff04a35997f368c52a30ed90c0f0930fd47a
+EBUILD libsc-2.3.1-r1.ebuild 2331 BLAKE2B 18265e2eb815a1b9ddc0da1d09318fd4d90867b3ed0b79503a396b09b9dc373820ab4ee358fafddbaf9f16e522905b27d5bfcbbbde95f946b2cc5a35893b1fc1 SHA512 73b5d0d641b15030a30e050ff29940da5a3c19dfb6506d71307aff7c62ef4184c7044a169f6188b295d0882fac57fb1808ed33ee66067bb74e4b28df3e0f62e9
+EBUILD libsc-2.3.3.ebuild 2331 BLAKE2B 18265e2eb815a1b9ddc0da1d09318fd4d90867b3ed0b79503a396b09b9dc373820ab4ee358fafddbaf9f16e522905b27d5bfcbbbde95f946b2cc5a35893b1fc1 SHA512 73b5d0d641b15030a30e050ff29940da5a3c19dfb6506d71307aff7c62ef4184c7044a169f6188b295d0882fac57fb1808ed33ee66067bb74e4b28df3e0f62e9
 EBUILD libsc-2.8.3.ebuild 1410 BLAKE2B f4654f5c21f62903c0a41e101acf83963972d3d4c243991c909930b8ea85bf601d5b879875bc736ece50bf0fc9ba15140de6cd960ac42532e3866b7c2cd3e388 SHA512 bc4edc505cbee1411027ea8869c8d4feab0006e8fb873cea02f9db59bb4a82f55c7d1391e4dca153e80e5292864120d7baa96f63c83290d0167492e43c381c33
 EBUILD libsc-9999.ebuild 1417 BLAKE2B ecdf34e21086e08c1716f020056ecb36ee8ff98b56fa3b544de22194cb545d848069a01de7ecca14a0a7111b27adfb56116f3f544ae7bb79fca071634e921898 SHA512 cbaaf4392a37220a02580af80884c0c763f1bb34a891219d404f942606e6c394b6f8c3fbe73970909dc0430c8db4ed68f9821c793bf41b481d16ee6c57764a38
 MISC metadata.xml 713 BLAKE2B 409d3a0b9037446fad7c431ad9908d6e39fc13a07ac5077e954a33e41e568480546dfb80e29de09071eafa553f683b95b12e4c7fa8175ec0e4da0bcdffc798ba SHA512 cbfb73ff9862b11e63e0d83064bc80f52569df860bdc669aebf83f2ecf3004fd1b4ca2fcc88fc1b981fd5435a5778e9d16483a706327a9f0eeeb87285651cfe8
diff --git a/sci-libs/libsc/libsc-2.3.1-r1.ebuild b/sci-libs/libsc/libsc-2.3.1-r1.ebuild
index 667c713b0096..6728d0cadb05 100644
--- a/sci-libs/libsc/libsc-2.3.1-r1.ebuild
+++ b/sci-libs/libsc/libsc-2.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -55,7 +55,7 @@ src_prepare() {
 	sed -i -e "s/@LUA_IMPL@/${ELUA}/" "${S}"/src/sc_lua.h || die
 
 	# Inject a version number into the build system
-	echo "${PV}" > ${S}/.tarball-version || die
+	echo "${PV}" > "${S}"/.tarball-version || die
 	eautoreconf
 }
 
diff --git a/sci-libs/libsc/libsc-2.3.3.ebuild b/sci-libs/libsc/libsc-2.3.3.ebuild
index 667c713b0096..6728d0cadb05 100644
--- a/sci-libs/libsc/libsc-2.3.3.ebuild
+++ b/sci-libs/libsc/libsc-2.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -55,7 +55,7 @@ src_prepare() {
 	sed -i -e "s/@LUA_IMPL@/${ELUA}/" "${S}"/src/sc_lua.h || die
 
 	# Inject a version number into the build system
-	echo "${PV}" > ${S}/.tarball-version || die
+	echo "${PV}" > "${S}"/.tarball-version || die
 	eautoreconf
 }
 
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index 388b901a86ac..04e81b810b74 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -8,8 +8,8 @@ DIST libsc-2.3.3.tar.gz 345177 BLAKE2B c9077cfe7af3eb8bfb34cf655fa8e49658f1ce0b8
 DIST p4est-2.3.1.tar.gz 2623681 BLAKE2B 426f15d27dd376b918e197adc46a8ef5555bd4765f53d7c98bc8f9b58e0a27125d38808503fd1c545e428e845635e2499ba27df22a989ed619ce264417d02908 SHA512 c691b39d140c2714a813dc45f721cf21a1e0f5d1a264a3d5733b09ec90cc3f8bcc9e5d799e41e91d2b994490c811287f8177bf6d7890ea4cd1cdfecb95cdbf23
 DIST p4est-2.3.3.tar.gz 2644849 BLAKE2B f39546d0583c4671f32814c3c1d297d903a4f7466f27049ef4e38d1138c83f57e991f6a702d0109e438337f98be13e8554a4dfef3e1c129f3d2690e0b4a54bbb SHA512 7f528a942438073c9f43242eae5383cdc1f64f0f26f96eccd01afc053e0454691160e7210dda2ad2bdd621fd3c17551dd205af417dd244642b1358cbe4aaa2fd
 DIST p4est-2.8.0.tar.gz 2655761 BLAKE2B 0637045bca3525d5d737010865c06d1273c6ecf848ab5ca55d1f19156550b7d7676c4f8d7c7a71b1fc70381dc7912cdca1e5405bb0af948180f75da1a3b1f343 SHA512 599faad177ce21f917e4ddfd969d6ef8c1f08b1e701cbdb9d4a1aa6dfd927176468afe757d018b9b7ded6a9ce165cd6fe78e0688b22cf6b9975cbd85d6f45d3c
-EBUILD p4est-2.3.1-r1.ebuild 2917 BLAKE2B cac667b2d40f920b9b48732ae4e503d30f391a44b080adc00545fa6eb09268aa6c36a882126a4cb78609eb4288131fbcbeee82e94b8487b8bdc9af99dacc90cc SHA512 0d2b661d46c9a0cc11b84cc941cc28c340fc5b0efbe8eab09e46fc1daef1dcbbcf099522cd2c08c890d09455151b055e92dc5cff137c78632ea7ab26ed3f91f9
-EBUILD p4est-2.3.3.ebuild 2917 BLAKE2B cac667b2d40f920b9b48732ae4e503d30f391a44b080adc00545fa6eb09268aa6c36a882126a4cb78609eb4288131fbcbeee82e94b8487b8bdc9af99dacc90cc SHA512 0d2b661d46c9a0cc11b84cc941cc28c340fc5b0efbe8eab09e46fc1daef1dcbbcf099522cd2c08c890d09455151b055e92dc5cff137c78632ea7ab26ed3f91f9
+EBUILD p4est-2.3.1-r1.ebuild 2919 BLAKE2B 030e3710c3d47c201763fd6e393bc3a2508f7bceab1db077afd5b1f11401703bae2ec4d06422b3d9e6af4644c599bb085453fbe0d9f9571255f7db6245f0ce16 SHA512 7cda5e11963275d9daf0d8d276ef7f31620e62be6dd4d31741dc751c0d26dc869de652fbd2e7d577362088d518440da6984d4e37d83c335dc6b97f3b305ca589
+EBUILD p4est-2.3.3.ebuild 2919 BLAKE2B 030e3710c3d47c201763fd6e393bc3a2508f7bceab1db077afd5b1f11401703bae2ec4d06422b3d9e6af4644c599bb085453fbe0d9f9571255f7db6245f0ce16 SHA512 7cda5e11963275d9daf0d8d276ef7f31620e62be6dd4d31741dc751c0d26dc869de652fbd2e7d577362088d518440da6984d4e37d83c335dc6b97f3b305ca589
 EBUILD p4est-2.8.0-r1.ebuild 1551 BLAKE2B 831a5c37bb0997a530c3b72f54358699fbf2288b4cda79026ea26ecd94181138e5b875b6502339c03c80265aa6ff54f41021f98f938eb91695bd866096dff066 SHA512 6540a34f7026bee590b9302eb68a55375f0843f3ce37ce2a1a34b0d2ea42e4a8bbc2a28f2691ad6084d57ad944fa39eecda540fd4a5dd5075a9bf0a05dd30141
 EBUILD p4est-9999.ebuild 1495 BLAKE2B cff45eb0a7951254a026c82c186f7eaea825779bdba372bea524a9913d070c281f0c88b55243ec5c4a883169f209a52d8055ea151e1a4b0f7feb5b6f0beaf810 SHA512 c60b7aa0d13389c30ad4c10ef9127f6c8ce6fdde10a00ddf2cf287070aef6a53d21feacecdebc353d123ec6de8f48b9f29111b281734b2898d5b823ce7b9b1d0
 MISC metadata.xml 933 BLAKE2B dbebf4c49f70183487e695e63b78c412260956c197dce7471145c8eb150672fcd7223d1ab4b81c793c0147bc77c49f235fbf31949581d760d077c0ca61e72a0b SHA512 228cade7cf570c4e5f629ae64b8fef9cb3635556f2ad52bc31c34480cc148ace1d2ebcb59563d02f1cc94f21a863c6077e8acc9b58b01d0519962c1580d836c5
diff --git a/sci-libs/p4est/p4est-2.3.1-r1.ebuild b/sci-libs/p4est/p4est-2.3.1-r1.ebuild
index c7756fee11c5..0d1041be0bd0 100644
--- a/sci-libs/p4est/p4est-2.3.1-r1.ebuild
+++ b/sci-libs/p4est/p4est-2.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -63,7 +63,7 @@ src_prepare() {
 	fi
 
 	# Inject a version number into the build system
-	echo "${PV}" > ${S}/.tarball-version
+	echo "${PV}" > "${S}"/.tarball-version
 
 	AT_M4DIR="${WORKDIR}/${P}/config ${WORKDIR}/${P}/sc/config"
 	eautoreconf
diff --git a/sci-libs/p4est/p4est-2.3.3.ebuild b/sci-libs/p4est/p4est-2.3.3.ebuild
index c7756fee11c5..0d1041be0bd0 100644
--- a/sci-libs/p4est/p4est-2.3.3.ebuild
+++ b/sci-libs/p4est/p4est-2.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -63,7 +63,7 @@ src_prepare() {
 	fi
 
 	# Inject a version number into the build system
-	echo "${PV}" > ${S}/.tarball-version
+	echo "${PV}" > "${S}"/.tarball-version
 
 	AT_M4DIR="${WORKDIR}/${P}/config ${WORKDIR}/${P}/sc/config"
 	eautoreconf
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index c795d54d96e4..ab09138c652e 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/nauty/Manifest b/sci-mathematics/nauty/Manifest
index 4efa59d87abd..601dc7f80fc4 100644
--- a/sci-mathematics/nauty/Manifest
+++ b/sci-mathematics/nauty/Manifest
@@ -1,5 +1,8 @@
 DIST nauty-includes.patch 2530 BLAKE2B 8789bc2f65b89aa3bbf27e517f1c56340f9bde089ef54aa28757c66c3954b5c54e8a09b6989ad8d57098970240dd1838baa0003766fe10c7f6c32041abf461e3 SHA512 d11f530fecb86edc9e95f0b4d91240778047c0e84d6259c80490358baf0a3eeaa112acfe1fcdb594da6c6e17855f5e21cb75c88446b8d6d9e96402be0e5e6af2
 DIST nauty27r3.tar.gz 1721200 BLAKE2B 2071f241dc531a056c678be0ec40497421440f2d5f1796ba20c1257feff426a452df592912faadca08010b29afbbc8cc0552c0517c168af3de9f3334b60d7f18 SHA512 8d6d92de8d348d3874677a55773088f4ff5b9a45fd9ed3802c9b1590072f5861946ac1d21892f4b383a9e36f6c9ac08270d021429cf36da3e5038e6a38d9fb6c
+DIST nauty27r4.tar.gz 1731562 BLAKE2B 104481e5af3333b60574a7185848832ad08b0cfeb8378e3c89ddd3f2cc87023cd701889356fa196b529ddbf19232a733fe3e694d9573adef04c2ad86baaf38e5 SHA512 2ed691bf0a6806f77cccbd95ee7687a66b6e6342493a0d65636166727cf4ea8cd887187d88a3154d911f665deb8d6f5bbaba33c8a1b740a564a1fc52bf4b4520
 DIST nauty_2.7r3+ds-1.debian.tar.xz 45520 BLAKE2B 5078ab84d1fcdbddc0f7442ebed57fb63551701295615b99f2833c300168dd7f71205fa3cc2e9ea977f52e389b67883b68e7d5d39e1698c6040913e4571fa4f9 SHA512 8618c78a7c6f1d579cb20048fcf55fb45b69d8d1cebd7f2c9aee664768ab78f0ab1930863c8475a153c9ac9f4692cf6e43f96d01c4a219eae1f23bb61cb50407
+DIST nauty_2.7r4+ds-1.debian.tar.xz 45712 BLAKE2B e4a7a1d2b70b5fa969f708bbd56b47aaf422c268be23ffa7ceb3f9cc21ff8d27270556adadd43fe60309e7840e1541a586b1d9d42d90ba6207801e170b747922 SHA512 7384e7637a875c35f6da94707576aa26a94f981a750eb80991a837fa9ae245680f11ca57cf24a9efe1164dcd386c9888270688c1b3de30d1a81b67bb7c670dd9
 EBUILD nauty-2.7.3.ebuild 1961 BLAKE2B af67f6907cc1ccf3bae706626e1d682c33b55aa0f0b85773968cf07f6d2ee5d7a3692d948f7aaf4ebfb30827c177f63db6fe2e7d0fe99165c720b555f4259645 SHA512 93691377b8e67eca41e8d80c2902f91c8182714eff9f3c4cae2e4afd03d379b71c0f710785671a35569105b6294abb8d4fcb9e57ab6c82ba06814955dd01dc66
+EBUILD nauty-2.7.4.ebuild 2320 BLAKE2B 015c98f4c476ccdb866cab3f8e651b5f1422c4c87cd62d4d0b96741e5820237b89caf744428b4191fdf29ba33a1fb2570d96fad3b684f0a3cb00e4cd663eb86f SHA512 df91230fd04016d66e3cc8cbd3236a3718fbfcf5946612068c49f5509b156d42dee0d71d708e763abdf30f9aa8169f89b53ad492b0b2229093b8439f5b9c87fa
 MISC metadata.xml 546 BLAKE2B a4224bf8078d785c2f6a90c3041db97b0dac92eca9ab9513989f899fc7b57e5a95d918a4abc7cbf2d8605107c764e32d4473cea6fa59703a0571aedf48aa5bfe SHA512 ff16cdbedc93669baa03da38ff27683c1a638390611b5c67f1be271542c1cb332e164743b3c9e8b43e89f14316970603bbe7f9130ad656257d8e0a654ce63238
diff --git a/sci-mathematics/nauty/nauty-2.7.4.ebuild b/sci-mathematics/nauty/nauty-2.7.4.ebuild
new file mode 100644
index 000000000000..d6f312ce894b
--- /dev/null
+++ b/sci-mathematics/nauty/nauty-2.7.4.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_PV1=$(ver_rs 2 'r')
+MY_PV=$(ver_rs 1 '' $(ver_rs 2 'r'))
+DEBIAN_PATCH_VERSION=1
+
+DESCRIPTION="Computing automorphism groups of graphs and digraphs"
+HOMEPAGE="https://pallini.di.uniroma1.it/"
+
+SRC_URI="https://pallini.di.uniroma1.it/${PN}${MY_PV}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV1}+ds-${DEBIAN_PATCH_VERSION}.debian.tar.xz
+	https://src.fedoraproject.org/rpms/nauty/raw/f35/f/nauty-includes.patch"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+IUSE="examples"
+
+BDEPEND="sys-apps/help2man"
+DEPEND="dev-libs/gmp:0
+	sys-libs/zlib
+	sci-mathematics/cliquer"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}${MY_PV}"
+
+DOCS=( schreier.txt formats.txt changes24-27.txt )
+
+PATCHES=(
+	"${WORKDIR}"/debian/patches/upstream-fix-gt_numorbits.patch
+	"${WORKDIR}"/debian/patches/upstream-C2help2man.patch
+	"${WORKDIR}"/debian/patches/upstream-autotoolization.patch
+	"${DISTDIR}"/nauty-includes.patch
+	"${WORKDIR}"/debian/patches/unbundle-cliquer.patch
+)
+
+src_prepare() {
+	default
+	rm makefile || die
+
+	# The debian patch looks for <cliquer.h>, but the autotools-form of
+	# cliquer installs that header as <cliquer/cliquer.h>.
+	sed -e 's~<cliquer\.h>~<cliquer/cliquer\.h>~' -i nautycliquer.h || die
+
+	# The debian autotools patch has only a placeholder in LT_INIT for
+	# the version that we must provide.
+	sed -e "s/@INJECTVER@/${PV}/" -i configure.ac || die
+
+	# This is not great, since consumers should expect to see the
+	# upstream versioning scheme in e.g. PKG_CHECK_MODULES. However, the
+	# upstream version is next to impossible to use for comparisons, so
+	# at least this fixes the QA warning and makes the pkg-config
+	# version useful on Gentoo?
+	sed -e "s/^Version:.*/Version: ${PV}/" -i nauty.pc.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Fedora has a patch to enable popcnt at runtime on CPUs that support it,
+	# but their patch isn't applying cleanly. What's worse, the patch doesn't
+	# support clang (bug 732020).
+	econf --disable-static \
+		  --disable-popcnt \
+		  --enable-tls \
+		  --enable-generic
+}
+
+src_install() {
+	default
+
+	if use examples; then
+		docinto examples
+		dodoc nautyex*.c
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 3690fc8b3b06..492ac52e70d5 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -5,6 +5,6 @@ AUX pari-2.9.4-fltk-detection.patch 572 BLAKE2B 1c2e1fa6e52521c7865c3fd011824c83
 AUX pari-2.9.4-ppc.patch 363 BLAKE2B 135e76972e4121362666a25e3da236c4a5b7cffa058bbc25b59ca19ea20ccb0665327f70701adca5239cb936d513976e3ba7b5cda915a3f77c7b2eb28e75eaa0 SHA512 aaf5960010e56722f11234079a20ee7a7f8819dc084e1f6567fd11ad2820e3ae47617608f312941c2f373b5312a8c09c9cd51bfa44e263ffe1e8062c9fd9877d
 AUX pari-2.9.4-strip.patch 323 BLAKE2B 85a2b56f5501b4dafc0bffe48249c1662d6f96e81f8e8260ad52ecf84f053efef2ee6d6be6a6fda47886c372eb338d8bbf4443910df79a0d4e168b2666228c37 SHA512 50624ead82da41819ccfadfbdb746fb6ff414196ae2576c5d6a86e83c67355740b0e6e901a2860cab202db15adb1b00e346aabba338ab303230bc6aee8d33076
 DIST pari-2.13.4.tar.gz 4772735 BLAKE2B 5a3eebd380f1e47f38746b03ddde9a715ed74e7e8e4ed30ef8f2d62cf7289694b800fc8396557150ce9d79245c244fb56cecddac867c6057b438da4df68505e6 SHA512 0eb8c0100d76fb8f29fd29e6a49e9534b9a4d90e1869820dbfddd57fe444f0e83909947331823157a67be31f71a5d26fa1224f72ce3f9e5197db0194c417b9b9
-EBUILD pari-2.13.4-r1.ebuild 3671 BLAKE2B c0e417e506e94cba9c1301594a10d00cd863c82ad9a82fe27ce8292424c15529956a6aefa1901a4d1d44d279f70031c2451a8ae35a137b34566478b2da169a81 SHA512 eec4bf91eb7a152131ed83d74a1f77147ee8fc1468cfa5983ce19d2227be46b73d840659d2c345fedd9c8ae7aaa8a66710cadb2d7c67bf6d7af0e00ccde0109c
+EBUILD pari-2.13.4-r1.ebuild 3669 BLAKE2B 50694a82d37f3d7315e61f804029a6271afc2193a28378e8321cef7d4cedac8f04b4e972547427f58712e3b003eea7371df7a2f21f990eb81e8ec667bca62e06 SHA512 d58c360d15d93cc4131a3f54438e34522ccdb1b42b5298551f73f86e619f8b6219e6472c97e44bb3a3bb22c9bd0b5bc174a85a38e15f3415e89fcda53293debf
 EBUILD pari-2.13.4.ebuild 3420 BLAKE2B 5c30dcb0cc91164956ce0ba5425d591dccbfda71b45991f3620129400a4924934ce857a0bd6758b10a0677ff560ef0295fba04ac3e2536897278ea9a9dec6cc3 SHA512 c18904b5fc26f7d32e8dbc8360f1daeebf2f16ff24760037780512bb85c3470df540d1f56a0b777cf71fa825c2058a8153e3fb5af50c586357fcffa0ee012535
 MISC metadata.xml 1765 BLAKE2B 5d45009ff34f4d7780e70d2cdd94a5c60ebef674c235ba84d0989485dec62e83d15b9be7cbcbd583bf258fc936c5aff3d610ca8ea682323b07430fc2e71ee225 SHA512 32f560edbcfcf283b7f6a907277c584e5e9a33044b334e66818bc3529fb49a8709888aa27332da3f46e8c80971711403f333de3616132a47c34b9a1413237772
diff --git a/sci-mathematics/pari/pari-2.13.4-r1.ebuild b/sci-mathematics/pari/pari-2.13.4-r1.ebuild
index 2c20485a6433..8a3f70f9f496 100644
--- a/sci-mathematics/pari/pari-2.13.4-r1.ebuild
+++ b/sci-mathematics/pari/pari-2.13.4-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 # The subslot is the value of $soname_num obtained from
 # upstream's config/version script.
 SLOT="0/7"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="data doc fltk gmp test threads X"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/planarity/Manifest b/sci-mathematics/planarity/Manifest
index c9b7be6c6acc..e98843e9284b 100644
--- a/sci-mathematics/planarity/Manifest
+++ b/sci-mathematics/planarity/Manifest
@@ -1,5 +1,3 @@
-DIST planarity-3.0.1.1.tar.gz 456236 BLAKE2B 60040c8e205dbd9eb67667c6554836a9545bab74ccfb51e319edb191425f1b74403916e7887d06cb2d570eb17694338819ee5fd9828d6636ebecbade8915cdfa SHA512 50d2b6905d20252a6d482aae15984673972508540416a3e9396ff67923bf3bfb5668ef00309d42e540e5c8dd3ac4636ef54da2e5ee334075e87d2f3af6488035
 DIST planarity-3.0.2.0.tar.gz 462194 BLAKE2B 7927b04cb7c9839637fe13228da50cee581ef7fd7fdaaa9ff2dc62348ba10c7f42ba88a75801034fedc973cf86fca6396ba2fb0b1f71407d850b73b8a9fc4fd0 SHA512 dbbc97cd9cf0a5497fbca76f3b0741d3bcfca110c7022150750e73179a0a0441428c854479831395b8f6340d0554b1c0e7cf7eaa63f7fe40d2a59365488c7013
-EBUILD planarity-3.0.1.1.ebuild 495 BLAKE2B 5d6efacc1d86e54c2654d652215e1316fb38c3a26815c8263062d59c9c58462fdb96975136818186bf33688159a5499a7d4c8ad39573e0f2f10c9be40c96402a SHA512 1e09d7570c132e2bc3c9afef16cbcda9eac31d24f41c389580d741dc4212055c509db617f2028fdabdbda18af75c34ba13927ff19d865e8bf3755843ef7b3580
-EBUILD planarity-3.0.2.0.ebuild 505 BLAKE2B 8c6e8b4d24d4a7209a3c08bc9027bd2652df4c450166a4afb4511610433fffa69d5d70ff0890514a896c42df9860d2e71ce76c8d907b93a972a39d340523779d SHA512 4fd94b0d971c2cf0c4373713a3b1a27201938b561542c7ace17b5dbef55c87952af3ae273584096fd33d8ef8a4efe6bd04cd2f9bd7faff739351d67e6dc3b284
+EBUILD planarity-3.0.2.0.ebuild 503 BLAKE2B 1af02f1e899c4b275f7f87c8c14e922768dee30ca062b8f7ec2c5377feec5f0ead2b71fcb3427b673404b844845cf010b0e0a19f5cd3b871f9a7a899183f50dc SHA512 96466aa877988ee4087292c2218a80f3af1128db9f19b03e479287fb834c3e9ea1ab3249bfbe76c7e4bc63c20ae41062582afcd558d209d37a29a1cd027488cc
 MISC metadata.xml 809 BLAKE2B 6c3ad8e9bbbc3cfbd8c18183051153054b2ab7f4dd94e69c8f4f98a955001330d1e51e6b1da7f98a7ce29f7920b7a55a31624828a5aeaf7831ace0b4cf5dbec0 SHA512 5aa885d48f2d4626ed54a67abcc068186189e726ddb68bc889b6dc7d9aa09da30dbf7bb284020503d70bc94a25b5e16c907fe992862c2c2a6c344e2977e57f25
diff --git a/sci-mathematics/planarity/planarity-3.0.1.1.ebuild b/sci-mathematics/planarity/planarity-3.0.1.1.ebuild
deleted file mode 100644
index a043769c34af..000000000000
--- a/sci-mathematics/planarity/planarity-3.0.1.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="The edge addition planarity suite of graph algorithms"
-HOMEPAGE="https://github.com/graph-algorithms/edge-addition-planarity-suite/"
-
-SRC_URI="https://github.com/graph-algorithms/edge-addition-planarity-suite/releases/download/Version_${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-mathematics/planarity/planarity-3.0.2.0.ebuild b/sci-mathematics/planarity/planarity-3.0.2.0.ebuild
index be7ad0f4831b..1c8db97eb865 100644
--- a/sci-mathematics/planarity/planarity-3.0.2.0.ebuild
+++ b/sci-mathematics/planarity/planarity-3.0.2.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/graph-algorithms/edge-addition-planarity-suite/relea
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 src_install() {
 	default
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 726eae353b11..69a502576d5e 100644
Binary files a/sec-keys/Manifest.gz and b/sec-keys/Manifest.gz differ
diff --git a/sec-keys/openpgp-keys-voikko/Manifest b/sec-keys/openpgp-keys-voikko/Manifest
index 6a98fff53134..2e4d61b0287e 100644
--- a/sec-keys/openpgp-keys-voikko/Manifest
+++ b/sec-keys/openpgp-keys-voikko/Manifest
@@ -1,3 +1,3 @@
 DIST 4AE3942E.asc.html 5476 BLAKE2B 22b3acf6d4360b1686890596e7c8de2a3a38e739aa0ea4ae7fa7e09295127c7196f5af5750bd30d5260365206e08397e3bda970a4b7cdfb2d0827f80f2810758 SHA512 025bafbfe98e2437a3919f4651e7583a5fccd60ff110904189969ce5fe1770ed4222c60a530065b7720a0e233d1a138b55cd7df4c8f28337b9e953547434429c
-EBUILD openpgp-keys-voikko-20201013.ebuild 645 BLAKE2B 9db3b606f2c024b2f4da082258c27f81db6ccd4178134b59d75dba8a2bf37f4cf6a9e98a04502aa9da5df9320ba1cec48d5f134b70edd88edde50f5b03de6ba6 SHA512 d0bf1fa6fa8a3ece7b78b8c451f87bbd13558a97a84dc7f35ddd2f1b3c85b1b408d885b1ea5715cf00e7e7b53c9679afcbf1de4532b2b563076ce7492c6bcde9
+EBUILD openpgp-keys-voikko-20201013.ebuild 647 BLAKE2B d1fb2201ab36a4a9fc420183641c41ce7ae842cf03f4388c5789457498f8ca62b74690865cc9daaf3a8266c927e1fbe21b56ecc5f81530d5ce8da71841649895 SHA512 e8d663dfa46a49c1d6feab43bff8486eaac743569388309901d1e777893c0aa4103f4dd5280a345caf394879ac3e79f0343eee1acce9ee61405f788a30f7b25e
 MISC metadata.xml 280 BLAKE2B 30756c19f90277ebe700cf4641848ae376453c6031a019f348f04ee8d4c30146947ec383fa4bf12b669df790417eec9285df363210138e39f611d345d127ed27 SHA512 cf301b82fada2d4ca02e1dd9ba7b5234c42b7c63f87b96d81cb06ebc7853934533b75d0fc77eff0dc39f3c0a9e2d468b6bc03ac98fcb3834da67a11b254a0b77
diff --git a/sec-keys/openpgp-keys-voikko/openpgp-keys-voikko-20201013.ebuild b/sec-keys/openpgp-keys-voikko/openpgp-keys-voikko-20201013.ebuild
index 00145ecbf26f..0535a2601ee5 100644
--- a/sec-keys/openpgp-keys-voikko/openpgp-keys-voikko-20201013.ebuild
+++ b/sec-keys/openpgp-keys-voikko/openpgp-keys-voikko-20201013.ebuild
@@ -15,5 +15,5 @@ S="${WORKDIR}"
 
 src_install() {
 	insinto /usr/share/openpgp-keys
-	newins - voikko.asc < <(awk '/-----BEGIN PGP PUBLIC KEY BLOCK-----/,/-----END PGP PUBLIC KEY BLOCK-----/' ${DISTDIR}/4AE3942E.asc.html || die)
+	newins - voikko.asc < <(awk '/-----BEGIN PGP PUBLIC KEY BLOCK-----/,/-----END PGP PUBLIC KEY BLOCK-----/' "${DISTDIR}"/4AE3942E.asc.html || die)
 }
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index f91f18aa33be..b045280e8750 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index 36e03ca35d7d..9481b0f27b47 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -1,4 +1,4 @@
 AUX accountsservice-22.04.62-gentoo-system-users.patch 1318 BLAKE2B 69c74ad620cebd6864efff7ad87401a72ea5f644a773a682653b45584e34755aaf12a0e79ba816c990b0af2784d01fec5e8b657699ecfc7c38343330a36fda57 SHA512 a85a6ca785a3863d96eae39bc3eee5fe89bedd0bdae40cd6bc2e077bb88f72d73d0be63dcf0e0a788f0f5d69ed39801c9ede623afe8ed08c94372314b1fddd09
 DIST accountsservice-22.08.8.tar.xz 102672 BLAKE2B 7c9436d3845fc1883772b434c4f9e2fba934d17e6d4452a6be65e1d790a23b331eaaa64b0e6eff6fefe79587a40cf1749a0f3de09f323b10740046bd9d145c9d SHA512 2ca3ceb1b44338d9924b86788256d4eef7ec10e0c2197bfb8cc6c31ae224fab3051f03cb406a526f90057684965bef4ba0f2cc01b26198ec1fc6baec36ad3ff8
-EBUILD accountsservice-22.08.8.ebuild 2021 BLAKE2B 2164989ef876f1653b5aba751131c677512e9f38cb41a9b9a6ac1a3b4f544fee2a673e9853bb1eb2436971a0515525eac793cde9e2156d9578161b3062a48313 SHA512 1acb2dec062c3543c93e1401f6eadc4b17b442d7851cf3f27a43864a2ab7965bee5fb4374b98b50f7e01521c777cd4cbba4d0893024458267c085f1f52f60fb2
+EBUILD accountsservice-22.08.8.ebuild 2028 BLAKE2B 4ec9d3410a014fdaa4fa9b81c1938c1437da94dd0d68a2d2e4587236a567a76ff9b3c3d5612b3cfb0546482e41433b5f638f5fd348df609fde34973490d7ba00 SHA512 eef31f9456e68f43a46379bb8d9a1957c63aa8de2916333007a6372b9cb28f0d8d9d1114a39e5e93d38beff68a1d5d599cddb1012e510e9597fc7e9a1470d6b9
 MISC metadata.xml 435 BLAKE2B 15950bf42bdf008f146f8bb89c9b8f29734eb244c7c8f664d6b9cfef3999b241de1fbec5bec7ed9cd874875a49b814001662122b488e5137a83f4ae6c8eef7aa SHA512 a5c93f2a4ab9453a20e6a6f9de924f5eff56a3e16a994c6ff09892a4739dbddc4d422bf4ad4d20c0772433932542b797277c2109bd39695588c1c02ef3d172dd
diff --git a/sys-apps/accountsservice/accountsservice-22.08.8.ebuild b/sys-apps/accountsservice/accountsservice-22.08.8.ebuild
index a989b367b5f4..40e0dad498bc 100644
--- a/sys-apps/accountsservice/accountsservice-22.08.8.ebuild
+++ b/sys-apps/accountsservice/accountsservice-22.08.8.ebuild
@@ -55,7 +55,7 @@ PATCHES=(
 
 python_check_deps() {
 	if use test; then
-		has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+		python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
 	fi
 }
 
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 7d26ce0d6824..687b6fff74d8 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,12 +1,13 @@
 AUX iproute2-3.1.0-mtu.patch 1649 BLAKE2B cbecd9770391ca7c7f25b860a95bb5b2783073b333084874b18de85f5a9072ab3922e083f726ab1e6f58f0334b515968b1e3651abcd7fc6f603def0492da79cb SHA512 5479c2085b4aca958a89d3e265ebc3763c9e7cb273bd4046d7b7585209739f75ff04cc9b84d8eb9e3afae821ff788f0f0c7ab443260ab07943b6fad6946403e1
 AUX iproute2-4.20.0-no-ipv6.patch 1334 BLAKE2B 612fa64a897fe8c601aca529a09508cc865f2f0fb7cb865ba28f3369748086622b6910f25052047c972f495b5e20014cdf6e9f73b230124f372cfe6301bc0bf2 SHA512 f4b42667d4433225b2e4272b6e629fc43b73ede02ac0e706d2e46d81ffcecd19ca45b8b9789904b4bd6d10d34c82239f9b3c33cfcf3f9e5b309d828a3494c864
 AUX iproute2-5.12.0-configure-nomagic.patch 6967 BLAKE2B 8707ace3766d2bb797901886032bbbfc78b3116b548d317038144307a52ba86a01dc49460fa8b4524f03de3abc5b56f4901a9cb24f1f6cacfbd7a5b92cea7145 SHA512 a6184d1fc150717ab40a278c2a6ce439ea04e9967d55f1d10fecc8162452a1a38a6e11c2f736c5aebfe0ffe726bfa80e154169004ccc571b89dcef9c0dbe1242
+AUX iproute2-5.19.0-musl.patch 1418 BLAKE2B 280fdf5b38652320bde967ff22dbd7a27a5829190396c74ba688ed75643162b7c97e62606c747520c8bd57d6a2437a0c35ff267ffe8a70621e773b7bb5d8df99 SHA512 c94f2ad23054fcb98dda7bab770812570c82ace0e961892383f12a0cc7647e85bd452a29119b70e3829ae659c6e492f82782b9194cfb5b924503b778e5ca3e78
 AUX iproute2-5.7.0-mix-signal.h-include.patch 213 BLAKE2B ad6def6d017ff1d78587d1bfb9d92379983d989d9d4a396e773f02c655ac14c57cc25c5d4e37fbdb0e0d1cb1d35fc94ee70077b81d1285ac2d58cb1b19fa69db SHA512 09a9d450179b06c434a41b7bdd8d4a47b8ca2303de3d08b2b101e8695aec28e5d1e454a8c62e1b71d66b6e776dc6975f2837acc0a0f8a2a3f1e31b1eb56b71e3
 DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B bca20ac53e1b2b3ae06186f655ad5073a0e691ed7b3aab25c4fbc118847b72a8a522175732cd22d8ec27480d1ab142319e80a5c3628434bec21260e585e1591d SHA512 e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22
 DIST iproute2-5.18.0.tar.xz 880456 BLAKE2B 21b15d84b07199d4ddd12cbf14d94806a073f4eda659958a8459ef2ca8becbef8638dac2550cc53893cd147888b6a3b738256dac074307b37ebec8dbb460e600 SHA512 7b43c89741a8ffe8fd529ac4ee19c8eab7dce2f064de494c160c75456ffb960fb5f1e78c868ab98360dafde28d5e2c4d58177135b6d380e80e06eba9e3eaf068
 DIST iproute2-5.19.0.tar.xz 892696 BLAKE2B ee287065d7c33c0fa97f0fc130bb3a4a3ad5ac9417ad74ce8489e64ec146ff97749d79bb6563043c8835eab91a51631576441d450693cb50808ad0d37b2ea648 SHA512 eb0fffb153f7cecc89b5573b7fc211d67fb1c06789fd3b0aec75ba5032521d53c51ccc52db7367e41397993df50244af84763b0b1d5a76d9dfccf013c010131b
 EBUILD iproute2-5.15.0.ebuild 4994 BLAKE2B bc73ac11db47b0d52926149af6546fe81fd94354ca48aad8f452c5fedeebc1629d847ba653175bdb18172a3d74c9e8c6026ffd8f3436130985929e38f4e0dec6 SHA512 5737c4bd54bc283c1c50c9b2f5e7c87f8b40d2665e15d72a05893d890427d1c389d2f6c857bd8ca0db2d38996dadea810b5a11f061e95830347ff7f864bd7f7e
 EBUILD iproute2-5.18.0-r1.ebuild 5803 BLAKE2B 5be3d8f2c91cb5d1e8d6b13d9a736e75d6066922caacaae94881b37e4cb963ed14eb185a68e745e484ec29fbd66c33a0deeccee75065af8fa292bfea945406fd SHA512 e42d7f42d7cab34838b1cc3984083d143ccf2d02743ed0ad14e091ae0fd4a3c4d8c82113cd813a1e517c527dac7915c5908e2503ddf8fedb2f46eb65675bb266
-EBUILD iproute2-5.19.0.ebuild 5790 BLAKE2B a4e4aef64a28dcde07729a71a30ff13b7d4a332dcf364e4aa5e6f32f63273574d4585826718cb15b087561690498efd56a1014233c60e3016a3d6eabdf62da68 SHA512 0277f4ea772b15af385e4bff0b84d751f5db3593c85148bfe7be149eea50514831c7d840b41d2c5ee89e234a056c57bbef33526a7a4c14e21ec9ab90e5ff571e
+EBUILD iproute2-5.19.0.ebuild 5821 BLAKE2B 37c5fc024d9a2976f587cc4410867bbae16f9b2c7c7ad9a429eb4916632588714d7ae9df96afcab0847357afd154dc5f860225c26eb1ad57a28c7af946410c3c SHA512 a2a19df5852566faea4d333edcf59030aea6b419d8489984084ce518b64cb9db324222a45314bd2b644cbf770f4f79789f65581ac2a24b8583df08c54e02883f
 EBUILD iproute2-9999.ebuild 5790 BLAKE2B a4e4aef64a28dcde07729a71a30ff13b7d4a332dcf364e4aa5e6f32f63273574d4585826718cb15b087561690498efd56a1014233c60e3016a3d6eabdf62da68 SHA512 0277f4ea772b15af385e4bff0b84d751f5db3593c85148bfe7be149eea50514831c7d840b41d2c5ee89e234a056c57bbef33526a7a4c14e21ec9ab90e5ff571e
 MISC metadata.xml 898 BLAKE2B f3c281e448846b5fa0e4cabec04767fe7217bd0d77a2baba7c1524ebdc1df4cc4c7d38ff441617959281c3a08b564d3cc6b7a89f846041f2416441b82079318d SHA512 404bd3aa523554bd78da7eb90bd3c53c146f71da92116115c238e1b186e971bf6d49161c33e58d6116af1616688bc00eb7d96f0fa5afb300a703cbdf6fdfe4ed
diff --git a/sys-apps/iproute2/files/iproute2-5.19.0-musl.patch b/sys-apps/iproute2/files/iproute2-5.19.0-musl.patch
new file mode 100644
index 000000000000..e907ba9454bf
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-5.19.0-musl.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/864771
+https://github.com/shemminger/iproute2/commit/cf6b60c504d4be5e1df2b2745e55d677967831d0
+https://github.com/shemminger/iproute2/commit/28c740473510cd911b97cc5d7d23bd809a0f200b
+
+From cf6b60c504d4be5e1df2b2745e55d677967831d0 Mon Sep 17 00:00:00 2001
+From: Changhyeok Bae <changhyeok.bae@gmail.com>
+Date: Tue, 9 Aug 2022 04:01:05 +0000
+Subject: [PATCH] ipstats: Add param.h for musl
+
+Fix build error for musl
+| /usr/src/debug/iproute2/5.19.0-r0/iproute2-5.19.0/ip/ipstats.c:231: undefined reference to `MIN'
+
+Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
+--- a/ip/ipstats.c
++++ b/ip/ipstats.c
+@@ -1,6 +1,7 @@
+ // SPDX-License-Identifier: GPL-2.0+
+ #include <assert.h>
+ #include <errno.h>
++#include <sys/param.h>
+ 
+ #include "list.h"
+ #include "utils.h"
+
+From 28c740473510cd911b97cc5d7d23bd809a0f200b Mon Sep 17 00:00:00 2001
+From: Stephen Hemminger <stephen@networkplumber.org>
+Date: Tue, 9 Aug 2022 13:27:33 -0700
+Subject: [PATCH] ipstats: add missing headers
+
+IWYU reports several headers are not explicitly
+included by ipstats.
+
+Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
+--- a/ip/ipstats.c
++++ b/ip/ipstats.c
+@@ -1,7 +1,11 @@
+ // SPDX-License-Identifier: GPL-2.0+
++#include <alloca.h>
+ #include <assert.h>
+ #include <errno.h>
++#include <stdio.h>
++#include <string.h>
+ #include <sys/param.h>
++#include <sys/socket.h>
+ 
+ #include "list.h"
+ #include "utils.h"
+
diff --git a/sys-apps/iproute2/iproute2-5.19.0.ebuild b/sys-apps/iproute2/iproute2-5.19.0.ebuild
index b3c0b0e984dc..0ad41a520dc0 100644
--- a/sys-apps/iproute2/iproute2-5.19.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.19.0.ebuild
@@ -51,6 +51,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722
 	#"${FILESDIR}"/${PN}-5.1.0-portability.patch
 	"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
+	"${FILESDIR}"/${P}-musl.patch
 )
 
 src_prepare() {
diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest
index 9cf9b0433b5e..898bd99311a3 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -1,3 +1,3 @@
 DIST mawk-1.3.4-20200120.tgz 468855 BLAKE2B dd8bb8f66cb8bd67d8415ee25ce928113cf3f33f8135bc432a16f30b83df861cd2e29da9e0fac1dfb1a6796239d0c838ed72cf51467f8ed79b96068e3e1f1e93 SHA512 14d9a6642ce931bf6457d248fc2d6da4f0ea7541976ca282ea708b26df048f86fdf92c27f72d497501ccd43a244d1d1a606f1a2f266a7558306fea35dcc3041b
 EBUILD mawk-1.3.4_p20200120.ebuild 859 BLAKE2B 7fbc7a0d28405fd7234b154c380559224095c47ffc835abea452a2cf857faa577e2191f15a933b743217f162e05f39d8f150d90949ecdb5fb33990ab1a01d318 SHA512 5706d0a0be47e12f4eb56773f7b0127b065d6d717c816b405382eae51418a826e0f51f8d1d22c717c16d5b5f9a69a29b39267213ba6ca0d02a7d35df7e48242b
-MISC metadata.xml 355 BLAKE2B 5bd1bc96d3d97b8c2ee10fabc6a7e77e6951a9be9724b9961a97ef53a4ef238548f088bc63ba7cbdd2b79be75aa912534f177008051e76b17562f7330758035f SHA512 07805a983d52dac30cc530435ff6ce27a4f1af9a9221381383ddb30ec3ea736fd32ec5da874787e2b1c1f889624bb59ec77170e3fff6d3b52d20b33087be83d8
+MISC metadata.xml 422 BLAKE2B 8bd344848b5247eb1858b7cd31d91a796671c321610b826e602d9350e59769a4e6612438d9bf89ee2d6d63c327729d88a9ccb538b162beb816fde2910d0a4d9a SHA512 9adcc3c3b54ee935d3363e874e76f9e9b1efee00faac94184a84d10a6600dad4f11da51d4567acabf63707ca55f9b3d5ac3df107c6de8b38cad1da9891e82086
diff --git a/sys-apps/mawk/metadata.xml b/sys-apps/mawk/metadata.xml
index 70c9644a61c5..528178a88402 100644
--- a/sys-apps/mawk/metadata.xml
+++ b/sys-apps/mawk/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<changelog>https://invisible-island.net/mawk/CHANGES.html</changelog>
+		<remote-id type="github">ThomasDickey/mawk-snapshots</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index f43c335652da..b2c6a0e339b5 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -6,7 +6,7 @@ DIST nvme-cli-2.0.tar.gz 646320 BLAKE2B 81a8161091071be4e98d4feb78b3f3edaed07262
 DIST nvme-cli-2.1.1.tar.gz 674354 BLAKE2B 2cb995195328a9c91644ff32676eb3a6d9f1927a004ed75d2be0a746f45050b8ae927924a1095a787ea10618bd600133237852f56116c1db25c4eaa03ea9dab5 SHA512 61a8e7c0ae8da082ac0cda2fdf61ffe8d83ed5d4ee31640bde89fde929ba3fe6d788950bd232630af2c7fc5f3563f05f47f350e005c8556691e5aede73c88d74
 EBUILD nvme-cli-1.16-r1.ebuild 1394 BLAKE2B bd2e45a72c07efd6e48b5872f43353817550ac4e7c4c31efc9b1b6f4e5736ac4298b2505c9d55537ecf701933bb470368a44df0587fa0a59d51a562f56273148 SHA512 63d4ef1730a6cb1fee4a331a8df795637935fc00d994f09a1d9d060d18726081ea7a2098c33187a23c4b81cec0742967fcb7ae9e1b9a107579f09a4d6ac765aa
 EBUILD nvme-cli-1.16.ebuild 1330 BLAKE2B dca5bcee7da2e65799bed14ba6eec3484b19d025061f1068d343891f2e76aa2c000c017b03bc977be76f51d9b0d38180ba7e44e6d7ce27eeed338a2b1741ba07 SHA512 44c68fa403731bd0d8f54f361e6d7b84cbb7f9222f7070ef174354c29e0314fa1007f0c1caba48e30afb607e5a6c56f355eb2d02b80079f62a8c2defc073b55f
-EBUILD nvme-cli-2.0-r1.ebuild 914 BLAKE2B f3eab8dd6ebbda164595f6db4862d189d38a307e4cb1980d253fad3819b8bfd29f667cf800d6ca59c92389855aaf2faf41800a0a305ec3dc906869520883a590 SHA512 f32c72f6498994ce0a9ac303e2d7de5ed29717bd6c3fe812887df9d6411550c3050efea116f1bba15fadd978525b3190d3dbdf43fed4f62052f5b6fcff9974e9
-EBUILD nvme-cli-2.0.ebuild 837 BLAKE2B b701df8a1a9c88145c6c3aeb7aa338dd1235cd03e70320425cfabb0208009b87987e9f8ce73bf0c99e116a44817db0c078b0d0691482d7273dc1b0c075c0be68 SHA512 e5d801a01776c6eef50b260836e4b0fcb4bf73f0df579bc678c92b23a2213dd80b4793e71d28c2e31ff6a63929609d165aea7a0bb07b8946c1610205deb948e6
-EBUILD nvme-cli-2.1.1.ebuild 843 BLAKE2B 33431bada5ca9ac295edb4fbe81afc3a4179a54eaf9556288cf060142decb3d0eed6dbabf8eaa4b438f6262021867342774d41217c7012e166ca221669a3a446 SHA512 bec65557213daff1840076051c28cab9667bd42541435978a7fdfed9415be064ad30005b4d1ae35883806769b73a71a1663115b0af722c490aff082a77ea2af9
+EBUILD nvme-cli-2.0-r1.ebuild 916 BLAKE2B 562795a3d62c792d35042187d614813605e900a7614fdbe67261541a0470671af215a12db322a6c80ddf062366239a7281bae2ba7080e717c7e3fe85de648911 SHA512 403efef199a73a7e7fc3b86612b8c2d1c5b2a5dfe9d1816651f0146fc1fe0322805e33e9ecda6db7f5ca9de4b608b853dd7d383f1cfa6a464925a4d9a4cec137
+EBUILD nvme-cli-2.0.ebuild 839 BLAKE2B 92d5d8df41fa282553ac4e0d652d047c90c327281a76282222f50cfd7b60d6b384fb3335102102d6a9873029fe54b5cb9a0848c26943dd63206b48c6cabca34f SHA512 6a84afa8302af8382e1d9c7e6b361fc4d1c287994c497a3706e34676de08bdad58f48d597087522942c7831edbc7e0213a9f4af54f59e8dff996fdd00d2332c9
+EBUILD nvme-cli-2.1.1.ebuild 845 BLAKE2B d8f1ec5ef3a4902d631f410f94b79fe2662f99b5193074cb4efef918c1f68691ef7bceabd8774e7e72239d22bf5ca4f77abacbd9a7a9aaf0fbd15207e13d9289 SHA512 577ce12620c001d90b77bcc4785a78471e4f3964369b2be36a782fc74a5885555a6d5bae8d64836a669b2054fdc87830680e985c515fc769558f8730b9c4be83
 MISC metadata.xml 594 BLAKE2B 52ac0579fd52797d0c9b2ec0528b134f67ef927987f9b99cf72d1010f13088af42d5eddb761b53939b196bc96ef4b8589b1bfc02242c95a56bf6a6a40afbad91 SHA512 d971b4fd68f8574b4e93377e9c4eef1f5901e81099ae97003ccfafbbd1657db92ce8a975cae38e6516cc4652b54259013c0c5e3ba53e80d717e42dab71440464
diff --git a/sys-apps/nvme-cli/nvme-cli-2.0-r1.ebuild b/sys-apps/nvme-cli/nvme-cli-2.0-r1.ebuild
index bc3e02e3f368..3bce0f7121ce 100644
--- a/sys-apps/nvme-cli/nvme-cli-2.0-r1.ebuild
+++ b/sys-apps/nvme-cli/nvme-cli-2.0-r1.ebuild
@@ -32,7 +32,7 @@ src_configure() {
 	local unitdir="$(systemd_get_systemunitdir)"
 	local emesonargs=(
 		-Dsystemddir=${unitdir%/system}
-		-Dudevrulesdir=${EPREFIX}$(get_udevdir)
+		-Dudevrulesdir="${EPREFIX}"$(get_udevdir)
 	)
 	meson_src_configure
 }
diff --git a/sys-apps/nvme-cli/nvme-cli-2.0.ebuild b/sys-apps/nvme-cli/nvme-cli-2.0.ebuild
index 2805c11288da..33135e2e14ea 100644
--- a/sys-apps/nvme-cli/nvme-cli-2.0.ebuild
+++ b/sys-apps/nvme-cli/nvme-cli-2.0.ebuild
@@ -28,7 +28,7 @@ src_configure() {
 	local unitdir="$(systemd_get_systemunitdir)"
 	local emesonargs=(
 		-Dsystemddir=${unitdir%/system}
-		-Dudevrulesdir=${EPREFIX}$(get_udevdir)
+		-Dudevrulesdir="${EPREFIX}"$(get_udevdir)
 	)
 	meson_src_configure
 }
diff --git a/sys-apps/nvme-cli/nvme-cli-2.1.1.ebuild b/sys-apps/nvme-cli/nvme-cli-2.1.1.ebuild
index 94b2b0fe7717..78d30a7452f5 100644
--- a/sys-apps/nvme-cli/nvme-cli-2.1.1.ebuild
+++ b/sys-apps/nvme-cli/nvme-cli-2.1.1.ebuild
@@ -28,7 +28,7 @@ src_configure() {
 	local unitdir="$(systemd_get_systemunitdir)"
 	local emesonargs=(
 		-Dsystemddir=${unitdir%/system}
-		-Dudevrulesdir=${EPREFIX}$(get_udevdir)
+		-Dudevrulesdir="${EPREFIX}"$(get_udevdir)
 	)
 	meson_src_configure
 }
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 828e0431a65b..4ffa2c72b951 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index 77863289800e..5c52dfd072aa 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -4,7 +4,7 @@ AUX libfprint-1.94.4-stderr-redefinition.patch 928 BLAKE2B e23caf122c169f93307cd
 DIST libfprint-1.0.tar.gz 475347 BLAKE2B cb560898cec11861c4529c0c37c328f74eaf271c1932ca5126b7bd6c82fafee24aff393c0fe223fef018a34a409647065d5f98a999c00f0e7a879e33bdfcd3cb SHA512 2d7f569368035cce0a579ef3412a1961c28aab254ae6174ce9ad11ce97b3dce824d0c6123adac12718cb074439e4d5b93bf978e5341824f179231d1faa219a26
 DIST libfprint-1.94.3.tar.gz 10409543 BLAKE2B 33e25715313cfc37f0c05ad47eca6d315a041a067cfc7dfac9d71fcf5231a11f54888dd837c083b8cca03ca2b4b0bced30340e8966ab4c989d4a33c59ceb483e SHA512 22290bd393b54ada75c4655b3e901b6ee25f389a396a9b29bc1e76c0333d9718483b2059c927deb5b8d8e0acf632fecc9c4535b3f161910d5c51fad508d3e7a4
 DIST libfprint-1.94.4.tar.gz 10408480 BLAKE2B 492ea10777d223ce7d610f0dca2871c8eae08cb5dd7d30187194d6cc139a60d5350e5908f759434065614c05a72192347be19c1d6fe5641e08a2f6419bdcede7 SHA512 425efdfde373179a237805c4b5561e3531616798c41ccd4358f1c521f1e21af01f8ca61aaf8c959e2c68a69e4dfda23960e696acaaad2228ffef6f999986468e
-EBUILD libfprint-1.0.ebuild 1063 BLAKE2B a486982077da190caacf146bd9831146087cdc4da4ccf8debb5bbeef1641b72fc21bc16de6ce8b69dd82262e6911ece105840f78991eeed34e6c300099564e42 SHA512 bf1e942f98ffa922bbb3e5110ee87106ca56a2f646be2afc9441ed0d15cea0bbc04daddd92bb9169c02619c8571fd02705be7229ea09716d8298ca0b5904f021
+EBUILD libfprint-1.0.ebuild 1065 BLAKE2B 2ae136498e5facd6d430d939a355022aa40ad67b892ff2271c67b7f4f19bc7729d58bc6c38ce715f1470ba75154f35133973738c3b37be3ff23b7ea9b09c5750 SHA512 12d4ddb9ed752dc1f0cdd8343a09b8a5d3d9d8068b74dc300c99794c2c17b2935a4844640f17af5b943ff37b8183a778555fe8987f50d6a5f9b6ab2331ac6c0e
 EBUILD libfprint-1.94.3.ebuild 1388 BLAKE2B 548dbde6c835bcbeff3b31daf812a9cd926f2df1b052bad503bbdbf4aaa32a3ad20723701105deaae14e2c1775994335fe748fe37becc92ebb81d11e48529d98 SHA512 aa9e8f5570e8daa2c4881d5eedb5b45c8879a42b32da79c7f274488c4a28e4662f7648ab59c6ec474ce0b7fec78e377e353e096d79fe1bd001ada43111b5ce9e
 EBUILD libfprint-1.94.4.ebuild 1358 BLAKE2B cc1c872a121f73a58565bbbf52dd67f78c0cbbf0636c1c164cf205f00f7ec99046ff25775b9afca5aa81f61a1580afcbbe5691886aa97c5fce98676d9a0084eb SHA512 f690d23fef1afe5eeee917e79cab6d658755b2653c14f42025e074800dd01ec7a2206adb3955e167cb157bdfd195406f5aeacdfa76c4421b5c578eabe5d75f74
 MISC metadata.xml 275 BLAKE2B 20edfbe69300bfaf17dcd8e55ed6576d69e44c4e41a27a6211eb613b1bef6e97b0ccca036d9a55ff318faa6ff0679fa387d115109935a4e144fa3dc9c0aaf847 SHA512 9d3975cfeeb4e4e3101c291081d5da73124002d03f016f8ac79931cbba20d3c28d7a08769b4c845cd8d8a2d9be537b68f429fe3691136f851b01bb8b5233f406
diff --git a/sys-auth/libfprint/libfprint-1.0.ebuild b/sys-auth/libfprint/libfprint-1.0.ebuild
index 782d8fc4edcf..d3873860d2fb 100644
--- a/sys-auth/libfprint/libfprint-1.0.ebuild
+++ b/sys-auth/libfprint/libfprint-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="dev-util/gtk-doc
 	virtual/pkgconfig"
 
-PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.8.2-fix-implicit-declaration.patch )
 
 S="${WORKDIR}/${PN}-V_$(ver_rs 0-3 '_')"
 
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 0c12dd2f51c9..369315aedd24 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/flashbench/Manifest b/sys-block/flashbench/Manifest
index a6671d2feab6..fc39b55e4119 100644
--- a/sys-block/flashbench/Manifest
+++ b/sys-block/flashbench/Manifest
@@ -1,4 +1,4 @@
 AUX flashbench-20120606-Makefile.patch 607 BLAKE2B b7ef8a5a658bdb7f39c85dff7cfd5c21b9c6b46ec18bd28dec606959d2e9592a890e77b038e815579d1f79119ca5ac97db61411989e33e370a677a8abd8e9624 SHA512 598601c068258889b420f82eb69228d1215f85f76301be1c2f753a7dd864ccd7adc8e2f0e204d8ceaf76ced43b83e69cfda6e08b963e8eb7e469664065a8bb7a
 DIST flashbench-20120606.tar.xz 17720 BLAKE2B 300bbd82ea849f9f6bfaa222006d9e218f7cca0f42704952380f22864f81b4341a844582bc5133b360ec68c7e38298b950b5e2c195b0c5b430a925df3c5fe88d SHA512 5ae0c38da7a7d7321157eb892e186e665b2dbacad98ffd7f00a72cce985b4ccd2a63c99c00d681cfeb02cce8c1e00f3a3095716c22f7893299f3c24077ad43ce
-EBUILD flashbench-20120606.ebuild 520 BLAKE2B ae43c104d81ffc409f0300533fee8c5a83cc0a89a983e125ab872ba3bb880a8aadf165dd5d850967eb63e5f0e917a6d762d8fe9eb5dd4c5930367de2ff2629ff SHA512 36ca21425c7a5259ce6a38a7934a8e1d43af57e297ecfddce56d56b7aa00a33851cd89178430897b3b67c5bfe90f31d51cb68a5cdcdff27a9289a4f8659bbdb3
+EBUILD flashbench-20120606.ebuild 522 BLAKE2B fca595fa1021a7f1e01abf481afb5138c8c9255d590eafc358f487572c55f49e2c08c8f693eaa0aa8b5750ae14586a03831d96b25c7da948d23dc1508ba9f3da SHA512 e7d968a9b3a0987958ec1fcc06ad1fd1b5458b26d7828e4b967d9f3e79fddeb87babda022d958d213958c4c4f4429b84453eb24be5c8c74f4f7715202a83de68
 MISC metadata.xml 219 BLAKE2B 653d91a369f082b0cc80cb48d57e9e7281e4be9c96d4dac04ac0b3011237eb843783392f95e67cf2ca032e65800d68202b97f858ddffb1e59d3fdaa174bcde3e SHA512 2bc2689f4cb40e4f20b8e7717b4c6539024e181c5d3cb2ad979b7cd974d823fdb1795e811bfdc9758df981854c63413ab5c288b966cda7f1c371f08c37d8ca02
diff --git a/sys-block/flashbench/flashbench-20120606.ebuild b/sys-block/flashbench/flashbench-20120606.ebuild
index 307d3b9f841e..c7f3200b611c 100644
--- a/sys-block/flashbench/flashbench-20120606.ebuild
+++ b/sys-block/flashbench/flashbench-20120606.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
-PATCHES=( ${FILESDIR}/${P}-Makefile.patch )
+PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
 
 src_install() {
 	dobin "${PN}"
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index bcc5f76839a7..7e467337b3c4 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/milo/Manifest b/sys-boot/milo/Manifest
index e55a247363a9..abf3dc2fab9d 100644
--- a/sys-boot/milo/Manifest
+++ b/sys-boot/milo/Manifest
@@ -9,5 +9,5 @@ DIST linload.exe 7168 BLAKE2B 393696c987b771a75c5c0a04a6f82999189ecb60067464e807
 DIST linux-2.2.20-reiserfs-3.5.35.diff.bz2 154943 BLAKE2B 6226321438bed88bc31fb151a28157dda811a2c7ce6c543564f2ef183489b20f2b7f6df903f63aadaa8196ba10bd54df4c7069e448bb456474bccf64770a666e SHA512 b63d03d605d65cb7a15020ad38b80d77b810963edbdc0b5ccaf1706347de5026e390d8c2a5315f1d2734b793903c1a407b4db4129d11b7d5ff2ad9dc8f2137aa
 DIST linux-2.2.25.tar.bz2 15791211 BLAKE2B 5b4b416c41b2277c4e509e7c0003d1ba0bd26e1bbb03a30bdb9d44f9211f6edb593bbca158379ea565e2f35d01e128590971ea85220baec06c23ae15e3942f1b SHA512 63e83f4f184cdd09f39c24e2023fce3562ea550db7182ae94e36ce30c6b2415bac970306cd60c1d1a89a1a3b54ad957094629557a5782f181939efb219ad41bb
 DIST milo-2.2-18.tar.bz2 1074725 BLAKE2B 7e7cac8ec2ee8246f21f5ea0f1d497dd6234ed67dad0a340e0183abec2f7a4f694b48eb87ba65ef97e967918c55c9fbfdd56e502f21fc47f8d053d0353758f1c SHA512 1ccc86c83d520d07040ba44d14e7e9353cf364bf5b83ba4df14b0560769643ce07f89feeab468144fe17b7bf482beb7480f5dad1a0e9b574e6e6150bb72aae93
-EBUILD milo-2.4.18.ebuild 7780 BLAKE2B da9e084674b09bbfe4b3ebf59fc3ff8acc0f3cbe23da324c32302e1ab81657fa70ba3b1f39ff80a7a8b8493c322877461eea4613dda2aff90fb5e1aa99818f0b SHA512 8818700b01ffe0603f619a5879ca3122a6242c9815dae61a58580961e2237c73a5a58f32977a0ddf841f2632e79e91facb4ef635c198fe720af17aa46339b3a3
+EBUILD milo-2.4.18.ebuild 7825 BLAKE2B 7a39de97939627fca55fb85f5dbe4fe99d5a0823606ec5f1d9996590d98c84e88a96689130ec764c0a5e2a5bb477e7ebd305f562158435292afe3a80efe55612 SHA512 7d9bca4fd50329629cb79c97b29099c55a506b33dd8a05f578318523956f04d29400c76274406c304c9fdf5e7d09d9247d62bbc8a7a8743fa0e069755c1a6b48
 MISC metadata.xml 791 BLAKE2B f5c04318b608981e2d10b88f2fbcf41410c25c20b155d7d13889b417f15fe2892c880bc3fdffe6bf1b2ffaccbfac7285851b1ba224261b3fc3d7f18c9e82a40f SHA512 1b56aef21105b621d47501d1da2a1f181d9ad6a84bc85b92d5c6f928c1c90a0a3c74bb74592129ca7c563cbee88a458db3ef17a3e5563d7638eaa5098d7fecc6
diff --git a/sys-boot/milo/milo-2.4.18.ebuild b/sys-boot/milo/milo-2.4.18.ebuild
index 0501252aa338..a4c3e71f8328 100644
--- a/sys-boot/milo/milo-2.4.18.ebuild
+++ b/sys-boot/milo/milo-2.4.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -93,9 +93,9 @@ src_unpack() {
 src_prepare() {
 	# gcc3 fixes, and some tweaks to get a build, also
 	# reiserfs support for the kernel (and milo).
-	cd ${WORKDIR}/linux; eapply "${FILESDIR}"/linux-${kernel_version}-gcc3-milo.diff || die
-	cd ${WORKDIR}/linux; eapply "${WORKDIR}"/linux-2.2.20-reiserfs-3.5.35.diff || die
-	cd ${S}; eapply "${FILESDIR}"/milo-${milo_version}-gcc3-gentoo.diff || die
+	cd "${WORKDIR}"/linux; eapply "${FILESDIR}"/linux-${kernel_version}-gcc3-milo.diff || die
+	cd "${WORKDIR}"/linux; eapply "${WORKDIR}"/linux-2.2.20-reiserfs-3.5.35.diff || die
+	cd "${S}"; eapply "${FILESDIR}"/milo-${milo_version}-gcc3-gentoo.diff || die
 	eapply_user
 }
 
@@ -138,7 +138,7 @@ src_compile() {
 		die "${MILO_IMAGE} not supported, or not recognised."
 	fi
 
-	sed -i "s!__MILO_ARCHES__!${MILO_ARCH}!g" ${S}/tools/scripts/build
+	sed -i "s!__MILO_ARCHES__!${MILO_ARCH}!g" "${S}"/tools/scripts/build
 
 	ewarn
 	ewarn "seriously, this is going to take a while, go get some coffee..."
@@ -154,9 +154,9 @@ src_compile() {
 	ewarn
 
 	# get kernel configured
-	cp ${custom_milo_kernel_config:-${S}/Documentation/config/linux-2.2.19-SuSE.config} \
-		${WORKDIR}/linux/.config
-	cd ${WORKDIR}/linux; yes n | make oldconfig || die "unable to configure kernel."
+	cp ${custom_milo_kernel_config:-"${S}"/Documentation/config/linux-2.2.19-SuSE.config} \
+		"${WORKDIR}"/linux/.config
+	cd "${WORKDIR}"/linux; yes n | make oldconfig || die "unable to configure kernel."
 
 	# we're building a generic kernel that defaults to ev5, but theres no
 	# reason why we cant tweak the instruction set.
@@ -165,7 +165,7 @@ src_compile() {
 	mcpu_flag="`get-flag mcpu`"
 	if [ ! -z "${mcpu_flag}" ]; then
 		sed -i "s/\(CFLAGS := \$(CFLAGS) \)-mcpu=ev5$/\1-mcpu=${mcpu_flag:-ev5}/g" \
-			${WORKDIR}/linux/arch/alpha/Makefile
+			"${WORKDIR}"/linux/arch/alpha/Makefile
 	fi
 
 	# build the generic linux kernel, of course if you have
@@ -173,11 +173,11 @@ src_compile() {
 	# to hack it (or the .config used here).
 	einfo "building a generic kernel for use with milo..."
 	unset CC DISTCC_HOSTS; make dep vmlinux || die "unable to build generic kernel for milo."
-	cat ${FILESDIR}/objstrip.c > ${WORKDIR}/linux/arch/alpha/boot/tools/objstrip.c
+	cat "${FILESDIR}"/objstrip.c > "${WORKDIR}"/linux/arch/alpha/boot/tools/objstrip.c
 
 	# make the objstrip utility.
-	gcc ${WORKDIR}/linux/arch/alpha/boot/tools/objstrip.c -o \
-		${WORKDIR}/linux/arch/alpha/boot/tools/objstrip || die "couldnt build objstrip."
+	gcc "${WORKDIR}"/linux/arch/alpha/boot/tools/objstrip.c -o \
+		"${WORKDIR}"/linux/arch/alpha/boot/tools/objstrip || die "couldnt build objstrip."
 	einfo "kernel build complete."
 	einfo "building milo images..."
 
@@ -191,20 +191,19 @@ src_compile() {
 	append-flags -DMILO_SERIAL_NUMBER1="${milo_serial_number1:-0x002174616572475f}"
 
 	# the Makefile missed this :-/
-	cd ${S}/tools/common; make || die "couldnt make commonlib."
+	cd "${S}"/tools/common; make || die "couldnt make commonlib."
 
 	# build all the milo images.
-	cd ${S}; tools/scripts/build || die "failed to build milo images."
+	cd "${S}"; tools/scripts/build || die "failed to build milo images."
 
 	# put the ldmilo utility there.
-	cp ${DISTDIR}/ldmilo-patched-${ldmilo_patch} ${S}/binaries/ldmilo.exe
-	cp ${DISTDIR}/linload.exe ${S}/binaries/linload.exe
+	cp "${DISTDIR}"/ldmilo-patched-${ldmilo_patch} "${S}"/binaries/ldmilo.exe
+	cp "${DISTDIR}"/linload.exe "${S}"/binaries/linload.exe
 
 }
 
 src_install() {
-
-	cd ${S}; dodir /opt/milo
+	cd "${S}"; dodir /opt/milo
 	insinto /opt/milo
 
 	einfo "Installing MILO images..."
@@ -214,10 +213,10 @@ src_install() {
 		doins ${i}
 	done
 
-	cd ${S}/Documentation
+	cd "${S}"/Documentation
 
 	dodoc ChangeLog filesystem Nikita.Todo README.milo Todo README.BSD Stuff WhatIsMilo \
-		${FILESDIR}/README-gentoo ${FILESDIR}/mkserial_no.c ${DISTDIR}/MILO-HOWTO
+		"${FILESDIR}"/README-gentoo "${FILESDIR}"/mkserial_no.c "${DISTDIR}"/MILO-HOWTO
 
 }
 
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 28208f86903b..e7be0ee125e2 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/c3/Manifest b/sys-cluster/c3/Manifest
index 100f19ce1b08..8f6a4fc56389 100644
--- a/sys-cluster/c3/Manifest
+++ b/sys-cluster/c3/Manifest
@@ -1,3 +1,3 @@
 DIST c3-4.0.1.tar.gz 55142 BLAKE2B 33cd81cebb28e3b50ca1863d58343192eb161a92357a56365c207d2ee2a019348d2292c0900433a409980274666ed20f49a19f6b60ba42fa8796a673becefa9d SHA512 a8ace5605709dd713f1686f3e13cd635d0d38224c835b43d0a02f255ddbd77fb9bbd4bbc0a1fac2d08a84bea2e98215264681381d9e9113ae737cc3a23a8dc89
-EBUILD c3-4.0.1.ebuild 1354 BLAKE2B 09aac66e22fcadf9519330dd4d8d9207503a15bb8c816f77ce7f9d3e55766ac9ccc3bcefda3ab422ae61a47cf2334101c51a6002cccb7175176e3d88230bd905 SHA512 13d7a796425fbd7675d0e1c731075aaa657249e8e1b80af7f726de820644ad1a45a7f0f30eba2d09a69b9f1bc85a47ea7fd8ee43991b2d995bfa511e5296b3d7
+EBUILD c3-4.0.1.ebuild 1358 BLAKE2B 48754282641245d5dbe868ac596e53b60ce6c8f5246bd0665d5d11a7fb552c3cef1deabe6bf821981f9be1724737a06a12a9f5553394dc142a94166872e386ef SHA512 84d72fdcba175e436d769603a44c1aada8707ad6c19cb1dfb5627dfe3b3a9ffe2776f1c4d487d3d6221e39c5bb83a344867d0bcb79ebbcff143a63c4333ed111
 MISC metadata.xml 254 BLAKE2B d6008c0af75d2c59696336153c1fbf23e23bb091b3786644f333d4c0bb9e43c13041ef756532814f203054bead254e98ee24c4e04b053a84e51c18e8714ec84c SHA512 49ac9b7f3e1a9e805c65e2288af69d49c40246ccd58241740afb44593e73c26fa89772185d6b6693db2778e14f5b493169f8b2def93e2d6bdde44cf3b5d66244
diff --git a/sys-cluster/c3/c3-4.0.1.ebuild b/sys-cluster/c3/c3-4.0.1.ebuild
index f8985982ddea..76baca262f11 100644
--- a/sys-cluster/c3/c3-4.0.1.ebuild
+++ b/sys-cluster/c3/c3-4.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,8 +38,8 @@ src_install() {
 	done
 	# Get systemimager-using tool out of bin, since systemimager isn't in
 	# portage
-	dodoc ${D}/${C3DIR}/cpushimage
-	rm ${D}/${C3DIR}/cpushimage || die
+	dodoc "${D}"/${C3DIR}/cpushimage
+	rm "${D}"/${C3DIR}/cpushimage || die
 
 	dodoc README README.scale CHANGELOG KNOWN_BUGS
 	docinto contrib
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 43f05eebd53c..5de4d8a5865c 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -39,19 +39,17 @@ AUX ceph-osd_at.service.conf 115 BLAKE2B d234b9bd718585baf43f229f583e211607aab02
 AUX ceph-tmpfilesd 29 BLAKE2B 02c5d6c59f6e93d03df3bb304529760824f64895f5bc0eff4a0a311013479e29cd3aa0fe554bbc65941838116d465b7df1ab351e2d80d7a4d1d109e26a7f0f2c SHA512 2d84199c6e57db1c0dd1074d94b899bf04c71ab0b10e91a34a0aa7c6a8136d34310ebe0967dcdde801f5b022502db00a891ce71af10c3ccef4ed396e8d316e15
 AUX ceph.confd-r5 619 BLAKE2B 6d495b970c7ff14972845e46aafc55d227c45817f5f8a9a1cad2e242398cc49f2c53896affe1373433db4175c426f1148242588207c7dee60f28a8c3ee543e5f SHA512 288560fee187c496402d46e3fa17fe99c4d3f2c0bbb389a5a91384a1015939f2389a81398045f0d1c978c4da5a1400e97126b98374185424bc5501d0b821ad5c
 AUX ceph.initd-r12 3088 BLAKE2B 371ee28604bef04766b3b13687feb56e076cf4ef23797bdf469db8b85454624ab005304c798c0945bcd4c5c0478ad7d724ccd33074afef39ab939464969e32b1 SHA512 4eeb1d589cd010b39405d1664f077a79d6a8bb8d9693b32390546e14a240f98ba6e4d6281940f482f57e8364339c68b1b02219c0f837f65a738686b00ac9498c
-AUX ceph.logrotate 427 BLAKE2B 9677f1a2a4872addff71527c800dd06bf65e18b589de3869e2a742c43070de789d5089f8739367efb913a64aeec5a8b82f47c129fac580e7c34e4f8cdc8b7332 SHA512 6edace611f46683ca3b8d2154b86ec77cc241909704e0362b728a5f51c2a809c22e83d69df0d58ec6b3a6b8dc8ef2518c220cac920f51e63fe668cdfe1b48bae
 AUX ceph.logrotate-r2 545 BLAKE2B ef7dab92aa5fbbe7f5d5418feaae1a1f4400dce08ca4484fe5889888f4dcb6d180bfb5888d5c7d6d9bc32bb5c58443fb83c1cb4613a2810cab45e8a74c421279 SHA512 c30edd67b7cc064f09d4e02bac68a0aa26827d8d4e3c027393932587e8ce782893b93b53d7165d361602b29c90ef3d6b755e79d11a1edb054e0172decd4e627b
 AUX envd-tcmalloc 48 BLAKE2B 4a0799ac6bbedfe5e701eead67600312d86f06143dbfd11d2c594c03d09bf13dfa645e5a0bde1189211ad20036dc4fcfce6758d3a5829d943eb337cc65783af9 SHA512 d180b1a888ec6d870ff523a3b10fd00eca479ee2586a236458af5ffaba21c84e7b8098da6d4bc08fb86c82c61a861dd3c3596a01063d734c329a92808682fc8c
 AUX make-node-frontend-tarball.bash 3196 BLAKE2B 1779c8fe924d8a341bcf922da310c9e3543dd9875db79b2f08fd99419fc2a693e24a5d0c36e7db7b9c46f02bb78b51359e844c8265ff266e8a931a32b877b665 SHA512 4c13ebc9f2a7ba3d45a01cd72135a57b2dc6ad3edfe06a05645957c5522a053be940782f1148c117d8bf785937655083d3d1c74668e8c72d75ae000888a65d85
-AUX rbdmap.initd 2373 BLAKE2B b88d79efc722e2de3d1f0269664a976ed45fbb0a1c9d46fcfd058ea64d3ae7fe27d13455f2ac5ca06663d77cfac1d2f9d86d12bba926541042ac09a8778a3a52 SHA512 bbd48d6987e52eaf6d02bccf3aecd06596465af4d3ac93063f9a814106de162a27bf1a33ae1646e669efb3c754f3ba57f395523293ad643b0d81ee588252216b
 AUX rbdmap.initd-r1 2372 BLAKE2B dee62cc3e92425bccfce86009be0fbecc84d55923a7dde302727d42f5f7703642121c690bdf079878c31b71d4c6c200ae6a7f595ede2dfe0bc46d8f6f9f5dd01 SHA512 d249d2299ef8dc4bbd12237cfe6ef626704872130b1092ab96d05894f04df09418364552433b264b80e49ee7e1587ebee71c1131fbbcd7d858cfadf1fe6357d5
 AUX sysctld 57 BLAKE2B 840eec3d188df4998c7ba8fb923777636ae9d2aa342545b69c12e5ea8aa98ae97349b42b56c65a531b207c5f970f873a79c41789941cdd10b279e38f1616f84d SHA512 410f5d721c6cfcc5d7ddaff4f348345140d4b8e1b8fddccb537118bfc59f573ecad63db448598423c9a58fcfdb4cef90e6af27b838e6b77955dfd47673f0f52a
-DIST ceph-15.2.16.tar.gz 148628915 BLAKE2B 4f624078027c706428eae3eddd5b5479efe3b4442c19a4e6b6cdf8d3839cf56e2863b18249dc3c5079a7e25f60796bfec3202ffd695537587654f5e2f820caaa SHA512 532b8a5073e157fe9ed552b26976faeb64dc29b79a249910c0982134ad5f945d4f57d8bf451adf63487b6d285c6e4bd5c39f0e3fcd449230d6fb3087539f8c3b
+DIST ceph-15.2.17.tar.gz 148640102 BLAKE2B a10dd702ffca005a8741bff645eaf2f671300be969edf9e9e321e29abdc34a403de7c56684fd1509d30c2bd32b996fff3aaa88d1d08c3d258d6f5ef43ecefddf SHA512 952cd4db057fcab5efa3c6331fbc19cf1e904f5855266c2ed13e41ffb2e5a7d18ed133bd113fea493149005a182f429eef39931c4ceac7776aefe84a208a745a
 DIST ceph-16.2.10.tar.gz 157176743 BLAKE2B 065b6f1941f87fde150ab22ba45aa9f58069acf7f33a483456faf0a26e41936846944e800ccd7f99bd8863db8438ae70804621522f75065c0b2506522c4fdd7d SHA512 ae164c24462c3e08763d202acc3e2fe86ffc09f312b5059bae07863e804fc47bd158fc130aa2923246ffcfe26ae6d6d9317326aec96373226e6f9030d7123c8b
 DIST ceph-16.2.9.tar.gz 157168096 BLAKE2B 0a667a9699925cfc920ca0cc535e5331cbcd95997fb0b9816a4d84c8add454b6b17813018bc1d1de07c802167ef50aa528704b10b01f42759189392ccdb5088f SHA512 bf369038ad6383f88abbed267f0239e9d8a1d33b46b34ed260aeeb1fda1b374cb6e658238e1ace013fbbb68e73b8cd2922b7def318d7a110e5f4560eeae8fca3
 DIST ceph-17.2.3.tar.gz 168821857 BLAKE2B 21ec5ac33591ae8b22eae3d88680ae87340e639cc21cb9c79bc4fb2f7b6cc7e93aa6b5af0242a6c094a4af9808a2b6f86b6bd7e3c8f247a513c91defa6d4e4a9 SHA512 fd6e057ba8440f69423e870dddb2705d68015089ff8d97356bdc359c2ab41e19351fb1c914330de6ba05180f48e328e3ea4c877e9dd80be049e2ec5895068595
 DIST ceph-xsimd-17.2.3.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
-EBUILD ceph-15.2.16.ebuild 10897 BLAKE2B d573f515f848378408cc05609469031751df2fdab8e0414bbc0f687eb0330a5136ccf9c85cb320433c1ee83edfd3b1d0cfd7f7ec46d9e775d183ff6668582de2 SHA512 aea7c7ff3762f1a25a8cdbd80cad9195c3af8a8041fe7e04936ce47bc304fbebb0fcba88fa0afe71c2cee3b248579853e89c13b7dfdc8d133c9e2077f3a51bde
+EBUILD ceph-15.2.17.ebuild 10919 BLAKE2B 693955b7dbcad95d54420e11c0ccd666a0ed85c6bdebf127bf58ca2c7618bd53fac9f9171fe33fd1e2e4b8aaf487e39761dceedd10e6af4e2616fc3d1284c6a6 SHA512 6f234d91f6672e8af1b8a7c133d8be70602f9dd3cce78954b4436e0d9d0908c44782d5e3817f474530ec2249901d2720956180a6d4c3573e3a8262090ee6686e
 EBUILD ceph-16.2.10.ebuild 12604 BLAKE2B b20b12cbf32cd6051db33cecaee51a8a38913abbc959b689b460bab87e1286ca20e17f405a714c5904ac1cdc08bf4b4c1f23e7ac8c50ebb083b3071cd151dfe8 SHA512 be1054b759be99ff02608f3e5022340d53c5ffeec0a04df6dc7b13262b6be0e65bbc5d3ebf3aa5f10cfbbfbeee975e1f8194eafd496cec5fdc59ca44c5b26390
 EBUILD ceph-16.2.9-r1.ebuild 12603 BLAKE2B bed9f1ffc126209a8ffdb7186eeabfed222e19c6db4ffc2189e4c65338accfb3c86d3134b0adc9350ef186ee0897092b5ffffa4140b785f6dee6de17ab07a91e SHA512 b5efc7e701b0784c4f4299ffabc01ff7a3ddc73ca16f36d1fd16e7e2562d78f89e11b960f9eacec697d9e788841d73e73d17554a7a916ab09cbe1a7cfc20557f
 EBUILD ceph-17.2.3.ebuild 12449 BLAKE2B 73eac41797937b4a255ea299a17b5adcc6d1afdcdfa9a283ad9cc7bf87b65fe503f4dd17595774979d0ff1652bb739493fbc6ebdad8caa07714e4f6665f53632 SHA512 792d0c808cff8b4c1b329a190a44a830b48504387772df0c994380304d1d39fafe479d5181a5168972672ce930725f48b52a5f51803a0b6b495d5b7800184d2f
diff --git a/sys-cluster/ceph/ceph-15.2.16.ebuild b/sys-cluster/ceph/ceph-15.2.17.ebuild
similarity index 99%
rename from sys-cluster/ceph/ceph-15.2.16.ebuild
rename to sys-cluster/ceph/ceph-15.2.17.ebuild
index 0b443b7f37b3..d3e65042d29a 100644
--- a/sys-cluster/ceph/ceph-15.2.16.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.17.ebuild
@@ -49,6 +49,7 @@ DEPEND="
 	dev-libs/leveldb:=[snappy,tcmalloc(-)?]
 	dev-libs/libaio:=
 	dev-libs/libfmt:=
+	<dev-libs/libfmt-9:=
 	dev-libs/libnl:3=
 	dev-libs/libxml2:=
 	<dev-libs/rocksdb-6.15:=
diff --git a/sys-cluster/ceph/files/ceph.logrotate b/sys-cluster/ceph/files/ceph.logrotate
deleted file mode 100644
index df03f5e69a4b..000000000000
--- a/sys-cluster/ceph/files/ceph.logrotate
+++ /dev/null
@@ -1,18 +0,0 @@
-/var/log/ceph/*.log
-{
-    rotate 7
-    daily
-    compress
-    sharedscripts
-    prerotate
-	for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do
-		ceph --admin-daemon /run/ceph/${dmn} log flush 2>/dev/null >/dev/null
-	done
-    endscript
-    postrotate
-	for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do
-		ceph --admin-daemon /run/ceph/${dmn} log reopen 2>/dev/null >/dev/null
-        done
-    endscript
-    missingok
-}
diff --git a/sys-cluster/ceph/files/rbdmap.initd b/sys-cluster/ceph/files/rbdmap.initd
deleted file mode 100644
index 9313cf658863..000000000000
--- a/sys-cluster/ceph/files/rbdmap.initd
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/sbin/openrc-run
-
-DESC="RBD Mapping:"
-RBDMAPFILE="/etc/ceph/rbdmap"
-
-extra_started_commands="reload"
-
-depend() {
-	need localmount net
-	before netmount
-}
-
-start() {
-
-	if [ ! -f "${RBDMAPFILE}" ]; then
-		ewarn "$DESC : No ${RBDMAPFILE} found."
-		exit 0
-	fi
-
-	RET=0
-	# Read /etc/ceph/rbdmap to create non-existant mapping
-	while read DEV PARAMS; do
-		case "$DEV" in
-		  ""|\#*)
-		  	continue
-			;;
-		  */*)
-		  	;;
-		  *)
-		  	DEV=rbd/$DEV
-			;;
-		esac
-		ebegin "${DESC} '${DEV}'"
-		newrbd=""
-		MAP_RV=""
-		RET_OP=0
-		OIFS=$IFS
-		IFS=','
-		for PARAM in ${PARAMS[@]}; do
-			CMDPARAMS="${CMDPARAMS} --$(echo ${PARAM} | tr '=' ' ')"
-		done
-		IFS=$OIFS
-		if [ ! -b /dev/rbd/${DEV} ]; then
-			MAP_RV=$(rbd map ${DEV} ${CMDPARAMS} 2>&1)
-			if [ $? -eq 0 ]; then
-				newrbd="yes"
-			else
-				RET=$((${RET}+$?))
-				RET_OP=1
-			fi
-		fi
-		eend ${RET_OP} "${MAP_RV}"
-
-		if [ "$newrbd" ]; then
-			## Mount new rbd
-			MNT_RV=""
-			mount --fake /dev/rbd/${DEV} >>/dev/null 2>&1 \
-			&& MNT_RV=$(mount -vn /dev/rbd/${DEV} 2>&1)
-			[ -n "${MNT_RV}" ] && einfo "mount: ${MNT_RV}"
-
-			## post-mapping
-			if [ -x "/etc/ceph/rbd.d/${DEV}" ]; then
-				einfo "RBD Running post-map hook '/etc/ceph/rbd.d/${DEV}'"
-				/etc/ceph/rbd.d/${DEV} map "/dev/rbd/${DEV}"
-			fi
-		fi
-	done < ${RBDMAPFILE}
-	eend ${RET}
-}
-
-stop() {
-
-	RET=0
-	## Unmount and unmap all rbd devices
-	if ls /dev/rbd[0-9]* >/dev/null 2>&1; then
-		for DEV in /dev/rbd[0-9]*; do
-			## pre-unmapping
-			for L in $(find /dev/rbd -type l); do
-				LL="${L##/dev/rbd/}"
-				if [ "$(readlink -f $L)" = "${DEV}" ] \
-				&& [ -x "/etc/ceph/rbd.d/${LL}" ]; then
-					einfo "RBD pre-unmap:  '${DEV}' hook '/etc/ceph/rbd.d/${LL}'"
-					/etc/ceph/rbd.d/${LL} unmap "$L"
-					break
-				fi
-			done
-
-			ebegin "Unmapping RBD device: '${DEV}'"
-			UMNT_RV=""
-			UMAP_RV=""
-			RET_OP=0
-			MNT=$(findmnt --mtab --source ${DEV} --noheadings | awk '{print $1'})
-			if [ -n "${MNT}" ]; then
-				einfo "un-mounting '${MNT}'"
-				UMNT_RV=$(umount "${MNT}" 2>&1)
-			fi
-			if mountpoint -q "${MNT}"; then
-				## Un-mounting failed.
-				RET_OP=1
-				RET=$((${RET}+1))
-			else
-				## Un-mapping.
-				UMAP_RV=$(rbd unmap $DEV 2>&1)
-				if [ $? -ne 0 ]; then
-					RET=$((${RET}+$?))
-					RET_OP=1
-				fi
-			fi
-			eend ${RET_OP} "${UMAP_RV}"
-			[ -n "${UMNT_RV}" ] && einfo "${UMNT_RV}"
-		done
-	fi
-	eend ${RET}
-}
-
-reload() {
-	start
-}
-
-status() {
-	rbd showmapped
-}
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 31594af521a7..632d1001d50e 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -3,20 +3,14 @@ AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c73
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
 DIST kubernetes-1.22.10.tar.gz 36075584 BLAKE2B e2d440070f8d573527359f4e59950af8c9b783da5e3f1914960b69e527411bf1aca98a1c23902e4e3d6b7c799233837676f02cc8469de130d8405800957b4cc1 SHA512 213629d3f71837318b3321b72cc08dcbf756be11ff927893154ec207cb6747a2a36c198cdbeb0f0bf9b1c0d0284f4bca8a43129f538ca1b763570fa4fe0e2ac8
 DIST kubernetes-1.22.12.tar.gz 36092785 BLAKE2B dc6427905469afee9d18b83f725a58a3f78d40f9fc1f4128e3105a0547df91d8b04500c507b21b43efba9358c012652b62c747d4f6ad3c4c442cca2a0093c897 SHA512 a024b652fd47e2e23890ae1509314456cb0abd96d3619054da18b8264e4f9da3a00278e1a4ab5b342aa7e80fbe637b4fb4d3053b8f999d4246bb1699ac145633
-DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
-DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
 DIST kubernetes-1.23.7.tar.gz 38210779 BLAKE2B 7b664b22491b19697ab596a2eacab5f4f907b7053f40e54bec48f807c273ec673f0e3f09107539d496ce2efbcfc0d649792d604aa6ea29ed938fc2b732b0cace SHA512 f871d8e4d9e41f829e8f6b5bc563ce7c2a060a3b23e9e8a76e3af49be4e2278422f2e8edff275730b690cc60127e334058f2b08d20c3befc6572431d08a8c0b4
 DIST kubernetes-1.23.9.tar.gz 38225608 BLAKE2B f657a2ed9df4a45f360f90e7dbea5c04c9ff536ffb08c53797d5745f3b18468041374910525995a8ae45e31add799ce863c2912892333a84197e6bf0e733dda2 SHA512 e5e46e68c90f6374e4b97424b088ed5b3d494a60bfd753a88cafed59d51d6696260d2be279631eab52f73b9f5444511609aaf950c51c73dfc77cba174943f37f
-DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0
 DIST kubernetes-1.24.1.tar.gz 37940937 BLAKE2B f5076a5ec36cf108b363645b7e39dd9e9b7d56c26457a3a740f30fad29db2bf66877f71ec33c4f545f9e5cdf736cfa6f752cb4d04ca917e2d78da1abfa233f83 SHA512 cdd85c10d931367e29d2cf3e99fd7eb0561e14a8c4a73c57cd3e497ecbd4ae4c0b30bac649ab75af241df63c715ca8ccc4cc67a51736fe2b01d182cd3a3ee104
 DIST kubernetes-1.24.3.tar.gz 37961140 BLAKE2B 663d1fe72e4c80b2946168880e496cae8842f7a884c1a821b0f4f6045dc81eb4313261cdaf3d86f887ee1ca34bb5c63a803ef4e109b935cde25ec0357dbdd5cd SHA512 21e5feac02be09f42b30c0e3a11855dcdfb5868fa031abd7dc52edc81c615353c62eae76fafb400dddb1fa41a25d96b2e4f193751f0d7362adaf32bae023a105
 EBUILD kube-apiserver-1.22.10.ebuild 1016 BLAKE2B 33a61cde7d8b70c868711c034d5d69af002f25cd3ff80b6ba12708618b8e0aa8fda2351d58b157e9ea68182c7932943bdac6d387c414551d9e799abc4abad8f8 SHA512 548b0b55ca6b094704e6f6b9a73ef6d5d0af8b9b03b2ed9f9ed692284e867439d1da6f9e412d11163d32ed58f99bdf57fa265e6791831cea8519bee46bb353a1
-EBUILD kube-apiserver-1.22.12.ebuild 1017 BLAKE2B f891662b03ea5bdcf7b0455c1013bf51ea916b8d100f16bea54a8734eb3bc3ddf86ea9f947c80be3dd997b713fa3e5b0f687d68ebfc807e6b80c562c1be6601c SHA512 1d2087cc96ad81c431dddb04a484ed2d3d5f10281b48d25f466f10474899780c35697a99bdb32c167182dcec2a5820ff8ead4138cb318aae967a25c39e701e5a
-EBUILD kube-apiserver-1.22.8.ebuild 1016 BLAKE2B 33a61cde7d8b70c868711c034d5d69af002f25cd3ff80b6ba12708618b8e0aa8fda2351d58b157e9ea68182c7932943bdac6d387c414551d9e799abc4abad8f8 SHA512 548b0b55ca6b094704e6f6b9a73ef6d5d0af8b9b03b2ed9f9ed692284e867439d1da6f9e412d11163d32ed58f99bdf57fa265e6791831cea8519bee46bb353a1
-EBUILD kube-apiserver-1.23.5.ebuild 991 BLAKE2B ee45da98c6c18e3bf3e979863e01c1401596cf21cf3cc79da20e6ccbdf2f7383b409f571f8cf6a245138dcfd481cf361a789284ef62e59bcb20938e1bdb5d148 SHA512 43091fd9e05355a4063d5133917ec5dade31ac326c0c332afae795b88648cdc3c96944305ff25553312a44ecb785361b1893310686a4e16bb82f218404592815
+EBUILD kube-apiserver-1.22.12.ebuild 1016 BLAKE2B 33a61cde7d8b70c868711c034d5d69af002f25cd3ff80b6ba12708618b8e0aa8fda2351d58b157e9ea68182c7932943bdac6d387c414551d9e799abc4abad8f8 SHA512 548b0b55ca6b094704e6f6b9a73ef6d5d0af8b9b03b2ed9f9ed692284e867439d1da6f9e412d11163d32ed58f99bdf57fa265e6791831cea8519bee46bb353a1
 EBUILD kube-apiserver-1.23.7.ebuild 991 BLAKE2B ee45da98c6c18e3bf3e979863e01c1401596cf21cf3cc79da20e6ccbdf2f7383b409f571f8cf6a245138dcfd481cf361a789284ef62e59bcb20938e1bdb5d148 SHA512 43091fd9e05355a4063d5133917ec5dade31ac326c0c332afae795b88648cdc3c96944305ff25553312a44ecb785361b1893310686a4e16bb82f218404592815
-EBUILD kube-apiserver-1.23.9.ebuild 992 BLAKE2B 78848d01aea6d0efb3c42f0af1ef60b6b80e8884fa1c0b3d811ade0dfe3d0552f2adda802eea4478b069323807a96ff915c329a1bd37d60b3d7d87cf63a6ac7a SHA512 13ef47a1f969ac0437f103e04825cbdf5a8951bed255b69199d8270a1f4b42324c2c9c84fdac7466d64f42682ef81fa90256921a58dcfecb5b03257e845498c7
-EBUILD kube-apiserver-1.24.0.ebuild 994 BLAKE2B 0365339fecbc58416819babbbb01b3dec184b7b34164c7b45005921f15a2f4a67216968572e48befcdd6b5f9359d77fabbc29c704642671439d0b52f53e44108 SHA512 4a6af8c8d24e26fecf865dc62786cd2bb44767ab247b9e56fe6a5792ff520303bddae25c7e6e82ae1d0eefb1400715171c7594d53ea7ccb39d74353be1fcf572
+EBUILD kube-apiserver-1.23.9.ebuild 991 BLAKE2B ee45da98c6c18e3bf3e979863e01c1401596cf21cf3cc79da20e6ccbdf2f7383b409f571f8cf6a245138dcfd481cf361a789284ef62e59bcb20938e1bdb5d148 SHA512 43091fd9e05355a4063d5133917ec5dade31ac326c0c332afae795b88648cdc3c96944305ff25553312a44ecb785361b1893310686a4e16bb82f218404592815
 EBUILD kube-apiserver-1.24.1.ebuild 993 BLAKE2B a1c1286df644af89f70d7023ab9033a8ce3e5cd565cfaefcbf59870b5acb242b2d153dad13e54bac53d1c48afdc2dba2c04d7f1b576799fa90508c9731fdcf29 SHA512 e79676ef0d19f4004a7431d5c3abc8cd9f69ac1438cbe429c6a8d1f9d8166119a656bf016fd49e6c4380de5dc55214e4f1b4fa53f3b831a657e731afac218084
-EBUILD kube-apiserver-1.24.3.ebuild 994 BLAKE2B 0365339fecbc58416819babbbb01b3dec184b7b34164c7b45005921f15a2f4a67216968572e48befcdd6b5f9359d77fabbc29c704642671439d0b52f53e44108 SHA512 4a6af8c8d24e26fecf865dc62786cd2bb44767ab247b9e56fe6a5792ff520303bddae25c7e6e82ae1d0eefb1400715171c7594d53ea7ccb39d74353be1fcf572
+EBUILD kube-apiserver-1.24.3.ebuild 993 BLAKE2B a1c1286df644af89f70d7023ab9033a8ce3e5cd565cfaefcbf59870b5acb242b2d153dad13e54bac53d1c48afdc2dba2c04d7f1b576799fa90508c9731fdcf29 SHA512 e79676ef0d19f4004a7431d5c3abc8cd9f69ac1438cbe429c6a8d1f9d8166119a656bf016fd49e6c4380de5dc55214e4f1b4fa53f3b831a657e731afac218084
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.22.12.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.22.12.ebuild
index 19b4da1a49f7..a43f3c267727 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.22.12.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.22.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.22.8.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.22.8.ebuild
deleted file mode 100644
index a43f3c267727..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.22.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.23.5.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.23.5.ebuild
deleted file mode 100644
index 5fb6d6b47274..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.23.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.17"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.23.9.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.23.9.ebuild
index a7400f70bdbe..5fb6d6b47274 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.23.9.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.23.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.24.0.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.24.0.ebuild
deleted file mode 100644
index 4010c16c51d5..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.24.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.18.1"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.24.3.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.24.3.ebuild
index 4010c16c51d5..6c3647f71003 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.24.3.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.24.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 87696883de67..93198f6ba190 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -3,20 +3,14 @@ AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
 DIST kubernetes-1.22.10.tar.gz 36075584 BLAKE2B e2d440070f8d573527359f4e59950af8c9b783da5e3f1914960b69e527411bf1aca98a1c23902e4e3d6b7c799233837676f02cc8469de130d8405800957b4cc1 SHA512 213629d3f71837318b3321b72cc08dcbf756be11ff927893154ec207cb6747a2a36c198cdbeb0f0bf9b1c0d0284f4bca8a43129f538ca1b763570fa4fe0e2ac8
 DIST kubernetes-1.22.12.tar.gz 36092785 BLAKE2B dc6427905469afee9d18b83f725a58a3f78d40f9fc1f4128e3105a0547df91d8b04500c507b21b43efba9358c012652b62c747d4f6ad3c4c442cca2a0093c897 SHA512 a024b652fd47e2e23890ae1509314456cb0abd96d3619054da18b8264e4f9da3a00278e1a4ab5b342aa7e80fbe637b4fb4d3053b8f999d4246bb1699ac145633
-DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
-DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
 DIST kubernetes-1.23.7.tar.gz 38210779 BLAKE2B 7b664b22491b19697ab596a2eacab5f4f907b7053f40e54bec48f807c273ec673f0e3f09107539d496ce2efbcfc0d649792d604aa6ea29ed938fc2b732b0cace SHA512 f871d8e4d9e41f829e8f6b5bc563ce7c2a060a3b23e9e8a76e3af49be4e2278422f2e8edff275730b690cc60127e334058f2b08d20c3befc6572431d08a8c0b4
 DIST kubernetes-1.23.9.tar.gz 38225608 BLAKE2B f657a2ed9df4a45f360f90e7dbea5c04c9ff536ffb08c53797d5745f3b18468041374910525995a8ae45e31add799ce863c2912892333a84197e6bf0e733dda2 SHA512 e5e46e68c90f6374e4b97424b088ed5b3d494a60bfd753a88cafed59d51d6696260d2be279631eab52f73b9f5444511609aaf950c51c73dfc77cba174943f37f
-DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0
 DIST kubernetes-1.24.1.tar.gz 37940937 BLAKE2B f5076a5ec36cf108b363645b7e39dd9e9b7d56c26457a3a740f30fad29db2bf66877f71ec33c4f545f9e5cdf736cfa6f752cb4d04ca917e2d78da1abfa233f83 SHA512 cdd85c10d931367e29d2cf3e99fd7eb0561e14a8c4a73c57cd3e497ecbd4ae4c0b30bac649ab75af241df63c715ca8ccc4cc67a51736fe2b01d182cd3a3ee104
 DIST kubernetes-1.24.3.tar.gz 37961140 BLAKE2B 663d1fe72e4c80b2946168880e496cae8842f7a884c1a821b0f4f6045dc81eb4313261cdaf3d86f887ee1ca34bb5c63a803ef4e109b935cde25ec0357dbdd5cd SHA512 21e5feac02be09f42b30c0e3a11855dcdfb5868fa031abd7dc52edc81c615353c62eae76fafb400dddb1fa41a25d96b2e4f193751f0d7362adaf32bae023a105
 EBUILD kube-controller-manager-1.22.10.ebuild 1013 BLAKE2B 124277c370f8b8238311ffecaac5d9f609bb620c9dccf9d929ec6b23c335b31d501b9e9f9db602a75d96fa330e8e9e6350cacb4125934146e6da7482911f34c5 SHA512 e2efacfeb452585f6d469aacee9bbe958cee567e437a7a6a438a7805dd46279089354cece61495241e4f75d0b02edd6cc425a12a24e533d784030ae6dca34cee
-EBUILD kube-controller-manager-1.22.12.ebuild 1014 BLAKE2B 97c377f2df93c70ff500772c031802d7d5cebbe23a38000829179f6dd35f4352b694a85c2f72d4e752862fe797a6cba8e2c143a7426c235a1a536297d30a6dae SHA512 ef4f30da99afb95c3574abf48c43ffeea20285a8ac9a48556156992df047e8e3480f9a9a9ce1503d720677db42ab754120abfdc43dd2fa01acbfba74c0ce8b11
-EBUILD kube-controller-manager-1.22.8.ebuild 1013 BLAKE2B 124277c370f8b8238311ffecaac5d9f609bb620c9dccf9d929ec6b23c335b31d501b9e9f9db602a75d96fa330e8e9e6350cacb4125934146e6da7482911f34c5 SHA512 e2efacfeb452585f6d469aacee9bbe958cee567e437a7a6a438a7805dd46279089354cece61495241e4f75d0b02edd6cc425a12a24e533d784030ae6dca34cee
-EBUILD kube-controller-manager-1.23.5.ebuild 988 BLAKE2B 87d2477f6f3dcc1b9b44ced1d69e981fbd21e5cb3e44c10848d8c53c393d82312b26cab030e8afc55be8b01af13160c42f28a52751e69b70d44dc7d00e4bfe53 SHA512 aa70cb437ed4cebfe426c899a4c80d5426df0ff733e5e633ce1986b8a6fbad3453058f42655f0cd03284837adc8eae7951ccc3cb735c1faa449a63905b6a2477
+EBUILD kube-controller-manager-1.22.12.ebuild 1013 BLAKE2B 124277c370f8b8238311ffecaac5d9f609bb620c9dccf9d929ec6b23c335b31d501b9e9f9db602a75d96fa330e8e9e6350cacb4125934146e6da7482911f34c5 SHA512 e2efacfeb452585f6d469aacee9bbe958cee567e437a7a6a438a7805dd46279089354cece61495241e4f75d0b02edd6cc425a12a24e533d784030ae6dca34cee
 EBUILD kube-controller-manager-1.23.7.ebuild 988 BLAKE2B 87d2477f6f3dcc1b9b44ced1d69e981fbd21e5cb3e44c10848d8c53c393d82312b26cab030e8afc55be8b01af13160c42f28a52751e69b70d44dc7d00e4bfe53 SHA512 aa70cb437ed4cebfe426c899a4c80d5426df0ff733e5e633ce1986b8a6fbad3453058f42655f0cd03284837adc8eae7951ccc3cb735c1faa449a63905b6a2477
-EBUILD kube-controller-manager-1.23.9.ebuild 989 BLAKE2B 6502e890aa70159eed88ed4d79d0ae176355ce33fea5e47fa87986769586abc5fc9d1a220b1b79116e25bc8f66bf1ae0765f18b731159c94ea7692913591127a SHA512 207f261358a494ce4d6a7b8d1805157fab087b6eadbd04122fbd40482112276e22e180314740e520707c176d5c2c1aaa57e8752a447ef5b35115d2da28941d17
-EBUILD kube-controller-manager-1.24.0.ebuild 991 BLAKE2B 111b237cba0d979e2ab42e25dfcdd99c24f35aa7bdd34a8fa452721476c6d0a5efa4c20f41d6138a8514c02e96be6a75904a28a741f4ca75581138c9dff3ee5e SHA512 375680a8fa40c07fb906d2df6ba8463cf0bf2a2871b59666bb3df0b941ccf6038f6ff986aac31e82c514b98487649c1a802c662b89032ca1ed49807807fc7f66
+EBUILD kube-controller-manager-1.23.9.ebuild 988 BLAKE2B 87d2477f6f3dcc1b9b44ced1d69e981fbd21e5cb3e44c10848d8c53c393d82312b26cab030e8afc55be8b01af13160c42f28a52751e69b70d44dc7d00e4bfe53 SHA512 aa70cb437ed4cebfe426c899a4c80d5426df0ff733e5e633ce1986b8a6fbad3453058f42655f0cd03284837adc8eae7951ccc3cb735c1faa449a63905b6a2477
 EBUILD kube-controller-manager-1.24.1.ebuild 990 BLAKE2B b2e9ba94485dabf41608df895ea0e37bd2c128768cd4102b8a68a5dcd0d73fa0f1c3d3b9341fcdb340e33587475941f707f45a35b7fa85600765e0361cad287e SHA512 eae86891024b243e3d74f83df46edbeb205a03c696563d5b86269c75dd6fa1cfbc245c377719c7167619822a3dc06fdb7f5ae60b8bb33620c65f993c215d362b
-EBUILD kube-controller-manager-1.24.3.ebuild 991 BLAKE2B 111b237cba0d979e2ab42e25dfcdd99c24f35aa7bdd34a8fa452721476c6d0a5efa4c20f41d6138a8514c02e96be6a75904a28a741f4ca75581138c9dff3ee5e SHA512 375680a8fa40c07fb906d2df6ba8463cf0bf2a2871b59666bb3df0b941ccf6038f6ff986aac31e82c514b98487649c1a802c662b89032ca1ed49807807fc7f66
+EBUILD kube-controller-manager-1.24.3.ebuild 990 BLAKE2B b2e9ba94485dabf41608df895ea0e37bd2c128768cd4102b8a68a5dcd0d73fa0f1c3d3b9341fcdb340e33587475941f707f45a35b7fa85600765e0361cad287e SHA512 eae86891024b243e3d74f83df46edbeb205a03c696563d5b86269c75dd6fa1cfbc245c377719c7167619822a3dc06fdb7f5ae60b8bb33620c65f993c215d362b
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.22.12.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.22.12.ebuild
index 3611bae7ae46..2e2307593ee7 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.22.12.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.22.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.22.8.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.22.8.ebuild
deleted file mode 100644
index 2e2307593ee7..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.22.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.5.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.5.ebuild
deleted file mode 100644
index 6b3568782a04..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.17"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.9.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.9.ebuild
index 8a6411803c93..6b3568782a04 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.9.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.0.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.0.ebuild
deleted file mode 100644
index 492d28a5d90e..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.18.1"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.3.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.3.ebuild
index 492d28a5d90e..7cb5f5ddc809 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.3.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 13e99ed6b577..07a920c1d597 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -3,20 +3,14 @@ AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe46
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
 DIST kubernetes-1.22.10.tar.gz 36075584 BLAKE2B e2d440070f8d573527359f4e59950af8c9b783da5e3f1914960b69e527411bf1aca98a1c23902e4e3d6b7c799233837676f02cc8469de130d8405800957b4cc1 SHA512 213629d3f71837318b3321b72cc08dcbf756be11ff927893154ec207cb6747a2a36c198cdbeb0f0bf9b1c0d0284f4bca8a43129f538ca1b763570fa4fe0e2ac8
 DIST kubernetes-1.22.12.tar.gz 36092785 BLAKE2B dc6427905469afee9d18b83f725a58a3f78d40f9fc1f4128e3105a0547df91d8b04500c507b21b43efba9358c012652b62c747d4f6ad3c4c442cca2a0093c897 SHA512 a024b652fd47e2e23890ae1509314456cb0abd96d3619054da18b8264e4f9da3a00278e1a4ab5b342aa7e80fbe637b4fb4d3053b8f999d4246bb1699ac145633
-DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
-DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
 DIST kubernetes-1.23.7.tar.gz 38210779 BLAKE2B 7b664b22491b19697ab596a2eacab5f4f907b7053f40e54bec48f807c273ec673f0e3f09107539d496ce2efbcfc0d649792d604aa6ea29ed938fc2b732b0cace SHA512 f871d8e4d9e41f829e8f6b5bc563ce7c2a060a3b23e9e8a76e3af49be4e2278422f2e8edff275730b690cc60127e334058f2b08d20c3befc6572431d08a8c0b4
 DIST kubernetes-1.23.9.tar.gz 38225608 BLAKE2B f657a2ed9df4a45f360f90e7dbea5c04c9ff536ffb08c53797d5745f3b18468041374910525995a8ae45e31add799ce863c2912892333a84197e6bf0e733dda2 SHA512 e5e46e68c90f6374e4b97424b088ed5b3d494a60bfd753a88cafed59d51d6696260d2be279631eab52f73b9f5444511609aaf950c51c73dfc77cba174943f37f
-DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0
 DIST kubernetes-1.24.1.tar.gz 37940937 BLAKE2B f5076a5ec36cf108b363645b7e39dd9e9b7d56c26457a3a740f30fad29db2bf66877f71ec33c4f545f9e5cdf736cfa6f752cb4d04ca917e2d78da1abfa233f83 SHA512 cdd85c10d931367e29d2cf3e99fd7eb0561e14a8c4a73c57cd3e497ecbd4ae4c0b30bac649ab75af241df63c715ca8ccc4cc67a51736fe2b01d182cd3a3ee104
 DIST kubernetes-1.24.3.tar.gz 37961140 BLAKE2B 663d1fe72e4c80b2946168880e496cae8842f7a884c1a821b0f4f6045dc81eb4313261cdaf3d86f887ee1ca34bb5c63a803ef4e109b935cde25ec0357dbdd5cd SHA512 21e5feac02be09f42b30c0e3a11855dcdfb5868fa031abd7dc52edc81c615353c62eae76fafb400dddb1fa41a25d96b2e4f193751f0d7362adaf32bae023a105
 EBUILD kube-proxy-1.22.10.ebuild 928 BLAKE2B c4a2ec947e91a35d0be81b534664205feb724cdede78fe09b8b30b8d024823b2544503adf2ff63772e25634fd2a859477039d7e9c7ebbc791a505f520aaa7f5b SHA512 57e22150df4378f562c852ec6db401467c94aa4cc953534fae8383919b4c4872952047e4461c3916adab8dd9490a54184fd2dad5defca262b351463ec5e46a13
-EBUILD kube-proxy-1.22.12.ebuild 929 BLAKE2B e7cf539cc2ae4e8f47ad785b6c720f66ae3e1dee7fce5f93f104566ebff9ee012f3b6d0623ea56261ff2f923bebdf6f71cc14c68406c9643d5875fd305d3e4b5 SHA512 49859b7ddd88894471d9e58b98455af9f93469a03eb4c40a1e73f113deb684706d69eeb79e06316ee9968af584b558e2cf7a6b908831b71b341492b11889b7d3
-EBUILD kube-proxy-1.22.8.ebuild 928 BLAKE2B c4a2ec947e91a35d0be81b534664205feb724cdede78fe09b8b30b8d024823b2544503adf2ff63772e25634fd2a859477039d7e9c7ebbc791a505f520aaa7f5b SHA512 57e22150df4378f562c852ec6db401467c94aa4cc953534fae8383919b4c4872952047e4461c3916adab8dd9490a54184fd2dad5defca262b351463ec5e46a13
-EBUILD kube-proxy-1.23.5.ebuild 903 BLAKE2B 6af6c1be968999dd8b76cd9a7036137d8be4c72c0516ce89f512f13eb3fc2186e34fc74d090fc5d34f285e2ca6f822382b6194ef1e80238ee23c7be1b10f6df9 SHA512 6f3a8e41e2505e752c4a0fbde6a93801db713a500903882f17c4001443a878c61087db361686a89afe529bb43d50e626343cac75c18f5c577b0e12ed582ab12a
+EBUILD kube-proxy-1.22.12.ebuild 928 BLAKE2B c4a2ec947e91a35d0be81b534664205feb724cdede78fe09b8b30b8d024823b2544503adf2ff63772e25634fd2a859477039d7e9c7ebbc791a505f520aaa7f5b SHA512 57e22150df4378f562c852ec6db401467c94aa4cc953534fae8383919b4c4872952047e4461c3916adab8dd9490a54184fd2dad5defca262b351463ec5e46a13
 EBUILD kube-proxy-1.23.7.ebuild 903 BLAKE2B 6af6c1be968999dd8b76cd9a7036137d8be4c72c0516ce89f512f13eb3fc2186e34fc74d090fc5d34f285e2ca6f822382b6194ef1e80238ee23c7be1b10f6df9 SHA512 6f3a8e41e2505e752c4a0fbde6a93801db713a500903882f17c4001443a878c61087db361686a89afe529bb43d50e626343cac75c18f5c577b0e12ed582ab12a
-EBUILD kube-proxy-1.23.9.ebuild 904 BLAKE2B 3630914e093e3f07eaaaa9e7d9a2bb7706810d3fc9b13843d9caf7dae3baa29fe25b2d1b0fa97545cf074cc56bf59bcfdc2595926fd1785cb93efaa2f4743234 SHA512 1a1a893b9f33407cceecd7e5e06fc9f1baf6e76a2831029b3d7d6743b1090b6c73ab96061e74d54f0f4fd5771b65f6891c58f67ff737ffd52f349edb5ef5f155
-EBUILD kube-proxy-1.24.0.ebuild 906 BLAKE2B b15e95243cd35fb900d792f9be7be136fed833eb8d09112cb71206ccde67cdd88c50a7c52cee398afaf3e902974a539ae73ac2029f56910d2b65f702fadfdf61 SHA512 5d0ec68ee23b1138ea859ba0db48902f65a7568e7ab99b3da59922ac7c428850373f82677a9948791f08802e14c1461c069c704643578dcb92114468a046e43e
+EBUILD kube-proxy-1.23.9.ebuild 903 BLAKE2B 6af6c1be968999dd8b76cd9a7036137d8be4c72c0516ce89f512f13eb3fc2186e34fc74d090fc5d34f285e2ca6f822382b6194ef1e80238ee23c7be1b10f6df9 SHA512 6f3a8e41e2505e752c4a0fbde6a93801db713a500903882f17c4001443a878c61087db361686a89afe529bb43d50e626343cac75c18f5c577b0e12ed582ab12a
 EBUILD kube-proxy-1.24.1.ebuild 905 BLAKE2B 38437dace1ad859f1d0071440672f140b57a025e51b0f6cd48c7bf3f8541a2c310927b212462f0ed3f4987d55c6b734ec272905b044909d6f50fa0ccd0552a49 SHA512 d7fd98864877ebe1e4362801c0a0d14799396241d65a0db7d4189023ed4d41d61b7f1b044761aa8a4e28a51096d76eb48fc06eb4abb4a6c8985a46b633280016
-EBUILD kube-proxy-1.24.3.ebuild 906 BLAKE2B b15e95243cd35fb900d792f9be7be136fed833eb8d09112cb71206ccde67cdd88c50a7c52cee398afaf3e902974a539ae73ac2029f56910d2b65f702fadfdf61 SHA512 5d0ec68ee23b1138ea859ba0db48902f65a7568e7ab99b3da59922ac7c428850373f82677a9948791f08802e14c1461c069c704643578dcb92114468a046e43e
+EBUILD kube-proxy-1.24.3.ebuild 905 BLAKE2B 38437dace1ad859f1d0071440672f140b57a025e51b0f6cd48c7bf3f8541a2c310927b212462f0ed3f4987d55c6b734ec272905b044909d6f50fa0ccd0552a49 SHA512 d7fd98864877ebe1e4362801c0a0d14799396241d65a0db7d4189023ed4d41d61b7f1b044761aa8a4e28a51096d76eb48fc06eb4abb4a6c8985a46b633280016
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.22.12.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.22.12.ebuild
index 866b8b777f1f..5cb1f41bbeab 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.22.12.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.22.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.22.8.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.22.8.ebuild
deleted file mode 100644
index 5cb1f41bbeab..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.22.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="net-firewall/conntrack-tools
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.23.5.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.23.5.ebuild
deleted file mode 100644
index d0b34277f839..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.23.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="net-firewall/conntrack-tools"
-BDEPEND=">=dev-lang/go-1.17"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.23.9.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.23.9.ebuild
index 2193eb857e81..d0b34277f839 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.23.9.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.23.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools"
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.24.0.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.24.0.ebuild
deleted file mode 100644
index 9073ae83aebc..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.24.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="net-firewall/conntrack-tools"
-BDEPEND=">=dev-lang/go-1.18.1"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.24.3.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.24.3.ebuild
index 9073ae83aebc..c71a00eedf48 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.24.3.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.24.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools"
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index c24ba38cd496..59423e8b638d 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -3,20 +3,14 @@ AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559f
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
 DIST kubernetes-1.22.10.tar.gz 36075584 BLAKE2B e2d440070f8d573527359f4e59950af8c9b783da5e3f1914960b69e527411bf1aca98a1c23902e4e3d6b7c799233837676f02cc8469de130d8405800957b4cc1 SHA512 213629d3f71837318b3321b72cc08dcbf756be11ff927893154ec207cb6747a2a36c198cdbeb0f0bf9b1c0d0284f4bca8a43129f538ca1b763570fa4fe0e2ac8
 DIST kubernetes-1.22.12.tar.gz 36092785 BLAKE2B dc6427905469afee9d18b83f725a58a3f78d40f9fc1f4128e3105a0547df91d8b04500c507b21b43efba9358c012652b62c747d4f6ad3c4c442cca2a0093c897 SHA512 a024b652fd47e2e23890ae1509314456cb0abd96d3619054da18b8264e4f9da3a00278e1a4ab5b342aa7e80fbe637b4fb4d3053b8f999d4246bb1699ac145633
-DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
-DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
 DIST kubernetes-1.23.7.tar.gz 38210779 BLAKE2B 7b664b22491b19697ab596a2eacab5f4f907b7053f40e54bec48f807c273ec673f0e3f09107539d496ce2efbcfc0d649792d604aa6ea29ed938fc2b732b0cace SHA512 f871d8e4d9e41f829e8f6b5bc563ce7c2a060a3b23e9e8a76e3af49be4e2278422f2e8edff275730b690cc60127e334058f2b08d20c3befc6572431d08a8c0b4
 DIST kubernetes-1.23.9.tar.gz 38225608 BLAKE2B f657a2ed9df4a45f360f90e7dbea5c04c9ff536ffb08c53797d5745f3b18468041374910525995a8ae45e31add799ce863c2912892333a84197e6bf0e733dda2 SHA512 e5e46e68c90f6374e4b97424b088ed5b3d494a60bfd753a88cafed59d51d6696260d2be279631eab52f73b9f5444511609aaf950c51c73dfc77cba174943f37f
-DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0
 DIST kubernetes-1.24.1.tar.gz 37940937 BLAKE2B f5076a5ec36cf108b363645b7e39dd9e9b7d56c26457a3a740f30fad29db2bf66877f71ec33c4f545f9e5cdf736cfa6f752cb4d04ca917e2d78da1abfa233f83 SHA512 cdd85c10d931367e29d2cf3e99fd7eb0561e14a8c4a73c57cd3e497ecbd4ae4c0b30bac649ab75af241df63c715ca8ccc4cc67a51736fe2b01d182cd3a3ee104
 DIST kubernetes-1.24.3.tar.gz 37961140 BLAKE2B 663d1fe72e4c80b2946168880e496cae8842f7a884c1a821b0f4f6045dc81eb4313261cdaf3d86f887ee1ca34bb5c63a803ef4e109b935cde25ec0357dbdd5cd SHA512 21e5feac02be09f42b30c0e3a11855dcdfb5868fa031abd7dc52edc81c615353c62eae76fafb400dddb1fa41a25d96b2e4f193751f0d7362adaf32bae023a105
 EBUILD kube-scheduler-1.22.10.ebuild 986 BLAKE2B a4f7a53e19faa830536c7463c384db1ffde30248eee4ca26dfcde1bc6a82278159b6c5e830a885785d845ec429d83b8baaeef7097e9ff1501d99c5a72676cd52 SHA512 fb3775804affa077c9ed82f34169c25113bb9511708afdd3baf6a71aa801682c57833ddb5778603349f5b7f07d6fd0e655e8a8a7b57699fec9c40656d1423bca
-EBUILD kube-scheduler-1.22.12.ebuild 987 BLAKE2B 152ac5b31334c12ca7a7cdcdae627ea8d00b8e1f118044b33bc59a430d64c9ed46d8231a2d6afcbae9ebf190730533cd405f1bda5661230689a4d1cbb264993f SHA512 ff649c406b4d0da1223c0b0e3611a1fc6570cf78901cd766352b3db0f430eea7a1471de6315b4ba1eabaa515deb4600800ad27ca04997706da4097c57d574e9b
-EBUILD kube-scheduler-1.22.8.ebuild 986 BLAKE2B a4f7a53e19faa830536c7463c384db1ffde30248eee4ca26dfcde1bc6a82278159b6c5e830a885785d845ec429d83b8baaeef7097e9ff1501d99c5a72676cd52 SHA512 fb3775804affa077c9ed82f34169c25113bb9511708afdd3baf6a71aa801682c57833ddb5778603349f5b7f07d6fd0e655e8a8a7b57699fec9c40656d1423bca
-EBUILD kube-scheduler-1.23.5.ebuild 961 BLAKE2B 833f5fcd8ed332afd7e503ac7fde09828ce18565ebf9c98d43356790bf79d985d6f6de1d682e371cceca717a593a10bc85e266c141ea20725cb57f6c6e34b26f SHA512 6d9ad34d6bb8a1a3a3a88576ef3ffa6129317ce5f9ad3bf7a9574414d3ace6a207f92324387f8fd9a1506a15cdeae09d5a2d30c9138a0fcc555d70513c6da120
+EBUILD kube-scheduler-1.22.12.ebuild 986 BLAKE2B a4f7a53e19faa830536c7463c384db1ffde30248eee4ca26dfcde1bc6a82278159b6c5e830a885785d845ec429d83b8baaeef7097e9ff1501d99c5a72676cd52 SHA512 fb3775804affa077c9ed82f34169c25113bb9511708afdd3baf6a71aa801682c57833ddb5778603349f5b7f07d6fd0e655e8a8a7b57699fec9c40656d1423bca
 EBUILD kube-scheduler-1.23.7.ebuild 961 BLAKE2B 833f5fcd8ed332afd7e503ac7fde09828ce18565ebf9c98d43356790bf79d985d6f6de1d682e371cceca717a593a10bc85e266c141ea20725cb57f6c6e34b26f SHA512 6d9ad34d6bb8a1a3a3a88576ef3ffa6129317ce5f9ad3bf7a9574414d3ace6a207f92324387f8fd9a1506a15cdeae09d5a2d30c9138a0fcc555d70513c6da120
-EBUILD kube-scheduler-1.23.9.ebuild 962 BLAKE2B ebc2aeda907841925e5c217a07407dddac04b82f46271387b1403486b870d95d42d40c4107da9741a7325efa812efecf4cbe771697071ad3e6639f5136631d9a SHA512 0b9cef2e337d0c0af9bd3b2f2e4131d434423724f27fed7992df106bde8e7c788cc5a207b0ef97c7e6ae9d5c50e0fe54c06876a1b24d89e184beb90feca17fbe
-EBUILD kube-scheduler-1.24.0.ebuild 964 BLAKE2B c9d6ce2d76b582df1fe639d31a045ceac568478eb20ba1ddfdbab0449e9b53c8ed62855a5678367f3fb07079e5fbc18799d3271e60a37c7d10be2e8d8ba37f3f SHA512 82c646d2f5278f388c9269e384be9fc5ee59b6b432e2eb48445347e12fd48028c478940e9373aa555ccba1b702291671c7cdcbdb90e223154b92eb3cd90f6552
+EBUILD kube-scheduler-1.23.9.ebuild 961 BLAKE2B 833f5fcd8ed332afd7e503ac7fde09828ce18565ebf9c98d43356790bf79d985d6f6de1d682e371cceca717a593a10bc85e266c141ea20725cb57f6c6e34b26f SHA512 6d9ad34d6bb8a1a3a3a88576ef3ffa6129317ce5f9ad3bf7a9574414d3ace6a207f92324387f8fd9a1506a15cdeae09d5a2d30c9138a0fcc555d70513c6da120
 EBUILD kube-scheduler-1.24.1.ebuild 963 BLAKE2B 81cb462597c2f4ead1eaf7eb5685ff200fbc6e7084ff171f3b471aeb41446de2a1566712aac755b482838007f929cad652bf1a715ff7639c3197d35cfa5d1c57 SHA512 8c882cab899db965a73ee86d0e5605adffe2dea197fe11e54705c93ded70cdaff0afaf393d845bc39dcdfb948bc08d000e86970fd083a539ba2122098ab6e228
-EBUILD kube-scheduler-1.24.3.ebuild 964 BLAKE2B c9d6ce2d76b582df1fe639d31a045ceac568478eb20ba1ddfdbab0449e9b53c8ed62855a5678367f3fb07079e5fbc18799d3271e60a37c7d10be2e8d8ba37f3f SHA512 82c646d2f5278f388c9269e384be9fc5ee59b6b432e2eb48445347e12fd48028c478940e9373aa555ccba1b702291671c7cdcbdb90e223154b92eb3cd90f6552
+EBUILD kube-scheduler-1.24.3.ebuild 963 BLAKE2B 81cb462597c2f4ead1eaf7eb5685ff200fbc6e7084ff171f3b471aeb41446de2a1566712aac755b482838007f929cad652bf1a715ff7639c3197d35cfa5d1c57 SHA512 8c882cab899db965a73ee86d0e5605adffe2dea197fe11e54705c93ded70cdaff0afaf393d845bc39dcdfb948bc08d000e86970fd083a539ba2122098ab6e228
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.22.12.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.22.12.ebuild
index 6deafd6db8c6..992ec024d537 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.22.12.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.22.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.22.8.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.22.8.ebuild
deleted file mode 100644
index 992ec024d537..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.22.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.23.5.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.23.5.ebuild
deleted file mode 100644
index 446310121794..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.23.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.17"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.23.9.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.23.9.ebuild
index 393cef8175ab..446310121794 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.23.9.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.23.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.24.0.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.24.0.ebuild
deleted file mode 100644
index 0644cbea3c98..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.24.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.18.1"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.24.3.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.24.3.ebuild
index 0644cbea3c98..825dcd92ae76 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.24.3.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.24.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 59b71004eb35..f0c3ed92e0cb 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,19 +1,13 @@
 DIST kubernetes-1.22.10.tar.gz 36075584 BLAKE2B e2d440070f8d573527359f4e59950af8c9b783da5e3f1914960b69e527411bf1aca98a1c23902e4e3d6b7c799233837676f02cc8469de130d8405800957b4cc1 SHA512 213629d3f71837318b3321b72cc08dcbf756be11ff927893154ec207cb6747a2a36c198cdbeb0f0bf9b1c0d0284f4bca8a43129f538ca1b763570fa4fe0e2ac8
 DIST kubernetes-1.22.12.tar.gz 36092785 BLAKE2B dc6427905469afee9d18b83f725a58a3f78d40f9fc1f4128e3105a0547df91d8b04500c507b21b43efba9358c012652b62c747d4f6ad3c4c442cca2a0093c897 SHA512 a024b652fd47e2e23890ae1509314456cb0abd96d3619054da18b8264e4f9da3a00278e1a4ab5b342aa7e80fbe637b4fb4d3053b8f999d4246bb1699ac145633
-DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
-DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
 DIST kubernetes-1.23.7.tar.gz 38210779 BLAKE2B 7b664b22491b19697ab596a2eacab5f4f907b7053f40e54bec48f807c273ec673f0e3f09107539d496ce2efbcfc0d649792d604aa6ea29ed938fc2b732b0cace SHA512 f871d8e4d9e41f829e8f6b5bc563ce7c2a060a3b23e9e8a76e3af49be4e2278422f2e8edff275730b690cc60127e334058f2b08d20c3befc6572431d08a8c0b4
 DIST kubernetes-1.23.9.tar.gz 38225608 BLAKE2B f657a2ed9df4a45f360f90e7dbea5c04c9ff536ffb08c53797d5745f3b18468041374910525995a8ae45e31add799ce863c2912892333a84197e6bf0e733dda2 SHA512 e5e46e68c90f6374e4b97424b088ed5b3d494a60bfd753a88cafed59d51d6696260d2be279631eab52f73b9f5444511609aaf950c51c73dfc77cba174943f37f
-DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0
 DIST kubernetes-1.24.1.tar.gz 37940937 BLAKE2B f5076a5ec36cf108b363645b7e39dd9e9b7d56c26457a3a740f30fad29db2bf66877f71ec33c4f545f9e5cdf736cfa6f752cb4d04ca917e2d78da1abfa233f83 SHA512 cdd85c10d931367e29d2cf3e99fd7eb0561e14a8c4a73c57cd3e497ecbd4ae4c0b30bac649ab75af241df63c715ca8ccc4cc67a51736fe2b01d182cd3a3ee104
 DIST kubernetes-1.24.3.tar.gz 37961140 BLAKE2B 663d1fe72e4c80b2946168880e496cae8842f7a884c1a821b0f4f6045dc81eb4313261cdaf3d86f887ee1ca34bb5c63a803ef4e109b935cde25ec0357dbdd5cd SHA512 21e5feac02be09f42b30c0e3a11855dcdfb5868fa031abd7dc52edc81c615353c62eae76fafb400dddb1fa41a25d96b2e4f193751f0d7362adaf32bae023a105
 EBUILD kubeadm-1.22.10.ebuild 911 BLAKE2B 8d528e3a92f11884298862fa90dbc02621635d0e0677af3ff9e63c78b67564d34b99b5a6017f57cec32e8bc09e99996781b3a355dfb8a410562fe53d8c8472a0 SHA512 75a830c95e052946772ee92ea4bd11bb677ba5add4f1342dbbac0c7bef0d51167dc3e32f85dc94463b24835350d4475ce253b47f3087b5c3c7e6de1c1008fbda
-EBUILD kubeadm-1.22.12.ebuild 912 BLAKE2B 7548d6905fd17d946d2d4e974229257aac34a826728c50d113ebff6a5d9758fe2f92c1388b6ed344056435f1af1563311f0c3e185d0aef4318cb1ba3167276c1 SHA512 094215e91d4681b9be05d3c67426e99f3a7bd6e7ffb34ee5c7a3fac96907c06f34dcb492d09dbaec7a045b2c13a66aef699ed0308fdf12dc6d1196a7bf7b01d0
-EBUILD kubeadm-1.22.8.ebuild 911 BLAKE2B 8d528e3a92f11884298862fa90dbc02621635d0e0677af3ff9e63c78b67564d34b99b5a6017f57cec32e8bc09e99996781b3a355dfb8a410562fe53d8c8472a0 SHA512 75a830c95e052946772ee92ea4bd11bb677ba5add4f1342dbbac0c7bef0d51167dc3e32f85dc94463b24835350d4475ce253b47f3087b5c3c7e6de1c1008fbda
-EBUILD kubeadm-1.23.5.ebuild 877 BLAKE2B 2c27ca601ccb9c9498cc2f3dcbc242e38946275232eaba4cc35d56a0edba48ecb7bdbd36d8de59a76bc36e5854c4f8f46957f2160bf96c41a80be731f104f00d SHA512 d02b2409d74052608b3150db41a3b77e8bf0cebb6398c2a4e51034304b28875ddb22bb7a21a61338bb09cacb930523444e5e25ae941a38ad6fb100cafb94397a
+EBUILD kubeadm-1.22.12.ebuild 911 BLAKE2B 8d528e3a92f11884298862fa90dbc02621635d0e0677af3ff9e63c78b67564d34b99b5a6017f57cec32e8bc09e99996781b3a355dfb8a410562fe53d8c8472a0 SHA512 75a830c95e052946772ee92ea4bd11bb677ba5add4f1342dbbac0c7bef0d51167dc3e32f85dc94463b24835350d4475ce253b47f3087b5c3c7e6de1c1008fbda
 EBUILD kubeadm-1.23.7.ebuild 877 BLAKE2B 2c27ca601ccb9c9498cc2f3dcbc242e38946275232eaba4cc35d56a0edba48ecb7bdbd36d8de59a76bc36e5854c4f8f46957f2160bf96c41a80be731f104f00d SHA512 d02b2409d74052608b3150db41a3b77e8bf0cebb6398c2a4e51034304b28875ddb22bb7a21a61338bb09cacb930523444e5e25ae941a38ad6fb100cafb94397a
-EBUILD kubeadm-1.23.9.ebuild 878 BLAKE2B 2278f6ff3cd15b03d5fafd5d5e03e6a565666171533c849750fbabee73e9300e29a4b3b80d213e0ca05ed43854f3b3444579d4da6081c40f09aa7633cb3d97f7 SHA512 b9c84df0bac044457c6cc1db5e745955349b2e035ae49ec91ea7f2f478eb2d40e0d904238ca0f2a4307eea0c2e59410c26935b7f52c72a5f45a819983493e0ad
-EBUILD kubeadm-1.24.0.ebuild 880 BLAKE2B a13ac00b8f2141c0d9829cad0f519e30330b6ebdd58783ffeffcc3f9ba73f613fa5c083599c116fc048951c3e71f05fcaee0b01c064152b144a9a56cbfc471c0 SHA512 2f43c723dc4f8e99e690fdfb788293a197dce92017a7a2bfaaa29bea0b47ede3cd6a397d122fcb0c2cdb80059299920c1ca99c60e59d5b2ef6cb11d4031224b1
+EBUILD kubeadm-1.23.9.ebuild 877 BLAKE2B 2c27ca601ccb9c9498cc2f3dcbc242e38946275232eaba4cc35d56a0edba48ecb7bdbd36d8de59a76bc36e5854c4f8f46957f2160bf96c41a80be731f104f00d SHA512 d02b2409d74052608b3150db41a3b77e8bf0cebb6398c2a4e51034304b28875ddb22bb7a21a61338bb09cacb930523444e5e25ae941a38ad6fb100cafb94397a
 EBUILD kubeadm-1.24.1.ebuild 879 BLAKE2B bbf1734ee70deee6e3f279da38e83f60e616dc02b432c60c272149617c346fcb352ae01c36b22fc8b394a57a1367590b97540bf3f94beebcd2acc53112bf52af SHA512 cae05e44f0cd285b606afd1231337c3a9b9f8659ed9aaa3b8e4121b6db9913ed90baf9e5cc3dc09d884bc7f031e1552ebb7df9c7fc4e936ab9278b3fc5b5e556
-EBUILD kubeadm-1.24.3.ebuild 880 BLAKE2B a13ac00b8f2141c0d9829cad0f519e30330b6ebdd58783ffeffcc3f9ba73f613fa5c083599c116fc048951c3e71f05fcaee0b01c064152b144a9a56cbfc471c0 SHA512 2f43c723dc4f8e99e690fdfb788293a197dce92017a7a2bfaaa29bea0b47ede3cd6a397d122fcb0c2cdb80059299920c1ca99c60e59d5b2ef6cb11d4031224b1
+EBUILD kubeadm-1.24.3.ebuild 879 BLAKE2B bbf1734ee70deee6e3f279da38e83f60e616dc02b432c60c272149617c346fcb352ae01c36b22fc8b394a57a1367590b97540bf3f94beebcd2acc53112bf52af SHA512 cae05e44f0cd285b606afd1231337c3a9b9f8659ed9aaa3b8e4121b6db9913ed90baf9e5cc3dc09d884bc7f031e1552ebb7df9c7fc4e936ab9278b3fc5b5e556
 MISC metadata.xml 918 BLAKE2B 487a711e9aebe9d4d8f2c3a03664990aa544a4c0b969dbb60d10ebf42ca64cb9b21f822f92e774f3a813b409d5df905c8ecf02f186218f925a69f70b2960d53c SHA512 392d1cdf4179bc2aa14598e41e38e364518f0c71c34d61280729ae2cdab37c247112b48fcea58c792f6f7148e3979dfbff174bac3a3a00b7084168332112f5d3
diff --git a/sys-cluster/kubeadm/kubeadm-1.22.12.ebuild b/sys-cluster/kubeadm/kubeadm-1.22.12.ebuild
index 654b067fe403..7ce55220d46f 100644
--- a/sys-cluster/kubeadm/kubeadm-1.22.12.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.22.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubeadm/kubeadm-1.22.8.ebuild b/sys-cluster/kubeadm/kubeadm-1.22.8.ebuild
deleted file mode 100644
index 7ce55220d46f..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.22.8.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.23.5.ebuild b/sys-cluster/kubeadm/kubeadm-1.23.5.ebuild
deleted file mode 100644
index 0789de0b701a..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.23.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-BDEPEND=">=dev-lang/go-1.17"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.23.9.ebuild b/sys-cluster/kubeadm/kubeadm-1.23.9.ebuild
index bcdb2bea7e7d..0789de0b701a 100644
--- a/sys-cluster/kubeadm/kubeadm-1.23.9.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.23.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.17"
diff --git a/sys-cluster/kubeadm/kubeadm-1.24.0.ebuild b/sys-cluster/kubeadm/kubeadm-1.24.0.ebuild
deleted file mode 100644
index 0bc4d23fc42c..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.24.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-BDEPEND=">=dev-lang/go-1.18.1"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.24.3.ebuild b/sys-cluster/kubeadm/kubeadm-1.24.3.ebuild
index 0bc4d23fc42c..b616b259fd08 100644
--- a/sys-cluster/kubeadm/kubeadm-1.24.3.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.24.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.18.1"
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index e68602f90989..b0b0ba3fe5a8 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,19 +1,13 @@
 DIST kubernetes-1.22.10.tar.gz 36075584 BLAKE2B e2d440070f8d573527359f4e59950af8c9b783da5e3f1914960b69e527411bf1aca98a1c23902e4e3d6b7c799233837676f02cc8469de130d8405800957b4cc1 SHA512 213629d3f71837318b3321b72cc08dcbf756be11ff927893154ec207cb6747a2a36c198cdbeb0f0bf9b1c0d0284f4bca8a43129f538ca1b763570fa4fe0e2ac8
 DIST kubernetes-1.22.12.tar.gz 36092785 BLAKE2B dc6427905469afee9d18b83f725a58a3f78d40f9fc1f4128e3105a0547df91d8b04500c507b21b43efba9358c012652b62c747d4f6ad3c4c442cca2a0093c897 SHA512 a024b652fd47e2e23890ae1509314456cb0abd96d3619054da18b8264e4f9da3a00278e1a4ab5b342aa7e80fbe637b4fb4d3053b8f999d4246bb1699ac145633
-DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
-DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
 DIST kubernetes-1.23.7.tar.gz 38210779 BLAKE2B 7b664b22491b19697ab596a2eacab5f4f907b7053f40e54bec48f807c273ec673f0e3f09107539d496ce2efbcfc0d649792d604aa6ea29ed938fc2b732b0cace SHA512 f871d8e4d9e41f829e8f6b5bc563ce7c2a060a3b23e9e8a76e3af49be4e2278422f2e8edff275730b690cc60127e334058f2b08d20c3befc6572431d08a8c0b4
 DIST kubernetes-1.23.9.tar.gz 38225608 BLAKE2B f657a2ed9df4a45f360f90e7dbea5c04c9ff536ffb08c53797d5745f3b18468041374910525995a8ae45e31add799ce863c2912892333a84197e6bf0e733dda2 SHA512 e5e46e68c90f6374e4b97424b088ed5b3d494a60bfd753a88cafed59d51d6696260d2be279631eab52f73b9f5444511609aaf950c51c73dfc77cba174943f37f
-DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0
 DIST kubernetes-1.24.1.tar.gz 37940937 BLAKE2B f5076a5ec36cf108b363645b7e39dd9e9b7d56c26457a3a740f30fad29db2bf66877f71ec33c4f545f9e5cdf736cfa6f752cb4d04ca917e2d78da1abfa233f83 SHA512 cdd85c10d931367e29d2cf3e99fd7eb0561e14a8c4a73c57cd3e497ecbd4ae4c0b30bac649ab75af241df63c715ca8ccc4cc67a51736fe2b01d182cd3a3ee104
 DIST kubernetes-1.24.3.tar.gz 37961140 BLAKE2B 663d1fe72e4c80b2946168880e496cae8842f7a884c1a821b0f4f6045dc81eb4313261cdaf3d86f887ee1ca34bb5c63a803ef4e109b935cde25ec0357dbdd5cd SHA512 21e5feac02be09f42b30c0e3a11855dcdfb5868fa031abd7dc52edc81c615353c62eae76fafb400dddb1fa41a25d96b2e4f193751f0d7362adaf32bae023a105
 EBUILD kubectl-1.22.10.ebuild 906 BLAKE2B fb1ae356bd2e4248ab3d3ba494a19dde26f915ed3086ce06eac4b3d1d2eb84a98098d6032d6b9ab9c027d94e288e9f3603163245d36df30671592131a4050c84 SHA512 6cab06510917581df5bde6c2eb9c46f411be9f0954c7be57ad1d63798777fba55d473a702b12a0e2214d35ed7318255c6e6dd27ce80ebfdbd57dcea3954a7516
-EBUILD kubectl-1.22.12.ebuild 907 BLAKE2B 999827e20b71b48c7bd7b18a4a42e7c9fd3e518330e5a47341f3b0801989c2febc2118500fc4441c9cb4e7ba82bee6981b9a3c57e653e6ca83d13b459f5590d3 SHA512 3a37997bcbb018485e0d09c0236f95242092a0dfad1717d72cdc4a9ad65ee7290b31faf0d6e6b837476bc6f3c0cc73ce193e20ec2f3fdb2c112b35857a2b760e
-EBUILD kubectl-1.22.8.ebuild 906 BLAKE2B fb1ae356bd2e4248ab3d3ba494a19dde26f915ed3086ce06eac4b3d1d2eb84a98098d6032d6b9ab9c027d94e288e9f3603163245d36df30671592131a4050c84 SHA512 6cab06510917581df5bde6c2eb9c46f411be9f0954c7be57ad1d63798777fba55d473a702b12a0e2214d35ed7318255c6e6dd27ce80ebfdbd57dcea3954a7516
-EBUILD kubectl-1.23.5.ebuild 873 BLAKE2B 92dd69326d788658c1c9d7ce0800f1762459ed06bda11aacbae11fb7e8babfa447f72d30749458630e44f0413d18f5e928799097cfb7585a97ffc52fd4b0f6ac SHA512 bdedaf5eaf161a6ee62aec1a2777d9b2a228b3ba6c2b232f4a1ecd9c11caa9b5b2ff65cf4c8fefc2f1afb146abb13501c42e148c02e44d695a734178aabe99a7
+EBUILD kubectl-1.22.12.ebuild 906 BLAKE2B fb1ae356bd2e4248ab3d3ba494a19dde26f915ed3086ce06eac4b3d1d2eb84a98098d6032d6b9ab9c027d94e288e9f3603163245d36df30671592131a4050c84 SHA512 6cab06510917581df5bde6c2eb9c46f411be9f0954c7be57ad1d63798777fba55d473a702b12a0e2214d35ed7318255c6e6dd27ce80ebfdbd57dcea3954a7516
 EBUILD kubectl-1.23.7.ebuild 873 BLAKE2B 92dd69326d788658c1c9d7ce0800f1762459ed06bda11aacbae11fb7e8babfa447f72d30749458630e44f0413d18f5e928799097cfb7585a97ffc52fd4b0f6ac SHA512 bdedaf5eaf161a6ee62aec1a2777d9b2a228b3ba6c2b232f4a1ecd9c11caa9b5b2ff65cf4c8fefc2f1afb146abb13501c42e148c02e44d695a734178aabe99a7
-EBUILD kubectl-1.23.9.ebuild 874 BLAKE2B f8edcff235a13dab9ff396b87d207ef4d829ac54213b312621f4f3d9da9e76828af7bbf2ba312ebc8255764568591775501478cdba4533cb6c3f3bbcd6ef47bd SHA512 21c7c81aa7ec98429c6cf6d993ee7ed90380e0f8a32799c66dc80e40d9a3a7b4d7a3612edb1673ce99f1fea6e9f04e0b9bbcffccb73f78f72f261127556cac9e
-EBUILD kubectl-1.24.0.ebuild 876 BLAKE2B 6bd715af975a6a28bff9df5d3e28506d7309751d0031a7091f230d4e65de3d0a0cb7b6672f992d9fdf381a4c7354ce45331654fa79264c76366e9a6f371ac33e SHA512 9a2e3ae147f1643386e0d43362bd1876b374bca199c36cc890baeb111a7ca0af7e2c9098edffaeb2738e53322431b9635b94883f7fecdaad0ac29c2bd335f6e0
+EBUILD kubectl-1.23.9.ebuild 873 BLAKE2B 92dd69326d788658c1c9d7ce0800f1762459ed06bda11aacbae11fb7e8babfa447f72d30749458630e44f0413d18f5e928799097cfb7585a97ffc52fd4b0f6ac SHA512 bdedaf5eaf161a6ee62aec1a2777d9b2a228b3ba6c2b232f4a1ecd9c11caa9b5b2ff65cf4c8fefc2f1afb146abb13501c42e148c02e44d695a734178aabe99a7
 EBUILD kubectl-1.24.1.ebuild 875 BLAKE2B fdf10d1e8ae1aea685425639eebbef4576f17afe6e55a4f26e51f7d6d058987e606097a3cb1d704826f7fd258cd6f4491340867b8f39bcafdfebc762dad4a8cd SHA512 b18e3add6afa37d1b5b8b248d67cce2af2f17faa78f649d670582a252d64cba44a2cd67f7ebe1968f4d108698518fffd478c8c2cce1859a747a35ea39e538340
-EBUILD kubectl-1.24.3.ebuild 876 BLAKE2B 6bd715af975a6a28bff9df5d3e28506d7309751d0031a7091f230d4e65de3d0a0cb7b6672f992d9fdf381a4c7354ce45331654fa79264c76366e9a6f371ac33e SHA512 9a2e3ae147f1643386e0d43362bd1876b374bca199c36cc890baeb111a7ca0af7e2c9098edffaeb2738e53322431b9635b94883f7fecdaad0ac29c2bd335f6e0
+EBUILD kubectl-1.24.3.ebuild 875 BLAKE2B fdf10d1e8ae1aea685425639eebbef4576f17afe6e55a4f26e51f7d6d058987e606097a3cb1d704826f7fd258cd6f4491340867b8f39bcafdfebc762dad4a8cd SHA512 b18e3add6afa37d1b5b8b248d67cce2af2f17faa78f649d670582a252d64cba44a2cd67f7ebe1968f4d108698518fffd478c8c2cce1859a747a35ea39e538340
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kubectl/kubectl-1.22.12.ebuild b/sys-cluster/kubectl/kubectl-1.22.12.ebuild
index f480c2f82844..1bc008b30c4a 100644
--- a/sys-cluster/kubectl/kubectl-1.22.12.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.22.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 DEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubectl/kubectl-1.22.8.ebuild b/sys-cluster/kubectl/kubectl-1.22.8.ebuild
deleted file mode 100644
index 1bc008b30c4a..000000000000
--- a/sys-cluster/kubectl/kubectl-1.22.8.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-DEPEND="!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubectl/kubectl-1.23.5.ebuild b/sys-cluster/kubectl/kubectl-1.23.5.ebuild
deleted file mode 100644
index 619b0c541831..000000000000
--- a/sys-cluster/kubectl/kubectl-1.23.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-BDEPEND=">=dev-lang/go-1.17"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubectl/kubectl-1.23.9.ebuild b/sys-cluster/kubectl/kubectl-1.23.9.ebuild
index 93befd485395..619b0c541831 100644
--- a/sys-cluster/kubectl/kubectl-1.23.9.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.23.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.17"
diff --git a/sys-cluster/kubectl/kubectl-1.24.0.ebuild b/sys-cluster/kubectl/kubectl-1.24.0.ebuild
deleted file mode 100644
index 375df35b0a71..000000000000
--- a/sys-cluster/kubectl/kubectl-1.24.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-BDEPEND=">=dev-lang/go-1.18.1"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubectl/kubectl-1.24.3.ebuild b/sys-cluster/kubectl/kubectl-1.24.3.ebuild
index 375df35b0a71..bc629ac72555 100644
--- a/sys-cluster/kubectl/kubectl-1.24.3.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.24.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.18.1"
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 997594bae305..c219c3e66c37 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -5,20 +5,14 @@ AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba8320
 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae
 DIST kubernetes-1.22.10.tar.gz 36075584 BLAKE2B e2d440070f8d573527359f4e59950af8c9b783da5e3f1914960b69e527411bf1aca98a1c23902e4e3d6b7c799233837676f02cc8469de130d8405800957b4cc1 SHA512 213629d3f71837318b3321b72cc08dcbf756be11ff927893154ec207cb6747a2a36c198cdbeb0f0bf9b1c0d0284f4bca8a43129f538ca1b763570fa4fe0e2ac8
 DIST kubernetes-1.22.12.tar.gz 36092785 BLAKE2B dc6427905469afee9d18b83f725a58a3f78d40f9fc1f4128e3105a0547df91d8b04500c507b21b43efba9358c012652b62c747d4f6ad3c4c442cca2a0093c897 SHA512 a024b652fd47e2e23890ae1509314456cb0abd96d3619054da18b8264e4f9da3a00278e1a4ab5b342aa7e80fbe637b4fb4d3053b8f999d4246bb1699ac145633
-DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
-DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
 DIST kubernetes-1.23.7.tar.gz 38210779 BLAKE2B 7b664b22491b19697ab596a2eacab5f4f907b7053f40e54bec48f807c273ec673f0e3f09107539d496ce2efbcfc0d649792d604aa6ea29ed938fc2b732b0cace SHA512 f871d8e4d9e41f829e8f6b5bc563ce7c2a060a3b23e9e8a76e3af49be4e2278422f2e8edff275730b690cc60127e334058f2b08d20c3befc6572431d08a8c0b4
 DIST kubernetes-1.23.9.tar.gz 38225608 BLAKE2B f657a2ed9df4a45f360f90e7dbea5c04c9ff536ffb08c53797d5745f3b18468041374910525995a8ae45e31add799ce863c2912892333a84197e6bf0e733dda2 SHA512 e5e46e68c90f6374e4b97424b088ed5b3d494a60bfd753a88cafed59d51d6696260d2be279631eab52f73b9f5444511609aaf950c51c73dfc77cba174943f37f
-DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0
 DIST kubernetes-1.24.1.tar.gz 37940937 BLAKE2B f5076a5ec36cf108b363645b7e39dd9e9b7d56c26457a3a740f30fad29db2bf66877f71ec33c4f545f9e5cdf736cfa6f752cb4d04ca917e2d78da1abfa233f83 SHA512 cdd85c10d931367e29d2cf3e99fd7eb0561e14a8c4a73c57cd3e497ecbd4ae4c0b30bac649ab75af241df63c715ca8ccc4cc67a51736fe2b01d182cd3a3ee104
 DIST kubernetes-1.24.3.tar.gz 37961140 BLAKE2B 663d1fe72e4c80b2946168880e496cae8842f7a884c1a821b0f4f6045dc81eb4313261cdaf3d86f887ee1ca34bb5c63a803ef4e109b935cde25ec0357dbdd5cd SHA512 21e5feac02be09f42b30c0e3a11855dcdfb5868fa031abd7dc52edc81c615353c62eae76fafb400dddb1fa41a25d96b2e4f193751f0d7362adaf32bae023a105
 EBUILD kubelet-1.22.10.ebuild 1003 BLAKE2B f7d967573c1558befc261e742472a7bf2d8ffb2279bf90bae5ef1316990abe0f5a542160ab06db9e195e0039e85b78b198163dcab5c393126df97262e5a81094 SHA512 03093d1134618415982e162a88452487654681be9f8be3312b3935d9f6b7efa2aa8cef3240367a9371b2f6b21fe4bdc8f0327e97ee655dc6bb5ffc84113777e0
-EBUILD kubelet-1.22.12.ebuild 1004 BLAKE2B 3df4d1079ca82c4e80a182230735e807b741bcf0cba6ceb9277c4126b62378e49ee6acb40145553b61f773139c0427a0078d516d56752ad6320716418177bf7f SHA512 7719010c913ef05977a61e1e5bad258eb1f891a1c511a39d8d89e15df2a31c2e718c695d2e6864fdd4a1e6513587f025fc2dddae40ef32cf050b8c7370de48b8
-EBUILD kubelet-1.22.8.ebuild 1003 BLAKE2B f7d967573c1558befc261e742472a7bf2d8ffb2279bf90bae5ef1316990abe0f5a542160ab06db9e195e0039e85b78b198163dcab5c393126df97262e5a81094 SHA512 03093d1134618415982e162a88452487654681be9f8be3312b3935d9f6b7efa2aa8cef3240367a9371b2f6b21fe4bdc8f0327e97ee655dc6bb5ffc84113777e0
-EBUILD kubelet-1.23.5.ebuild 969 BLAKE2B 1aa00967d2b13a6607ca139498c8772385c8fae93c086c9128ea1968bb3ad61b40a63831f27718a7fe43eff8d5f52dc8001a5c7301d0146f327918fa05f53d2a SHA512 2a483fe573fa549b7a1886e2757e368b874d602027a7ed844602bad71b64c4ccb9171a74343e1950049d3640bc78f698c6c6063b75b7912927b02e69ca6aa9e6
+EBUILD kubelet-1.22.12.ebuild 1003 BLAKE2B f7d967573c1558befc261e742472a7bf2d8ffb2279bf90bae5ef1316990abe0f5a542160ab06db9e195e0039e85b78b198163dcab5c393126df97262e5a81094 SHA512 03093d1134618415982e162a88452487654681be9f8be3312b3935d9f6b7efa2aa8cef3240367a9371b2f6b21fe4bdc8f0327e97ee655dc6bb5ffc84113777e0
 EBUILD kubelet-1.23.7.ebuild 969 BLAKE2B 1aa00967d2b13a6607ca139498c8772385c8fae93c086c9128ea1968bb3ad61b40a63831f27718a7fe43eff8d5f52dc8001a5c7301d0146f327918fa05f53d2a SHA512 2a483fe573fa549b7a1886e2757e368b874d602027a7ed844602bad71b64c4ccb9171a74343e1950049d3640bc78f698c6c6063b75b7912927b02e69ca6aa9e6
-EBUILD kubelet-1.23.9.ebuild 970 BLAKE2B fc431b0d0543d2a6d8a0a38aea43443a218437dea52c2e5719e9b21266a648137a27acaf4dacc4ca3ff1e575e62f13b80a0d67c17e80a12135e0685c99ada902 SHA512 b868d712bfa9a549eac6b3836c6d6c6f8fee039fd74b735bb37dbd0dc2d49987ac40b927f93b08425a9b67b710a4bc38a062a1472e5334cd4ad7cc63294d51ac
-EBUILD kubelet-1.24.0.ebuild 972 BLAKE2B d073eb7e7f1009b5c1ceb372bc6e40c84805d633a543154f04e6f56fbfc1f641e678ced0711ad35467df86fe0ad2d41b7b7199ee7345df19c303350cfa9800ec SHA512 ce266a3e4b72b5a0ed6ebfe120c323e9489cb6ba95888edeb3e447c0d5a7c4fb124b6397f922dd8f441c55c96cf76f651808cfc16dceda2d8b9c210f64f66834
+EBUILD kubelet-1.23.9.ebuild 969 BLAKE2B 1aa00967d2b13a6607ca139498c8772385c8fae93c086c9128ea1968bb3ad61b40a63831f27718a7fe43eff8d5f52dc8001a5c7301d0146f327918fa05f53d2a SHA512 2a483fe573fa549b7a1886e2757e368b874d602027a7ed844602bad71b64c4ccb9171a74343e1950049d3640bc78f698c6c6063b75b7912927b02e69ca6aa9e6
 EBUILD kubelet-1.24.1.ebuild 971 BLAKE2B a79899c59bf5c31ed15b98512e5868a7d11da802ec23517e08833c99470a11ee13db4dd119e369183b9713e83ea41fc6d1ecb853cc0d622967329fb94ccbdec9 SHA512 f5f5a0ecc9379a7062d9f275e7704e1887aeb59ecd235eacb6962ae393456b0c1f81a0f5cbf44246360e33e26ee033a7ebce2919b744ce8c927c4a1f7475b1eb
-EBUILD kubelet-1.24.3.ebuild 972 BLAKE2B d073eb7e7f1009b5c1ceb372bc6e40c84805d633a543154f04e6f56fbfc1f641e678ced0711ad35467df86fe0ad2d41b7b7199ee7345df19c303350cfa9800ec SHA512 ce266a3e4b72b5a0ed6ebfe120c323e9489cb6ba95888edeb3e447c0d5a7c4fb124b6397f922dd8f441c55c96cf76f651808cfc16dceda2d8b9c210f64f66834
+EBUILD kubelet-1.24.3.ebuild 971 BLAKE2B a79899c59bf5c31ed15b98512e5868a7d11da802ec23517e08833c99470a11ee13db4dd119e369183b9713e83ea41fc6d1ecb853cc0d622967329fb94ccbdec9 SHA512 f5f5a0ecc9379a7062d9f275e7704e1887aeb59ecd235eacb6962ae393456b0c1f81a0f5cbf44246360e33e26ee033a7ebce2919b744ce8c927c4a1f7475b1eb
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kubelet/kubelet-1.22.12.ebuild b/sys-cluster/kubelet/kubelet-1.22.12.ebuild
index 3dc412ebab17..dff62dcd892d 100644
--- a/sys-cluster/kubelet/kubelet-1.22.12.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.22.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubelet/kubelet-1.22.8.ebuild b/sys-cluster/kubelet/kubelet-1.22.8.ebuild
deleted file mode 100644
index dff62dcd892d..000000000000
--- a/sys-cluster/kubelet/kubelet-1.22.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test "
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.23.5.ebuild b/sys-cluster/kubelet/kubelet-1.23.5.ebuild
deleted file mode 100644
index 1460ed4513e3..000000000000
--- a/sys-cluster/kubelet/kubelet-1.23.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-BDEPEND=">=dev-lang/go-1.17"
-
-RESTRICT+=" test "
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.23.9.ebuild b/sys-cluster/kubelet/kubelet-1.23.9.ebuild
index ecbeff2f53f1..1460ed4513e3 100644
--- a/sys-cluster/kubelet/kubelet-1.23.9.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.23.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.17"
diff --git a/sys-cluster/kubelet/kubelet-1.24.0.ebuild b/sys-cluster/kubelet/kubelet-1.24.0.ebuild
deleted file mode 100644
index e4341ebfaa6b..000000000000
--- a/sys-cluster/kubelet/kubelet-1.24.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-BDEPEND=">=dev-lang/go-1.18.1"
-
-RESTRICT+=" test "
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.24.3.ebuild b/sys-cluster/kubelet/kubelet-1.24.3.ebuild
index e4341ebfaa6b..e27cd329b9b4 100644
--- a/sys-cluster/kubelet/kubelet-1.24.3.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.24.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.18.1"
diff --git a/sys-cluster/rdma-core/Manifest b/sys-cluster/rdma-core/Manifest
index 28c615fdbb0c..60cb8174af1d 100644
--- a/sys-cluster/rdma-core/Manifest
+++ b/sys-cluster/rdma-core/Manifest
@@ -8,6 +8,6 @@ DIST rdma-core-39.0.tar.gz 1762652 BLAKE2B 7fed2be57624451c660120c6360fedd15ffaf
 DIST rdma-core-41.0.tar.gz 1784540 BLAKE2B 3c153dcc3563427f32fa32d9a31527635c6bb3e63297c201f30de1328a68ac73ecb3af89074dfcc27d92c640d14d8d8ec61c001659d18336a4156cf8ed22996c SHA512 d8c1210ca078ea53879cee42c838cc88bcc98430471ae609d8c4a25218dbfd63a70f5bbd4e9ba6efabdfc467f7d5796ce618ec22013d414f17502d1257601a80
 EBUILD rdma-core-38.0.ebuild 2448 BLAKE2B 090f6b08a69860660d408a992637ca3e169483179cf2a711f85eef36e083b1f3ebf418a3e5ca803068a0405ca9debf5d0248d797af51962d727489c23ea346e4 SHA512 515fda3b404e98e0da4f21496657e8c375b5d22c452504bbe29bf5f0bc40ad125f565184730592d9a423559828906a6bf0038f73c713f81de0ed043a96c9d341
 EBUILD rdma-core-39.0.ebuild 2472 BLAKE2B f055ae93485aebe8fb916849b6d7c91a423fc7145a4ea572a47dce600c5f83dbb0ae27a53c3070f5dacc8bd05927a58b77d36d7963ee5352967a67da9a5f9247 SHA512 152476c57ba02cb370632dbfc388eff32cdb6286c544e41a38a097afef97d5be3a0419b9f887b9c94b8f1f0384bd56f399ef50883c56e9810740f1abc24c5f96
-EBUILD rdma-core-41.0.ebuild 2588 BLAKE2B b7955683867b39d7685bf98836a51bdda982f7404e0e7b2191ddeedf62e6afd528e4ba51fd108fa8833b376be770be8f6e236534db66454ca6784e883a3e1d05 SHA512 a63882336c276a47d778e3eb2633c602c986ee144c6c36309f29927b8976ca715045669cc43335024074ea65dc874ae341e60f904937907f3c59a50fe9a0a8ff
+EBUILD rdma-core-41.0.ebuild 2587 BLAKE2B efb123f796caedae389ddda11419af6d4f54fb704d9b4f2fdb4acf813c3e568a031acdccaab0e56617fb78ef12006cf92ed73bd8ee3dd0830136ea9d6c94f8eb SHA512 a79347a0042b919b65942c13a6353418fa8a74aa2548879b31cf2827a529c743b380941a032f75c30e017fa502ca8ee9ea56ac28b93bcdde5566250a6c2ddfe5
 EBUILD rdma-core-9999.ebuild 2418 BLAKE2B d2fa179a54139bcfd93f0c8bdbd9be1435a9df8df3b0fd7df671397704aa07495128ce32e7526cc76fa63e75cb6efc88906a0e405a2482aec98626027bfaedfe SHA512 98e1deb03db9be7d8cf69426deef07ced89999c84d63a903a6015717ec799d46dfc8207c0e1ced3df1b09b01d42e870df49f1371643ddf758d619013c3aec620
 MISC metadata.xml 560 BLAKE2B f76b4e81668b49b5bb5c3719c2bc2ae9e2d649d827193b60961864924fba1861865d3a55dd14d38f2d58fae0ce49bae8144946600233c63baf4b9a88b2422a06 SHA512 bde881700dedb23708d08b09b0e5317e49729323e8fd4acd2be90c74ddbc837adc228b7831920c8140b8162d494d02b0ccfb8244dfd545aca3cadde418370a6e
diff --git a/sys-cluster/rdma-core/rdma-core-41.0.ebuild b/sys-cluster/rdma-core/rdma-core-41.0.ebuild
index 344d77a450b7..d8d8ff54cdfb 100644
--- a/sys-cluster/rdma-core/rdma-core-41.0.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-41.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
 else
 	SRC_URI="https://github.com/linux-rdma/rdma-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
diff --git a/sys-cluster/sanlock/Manifest b/sys-cluster/sanlock/Manifest
index 355c1e0037bf..a444390ed2f7 100644
--- a/sys-cluster/sanlock/Manifest
+++ b/sys-cluster/sanlock/Manifest
@@ -3,6 +3,6 @@ AUX sanlock.initd 249 BLAKE2B 18bafba28ab4449c7f25ab2d14b4ac2d3cc89cf79bfb8f802f
 AUX wdmd.initd 261 BLAKE2B 65b393f2f084896d3c17aa0345f9930badeec7a3ee4cc7e47bd0a35e47c18ea2bcf5afdc386c0da98988bc9fae479a68b504c244b55ab389ac7f5304c34282ae SHA512 9c7e980817c1c76868caff229b42a3d70e912abfd8c974bf5b856067bef79fbd3a5942b30bcb7d02869e2eba85e6f6ba3c861e9780046b01b25df1b39661b6c0
 DIST sanlock-3.8.2.tar.gz 266780 BLAKE2B 5248d08225bcc2a19594a3dcd3872c8c69ca8b217d31f6263f2717e4594180d4ba4685c9679ce2f31b6a2dcb4fe9f3e6a5dd5ac3ed073aea02599e7bbc04390c SHA512 2fa92e16eee4d2f3dac452400522f7e90b93b71349d322564d5957e2d87fb4bd69f0b5617b05f4b296c272d6da9a404fccadbbfff106354a0e302c436593eaac
 DIST sanlock-3.8.4.tar.gz 270031 BLAKE2B da011a15d488849d47fe1043df040580652558918dff9549bf4e6cb4077c03b4aaa8f8de5399dbb0e3f2301ae90c0d20599b25bd5e72bae5317b13f79a352333 SHA512 9fca2b18fd3bd504d5186de0b2626ea2c993997528de2384dc042afe52b2b68422a2e4bb79e2409c9e6eccbe5ea8d8939549eb25c5d16aa7fecf6c9a5798340c
-EBUILD sanlock-3.8.2.ebuild 2163 BLAKE2B a69abcff0f598a554ab43b72ce408d03bf97468e26be127cfee8920220e196d8db245f3759b19db8490e38fba5a2b3bcc73d9599034dc97cc315b359aa6af2a5 SHA512 5c74aabed7e21b3f80e8f0763b21e6ca98b24a27c568c481c4535d3ef8982321649c729b1ce105c038c4e3451d91a7a47f46d502302c94b78b1e633db7355ab4
+EBUILD sanlock-3.8.2.ebuild 2165 BLAKE2B 0357ae6c8aabee20012ab4615be9dfc6c9716424e385f02e10caabfa273b3950d7f3637f4abe577d377085d5a7cac73af4e497922a21f35afae7aa297dfc0bee SHA512 6f1e33bfdde6412b3013d1fa0a436ae1501f8c6ad04923305b3f32fafbc114ed9d73fc9b8df9afb2053b9d0340518f1a274f38e16aa9ad418fcb75ef0eb61b78
 EBUILD sanlock-3.8.4.ebuild 1792 BLAKE2B 9748376f44a47d1e9da05c2409d38caeab690a750b7a23c5240d421181500ba03c618d8621e7d520652cd97f5adc6b8b4c2af753d73ca6cd87f68a34025d2568 SHA512 394054648234d0186bc26a19358433c190bd60d168ba43f23c883e07173f7015b528c4ec974a3b6353e3659242fb78b489b947a612b7f0341d2ca130f7c92aa6
 MISC metadata.xml 369 BLAKE2B a32cbc5e109bab37912ecc7efe951fcec96fb133b2861d3c38290e5f3aabe87e444d38bdbb18b711ba5836c43c7ac7ebcde3b5f23ec10df8c413cbd445c05ddf SHA512 ac7cb5f13743775baecae83e2c6beb6988b4c374db96217136cd68124e947890de32c9d7afecbdafbac32b0ac450ec2580b923f0e9fb63ef944463e879cd8283
diff --git a/sys-cluster/sanlock/sanlock-3.8.2.ebuild b/sys-cluster/sanlock/sanlock-3.8.2.ebuild
index 4df87061fd18..86fc96a44877 100644
--- a/sys-cluster/sanlock/sanlock-3.8.2.ebuild
+++ b/sys-cluster/sanlock/sanlock-3.8.2.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	${FILESDIR}/sanlock-fence_sanlock-LDFLAGS.patch
+	"${FILESDIR}"/sanlock-fence_sanlock-LDFLAGS.patch
 )
 
 pkg_setup() {
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 349fc056090b..bfdfeffc36ef 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index d57a7fcaf206..3ea8b59d34a7 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -1,3 +1,4 @@
+AUX 50binutils-gentoo.el 142 BLAKE2B 2101b53bb85e33b34b807cd3483979db3466e1a4d804f274d086b7975f7c437df731e922a706d03921f5e838524d126098462fd29f9867cfd863dc85fd83f321 SHA512 c6ff6a3b9ef606368a6b74e38c8d3f030098c6dd619ce1a0b090f5b30b5fc0c35e3567a8af5f12a63611d9fee1d9127fd844b9e3f3cfac8357413dc405955f96
 AUX binutils-2.29.1-nogoldtest.patch 730 BLAKE2B f4f5926511866e58566abc224d2bae1336eb2cbfb63ae6d2a8a3b1f455f24d31fe0ecaee616eb6075712b8d90c40495a639c413c7229c9dfa741a5d284ff2911 SHA512 dd94d947fd25a770990ebc711fba6f680c90677e726f7cdc5435dd121f57e28e3a19343805e514045513bb011094f3a1fe2c4178d1be73e5d38a24abcc2b88e5
 AUX binutils-2.32-gcc-10.patch 321 BLAKE2B a16a525ac14a2ebc5ec8a463370c6917a57835bd8c04599cb880193fc7c3a4569084e9eb206505357f9d73575fe380964fc404171dae7bb1ee53c157bad3e221 SHA512 dc3ef3da32ac58bb0678f49ba3e6c613653113d93dfc3af4541e1808ad92268c62003cae22e0059a8d5d8ba9e27282bca8d59ecca928d7a9f593454d795e54de
 AUX binutils-2.33-gcc-10.patch 815 BLAKE2B 84cf88e34afea70ea3728e2a78f0ba004e24934f57ff53d42694c3fe6f1afd6fb091b70ca114ff539ae6274699f0e3584decbf1355d1d1cd720bb4aca31bcb33 SHA512 8c0cd37738d2d172aadf1df875d028538d9edca35b681d7faa7dc3ab64e2c214d9c33862795a51c0cba9a61aaea9c5bbf5f9f9fb4a01762aa266f32c97eaafbd
@@ -28,7 +29,7 @@ EBUILD binutils-2.35.2.ebuild 12651 BLAKE2B d97d3cfab222e74e94bdc5d462bf95f9d39c
 EBUILD binutils-2.36.1-r2.ebuild 12553 BLAKE2B 8ce3d14f6d7cc81e920f7d5a28875a5bcc45b396169afe5a6e4429849eb9b420977f39fd85487d3ef93a2aef838c6122413b7ef5c9f8c6273d9d1b1bf5b4608a SHA512 53935fec45e8241e73c76be22dde5e9576360cb511642bb5fded59515ea0641cbcb7eb6bd6eef2f30d6d4e940cf1869908c96b194ec1f5e9a016664a5c6cf2eb
 EBUILD binutils-2.37_p1-r2.ebuild 13024 BLAKE2B e67ed4a55a9f07ebd064c82901bc6b5e23933f562c8b6258d32649571f38cbc81061fcb886feaa70619d46d47c52cd701745c173ccf060e47c5cfef2d202a8ca SHA512 480b1921ff344b943b1cf2c1ea9960cd5252f8055a4bffc109f096b038d4d1fc2dd670d696ce7217fd1d827eef5c07cc81c7d0886fc554d939535582d5300f26
 EBUILD binutils-2.38-r1.ebuild 13032 BLAKE2B 23dcf886c2fc5837ad09a69fb5671b65e57cedd0b1275242da32d6fa07ca198ebfc08875f0675193651f33a39b4f872cea46de2953bff94246d5f0db22e20abc SHA512 9fcd78ef633f16e1ecdd5c5ffe68f182e93ad8c2fbbcda8a80d00870b102c4801a65781251ecc623a6f7d42a20d60cb29e88d074d7b8b9a0736e63f252420603
-EBUILD binutils-2.38-r2.ebuild 13403 BLAKE2B 93a4cc53ac967879484b7a6e5ed33b2a188eff6407d4e8dc321f04612b7bf99610cbf8799e878b2763ed3fd7c2313ae87cbafa6d671548ffc4501d21782a51de SHA512 e1116d00b4d7625381d298ee81a92dd123c4d6cf291e72789e4434488a13714646bcefd40b5bb0df00423a4e4960e4b3913d7bf53f0bfb982f159c288889e83c
-EBUILD binutils-2.39.ebuild 13306 BLAKE2B f543f00804b351eab89acf1d9077aa9a95aff44ac4a22b0badeb72f778ccfc086add54d8259b03759bc7d83d13931678add6f0c91b379e182a14bffcd35b1ad9 SHA512 b2266c63bdece82d4929989d0b29e2a2d53d83eef80cff50fb7533f9ba630be5c927590a608c0ebb5109c11d9c64f05bc46846bfb390f61f4fd4b8b0d7f59ade
-EBUILD binutils-9999.ebuild 13287 BLAKE2B a062c840272d6676b2189400c6b975728b72ecba8481c6e0793ca10571f008ecec604d9629a6a54e7d6cc3b1380996b46a3e04baee117597d9d5444862e892bb SHA512 2fcd9c82c259f73ab9e9ed2f369fa6627b7b278fe5ae5487a86ea5922776b0f11cb5bd5e5a86e88b08943ed849d84e3baf0cf3b0133ebe5fa25adcb39b5359fb
+EBUILD binutils-2.38-r2.ebuild 13780 BLAKE2B 0d462e98c524b2424fc0ca5481832158a547fdc75b2cf71b841e26151118b59f1cb96ea0d67b1d28aefd41487b00fcde3654f6ddf8e880519d36be8323791ae9 SHA512 6b5b723ea0f869df9ecbb1b577113a639eb0e06efc4dad0cbd2ac42307ef0563f927488ad6bb9be412e0a6501b9ec6be6aa0e9d8a946ceed8bd901ed97f4a00e
+EBUILD binutils-2.39.ebuild 13683 BLAKE2B 6adb51d130c50374516e23d603a221cc07ef1ca4635180553d491ae125715b47258262307c6625c61da419e3e2cc0d19791c1f399f8416fb5db58f7e2b5f649e SHA512 b8a483ca34f00f5c44fffdf998a51123b95cb55b503414b6b2852024cd8e5e3fe610a0555c3d402423714e6ecd465aa66c8858dc938e487086ce5f02f67dbb50
+EBUILD binutils-9999.ebuild 13665 BLAKE2B e13bccb6ed94a8fe78eaa6b0524f3d4c38ca5436cc7605639074f7cb65a5b16b59aac114d1d9d2bde9620ef6ebddca03f102d6027fc2afe10c8f4db7b16cd7d3 SHA512 d20956350a4fecbb6e3cded9ba7f82c7127e86f5fd9ad7caa2679c4da44dcd3f942e527c33274157b37c295cebf5f9f0503cbce2902301c4f1c2f5874a8e4bf6
 MISC metadata.xml 815 BLAKE2B 0d866827f8a6d0244be472dea595d5784ea60464ba361cde9bd062473b5eb19ccecc99bb58729acadd2cfe7dc017cdb2107fc282a31be6ed96c757954e6c9ac0 SHA512 8996f29b159ba483293b8d80eb62372ee0016e817d9ac55b7de9c211aca770b5a05135e705aac108099181d879daf5e22df1facab64bc7765966b3d7e3274e16
diff --git a/sys-devel/binutils/binutils-2.38-r2.ebuild b/sys-devel/binutils/binutils-2.38-r2.ebuild
index 47b5e977cdfd..b4b21afc9d21 100644
--- a/sys-devel/binutils/binutils-2.38-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.38-r2.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-inherit libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
+inherit elisp-common libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
 
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="https://sourceware.org/binutils/"
 LICENSE="GPL-3+"
-IUSE="cet default-gold doc +gold multitarget +nls pgo +plugins static-libs test vanilla"
+IUSE="cet default-gold doc emacs +gold multitarget +nls pgo +plugins static-libs test vanilla"
 REQUIRED_USE="default-gold? ( gold )"
 
 # Variables that can be set here  (ignored for live ebuilds)
@@ -52,6 +52,7 @@ is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
 RDEPEND="
 	>=sys-devel/binutils-config-3
 	sys-libs/zlib
+	emacs? ( >=app-editors/emacs-23.1:* )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -311,6 +312,8 @@ src_compile() {
 		emake V=1 info
 	fi
 
+	! is_cross && use emacs && elisp-compile "${S}"/binutils/dwarf-mode.el
+
 	# we nuke the manpages when we're left with junk
 	# (like when we bootstrap, no perl -> no manpages)
 	find . -name '*.1' -a -size 0 -delete
@@ -403,6 +406,11 @@ src_install() {
 		dodoc opcodes/ChangeLog*
 	fi
 
+	if ! is_cross && use emacs ; then
+		elisp-install ${PN} "${S}"/binutils/dwarf-mode.el{,c}
+		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+	fi
+
 	# Remove shared info pages
 	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
 
@@ -414,6 +422,8 @@ pkg_postinst() {
 	# Make sure this ${CTARGET} has a binutils version selected
 	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
 	binutils-config ${CTARGET}-${PV}
+
+	! is_cross && use emacs && elisp-site-regen
 }
 
 pkg_postrm() {
@@ -437,6 +447,8 @@ pkg_postrm() {
 	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
 		binutils-config ${CTARGET}-${PV}
 	fi
+
+	! is_cross && use emacs && elisp-site-regen
 }
 
 # Note [slotting support]
diff --git a/sys-devel/binutils/binutils-2.39.ebuild b/sys-devel/binutils/binutils-2.39.ebuild
index 3b954f859b3a..22183040ab35 100644
--- a/sys-devel/binutils/binutils-2.39.ebuild
+++ b/sys-devel/binutils/binutils-2.39.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-inherit libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
+inherit elisp-common libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
 
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="https://sourceware.org/binutils/"
 LICENSE="GPL-3+"
-IUSE="cet default-gold doc gold multitarget +nls pgo +plugins static-libs test vanilla"
+IUSE="cet default-gold doc emacs gold multitarget +nls pgo +plugins static-libs test vanilla"
 REQUIRED_USE="default-gold? ( gold )"
 
 # Variables that can be set here  (ignored for live ebuilds)
@@ -54,6 +54,7 @@ is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
 RDEPEND="
 	>=sys-devel/binutils-config-3
 	sys-libs/zlib
+	emacs? ( >=app-editors/emacs-23.1:* )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -316,6 +317,8 @@ src_compile() {
 		emake V=1 info
 	fi
 
+	! is_cross && use emacs && elisp-compile "${S}"/binutils/dwarf-mode.el
+
 	# we nuke the manpages when we're left with junk
 	# (like when we bootstrap, no perl -> no manpages)
 	find . -name '*.1' -a -size 0 -delete
@@ -417,6 +420,11 @@ src_install() {
 		dodoc opcodes/ChangeLog*
 	fi
 
+	if ! is_cross && use emacs ; then
+		elisp-install ${PN} "${S}"/binutils/dwarf-mode.el{,c}
+		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+	fi
+
 	# Remove shared info pages
 	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
 
@@ -428,6 +436,8 @@ pkg_postinst() {
 	# Make sure this ${CTARGET} has a binutils version selected
 	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
 	binutils-config ${CTARGET}-${PV}
+
+	! is_cross && use emacs && elisp-site-regen
 }
 
 pkg_postrm() {
@@ -451,6 +461,8 @@ pkg_postrm() {
 	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
 		binutils-config ${CTARGET}-${PV}
 	fi
+
+	! is_cross && use emacs && elisp-site-regen
 }
 
 # Note [slotting support]
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index d19bdb17825d..c2ab796642a4 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-inherit libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
+inherit elisp-common libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
 
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="https://sourceware.org/binutils/"
 LICENSE="GPL-3+"
-IUSE="cet default-gold doc gold multitarget +nls pgo +plugins static-libs test vanilla"
+IUSE="cet default-gold doc emacs +gold multitarget +nls pgo +plugins static-libs test vanilla"
 REQUIRED_USE="default-gold? ( gold )"
 
 # Variables that can be set here  (ignored for live ebuilds)
@@ -53,6 +53,7 @@ is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
 RDEPEND="
 	>=sys-devel/binutils-config-3
 	sys-libs/zlib
+	emacs? ( >=app-editors/emacs-23.1:* )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -315,6 +316,8 @@ src_compile() {
 		emake V=1 info
 	fi
 
+	! is_cross && use emacs && elisp-compile "${S}"/binutils/dwarf-mode.el
+
 	# we nuke the manpages when we're left with junk
 	# (like when we bootstrap, no perl -> no manpages)
 	find . -name '*.1' -a -size 0 -delete
@@ -416,6 +419,11 @@ src_install() {
 		dodoc opcodes/ChangeLog*
 	fi
 
+	if ! is_cross && use emacs ; then
+		elisp-install ${PN} "${S}"/binutils/dwarf-mode.el{,c}
+		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+	fi
+
 	# Remove shared info pages
 	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
 
@@ -427,6 +435,8 @@ pkg_postinst() {
 	# Make sure this ${CTARGET} has a binutils version selected
 	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
 	binutils-config ${CTARGET}-${PV}
+
+	! is_cross && use emacs && elisp-site-regen
 }
 
 pkg_postrm() {
@@ -450,6 +460,8 @@ pkg_postrm() {
 	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
 		binutils-config ${CTARGET}-${PV}
 	fi
+
+	! is_cross && use emacs && elisp-site-regen
 }
 
 # Note [slotting support]
diff --git a/sys-devel/binutils/files/50binutils-gentoo.el b/sys-devel/binutils/files/50binutils-gentoo.el
new file mode 100644
index 000000000000..7caa9f19a37b
--- /dev/null
+++ b/sys-devel/binutils/files/50binutils-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'dwarf-browse "dwarf-mode"
+  "Invoke `objdump' and put output into a `dwarf-mode' buffer." t)
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index c2e2f81e09f8..d8baeb70b950 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,10 +1,12 @@
 AUX gdb-11.2-glibc-2.35-fsqrt.patch 2212 BLAKE2B c0b9e6e9f27f791d197691ff5bc1e5083b7acb3197312ce5c9afdad02756b69b47f308f85d2b94d3695e8869db8925298bc808468c36c29ddfb289009fb038c4 SHA512 4b8d9ffcd178c0a028b29d8ba2ecb6eedf7a8d67ea1a8bb39276a5d36582502604d7cb1585671e82169539f6a4317224ce61ca4e95b455221340f70a4f1360e0
+AUX gdb-12.1-core-file-detach.patch 5853 BLAKE2B 4442a9d6357f751f9953236a068ffc5e8a1f57eef1bf9e118d572614164486197db44cb6e5f1ab20906ae97ca1c4805a01ce5c2c3cbd1509bb383c108b6b8b1e SHA512 e044053dec340e6373b4a3546adf36ea121bb63a5277d6a1f24f5551edb0cf408f3f862076d6760b27501d54025063afd4a9375914c3f2321f5410466a89f75b
 AUX gdb-12.1-readline-8.2-build.patch 926 BLAKE2B f483dd1054b019d44dd4731ba22113551d3530a9da1af8c5e83aeae3ba820d96b8a1c2cb7758ecc3fbe8a56cdc7232cdece809d15c30dbfffadc30d81738a7ca SHA512 f865349953181fe3502abbe6042ebab249e2ebbc4c0017ebad756aadfd63e72f57b009fe2e7d036543f326e54518a656101bef572d03a7a7170c9ec305807ed8
 AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d217c4d977aed0847fdf125bb13ebc004906d9afb8e3f629c41efccca88df0040015e7799c1fd24de5fb50f62f5bbd90 SHA512 c2bb013e4fcabefddcd8042bd3cbb53471f83182cc8769fe0d19eed80ccc4a83bd84d120006fa25b3b7d0310dc2f2ec6b44a6ff74909cd312b7e491f371777a3
 DIST gdb-11.2.tar.xz 22039420 BLAKE2B 66ce7e12c99c33c8b4e6ababa673204aab525e72c90ba54cc34a5fd69948a09dc2a9ef2050764b2464544231b1d1a6431279c2877388551ca6fbf384a3f9b464 SHA512 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127
 DIST gdb-12.1.tar.xz 22470332 BLAKE2B 7f6f853d1640908cf2c79932cdc1ba02549a07721c005d9c7ce2946a715761719cc164a4e68235a18664ec8a029afe3a2a0cfb57e1635f280076d6bed91317fd SHA512 425568d2e84672177d0fb87b1ad7daafdde097648d605e30cf0656970f66adc6a82ca2d83375ea4be583e9683a340e5bfdf5819668ddf66728200141ae50ff2d
 EBUILD gdb-11.2.ebuild 7722 BLAKE2B 1bcbff793ff193619bb8a8d0fc066b4feadb66fde7561386b7cee2a4a21a2589e19581beaad9730d2d39542e34e62e030b4dcf0a27f3494963c61e890873e70b SHA512 2ec73b48268062d058757656a76a3b8c8934cf474850c0f580f7e6a0931c775cf649cbfa812aa2a70c707efb0ae74d0fef78c3faa7780499764adb5f04333e59
 EBUILD gdb-12.1-r1.ebuild 8182 BLAKE2B fa5f02ee9d8ca485ec0f3e3c8f59977669cf1bb4ac1317b44dcab292c1a394d826029199d78859206c2e3816af01d3fdcbf077c7bce67a9cd47c8e7e4818e752 SHA512 f2c12426f28e36183009f314ab7164512a6367b4c344f418d00c80279b0a348dacabc1ca6af4c971a4ea949273e9b9e96458a4850a362c1629aa6650f67a4825
+EBUILD gdb-12.1-r2.ebuild 8225 BLAKE2B 3bf43b7d87029a0ec4319c00a177e4df8b4d23a68862b0b1692481e9ed817947ddd9da32d281641772db270d8daee2674696a550be348cde4364d826fc7974a4 SHA512 bd17ae458284a1aca545e4cdb81f0243e942d010d01263bf223a2f542b150bf1ddff90fcb849f00cafad56412910b045d9562785fc64aa1c6819c3a34b420d46
 EBUILD gdb-12.1.ebuild 7708 BLAKE2B 13e0a83a1f30c21d973c8bdaa018406b7a60563fec76e73052ccb388308f88acbd613a3c0e115a02f2fa61ff1c2733d79203750e93c815ef85f5f75bd76b23b4 SHA512 3e9e0fd46b7680daf8c8a67200af8fcfb1d0422d372820e758d5a5e8bc0d674b7ae977e600446e2201d645be7e2a930a2165bcb6a09fce5113088aaa2f7bb2ca
 EBUILD gdb-9999.ebuild 8137 BLAKE2B 5674afcc2ba558478269300ecb18efc14abb528d1d9a9a2175e813b9f110ee29ea63b8a68e10c0e657691b165cc8852b577ed1b504786a0cc651d60edfc5c337 SHA512 d5f2888f77d1f4595d5c2497730ce0900189e02c4b793b4636c607d28f663657a040ba20eb792597bbb8b27d6f39679e5c596b95e62ccfeaaa3b0777449ca3b3
 MISC metadata.xml 1103 BLAKE2B e63ea2e52649ac2f4ac21381cadb7cc76525792e99a4a6581535475480b6c45e654c8222b0b58585435d4c858cf3eef00dcaecf7edecae2b2fd336f1b56e6e56 SHA512 f7f1b4da71b18cb68a2f32aa6faae6251528047069071c9bee1be504267d0baf2cbac4fb928e0cbe9df100e3a681e2c3b6c7be14514a45a2f52d30364a8626f4
diff --git a/sys-devel/gdb/files/gdb-12.1-core-file-detach.patch b/sys-devel/gdb/files/gdb-12.1-core-file-detach.patch
new file mode 100644
index 000000000000..c0f8a8ee0269
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-12.1-core-file-detach.patch
@@ -0,0 +1,155 @@
+https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=0fe74cb9ad35add9c6da4df5c9879f254d918a6a
+
+From: Pedro Alves <pedro@palves.net>
+Date: Wed, 22 Jun 2022 18:44:37 +0100
+Subject: [PATCH] Fix core-file -> detach -> crash (corefiles/29275)
+
+After loading a core file, you're supposed to be able to use "detach"
+to unload the core file.  That unfortunately regressed starting with
+GDB 11, with these commits:
+
+ 1192f124a308 - gdb: generalize commit_resume, avoid commit-resuming when threads have pending statuses
+ 408f66864a1a - detach in all-stop with threads running
+
+resulting in a GDB crash:
+
+ ...
+ Thread 1 "gdb" received signal SIGSEGV, Segmentation fault.
+ 0x0000555555e842bf in maybe_set_commit_resumed_all_targets () at ../../src/gdb/infrun.c:2899
+ 2899          if (proc_target->commit_resumed_state)
+ (top-gdb) bt
+ #0  0x0000555555e842bf in maybe_set_commit_resumed_all_targets () at ../../src/gdb/infrun.c:2899
+ #1  0x0000555555e848bf in scoped_disable_commit_resumed::reset (this=0x7fffffffd440) at ../../src/gdb/infrun.c:3023
+ #2  0x0000555555e84a0c in scoped_disable_commit_resumed::reset_and_commit (this=0x7fffffffd440) at ../../src/gdb/infrun.c:3049
+ #3  0x0000555555e739cd in detach_command (args=0x0, from_tty=1) at ../../src/gdb/infcmd.c:2791
+ #4  0x0000555555c0ba46 in do_simple_func (args=0x0, from_tty=1, c=0x55555662a600) at ../../src/gdb/cli/cli-decode.c:95
+ #5  0x0000555555c112b0 in cmd_func (cmd=0x55555662a600, args=0x0, from_tty=1) at ../../src/gdb/cli/cli-decode.c:2514
+ #6  0x0000555556173b1f in execute_command (p=0x5555565c5916 "", from_tty=1) at ../../src/gdb/top.c:699
+
+The code that crashes looks like:
+
+ static void
+ maybe_set_commit_resumed_all_targets ()
+ {
+   scoped_restore_current_thread restore_thread;
+
+   for (inferior *inf : all_non_exited_inferiors ())
+     {
+       process_stratum_target *proc_target = inf->process_target ();
+
+       if (proc_target->commit_resumed_state)
+           ^^^^^^^^^^^
+
+With 'proc_target' above being null.  all_non_exited_inferiors filters
+out inferiors that have pid==0.  We get here at the end of
+detach_command, after core_target::detach has already run, at which
+point the inferior _should_ have pid==0 and no process target.  It is
+clear it no longer has a process target, but, it still has a pid!=0
+somehow.
+
+The reason the inferior still has pid!=0, is that core_target::detach
+just unpushes, and relies on core_target::close to actually do the
+getting rid of the core and exiting the inferior.  The problem with
+that is that detach_command grabs an extra strong reference to the
+process stratum target, so the unpush_target inside
+core_target::detach doesn't actually result in a call to
+core_target::close.
+
+Fix this my moving the cleaning up the core inferior to a shared
+routine called by both core_target::close and core_target::detach.  We
+still need to cleanup the inferior from within core_file::close
+because there are paths to it that want to get rid of the core without
+going through detach.  E.g., "core-file" -> "run".
+
+This commit includes a new test added to gdb.base/corefile.exp to
+cover the "core-file core" -> "detach" scenario.
+
+Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29275
+
+Change-Id: Ic42bdd03182166b19f598428b0dbc2ce6f67c893
+--- a/gdb/corelow.c
++++ b/gdb/corelow.c
+@@ -120,6 +120,9 @@ public:
+ 
+ private: /* per-core data */
+ 
++  /* Get rid of the core inferior.  */
++  void clear_core ();
++
+   /* The core's section table.  Note that these target sections are
+      *not* mapped in the current address spaces' set of target
+      sections --- those should come only from pure executable or
+@@ -290,10 +293,8 @@ core_target::build_file_mappings ()
+ /* An arbitrary identifier for the core inferior.  */
+ #define CORELOW_PID 1
+ 
+-/* Close the core target.  */
+-
+ void
+-core_target::close ()
++core_target::clear_core ()
+ {
+   if (core_bfd)
+     {
+@@ -307,6 +308,14 @@ core_target::close ()
+ 
+       current_program_space->cbfd.reset (nullptr);
+     }
++}
++
++/* Close the core target.  */
++
++void
++core_target::close ()
++{
++  clear_core ();
+ 
+   /* Core targets are heap-allocated (see core_target_open), so here
+      we delete ourselves.  */
+@@ -592,9 +601,15 @@ core_target_open (const char *arg, int from_tty)
+ void
+ core_target::detach (inferior *inf, int from_tty)
+ {
+-  /* Note that 'this' is dangling after this call.  unpush_target
+-     closes the target, and our close implementation deletes
+-     'this'.  */
++  /* Get rid of the core.  Don't rely on core_target::close doing it,
++     because target_detach may be called with core_target's refcount > 1,
++     meaning core_target::close may not be called yet by the
++     unpush_target call below.  */
++  clear_core ();
++
++  /* Note that 'this' may be dangling after this call.  unpush_target
++     closes the target if the refcount reaches 0, and our close
++     implementation deletes 'this'.  */
+   inf->unpush_target (this);
+ 
+   /* Clear the register cache and the frame cache.  */
+--- a/gdb/testsuite/gdb.base/corefile.exp
++++ b/gdb/testsuite/gdb.base/corefile.exp
+@@ -207,6 +207,16 @@ gdb_test "up" "#\[0-9\]* *\[0-9xa-fH'\]* in .* \\(.*\\).*" "up in corefile.exp (
+ 
+ gdb_test "core" "No core file now."
+ 
++# Test that we can unload the core with the "detach" command.
++
++proc_with_prefix corefile_detach {} {
++    clean_restart $::binfile
++
++    gdb_test "core-file $::corefile" "Core was generated by .*" "load core"
++    gdb_test "detach" "No core file now\\." "detach core"
++}
++
++corefile_detach
+ 
+ # Test a run (start) command will clear any loaded core file.
+ 
+@@ -222,6 +232,8 @@ proc corefile_test_run {} {
+ 	return
+     }
+ 
++    clean_restart $::binfile
++
+     gdb_test "core-file $corefile" "Core was generated by .*" "run: load core again"
+     gdb_test "info files" "\r\nLocal core dump file:\r\n.*" "run: sanity check we see the core file"
+ 
diff --git a/sys-devel/gdb/gdb-12.1-r2.ebuild b/sys-devel/gdb/gdb-12.1-r2.ebuild
new file mode 100644
index 000000000000..9da927c79e77
--- /dev/null
+++ b/sys-devel/gdb/gdb-12.1-r2.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit flag-o-matic python-single-r1 strip-linguas toolchain-funcs
+
+export CTARGET=${CTARGET:-${CHOST}}
+
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+case ${PV} in
+	9999*)
+		# live git tree
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		SRC_URI=""
+		;;
+	*.*.50.2???????)
+		# weekly snapshots
+		SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
+		;;
+	*)
+		# Normal upstream release
+		SRC_URI="mirror://gnu/gdb/${P}.tar.xz
+			ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
+		;;
+esac
+
+PATCH_VER=""
+PATCH_DEV=""
+DESCRIPTION="GNU debugger"
+HOMEPAGE="https://sourceware.org/gdb/"
+SRC_URI="${SRC_URI}
+	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz}
+	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
+"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+IUSE="cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# In fact, gdb's test suite needs some work to get passing.
+# See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
+# As of 11.2, on amd64: "# of unexpected failures    8600"
+# ia64 kernel crashes when gdb testsuite is running
+# in fact, gdb's test suite needs some work to get passing.
+# See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
+# As of 11.2, on amd64: "# of unexpected failures    8600"
+RESTRICT="
+	ia64? ( test )
+	!test? ( test )
+	test
+"
+
+RDEPEND="
+	dev-libs/mpfr:0=
+	dev-libs/gmp:=
+	>=sys-libs/ncurses-5.2-r2:0=
+	>=sys-libs/readline-7:0=
+	sys-libs/zlib
+	elibc_glibc? ( net-libs/libnsl:= )
+	lzma? ( app-arch/xz-utils )
+	python? ( ${PYTHON_DEPS} )
+	guile? ( >=dev-scheme/guile-2.0 )
+	xml? ( dev-libs/expat )
+	source-highlight? (
+		dev-util/source-highlight
+	)
+	xxhash? (
+		dev-libs/xxhash
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	sys-apps/texinfo
+	virtual/yacc
+	nls? ( sys-devel/gettext )
+	source-highlight? ( virtual/pkgconfig )
+	test? ( dev-util/dejagnu )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
+	"${FILESDIR}"/${P}-readline-8.2-build.patch
+	"${FILESDIR}"/${P}-core-file-detach.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	strip-linguas -u bfd/po opcodes/po
+
+	# Avoid using ancient termcap from host on Prefix systems
+	sed -i -e 's/termcap tinfow/tinfow/g' \
+		gdb/configure{.ac,} || die
+}
+
+gdb_branding() {
+	printf "Gentoo ${PV} "
+
+	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
+		printf "p${PATCH_VER}"
+	else
+		printf "vanilla"
+	fi
+
+	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
+}
+
+src_configure() {
+	strip-unsupported-flags
+
+	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
+	# Avoid really confusing logs from subconfigure spam, makes logs far
+	# more legible.
+	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
+	local myconf=(
+		# portage's econf() does not detect presence of --d-d-t
+		# because it greps only top-level ./configure. But not
+		# gnulib's or gdb's configure.
+		--disable-dependency-tracking
+
+		--with-pkgversion="$(gdb_branding)"
+		--with-bugurl='https://bugs.gentoo.org/'
+		--disable-werror
+		# Disable modules that are in a combined binutils/gdb tree. bug #490566
+		--disable-{binutils,etc,gas,gold,gprof,ld}
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
+
+		$(use_enable test unit-tests)
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
+
+		# We need to set both configure options, --with-sysroot and --libdir,
+		# to fix cross build issues that happen when configuring gmp.
+		# We explicitly need --libdir. Having only --with-sysroot without
+		# --libdir would not fix the build issues.
+		# For some reason, it is not enough to set only --with-sysroot,
+		# also not enough to pass --with-gmp-xxx options.
+		--with-sysroot="${ESYSROOT}"
+		--libdir="${ESYSROOT}/usr/$(get_libdir)"
+	)
+
+	local sysroot="${EPREFIX}/usr/${CTARGET}"
+
+	is_cross && myconf+=(
+		--with-sysroot="${sysroot}"
+		--includedir="${sysroot}/usr/include"
+		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
+	)
+
+	# gdbserver only works for native targets (CHOST==CTARGET).
+	# it also doesn't support all targets, so rather than duplicate
+	# the target list (which changes between versions), use the
+	# "auto" value when things are turned on, which is triggered
+	# whenever no --enable or --disable is given
+	if is_cross || use !server ; then
+		myconf+=( --disable-gdbserver )
+	fi
+
+	myconf+=(
+		--enable-64-bit-bfd
+		--disable-install-libbfd
+		--disable-install-libiberty
+		--enable-obsolete
+		# This only disables building in the readline subdir.
+		# For gdb itself, it'll use the system version.
+		--disable-readline
+		--with-system-readline
+		# This only disables building in the zlib subdir.
+		# For gdb itself, it'll use the system version.
+		--without-zlib
+		--with-system-zlib
+		--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
+		$(use_with xml expat)
+		$(use_with lzma)
+		$(use_enable nls)
+		$(use_enable source-highlight)
+		$(use multitarget && echo --enable-targets=all)
+		$(use_with python python "${EPYTHON}")
+		$(use_with xxhash)
+		$(use_with guile)
+	)
+
+	if use sparc-solaris || use x86-solaris ; then
+		# Disable largefile support
+		# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html
+		myconf+=( --disable-largefile )
+	fi
+
+	# source-highlight is detected with pkg-config: bug #716558
+	export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
+	# ensure proper compiler is detected for Clang builds: bug #831202
+	export GCC_FOR_TARGET="${CC_FOR_TARGET:-$(tc-getCC)}"
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake V=1 DESTDIR="${D}" install
+
+	find "${ED}"/usr -name libiberty.a -delete || die
+
+	# Delete translations that conflict with binutils-libs. bug #528088
+	# Note: Should figure out how to store these in an internal gdb dir.
+	if use nls ; then
+		find "${ED}" \
+			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
+			-delete || die
+	fi
+
+	# Don't install docs when building a cross-gdb
+	if [[ ${CTARGET} != ${CHOST} ]] ; then
+		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
+		local f
+		for f in "${ED}"/usr/share/man/*/* ; do
+			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
+				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
+			fi
+		done
+		return 0
+	fi
+
+	# Install it by hand for now:
+	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
+	# Only install if it exists due to the twisted behavior (see
+	# notes in src_configure above).
+	[[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay
+
+	docinto gdb
+	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
+		gdb/NEWS gdb/PROBLEMS
+	docinto sim
+	dodoc sim/{MAINTAINERS,README-HACKING}
+
+	if use server ; then
+		docinto gdbserver
+		dodoc gdbserver/README
+	fi
+
+	if [[ -n ${PATCH_VER} ]] ; then
+		dodoc "${WORKDIR}"/extra/gdbinit.sample
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,ctf-spec,standards}.info*
+
+	if use python ; then
+		python_optimize "${ED}"/usr/share/gdb/python/gdb
+	fi
+}
+
+pkg_postinst() {
+	# Portage doesn't unmerge files in /etc
+	rm -vf "${EROOT}"/etc/skel/.gdbinit
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "gdb is unable to get a mach task port when installed by Prefix"
+		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
+		ewarn "have to perform the following steps:"
+		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
+		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
+	fi
+}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index d2c01b694f01..d0b3a51f68b2 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -3,9 +3,9 @@ DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf
 DIST llvm-project-15.0.0rc2.src.tar.xz 112110968 BLAKE2B 98c3769f17f1958fbec771409eef781f5ca845363656c70fe5cd20bca1b8471e7a8773a7d4e395700c297a5f3f208fe1303cf18e2a73b45388b782fb7484106b SHA512 eee1bee1f83cc468fb4bb6839acbd5c1618dc35f35e51cd078288b91bad95d52edaadd05c88f2d72d51c1c338ba08b3346c070a28693b1224639eb7a1ef4a4d9
 DIST llvm-project-15.0.0rc2.src.tar.xz.sig 438 BLAKE2B 09f260b30724b41b27ef621929c086fd6c13bde51c4adb880897b549b2d336682f617faf3dd636ceb795e329b664972cf50745ab49f84e7540658d53074510da SHA512 9f695a309fbb15026dc133eb17d33abd26831eb036fad79dd8df37d4f4d9eeae1ca463acd037d2a1882bc2cff763e4bda507d1d827d845613bfd62d0f9fbd4ca
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
-EBUILD lld-13.0.1.ebuild 1871 BLAKE2B b6acf1ff04dd34f58e6113c318d1dfd991f60df2dbcbe02ebf2cad37be07cf676b36113fec0d8d6c3752eb98ec9a459dc214a0f28a4244dacfdaf8ff762ea405 SHA512 c3991a3e337477cbefadd221fa3ee640abe21b6fb51521051e387fb29314ca8f0d83dff5bd35f93e01b80e05823527d6b20c8223f86be9d0d879dba9fbe9d055
-EBUILD lld-14.0.6.ebuild 1883 BLAKE2B bd1e28b7f7717b51207b6a2bb7bda0bfd2003fb6e1b92cfb416be1bcdbc36445f8d2305b7144caaae69197446cdf863ab492e0061bc9b72f4d4440e30db2a17b SHA512 de39399cbb6bc8c60961f61fe47d22d7a7c85d8bf54aca86b60399b1d2a321d16875a19cf0aab6dc8a8786d81bd243ac57221c034edb090a2b6df424559371d7
-EBUILD lld-15.0.0.9999.ebuild 1846 BLAKE2B 8c305b9447a7fa1ae7388b62ad4f2e28c51438ed01304a39fe00683b28b2bbc84a549b6a9ea33fc0b1fe5f5974813fa8d8667b002346fa3d76bd1b709e23ec4f SHA512 3c2eb3b5c2764016c352809e9c466a67add7caffbad10f93961ec000e297a0a54789afcdbf3bbb83bb4b252231a5fe4b6208b9e4d787c1399df12a7e4e9f0540
-EBUILD lld-15.0.0_rc2.ebuild 1846 BLAKE2B 8c305b9447a7fa1ae7388b62ad4f2e28c51438ed01304a39fe00683b28b2bbc84a549b6a9ea33fc0b1fe5f5974813fa8d8667b002346fa3d76bd1b709e23ec4f SHA512 3c2eb3b5c2764016c352809e9c466a67add7caffbad10f93961ec000e297a0a54789afcdbf3bbb83bb4b252231a5fe4b6208b9e4d787c1399df12a7e4e9f0540
-EBUILD lld-16.0.0.9999.ebuild 1846 BLAKE2B 8c305b9447a7fa1ae7388b62ad4f2e28c51438ed01304a39fe00683b28b2bbc84a549b6a9ea33fc0b1fe5f5974813fa8d8667b002346fa3d76bd1b709e23ec4f SHA512 3c2eb3b5c2764016c352809e9c466a67add7caffbad10f93961ec000e297a0a54789afcdbf3bbb83bb4b252231a5fe4b6208b9e4d787c1399df12a7e4e9f0540
+EBUILD lld-13.0.1.ebuild 1882 BLAKE2B 1a5207649cc769c725f4825ebb6c070eb2b43ffa53ce4c3a04297e5c8e11e9f8cc2df88de51dccefc48a7ad045caadf95b22e747b3760c2d0961f6adba6ff422 SHA512 9f098fda60de3570cd04200babd163d940606a96ff5f7a6f3e8bf31ce054dd50636f47cc25c945cc46e5b4c7646763f58d2799b4940dbee412bad76f73de8dee
+EBUILD lld-14.0.6.ebuild 1894 BLAKE2B 8f5922031c9b64b0cf246800fd26b1802bdcc1fd84aae911106bd0c5a6d9482ff7c92571b7cc7f988e0b8b0b679eb94fa6c62685d69fdf9cc2b697ae29252e09 SHA512 4959af6727591bbd411861f4717ffd523b9a026c33c4de3b035230b1b5dc1067d9fa5c539455ea16fd7a294c95b9019be1e85638448afb0d900dedbb4284a30a
+EBUILD lld-15.0.0.9999.ebuild 1857 BLAKE2B d50e5b40aca9f43d860247f497f2f4ae7539be215002cbf0e64879d526f79bfff8e8adbba7afb5e9ec18813d0e2923bfc8389f8b03d92d48d03b357bd9adb4ad SHA512 4fd89852998e6d52492a28271d75824c90ecddbae6feec7fce597c31039d4f6e033b4521f3aaf0e60c4df36b2a8c00630d8bddfac46f4936fc0376139baaa416
+EBUILD lld-15.0.0_rc2.ebuild 1857 BLAKE2B d50e5b40aca9f43d860247f497f2f4ae7539be215002cbf0e64879d526f79bfff8e8adbba7afb5e9ec18813d0e2923bfc8389f8b03d92d48d03b357bd9adb4ad SHA512 4fd89852998e6d52492a28271d75824c90ecddbae6feec7fce597c31039d4f6e033b4521f3aaf0e60c4df36b2a8c00630d8bddfac46f4936fc0376139baaa416
+EBUILD lld-16.0.0.9999.ebuild 1857 BLAKE2B d50e5b40aca9f43d860247f497f2f4ae7539be215002cbf0e64879d526f79bfff8e8adbba7afb5e9ec18813d0e2923bfc8389f8b03d92d48d03b357bd9adb4ad SHA512 4fd89852998e6d52492a28271d75824c90ecddbae6feec7fce597c31039d4f6e033b4521f3aaf0e60c4df36b2a8c00630d8bddfac46f4936fc0376139baaa416
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/lld/lld-13.0.1.ebuild b/sys-devel/lld/lld-13.0.1.ebuild
index 254b9182c562..261c2c5ddab8 100644
--- a/sys-devel/lld/lld-13.0.1.ebuild
+++ b/sys-devel/lld/lld-13.0.1.ebuild
@@ -28,7 +28,7 @@ LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
 llvm.org_set_globals
 
 python_check_deps() {
-	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "~dev-python/lit-${PV}[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/sys-devel/lld/lld-14.0.6.ebuild b/sys-devel/lld/lld-14.0.6.ebuild
index 8d4e6bb18c09..cc28bfce5593 100644
--- a/sys-devel/lld/lld-14.0.6.ebuild
+++ b/sys-devel/lld/lld-14.0.6.ebuild
@@ -33,7 +33,7 @@ LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
 llvm.org_set_globals
 
 python_check_deps() {
-	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "~dev-python/lit-${PV}[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/sys-devel/lld/lld-15.0.0.9999.ebuild b/sys-devel/lld/lld-15.0.0.9999.ebuild
index 019425b4e1fa..76bdcb369c4b 100644
--- a/sys-devel/lld/lld-15.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-15.0.0.9999.ebuild
@@ -33,7 +33,7 @@ LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
 llvm.org_set_globals
 
 python_check_deps() {
-	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "~dev-python/lit-${PV}[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/sys-devel/lld/lld-15.0.0_rc2.ebuild b/sys-devel/lld/lld-15.0.0_rc2.ebuild
index 019425b4e1fa..76bdcb369c4b 100644
--- a/sys-devel/lld/lld-15.0.0_rc2.ebuild
+++ b/sys-devel/lld/lld-15.0.0_rc2.ebuild
@@ -33,7 +33,7 @@ LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
 llvm.org_set_globals
 
 python_check_deps() {
-	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "~dev-python/lit-${PV}[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/sys-devel/lld/lld-16.0.0.9999.ebuild b/sys-devel/lld/lld-16.0.0.9999.ebuild
index 019425b4e1fa..76bdcb369c4b 100644
--- a/sys-devel/lld/lld-16.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-16.0.0.9999.ebuild
@@ -33,7 +33,7 @@ LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
 llvm.org_set_globals
 
 python_check_deps() {
-	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "~dev-python/lit-${PV}[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 05340dc54cd5..d849d8088d8a 100644
Binary files a/sys-firmware/Manifest.gz and b/sys-firmware/Manifest.gz differ
diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
index 441948c37ca0..40ad95b3ac23 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -1,27 +1,17 @@
-DIST intel-microcode-collection-20201116.tar.xz 6506624 BLAKE2B b74ec0ddafe9681ae94d6a0df1de51655004eecae83c413fa824c9ad25cf68a25059627e2809a3b8cd5b3cb18647455385de0be2b2a7fcc6bc6c30e2ccabd1af SHA512 3a1aab0af9ff6dc95778276964b457a4429aa12f13499f6f89fa48285cf8aef9a0990099a80e360b76b2d4b6a836f2528f984aab17f12d905cf237dbab2a8b33
-DIST intel-microcode-collection-20210221.tar.xz 6690716 BLAKE2B 09758341d20d60b739c4859442457fcc4ce563327dd7f14e8a626f49198d3beb59ef580530500a2dacb5ab9832119e8d489f553ccffc56613b31df027eb93e98 SHA512 e3bb3644c46ee41752bbd21c56e69144d23dab9162ebfe9906a07ff646b7ba57d14b0280b044bf7ceab771fe80e75d7aed3808b68b823ae19bc0c7c4a94589dd
-DIST intel-microcode-collection-20210514.tar.xz 7907672 BLAKE2B d5226008e50e804c0acfa648393032b08a317572be1e38743721613000dede886d3885b36f7fa4a9c061e72855fc0ad409ce3299f679afc866abda7d29c9512a SHA512 fc4fcd3e2c4f1abdf5c0d23c1c0ac2f8c572531dadbc9a070c38150ec939cd4e2b13226b86df2371eb0679cef96307262d0356f2e617773c51c53f3e440894d2
-DIST intel-microcode-collection-20210608.tar.xz 8012692 BLAKE2B 98df9d18658bfdf06ac7db84ac30707fe8834874583b324ebc882b514975d71b686788fcd1c9b9c5b05448403b27524e29a94ade34facdffb1645333059019a9 SHA512 7fd810cf05334f6442b9a0c77aef5319d3e2006e887d0354dee952647ded3fa6331a30192abf82eda0676af0439b40f5e3ab0210611f96c78fe52f01f106c5d4
 DIST intel-microcode-collection-20210830.tar.xz 8681768 BLAKE2B 84f098285ed0b79b953e1f54b9ca077e42e7a2b6b28e862dddcb23a546ebebdd5afb9e54215b6c6493b72bf82121ace4b06f759413d3745571ff8156db52d6b1 SHA512 8a6a7376524888b0e89f9fd9a592d52a3859f4ddf1d961484b60d77098faa6984c5e8efc9cf4258a943cfc2c3503dbb87989868962a7ad8028c391d897e212b6
 DIST intel-microcode-collection-20220207.tar.xz 9362888 BLAKE2B 9efb2a943bffc1d702675c4ca5d17b6bc7f5bf5688fb1979caadbf96c516c31c3e1894823aaa16dbdb8c778c933eaf49dec6f2d416483d11e58ed1e75823cef8 SHA512 72458aa64c05ceb8bb21b296da5ad15230af3e6ac63240a10370fadec09523cf7ebefaaddce2b31e2c16570c2700a875cccf86fd1770046ff36cc30eb594f041
 DIST intel-microcode-collection-20220421.tar.xz 9442704 BLAKE2B 9c0d682d4ae07c6c40b7638cd53e559f0d5b672f40676a3fc478d07ac5772f350da777c20f821ed5a0907ba31800874cd15553fcdbdae319e77e17961cf49f9f SHA512 a7b5ef78618a27c6065a78d5302d19f846feb71bc09cc0359342d1f31f1f793242982bc384227b0e59a4b7f246cb9f4aaa2350ad0a4fe1a23ce3504e59b0d2c2
 DIST intel-microcode-collection-20220508.tar.xz 9444060 BLAKE2B 1737143f5227d95590f325f7205c04816d7791bebb27573dc30774fe5f40f74c1e0506d41774474a8b2495b0dc210528fac1362545d670a085c5c502aa903b24 SHA512 b9d7f2d5db0f625a219959f52822c8d6fba2e0bc682257a204c9b33cd19ed2101f5f661e7f2e2b98a8ad8d105fcb3309699d193469ee4d67d99ae188dc7034d9
 DIST intel-microcode-collection-20220809.tar.xz 9863700 BLAKE2B 266deba0890cc68de72dab28cb76b9aedd81258c2da1c1c00a19f927c73e9856c9dc6a18c08a768d1df2d5c5c3b21aab13446cdb4f84e13078ff2124859cdb00 SHA512 4c35e26d5887e9182dce5cf4cce46d4cfe8cab926e833396a645561adab775b8a5eac9a27f50a4c83887c50e56384917680a596eb02d50f1a14a56e8c163f4c2
 DIST intel-ucode-sig_0x406e3-rev_0xd6.bin 101376 BLAKE2B 66d55867954d69dda1425febd93bb8c89f7aa836d504f8b5fee127f8505bcf2246f4fcc55cc245bc5e532528d60cca2eee278de7ab5174dc2862db7982a2b36f SHA512 248066b521bf512b5d8e4a8c7e921464ce52169c954d6e4ca580d8c172cd789519e22b4cf56c212e452b4191741f0202019f7061d322c9433b5af9ce5413b567
-DIST microcode-20201112.tar.gz 3610834 BLAKE2B 4212924f1673afded961266a25fe6063ec6cdafaa26c8bee1c42372eb8ab5f278dc2501615b23e09e2f9809bf2792a8db317c98c170bf0c5e1dd62b7dc80a084 SHA512 0875675d065a83ee14fa34a31022ee34e46aee579d1ff192414e79861af157ae269ca7c2c462f03b3accbd45590c76e5cbf4f53d7a6ed237e410213a96459211
-DIST microcode-20210216.tar.gz 3506111 BLAKE2B e09ab59dcccc77c15545b119dcf5309e626d53649a601c49fc7d6a65d774b8016d9ad44783f75ceb4bf384a03b909bc28693ed2be9f047029342dca9beae9cae SHA512 211ed90a248c891224bb8c569e24c04410d3f67ecc6daee41dc025042bd51c257baaba0da1ac5327df76352d2b53d812e81f06cc8726e43b95ea2f8898bc00bf
 DIST microcode-20210608.tar.gz 4782451 BLAKE2B 2eac43aaa7832365e428bf2de20797ef42293a53087545920d205bd3b11a3d8ca2afb33931af5d36b8f3a224b9c22ed89ff828acc8afdcfa1b8220884c55ae89 SHA512 61acd2e76aa019fa0002fbf56c503791080a937ff93d81e020f8f0cc089dc08928b4c7e9884f713b886e2f9d4a8409fea59e39f628ef534a588515e1c3fc861d
 DIST microcode-20220207.tar.gz 4590237 BLAKE2B 8c47a330794615b6684084976b6bb9e8800cd2869f81ecc33b28b54441b220a645502c0ade0cbd58e91879a652ff6bca181800004de477fc74033413ea4b1c8f SHA512 efa9f80815947cf2be371e7da7185634cbacefe779d1d6dfef0c15b78ccae7d2740ea6681b967a19dfbcc3014edce5bcdcdba87c9dea1f19d0415a03fca9e936
 DIST microcode-20220419.tar.gz 4590171 BLAKE2B 69d296efad5329324a47640eace5d1a10e38b85cb8b7ac5baa9f14c40391ff809ae17cb7814f99f2e43910fe4c4b02dc77ffea7bb5f2b58069b2c17029e9f76a SHA512 abfe3942c204e42ed121bcea47c366469013a6751ef5d28d9c0d59a3a660bd1ad7010441e000367c052ee1ead00285a252d2b3c3ca86314eaea9f7d0de3f05c6
 DIST microcode-20220510.tar.gz 5912115 BLAKE2B 5f8c238b00970ddda132dbcf9059df759bb768e1eb2fe0b9912ffe69cf9a6104b32ea816e7574660ea74e3d08af1aa45cc46b5f38d0b315e6e466d8ca466f37d SHA512 00329ce62a6d9cc66fb8594d132ef67951086ab1250ceaf908d5a357753ed62557275f55c5eb7b3ad55d1fdd312b5d1a436b214cdcbf6e3e1a840c8bf6f4795d
 DIST microcode-20220809.tar.gz 5929894 BLAKE2B 3765995c88b67aff78fe8c4280b3293c60a2013f2b8c9ec155a2ef187af55a7e562c73a000e45828cf5309e2c1b644dac5849347130b1a98c831bdad117df437 SHA512 1c91df1cbba33953f4ad19cc53215cad843c61a08509596fad32a84b4f0012d9d29bce64b58eb405c345af7f646d5982e45227570ce3605780be6e8bf31a63e1
-EBUILD intel-microcode-20201112_p20201116-r1.ebuild 9283 BLAKE2B 80ef0e145d64b3c104400c7c555a4d2436c55b385a870b31b9d3288016c350f0f9f81f0a92d12985e84895bfb051b9113e2a4ba4a439a89d8d28444f03efa0b3 SHA512 13d0dc01a5a253db88756eae947cb447d1fb5e082bd45b86b6a9d083a0c7004e2d721390bc225f2ad63b11409004d5e73b99884a413fc811f90017acc403caf1
-EBUILD intel-microcode-20210216_p20210221.ebuild 9283 BLAKE2B 80ef0e145d64b3c104400c7c555a4d2436c55b385a870b31b9d3288016c350f0f9f81f0a92d12985e84895bfb051b9113e2a4ba4a439a89d8d28444f03efa0b3 SHA512 13d0dc01a5a253db88756eae947cb447d1fb5e082bd45b86b6a9d083a0c7004e2d721390bc225f2ad63b11409004d5e73b99884a413fc811f90017acc403caf1
-EBUILD intel-microcode-20210216_p20210514.ebuild 9283 BLAKE2B 80ef0e145d64b3c104400c7c555a4d2436c55b385a870b31b9d3288016c350f0f9f81f0a92d12985e84895bfb051b9113e2a4ba4a439a89d8d28444f03efa0b3 SHA512 13d0dc01a5a253db88756eae947cb447d1fb5e082bd45b86b6a9d083a0c7004e2d721390bc225f2ad63b11409004d5e73b99884a413fc811f90017acc403caf1
-EBUILD intel-microcode-20210608_p20210608.ebuild 9283 BLAKE2B 80ef0e145d64b3c104400c7c555a4d2436c55b385a870b31b9d3288016c350f0f9f81f0a92d12985e84895bfb051b9113e2a4ba4a439a89d8d28444f03efa0b3 SHA512 13d0dc01a5a253db88756eae947cb447d1fb5e082bd45b86b6a9d083a0c7004e2d721390bc225f2ad63b11409004d5e73b99884a413fc811f90017acc403caf1
 EBUILD intel-microcode-20210608_p20210830.ebuild 9283 BLAKE2B 80ef0e145d64b3c104400c7c555a4d2436c55b385a870b31b9d3288016c350f0f9f81f0a92d12985e84895bfb051b9113e2a4ba4a439a89d8d28444f03efa0b3 SHA512 13d0dc01a5a253db88756eae947cb447d1fb5e082bd45b86b6a9d083a0c7004e2d721390bc225f2ad63b11409004d5e73b99884a413fc811f90017acc403caf1
 EBUILD intel-microcode-20220207_p20220207.ebuild 9283 BLAKE2B 80ef0e145d64b3c104400c7c555a4d2436c55b385a870b31b9d3288016c350f0f9f81f0a92d12985e84895bfb051b9113e2a4ba4a439a89d8d28444f03efa0b3 SHA512 13d0dc01a5a253db88756eae947cb447d1fb5e082bd45b86b6a9d083a0c7004e2d721390bc225f2ad63b11409004d5e73b99884a413fc811f90017acc403caf1
 EBUILD intel-microcode-20220419_p20220421.ebuild 9269 BLAKE2B b978c98dc2a6caddcf864696e6f9ed868f3419dfabf714bda7be6dd0da157297eb3982d51e2eccb2b0d487d248326dbd38abe0131d3888d9790b2e779eee06cb SHA512 a09e7efb3c32cb9b8f84bb5cd18ceff0c55bacdc325b8bab9f959a92cde0d5e85ab10e69bea51d1fd145a0e843ce19681b7d95ef9960caf9133ac250478b8b9a
 EBUILD intel-microcode-20220510_p20220508.ebuild 9269 BLAKE2B b978c98dc2a6caddcf864696e6f9ed868f3419dfabf714bda7be6dd0da157297eb3982d51e2eccb2b0d487d248326dbd38abe0131d3888d9790b2e779eee06cb SHA512 a09e7efb3c32cb9b8f84bb5cd18ceff0c55bacdc325b8bab9f959a92cde0d5e85ab10e69bea51d1fd145a0e843ce19681b7d95ef9960caf9133ac250478b8b9a
-EBUILD intel-microcode-20220809_p20220809.ebuild 9269 BLAKE2B b978c98dc2a6caddcf864696e6f9ed868f3419dfabf714bda7be6dd0da157297eb3982d51e2eccb2b0d487d248326dbd38abe0131d3888d9790b2e779eee06cb SHA512 a09e7efb3c32cb9b8f84bb5cd18ceff0c55bacdc325b8bab9f959a92cde0d5e85ab10e69bea51d1fd145a0e843ce19681b7d95ef9960caf9133ac250478b8b9a
+EBUILD intel-microcode-20220809_p20220809.ebuild 10233 BLAKE2B 10f02d205e2702a443f89e9b072ef740ad4d5c58003f05fe1f87913c153c46374a4af57a57808a0eb2a8dc88887019b9d01860392d37711047c6df0e1b0ef9a6 SHA512 68376b816f4398852224914bdbfb79df97573ec54888c62b6ee3dd3b0fea2a37f02a01bdbce2c52d6a5c1fb04c4c4db61c5ff3439c2f5324d373cdaa6b7cb0e1
 MISC metadata.xml 668 BLAKE2B 9b5e9c5ad6b5889f72758aa76253fc43f0fba9ab9fa51b8393f2b48e76ba61455c257561697a00dd2178c3a563ae76066a3d930cb20e5f51c9534ee1d8db232e SHA512 c1354363370d038f70e20176232dbbe8e66f515a0a28e9da4fa1b792de8c7c785bd70fdc872db774d1f29a50217955becf93a3a55e31c431a4954bada801c6ac
diff --git a/sys-firmware/intel-microcode/intel-microcode-20201112_p20201116-r1.ebuild b/sys-firmware/intel-microcode/intel-microcode-20201112_p20201116-r1.ebuild
deleted file mode 100644
index adfb7ec7e6a4..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20201112_p20201116-r1.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit linux-info toolchain-funcs mount-boot
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# https://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-COLLECTION_SNAPSHOT="${PV##*_p}"
-INTEL_SNAPSHOT="${PV/_p*}"
-#NUM="28087"
-#https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}
-#https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}.tgz
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/"
-SRC_URI="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-${INTEL_SNAPSHOT}.tar.gz
-	https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin
-	https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="hostonly initramfs +split-ucode vanilla"
-REQUIRED_USE="|| ( initramfs split-ucode )"
-
-BDEPEND=">=sys-apps/iucode_tool-2.3"
-
-# !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
-RDEPEND="hostonly? ( sys-apps/iucode_tool )"
-
-RESTRICT="binchecks strip"
-
-S=${WORKDIR}
-
-# Blacklist bad microcode here.
-# 0x000406f1 aka 06-4f-01 aka CPUID 406F1 require newer microcode loader
-MICROCODE_BLACKLIST_DEFAULT="-s !0x000406f1"
-
-# https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/issues/31
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00dc"
-
-# https://bugs.gentoo.org/722768
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00da"
-
-# https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/commit/49bb67f32a2e3e631ba1a9a73da1c52e1cac7fd9
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000806c1,0x80,eq:0x0068"
-
-# In case we want to set some defaults ...
-MICROCODE_SIGNATURES_DEFAULT=""
-
-# Advanced users only!
-# Set MIRCOCODE_SIGNATURES to merge with:
-# only current CPU: MICROCODE_SIGNATURES="-S"
-# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
-# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
-
-pkg_pretend() {
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	if cd Intel-Linux-Processor-Microcode-Data* &>/dev/null; then
-		# new tarball format from GitHub
-		mv * ../ || die "Failed to move Intel-Linux-Processor-Microcode-Data*"
-		cd .. || die
-		rm -r Intel-Linux-Processor-Microcode-Data* || die
-	fi
-
-	mkdir intel-ucode-old || die
-	cp "${DISTDIR}"/intel-ucode-sig_0x406e3-rev_0xd6.bin "${S}"/intel-ucode-old/ || die
-
-	# Prevent "invalid file format" errors from iucode_tool
-	rm -f "${S}"/intel-ucod*/list || die
-}
-
-src_install() {
-	# This will take ALL of the upstream microcode sources:
-	# - microcode.dat
-	# - intel-ucode/
-	# In some cases, they have not contained the same content (eg the directory has newer stuff).
-	MICROCODE_SRC=(
-		"${S}"/intel-ucode/
-		"${S}"/intel-ucode-with-caveats/
-		"${S}"/intel-ucode-old/
-	)
-
-	# Allow users who are scared about microcode updates not included in Intel's official
-	# microcode tarball to opt-out and comply with Intel marketing
-	if ! use vanilla; then
-		MICROCODE_SRC+=( "${S}"/intel-microcode-collection-${COLLECTION_SNAPSHOT} )
-	fi
-
-	# These will carry into pkg_preinst via env saving.
-	: ${MICROCODE_BLACKLIST=${MICROCODE_BLACKLIST_DEFAULT}}
-	: ${MICROCODE_SIGNATURES=${MICROCODE_SIGNATUES_DEFAULT}}
-
-	opts=(
-		${MICROCODE_BLACKLIST}
-		${MICROCODE_SIGNATURES}
-		# be strict about what we are doing
-		--overwrite
-		--strict-checks
-		--no-ignore-broken
-		# we want to install latest version
-		--no-downgrade
-		# show everything we find
-		--list-all
-		# show what we selected
-		--list
-	)
-
-	# The earlyfw cpio needs to be in /boot because it must be loaded before
-	# rootfs is mounted.
-	use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED}/boot/intel-uc.img" )
-
-	keepdir /lib/firmware/intel-ucode
-	opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
-
-	iucode_tool \
-		"${opts[@]}" \
-		"${MICROCODE_SRC[@]}" \
-		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
-
-	dodoc releasenote.md
-}
-
-pkg_preinst() {
-	if [[ ${MICROCODE_BLACKLIST} != ${MICROCODE_BLACKLIST_DEFAULT} ]]; then
-		ewarn "MICROCODE_BLACKLIST is set to \"${MICROCODE_BLACKLIST}\" instead of default \"${MICROCODE_BLACKLIST_DEFAULT}\". You are on your own!"
-	fi
-
-	if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-		ewarn "Package was created using advanced options:"
-		ewarn "MICROCODE_SIGNATURES is set to \"${MICROCODE_SIGNATURES}\" instead of default \"${MICROCODE_SIGNATURES_DEFAULT}\"!"
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && mount-boot_pkg_preinst
-
-	local _initramfs_file="${ED}/boot/intel-uc.img"
-
-	if use hostonly; then
-		# While this output looks redundant we do this check to detect
-		# rare cases where iucode_tool was unable to detect system's processor(s).
-		local _detected_processors=$(iucode_tool --scan-system 2>&1)
-		if [[ -z "${_detected_processors}" ]]; then
-			ewarn "Looks like iucode_tool was unable to detect any processor!"
-		else
-			einfo "Only installing ucode(s) for ${_detected_processors#iucode_tool: system has } due to USE=hostonly ..."
-		fi
-
-		opts=(
-			--scan-system
-			# be strict about what we are doing
-			--overwrite
-			--strict-checks
-			--no-ignore-broken
-			# we want to install latest version
-			--no-downgrade
-			# show everything we find
-			--list-all
-			# show what we selected
-			--list
-		)
-
-		# The earlyfw cpio needs to be in /boot because it must be loaded before
-		# rootfs is mounted.
-		use initramfs && opts+=( --write-earlyfw=${_initramfs_file} )
-
-		if use split-ucode; then
-			opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
-		fi
-
-		opts+=( "${ED}/lib/firmware/intel-ucode-temp" )
-
-		mv "${ED}"/lib/firmware/intel-ucode{,-temp} || die
-		keepdir /lib/firmware/intel-ucode
-
-		iucode_tool "${opts[@]}" || die "iucode_tool ${opts[@]}"
-
-		rm -r "${ED}"/lib/firmware/intel-ucode-temp || die
-
-	elif ! use split-ucode; then # hostonly disabled
-		rm -r "${ED}"/lib/firmware/intel-ucode || die
-	fi
-
-	# Because it is possible that this package will install not one single file
-	# due to user selection which is still somehow unexpected we add the following
-	# check to inform user so that the user has at least a chance to detect
-	# a problem/invalid select.
-	local _has_installed_something=
-	if use initramfs && [[ -s "${_initramfs_file}" ]]; then
-		_has_installed_something="yes"
-	elif use split-ucode; then
-		_has_installed_something=$(find "${ED}/lib/firmware/intel-ucode" -maxdepth 0 -not -empty -exec echo yes \;)
-	fi
-
-	if use hostonly && [[ -n "${_has_installed_something}" ]]; then
-		elog "You only installed ucode(s) for all currently available (=online)"
-		elog "processor(s). Remember to re-emerge this package whenever you"
-		elog "change the system's processor model."
-		elog ""
-	elif [[ -z "${_has_installed_something}" ]]; then
-		ewarn "WARNING:"
-		if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-			ewarn "No ucode was installed! Because you have created this package"
-			ewarn "using MICROCODE_SIGNATURES variable please double check if you"
-			ewarn "have an invalid select."
-			ewarn "It's rare but it is also possible that just no ucode update"
-			ewarn "is available for your processor(s). In this case it is safe"
-			ewarn "to ignore this warning."
-		else
-			ewarn "No ucode was installed! It's rare but it is also possible"
-			ewarn "that just no ucode update is available for your processor(s)."
-			ewarn "In this case it is safe to ignore this warning."
-		fi
-
-		ewarn ""
-
-		if use hostonly; then
-			ewarn "Unset \"hostonly\" USE flag to install all available ucodes."
-			ewarn ""
-		fi
-	fi
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/intel-uc.img!
-	use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postrm
-}
-
-pkg_postinst() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postinst
-
-	# We cannot give detailed information if user is affected or not:
-	# If MICROCODE_BLACKLIST wasn't modified, user can still use MICROCODE_SIGNATURES
-	# to to force a specific, otherwise blacklisted, microcode. So we
-	# only show a generic warning based on running kernel version:
-	if kernel_is -lt 4 14 34; then
-		ewarn "${P} contains microcode updates which require"
-		ewarn "additional kernel patches which aren't yet included in kernel <4.14.34."
-		ewarn "Loading such a microcode through kernel interface from an unpatched kernel"
-		ewarn "can crash your system!"
-		ewarn ""
-		ewarn "Those microcodes are blacklisted per default. However, if you have altered"
-		ewarn "MICROCODE_BLACKLIST or MICROCODE_SIGNATURES, you maybe have unintentionally"
-		ewarn "re-enabled those microcodes...!"
-		ewarn ""
-		ewarn "Check \"${EROOT}/usr/share/doc/${PN}-*/releasenot*\" if your microcode update"
-		ewarn "requires additional kernel patches or not."
-	fi
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20210216_p20210221.ebuild b/sys-firmware/intel-microcode/intel-microcode-20210216_p20210221.ebuild
deleted file mode 100644
index adfb7ec7e6a4..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20210216_p20210221.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit linux-info toolchain-funcs mount-boot
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# https://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-COLLECTION_SNAPSHOT="${PV##*_p}"
-INTEL_SNAPSHOT="${PV/_p*}"
-#NUM="28087"
-#https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}
-#https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}.tgz
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/"
-SRC_URI="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-${INTEL_SNAPSHOT}.tar.gz
-	https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin
-	https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="hostonly initramfs +split-ucode vanilla"
-REQUIRED_USE="|| ( initramfs split-ucode )"
-
-BDEPEND=">=sys-apps/iucode_tool-2.3"
-
-# !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
-RDEPEND="hostonly? ( sys-apps/iucode_tool )"
-
-RESTRICT="binchecks strip"
-
-S=${WORKDIR}
-
-# Blacklist bad microcode here.
-# 0x000406f1 aka 06-4f-01 aka CPUID 406F1 require newer microcode loader
-MICROCODE_BLACKLIST_DEFAULT="-s !0x000406f1"
-
-# https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/issues/31
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00dc"
-
-# https://bugs.gentoo.org/722768
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00da"
-
-# https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/commit/49bb67f32a2e3e631ba1a9a73da1c52e1cac7fd9
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000806c1,0x80,eq:0x0068"
-
-# In case we want to set some defaults ...
-MICROCODE_SIGNATURES_DEFAULT=""
-
-# Advanced users only!
-# Set MIRCOCODE_SIGNATURES to merge with:
-# only current CPU: MICROCODE_SIGNATURES="-S"
-# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
-# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
-
-pkg_pretend() {
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	if cd Intel-Linux-Processor-Microcode-Data* &>/dev/null; then
-		# new tarball format from GitHub
-		mv * ../ || die "Failed to move Intel-Linux-Processor-Microcode-Data*"
-		cd .. || die
-		rm -r Intel-Linux-Processor-Microcode-Data* || die
-	fi
-
-	mkdir intel-ucode-old || die
-	cp "${DISTDIR}"/intel-ucode-sig_0x406e3-rev_0xd6.bin "${S}"/intel-ucode-old/ || die
-
-	# Prevent "invalid file format" errors from iucode_tool
-	rm -f "${S}"/intel-ucod*/list || die
-}
-
-src_install() {
-	# This will take ALL of the upstream microcode sources:
-	# - microcode.dat
-	# - intel-ucode/
-	# In some cases, they have not contained the same content (eg the directory has newer stuff).
-	MICROCODE_SRC=(
-		"${S}"/intel-ucode/
-		"${S}"/intel-ucode-with-caveats/
-		"${S}"/intel-ucode-old/
-	)
-
-	# Allow users who are scared about microcode updates not included in Intel's official
-	# microcode tarball to opt-out and comply with Intel marketing
-	if ! use vanilla; then
-		MICROCODE_SRC+=( "${S}"/intel-microcode-collection-${COLLECTION_SNAPSHOT} )
-	fi
-
-	# These will carry into pkg_preinst via env saving.
-	: ${MICROCODE_BLACKLIST=${MICROCODE_BLACKLIST_DEFAULT}}
-	: ${MICROCODE_SIGNATURES=${MICROCODE_SIGNATUES_DEFAULT}}
-
-	opts=(
-		${MICROCODE_BLACKLIST}
-		${MICROCODE_SIGNATURES}
-		# be strict about what we are doing
-		--overwrite
-		--strict-checks
-		--no-ignore-broken
-		# we want to install latest version
-		--no-downgrade
-		# show everything we find
-		--list-all
-		# show what we selected
-		--list
-	)
-
-	# The earlyfw cpio needs to be in /boot because it must be loaded before
-	# rootfs is mounted.
-	use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED}/boot/intel-uc.img" )
-
-	keepdir /lib/firmware/intel-ucode
-	opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
-
-	iucode_tool \
-		"${opts[@]}" \
-		"${MICROCODE_SRC[@]}" \
-		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
-
-	dodoc releasenote.md
-}
-
-pkg_preinst() {
-	if [[ ${MICROCODE_BLACKLIST} != ${MICROCODE_BLACKLIST_DEFAULT} ]]; then
-		ewarn "MICROCODE_BLACKLIST is set to \"${MICROCODE_BLACKLIST}\" instead of default \"${MICROCODE_BLACKLIST_DEFAULT}\". You are on your own!"
-	fi
-
-	if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-		ewarn "Package was created using advanced options:"
-		ewarn "MICROCODE_SIGNATURES is set to \"${MICROCODE_SIGNATURES}\" instead of default \"${MICROCODE_SIGNATURES_DEFAULT}\"!"
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && mount-boot_pkg_preinst
-
-	local _initramfs_file="${ED}/boot/intel-uc.img"
-
-	if use hostonly; then
-		# While this output looks redundant we do this check to detect
-		# rare cases where iucode_tool was unable to detect system's processor(s).
-		local _detected_processors=$(iucode_tool --scan-system 2>&1)
-		if [[ -z "${_detected_processors}" ]]; then
-			ewarn "Looks like iucode_tool was unable to detect any processor!"
-		else
-			einfo "Only installing ucode(s) for ${_detected_processors#iucode_tool: system has } due to USE=hostonly ..."
-		fi
-
-		opts=(
-			--scan-system
-			# be strict about what we are doing
-			--overwrite
-			--strict-checks
-			--no-ignore-broken
-			# we want to install latest version
-			--no-downgrade
-			# show everything we find
-			--list-all
-			# show what we selected
-			--list
-		)
-
-		# The earlyfw cpio needs to be in /boot because it must be loaded before
-		# rootfs is mounted.
-		use initramfs && opts+=( --write-earlyfw=${_initramfs_file} )
-
-		if use split-ucode; then
-			opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
-		fi
-
-		opts+=( "${ED}/lib/firmware/intel-ucode-temp" )
-
-		mv "${ED}"/lib/firmware/intel-ucode{,-temp} || die
-		keepdir /lib/firmware/intel-ucode
-
-		iucode_tool "${opts[@]}" || die "iucode_tool ${opts[@]}"
-
-		rm -r "${ED}"/lib/firmware/intel-ucode-temp || die
-
-	elif ! use split-ucode; then # hostonly disabled
-		rm -r "${ED}"/lib/firmware/intel-ucode || die
-	fi
-
-	# Because it is possible that this package will install not one single file
-	# due to user selection which is still somehow unexpected we add the following
-	# check to inform user so that the user has at least a chance to detect
-	# a problem/invalid select.
-	local _has_installed_something=
-	if use initramfs && [[ -s "${_initramfs_file}" ]]; then
-		_has_installed_something="yes"
-	elif use split-ucode; then
-		_has_installed_something=$(find "${ED}/lib/firmware/intel-ucode" -maxdepth 0 -not -empty -exec echo yes \;)
-	fi
-
-	if use hostonly && [[ -n "${_has_installed_something}" ]]; then
-		elog "You only installed ucode(s) for all currently available (=online)"
-		elog "processor(s). Remember to re-emerge this package whenever you"
-		elog "change the system's processor model."
-		elog ""
-	elif [[ -z "${_has_installed_something}" ]]; then
-		ewarn "WARNING:"
-		if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-			ewarn "No ucode was installed! Because you have created this package"
-			ewarn "using MICROCODE_SIGNATURES variable please double check if you"
-			ewarn "have an invalid select."
-			ewarn "It's rare but it is also possible that just no ucode update"
-			ewarn "is available for your processor(s). In this case it is safe"
-			ewarn "to ignore this warning."
-		else
-			ewarn "No ucode was installed! It's rare but it is also possible"
-			ewarn "that just no ucode update is available for your processor(s)."
-			ewarn "In this case it is safe to ignore this warning."
-		fi
-
-		ewarn ""
-
-		if use hostonly; then
-			ewarn "Unset \"hostonly\" USE flag to install all available ucodes."
-			ewarn ""
-		fi
-	fi
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/intel-uc.img!
-	use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postrm
-}
-
-pkg_postinst() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postinst
-
-	# We cannot give detailed information if user is affected or not:
-	# If MICROCODE_BLACKLIST wasn't modified, user can still use MICROCODE_SIGNATURES
-	# to to force a specific, otherwise blacklisted, microcode. So we
-	# only show a generic warning based on running kernel version:
-	if kernel_is -lt 4 14 34; then
-		ewarn "${P} contains microcode updates which require"
-		ewarn "additional kernel patches which aren't yet included in kernel <4.14.34."
-		ewarn "Loading such a microcode through kernel interface from an unpatched kernel"
-		ewarn "can crash your system!"
-		ewarn ""
-		ewarn "Those microcodes are blacklisted per default. However, if you have altered"
-		ewarn "MICROCODE_BLACKLIST or MICROCODE_SIGNATURES, you maybe have unintentionally"
-		ewarn "re-enabled those microcodes...!"
-		ewarn ""
-		ewarn "Check \"${EROOT}/usr/share/doc/${PN}-*/releasenot*\" if your microcode update"
-		ewarn "requires additional kernel patches or not."
-	fi
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20210216_p20210514.ebuild b/sys-firmware/intel-microcode/intel-microcode-20210216_p20210514.ebuild
deleted file mode 100644
index adfb7ec7e6a4..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20210216_p20210514.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit linux-info toolchain-funcs mount-boot
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# https://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-COLLECTION_SNAPSHOT="${PV##*_p}"
-INTEL_SNAPSHOT="${PV/_p*}"
-#NUM="28087"
-#https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}
-#https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}.tgz
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/"
-SRC_URI="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-${INTEL_SNAPSHOT}.tar.gz
-	https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin
-	https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="hostonly initramfs +split-ucode vanilla"
-REQUIRED_USE="|| ( initramfs split-ucode )"
-
-BDEPEND=">=sys-apps/iucode_tool-2.3"
-
-# !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
-RDEPEND="hostonly? ( sys-apps/iucode_tool )"
-
-RESTRICT="binchecks strip"
-
-S=${WORKDIR}
-
-# Blacklist bad microcode here.
-# 0x000406f1 aka 06-4f-01 aka CPUID 406F1 require newer microcode loader
-MICROCODE_BLACKLIST_DEFAULT="-s !0x000406f1"
-
-# https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/issues/31
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00dc"
-
-# https://bugs.gentoo.org/722768
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00da"
-
-# https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/commit/49bb67f32a2e3e631ba1a9a73da1c52e1cac7fd9
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000806c1,0x80,eq:0x0068"
-
-# In case we want to set some defaults ...
-MICROCODE_SIGNATURES_DEFAULT=""
-
-# Advanced users only!
-# Set MIRCOCODE_SIGNATURES to merge with:
-# only current CPU: MICROCODE_SIGNATURES="-S"
-# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
-# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
-
-pkg_pretend() {
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	if cd Intel-Linux-Processor-Microcode-Data* &>/dev/null; then
-		# new tarball format from GitHub
-		mv * ../ || die "Failed to move Intel-Linux-Processor-Microcode-Data*"
-		cd .. || die
-		rm -r Intel-Linux-Processor-Microcode-Data* || die
-	fi
-
-	mkdir intel-ucode-old || die
-	cp "${DISTDIR}"/intel-ucode-sig_0x406e3-rev_0xd6.bin "${S}"/intel-ucode-old/ || die
-
-	# Prevent "invalid file format" errors from iucode_tool
-	rm -f "${S}"/intel-ucod*/list || die
-}
-
-src_install() {
-	# This will take ALL of the upstream microcode sources:
-	# - microcode.dat
-	# - intel-ucode/
-	# In some cases, they have not contained the same content (eg the directory has newer stuff).
-	MICROCODE_SRC=(
-		"${S}"/intel-ucode/
-		"${S}"/intel-ucode-with-caveats/
-		"${S}"/intel-ucode-old/
-	)
-
-	# Allow users who are scared about microcode updates not included in Intel's official
-	# microcode tarball to opt-out and comply with Intel marketing
-	if ! use vanilla; then
-		MICROCODE_SRC+=( "${S}"/intel-microcode-collection-${COLLECTION_SNAPSHOT} )
-	fi
-
-	# These will carry into pkg_preinst via env saving.
-	: ${MICROCODE_BLACKLIST=${MICROCODE_BLACKLIST_DEFAULT}}
-	: ${MICROCODE_SIGNATURES=${MICROCODE_SIGNATUES_DEFAULT}}
-
-	opts=(
-		${MICROCODE_BLACKLIST}
-		${MICROCODE_SIGNATURES}
-		# be strict about what we are doing
-		--overwrite
-		--strict-checks
-		--no-ignore-broken
-		# we want to install latest version
-		--no-downgrade
-		# show everything we find
-		--list-all
-		# show what we selected
-		--list
-	)
-
-	# The earlyfw cpio needs to be in /boot because it must be loaded before
-	# rootfs is mounted.
-	use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED}/boot/intel-uc.img" )
-
-	keepdir /lib/firmware/intel-ucode
-	opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
-
-	iucode_tool \
-		"${opts[@]}" \
-		"${MICROCODE_SRC[@]}" \
-		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
-
-	dodoc releasenote.md
-}
-
-pkg_preinst() {
-	if [[ ${MICROCODE_BLACKLIST} != ${MICROCODE_BLACKLIST_DEFAULT} ]]; then
-		ewarn "MICROCODE_BLACKLIST is set to \"${MICROCODE_BLACKLIST}\" instead of default \"${MICROCODE_BLACKLIST_DEFAULT}\". You are on your own!"
-	fi
-
-	if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-		ewarn "Package was created using advanced options:"
-		ewarn "MICROCODE_SIGNATURES is set to \"${MICROCODE_SIGNATURES}\" instead of default \"${MICROCODE_SIGNATURES_DEFAULT}\"!"
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && mount-boot_pkg_preinst
-
-	local _initramfs_file="${ED}/boot/intel-uc.img"
-
-	if use hostonly; then
-		# While this output looks redundant we do this check to detect
-		# rare cases where iucode_tool was unable to detect system's processor(s).
-		local _detected_processors=$(iucode_tool --scan-system 2>&1)
-		if [[ -z "${_detected_processors}" ]]; then
-			ewarn "Looks like iucode_tool was unable to detect any processor!"
-		else
-			einfo "Only installing ucode(s) for ${_detected_processors#iucode_tool: system has } due to USE=hostonly ..."
-		fi
-
-		opts=(
-			--scan-system
-			# be strict about what we are doing
-			--overwrite
-			--strict-checks
-			--no-ignore-broken
-			# we want to install latest version
-			--no-downgrade
-			# show everything we find
-			--list-all
-			# show what we selected
-			--list
-		)
-
-		# The earlyfw cpio needs to be in /boot because it must be loaded before
-		# rootfs is mounted.
-		use initramfs && opts+=( --write-earlyfw=${_initramfs_file} )
-
-		if use split-ucode; then
-			opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
-		fi
-
-		opts+=( "${ED}/lib/firmware/intel-ucode-temp" )
-
-		mv "${ED}"/lib/firmware/intel-ucode{,-temp} || die
-		keepdir /lib/firmware/intel-ucode
-
-		iucode_tool "${opts[@]}" || die "iucode_tool ${opts[@]}"
-
-		rm -r "${ED}"/lib/firmware/intel-ucode-temp || die
-
-	elif ! use split-ucode; then # hostonly disabled
-		rm -r "${ED}"/lib/firmware/intel-ucode || die
-	fi
-
-	# Because it is possible that this package will install not one single file
-	# due to user selection which is still somehow unexpected we add the following
-	# check to inform user so that the user has at least a chance to detect
-	# a problem/invalid select.
-	local _has_installed_something=
-	if use initramfs && [[ -s "${_initramfs_file}" ]]; then
-		_has_installed_something="yes"
-	elif use split-ucode; then
-		_has_installed_something=$(find "${ED}/lib/firmware/intel-ucode" -maxdepth 0 -not -empty -exec echo yes \;)
-	fi
-
-	if use hostonly && [[ -n "${_has_installed_something}" ]]; then
-		elog "You only installed ucode(s) for all currently available (=online)"
-		elog "processor(s). Remember to re-emerge this package whenever you"
-		elog "change the system's processor model."
-		elog ""
-	elif [[ -z "${_has_installed_something}" ]]; then
-		ewarn "WARNING:"
-		if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-			ewarn "No ucode was installed! Because you have created this package"
-			ewarn "using MICROCODE_SIGNATURES variable please double check if you"
-			ewarn "have an invalid select."
-			ewarn "It's rare but it is also possible that just no ucode update"
-			ewarn "is available for your processor(s). In this case it is safe"
-			ewarn "to ignore this warning."
-		else
-			ewarn "No ucode was installed! It's rare but it is also possible"
-			ewarn "that just no ucode update is available for your processor(s)."
-			ewarn "In this case it is safe to ignore this warning."
-		fi
-
-		ewarn ""
-
-		if use hostonly; then
-			ewarn "Unset \"hostonly\" USE flag to install all available ucodes."
-			ewarn ""
-		fi
-	fi
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/intel-uc.img!
-	use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postrm
-}
-
-pkg_postinst() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postinst
-
-	# We cannot give detailed information if user is affected or not:
-	# If MICROCODE_BLACKLIST wasn't modified, user can still use MICROCODE_SIGNATURES
-	# to to force a specific, otherwise blacklisted, microcode. So we
-	# only show a generic warning based on running kernel version:
-	if kernel_is -lt 4 14 34; then
-		ewarn "${P} contains microcode updates which require"
-		ewarn "additional kernel patches which aren't yet included in kernel <4.14.34."
-		ewarn "Loading such a microcode through kernel interface from an unpatched kernel"
-		ewarn "can crash your system!"
-		ewarn ""
-		ewarn "Those microcodes are blacklisted per default. However, if you have altered"
-		ewarn "MICROCODE_BLACKLIST or MICROCODE_SIGNATURES, you maybe have unintentionally"
-		ewarn "re-enabled those microcodes...!"
-		ewarn ""
-		ewarn "Check \"${EROOT}/usr/share/doc/${PN}-*/releasenot*\" if your microcode update"
-		ewarn "requires additional kernel patches or not."
-	fi
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20210608_p20210608.ebuild b/sys-firmware/intel-microcode/intel-microcode-20210608_p20210608.ebuild
deleted file mode 100644
index adfb7ec7e6a4..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20210608_p20210608.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit linux-info toolchain-funcs mount-boot
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# https://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-COLLECTION_SNAPSHOT="${PV##*_p}"
-INTEL_SNAPSHOT="${PV/_p*}"
-#NUM="28087"
-#https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}
-#https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}.tgz
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/"
-SRC_URI="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-${INTEL_SNAPSHOT}.tar.gz
-	https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin
-	https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="hostonly initramfs +split-ucode vanilla"
-REQUIRED_USE="|| ( initramfs split-ucode )"
-
-BDEPEND=">=sys-apps/iucode_tool-2.3"
-
-# !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
-RDEPEND="hostonly? ( sys-apps/iucode_tool )"
-
-RESTRICT="binchecks strip"
-
-S=${WORKDIR}
-
-# Blacklist bad microcode here.
-# 0x000406f1 aka 06-4f-01 aka CPUID 406F1 require newer microcode loader
-MICROCODE_BLACKLIST_DEFAULT="-s !0x000406f1"
-
-# https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/issues/31
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00dc"
-
-# https://bugs.gentoo.org/722768
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00da"
-
-# https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/commit/49bb67f32a2e3e631ba1a9a73da1c52e1cac7fd9
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000806c1,0x80,eq:0x0068"
-
-# In case we want to set some defaults ...
-MICROCODE_SIGNATURES_DEFAULT=""
-
-# Advanced users only!
-# Set MIRCOCODE_SIGNATURES to merge with:
-# only current CPU: MICROCODE_SIGNATURES="-S"
-# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
-# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
-
-pkg_pretend() {
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	if cd Intel-Linux-Processor-Microcode-Data* &>/dev/null; then
-		# new tarball format from GitHub
-		mv * ../ || die "Failed to move Intel-Linux-Processor-Microcode-Data*"
-		cd .. || die
-		rm -r Intel-Linux-Processor-Microcode-Data* || die
-	fi
-
-	mkdir intel-ucode-old || die
-	cp "${DISTDIR}"/intel-ucode-sig_0x406e3-rev_0xd6.bin "${S}"/intel-ucode-old/ || die
-
-	# Prevent "invalid file format" errors from iucode_tool
-	rm -f "${S}"/intel-ucod*/list || die
-}
-
-src_install() {
-	# This will take ALL of the upstream microcode sources:
-	# - microcode.dat
-	# - intel-ucode/
-	# In some cases, they have not contained the same content (eg the directory has newer stuff).
-	MICROCODE_SRC=(
-		"${S}"/intel-ucode/
-		"${S}"/intel-ucode-with-caveats/
-		"${S}"/intel-ucode-old/
-	)
-
-	# Allow users who are scared about microcode updates not included in Intel's official
-	# microcode tarball to opt-out and comply with Intel marketing
-	if ! use vanilla; then
-		MICROCODE_SRC+=( "${S}"/intel-microcode-collection-${COLLECTION_SNAPSHOT} )
-	fi
-
-	# These will carry into pkg_preinst via env saving.
-	: ${MICROCODE_BLACKLIST=${MICROCODE_BLACKLIST_DEFAULT}}
-	: ${MICROCODE_SIGNATURES=${MICROCODE_SIGNATUES_DEFAULT}}
-
-	opts=(
-		${MICROCODE_BLACKLIST}
-		${MICROCODE_SIGNATURES}
-		# be strict about what we are doing
-		--overwrite
-		--strict-checks
-		--no-ignore-broken
-		# we want to install latest version
-		--no-downgrade
-		# show everything we find
-		--list-all
-		# show what we selected
-		--list
-	)
-
-	# The earlyfw cpio needs to be in /boot because it must be loaded before
-	# rootfs is mounted.
-	use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED}/boot/intel-uc.img" )
-
-	keepdir /lib/firmware/intel-ucode
-	opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
-
-	iucode_tool \
-		"${opts[@]}" \
-		"${MICROCODE_SRC[@]}" \
-		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
-
-	dodoc releasenote.md
-}
-
-pkg_preinst() {
-	if [[ ${MICROCODE_BLACKLIST} != ${MICROCODE_BLACKLIST_DEFAULT} ]]; then
-		ewarn "MICROCODE_BLACKLIST is set to \"${MICROCODE_BLACKLIST}\" instead of default \"${MICROCODE_BLACKLIST_DEFAULT}\". You are on your own!"
-	fi
-
-	if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-		ewarn "Package was created using advanced options:"
-		ewarn "MICROCODE_SIGNATURES is set to \"${MICROCODE_SIGNATURES}\" instead of default \"${MICROCODE_SIGNATURES_DEFAULT}\"!"
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && mount-boot_pkg_preinst
-
-	local _initramfs_file="${ED}/boot/intel-uc.img"
-
-	if use hostonly; then
-		# While this output looks redundant we do this check to detect
-		# rare cases where iucode_tool was unable to detect system's processor(s).
-		local _detected_processors=$(iucode_tool --scan-system 2>&1)
-		if [[ -z "${_detected_processors}" ]]; then
-			ewarn "Looks like iucode_tool was unable to detect any processor!"
-		else
-			einfo "Only installing ucode(s) for ${_detected_processors#iucode_tool: system has } due to USE=hostonly ..."
-		fi
-
-		opts=(
-			--scan-system
-			# be strict about what we are doing
-			--overwrite
-			--strict-checks
-			--no-ignore-broken
-			# we want to install latest version
-			--no-downgrade
-			# show everything we find
-			--list-all
-			# show what we selected
-			--list
-		)
-
-		# The earlyfw cpio needs to be in /boot because it must be loaded before
-		# rootfs is mounted.
-		use initramfs && opts+=( --write-earlyfw=${_initramfs_file} )
-
-		if use split-ucode; then
-			opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
-		fi
-
-		opts+=( "${ED}/lib/firmware/intel-ucode-temp" )
-
-		mv "${ED}"/lib/firmware/intel-ucode{,-temp} || die
-		keepdir /lib/firmware/intel-ucode
-
-		iucode_tool "${opts[@]}" || die "iucode_tool ${opts[@]}"
-
-		rm -r "${ED}"/lib/firmware/intel-ucode-temp || die
-
-	elif ! use split-ucode; then # hostonly disabled
-		rm -r "${ED}"/lib/firmware/intel-ucode || die
-	fi
-
-	# Because it is possible that this package will install not one single file
-	# due to user selection which is still somehow unexpected we add the following
-	# check to inform user so that the user has at least a chance to detect
-	# a problem/invalid select.
-	local _has_installed_something=
-	if use initramfs && [[ -s "${_initramfs_file}" ]]; then
-		_has_installed_something="yes"
-	elif use split-ucode; then
-		_has_installed_something=$(find "${ED}/lib/firmware/intel-ucode" -maxdepth 0 -not -empty -exec echo yes \;)
-	fi
-
-	if use hostonly && [[ -n "${_has_installed_something}" ]]; then
-		elog "You only installed ucode(s) for all currently available (=online)"
-		elog "processor(s). Remember to re-emerge this package whenever you"
-		elog "change the system's processor model."
-		elog ""
-	elif [[ -z "${_has_installed_something}" ]]; then
-		ewarn "WARNING:"
-		if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-			ewarn "No ucode was installed! Because you have created this package"
-			ewarn "using MICROCODE_SIGNATURES variable please double check if you"
-			ewarn "have an invalid select."
-			ewarn "It's rare but it is also possible that just no ucode update"
-			ewarn "is available for your processor(s). In this case it is safe"
-			ewarn "to ignore this warning."
-		else
-			ewarn "No ucode was installed! It's rare but it is also possible"
-			ewarn "that just no ucode update is available for your processor(s)."
-			ewarn "In this case it is safe to ignore this warning."
-		fi
-
-		ewarn ""
-
-		if use hostonly; then
-			ewarn "Unset \"hostonly\" USE flag to install all available ucodes."
-			ewarn ""
-		fi
-	fi
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/intel-uc.img!
-	use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postrm
-}
-
-pkg_postinst() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postinst
-
-	# We cannot give detailed information if user is affected or not:
-	# If MICROCODE_BLACKLIST wasn't modified, user can still use MICROCODE_SIGNATURES
-	# to to force a specific, otherwise blacklisted, microcode. So we
-	# only show a generic warning based on running kernel version:
-	if kernel_is -lt 4 14 34; then
-		ewarn "${P} contains microcode updates which require"
-		ewarn "additional kernel patches which aren't yet included in kernel <4.14.34."
-		ewarn "Loading such a microcode through kernel interface from an unpatched kernel"
-		ewarn "can crash your system!"
-		ewarn ""
-		ewarn "Those microcodes are blacklisted per default. However, if you have altered"
-		ewarn "MICROCODE_BLACKLIST or MICROCODE_SIGNATURES, you maybe have unintentionally"
-		ewarn "re-enabled those microcodes...!"
-		ewarn ""
-		ewarn "Check \"${EROOT}/usr/share/doc/${PN}-*/releasenot*\" if your microcode update"
-		ewarn "requires additional kernel patches or not."
-	fi
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20220809_p20220809.ebuild b/sys-firmware/intel-microcode/intel-microcode-20220809_p20220809.ebuild
index 4171888a5826..426180b0a1f1 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20220809_p20220809.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20220809_p20220809.ebuild
@@ -56,6 +56,17 @@ MICROCODE_SIGNATURES_DEFAULT=""
 # only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
 # exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
 
+# Package Maintenance instructions :
+# 1. The ebuild is in the form of intel-microcode-<INTEL_SNAPSHOT>_p<COLLECTION_SNAPSHOT>.ebuild
+# 2. The INTEL_SNAPSHOT upstream is located at: https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files\
+# 3. The COLLECTION_SNAPSHOT is created manually using the following steps:
+#   a. Clone the repository https://github.com/platomav/CPUMicrocodes
+#   b. Rename the Intel directory to intel-microcode-collection-<YYYYMMDD>
+#   c. From the CPUMicrocodes directory tar and xz compress the contents of intel-microcode-collection-<YYYYMMDD>:
+#      tar -cJf intel-microcode-collection-<YYYYMMDD>.tar.xz intel-microcode-collection-<YYYYMMDD>/
+#   d. This file can go in your devspace, add the URL to SRC_URI if it's not there
+#      https://dev.gentoo.org/~<dev nick>/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz
+
 pkg_pretend() {
 	use initramfs && mount-boot_pkg_pretend
 }
@@ -76,6 +87,8 @@ src_prepare() {
 	# Prevent "invalid file format" errors from iucode_tool
 	rm -f "${S}"/intel-ucod*/list || die
 
+	# Remove non-microcode file from list
+	rm -f "${S}"/intel-ucode/LICENSE
 }
 
 src_install() {
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index a18c14ad2ae6..ff34d40c73b5 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/inotify-tools/Manifest b/sys-fs/inotify-tools/Manifest
index 5ea97fe150a1..74f715c88cbb 100644
--- a/sys-fs/inotify-tools/Manifest
+++ b/sys-fs/inotify-tools/Manifest
@@ -1,4 +1,4 @@
 AUX inotify-tools-3.22.6.0-musl.patch 827 BLAKE2B 499aa4517af0ae2eb4d59e9f9128e49a76a8551a03f59b32e8e31d42d3e77d8720eab43d14553daac4ef42cd8e67cefc7ee1c1ff5108c17976d7cfe72683ecf3 SHA512 9af49e57302b76d1bcd807846a3e660a4ed342de0767549a572a51a072da8d00b87069e7ef81ca55f7a900b6c226eefb5f1f440161f7811c26d976bfa4526075
 DIST inotify-tools-3.22.6.0.tar.gz 92918 BLAKE2B 601d3ac6896e445d297a04498c63df4f81c59699ba2d5b2eee2e8c499332913ce2783d13c9906d577ff0b6d7ef91ca826d48b01674adeb3d3569dfc1fbc0df63 SHA512 cda445add4b9d80b70eff9189ed50d05f4b5593a755159d0354431166c6fe6fdb33f7bf37fd50bc09aad3ed0a6e3763b9c74f65e554400f2596b8d492f1d0a21
 EBUILD inotify-tools-3.22.6.0.ebuild 881 BLAKE2B 189a11983d852452cc14f367ccc1ec84415e5e98358a0f3f62559d9baa60665d7424ca74c2d0b4bff65468ff92898bb6387342f3015be7bb0f995857d8186fec SHA512 46c04f360cc989de8193dc2d8b7f78594cb6ac40a7c908c8ba341810d4db7e07c0303b357b7a24f1fde42b59f4e6bc0cb81f997e8eec91cad5f2b831c27edc60
-MISC metadata.xml 644 BLAKE2B faa84a2101847409fcc82427dcbcd1ac7ec4073ee044e970b3f4c65bc1c28484ab4266cdfc4dc4e3980ee1c384186e308d210d02304788d63ccc1b4f54dd5ac8 SHA512 ba77f381e79379995ff395e82c65dacfe9bc3c621d38201bea7ebaac76911aa2de5d472a486e22a5ddbf79565e8d88ea14707d8e5f4abbc7dad8bce3b1e0f05d
+MISC metadata.xml 590 BLAKE2B 6e50ca7a9b47cfe8bf97f73cb62c7e9f99d21c7687989a224136a38c075242f02386e14e5fc6d4e7216f9e44be32711005a2f366f2c26db02a900c6c5a852adf SHA512 a17f9f5e0b397c00f290e476ba9c40466149a40bb0bdbab9b75a726518ee413efc6fd64a13f2be5baf5f651c5a09a1f736c194122e5b3b81377d542b21cf925d
diff --git a/sys-fs/inotify-tools/metadata.xml b/sys-fs/inotify-tools/metadata.xml
index b5ef777a11d5..5a392e4fedd5 100644
--- a/sys-fs/inotify-tools/metadata.xml
+++ b/sys-fs/inotify-tools/metadata.xml
@@ -11,7 +11,6 @@ interface to inotify. These programs can be used to monitor and act upon
 filesystem events. Requires a Linux kernel supporting inotify.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">rvoicilas/inotify-tools</remote-id>
-		<remote-id type="sourceforge">inotify-tools</remote-id>
+		<remote-id type="github">inotify-tools/inotify-tools</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 1edc28d49976..d5c2ec0ccc8c 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index e5869e834551..fbebbc1908a3 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -7,18 +7,19 @@ DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab30
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST patch-4.14.290.xz 4840940 BLAKE2B 0f799c4b4deeac7ae4b7e16fdf62e46ee066a50d210c5bf7fb44acec872f4605f3d223314c3de192151dbfa5aa80baf1a96db28d5dbf677d933ee3e88e73916f SHA512 43cd1ae942a35e93aa9bb0908b3487b690cf56a0a2c611505a386019c82cfaaa41d9d50c92ebb7d173ec034ac06f10349b6b24a0f5b0a37730531c328daeb18a
-DIST patch-4.19.254.xz 4772260 BLAKE2B 2479d9917d447db6aec55627cf1a3f96d7947ded724467e5bcd18a9a3341e39a55dfe2603b4138b961c8c01047ed61944e314dd029780d49581e33009634e2ad SHA512 3e4fd2c26fd3cd9826915afae8a083a32c5a4921559a839efd23fb42aabdac2b0892963469268a691236a147e002858343b2bce62f641103f2280a49febb5c37
+DIST patch-4.19.255.xz 4776772 BLAKE2B 65f0dd0d52db82c58f73a3407fe15ae38be0ef690aea391ad9e2b21330e94b02a1f38a802ff9a8c3ec424a27a0e23ab85a8e2282b93262cd21e7ece1094f4aca SHA512 e0a797ae95e0cc7bc52e7e8fa8b42ec11cb88353519a22868fb52447dd804daf759d0c4df5cfd6a02464ca145569fb119b22fd894f3cd4baf950db505708fa6b
 DIST patch-4.9.325.xz 4429432 BLAKE2B cd67bc408aac069e89ea26d29cea69745dfabaca24d875323f4354204472e70389c0e0bdfac4966a11892b626088668bf7a1d6a7a6e355550806cca102699e38 SHA512 8e673fa0f2f69cde042e781fa9b2e6940e91faad8c5503ff5eae021680a1c6eb40f3a516fbb6728298887ad22fbbf50894b6a0b039672118f27d3200d45d7749
-DIST patch-5.10.135.xz 3499672 BLAKE2B 683f493a9f019a7abbfb250b1ea6460823eac74c8ce2575ff674ddb749936c84f81375b2b00c6fc75368894f32716907694f0ed15d49d5903c67286661ccd946 SHA512 2d32778854601b16a0b7b788fa04bf67eaf29438f819a1b77fffca1051068cd4f13547c35465e86ec0d0eeb480880089425de2f07a360a85afe7bf9add5135a8
-DIST patch-5.15.59.xz 2347456 BLAKE2B 15f20ca2a4cc92239b039ef4177930bdcc1535f7a899aa0e6029b5e8e5fcfdbc955257e8ccb9603da0016b2c0ca0e9a7338e6b8c21421cc884513dcccd0cdd8e SHA512 b0cd7feb200cf145581164a435120019e2c4eb0ab7fd0725bdb6a97ad7523dbbfc550639baeebe2201d6d534b772eefc920fdd494a2c190b6e96d4c3fefbe310
-DIST patch-5.18.16.xz 754004 BLAKE2B 61d35f76ce01e5f2f61f185cc989ddd3337deb6de28a3a95d2c1013b2cb30be5d2edd6cccc05e74769c9edd9072d6e6f90662ee5a7ed5ce42658a0189b043c2d SHA512 86b9fcaf7d441b5185730be480211c1e819f16077e65b7324e13ffcbb506bc9f92cffbf1b79dc65b1b2fab80ccdb071a78e581f4fbd484283c2765901ba296f6
-DIST patch-5.4.209.xz 4137436 BLAKE2B 97a20293ac37a7e9b1512a153da1937b0f457e3b262abff0fca39e3d2c6f0cd3371dbfdb9d0c98d2ab1d3770b963e541a9e0e1bf80ac37869a6dcbcfbf3d7ee9 SHA512 e67118e2a5fa5b9e280e2f2e3541c5eca4fe282492c5314ad0344b39dff3e796ad69ebe31c7a5f47a291986520191622d83c96110eafd562b85603833d9ced66
+DIST patch-5.10.136.xz 3504576 BLAKE2B ac5dc05f739fa047f4d16ea3679f93f04a4cfe98914079b2818bc07b4dc23d9f9d4e2c28baa5b363dc0568b5ac8b4f0f3b20cc939cfb5d50a0e294595dfcfa9c SHA512 86fa57dbe9a1e29ea5acf01a2a587a3f8343738eb2d1194cc18ee870ec4d212a5ac0906e451fab2a381885a5e965cf5c18a0b4d3d07f9cb6828da8a39bc66f79
+DIST patch-5.15.60.xz 2353760 BLAKE2B 5e06557a95a01bd247e54e3b31f409fee1d6c591d19efb67e95ca68ca98488e61dd2488a4ba0ffbe34d125ac86135fb3615bdd00bf246b4458ca55d048b2f8b8 SHA512 8f23e320df73d8a22a848408a1e77cb88f4f197cd0317661df79f9631898341fb9b9469f8fa0ca981a15fa740aab7212fa71dea6cc0f3e61e059b5adcbf75c9d
+DIST patch-5.18.17.xz 762484 BLAKE2B b98b5b2e67d852d247c42786f08c3bbe2a1bcf06730f113ae10eb4edc710f785151685a00a66977432e6c17de93a37d8896ad848c05ddcb40622948bb2fa2b68 SHA512 438b0bb1542fb7446458b19977447f0f35d276ee8decf7f55af8df21570d7c9429c03fe0e80b1251ec12808babbb50b8c3d9e19e9310bfcb1169a6e731672568
+DIST patch-5.19.1.xz 7644 BLAKE2B e0e31aa647bd6e5bbd62e7469f62718362c1d7434dd658de30e79a14dc009b64e748b81939ab9999ae6369149cb13e1e75dff3da0c8800a9780260e6d1df7b22 SHA512 a61c71c6fb935b4b256ff3cbdfdaba502af98f2b4b905dfc8f669aae502049bb4b44eb08e362cd6108e17190343e4cc6f39474b1a62287756401b359205708db
+DIST patch-5.4.210.xz 4141780 BLAKE2B 98be2ae87a3e14fcc4b7ef8af4929fd758c9e1af6315e0fb38c9077f3c4d360c93b1b1d4f3b60cd254b31756287628cefcd48be17c43245f3eb719e0e77d6663 SHA512 c0ba445375c213bb1eacdc9a172d7002658cdeb1351f711a44548b00b8f8156c36e4deaad64ddeddc28f07ebef607d97dfc5b984fced772064c066f1e9d196ef
 EBUILD vanilla-sources-4.14.290.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-4.19.254.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-4.19.255.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 EBUILD vanilla-sources-4.9.325.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.10.135.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.15.59.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.18.16.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.19.0.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.4.209.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.10.136.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.15.60.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.18.17.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.19.1.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.4.210.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 MISC metadata.xml 340 BLAKE2B e283ab9d2ebb7212e3ba37850c93761f165b4697a2ee6dbf07a67ce907df8ec71b3290a411cb81af8d8d8869b7e45c572487d4d2667dc0a0971986f0f6d1aa8e SHA512 bd0f7f570230dd5bd9f6e270345a3ebc556eb2dbcd19b04e33b5c6df8d9e6735a6e23fe934b39d9ef130ab5e78c6fdd29d7a167cb8ee4ac8ce919c75cec7425c
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.254.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.255.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.19.254.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.19.255.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.135.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.136.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.10.135.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.10.136.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.15.59.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.15.60.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.15.59.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.15.60.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.18.16.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.18.17.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.18.16.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.18.17.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.19.0.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.19.1.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.19.0.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.19.1.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.209.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.210.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.4.209.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.4.210.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 791fb70e6f7f..427aa37a86c0 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index a4b6ea46e470..5860d5c590bb 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -10,10 +10,13 @@ DIST binutils-2.37_p1.tar.xz 22992196 BLAKE2B a8aa0f386d03a5b1466166ac7c40989c22
 DIST binutils-2.38-patches-3.tar.xz 189068 BLAKE2B 5b14c90ab7dba253e92ad57b3a702fcbf48739dd0121ce8f739d88331da820ce44c35e16ac4bee394525c3a46bce980e9e1bbf4cbc9ce8a14fc324bc8fa059e7 SHA512 099266a8ef4272fd7f7552071e1892d114ed564a38b700df32e058ed691c6bfcd6f2454f649461f9c36594ea819a35d1e4cd2418609a2407be2a4f8885e500e3
 DIST binutils-2.38-patches-4.tar.xz 193852 BLAKE2B 5a83e20008e58464ed563a6817a367e50684c59d08c47345cc546054269c42463d1651441720f865851e4e182e917df1a095c68e64226e0351b64e975d524096 SHA512 6657e547bb02898632cc45a8f1894be098aa7472b6725b65f95393e621abb127e468b4e50310720bf03f7e8d0a68bc2c47af76fc43aaa8f32b2e4a149c0c6290
 DIST binutils-2.38.tar.xz 23651408 BLAKE2B 19ede396ec97b88e632aded2f69f4684cc5053109e06c3c4a1934944e3f0ceaa9e4a2604528a440189771f778cb5d75edd510163970eeea31afba87fa256feba SHA512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d
+DIST binutils-2.39-patches-3.tar.xz 57332 BLAKE2B 08bdcd35afb6310c5f61e8a93f60c624ff461a612d8b473b2cfc1d8eb94eedb311af0b39b5f8ac425f3676d8e1addd13a4b223983de2f6d579e50daec08d3881 SHA512 f8a1a908866637a39a3ad55d47304f3320ab663d299d8d231a873008a50bb2a09c89a2482394c017a2a73c2cfc48ed944e99b422fd5db19f829e45ff071bb659
+DIST binutils-2.39.tar.xz 25167756 BLAKE2B ac6a5296c6586d53eaadcbffc5c399a6d79edf72450b9bb8b3525ce525129cef3d2eb90c85ef3bb3270b5a03b0e1ffb8f0b705f028158726f9777ebb8685066f SHA512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3
 EBUILD binutils-libs-2.34-r2.ebuild 3678 BLAKE2B 2ecd619f2dd9968a11a3c8c2cf8f65d30d7191163bc6fd5ae1fc7d6dfad4bb30b061e5029fc7d2a23c1b7d0a4ca142532b8175b593d9d0ac408338c39cc02e60 SHA512 3ae489fa333ea206ce758f102a56ebbde7a59fa817720503eb1287c4d1d156598cbe7bc78beb2f0ab85f6f60c32f753d4c66cb0428dcbeb13d873407a4c86335
 EBUILD binutils-libs-2.35.2.ebuild 4100 BLAKE2B 521acb4f160e171efd6500aba598825f50c19b62f77689b208dcca260396aa1a2c769937db49b147a51e7645baa1fd72f13559fa15e5fced7c8bd57088575027 SHA512 628c171049d6fae374538a96ad7cc76463d78e562d16fbd5877ab7b0800b026e9c72f3b346ec2e3e92a9c5836c483e0eec226c5ac2ecc8e71c2c66c6c8c5b844
 EBUILD binutils-libs-2.36.1-r2.ebuild 4053 BLAKE2B 1d2c9609ce0fa3aff3222d89ee237ba73d31515bb0032ffd8d6b6a9a04060aec1df32cb727572a0a20b9ba64834dc43c2260f3401703cb711d0d5516e136a3d1 SHA512 e355a34921f4a260f2f61a222365703b1afc103fc993e255801a8c2deec42409ba1aec8a22d734c38a4440c385b29f81eac52c4584431ee54d0cf0cfe611ff6c
 EBUILD binutils-libs-2.37_p1-r2.ebuild 4126 BLAKE2B 63dcef180b378d47d48f714e095ff2ce98dcd027de0d176c64179fcfe1f48df5f451468fb974176ade21914f4ba731487b91b03223eba11662be17cb3b42c9c1 SHA512 c659774de8238e81669507dfd5b2a565b5deaa8c54fe12ee02f5b3b204a147b2aea5bb9a6707930d0ac3ca10225ce486f294e510402b37c99ee1f6c170c31ecc
 EBUILD binutils-libs-2.38-r1.ebuild 4530 BLAKE2B 6fbf59602ecd890921c795d31d67559da3e36790d1f2976f25a8cfd4a8c644236870cf03e843c82e6ffdd74ba2386d43ee722c7aa5a421058eabbafa3585bc7d SHA512 42253acb4cd37d34c44af701bdd3c7eeba54409601e55ef5267370ff2cd76574046d32ffbf04921b64104df73ccb0a312a282cc4cc7d1d58cfd8d6d89063b951
 EBUILD binutils-libs-2.38-r2.ebuild 4804 BLAKE2B 18f2d2553a1f524cce1133e61f9538349a645e308f0335cdcd5a37081db03b54601ac137961253044051ac0230c25a880490271e85524bbb740b7e248a719900 SHA512 42c6ad9c4b05876d1a33c5c17783cd9f93975f9b673a5e197809f08f248384944eb00d17926f296ce1490887af30df76de63b34628b37dad69b2dd1c4645bb82
+EBUILD binutils-libs-2.39.ebuild 4813 BLAKE2B ccf2083b279e1ef8807117c7d0ef9bda70ca40ec5be92c405fd409830f01cfc3a5053ba023b0eae28db2771a589440dfb01061ed99a700e3823ad6a084bd8f1c SHA512 06b2ef408444b26c030a66441375cb182a3b9de5c8a3d7e63fd093674171ec6659d8a7d7149f3bce16c5cdc6b49492ca0c4bf47b337f8e4faeb78a5ad863b44a
 MISC metadata.xml 612 BLAKE2B ceaafd9fd1421e9f3993e003d0029c92a78054c7a2b90bd78afc05370ad19c931c6a7c150545cfb7d57165168e0fdaf3a00dde1905b328826a91cbc70d9548a8 SHA512 c8d33bb8d1c62c7e95758624ed0febbc9d40e9f141bfd280837b3207bcd771412158d71c0cb5548d60be0b236f6fe103621daf7efa8875191982859b566ffa8d
diff --git a/sys-libs/binutils-libs/binutils-libs-2.39.ebuild b/sys-libs/binutils-libs/binutils-libs-2.39.ebuild
new file mode 100644
index 000000000000..68c12ebf98ac
--- /dev/null
+++ b/sys-libs/binutils-libs/binutils-libs-2.39.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCH_VER=3
+PATCH_DEV=dilfridge
+
+inherit libtool toolchain-funcs multilib-minimal
+
+MY_PN="binutils"
+MY_P="${MY_PN}-${PV}"
+PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
+PATCH_DEV=${PATCH_DEV:-dilfridge}
+
+DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
+HOMEPAGE="https://sourceware.org/binutils/"
+SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_P}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0/${PV%_p?}"
+IUSE="64-bit-bfd cet multitarget nls static-libs"
+#KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
+# Need a newer binutils-config that'll reset include/lib symlinks for us.
+RDEPEND="${DEPEND}
+	>=sys-devel/binutils-config-5
+"
+
+S="${WORKDIR}/${MY_P%_p?}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/bfd.h
+)
+
+src_prepare() {
+	if [[ -n ${PATCH_VER} ]] ; then
+		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
+		eapply "${WORKDIR}/patch"/*.patch
+	fi
+
+	# Fix cross-compile relinking issue, bug #626402
+	elibtoolize
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# somehow libtool/configure is messed up and (custom patch at
+		# upstream?) and misdetects (basically assumes) nm can be called
+		# with -B arg -- can't run eautoreconf (fails), so patch up
+		# manually, this would break any target that needs -B to nm
+		sed -i -e 's/lt_cv_path_NM="$tmp_nm -B"/lt_cv_path_NM="$tmp_nm"/' \
+			libctf/configure || die
+	fi
+
+	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
+	# Avoid really confusing logs from subconfigure spam, makes logs far
+	# more legible.
+	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
+	default
+}
+
+pkgversion() {
+	printf "Gentoo ${PVR}"
+	[[ -n ${PATCHVER} ]] && printf " p${PATCHVER}"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-obsolete
+		--enable-shared
+		--enable-threads
+		# Newer versions (>=2.24) make this an explicit option. #497268
+		--enable-install-libiberty
+		--disable-werror
+		--with-bugurl="https://bugs.gentoo.org/"
+		--with-pkgversion="$(pkgversion)"
+		$(use_enable static-libs static)
+		# The binutils eclass enables this flag for all bi-arch builds,
+		# but other tools often don't care about that support.  Put it
+		# beyond a flag if people really want it, but otherwise leave
+		# it disabled as it can slow things down on 32bit arches. #438522
+		$(use_enable 64-bit-bfd)
+		# This only disables building in the zlib subdir.
+		# For binutils itself, it'll use the system version. #591516
+		--without-zlib
+		--with-system-zlib
+		# We only care about the libs, so disable programs. #528088
+		--disable-{binutils,etc,ld,gas,gold,gprof,gprofng}
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{gdb,libdecnumber,readline,sim}
+		# Strip out broken static link flags.
+		# https://gcc.gnu.org/PR56750
+		--without-stage1-ldflags
+		# We pull in all USE-flags that change ABI in an incompatible
+		# way. #666100
+		# USE=multitarget change size of global arrays
+		# USE=64-bit-bfd changes data structures of exported API
+		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)-$(usex 64-bit-bfd 64 def)
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
+	)
+
+	# mips can't do hash-style=gnu ...
+	if [[ $(tc-arch) != mips ]] ; then
+		myconf+=( --enable-default-hash-style=gnu )
+	fi
+
+	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
+
+	use nls \
+		&& myconf+=( --without-included-gettext ) \
+		|| myconf+=( --disable-nls )
+
+	if [[ ${CHOST} == *-darwin* ]] && use nls ; then
+		# fix underlinking in opcodes
+		sed -i -e 's/@SHARED_LDFLAGS@/@SHARED_LDFLAGS@ -lintl/' \
+			"${S}"/opcodes/Makefile.in || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	# Prevent makeinfo from running as we don't build docs here.
+	# bug #622652
+	sed -i \
+		-e '/^MAKEINFO/s:=.*:= true:' \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	emake V=1
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install
+
+	# Provide libiberty.h directly.
+	dosym libiberty/libiberty.h /usr/include/libiberty.h
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}"/usr -name '*.la' -delete
+}
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 960d07d9da1d..d4770642de83 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -7,9 +7,9 @@ DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf
 DIST llvm-project-15.0.0rc2.src.tar.xz 112110968 BLAKE2B 98c3769f17f1958fbec771409eef781f5ca845363656c70fe5cd20bca1b8471e7a8773a7d4e395700c297a5f3f208fe1303cf18e2a73b45388b782fb7484106b SHA512 eee1bee1f83cc468fb4bb6839acbd5c1618dc35f35e51cd078288b91bad95d52edaadd05c88f2d72d51c1c338ba08b3346c070a28693b1224639eb7a1ef4a4d9
 DIST llvm-project-15.0.0rc2.src.tar.xz.sig 438 BLAKE2B 09f260b30724b41b27ef621929c086fd6c13bde51c4adb880897b549b2d336682f617faf3dd636ceb795e329b664972cf50745ab49f84e7540658d53074510da SHA512 9f695a309fbb15026dc133eb17d33abd26831eb036fad79dd8df37d4f4d9eeae1ca463acd037d2a1882bc2cff763e4bda507d1d827d845613bfd62d0f9fbd4ca
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
-EBUILD compiler-rt-sanitizers-13.0.1.ebuild 6337 BLAKE2B 67f5e39af19ab6e4dccb2989d044a1f148a7e3cafd7134ea7ccdc75481416158613137e3cc7204d32b3c868d00e5047c9d378f09814b8fc1e46ad876d5214423 SHA512 c49b998f5f990103e53253f22f19313e3b8e884818bdc5b651ee976957f8fa10d36ce6146b1db65336c60e4f22f67c435c5841e0f8cea48901724790d3c6738f
-EBUILD compiler-rt-sanitizers-14.0.6.ebuild 6349 BLAKE2B b4a180561b4aa22cf1af576e87a97513af4f6f5aebdf133aa39864697ef5b116b37066d115b4fd396132830127425884b3f009baf77276733ea85df76ec37008 SHA512 26220a0202faecae61933fa53a8f8c443989e0deb4b412ca7303d31a8c50aef0530802862e30f59d105136a8f38f6b55b7ffca6f33f24878cbcb798e3e17129c
-EBUILD compiler-rt-sanitizers-15.0.0.9999.ebuild 6292 BLAKE2B a0cb8f93777efbe56af67b5c79d187bfe2dfedfdbbe4bac3eaf921c7e1e7f307e6cefe5fd00afa799cda93d0538ad313009544d20182accf4a35895948bebd62 SHA512 9782e162eb492c0a03555a671ed1bea614304359afbb6a04a4f6232c1ab0f3c796e5e617e032f9213e0f430a6871a05adc1616f3aaed1e57424b8916466d85f9
-EBUILD compiler-rt-sanitizers-15.0.0_rc2.ebuild 6295 BLAKE2B 484585cdcfead216926cf70c38b35f1253bbdd69e27ee56bd62a489b8abf89c8415037f91195e7e2658fef8192374065da6b87bb1c25d75bb8ac207721f2da84 SHA512 7ec8c1747aa918d0b947745b07976b35f8dce8e8686a665a1baeb1ff0280e528db3cf694d972df18d612c480628d732c13058c28f2263b9945ee8e23a059b4cf
-EBUILD compiler-rt-sanitizers-16.0.0.9999.ebuild 6292 BLAKE2B a0cb8f93777efbe56af67b5c79d187bfe2dfedfdbbe4bac3eaf921c7e1e7f307e6cefe5fd00afa799cda93d0538ad313009544d20182accf4a35895948bebd62 SHA512 9782e162eb492c0a03555a671ed1bea614304359afbb6a04a4f6232c1ab0f3c796e5e617e032f9213e0f430a6871a05adc1616f3aaed1e57424b8916466d85f9
+EBUILD compiler-rt-sanitizers-13.0.1.ebuild 6348 BLAKE2B 694ba6bb9554d0d02993fcf2bc172fd4b9922e82df8819b1b9cec31b801b21e153e4e99ef1bec38283783e0599d52cffdd777dcddd979cdc51174e0090b23324 SHA512 cb79db99daf927f823688e3820eda0567cbb6f5b10b37d03bcc20a2c8d1c1fd5450e8d0c2452fbde0312c69a96a464896643ece2284f1107b4652e2ca79c313e
+EBUILD compiler-rt-sanitizers-14.0.6.ebuild 6360 BLAKE2B d9a3f4367e06f3caa7bd1c70c05d6a3d5d7b13a2361f062c14d674ad762e0df59cbe435dc7c922f3bf1eabf67b8f5a85e36cbf9db55a86f5a7ee2b2eccc7e5ea SHA512 4d19ae130a19735beb1d9dcbc05a650dfd13c7f1acc3aaae5eb2de6e62dcc05255a7ade50ad8fbd805b4b4ca10ff47f0c297f8e613da86c01d433f5315081b0a
+EBUILD compiler-rt-sanitizers-15.0.0.9999.ebuild 6304 BLAKE2B 652283289885a64f52faa349b888ef9c5236049cde24e2c829a0165ae634997e3ce5e3c74a5689a50f90e3a216cc4ca4fd53e45e3c7da7c7dc1ee3fafb9f0152 SHA512 94e76db007b5f71357bad2317d7088030213623037beb0a7f5ee1cf1ae7d6ff32ca592105fb56f4d9eb48844f18f4dc36e4ec972894f6cfab7ae04313f9b3365
+EBUILD compiler-rt-sanitizers-15.0.0_rc2.ebuild 6307 BLAKE2B cf4a3f87cd80251485b83cc9d19ea7a7a4a04c754fd032a4b3033420cac5276ff9f7adb62b15b68bcaa41df16abb93c58de492b05a9617f23a30f6ae5ae39bb2 SHA512 cbdfdd126901d573604c2eafeba0140744eecd2649d799c6cc30638cd2bce9503196114b8c64253971d12d276fb654ae357b9821bfea5dae96bbad31402ca495
+EBUILD compiler-rt-sanitizers-16.0.0.9999.ebuild 6304 BLAKE2B 652283289885a64f52faa349b888ef9c5236049cde24e2c829a0165ae634997e3ce5e3c74a5689a50f90e3a216cc4ca4fd53e45e3c7da7c7dc1ee3fafb9f0152 SHA512 94e76db007b5f71357bad2317d7088030213623037beb0a7f5ee1cf1ae7d6ff32ca592105fb56f4d9eb48844f18f4dc36e4ec972894f6cfab7ae04313f9b3365
 MISC metadata.xml 1412 BLAKE2B 75675507000fa6a6b8182e6b45a08a2716ae7fb9a7e3428dc8420464e4c1d1bdb5bea62cc2f553c579de5a4faa752b35cb3529d980fb07a055ff4ddf6e752707 SHA512 f05ea5168b923db72f4f5b53e9b748ebbcdae9eff09d86323313055933b47fc0089e1b2d73cd997d73dcfb2dca032344955816425fbddc09d27ca751463aadbb
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.ebuild
index 9ea0f646dc82..7305f93d80ab 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.ebuild
@@ -56,7 +56,7 @@ llvm.org_set_globals
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version ">=dev-python/lit-5[${PYTHON_USEDEP}]"
 }
 
 check_space() {
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.6.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.6.ebuild
index 80f1153af338..aeb3dfaae900 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.6.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.6.ebuild
@@ -62,7 +62,7 @@ llvm.org_set_globals
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version ">=dev-python/lit-5[${PYTHON_USEDEP}]"
 }
 
 check_space() {
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.9999.ebuild
index 964e7e01049f..f3765795b5cc 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.9999.ebuild
@@ -62,7 +62,7 @@ llvm.org_set_globals
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
 }
 
 check_space() {
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0_rc2.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0_rc2.ebuild
index ddcda06e3401..d164d890501b 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0_rc2.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0_rc2.ebuild
@@ -62,7 +62,7 @@ llvm.org_set_globals
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
 }
 
 check_space() {
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild
index 964e7e01049f..f3765795b5cc 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild
@@ -62,7 +62,7 @@ llvm.org_set_globals
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
 }
 
 check_space() {
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index f091adb506a0..55e6bdc3ebf0 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -7,10 +7,10 @@ DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf
 DIST llvm-project-15.0.0rc2.src.tar.xz 112110968 BLAKE2B 98c3769f17f1958fbec771409eef781f5ca845363656c70fe5cd20bca1b8471e7a8773a7d4e395700c297a5f3f208fe1303cf18e2a73b45388b782fb7484106b SHA512 eee1bee1f83cc468fb4bb6839acbd5c1618dc35f35e51cd078288b91bad95d52edaadd05c88f2d72d51c1c338ba08b3346c070a28693b1224639eb7a1ef4a4d9
 DIST llvm-project-15.0.0rc2.src.tar.xz.sig 438 BLAKE2B 09f260b30724b41b27ef621929c086fd6c13bde51c4adb880897b549b2d336682f617faf3dd636ceb795e329b664972cf50745ab49f84e7540658d53074510da SHA512 9f695a309fbb15026dc133eb17d33abd26831eb036fad79dd8df37d4f4d9eeae1ca463acd037d2a1882bc2cff763e4bda507d1d827d845613bfd62d0f9fbd4ca
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
-EBUILD compiler-rt-13.0.1.ebuild 3868 BLAKE2B b2b643b850023513b69076bc791b22b74aa54445250cba334a2d3dfdc26a1ea11d30d1ce9df6cb2d1c813b66eaa59a130821470b3a3076237f9ef93d2919a124 SHA512 334a2609ae6882dbbb9caca5bb3bc7ba0a668f9a8f337570d54bde926d7ebfaa87fe4e53dddc73ea602b2d52e7537b9490f8936736480f1ddac6c9caf7b6832d
-EBUILD compiler-rt-14.0.6-r1.ebuild 4179 BLAKE2B 1fe649044872b312da697df9a88217c323ced9dff0283932f6a0210b3e97a86cce59a37a1e678f45ff16c93f5647d6150ffb963303a3390a6eeb372fcd587a3d SHA512 2182681a27d944378e39cc5283d46c4a94da3b8b3a9fc18d5c38c6f00e92a1b1dc7cc945bd3dc71b6471b24a1ce769d6f17f84a5452e0f4b2bf1c7c670cbaa1c
-EBUILD compiler-rt-14.0.6.ebuild 4019 BLAKE2B f97793688c6e2dd3f2874217813ee9759bb896e192e146a2bc17e97daa0d9f8d8708938c68ab1270ef9dc49eb52bb7c29b4edd94382993e8de0a73f006238d23 SHA512 73a150cb917587e1e9a0adc499ae6cb1d473e455400b1b19777b30dea72846f01114bc52018dda7ff7090ea43b365793ad5a3515e4601dbd9ba4226c62322c77
-EBUILD compiler-rt-15.0.0.9999.ebuild 4113 BLAKE2B 58ae13f048e6b4749815cc75eaab2d0bdf0ecc55703c6699eea4cea239ce0969b60d109e56e9975fd1c33a11db09554e3195c3fe164b37af62c95de1dd001471 SHA512 bcf661838b113330870526950bbcefc83e9eb00b874c314706881b9c279638502986d881a7d025c34eeccb8379951d480996ee82b1c184f726b6ce2dba529829
-EBUILD compiler-rt-15.0.0_rc2.ebuild 4116 BLAKE2B 7a5640ca077df1e9c792172d649061d15b4d484fa22a77ece762b1a18b09be5888df794005b88d62c46204b78a436fac32bc0e9aa30b1527ae95aeed4aac432d SHA512 07f72d7dcc4ebee3b748c406b5a8a07cabaca1d99321b9fa088341336626f568a628cb397e03faa77c5cf7896711ac6df514580a62771dc8bc0f94f444818627
-EBUILD compiler-rt-16.0.0.9999.ebuild 4113 BLAKE2B 58ae13f048e6b4749815cc75eaab2d0bdf0ecc55703c6699eea4cea239ce0969b60d109e56e9975fd1c33a11db09554e3195c3fe164b37af62c95de1dd001471 SHA512 bcf661838b113330870526950bbcefc83e9eb00b874c314706881b9c279638502986d881a7d025c34eeccb8379951d480996ee82b1c184f726b6ce2dba529829
+EBUILD compiler-rt-13.0.1.ebuild 3883 BLAKE2B d4019a3e18469063707bc068c32ac1b719732dba04058c74a2966a462738441272314ad47a3d50a2eb1ddfdcaf3834bb81bf2301e8f5502fd28687a9b04f8f9c SHA512 613a99554b0d86aca84e3a6500a164e467fc90ce17a7c39df9cd575ec30db83cb6873e2b9086a2e1600d2f8526088e8f8154a9d90170c1fba8e0d94ca6496ad8
+EBUILD compiler-rt-14.0.6-r1.ebuild 4194 BLAKE2B c1f1f41a7a7d464c90ebde92e551479413dfc09366253f90a2c63b910909189b4aaf6967cf447941a07b5282f4a30fd673356a06c087c67738facc72002ff94f SHA512 a69ac6a4adc75b0f2db4469f482cb2c0fc921e196a218b6612630d5c401e1269ca4a152eca912e182ab14fa2c5a7573cfeb2ce1348cbec4985aa9b1adbf897af
+EBUILD compiler-rt-14.0.6.ebuild 4034 BLAKE2B 00e5eb31362a0ab414cd2604d76629ae12e57ff50ddd7012d5a5fc953d59e5cc47853b42c9fd785bafc0c589a1208b00c510b365d659feb9e715108dc1e0ffa4 SHA512 ef8a418d02e3d64cae0ae7b04cc3d74a4257431689e0460ac9f8191bab7b859c80ae8e9ace4c70f0670713a1377caa0086fd3fb3562ed47ccb34bc8af107ad7a
+EBUILD compiler-rt-15.0.0.9999.ebuild 4125 BLAKE2B 281406ad127f07e1a09b46e46592f7ac33a58ffaaf7c96a89a197a2897dd366de3ca82beda763a5b0cc72ce70b99ad7121625308d8badbbf337f0f72e9f58a56 SHA512 cc15daf8d9ab117a3c5538ff87950b0ea0a754913d1397abcb19d2018e821c5f3897eb6d5f4a70e6f09e60814309ab16e71322797a0e2e19cd84cc63b7611000
+EBUILD compiler-rt-15.0.0_rc2.ebuild 4128 BLAKE2B ecb574b9ab707710d6e04797c4a1dc777ba1aecb4df373deef7f34dd5adfb1687a30201de0598792897f584adf63887045532f86e24989549abfeee254478240 SHA512 53011ff3f37ca9862a997fe2d21528288ae733c3c166ad5538e2aa8a678ae066ee1bc9555f17a92f70ac031a248b5d384142670c30cf8fddddf27e21cc1e1067
+EBUILD compiler-rt-16.0.0.9999.ebuild 4125 BLAKE2B 281406ad127f07e1a09b46e46592f7ac33a58ffaaf7c96a89a197a2897dd366de3ca82beda763a5b0cc72ce70b99ad7121625308d8badbbf337f0f72e9f58a56 SHA512 cc15daf8d9ab117a3c5538ff87950b0ea0a754913d1397abcb19d2018e821c5f3897eb6d5f4a70e6f09e60814309ab16e71322797a0e2e19cd84cc63b7611000
 MISC metadata.xml 416 BLAKE2B 79a58249c94b605ba57f346c4e05b43853cf6cfb8bb65a4f4e3c44039cccfdb83dd31bfaaaf398bcbdc393efabdfc7ed186fe775976c46227e74decf2c8f4fb2 SHA512 ce30c79a575e5933effb1fec36f9a4ef02d9f97f312feb39c55a88cbda9a1bae1d7af2ec4ad5f66212cbb2cdbfb26f1a436689f16f410153c9d65eb010264c48
diff --git a/sys-libs/compiler-rt/compiler-rt-13.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.1.ebuild
index 08e7c073204b..6de6eb7c2d78 100644
--- a/sys-libs/compiler-rt/compiler-rt-13.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-13.0.1.ebuild
@@ -36,7 +36,7 @@ llvm.org_set_globals
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version ">=dev-python/lit-9.0.1[${PYTHON_USEDEP}]"
 }
 
 pkg_pretend() {
diff --git a/sys-libs/compiler-rt/compiler-rt-14.0.6-r1.ebuild b/sys-libs/compiler-rt/compiler-rt-14.0.6-r1.ebuild
index 10bb65dc8a01..4ce8bbb484a7 100644
--- a/sys-libs/compiler-rt/compiler-rt-14.0.6-r1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-14.0.6-r1.ebuild
@@ -38,7 +38,7 @@ llvm.org_set_globals
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version ">=dev-python/lit-9.0.1[${PYTHON_USEDEP}]"
 }
 
 pkg_pretend() {
diff --git a/sys-libs/compiler-rt/compiler-rt-14.0.6.ebuild b/sys-libs/compiler-rt/compiler-rt-14.0.6.ebuild
index 6e15bd7327b0..f6cf92a36424 100644
--- a/sys-libs/compiler-rt/compiler-rt-14.0.6.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-14.0.6.ebuild
@@ -38,7 +38,7 @@ llvm.org_set_globals
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version ">=dev-python/lit-9.0.1[${PYTHON_USEDEP}]"
 }
 
 pkg_pretend() {
diff --git a/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild
index 9330ad9834cf..5063f18091f9 100644
--- a/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild
@@ -38,7 +38,7 @@ llvm.org_set_globals
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
 }
 
 pkg_pretend() {
diff --git a/sys-libs/compiler-rt/compiler-rt-15.0.0_rc2.ebuild b/sys-libs/compiler-rt/compiler-rt-15.0.0_rc2.ebuild
index 15ea5aaaa3f2..d41092a0cf32 100644
--- a/sys-libs/compiler-rt/compiler-rt-15.0.0_rc2.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-15.0.0_rc2.ebuild
@@ -38,7 +38,7 @@ llvm.org_set_globals
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
 }
 
 pkg_pretend() {
diff --git a/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild
index 9330ad9834cf..5063f18091f9 100644
--- a/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild
@@ -38,7 +38,7 @@ llvm.org_set_globals
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
 }
 
 pkg_pretend() {
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 12c6f479036a..53ec65a2e89e 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -7,9 +7,9 @@ DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf
 DIST llvm-project-15.0.0rc2.src.tar.xz 112110968 BLAKE2B 98c3769f17f1958fbec771409eef781f5ca845363656c70fe5cd20bca1b8471e7a8773a7d4e395700c297a5f3f208fe1303cf18e2a73b45388b782fb7484106b SHA512 eee1bee1f83cc468fb4bb6839acbd5c1618dc35f35e51cd078288b91bad95d52edaadd05c88f2d72d51c1c338ba08b3346c070a28693b1224639eb7a1ef4a4d9
 DIST llvm-project-15.0.0rc2.src.tar.xz.sig 438 BLAKE2B 09f260b30724b41b27ef621929c086fd6c13bde51c4adb880897b549b2d336682f617faf3dd636ceb795e329b664972cf50745ab49f84e7540658d53074510da SHA512 9f695a309fbb15026dc133eb17d33abd26831eb036fad79dd8df37d4f4d9eeae1ca463acd037d2a1882bc2cff763e4bda507d1d827d845613bfd62d0f9fbd4ca
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
-EBUILD libcxx-13.0.1.ebuild 6780 BLAKE2B 575c9089d74bddc871e97147c53f7c298cd1683b989eba6b50601b45693c11d0647e3bd6f70c0a75caaea7ee3fea2f88f1bbad444d7f1785a62175337659e2e3 SHA512 f0ff78e48acca25cb925aee5106fba0d547ab8522ccfd65e2198d4f481f83abbadc415ac3808e45387fc945980f9892fdbda3b6a26d54163cebfa4f12fa17172
-EBUILD libcxx-14.0.6.ebuild 6960 BLAKE2B d95e91e206ef8b9173368016b15f6d6457f6892db5bacffd0b551365198e572cc0f492e3aa4e3b5cba902163572b424b713de68f7afede6115daa1920fb3c267 SHA512 61370b6464aa7f54c0f13a38922e5e05100817ca65fee5231acd0384693b3ef88a5e611b53bebea3931e9b9f8f5f0513475504a8ab62942316375196a1eae718
-EBUILD libcxx-15.0.0.9999.ebuild 6065 BLAKE2B 3816a2235860d89f5afcfaeaccc1d84a115ad0a06526f3b4383247e165cc1917737fa5c9c66d1189871ed60371c50db93d8194daaaa8c2b708d8dc0ec810c571 SHA512 22e742b874b9403f64eee8eee76552cd145ed4eca65523bd47b2bdddbb2a9436982c010bc10980ada9bb4a63a5d8663eec2d124a3517355eccbdd22b32f85bfb
-EBUILD libcxx-15.0.0_rc2.ebuild 6068 BLAKE2B 38bf81153ffcce8af7f2512d906cf8b25df9c297bf9d9265798e9d8254d13ad57bac7bed20203f74e735e964e61df85c4882cced9efed7e073fc97554c9a4fd4 SHA512 a67b7f247043622955666d0452953c6cf543db294d2658b1d90f42dfd2728a49bbf983dcfb9d07cf070e101d76b0088b6a03b132c67fe100c18ef6d4d7c249a1
-EBUILD libcxx-16.0.0.9999.ebuild 6065 BLAKE2B 3816a2235860d89f5afcfaeaccc1d84a115ad0a06526f3b4383247e165cc1917737fa5c9c66d1189871ed60371c50db93d8194daaaa8c2b708d8dc0ec810c571 SHA512 22e742b874b9403f64eee8eee76552cd145ed4eca65523bd47b2bdddbb2a9436982c010bc10980ada9bb4a63a5d8663eec2d124a3517355eccbdd22b32f85bfb
+EBUILD libcxx-13.0.1.ebuild 6787 BLAKE2B 4be84b4e8a51630f92e96b429bcae8f57a782ad6231fb49e8d71b71917033c03a5fb267fca52504a161109a1fc9d2cecec62d0e65baed9344d5c5383e658cff5 SHA512 dba4e5596f80f39cef66b7676d456ce1b7dc114a4cfd6d084ad4572d63017a3d07f2b9361b490392018ab79de9e58a628ff14061a86e03fa2eadc8042b21d5ed
+EBUILD libcxx-14.0.6.ebuild 6967 BLAKE2B f2d281504a4781515f75b27f5bd483e3af779fdbf96c52b59b95dada4beef3fd91fc5f295c17b718e7fe79159703b3ca541d48e32926659a67cbe32269dba877 SHA512 b048dadf44847aa0b89166186f8b31f23d1742bcdb173dd75ade95a7c50ef5b0dc5c545b587717d395a4670aee29423465e6fa134dda93e9b6bc6db10fd54c4c
+EBUILD libcxx-15.0.0.9999.ebuild 6072 BLAKE2B 590e10d6df81e39af1945c6b8a2871e850b4fe46b8e89b25b18968687f70f551867c22406c9d91ec49ab2b31ae20437a935e06506d644cee75ac44e1123ba74d SHA512 d20f2bf0e57d770fa2061355894d860c8b18d169c6052929993146286e0045f5303a8a6c8b3660bc39ed07fd68167419659d63e71d46a8532509f21feb6d502b
+EBUILD libcxx-15.0.0_rc2.ebuild 6075 BLAKE2B f6701258d7159165f4fe5fb0dd71019c1b816a7a8d200f67fe279eaa0d29df4843c63899580ed08046f9c859990bdd9847382c02e1eeceb0ffcb925116c2490b SHA512 5a682ef307a914a2634762d5a5a0c5ff800f9a55910463675fae411b75f6032f3279ccb8cf17571c2fb9495f036fb947b7c933f2c7a8d255ee298e080a11433f
+EBUILD libcxx-16.0.0.9999.ebuild 6072 BLAKE2B 590e10d6df81e39af1945c6b8a2871e850b4fe46b8e89b25b18968687f70f551867c22406c9d91ec49ab2b31ae20437a935e06506d644cee75ac44e1123ba74d SHA512 d20f2bf0e57d770fa2061355894d860c8b18d169c6052929993146286e0045f5303a8a6c8b3660bc39ed07fd68167419659d63e71d46a8532509f21feb6d502b
 MISC metadata.xml 828 BLAKE2B 40af456df8ac1cfdb66fd62a217abbb4ca837956529906118c35232000435d9e991d18dd0332b7b95eed70d4c7610c7a1aee80af8ba511763edc1423749a4aa4 SHA512 257f8fd05fcade26ca02305356b67c8e2d67a87b180e38a189a659212093b07b9a710b871fbaab894dba9eba5fe450b76c52cc82f6405c24cc1ab2df3abe8bfd
diff --git a/sys-libs/libcxx/libcxx-13.0.1.ebuild b/sys-libs/libcxx/libcxx-13.0.1.ebuild
index 9720629f1aff..f7e237c7af45 100644
--- a/sys-libs/libcxx/libcxx-13.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-13.0.1.ebuild
@@ -40,7 +40,7 @@ LLVM_PATCHSET=${PV/_/-}
 llvm.org_set_globals
 
 python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/sys-libs/libcxx/libcxx-14.0.6.ebuild b/sys-libs/libcxx/libcxx-14.0.6.ebuild
index 09ef1beb4a22..b32a3fd02e55 100644
--- a/sys-libs/libcxx/libcxx-14.0.6.ebuild
+++ b/sys-libs/libcxx/libcxx-14.0.6.ebuild
@@ -48,7 +48,7 @@ llvm.org_set_globals
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/sys-libs/libcxx/libcxx-15.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-15.0.0.9999.ebuild
index d95f996ca33b..9dc33c6e6120 100644
--- a/sys-libs/libcxx/libcxx-15.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-15.0.0.9999.ebuild
@@ -51,7 +51,7 @@ llvm.org_set_globals
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/sys-libs/libcxx/libcxx-15.0.0_rc2.ebuild b/sys-libs/libcxx/libcxx-15.0.0_rc2.ebuild
index e6120dc78ebd..d4df61d8cca7 100644
--- a/sys-libs/libcxx/libcxx-15.0.0_rc2.ebuild
+++ b/sys-libs/libcxx/libcxx-15.0.0_rc2.ebuild
@@ -51,7 +51,7 @@ llvm.org_set_globals
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/sys-libs/libcxx/libcxx-16.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-16.0.0.9999.ebuild
index d95f996ca33b..9dc33c6e6120 100644
--- a/sys-libs/libcxx/libcxx-16.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-16.0.0.9999.ebuild
@@ -51,7 +51,7 @@ llvm.org_set_globals
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index e720a3444dbb..58c2c806f70a 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -3,9 +3,9 @@ DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf
 DIST llvm-project-15.0.0rc2.src.tar.xz 112110968 BLAKE2B 98c3769f17f1958fbec771409eef781f5ca845363656c70fe5cd20bca1b8471e7a8773a7d4e395700c297a5f3f208fe1303cf18e2a73b45388b782fb7484106b SHA512 eee1bee1f83cc468fb4bb6839acbd5c1618dc35f35e51cd078288b91bad95d52edaadd05c88f2d72d51c1c338ba08b3346c070a28693b1224639eb7a1ef4a4d9
 DIST llvm-project-15.0.0rc2.src.tar.xz.sig 438 BLAKE2B 09f260b30724b41b27ef621929c086fd6c13bde51c4adb880897b549b2d336682f617faf3dd636ceb795e329b664972cf50745ab49f84e7540658d53074510da SHA512 9f695a309fbb15026dc133eb17d33abd26831eb036fad79dd8df37d4f4d9eeae1ca463acd037d2a1882bc2cff763e4bda507d1d827d845613bfd62d0f9fbd4ca
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
-EBUILD libcxxabi-13.0.1.ebuild 3605 BLAKE2B 7bdc8ecd9c35cdc247f08f9d5687d7362013be7c9c5afe006817cb5a384d4dd272bc686c6fe2ddf2a9bde5be8d1fa185ae60da940fded833a356f76e6105feb8 SHA512 69c4564fc68e3037620de0ce0cda29093bff9eb919f48f4760558edd1031c0d198991e6346774244701679aa0619d6afd814ec80d0d66265418408416621d9d0
-EBUILD libcxxabi-14.0.6.ebuild 3521 BLAKE2B 3f5bb6329c14a608fb52e2429ba4acbff8ec2c490d832beae73956a4323c896e8d7030261fb845002cf1682bd7331cbb0e31df2ea214dda583cd004ae6c2f9db SHA512 92e061f2f4736f8a6fcc5240870dbdb4574a2945d77de0f00d6c7fd2011e76edf63084bb7ee6c32f038a708c5d1df4753aaa936470d0670cd772113f38cef62a
-EBUILD libcxxabi-15.0.0.9999.ebuild 3303 BLAKE2B 75a33d5039be0e5400680a7144c9cb50bf7b7fe6fb0edadf1d8d929a3bfeff2f752b08c4a9ba11ee46355b9a353da7b586449521edf779fd5edfcdd78db2ade0 SHA512 3f7851502ea769fad89ef013fbf42b9e8763f25139f4440dbadda8b559d14b7b3aff09c388233a3906d8895a76308f6fd9fa7900cf2535567c4b271083c9692f
-EBUILD libcxxabi-15.0.0_rc2.ebuild 3303 BLAKE2B 75a33d5039be0e5400680a7144c9cb50bf7b7fe6fb0edadf1d8d929a3bfeff2f752b08c4a9ba11ee46355b9a353da7b586449521edf779fd5edfcdd78db2ade0 SHA512 3f7851502ea769fad89ef013fbf42b9e8763f25139f4440dbadda8b559d14b7b3aff09c388233a3906d8895a76308f6fd9fa7900cf2535567c4b271083c9692f
-EBUILD libcxxabi-16.0.0.9999.ebuild 3303 BLAKE2B 75a33d5039be0e5400680a7144c9cb50bf7b7fe6fb0edadf1d8d929a3bfeff2f752b08c4a9ba11ee46355b9a353da7b586449521edf779fd5edfcdd78db2ade0 SHA512 3f7851502ea769fad89ef013fbf42b9e8763f25139f4440dbadda8b559d14b7b3aff09c388233a3906d8895a76308f6fd9fa7900cf2535567c4b271083c9692f
+EBUILD libcxxabi-13.0.1.ebuild 3612 BLAKE2B e93cbc3477c3022e4871fdc5c971450b4539c762b4a22f335ddfa01318454d5fa880cbf4a9fb7ac6f3f35a25a761959cd8c400c9875c8c21ef3bdf5349e16dd1 SHA512 30e4e66859523da6cd3d8f5fffe12aa0b2fa719021a0f610cdb39238a552a0c224bf23f6ad648d680950d64c053a5c4db5721777aded4dc80099b018821afc5c
+EBUILD libcxxabi-14.0.6.ebuild 3528 BLAKE2B 1354d2843f58c20a7b9a5552c0932049413e18c48629eaa0e5462ae6fc1ab8aef2dd9dcd3528e5f3aba663edd35afb3a395d52ca1cb327846b3d9ebe18a1f6ad SHA512 24f6abce40fce8cdb210cd84b91d32c4db13a01321a0579a0c939c93b016b099a5c8b6cb75a635beffe6ad9a24ddb38e991cb33470c32084697237231cfbad1a
+EBUILD libcxxabi-15.0.0.9999.ebuild 3310 BLAKE2B 95f4224157cef70792574d64cfb42f383626900e586b6ab28cc2fe20921e34ba973caa930d7f620509dd239b21ba5bdb6bd5d0f7abf74256893401b5868b0282 SHA512 0cbce4acdbabaf593339756aeb3e5be983cfaaf5fd25748c9c1d454810401998abb7fe52e7d4df6dd94fb0143bd690b76bb59bd6f16cb7fc9e2ba038168abd35
+EBUILD libcxxabi-15.0.0_rc2.ebuild 3310 BLAKE2B 95f4224157cef70792574d64cfb42f383626900e586b6ab28cc2fe20921e34ba973caa930d7f620509dd239b21ba5bdb6bd5d0f7abf74256893401b5868b0282 SHA512 0cbce4acdbabaf593339756aeb3e5be983cfaaf5fd25748c9c1d454810401998abb7fe52e7d4df6dd94fb0143bd690b76bb59bd6f16cb7fc9e2ba038168abd35
+EBUILD libcxxabi-16.0.0.9999.ebuild 3310 BLAKE2B 95f4224157cef70792574d64cfb42f383626900e586b6ab28cc2fe20921e34ba973caa930d7f620509dd239b21ba5bdb6bd5d0f7abf74256893401b5868b0282 SHA512 0cbce4acdbabaf593339756aeb3e5be983cfaaf5fd25748c9c1d454810401998abb7fe52e7d4df6dd94fb0143bd690b76bb59bd6f16cb7fc9e2ba038168abd35
 MISC metadata.xml 557 BLAKE2B 4f6b0acb7cfdf74971a6fd96051d9f9020141c6117333a8de42bd043935b7bff8d9942faabdf3b1c94597c460393f64eb7d3f7b7d49f39ecfd0094de460f563e SHA512 67a812ef768e681ae77ef6e13bccffcbe53b41e94901f0558b3c7acaf896605ca670c4bb5a690bd9afa3b5a76271341710520a6abc0024c18f437fabde20e847
diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.1.ebuild
index 690b4d4e2681..22ef4d1e4c4a 100644
--- a/sys-libs/libcxxabi/libcxxabi-13.0.1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-13.0.1.ebuild
@@ -35,7 +35,7 @@ LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake )
 llvm.org_set_globals
 
 python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/sys-libs/libcxxabi/libcxxabi-14.0.6.ebuild b/sys-libs/libcxxabi/libcxxabi-14.0.6.ebuild
index fa07ba2e8fb5..3e188e6e2a6c 100644
--- a/sys-libs/libcxxabi/libcxxabi-14.0.6.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-14.0.6.ebuild
@@ -45,7 +45,7 @@ llvm.org_set_globals
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild
index 308024bf9d49..4953b42a943d 100644
--- a/sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild
@@ -45,7 +45,7 @@ llvm.org_set_globals
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/sys-libs/libcxxabi/libcxxabi-15.0.0_rc2.ebuild b/sys-libs/libcxxabi/libcxxabi-15.0.0_rc2.ebuild
index 308024bf9d49..4953b42a943d 100644
--- a/sys-libs/libcxxabi/libcxxabi-15.0.0_rc2.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-15.0.0_rc2.ebuild
@@ -45,7 +45,7 @@ llvm.org_set_globals
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/sys-libs/libcxxabi/libcxxabi-16.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-16.0.0.9999.ebuild
index 308024bf9d49..4953b42a943d 100644
--- a/sys-libs/libcxxabi/libcxxabi-16.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-16.0.0.9999.ebuild
@@ -45,7 +45,7 @@ llvm.org_set_globals
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index dac2678e1c16..09a24b4d9442 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -6,9 +6,9 @@ DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf
 DIST llvm-project-15.0.0rc2.src.tar.xz 112110968 BLAKE2B 98c3769f17f1958fbec771409eef781f5ca845363656c70fe5cd20bca1b8471e7a8773a7d4e395700c297a5f3f208fe1303cf18e2a73b45388b782fb7484106b SHA512 eee1bee1f83cc468fb4bb6839acbd5c1618dc35f35e51cd078288b91bad95d52edaadd05c88f2d72d51c1c338ba08b3346c070a28693b1224639eb7a1ef4a4d9
 DIST llvm-project-15.0.0rc2.src.tar.xz.sig 438 BLAKE2B 09f260b30724b41b27ef621929c086fd6c13bde51c4adb880897b549b2d336682f617faf3dd636ceb795e329b664972cf50745ab49f84e7540658d53074510da SHA512 9f695a309fbb15026dc133eb17d33abd26831eb036fad79dd8df37d4f4d9eeae1ca463acd037d2a1882bc2cff763e4bda507d1d827d845613bfd62d0f9fbd4ca
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
-EBUILD libomp-13.0.1.ebuild 3836 BLAKE2B bfecc3ecb5928ba0c4f1e79baf7108705b33b654631ebc05a52bebab494eebefe6ec1f7403170f5e0b541942618a88ebad52f5ba80bf185a2544170df3c84bcc SHA512 97a257c4e40440c83dc72d76f67d5b4b49ea74b138e541163c3bc938a50052fae3ae988c60a290c1b0051efc623f9be464c1801b5b7569a8cbb446724fe8267b
-EBUILD libomp-14.0.6-r1.ebuild 3846 BLAKE2B ba454ff21aa950024868546e76e34f7eae5e0df1e72f828832c7f32d4b5cb544d479b18e609adbfc2352e5773c9cc08717a0b09d6bcbf1c76020dc4911edd7e6 SHA512 6547e2e6c9847fa9dc0eee0717db07347764937f942db9a13f3e47615954fc3a15b7db1516f629c0e2036ee8367cba6aea7bd27c27d2a4b9b51922afc97e7ebb
-EBUILD libomp-15.0.0.9999.ebuild 3250 BLAKE2B 93eb6805d0b96f8b9adb99c0b69b41a8b0f7e58c9aa3a8c8d58d98b265f0656b802638b3faf206f8603e7a591227eeb1853a97be6629c24b32c2f609369e3be5 SHA512 340e88828c233a54a03622db8cbfc468fc9a117665014cf5c431ae611e21bffe6286d3cd41478ae6425047ba9cb1f067498c19895b74dc432e93caf753874c70
-EBUILD libomp-15.0.0_rc2.ebuild 3274 BLAKE2B 5318e87c87ae1f1248e1e3fb665ad0d3951699f6130db22dcae50440085e32056e5b498bf0c2dafefcd257b73abf4b49bbf0085fc8251f9bfacee02f108291f7 SHA512 e8b06aa88286a7958fc43f6abe4a26b77930c3f809724d272ffe88bf12bf9567315ffab33f0a1fb63e68b45e92b65b6894f99bdb608cabcb0a8a09384ee01f37
-EBUILD libomp-16.0.0.9999.ebuild 3250 BLAKE2B 93eb6805d0b96f8b9adb99c0b69b41a8b0f7e58c9aa3a8c8d58d98b265f0656b802638b3faf206f8603e7a591227eeb1853a97be6629c24b32c2f609369e3be5 SHA512 340e88828c233a54a03622db8cbfc468fc9a117665014cf5c431ae611e21bffe6286d3cd41478ae6425047ba9cb1f067498c19895b74dc432e93caf753874c70
+EBUILD libomp-13.0.1.ebuild 3843 BLAKE2B ef8322c379d47bd38e332da631efae1c8164c74ff93f2e5801275bdbb75e6bc865d60409eb3e3e4e23893321f14d8690272477c94206b8a4264e85351e4ac10f SHA512 0fc625e33aab503fc34f3ba89767dfeed3edfb510647056a9f97591fa8bca6e5061f4298a2a67f5660e22513b57ef7ed147f1830ebf1d725da902b42d2a7b636
+EBUILD libomp-14.0.6-r1.ebuild 3853 BLAKE2B 79bb911bad46cc252278d48c512c6f39387d96760beb8a6d01bc5a93278e9dc6484c7adefaa4c1ce984e8ba094a399ce3e97ff2849518af5396b2e82f5a4db90 SHA512 1a13bf131f914b1894c2d94a7ab9ac29d89d6482286ec799488613d6d9693c92cce409f34b13d016ce362066c0aedb041adf31032a5c1e73326261d838f71f89
+EBUILD libomp-15.0.0.9999.ebuild 3257 BLAKE2B 45dd6baeb08bdfbe716adfb35d119d87491a8477ea7f85765b2765cb0eaed02d78ad6d5a1244cc411db15bc0d681c37b6c9fcc0a1a9d90757acae15c60c9eb99 SHA512 c05fff7d646a9850b935f6bc6aa87348e9cf0ae4c361f759589f7ef138c5a8a7be1c9d491eba54d2668a617892ad5c79232aff491226f90cca6489feb2a3685c
+EBUILD libomp-15.0.0_rc2.ebuild 3281 BLAKE2B a314f7ead0b7c61820316ab426eeff2e705058b02274f117ce5a41c025d7350092843a65d314fd702584c8aecdc2e5f4749ca8090e55d4b1a9fce9aa18864503 SHA512 fd7e5ce0870443001e5b714d58f7a14bffb0cca23abf797268e5aba50b4d9d37f7200782ccc9dc2cca9dfa52a48c63e2247aff4872667caaf26ac88f7dac10e7
+EBUILD libomp-16.0.0.9999.ebuild 3257 BLAKE2B 45dd6baeb08bdfbe716adfb35d119d87491a8477ea7f85765b2765cb0eaed02d78ad6d5a1244cc411db15bc0d681c37b6c9fcc0a1a9d90757acae15c60c9eb99 SHA512 c05fff7d646a9850b935f6bc6aa87348e9cf0ae4c361f759589f7ef138c5a8a7be1c9d491eba54d2668a617892ad5c79232aff491226f90cca6489feb2a3685c
 MISC metadata.xml 908 BLAKE2B c200fb1c93ae8fbd3963b2b575586fbe8f6df2308a2babbe3da77c2cf59c3fa43f938849d47df2ef4acf381f247848c363a20cf33ad763be169764cbe43c4bb4 SHA512 3cde603a2de523c21fbf288d459d76c697f2291d3dc3dac47e70781a910b4d524442d3076d8541818f2d43c3c6477af75d5f0cb76c4fbe0b4567a11d67edb056
diff --git a/sys-libs/libomp/libomp-13.0.1.ebuild b/sys-libs/libomp/libomp-13.0.1.ebuild
index f9268fab32f5..58e0a2313f05 100644
--- a/sys-libs/libomp/libomp-13.0.1.ebuild
+++ b/sys-libs/libomp/libomp-13.0.1.ebuild
@@ -50,7 +50,7 @@ LLVM_PATCHSET=${PV/_/-}
 llvm.org_set_globals
 
 python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
 kernel_pds_check() {
diff --git a/sys-libs/libomp/libomp-14.0.6-r1.ebuild b/sys-libs/libomp/libomp-14.0.6-r1.ebuild
index a7dc5dde7c2f..18736fc8be8b 100644
--- a/sys-libs/libomp/libomp-14.0.6-r1.ebuild
+++ b/sys-libs/libomp/libomp-14.0.6-r1.ebuild
@@ -58,7 +58,7 @@ LLVM_PATCHSET=${PV}-r2
 llvm.org_set_globals
 
 python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
 kernel_pds_check() {
diff --git a/sys-libs/libomp/libomp-15.0.0.9999.ebuild b/sys-libs/libomp/libomp-15.0.0.9999.ebuild
index 8ba05d6be239..af8fbac19223 100644
--- a/sys-libs/libomp/libomp-15.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-15.0.0.9999.ebuild
@@ -51,7 +51,7 @@ LLVM_COMPONENTS=( openmp cmake llvm/include )
 llvm.org_set_globals
 
 python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
 kernel_pds_check() {
diff --git a/sys-libs/libomp/libomp-15.0.0_rc2.ebuild b/sys-libs/libomp/libomp-15.0.0_rc2.ebuild
index 38cf52e1736e..ca9a2f31614f 100644
--- a/sys-libs/libomp/libomp-15.0.0_rc2.ebuild
+++ b/sys-libs/libomp/libomp-15.0.0_rc2.ebuild
@@ -52,7 +52,7 @@ LLVM_PATCHSET=${PV/_/-}
 llvm.org_set_globals
 
 python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
 kernel_pds_check() {
diff --git a/sys-libs/libomp/libomp-16.0.0.9999.ebuild b/sys-libs/libomp/libomp-16.0.0.9999.ebuild
index 8ba05d6be239..af8fbac19223 100644
--- a/sys-libs/libomp/libomp-16.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-16.0.0.9999.ebuild
@@ -51,7 +51,7 @@ LLVM_COMPONENTS=( openmp cmake llvm/include )
 llvm.org_set_globals
 
 python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
 kernel_pds_check() {
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index ab9c0c05b56a..bab52c5ccc78 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -4,9 +4,9 @@ DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf
 DIST llvm-project-15.0.0rc2.src.tar.xz 112110968 BLAKE2B 98c3769f17f1958fbec771409eef781f5ca845363656c70fe5cd20bca1b8471e7a8773a7d4e395700c297a5f3f208fe1303cf18e2a73b45388b782fb7484106b SHA512 eee1bee1f83cc468fb4bb6839acbd5c1618dc35f35e51cd078288b91bad95d52edaadd05c88f2d72d51c1c338ba08b3346c070a28693b1224639eb7a1ef4a4d9
 DIST llvm-project-15.0.0rc2.src.tar.xz.sig 438 BLAKE2B 09f260b30724b41b27ef621929c086fd6c13bde51c4adb880897b549b2d336682f617faf3dd636ceb795e329b664972cf50745ab49f84e7540658d53074510da SHA512 9f695a309fbb15026dc133eb17d33abd26831eb036fad79dd8df37d4f4d9eeae1ca463acd037d2a1882bc2cff763e4bda507d1d827d845613bfd62d0f9fbd4ca
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
-EBUILD llvm-libunwind-13.0.1.ebuild 3814 BLAKE2B 90b96e50590839f5bcc8e9d47219e0a6af25c23fd7a6851316596960c00481fbbd02ae606092d79f15648cfb511be9ce44cfec8bb3f185e098eb4eb6bec1c0da SHA512 ee5d861f886d8e33946056ac14a838788dcca42f9e3879fee79f7a211fa2b4eb4481b0f61ec1c77c9b41c9be97ded6fa4e32f63c35bd6ea2a28d0bc503f7ba29
-EBUILD llvm-libunwind-14.0.6.ebuild 3203 BLAKE2B 8ae5c78793e1a71e5f884666d2248bf0495342c4e8bdd80a4fab994e0d46c561790f9dfab32a6d04007dbbe60e5be7b3aa858f379a10f57d6fed3e2e43efc839 SHA512 1065bb6669a83d982e901f50701daf16bd4ae776e0c858fdcfec96c5d41f3a87c7cf53634b6a391422664839e264b9df96752d88054085a498ba718294becc16
-EBUILD llvm-libunwind-15.0.0.9999.ebuild 3066 BLAKE2B 61c4948db6029c903dbd39a4f38f8267bcb24ef829719cb56632f9b1f6eb159aa7f745675c5f11b0fb9c349d9e74a44b848225c289d0842ef97220c768585b51 SHA512 9250de911107f95fa73472800f557493be59f6f0f4958f3bb6eee0b24873b7d060a4550db69d21a392028b324ab1cdc29342d7dc736d2b8aeeb66ff65c3f5be4
-EBUILD llvm-libunwind-15.0.0_rc2.ebuild 3066 BLAKE2B 61c4948db6029c903dbd39a4f38f8267bcb24ef829719cb56632f9b1f6eb159aa7f745675c5f11b0fb9c349d9e74a44b848225c289d0842ef97220c768585b51 SHA512 9250de911107f95fa73472800f557493be59f6f0f4958f3bb6eee0b24873b7d060a4550db69d21a392028b324ab1cdc29342d7dc736d2b8aeeb66ff65c3f5be4
-EBUILD llvm-libunwind-16.0.0.9999.ebuild 3066 BLAKE2B 61c4948db6029c903dbd39a4f38f8267bcb24ef829719cb56632f9b1f6eb159aa7f745675c5f11b0fb9c349d9e74a44b848225c289d0842ef97220c768585b51 SHA512 9250de911107f95fa73472800f557493be59f6f0f4958f3bb6eee0b24873b7d060a4550db69d21a392028b324ab1cdc29342d7dc736d2b8aeeb66ff65c3f5be4
+EBUILD llvm-libunwind-13.0.1.ebuild 3821 BLAKE2B 07e0f984c7181a237d939493438873818b9e602617f18ae55f7e8b89b019f924bef5df0407fe668ec8fec0c21b937755574bd857898a540b03ffcc278603c8d8 SHA512 f2f38fc29b8574522f3d68f39c53c7554a9e6d4fbbfa33ff964d332db8b192d424ed31efc67190395b629cdf6adf31b92303b02f54208f918c600fee27b71a2b
+EBUILD llvm-libunwind-14.0.6.ebuild 3210 BLAKE2B f8c2843dc2a594de80f074c3a75e65326af2aa1e402d9c2aafcdf56db84e88cac4b87baef1fd63b5bc45b291129d7c2a73d941f11c544eb12b459dab3df83784 SHA512 624cabd6d68c0a31236713d2e7c269f410135fae34aaf978d81e1cd0d982d3439dd5abd2a7fd171cf505096f443fc616d95224255c775829c01336f510124090
+EBUILD llvm-libunwind-15.0.0.9999.ebuild 3073 BLAKE2B 6de513ab392666bc426c2e1d6566a636bde07a37f6907b5ffdf2a749b0b9d867189d3fedfc248c6846cadafcaf1fb14a2fad906f5c98ec2f53152dc762a82c28 SHA512 4c9179c5bd821cde52fce2d59318b024a9d8c549e9ab1404d6dfea3acf435c042ceddfaa6b0db441dc11f50370032e53e0ac5ad4686ab8c82fab447b48b7fbf2
+EBUILD llvm-libunwind-15.0.0_rc2.ebuild 3073 BLAKE2B 6de513ab392666bc426c2e1d6566a636bde07a37f6907b5ffdf2a749b0b9d867189d3fedfc248c6846cadafcaf1fb14a2fad906f5c98ec2f53152dc762a82c28 SHA512 4c9179c5bd821cde52fce2d59318b024a9d8c549e9ab1404d6dfea3acf435c042ceddfaa6b0db441dc11f50370032e53e0ac5ad4686ab8c82fab447b48b7fbf2
+EBUILD llvm-libunwind-16.0.0.9999.ebuild 3073 BLAKE2B 6de513ab392666bc426c2e1d6566a636bde07a37f6907b5ffdf2a749b0b9d867189d3fedfc248c6846cadafcaf1fb14a2fad906f5c98ec2f53152dc762a82c28 SHA512 4c9179c5bd821cde52fce2d59318b024a9d8c549e9ab1404d6dfea3acf435c042ceddfaa6b0db441dc11f50370032e53e0ac5ad4686ab8c82fab447b48b7fbf2
 MISC metadata.xml 438 BLAKE2B 2a36fbbc59e137056029c62aef6d167d9c82531c2582d7bad5cb13cc36e5c4c9518ffe8c56d06bbcfd97ad22eda71a8b776f3984195f53d06cf45659b438dc00 SHA512 4f18b054072d00e5440faa31a59f9ef587d035b5f25e30913f0b1449debee967fa794fae2548e87db3fb2177ce853ab075e1f11f3cc763f5d7fdf06147108845
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1.ebuild
index 844bef25c084..a19aef314796 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1.ebuild
@@ -31,7 +31,7 @@ LLVM_PATCHSET=${PV/_/-}
 llvm.org_set_globals
 
 python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-14.0.6.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.6.ebuild
index f077bc5f0fe5..e1bc7b404eaa 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-14.0.6.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.6.ebuild
@@ -39,7 +39,7 @@ llvm.org_set_globals
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
 multilib_src_configure() {
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0.9999.ebuild
index 70ee605d38b3..ea22881bd8ef 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0.9999.ebuild
@@ -43,7 +43,7 @@ llvm.org_set_globals
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
 multilib_src_configure() {
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0_rc2.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0_rc2.ebuild
index 70ee605d38b3..ea22881bd8ef 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0_rc2.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0_rc2.ebuild
@@ -43,7 +43,7 @@ llvm.org_set_globals
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
 multilib_src_configure() {
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-16.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-16.0.0.9999.ebuild
index 70ee605d38b3..ea22881bd8ef 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-16.0.0.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-16.0.0.9999.ebuild
@@ -43,7 +43,7 @@ llvm.org_set_globals
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
 multilib_src_configure() {
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 7bad8394d4be..8b61b5039329 100644
Binary files a/sys-power/Manifest.gz and b/sys-power/Manifest.gz differ
diff --git a/sys-power/switcheroo-control/Manifest b/sys-power/switcheroo-control/Manifest
index 7d0b0c24799a..9f047da2e040 100644
--- a/sys-power/switcheroo-control/Manifest
+++ b/sys-power/switcheroo-control/Manifest
@@ -1,5 +1,5 @@
 DIST switcheroo-control-2.4.tar.xz 27964 BLAKE2B f85014ad6696e301bafd75b694f5c130498171d95b0330d2996568737cbcd677eef5256bc47638bf87d178d6fe099f3c53bd710a1534db20f1dbe5fbe51681c7 SHA512 47f071b17cbb520d862800ef2d8389ada1130be96a8c1efed9be6793081b5826355ad30b0feeba1cc9eda792b4c943ffc852d12648b0c5e74f25c207d151c1c3
 DIST switcheroo-control-2.6.tar.xz 29996 BLAKE2B 98204a1d0f3b92cc2b98ad9f382313aed4da5877ac6be607c48ee9386bd25087301e249907a7e1385eea357f0a3ce5fb2936fac688923dfa3555a9870f0d2e58 SHA512 ac8867a839ae958676f5c5c7bb4c25cbbcf70eb35a696bb3d80b388c31a9722e75311c041c4c60b8f1d00f405af97dd9173e99780a2be3c621ac759c4986a2d2
 EBUILD switcheroo-control-2.4.ebuild 917 BLAKE2B 6bd3ab227424ef1e6ec1efd9d8383f353c076c5bbbe0bbf0875e5f22cada2f8ee42631c2eb793bd4bbd6ad7070a5404adc0b484901271ae26bedac0f74b14b67 SHA512 199a464108ba28b19059539888eb0dea7c9cb33018a8727479b088d3bf6924f48d8820bd90fed882d36ff2127c9f0e4660621df5738c65638319090550ff1712
-EBUILD switcheroo-control-2.6.ebuild 1181 BLAKE2B ee6659610a4387b42063b85bb5809521b81c5872425fa72d5ebabdb6407e4b990abb3da592653d01d1503f950720fedcd7a06f8748097ea0cf2ed3a758af7468 SHA512 1e2ee83ff32c7064c3b4bae74e73646f88b143c62a9ef8dd25d42f96c71acc10607f93ce18fb2f133cf712f2dbd4006e10f548fa510e5d13230c29a2bef73327
+EBUILD switcheroo-control-2.6.ebuild 1188 BLAKE2B 673bddc4c15142c8bcb8fe69c7b28ab90de29d181acc55eae36d1bff63a73ce16f26e421e300154cbd06379e1e174ae3f5dbee2fba9a10a880936a9b51398132 SHA512 9e135e699d2d5e2de1cf882af715233b0d6f1610e4963a819f97be99c033af1028b5fe3a69b2a10b884cff17d6cd83618814818310ab04d5b904be53c42f651b
 MISC metadata.xml 217 BLAKE2B f8189b02494f180dac078dcd5c275d3c795f20f360f8b172c66065a2d937e396b24b8631bba4cd8567d60285ce89fc77b9539f2233bf33899c820613c48c33ba SHA512 f0c9e5b3d281fecd21b1e23a6f44c94c1c0b3220de46a177d35932111b7f1ab4399061c42833ac1ee9bd0324b139fc8db66e0d2890224d607bd3be38ae469be9
diff --git a/sys-power/switcheroo-control/switcheroo-control-2.6.ebuild b/sys-power/switcheroo-control/switcheroo-control-2.6.ebuild
index 93e64ab5b467..14ec8f0eb790 100644
--- a/sys-power/switcheroo-control/switcheroo-control-2.6.ebuild
+++ b/sys-power/switcheroo-control/switcheroo-control-2.6.ebuild
@@ -34,7 +34,7 @@ RESTRICT="!test? ( test )"
 
 python_check_deps() {
 	use test || return 0
-	has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 5adb48aa32e4..943a0c6c3dd5 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index ee0310e08adc..3ec43054aab0 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -2,7 +2,7 @@ DIST icingaweb2-2.10.3.tar.gz 11490948 BLAKE2B ab7c3d0772224162f8eb106618c103987
 DIST icingaweb2-2.11.0.tar.gz 11411511 BLAKE2B f7b550a73bd0ff9770700a3a8cab1b02c88a57ed4bbb2e120df379bf897fb21d838a968f9d4d83e6a38d32578655d2670734f66e3c0dc8215fe5295d46ebc191 SHA512 e76e01262cb5b4ac43504349262660d85306205e0599bb0c8afd6a1d9f3240d659dd5cfdc35a6b9e2498ad16864a6024d0dac46faed4473da70be461a1db9f8e
 DIST icingaweb2-2.11.1.tar.gz 11410186 BLAKE2B 6211dac560ab7acd4b37b056ab32fa73d21521f5bb02509b63d703e986761e617c1304ff71c22fc1b0d820cabf4e1264d13847142daee7da5cc5644fb4164a67 SHA512 3df41958de29e6099acfbf002b9cf68da535cfd5400397e03d3ea59083ee68b8084c1cea85ae31cb6134cef2a2b39c18b53cabcbdf436e7ddc14f0ddbcd61997
 EBUILD icingaweb2-2.10.3.ebuild 2529 BLAKE2B 0bff09ed4258d2674a3e1ec780e6b7aa0d87cbcba5771af2ea2aae5fc10381f73f9b9434f09e3730c07d3ddcfdd2809f5b33273dd169f0c7ce808694d772c2ad SHA512 b9a0b279ac1606370ce0b238638c9a328990ffa977a50a21c61ad25b46d800e689b18c5eb8989e83a94a75a0d5afff3548989565a62bb3b6ab1551a8b17c2171
-EBUILD icingaweb2-2.11.0.ebuild 2628 BLAKE2B b38041e236796eb47d685b601a0008f3943e46ad33a42e8e76fdcbce557907aadec63cf96c073e4bf08da6137e2c45792afd9607086e8fe904a5394dfdcbd768 SHA512 cfa728da3f9fa851190d357742e4e1b6e20be1ae813d4351f33c6878f85214e5d8088c03113581190d1dc44d3a919fe87300dd241c61484bb515e0fba77eed1f
-EBUILD icingaweb2-2.11.1.ebuild 2628 BLAKE2B b38041e236796eb47d685b601a0008f3943e46ad33a42e8e76fdcbce557907aadec63cf96c073e4bf08da6137e2c45792afd9607086e8fe904a5394dfdcbd768 SHA512 cfa728da3f9fa851190d357742e4e1b6e20be1ae813d4351f33c6878f85214e5d8088c03113581190d1dc44d3a919fe87300dd241c61484bb515e0fba77eed1f
-EBUILD icingaweb2-9999.ebuild 2630 BLAKE2B eeca16f7d11d494af283842afad010e87c589e1fe8724c93176c70463db396815a73fa99496c557dc5fe25cf3da55739bbe805d9ecc1776a291126a066f7bfbd SHA512 32878a4e15cd689e8c5b890db2c41242992cbaf230f6080d7bc2e88715bbb6587f226f74bd19744dcec6cf23e81573bfda46bdc0c0e3eb3f255d0da6e2a4ef67
+EBUILD icingaweb2-2.11.0.ebuild 2645 BLAKE2B 6f6074a12bc465820885a5e78acdceeef0d86faee157f7572060d4ebb68ce877ed5f6757d97b0dade750f1cc5af7af13ce270edc80cb6f4320a901fd09f00d72 SHA512 a4d3fb6fbc7699eae92dcdfac74acae1e1379ed6e4e7f946bb9f322dd0785721da31ccb074eb41ad4876d61316e243cd11e0380ee3f6e29f1e13faafec692d72
+EBUILD icingaweb2-2.11.1.ebuild 2645 BLAKE2B 6f6074a12bc465820885a5e78acdceeef0d86faee157f7572060d4ebb68ce877ed5f6757d97b0dade750f1cc5af7af13ce270edc80cb6f4320a901fd09f00d72 SHA512 a4d3fb6fbc7699eae92dcdfac74acae1e1379ed6e4e7f946bb9f322dd0785721da31ccb074eb41ad4876d61316e243cd11e0380ee3f6e29f1e13faafec692d72
+EBUILD icingaweb2-9999.ebuild 2647 BLAKE2B fa8e259a2c1acaba634189974ed0e4cffd1178d46e88ee33398b0df83d34b3f3ca829834a862960ea7be4af374cfb91a2f9c02e2a01f4de8f2a68500b75cc9ab SHA512 b134e2277cdb896f61a9459b0a07f02b0a7233b63810e95a4df15ee06432e1b4abc53cdc7efe93b3f5b41d939b6500bc8b0fd556db0c8695992846db27f2984d
 MISC metadata.xml 444 BLAKE2B bf24467286f442770ed78cb298cd0fc1d37786b06e85bbc4b20a8c750764e7a831828ebc9b7872772f0a286b12cb67491cb1f84f189cf00e2ec59a6b921e760f SHA512 55e57997695e09ad9cc8448030e8470a0e39a1cbc610f70e29c2a68a4f287e54cb816b0cd1ceec611112849ba97225a60560b67368fb3a6ed68a73a728d61d83
diff --git a/www-apps/icingaweb2/icingaweb2-2.11.0.ebuild b/www-apps/icingaweb2/icingaweb2-2.11.0.ebuild
index 859522be43f0..427ea0f05350 100644
--- a/www-apps/icingaweb2/icingaweb2-2.11.0.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.11.0.ebuild
@@ -33,8 +33,8 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
 			dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 			dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 		)
-		dev-libs/icinga-php-library
-		dev-libs/icinga-php-thirdparty
+		>=dev-libs/icinga-php-library-0.8.1
+		>=dev-libs/icinga-php-thirdparty-0.11.0
 		acct-group/icingacmd
 		acct-group/icingaweb2"
 RDEPEND="${DEPEND}"
diff --git a/www-apps/icingaweb2/icingaweb2-2.11.1.ebuild b/www-apps/icingaweb2/icingaweb2-2.11.1.ebuild
index 859522be43f0..427ea0f05350 100644
--- a/www-apps/icingaweb2/icingaweb2-2.11.1.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.11.1.ebuild
@@ -33,8 +33,8 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
 			dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 			dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 		)
-		dev-libs/icinga-php-library
-		dev-libs/icinga-php-thirdparty
+		>=dev-libs/icinga-php-library-0.8.1
+		>=dev-libs/icinga-php-thirdparty-0.11.0
 		acct-group/icingacmd
 		acct-group/icingaweb2"
 RDEPEND="${DEPEND}"
diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-9999.ebuild
index 078757090855..60f9756ef763 100644
--- a/www-apps/icingaweb2/icingaweb2-9999.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-9999.ebuild
@@ -33,8 +33,8 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
 			dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 			dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 		)
-		dev-libs/icinga-php-library
-		dev-libs/icinga-php-thirdparty
+		>=dev-libs/icinga-php-library-0.8.1
+		>=dev-libs/icinga-php-thirdparty-0.11.0
 		acct-group/icingacmd
 		acct-group/icingaweb2"
 RDEPEND="${DEPEND}"
diff --git a/www-apps/sonarr/Manifest b/www-apps/sonarr/Manifest
index c22b96123173..da32c71dbea4 100644
--- a/www-apps/sonarr/Manifest
+++ b/www-apps/sonarr/Manifest
@@ -1,8 +1,14 @@
+AUX Sonarr 53 BLAKE2B 336359bd45605d20c6b03a70457a453dc1791d70f260f43d9c1749daac500b979dea39b27ca0305677793814cd89c1657552f6c4093b9b4912e1f2bade7f92c3 SHA512 9a5645217f27fe97f7aa93cd9fe31900224067e44c30c0645950a784e7ccb5db59d109de26b84642e88d9e80743813f7cbbb49f590dbdafdb5715ea99a2b52b7
 AUX sonarr.init 153 BLAKE2B b5a4d6540daf982180186d4d46b58669d2afa0ef5cb2f56e2657ffc635c61276c2950f07c56cd6a0d4d55c5302406c28c39e37057882b3ca9d4d4e9382a2489a SHA512 ee42b108d004c4d428ce0db191e2b58e1223997419b3d553908c6ed3d3306eca0fd36d99d59015a20ba73034a4e059f16aa735f512afd247aa0470b945afa1d0
+AUX sonarr.init-r1 129 BLAKE2B 694547ef7125fb05338d85761afae141583108c9b551cd80af0d34d574764f8c80db7c54475011dba4f85981898a8f0d4f8a6eb987c358a5be5bab1d65cf5b1b SHA512 1a6640901e549a85bf98b31cbedf6e1cd17dc576b891e4cb17151bd97d7eb98586b7ea272715303c6e7578072b2ce368d4c462d8c317d1bd9c89aa65fb524699
+AUX sonarr.init-r2 148 BLAKE2B ec52d371fe94038459978619cb51e1a5394d48178af12eaf8e48758af2476edad621866261454a33fc4d1fdf985463c5036442627ded3733531549c00bf7d980 SHA512 769e844e962df9880d5aa6d6030af792e14d6ca7c375f687cb0a62921b784037f45bc7e2d0da2803400f6de5a2a32b5903e3cfa910bc06bfca5a2f90b042ea65
 AUX sonarr.logrotate 187 BLAKE2B ee4f6641669084be16aa4e5bc731d3f86dc50e2d5a71a469364ff86d2af5a9f5a124445d22f1da9e25b4af4dc6891ce9d594323df5757daca8a7dbaa07e2a6cb SHA512 a31988829ee49fcf0fc2d08c1627689d73de08cc08a344c0e01f3f42767c7feae0b89255a30b0f95f45291a284661f150eadeddc146e2d4d1b1d21f22fe8b2cd
 AUX sonarr.service 586 BLAKE2B ee1adb8a3da32d9b7a0b9f51a08c05f2589e29b341773d5d83f49c3f16fab31f097c1e40c992062b7fde174970963cbede3fe5fc4c80c4340109f16ffc2ea7ce SHA512 b19daa0c08dea5349011567ade976a3c6a9d2edce85047d37eb583dbd83716ee6d461d46876c686bb8cf7de136b4b0c77a8b8c7c73dc94dbde6ee7d2559d3589
+AUX sonarr.service-r1 568 BLAKE2B 7ccc2f3def560fd07713e433a657f2664c153acbf316442e516f9591a918dc042bcc8302877e1456af2dc4ae30d44157ffc1b11e6844ea9cbea9990aecd62c24 SHA512 d99f6312ffe8dff2c0d938a3c0e5801355e1323261b7e8752f409ddab5885ebacd9c6237060cd4153bd91e1f1c8c3e70dd69285002956cc45a8259798268bfcb
 DIST Sonarr.main.3.0.8.1507.linux.tar.gz 13647325 BLAKE2B bd269ec2e628075548c9c11db0f9d31f0b9a8c24bb55e0b7d0c58cc32c33423ca4988e9e63170fa6b5f49d438877a88402cebca3183fb98ac5995eb2a38e96e5 SHA512 32efec2207e853a1d7737fc72e9484e62c07a4b39f7e9c6ea0519bcc3220bf4bdb189c6b5dc30aa168912ba912a78c4c5832e2b84bc0a42c46844e76d3b9cc1a
 DIST Sonarr.main.3.0.9.1549.linux.tar.gz 14105679 BLAKE2B 97aa7e5a3836e66433b49e6128779acfe6985fba029a17835a9de31708793752f0f7f59269697f97210994d566708aea2147f199e4d0f51a845c60918d236bfe SHA512 ee97eaa9f2864387619091656843cb57610ada9fd6ad01da3c5414a876ad3b2257572711b2d113477983fcd7456a8eed962bd05928124c6fd9fc66cb80aab170
 EBUILD sonarr-3.0.8.1507.ebuild 959 BLAKE2B 72938c850cd5133418ec3045c46e6f2cc5298a822370f33dbbfa0f7bc1f0f8e635daa9a28f12892d661c94d26faab6e671ef4f80e4dc79c9938d88ffffdf64e1 SHA512 d1cb5d58b5bd4be08165592b117ddc91ee35bf2fe4b25d74fff99dd59ccd860e73e7ec724dadb99a82415692e43b6fcc6ec06163ee557c67138cc15977cf94ca
+EBUILD sonarr-3.0.9.1549-r1.ebuild 1036 BLAKE2B 0e235bc053731f87eb3b83634dfac58ae5fc131c1f475ea50bb0fd445f97c4e03f60d43594cbd8b0c56afb3463b152a361cd1eb04e835fd2ff9696d902db748d SHA512 9a37fe166fad0e584bb249557e13b13c0c00009b454f1fff1af750de173415f258978636da9acd9023568572ad03092c39c1ff04cd64df18e490fa6b7b572b07
+EBUILD sonarr-3.0.9.1549-r2.ebuild 1036 BLAKE2B f90ffde5965043c2b6d46a2e674fa1518ce7518f57dd8a3b4f56c4502b8d22458d0c06391179244509270cccf3b778fdf8d8996da5364b8f49021f18b65c6756 SHA512 e3636d70a832e1fd32c9a7d0ebb9d84b39d70f34edf10f46d734c3b2aa0e66e63d8a71b62d60e46b2a6194b8053cbec61d718714fa4ca8718c407a46982e0197
 EBUILD sonarr-3.0.9.1549.ebuild 959 BLAKE2B 72938c850cd5133418ec3045c46e6f2cc5298a822370f33dbbfa0f7bc1f0f8e635daa9a28f12892d661c94d26faab6e671ef4f80e4dc79c9938d88ffffdf64e1 SHA512 d1cb5d58b5bd4be08165592b117ddc91ee35bf2fe4b25d74fff99dd59ccd860e73e7ec724dadb99a82415692e43b6fcc6ec06163ee557c67138cc15977cf94ca
 MISC metadata.xml 675 BLAKE2B 5ac9fb421e127c8552ee273b784205059a59245d3783efa5c69225dcc34a65cdf00e39de3dc47013807923766110992f557cb3247f9866ec6d0c836b42ab4cd5 SHA512 1c347d1e422a2653fe8c403169cc1f16f7d5c668831d60a67d67a2df8ca90c696fb28fde70cd4a3c9336f983c39fbba30ec570ab7c14caee946cdd983aa6ba58
diff --git a/www-apps/sonarr/files/Sonarr b/www-apps/sonarr/files/Sonarr
new file mode 100644
index 000000000000..773b3504ca3e
--- /dev/null
+++ b/www-apps/sonarr/files/Sonarr
@@ -0,0 +1,3 @@
+#!/bin/sh
+/usr/bin/mono /opt/sonarr/Sonarr.exe "$@"
+
diff --git a/www-apps/sonarr/files/sonarr.init-r1 b/www-apps/sonarr/files/sonarr.init-r1
new file mode 100644
index 000000000000..dd1b7388738a
--- /dev/null
+++ b/www-apps/sonarr/files/sonarr.init-r1
@@ -0,0 +1,7 @@
+#!/sbin/openrc-run
+
+pidfile="/run/sonarr.pid"
+command="/opt/sonarr/Sonarr"
+command_user="sonarr:sonarr"
+command_background=true
+
diff --git a/www-apps/sonarr/files/sonarr.init-r2 b/www-apps/sonarr/files/sonarr.init-r2
new file mode 100644
index 000000000000..76b8dbed164b
--- /dev/null
+++ b/www-apps/sonarr/files/sonarr.init-r2
@@ -0,0 +1,7 @@
+#!/sbin/openrc-run
+
+pidfile="/run/sonarr.pid"
+command="/opt/sonarr/Sonarr"
+command_user="${GROUP:-sonarr}:${USER:-sonarr}"
+command_background=true
+
diff --git a/www-apps/sonarr/files/sonarr.service-r1 b/www-apps/sonarr/files/sonarr.service-r1
new file mode 100644
index 000000000000..542f5d7f1031
--- /dev/null
+++ b/www-apps/sonarr/files/sonarr.service-r1
@@ -0,0 +1,30 @@
+[Unit]
+Description=Sonarr is a Smart PVR for newsgroup and bittorrent users.
+After=syslog.target network.target network-online.target
+
+[Service]
+User=sonarr
+Group=sonarr
+
+Type=simple
+ExecStart=/opt/sonarr/Sonarr
+TimeoutStopSec=20
+KillMode=process
+Restart=on-failure
+
+PrivateTmp=yes
+PrivateDevices=yes
+PrivateMounts=yes
+ProtectHome=yes
+ProtectSystem=full
+NoNewPrivileges=yes
+ProtectHostname=yes
+ProtectClock=yes
+ProtectKernelTunables=yes
+ProtectKernelModules=yes
+ProtectKernelLogs=yes
+ProtectControlGroups=yes
+RestrictRealtime=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-apps/sonarr/sonarr-3.0.9.1549-r1.ebuild b/www-apps/sonarr/sonarr-3.0.9.1549-r1.ebuild
new file mode 100644
index 000000000000..a3d2abfcc0bc
--- /dev/null
+++ b/www-apps/sonarr/sonarr-3.0.9.1549-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+SRC_URI="https://download.sonarr.tv/v3/main/${PV}/Sonarr.main.${PV}.linux.tar.gz"
+
+DESCRIPTION="Sonarr is a Smart PVR for newsgroup and bittorrent users"
+HOMEPAGE="https://www.sonarr.tv"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="bindist strip test"
+
+RDEPEND="
+	acct-group/sonarr
+	acct-user/sonarr
+	>=dev-lang/mono-6.6.0.161
+	media-video/mediainfo
+	dev-db/sqlite"
+
+QA_PREBUILT="*"
+
+S="${WORKDIR}/Sonarr"
+
+src_install() {
+	newinitd "${FILESDIR}/${PN}.init-r1" ${PN}
+
+	keepdir /var/lib/${PN}
+	fowners -R ${PN}:${PN} /var/lib/${PN}
+
+	insinto /etc/logrotate.d
+	insopts -m0644 -o root -g root
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	dodir  "/opt/${PN}"
+	cp -R "${S}/." "${D}/opt/${PN}" || die "Install failed!"
+
+	exeinto "/opt/${PN}"
+	doexe "${FILESDIR}/Sonarr"
+
+	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}@.service"
+}
diff --git a/www-apps/sonarr/sonarr-3.0.9.1549-r2.ebuild b/www-apps/sonarr/sonarr-3.0.9.1549-r2.ebuild
new file mode 100644
index 000000000000..49124b0696ba
--- /dev/null
+++ b/www-apps/sonarr/sonarr-3.0.9.1549-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+SRC_URI="https://download.sonarr.tv/v3/main/${PV}/Sonarr.main.${PV}.linux.tar.gz"
+
+DESCRIPTION="Sonarr is a Smart PVR for newsgroup and bittorrent users"
+HOMEPAGE="https://www.sonarr.tv"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="bindist strip test"
+
+RDEPEND="
+	acct-group/sonarr
+	acct-user/sonarr
+	>=dev-lang/mono-6.6.0.161
+	media-video/mediainfo
+	dev-db/sqlite"
+
+QA_PREBUILT="*"
+
+S="${WORKDIR}/Sonarr"
+
+src_install() {
+	newinitd "${FILESDIR}/${PN}.init-r2" ${PN}
+
+	keepdir /var/lib/${PN}
+	fowners -R ${PN}:${PN} /var/lib/${PN}
+
+	insinto /etc/logrotate.d
+	insopts -m0644 -o root -g root
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	dodir  "/opt/${PN}"
+	cp -R "${S}/." "${D}/opt/${PN}" || die "Install failed!"
+
+	exeinto "/opt/${PN}"
+	doexe "${FILESDIR}/Sonarr"
+
+	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}@.service"
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index ef283eff6f96..e8f9b927e9aa 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 8704f51d3f0d..e1484ec3968b 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -601,7 +601,7 @@ DIST firefox-91.12.0esr.source.tar.xz 379877004 BLAKE2B c00e5cc219c59d8347a69e52
 DIST firefox-91esr-patches-10j.tar.xz 18320 BLAKE2B ec882411eed19bafab8676e3d79f4ae43947bb97c44571c1497bb93a44fcfec99de06ebacbdf8c4944dcecdf949e4f684908d7ce4226cdcec60241e62e75810e SHA512 670a14d852bb74b9074c3fef9310650f71ce1c56314109c49aea02a7a69acc836af60a8beab11da53e21b10a8e6da341fcfa18b68a1dfd33b26978dd63758e9c
 EBUILD firefox-102.0.1.ebuild 37139 BLAKE2B 1ed14a48c14bbebfc23e6327b8d63e1ca76d28a5a6274d21b18735fd5d914e43e2f46e81b2ac17476818027eeb86e2a5c3806281a516923ac66d9fc47baec95c SHA512 39fd9d8b90a5bb9951856c66dc7681d5d3f5febdcc5d142128258c81b15f9d0f887167a552682fab18e8f3af2a1954c7764e737c1548c2f0e867c59553db65f2
 EBUILD firefox-103.0.1.ebuild 37014 BLAKE2B 79af56094abd978d936800fc2739cf5611d75e2243f6d90d385141b7736079e5d939b665c18da94d80dd341ae5ab73edb081dbe356d07fcaaa61a0e2ed27dc10 SHA512 c89852021204d736bacadd5c4fd006cf3e835cb6ed893aae84d38c60d4e5722b5cc57c69dfb88bb0c603c7001329bb985029896359afa71de4eadae69eff6fb9
-EBUILD firefox-103.0.2.ebuild 37014 BLAKE2B 79af56094abd978d936800fc2739cf5611d75e2243f6d90d385141b7736079e5d939b665c18da94d80dd341ae5ab73edb081dbe356d07fcaaa61a0e2ed27dc10 SHA512 c89852021204d736bacadd5c4fd006cf3e835cb6ed893aae84d38c60d4e5722b5cc57c69dfb88bb0c603c7001329bb985029896359afa71de4eadae69eff6fb9
+EBUILD firefox-103.0.2.ebuild 37012 BLAKE2B 67b6a46e8177ad1b568485ce7f6017d15bcab54b8c0ee5acc073f37df2b03093bd04b559c232b9428ddd5494c3d07629f6b352ca09138b1d39fe7d1d9cd24b4e SHA512 25e59e80b2afaf572c2e9dd60977caebbf6be9225e533ccd9ae95fea366d2289f98245211173283c0666cbf5ee6abf14f251d6322868662c3a677bf632b4ceef
 EBUILD firefox-103.0.ebuild 37033 BLAKE2B 7f71ee77a0a68d68385fc5428e1c2061afc04ac426fd7a897f595a61d636a231c72c1d8d389d0d53389d0536b3eaef6f1f20bbcdb3dd774ef17de9e488244631 SHA512 011158b6a1ccda18b61e92c2657389acabf527d8eb21b59e63c5b72d5a7f94fbcb50b4061eb6098ede5ed2499e24abd2423fdb4ce96f0d885e9d4ddcb4ff7cf8
 EBUILD firefox-91.11.0.ebuild 35732 BLAKE2B 34ac3cd27fa40eb44411c4f0604cc89997dcab84dffbae6548da01f6f98b6f51896916d73072d27c8c958273550290646c3e68df8794199517750b72745c2727 SHA512 8e213ae366600e1fbb130d720177db03bfbd133a35fedfbfbf45d0721f4851534831b43b752404f682e9001def063484791707c1e4a421266fb88a7327b3fd88
 EBUILD firefox-91.12.0.ebuild 35570 BLAKE2B c14dcbc494bc36b0e668cda3a7b85e97566de563e91d82d49a15e84f9136a43566c0fd5551735f604b9bfaf6af7d518044a2d1d1bd16e25153cf7215ed6508fa SHA512 d70e1454d95e4b05f1ceb4cf29e3ab39f5542368c84cc1624d7f826f259df5ae6e0f39e051a5a3e5deac6b62c5c276e4c63fe31e22237afd4f89c008d1dae38a
diff --git a/www-client/firefox/firefox-103.0.2.ebuild b/www-client/firefox/firefox-103.0.2.ebuild
index f63628c3fda5..f570f6f6b4f0 100644
--- a/www-client/firefox/firefox-103.0.2.ebuild
+++ b/www-client/firefox/firefox-103.0.2.ebuild
@@ -1271,7 +1271,7 @@ pkg_postinst() {
 	# bug 835078
 	if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
 		ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
-		ewarn "enabled for Firefox. Nouveau / your GPU might not supported the "
+		ewarn "enabled for Firefox. Nouveau / your GPU might not support the "
 		ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
 		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
 	fi
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index da7b88e46b4c..9a03fe250c5e 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -6,4 +6,4 @@ DIST lynx2.9.0dev.6.tar.bz2 2730690 BLAKE2B 2b176db49ac053e6c057b366b625883f0877
 DIST lynx2.9.0dev.9.tar.bz2 2746988 BLAKE2B 6b5658b6bc224d02fe89fe31a1b8cdac5f736d68545fb6508f3a3b83e9c7537599dbacf5000320a019f0fab1059d5d4516e8d54341ef7d3384605d9e2f3c19da SHA512 ad343a7bc254cf287accde305db556101f7fa0f081e7c1c4327d7a4366c74cdbfb03ec003b0bc176768bbe726eae3e1bf8361416e0364ccdfe40d63fbc5b6dc4
 EBUILD lynx-2.9.0_pre6-r2.ebuild 2536 BLAKE2B 2e56c0a17e40ccba0f78199c3ff7bef7362b8b42d5ef42c1ed7792aa0e1fde92d20c70fdebe9e835083770f155bd0a84cc2ba9d40c1e270196aac8b38bc73247 SHA512 2d9aaa442037c25d0ea67bbd2acbc80361dbba7ebe6f27ed2525f74f6aff594b490bffe3aac9a1791d5470f832cc062151b022e193579b187af9935d25061a89
 EBUILD lynx-2.9.0_pre9.ebuild 2431 BLAKE2B 433087b1de3ccabb65d95a8006f2bcd4c1fb3e761f0bda24e35f2ac67e1b8914597d8529632616831cc85566825f90434a191a6c56c22ad9e75f20ae6ea514fc SHA512 8a45029298dfe9f27d2461be8814d78d6ac70f6ca25443e8d882f9117e10fa34bbf4e9ac0d5ec487bed58a3d41b182bd59b7ddc1b46f4a93e322f064204cb8a3
-MISC metadata.xml 454 BLAKE2B 065cada61ba3fae08cee69fbce83bef6daa178878ddff8dfd834d0dde0f8e3743744fafcfb40ed83a2ff75820007aa413daaa6cc202ee786b5b07aa2c501489f SHA512 179f656c2675f80a0bb17dba6b616064533df16575a42455a4f8188ac44305a21da35b0c24ef7fb97b270161b2b500906f1c0cb819074a57b381131d11de17c4
+MISC metadata.xml 521 BLAKE2B 1c520669081f0dfd89ddc4a9a9c121e02fa4e184d28ed796b7e8e160affff889cefedd23b4a0f38d4d4acd2c9e2e8426715a0b8d0f37fa14d4d12fb4f063a9d8 SHA512 2192536d199e0e00dc2add38560b72c8a772966192f394704bc9410674b413791d2d262fefe729a32726f2c9b166f52f7af54d5d71f0868072853c3cfea151b1
diff --git a/www-client/lynx/metadata.xml b/www-client/lynx/metadata.xml
index cff28d637bc8..142dd473b0ba 100644
--- a/www-client/lynx/metadata.xml
+++ b/www-client/lynx/metadata.xml
@@ -8,5 +8,6 @@
 	</use>
 	<upstream>
 		<changelog>https://lynx.invisible-island.net/current/CHANGES.html</changelog>
+		<remote-id type="github">ThomasDickey/lynx-snapshots</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 15f3f071bc6c..78532f75f072 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -6,6 +6,6 @@ DIST seamonkey-2.53.12.source.tar.xz 288302876 BLAKE2B f09a4b8bee9895ccebeef9dbd
 DIST seamonkey-2.53.13-patches.tar.gz 64940 BLAKE2B 8c3e62da825fc998137243026620ddcccaf2c7b6bf187b643a4934c99cbbe3f87bfe17bcf638b5eb14f60447bc46cbeb359ab7897e424c9ec46aa389b23ad041 SHA512 fe54a6c632595ae3c918c657fd42f341135ab6e620b178c4d1a077ea425ab975e211174ea86290e6e1f2586ceead226f4457abdf420fa51878e32bc0150116cf
 DIST seamonkey-2.53.13.source-l10n.tar.xz 13641692 BLAKE2B 865d7fafc64fd6b0831abe2979b45f833823d50113f69f9e403ed74c16869207dfef15319185b1dec14d09927cdb167c9787829a5d41d3fe8d4abe1874931699 SHA512 ddffde1309f1b9f8d8a82d061494002e6525f2b0b724190a1367204010a9e1f0214abb35d391732fe52f93dd4cdbb1cab82ebe2c6297c876a080bcdf5904e862
 DIST seamonkey-2.53.13.source.tar.xz 253664548 BLAKE2B af8fb0b3ac339d8c468cfcfa9cf0594b93d0aa0d40a7a32b2d3a99c980ad4249983725347110b8cc87da0f4fbc7629e37c6cbe27f0bed181ede9b1df4292c297 SHA512 f95fcec1dd732c3ca8218e6359c51260d44c40c8c2f34ad11ee160166f4df7c2184dd5d7e02b4ee363700d189e8652fabe7aeec8d0917ea9589ec1baa714f7a2
-EBUILD seamonkey-2.53.12.ebuild 17825 BLAKE2B 7955d34c3c3e1b9d7398ae5d75f4b79e72997400c8211e3004278c2b4632894b0a45b37948e6c4528aea9bc50d89717f0591067456c359d13c513eeeb633d624 SHA512 96c56786ec64c563b484998e61fd63fc109d0ce4a07de887dc84312cdceb93f3d290b8d6d273517f998eafd9236ba332a72883cd6a25b2b8e6b8461ba01be216
-EBUILD seamonkey-2.53.13.ebuild 17045 BLAKE2B dac5169bfecf9150cd695079016e0c7a3a81b6c4b54ec2a4621d1fc6f1543ae6b82940ae06d3724715675ad371cec8980075d65ce88fa3766f0ed7b04295d1b6 SHA512 fc68321a3f0c91310ce1a63677fbc669a44ddecba5f85bd326daec41dc36c2000cfa7e6c8d24859e0cb5186c0c9fe661e7635c23de3c6bc5425d8c5a78f5454f
+EBUILD seamonkey-2.53.12.ebuild 17827 BLAKE2B ec7474597f87f8956a889fb6af86e8d018b2fb280e87fc23eba578aa6e8fcf5b8ff129ed3f0b18684697ee34989db7053928b5a2b8783cd942f0b33027ec4d39 SHA512 5d1c80d82fe91b175c4d50b19b69164804512fffa4a2fff6c3ebcd039a3f7e23a3534e62026633390909cb8ef06f554234441f333f58f8ed30dd8d4372bede72
+EBUILD seamonkey-2.53.13.ebuild 17047 BLAKE2B 550e6615eaab2d2b01365023491242bcab5fec1097dae2a7be4964182202fba443d18e0a24a136e217753e865c3a022d50f87a327d48d2dde5e589937ada21b4 SHA512 380c578a29f7858f4a0d4e991fcc16066f3e2d32984445dd23d1c77c72ce6aa4431d5e09d4d61669a0a64ce68f782f38e8df4e83b1a2884afa438ae0120a9b52
 MISC metadata.xml 2085 BLAKE2B bdc1da446f817a45f519f41f0eaba8c8437e81a1c4387cd94e168ed35548692b0b137e98a890cdd3cbb10fe3876820123fa22f64f69be8cb2fde31548184eca2 SHA512 50d64f3eba08f582c723328d7face922a67f62c08e3f23e719fe49092584e2e59e3e5e6a82e4b7bae6f9b05180f70e2e3cd5246315bd980a89207bb9172ed230
diff --git a/www-client/seamonkey/seamonkey-2.53.12.ebuild b/www-client/seamonkey/seamonkey-2.53.12.ebuild
index 89167ba21bb6..f296acc6009e 100644
--- a/www-client/seamonkey/seamonkey-2.53.12.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.12.ebuild
@@ -539,7 +539,7 @@ src_install() {
 
 	# revdep-rebuild entry
 	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN} || die
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> "${T}"/11${PN} || die
 	doins "${T}"/11${PN}
 }
 
diff --git a/www-client/seamonkey/seamonkey-2.53.13.ebuild b/www-client/seamonkey/seamonkey-2.53.13.ebuild
index efeab5f7dcaa..c47170f1c11d 100644
--- a/www-client/seamonkey/seamonkey-2.53.13.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.13.ebuild
@@ -516,7 +516,7 @@ src_install() {
 
 	# revdep-rebuild entry
 	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN} || die
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> "${T}"/11${PN} || die
 	doins "${T}"/11${PN}
 }
 
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 815ee5ed3b41..74569a7183d7 100644
Binary files a/x11-apps/Manifest.gz and b/x11-apps/Manifest.gz differ
diff --git a/x11-apps/luit/Manifest b/x11-apps/luit/Manifest
index 60a171cdf640..b234e51ca169 100644
--- a/x11-apps/luit/Manifest
+++ b/x11-apps/luit/Manifest
@@ -1,3 +1,3 @@
 DIST luit-20220111.tgz 206011 BLAKE2B 030f4c734b1b63c7f51f4e601445522a318b9b0cb3d291d9a392c8aac12315088115e513d368977c3a4536c580f033b78ab575ae4d6d4e8439c53fad6f5cd5e0 SHA512 c3e0e2e7e9da5ca1176f61b1aa050e6a525af1e4c924d9685ae0684657e549093677240cc3f74517dcb12821f7c447e5b4f5306f37d1ddefc9fc7bf1971eee28
 EBUILD luit-20220111.ebuild 643 BLAKE2B bd0c94e5dfc82af625a02323c820b184df988ed12a5de6ec4eea0e0eed55525e67c3b7d82d32139432c15a1fa89891206d3e92651a6ceeefa58ebb866adf3eac SHA512 8d4bf29e8b9765637ca88976d8dae5792b0c2ecf4801b110d07d056cb156a7a73041dde16b7e22adc752f3fefbda75b2537010526bc5ba07185ebdf61ed00a4e
-MISC metadata.xml 266 BLAKE2B 480d87d101d6c5967bb91a576bb1c3702ebf9b6aceafcb69a7a25a89927cdb7fa48a4d305c8636b580c1261497c215c94c9136340ebde6a2f39a49c671d5bc8f SHA512 138e12ed699397d42af1e5b9bcb5c9d94235ff5333192258b93b0b30f0f7a0ba7c321e3c8d4fa79d6da60c3f19286caf01a675e4d9b1f04ed935b93310890cc6
+MISC metadata.xml 333 BLAKE2B 5f4b1f673dd8208a3b23c5f522e08e0762c30f5a073cbda959e74b8949d747e83a97cb2908a295f9d3ed4d25f296a9a8c65f4d15f3ed3b5c46afd1e49c3f9c4f SHA512 1819ed06cf5efe5ac10cd04ba571788df4002de323bbb4785888eaacb7034a1d15996ffeecf6284591ff6851325abff391ec816ea09c05ea2bdacc8069712c2e
diff --git a/x11-apps/luit/metadata.xml b/x11-apps/luit/metadata.xml
index a9008c5e06b0..0dd220c66856 100644
--- a/x11-apps/luit/metadata.xml
+++ b/x11-apps/luit/metadata.xml
@@ -4,5 +4,6 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<changelog>https://invisible-island.net/luit/luit.log.html</changelog>
+		<remote-id type="github">ThomasDickey/luit-snapshots</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index b6b82df9c7ae..5dd9b381c0d5 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 63fd365ea275..7adc988bd6d0 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,4 +1,6 @@
 AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e7c95c59ec0b8d5f65f72c1675186b0c0cc105be5537e7b4660730dce3799227217a582a64f295afbd33a8cf52071f5fe8c4e153c0d3 SHA512 0a3e51c52f947d6231b472525b11e13fdc752b8eaa34c95ec3c76cfb0faf33ef3109c8381189261e8ebae76a4070af24e58c373bebc69bbb6b69399bf833395d
 DIST gdk-pixbuf-2.42.8.tar.xz 8503020 BLAKE2B 39960043c5aa980f311d2705c868c170c90c7b580ac9ae849a3fdfc6a5faffcc24be23b82ca8fefb1cd5c28d2a02bfb87b1c5c5d1eab7b897f5e551a57577f7c SHA512 994a1374becec6235d347f4980afcc8b85f43ac373e4d7e00b7445880d0a51932e63b54429b28ab5af09e7c4437f9d6008e1c25b2d44a2c9ef7cc9821b478387
+DIST gdk-pixbuf-2.42.9.tar.xz 6596068 BLAKE2B f464a6b326aee185b30b24f66267ad7eacd12e8b3bd07e7cebfb42a496791561cdd71cd937282d72f1fc55ee1e86b531f7e737a2dd00f2187d705865be177919 SHA512 032869c98d22cc4add05198baec5a64d29af247a99a084d7c498f82f467fb2a2008a8d0d4564ee5d963f6965dc9b3ff61b6c07377f67fec70ddf14e5373abfb3
 EBUILD gdk-pixbuf-2.42.8.ebuild 3459 BLAKE2B 76c75c89dbaf850cb2943962ccf72eaab6c2ebb5bd78f4f3f214f64be80adf41f3204167aa2e6ce2be2cfb46d5917d50676f0a3ee54320956b914786cfc8e5dd SHA512 293bf38a0ca34fd3c9669e56631e0823aca22fd48308f94961c7acb32de7d7670d7302b43f486d3f93c49a86190a3fcc2df942342dc2d27d108103bbd732cf6b
+EBUILD gdk-pixbuf-2.42.9.ebuild 2780 BLAKE2B d43b47e402c1b668ecafc48e97da9c4d170f3f07c6145e2335e4b047c78d50dbc3177410b96d0d2ef53fed17d02b1c7e8a19555a7bd06f6053400d833eff5e4f SHA512 406f9d52238ce73b44a41093f3142c005ef33272a92fb5a30300b13f3e4a77bd1f6b81d93f9822e6337500ad52aa38cf2e749facfb68ab2364fdd6ebf73aa63e
 MISC metadata.xml 332 BLAKE2B d11021f9889f64b977816523c2ed8f4b122b3f510e9649ef1548584f99b97e28f782d6fa753e92042bfefc8da4d1c9694949559660d99bdcdaa648af0bb01c4d SHA512 9bfa76b3e49cc2038dfa8af478bd12ec1832c4cf073987a88d6c1b0da791496d45f20b7a411e08c89bcffa1ce207fa07c08da244f93a2534175e0b80079965af
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.9.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.9.ebuild
new file mode 100644
index 000000000000..aad9b485be43
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.9.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson-multilib multilib xdg
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+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="gtk-doc +introspection jpeg test tiff"
+RESTRICT="!test? ( test )"
+
+# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
+DEPEND="
+	>=dev-libs/glib-2.56.0:2[${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+	jpeg? ( media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
+	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/glib:2
+	dev-libs/libxslt
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
+)
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	# dev-python/docutils installs rst2man.py, not rst2man
+	sed -i -e "s/'rst2man'/'rst2man.py'/" docs/meson.build || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dpng=enabled
+		$(meson_feature tiff)
+		$(meson_feature jpeg)
+		-Dbuiltin_loaders=png,jpeg
+		-Drelocatable=false
+		#native_windows_loaders
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+		-Dgio_sniffing=true
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_native_use_feature introspection)
+		$(meson_native_true man)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/gdk-pixbuf "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/gdk-pixdata "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make sure loaders.cache belongs to gdk-pixbuf alone
+		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+		if [[ -e ${EROOT}/${cache} ]]; then
+			cp "${EROOT}"/${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	multilib_foreach_abi multilib_pkg_preinst
+	gnome2_gdk_pixbuf_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	multilib_foreach_abi gnome2_gdk_pixbuf_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		rm -f "${EROOT}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+	fi
+}
diff --git a/x11-libs/libXaw3dXft/Manifest b/x11-libs/libXaw3dXft/Manifest
index 1bbbb6a28a26..5ba5785e8499 100644
--- a/x11-libs/libXaw3dXft/Manifest
+++ b/x11-libs/libXaw3dXft/Manifest
@@ -1,3 +1,3 @@
 DIST libXaw3dXft-1.6.2h.tar.bz2 593436 BLAKE2B e0e5c3a3e5b4564d58bb059ad7eb594d1a46cc37e0e21799ea11892d206a57f3f11a46d7413310d2a43738f03e001f5dc6f8c3b86bbe806fbc651661e9f720db SHA512 bc9b6de80379bdc82c7f5cd46ac78a422282b018eed979ef5548d0382f43e53619a6ebaf40c6b9ae264d597536022dc1daf023c1d1a04e948d4b4658bc6479ca
-EBUILD libXaw3dXft-1.6.2h.ebuild 737 BLAKE2B 7588db2950c7574fb799a1c067ba2ee916a28d473e1dae53f2bd942e437a3565028b3beaccd63a6e4fad7ff13d4f7fdbf71260ee8cc8b26fabb6bfdddb8a7066 SHA512 b2cacfb2d2dc7975d8f5e16b6391a32100b515e656947faceb42203d1455f5e8eec7648515ccf13007bec2b2d2db7db6596a537945b783e01a97decc71038fe9
+EBUILD libXaw3dXft-1.6.2h.ebuild 799 BLAKE2B d738a11d8970718a695ad9fa165bb1407a1adbd4a1d165fabb8438b0c59caafbd91f005808953e22cb17a70f6e03034b02f00afaef8d13364a75ddc8db231563 SHA512 53e2075e19e38fa12e3d8a299e1ea07bb88bd4546098b15ba76292f1d2272034e31ebb4c2fb86d20b34e9f7a3637e07254d61c2789899ce0286db489f2607a7c
 MISC metadata.xml 482 BLAKE2B 72697de1fc204fcd4873595c5b22d8e45fbd4a7fc036003da81d425df1e022574fac78dc373cbcbfc618d748e0532dbdf5cdd52cd98bac569545515d1f040171 SHA512 7e29b3ac2214a41c2812af079b69d7b5784fc52b957b6807059d8e5daf18ebd3d9ab059db1852cd736c3efa8f944ddffefedd11f9263a0db1d70ac76e1d19f05
diff --git a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2h.ebuild b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2h.ebuild
index 3523c3b1a0bb..d42b0426bbdf 100644
--- a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2h.ebuild
+++ b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2h.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="Xaw3dXft library"
-HOMEPAGE="https://sourceforge.net/projects/sf-xpaint"
+HOMEPAGE="https://sourceforge.net/projects/sf-xpaint/"
 SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
 
 KEYWORDS="amd64 x86"
@@ -23,7 +23,10 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 BDEPEND="
 	sys-devel/flex
-	virtual/yacc"
+	virtual/yacc
+	x11-misc/util-macros"
+
+QA_PKGCONFIG_VERSION="${PV//[!0-9.]}"
 
 src_configure() {
 	local XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest
index c833fed5449d..211a34826ae1 100644
--- a/x11-libs/libvdpau/Manifest
+++ b/x11-libs/libvdpau/Manifest
@@ -1,3 +1,3 @@
 DIST libvdpau-1.5.tar.gz 152838 BLAKE2B c3d76c1e46b718d71daff74232f2de9efb989c496cef7fa1016ec76d751530be39b5b6ad6354819579043f23744a647492d5d52b5ab93cae89dd82fb17d08289 SHA512 cebe0e0d9411b87238fa2adec40516881c61a67f33f80c22372f514e672e2dff839687291ab0b01d47af811c254fa65da579f360fcded3f65e382720548d3ea5
-EBUILD libvdpau-1.5.ebuild 934 BLAKE2B 55ef409c47b1c2999c119c175fae00238e4868d84001fb0332e22389080eb29b9d8cad7940422ceb82ae7e6001b4885cb25340f38812b189c8de70e0f54bf7b3 SHA512 f73eacec85942d7786bf8ccb0886047dddba19d6d649cdb4ea4321f28e17c4aa765e94d6120d4e0f06bf727e18855a420641149edfce4cb2ea8834bfcb27f642
+EBUILD libvdpau-1.5.ebuild 935 BLAKE2B 3dd6bbaa9a3bcf49416a532ecdd071f89c2dda70d83dea08f52376cb89e8f41d4e78f9044f80e0d243ea479b74b0debd317d8a0eec8b3725fc5c4c3eecaab610 SHA512 6a6bd6492b82d6fe68c3427e778bc0f5c9773229e74e36a821e5c5fa080dca501150e5d6550883e26cd18daf1fa4e31bf29011a577bc03267d47cb0bd8cbdd10
 MISC metadata.xml 246 BLAKE2B a512e6e8ffd8a998f89ea9dbf8a29dd4bb2d6db435e4ac0ef3182fc23996e04a6e87c1771975d835038ad86d6cb61e4a1aea8b80286666d64ad0b511c9d8f163 SHA512 d827f64596500d61c0f24c9d2a69fa3ca2f8b52e5f5815106d7db2837482172f0518d99677e6332a69fd4c34289ef817203a5047363ea7d2c10372b09f9e0618
diff --git a/x11-libs/libvdpau/libvdpau-1.5.ebuild b/x11-libs/libvdpau/libvdpau-1.5.ebuild
index 0ec6c6eb88e1..b9492cf8a92c 100644
--- a/x11-libs/libvdpau/libvdpau-1.5.ebuild
+++ b/x11-libs/libvdpau/libvdpau-1.5.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit meson-multilib virtualx
 
 DESCRIPTION="VDPAU wrapper and trace libraries"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU/"
 SRC_URI="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 016c03af1408..59752d467d9e 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/devilspie/Manifest b/x11-misc/devilspie/Manifest
index 817ccdccd446..16c6ba281f13 100644
--- a/x11-misc/devilspie/Manifest
+++ b/x11-misc/devilspie/Manifest
@@ -1,3 +1,3 @@
 DIST devilspie-0.23.tar.xz 130984 BLAKE2B 86b1b472d23ba49fdcc27c1d5a48ef95e3edd1c236569a3d25e23c8947ed41d91ce35969939cefc8ee1b74eb65594f91617172d35350e873977f4e8856e71ce4 SHA512 6ea6c79d317b0f35d943ecafa010e8c6011870796d83ff0a24a4853ad0ebad93608173dd1c4b645254d53c5c182c667e6eba42a20f764f258c211ee2bcd19174
-EBUILD devilspie-0.23-r2.ebuild 657 BLAKE2B e3f25b47a3542710e76cb3ffbe7bc74ba4a39ad8f0ee00384a0eccbe46b67cacc3e4c12c5525131a536ef746eed323f4dd78d0feafc5f2deca34d3f4d12855e4 SHA512 566f45d28d0326914668c92c1d714b219fad96c58f041e648b0d921754d13085ad148304a11bcd0da486b558805c0ceeceedaa5b816d5ba58550b11e0387fc08
+EBUILD devilspie-0.23-r2.ebuild 660 BLAKE2B 7ca6ce6af92bdba994591a7f226c4f317348a03b57c2869b02a1a2b3cb27ac53f3d4bc106d9935e1edccf93a6509c23920fca3a963e607430e61076fc8b04113 SHA512 13c0a577b95c902fcf17f28baf04bf472a48d9c3d3c08118f3ba6c6ef68fcf4fda20dc26c4e9a459f8e1712dc637519eeb795fd6b032a76b488aaa02a0b1ee1d
 MISC metadata.xml 246 BLAKE2B a512e6e8ffd8a998f89ea9dbf8a29dd4bb2d6db435e4ac0ef3182fc23996e04a6e87c1771975d835038ad86d6cb61e4a1aea8b80286666d64ad0b511c9d8f163 SHA512 d827f64596500d61c0f24c9d2a69fa3ca2f8b52e5f5815106d7db2837482172f0518d99677e6332a69fd4c34289ef817203a5047363ea7d2c10372b09f9e0618
diff --git a/x11-misc/devilspie/devilspie-0.23-r2.ebuild b/x11-misc/devilspie/devilspie-0.23-r2.ebuild
index 0b9696b3ff23..985daf2b245f 100644
--- a/x11-misc/devilspie/devilspie-0.23-r2.ebuild
+++ b/x11-misc/devilspie/devilspie-0.23-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Window matching utility similar to Sawfish's Matched Windows"
-HOMEPAGE="http://www.burtonini.com/blog/tag/devilspie.html"
-SRC_URI="http://www.burtonini.com/computing/${P}.tar.xz"
+HOMEPAGE="https://www.burtonini.com/blog/tag/devilspie.html"
+SRC_URI="https://www.burtonini.com/computing/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,5 +25,6 @@ BDEPEND="
 
 src_prepare() {
 	default
+
 	sed -i "/doc\//s@devilspie..@${PF}/@" devilspie.1 || die
 }
diff --git a/x11-misc/vdpauinfo/Manifest b/x11-misc/vdpauinfo/Manifest
index 691960b78cf1..5f74a299d304 100644
--- a/x11-misc/vdpauinfo/Manifest
+++ b/x11-misc/vdpauinfo/Manifest
@@ -1,3 +1,3 @@
 DIST vdpauinfo-1.5.tar.gz 12246 BLAKE2B 5673eb6d00e501234cab3434ee06ef428495f86cf18304eed628e41dd0b17f8fe25aff8ef3bb896f4f70eefe2121446eae740c638b48b3ae1bc3547de4cb3102 SHA512 f3d359242443de919803ae0b8d89809c71e94d59d8ee9994f8f315036b829ad24030b75d953346989c1d0ddf436107041491e299c3212b013ad1d2b3c0571e59
-EBUILD vdpauinfo-1.5.ebuild 548 BLAKE2B 59392934c2cd5be295e2c944877ef2d648df9bc3d2ff809dc9ea4e898281c7478e2ff3f50ad3b3449bc683f6bd34113ad90d406c2378de4db306d6412c35e090 SHA512 606eb3ee428b6b160377e162875e5738a0ef4b2ec8b0307fe73effba137c8f1ccaf05294183e67622b31cfbd260e6219667c31a81d24c0f17bec18e3c009adf3
+EBUILD vdpauinfo-1.5-r1.ebuild 606 BLAKE2B 827e399afd8d24622e1b5650a7efc52c55bdc227fdcfe68ada8a831c5c4e922ae2573e1dbdbe62453f9884c6b664d772323a4e3e906bf8f867dc34b0f774eb9e SHA512 719f02f26bdccc92afc21bc8502d5fddd6e21d6004946113eaa6bb281ede40917eb551181bd9abac89249e01b634d8d8c9cd057e17e34475c17014278e2001e1
 MISC metadata.xml 246 BLAKE2B a512e6e8ffd8a998f89ea9dbf8a29dd4bb2d6db435e4ac0ef3182fc23996e04a6e87c1771975d835038ad86d6cb61e4a1aea8b80286666d64ad0b511c9d8f163 SHA512 d827f64596500d61c0f24c9d2a69fa3ca2f8b52e5f5815106d7db2837482172f0518d99677e6332a69fd4c34289ef817203a5047363ea7d2c10372b09f9e0618
diff --git a/x11-misc/vdpauinfo/vdpauinfo-1.5.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.5-r1.ebuild
similarity index 77%
rename from x11-misc/vdpauinfo/vdpauinfo-1.5.ebuild
rename to x11-misc/vdpauinfo/vdpauinfo-1.5-r1.ebuild
index 4969f9251cdf..1094701a0a2e 100644
--- a/x11-misc/vdpauinfo/vdpauinfo-1.5.ebuild
+++ b/x11-misc/vdpauinfo/vdpauinfo-1.5-r1.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=8
 
-inherit autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="Displays info about your card's VDPAU support"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU/"
 SRC_URI="https://gitlab.freedesktop.org/vdpau/vdpauinfo/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
@@ -25,4 +25,6 @@ src_prepare() {
 	default
 
 	eautoreconf
+
+	append-flags -fno-strict-aliasing #864755
 }
diff --git a/x11-misc/wmctrl/Manifest b/x11-misc/wmctrl/Manifest
index 5c7cb82ce550..eeb6b03d583f 100644
--- a/x11-misc/wmctrl/Manifest
+++ b/x11-misc/wmctrl/Manifest
@@ -1,4 +1,4 @@
-AUX amd64-Xlib.patch 1126 BLAKE2B f867b520c9175f0ecef50734ba3a7af78e474ff30b5c40bc88e3df5cd7dd85889a07e0d2f197f23807ae7234c6e407d3562801799c76001e9afa4964026a04f3 SHA512 8db78cf8c267bf2af30e3e91bcd334ea3c6fc8bb5e76afe4a6d9923341631402bf09c7ad55975c8c74f7b54ae288fae7dfdfe737227a72663785b02ec3416f63
+AUX wmctrl-1.07-64bit-xlib.patch 451 BLAKE2B 99db11eeec40f8979470b1cc56942196c98bfc068920f1016b96120b7eb722bba6196b8f98370664e847190d1e52e591c6fd3072d812aad3cb75e6df3fa480c1 SHA512 3ef0a6ae0efa9667a019777673c9c794aae23aa9f76ec63d4a54390397b2af66826feb040861f2da3dc673e67aeead6abec001e1436d8c86a4c24e7d96f87e5e
 DIST wmctrl-1.07.tar.gz 87820 BLAKE2B e1059bef92fd4cf6cca3f539c68bfe3745c95abbefecabe3b1592a7dc3c69d769551f0ea4acc1d1e0c57024ce64e3fa0f0248fcf0f5776617d1ab88d667b662a SHA512 4c77ad1e204e8d444f682ad1d05c0993bcab9097ac6d4b6a944556ab85acbe713f549dbaf443cd4d1226a162ce7d46fbd209c92652e87fc8e609feee74907daa
-EBUILD wmctrl-1.07-r2.ebuild 597 BLAKE2B 18d802757ae8848c723279b69d188d4e4d2db75305447bdb581c61908a1ff79d49256e52009b963b8e0df1579dbb31573c43a556034f962aa96398b15ad89dd1 SHA512 b861d322e07af06899ff569154ce6dc7df68379f0c5e26b69c17e82696115d55c16016a963ada5eb70a4f205a0c45b7a27a30f3a2f5f768fef25c827cb45e230
+EBUILD wmctrl-1.07-r3.ebuild 589 BLAKE2B 2cdb917a3aeb8b05f4e9f94530b87503a407d2d91770c0e9504589f74d762d2ba9cc67ea052ab48be6f5a957948b55976b61030030a0ece385d90dbd27ea0078 SHA512 c6f3e3636aa6e7003109c62c1c8a22f451c07a7ac79319761c30f8ee7f9f397e407249bb8066d04d4a8b85ca329c429afc0038556888d603d60b1ce48969839c
 MISC metadata.xml 246 BLAKE2B a512e6e8ffd8a998f89ea9dbf8a29dd4bb2d6db435e4ac0ef3182fc23996e04a6e87c1771975d835038ad86d6cb61e4a1aea8b80286666d64ad0b511c9d8f163 SHA512 d827f64596500d61c0f24c9d2a69fa3ca2f8b52e5f5815106d7db2837482172f0518d99677e6332a69fd4c34289ef817203a5047363ea7d2c10372b09f9e0618
diff --git a/x11-misc/wmctrl/files/amd64-Xlib.patch b/x11-misc/wmctrl/files/amd64-Xlib.patch
deleted file mode 100644
index a1039a825023..000000000000
--- a/x11-misc/wmctrl/files/amd64-Xlib.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- wmctrl-1.07.orig/main.c
-+++ wmctrl-1.07/main.c
-@@ -1425,6 +1425,16 @@
-      *
-      * long_length = Specifies the length in 32-bit multiples of the
-      *               data to be retrieved.
-+     *
-+     * NOTE:  see 
-+     * http://mail.gnome.org/archives/wm-spec-list/2003-March/msg00067.html
-+     * In particular:
-+     *
-+     * 	When the X window system was ported to 64-bit architectures, a
-+     * rather peculiar design decision was made. 32-bit quantities such
-+     * as Window IDs, atoms, etc, were kept as longs in the client side
-+     * APIs, even when long was changed to 64 bits.
-+     *
-      */
-     if (XGetWindowProperty(disp, win, xa_prop_name, 0, MAX_PROPERTY_VALUE_LEN / 4, False,
-             xa_prop_type, &xa_ret_type, &ret_format,     
-@@ -1441,6 +1451,8 @@
- 
-     /* null terminate the result to make string handling easier */
-     tmp_size = (ret_format / 8) * ret_nitems;
-+    /* Correct 64 Architecture implementation of 32 bit data */
-+    if(ret_format==32) tmp_size *= sizeof(long)/4;
-     ret = g_malloc(tmp_size + 1);
-     memcpy(ret, ret_prop, tmp_size);
-     ret[tmp_size] = '\0';
diff --git a/x11-misc/wmctrl/files/wmctrl-1.07-64bit-xlib.patch b/x11-misc/wmctrl/files/wmctrl-1.07-64bit-xlib.patch
new file mode 100644
index 000000000000..8888a0320870
--- /dev/null
+++ b/x11-misc/wmctrl/files/wmctrl-1.07-64bit-xlib.patch
@@ -0,0 +1,12 @@
+http://mail.gnome.org/archives/wm-spec-list/2003-March/msg00067.html
+--- a/main.c
++++ b/main.c
+@@ -1441,6 +1451,8 @@
+ 
+     /* null terminate the result to make string handling easier */
+     tmp_size = (ret_format / 8) * ret_nitems;
++    /* Correct 64 Architecture implementation of 32 bit data */
++    if(ret_format==32) tmp_size *= sizeof(long)/4;
+     ret = g_malloc(tmp_size + 1);
+     memcpy(ret, ret_prop, tmp_size);
+     ret[tmp_size] = '\0';
diff --git a/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild b/x11-misc/wmctrl/wmctrl-1.07-r3.ebuild
similarity index 58%
rename from x11-misc/wmctrl/wmctrl-1.07-r2.ebuild
rename to x11-misc/wmctrl/wmctrl-1.07-r3.ebuild
index f7701592d694..a7bad8f520bc 100644
--- a/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild
+++ b/x11-misc/wmctrl/wmctrl-1.07-r3.ebuild
@@ -1,25 +1,26 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Command line tool to interact with an EWMH/NetWM compatible X Window Manager"
-HOMEPAGE="http://sweb.cz/tripie/utils/wmctrl"
-SRC_URI="http://sweb.cz/tripie/utils/wmctrl/dist/${P}.tar.gz"
+HOMEPAGE="http://tripie.sweb.cz/utils/wmctrl/"
+SRC_URI="http://tripie.sweb.cz/utils/wmctrl/dist/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 arm64 ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
 
 RDEPEND="
 	dev-libs/glib:2
 	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt"
+	x11-libs/libXmu"
 DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto"
 BDEPEND="
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/amd64-Xlib.patch" )
+PATCHES=(
+	"${FILESDIR}"/${P}-64bit-xlib.patch
+)
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index ff4f78ad61cf..035890e2f116 100644
Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ
diff --git a/x11-plugins/wmcdplay/Manifest b/x11-plugins/wmcdplay/Manifest
index 4273df1d1ee6..de704ad2c754 100644
--- a/x11-plugins/wmcdplay/Manifest
+++ b/x11-plugins/wmcdplay/Manifest
@@ -1,5 +1,5 @@
 AUX wmcdplay-1.1-cpp11.patch 1315 BLAKE2B 5ca7792045a6c64be012a1b1474bfe5722f9365e2e3c0b3ed956b30e0afd7cea99cc4a672fd0e236c5cc4d76bb4f948699e699fccb959f37dcf0cf94ca955fdb SHA512 4774a3de25ecb5de09ccf32318f6e19d98560c05a438d39bf4bbdd47b38e1a5eeea13a2f615c969eb3efd48fdc83b013d830b8b3f11518f9c12c90b0993a5437
 AUX wmcdplay.desktop 178 BLAKE2B 74f1f10064d6e3e1738bb21b135ba479ce2bec97e084d4d3b402b823abbeb6db9b0590c2e12c427661518f099c478f7de35b161d788d01359053bed88224d69c SHA512 54e48ca979d5348e58b7b7057665dab9ff1429be534ea2dee970900c14b853ba9616487ff27500bf4a28145ca2b8809b4d6fffebbc99ac684238fa708a946293
 DIST wmcdplay-1.1.tar.gz 32082 BLAKE2B 5fd8f57aca1d3d53d34a31f9814c132a98241b848ac04e69c367065ea291add5f025598b7b03c44033024d20e24271690cdb38830e56d3795f6232b02f1d81c6 SHA512 db657ee2cf0a1a7e323e1a6fbf2ec70251005b84fb18808661cd44a50b4203786e56e90329d81957d2496a6e79d76e9d87620680186c85e476b7f94d8f234133
-EBUILD wmcdplay-1.1-r1.ebuild 639 BLAKE2B eaf576cb722ad44210fda5bf6c71bb63a158fba3ae0b40e552c1fc0876fc3fc2dee511c4ac4af6e09a476fc275280952e3032deedef450f442618eed6a20348e SHA512 bc255c8689916b6a7ef6b7853919e2891814d5ca504da37aa62dd13908807d5b4c62f777d98f907846934aa8f510fcb4a14c5db5c5dcfd81896d9cccf68fbe9d
+EBUILD wmcdplay-1.1-r1.ebuild 641 BLAKE2B 65427a5264bd7b9c1dd04ef1c6da4ecc1d91a8aae5c02f409d54c8ddf22fc25810da045900749907fd3125136ee41599b6ed7301e98fdfb6cc5bf7ec0533f0d1 SHA512 ae8a4767b2061d4ce7a4e557db4b81e2deeedd9324f623109059c6af189bc2b93942ac99c4cac079b4d74d2d044912e93b82c0cdefaaf07747c2542f7e95bdbe
 MISC metadata.xml 250 BLAKE2B 3d69a837b82fe334630573d6bf123718a3eac254377bc2ca86a2268f210cbcef9922db631e91954bceacc28828b54ad567d0568a4df655545ac56a4a54151d76 SHA512 ee587c14474743ca118c5468d1cd04ce5e3533ea29550ae74a7d517f092c895fa18c7edc7e9ffe7757b62c214dda7abf5352ee838a6dbd7d1079d60d2762732f
diff --git a/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild b/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild
index 47fa6c9faf43..89cc7d94fed4 100644
--- a/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild
+++ b/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild
@@ -20,7 +20,7 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/dockapps"
 
-PATCHES=( ${FILESDIR}/${P}-cpp11.patch )
+PATCHES=( "${FILESDIR}"/${P}-cpp11.patch )
 DOCS=( ARTWORK README )
 
 src_prepare() {
diff --git a/x11-plugins/wmwork/Manifest b/x11-plugins/wmwork/Manifest
index 758aced202d7..5b06b3caf950 100644
--- a/x11-plugins/wmwork/Manifest
+++ b/x11-plugins/wmwork/Manifest
@@ -1,4 +1,4 @@
 AUX wmwork-0.2.5-gcc-10.patch 420 BLAKE2B 197a21429e5290913608146c9915ce014dd5ad8629ae57cfe2b59c4d93bf5120138ac0b3782ab0775a9b55aefc9ff5e8e48970462ea176b776ec87787f6c4b46 SHA512 fa0bdbfbe6c0c6b91046dd8c01d34c0579ca0c27c6bfaa9c6e534b64ff74589fe39859368b34b8e4cdbd29a4b53cf57e6b72e2e2772fdfb02765001cce7edf7b
 DIST wmwork-0.2.5.tar.gz 62044 BLAKE2B e2990e84aa4be3c025f681e52948a9a729a6e06cb2032cd2502c7eb484c2a99aa0cfeede0bd727d22a70d9ca372cf0ee4afaabf2af8d0c659fb7c29977dcc08a SHA512 ffbc1b7e3a1bdd0e76c2c3b01088ee8cf1a9c615b4925ea8af514b6a4096f5192900a6c6633b2d60fd941d3515a6cb80396ca17d81104b7cdcacb5e46050e864
-EBUILD wmwork-0.2.5-r1.ebuild 571 BLAKE2B ff42381b647bfdd4e89b242a0749fbb5f0a4236f185025d9796f66fc76e8c5922aa8b18618ff2e355221dfaad7c577a804a1b59276c1910445d5df4429905046 SHA512 957ff33a69ff85dc752a23c8e4e8d76058151d15f524f723c9014cd8267d5d2f91a4a79d8aa6ed2fe6943a40549a59ce474c9d84889b0dc1d37e24d6c94d9d87
+EBUILD wmwork-0.2.5-r1.ebuild 573 BLAKE2B b42828d2ad9e10a1f436e9987196ea7be68d5e2810f43ea5270219ce4ab674441da970487530b50bd3ef17ffe3cd477b2ae6e3e2424ad56474cc93d4e717f0ef SHA512 3ab77b1ba80f0775649cb5ee0b7424a2f0f3260a663abd969ae216c00c2da73ac516098f73455967cb05ca357b65124aa3f65af06a33f8678f200ed76fbfc0b6
 MISC metadata.xml 250 BLAKE2B 3d69a837b82fe334630573d6bf123718a3eac254377bc2ca86a2268f210cbcef9922db631e91954bceacc28828b54ad567d0568a4df655545ac56a4a54151d76 SHA512 ee587c14474743ca118c5468d1cd04ce5e3533ea29550ae74a7d517f092c895fa18c7edc7e9ffe7757b62c214dda7abf5352ee838a6dbd7d1079d60d2762732f
diff --git a/x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild b/x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild
index e8fd4e681e82..c5dac0be2f93 100644
--- a/x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild
+++ b/x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,4 +20,4 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${P}/src"
 
 DOCS=( ../{CHANGES,README} )
-PATCHES=( ${FILESDIR}/${P}-gcc-10.patch )
+PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index acc09c07393a..916043c80e68 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index 6bedd3cf1ab2..400a0a7efba3 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,3 +1,3 @@
-DIST guake-3.8.5.tar.gz 1112897 BLAKE2B 221e6a388c3a5904cd20a762e6a669e30b59a742a550e5c2a411534c3b0730c7622f42c67fdc72785fac199c432a297beb9fb53be2b5e2b7545a5b03c2b8b545 SHA512 40605fadb3a0149ea488a7e93f1b7e4f5250f62fe058292f2c02f03f837f22e13171b28c4a9d1a14c2e4897c0066a683cae547e03862397310bc650d149181fb
-EBUILD guake-3.8.5.ebuild 2310 BLAKE2B 7f7c37278eb68c75c0e831001012967d4895a69493a657aa33f37bf000bc31cadaf32faa360ca30fdb4174ebbea77ef35afefd6b6b854f816a6411289602d502 SHA512 4e358bf44a1e3765436df457ffe9c893d2d877261d77525f19653c231f3af7a32f1aa088515b2f6ce5cb14d1a0c300697ad4d2f6b9bd9596679dc4eb083f4311
+DIST guake-3.8.5.gh.tar.gz 1112897 BLAKE2B 221e6a388c3a5904cd20a762e6a669e30b59a742a550e5c2a411534c3b0730c7622f42c67fdc72785fac199c432a297beb9fb53be2b5e2b7545a5b03c2b8b545 SHA512 40605fadb3a0149ea488a7e93f1b7e4f5250f62fe058292f2c02f03f837f22e13171b28c4a9d1a14c2e4897c0066a683cae547e03862397310bc650d149181fb
+EBUILD guake-3.8.5-r1.ebuild 2389 BLAKE2B 6d47de757e12b828048cbb29e056364c6b21bc0fdee989227f2a0234f8db08ee7614b5187e17bd2a84b945ccf56596525c959465f1f42d97b6508ce0e72951d9 SHA512 bd70effa6809a5a2854756ef50544fe893700f130ed801ae84b55610619cee48a72f6e5443edd8483fcaa8d60b2141b1717bf8a9cad5ba43c992c65e008943b8
 MISC metadata.xml 418 BLAKE2B 4eaf1e46ca71463bf5e7c54f31941d391851b2415872e06e41bc97b8d2278ac58c544ff869a5050e4d20abc670c20d4c7d364a8d68a7d9fb21baae2fa061af69 SHA512 52a8f383fc6bd2757dfc41fd0758c2b47ee177ecf49bf840a4e8ee8b32421a8f3c6a08270fa72f8cd2d87f8bfe663390ae18f17ea9ad18715099fe575de726d1
diff --git a/x11-terms/guake/guake-3.8.5.ebuild b/x11-terms/guake/guake-3.8.5-r1.ebuild
similarity index 95%
rename from x11-terms/guake/guake-3.8.5.ebuild
rename to x11-terms/guake/guake-3.8.5-r1.ebuild
index b0161dd6782f..3c4daa62d6d1 100644
--- a/x11-terms/guake/guake-3.8.5.ebuild
+++ b/x11-terms/guake/guake-3.8.5-r1.ebuild
@@ -12,7 +12,7 @@ PLOCALES="ca cs de el es fa fi fr gl hr hu id it ja ko nb nl pa pl pt_BR ru sv t
 
 DESCRIPTION="Drop-down terminal for GNOME"
 HOMEPAGE="http://guake-project.org/"
-SRC_URI="https://github.com/Guake/guake/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Guake/guake/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -65,6 +65,7 @@ python_install() {
 	sed -e "/^SCHEMA_DIR/s|=.*|= \"${EPREFIX}/usr/share/glib-2.0/schemas\"|" \
 		-e "/def get_default_data_dir/{n;s|=.*|= \"${EPREFIX}/usr/share/guake\"|}" \
 		-i "${BUILD_DIR}/install$(python_get_sitedir)"/guake/paths.py || die
+	python_optimize "${BUILD_DIR}/install$(python_get_sitedir)"/guake/paths.py
 
 	distutils-r1_python_install
 }
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 364a1cf019eb..aef7798dfd0c 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,3 +1,3 @@
 DIST xterm-372.tgz 1507107 BLAKE2B 256b99b13512740086203c4c05685cd170356118e11029a01d30b32f69c1fc5088efa0dabc955d8a24acf36f3e061faf7af9866c2302a4ac45405b97455384a0 SHA512 f65fee6227ca27be85569ec06f3701a6114489e036975d0fe37f3c71d7598d1b06c8689cfbda593a98418eec1417bd60b33e3978752b255989cfa0bb4ce332bf
 EBUILD xterm-372.ebuild 2602 BLAKE2B 34217a79398617f43dceb77255dc2f60ef742e0626a75a3362e0f440e976eabeabe5b68f01b64b04c944102b041b490550a7cfa11a49bb9a26a4f4a7045d4326 SHA512 931ebdb5db36135ab730418b2bcef4565040250f27b4d403cfa57abead4b2b2046f5982c202a034b5dfca3705b3dd613359b56740d8280336bb66da1211be1e0
-MISC metadata.xml 551 BLAKE2B ea228db9f2a50592917875e25ff88094c4aa1389db78b1301c59f98e3b3259ea69827c20e48a187c423b6303977532b9172a3dedd08e52cb1faf3e60bfb181db SHA512 fa450afa13de5b0fabb81f6fa55961e1b603f902836065736ed381cd447561eda6449a269e4c2a3d63c1c6967848c82997b93fa6462b7a622361929e619d1025
+MISC metadata.xml 619 BLAKE2B c7707d831a1438434b2efd0c84fec19032cca874e2ec00e7e53d7a2d057c2520abd48701fcf073d328dfab1c91677bbc6a261f5b77e722839f1b140d73f835c4 SHA512 d8d7e51d21f7e2e56bb7761e2383c77b0fd1c2fc7867a723256a04bfc1a49af7957564c0a554658227a571e90c44c2850f3d26e8476c4599b837b8babc42bab4
diff --git a/x11-terms/xterm/metadata.xml b/x11-terms/xterm/metadata.xml
index f4e653d10222..afa7b8cf58e8 100644
--- a/x11-terms/xterm/metadata.xml
+++ b/x11-terms/xterm/metadata.xml
@@ -12,5 +12,6 @@
 	</use>
 	<upstream>
 		<changelog>https://invisible-island.net/xterm/xterm.log.html</changelog>
+		<remote-id type="github">ThomasDickey/xterm-snapshots</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 3c6e3c199ab3..1ca8df106ed7 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/gentoo-xcursors/Manifest b/x11-themes/gentoo-xcursors/Manifest
index d1e064a5bcb3..08f25b058ff3 100644
--- a/x11-themes/gentoo-xcursors/Manifest
+++ b/x11-themes/gentoo-xcursors/Manifest
@@ -1,4 +1,4 @@
 DIST gentoo-xcursors-0.3.2.tar.gz 2035025 BLAKE2B 520dbb3f8fe77bc915bb60c81f2abf4fce1ee6fb349ae5064ff5d2fa10c0af7ba2dd00dc0b36f992c96169214c4ebd28dceb1ba069e638e5efab7088ba804fe6 SHA512 5ccbd2e8be7bda4da0578c5a08d967dded9dc4c9163eb96f629c0eaa548f2e46e85f7301de44d5be707cc63a988b925c9c222863da5bac9095dc5170ca9c4aea
 EBUILD gentoo-xcursors-0.3.2-r1.ebuild 1440 BLAKE2B a9b4bf070791fdec7be4d8966b63893807d8cea13eb2f6c0c542869185ec1b74cd00315d5423683b44e4edbe47fe75f48364da8e4048991e8104b951e144c964 SHA512 095534b14414735d5490862eb8224c48b06a729c691d040745cde1787bf99474d9653f148aad2bb2f57501919fedc757d0db018c605ce52578cb771422957c91
-EBUILD gentoo-xcursors-0.3.2-r3.ebuild 1649 BLAKE2B a1fa8423b0e900b5899f4053287c2ce52cbf8a4e68a677d9ef45434abbdc6a1aff9ad56daa570b4eaec8cee1afea0414eeaa43cc061d9876f80cf1a3e7651add SHA512 f454fc13503667acf7f7274e3b2f18fbd1b0d85f31db78886b9aadc61d6a45440e200ccd6f5d9ce56a7a8739bb599d0405471c474865e6d966cf110c7690d79a
+EBUILD gentoo-xcursors-0.3.2-r3.ebuild 1653 BLAKE2B 9f37193b8ed4d72b858089d66a8ae791592dd6268d949577211c7e1f841cc89ff5055bc7fa0b90ff7886687ced44bf3302cb8f0df2a04a1e728432a29903384c SHA512 14770bd8f7851a033169a27dca81e2a31c8b52930f99a9f1ee90ba596ffea6e548a65c1ecf0143cae499cac8aa269def4211e4937e28316ccf3c59c7d49d0807
 MISC metadata.xml 625 BLAKE2B a8b1dcb3b123b3ac1131ef60c143b3adf94d1459c6cd00a5d4e56e83f7701f6842838802cea3c7f53cb4105ba0b20a828fd8ee06fa0a93e0ccc3764c2ef53525 SHA512 b80de950edb24625458aeabf9dabb3567306f202f63dc0cdab77b30d80652f833412aab92f3d7e314486d6bcbc823e36fc2718c30293e1e8d704c58593258787
diff --git a/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2-r3.ebuild b/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2-r3.ebuild
index a891f268b288..17f253e4ff91 100644
--- a/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2-r3.ebuild
+++ b/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2-r3.ebuild
@@ -17,8 +17,8 @@ src_install() {
 	doins -r cursors/*
 
 	# Add symlinks in Gentoo-specific location for backwards compatibility, #848606
-	mkdir -p ${ED}/usr/share/cursors/xorg-x11 || die
-	cd ${ED}/usr/share/cursors/xorg-x11 || die
+	mkdir -p "${ED}"/usr/share/cursors/xorg-x11 || die
+	cd "${ED}"/usr/share/cursors/xorg-x11 || die
 	for cursorset in ../../icons/*; do
 		dosym ${cursorset} /usr/share/cursors/xorg-x11/${cursorset##*/}
 	done
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index ad4ce9477c60..9f8681d22378 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 5bd6f49b4779..68385da34ba4 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,6 +1,6 @@
 AUX mutter-42.0-Disable-anonymous-file-test.patch 765 BLAKE2B 7d223e0dc98963b61cb0bc26ec22775e87942f88f97af7dbcde63e0d960f5b41afc3de0b358b0c6252de90af4451d4fd6c75b7815ab573c7199b0c82cdd1eb7d SHA512 c066d1b5541078c6cc8d2788b36935b9aff0f1fbb800f39fa4674755a6842be66736c57b43d5edb00e5c18a33c1ff17d54a546134e5aae8ebd9a8967cd46b164
 DIST mutter-42.2.tar.xz 2747612 BLAKE2B 39d83283dc04473e47263d463849030c1076bb5b8d6fbc37f03e1936cb999ab554784f02ad9a04cdbfa2f35ad95c74c0899ee44e9710e435e66de613628cc683 SHA512 e43bdc7c9183b2578ae1f777fdf84bfde550a26bfc28fd4a1a183c7f310d852110f3dcabd50a2fabdafba4cfb8aa6577aec4c65775075f0afff7bd1bb4dde957
 DIST mutter-42.3.tar.xz 2746756 BLAKE2B 818b2ac8cd264c6b8e30b6731ef2641dbcbba6dce7628d0a934c3f49a5857874d9e6a97cd53ec689c2a9ae7f52d49ed98b7cc551eafbb32b74cbebbe027d9f43 SHA512 f346d2299143ceb6c9164977df2e23655b1c204f3a2d1f713377f3cc2f3609c56914c5e8a0b940d4fdd3d040a9af210f724350bb4f74ffac293e6a82e2b0785b
-EBUILD mutter-42.2.ebuild 5451 BLAKE2B 1e19e26fb5c7685eb43ca8e49ce9c470d5bf59ef55013d7b9eb34ddbfa8258b74b974fb80900238ce4ab3fa1ed1441f73457fa0b54abcf30f9d8f49de53f4296 SHA512 5f9a049dcf87d30ff0e892da6aa1621c21565b9e3dc56576463abe19a59bcc489e0fec44b5012468b6033747f9bfe58a1b1543a1b7598289b1c3d28293f5f4ec
-EBUILD mutter-42.3.ebuild 5479 BLAKE2B bda5156d08734915a19cc0c7a1a2105d7cde5cb39538936beac2a58905f6ee71d15a1ebc96aed290355f7109c0509a4bb27519306221005668c7e15764b50145 SHA512 27206b0bc1107e03c52bb98899a88b66bee1f0da3a4cec0ee5a1302dc34323d9a7b0c312260f5ab777260c5c4f202d08a6cd5c3460c7442d0c46a85d9c35130e
+EBUILD mutter-42.2.ebuild 5458 BLAKE2B 982ebdfa6de26b9f9f4785e59f29d9ac8b7d4f47620db7bc1d11f82f6e1cd0fb57e2a98aa51f3a3a869d949c20607b5684916a540706c283ec13923ae1bd65d6 SHA512 831ae393d159d480fe7eefbd11bf7aa05aca08e96dae4da653c7ca38551a3da23c33d34c2380a8a15b66c4f7b899d8f965e23bd36b10fe341e92054a5498516b
+EBUILD mutter-42.3.ebuild 5486 BLAKE2B 7969cc68ae159ee63076c9947054fca8b628dc32f166611cf20d2cd7f9f5e3fc2144f0b3046a0e5bc74fb5912f03760f9cab0a8ca770c4eaffcc3d27af5c7223 SHA512 17040b8714373e0947575ea133b45a5c1c7b621ead36039816c3d573310b42b68d0dc7cc12f4e2115e61de5d99eb6661bc01a92f22632b09c65f1ec3ceb2f8ab
 MISC metadata.xml 485 BLAKE2B c44b289cf5592b16abd0d7a095e2c042550d6bc37a3ab8a0ac287a9c501cdd5b30e7ddba0286dbcf25845f659afa07ae92182c063fb3b549ed448829197cc2ee SHA512 16628e78b4c9b07283733038e66d9b0ec58a1964593be2aa4e81be117a26944a9d642175ab0eceb06913bb178034d4e49364ae977c60f296cbc3cb0acafdb90e
diff --git a/x11-wm/mutter/mutter-42.2.ebuild b/x11-wm/mutter/mutter-42.2.ebuild
index 3edf61ef69c1..f99221169c0b 100644
--- a/x11-wm/mutter/mutter-42.2.ebuild
+++ b/x11-wm/mutter/mutter-42.2.ebuild
@@ -114,7 +114,7 @@ PATCHES=(
 
 python_check_deps() {
 	if use test; then
-		has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+		python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
 	fi
 }
 
diff --git a/x11-wm/mutter/mutter-42.3.ebuild b/x11-wm/mutter/mutter-42.3.ebuild
index 26438fb0f09a..94496717159e 100644
--- a/x11-wm/mutter/mutter-42.3.ebuild
+++ b/x11-wm/mutter/mutter-42.3.ebuild
@@ -115,7 +115,7 @@ PATCHES=(
 
 python_check_deps() {
 	if use test; then
-		has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+		python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
 	fi
 }