gentoo auto-resync : 11:08:2022 - 14:19:56

560 files changed, 4360 insertions, 4090 deletions

diff --git a/Manifest b/Manifest
index 0eaa55583e3b..5c6211674347 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29647 BLAKE2B f3ab2fd6d49c221f067f5cf7bab25d23be8c98d5639c392eb262ac07f7ff9b8dc8aa9e844b9fe0e5ed90bd16e2e3e74061665904e6f4fcd6d645615c703fed54 SHA512 6bf202829c9b69ed29717a0a5303c3a20baa3972d8cb4de062d76eb03ad083cc09a70a6ee49977f9cb8d6d567d184eea16c18d42bd6c23068ca0dd32817c31c3
-TIMESTAMP 2022-08-11T06:40:02Z
+MANIFEST Manifest.files.gz 29671 BLAKE2B e899e33d35818fac64eb2504d1a2e7ee06333b2afd192f5a0a79589289f666e0a869681d27f1608fff11cc2f19108d9d5ab84cac866b2ee3b06a71490e124bcf SHA512 2bab80dd3f334806ff68ca7d258d3ffa21ec4a541cd5586a2e3a966b09fa4e6ea03f4184a858bdd2dab0dd116bad620eb5230838762990816e5863aeda65d26a
+TIMESTAMP 2022-08-11T12:40:08Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL0pEJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL0+KhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA5TA/+O7H+6PHrFCfO77Y8RmVNlQKvDvsXaaHe/ZyA0dSH7lWGnNY8pLkt8LSK
-0XiQWB3Ros9MkB2cj8xSfO8ZdWFmXX7X+JuXk/dNYrs8BI2fkryxfNqFqwIaYLUv
-CXuH0aAu9T0q/UppFKCiy4qvc0GRIw2meTDd7heuFQiyMUmKEkzrkincZO9VlwZE
-hrBJsXM08UfDtC/Vc37ZOUmQGzCQ1V6jHSK5u7qa47tVxuELMTjLMEuop0c0xxAi
-myiCpEcFHWZ2r1L9n0FJ/MuN9vgatqjPzzuZDzSAp9Mqt6gVvG9CJ+72xqp33wJs
-8t4pzCfLPwm+oy+Hv7X3qvK5IkCa8VShY7JF7LFCuLb5Vfsikj7+EmLrEUHjItHk
-REcT2mkxfbg8xIkP8Pg/Ha18cojln4Y/40LccK3yP4V226IVW32VUcoFq9z13iEj
-kC2C3UV3a4J9twCRgqQ5aihw2ayN7AoVfwQe9Z1HQOP7RmBvPXfATfVbGyvfbUKH
-C1tXLUEk4rdJb5eMJMgfT73L3bLcG5AWiwSlcII9AUJpNWCOoPhJebijfo0mbLaR
-TXsCMTzDhshF8K4LolWeR/R1ISrPSrvPk9uQnAQ1vgZ9NUhB0Tw9F13643sosTHX
-7yfl8VTI1YvvpVVvreVk2OSPBiaMZold361moE/zUKMzf37fgPQ=
-=MRFI
+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 d23122cf27dc..71f94e17851e 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index aeb6f4dd664e..4ab8addd23d4 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
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-backup/Manifest.gz b/app-backup/Manifest.gz
index 9f30e6b2c9b1..4f7241fe4099 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
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-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 3af2288d29fb..97378c8363d2 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
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-shells/Manifest.gz b/app-shells/Manifest.gz
index f0d214ebf19e..4a5764e9ab65 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
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/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 2d4f830fd1f7..28a70ac42753 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index 2197144a4cc3..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 3265 BLAKE2B 8c7893af95ce60f773c6331ab38bf339e0c72ae0e351a056b2b0e2e3517c24f64246f03bbc4eb66020b1eb660541656d22a0abdc91719b0c12b0f0846602df5a SHA512 097d0e7ef8b9a0b0cbf251268bb2a8d0d8beec58a5aa71f033693ea7952be9b763d585bb733f9a462422a9305ed089aa8fd1b16826b29d789513c58345550976
+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 058130f8eb17..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
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
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 b5d99c4b3311..1114674ed9cb 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
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-libs/Manifest.gz b/dev-libs/Manifest.gz
index 564b32f7ab71..ada7f4ce7dd4 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
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-python/Manifest.gz b/dev-python/Manifest.gz
index d8723b8a8136..af50851e08b6 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
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/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/ensurepip-wheels/Manifest b/dev-python/ensurepip-wheels/Manifest
index 522eb69fa01d..9266440f2c22 100644
--- a/dev-python/ensurepip-wheels/Manifest
+++ b/dev-python/ensurepip-wheels/Manifest
@@ -1,4 +1,6 @@
 DIST pip-22.2.2-py3-none-any.whl 2044706 BLAKE2B 254427e593e44d9f1ce48276fd40f214e8ca9d27b6c31b7a6ed5fa4566df6b1f723215c6a1766a534ce18174f2363c383dbff19368d1b89f1519a53bebd34215 SHA512 142d3144c14b692c645613d98bf35dd91193128d5e21b61a8a702548f1247fac662499d6e39b65c0aa9a0444d2d92983fd8c410439796626485a4e1be99a102f
 DIST setuptools-63.4.2-py3-none-any.whl 1230330 BLAKE2B 8190129907edb6a5a3607fc8caae995070d5740c849cd31510efa43271fddd58c5c21cb1d60a4647473b10ba90a6220e06db92413847cbf71e11e43571def2ab SHA512 8b2a56c840220c616a13ec19b424981b9767f4e39b98a3ba0b99904beb63f4d6d6c28ada37a25d482c1838063ccd09d260b12cc7d00aeca78b95cde49928211e
+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.3.22.2.2.ebuild b/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.3.22.2.2.ebuild
new file mode 100644
index 000000000000..691136b4b5bb
--- /dev/null
+++ b/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.3.22.2.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+SETUPTOOLS_WHL=setuptools-$(ver_cut 1-3)-py3-none-any.whl
+PIP_WHL=pip-$(ver_cut 4-)-py3-none-any.whl
+
+DESCRIPTION="Shared wheels for ensurepip Python module"
+HOMEPAGE="
+	https://pypi.org/project/pip/
+	https://pypi.org/project/setuptools/
+"
+SRC_URI="
+	https://files.pythonhosted.org/packages/py3/p/pip/${PIP_WHL}
+	https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
+"
+S=${DISTDIR}
+
+# combined license of setuptools and pip (with its bundled deps)
+LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+src_install() {
+	insinto /usr/lib/python/ensurepip
+	doins "${PIP_WHL}" "${SETUPTOOLS_WHL}"
+}
diff --git a/dev-python/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/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/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/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/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/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/setuptools-rust/Manifest b/dev-python/setuptools-rust/Manifest
index 45bd85bdc67b..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
@@ -80,4 +81,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 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 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.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-util/Manifest.gz b/dev-util/Manifest.gz
index 3f3167f36ca2..5494af0ebc1d 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
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
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
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
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
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-fps/Manifest.gz b/games-fps/Manifest.gz
index 5c3a8e79308f..c98e19a64265 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
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
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
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-simulation/Manifest.gz b/games-simulation/Manifest.gz
index b4c0df8c9016..5320cad2b60b 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
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 adaa90c0a6fe..1e47eb0a76a9 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
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/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
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
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
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
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 748727d71292..fea4a78b28a6 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
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/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index acba020cf574..83a55caa0eba 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
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
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
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 2786bdb976d8..fde7424dec50 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
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/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-libs/Manifest.gz b/media-libs/Manifest.gz
index 118157f2e000..7948b3ec5c22 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
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/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-video/Manifest.gz b/media-video/Manifest.gz
index b4fc4f53967e..fa90da42eeae 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
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 35aac8e5888d..826ad144cbd9 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index c02114c30f84..5782a557b641 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 11 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 d039a22dea18..c7290d2d2461 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 521770 BLAKE2B c2acb8c863b2efce05519b69900dc397016a5ee5af4af18fda8ac25353a157eb4632e81d3a44a9e724b472ac3f520214dc9c6708619ea63041d0b272f7a9be10 SHA512 6eb592a988ac90c24adf99f6fcb0f9a848c75aa47fdc37e5dbf4ebafea5daf193d2bf7928130322630437e54a2d9a93d5dd6a6ed7658bde2da05b340db2721c7
-TIMESTAMP 2022-08-11T06:40:01Z
+TIMESTAMP 2022-08-11T12:40:07Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL0pEFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL0+KdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAEBQ//WolGWTeDAk7CldyV61J4WyIfIe6mxpUj5ZH7eXvyVgZUidS6h4pvG5S5
-dnpE4HK+FBCf6rtbwwuNb72tJlgLUu/DC6uOAdc1NHeSYEia7vKERkmnK+7VVQ+m
-HasCMBWRJcF1nV3FLpjdlaJdlCUCybOvUDvEikYlu9EyV82bDTLJJCU5bjAxswOu
-SqcEmlR91LIX6usl8ZHn9IBCxu+jfVvp7Cvyw/Tx1uwnigcqPRQZo3WbYOuOZFoy
-0cMSIMh5TeEoHUPfrhLav+TRKccCtNs0BRqoL9aKdMqio/ec9vfJ2U4q/6WnIiQK
-78oEwHQTee1XvTHqIodtMzb+eL2lQlEgAUQ2tSV5gBBfBElHG/YnIAI2xdWFxvig
-DIEdoGgXcDrZJfJ4nJMr1C0lWyqMiw8J5zXRiA9izg/2VhFlxejf4dYbm5iHuuPy
-2Pg8re3A/aZ1H3V62yNs/WoujJZzwkpHtXTjsQHInHSlQsM0KavieQFgkUvLPqSg
-yFmBkpXjzdmBvKDhRCWYXZcDuVuPr+Jo2gkO0BR66og3tCLI2KeAkWHbdP5ldY2D
-1mLYnv3nceGdH7B/Yx5bPCsDTGgZmyADMJ067iqJbyhhgKT/I+RbsYqh5N53NQGI
-mbLmelrkbwRHK3l8iD7dv9E7Cx3jJ/weejn1OfkZ8XA0DqKhQNw=
-=83u6
+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/timestamp.chk b/metadata/glsa/timestamp.chk
index c02114c30f84..5782a557b641 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 11 Aug 2022 06:39:56 +0000
+Thu, 11 Aug 2022 12:40:04 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 9b7ae5026b39..7abc50030980 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 8c7b266a4785..c62f64b74d9e 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.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-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index a55ef3a7a62b..55ee72b2edd4 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
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-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 6a45aee1e28b..e7ae94073b3c 100644
--- a/metadata/md5-cache/app-metrics/Manifest.gz
+++ b/metadata/md5-cache/app-metrics/Manifest.gz
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-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index dbe9c589555d..8a83979dddf1 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/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/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 1574fd09221a..ea2b90047ba5 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.27-r1 b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.27-r1
index bb53b0465fb3..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_=828d1683ab0d2fd4a04e678a345d2d62
+_md5_=069ae13fa5a6c6007f7d791c24b3bf8c
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index f94576d21e98..911b031a28fc 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
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 8f76e899a551..d84c8a8da983 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/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-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index d83443351cb4..a63c6861e4d7 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/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-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 817beb9f5504..cedcebc127c9 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/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/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/ensurepip-wheels-63.4.3.22.2.2 b/metadata/md5-cache/dev-python/ensurepip-wheels-63.4.3.22.2.2
new file mode 100644
index 000000000000..40dabb0cc9f8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ensurepip-wheels-63.4.3.22.2.2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Shared wheels for ensurepip Python module
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pip/ https://pypi.org/project/setuptools/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/py3/p/pip/pip-22.2.2-py3-none-any.whl https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-63.4.3-py3-none-any.whl
+_md5_=38599eac27c58e664ba46672b8e33827
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/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/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/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/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/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/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.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-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 45993aff7332..4e425c040e1d 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/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
--- a/metadata/md5-cache/games-action/Manifest.gz
+++ b/metadata/md5-cache/games-action/Manifest.gz
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
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
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-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 7badc8b79c77..95777f7edfd8 100644
--- a/metadata/md5-cache/games-fps/Manifest.gz
+++ b/metadata/md5-cache/games-fps/Manifest.gz
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
--- a/metadata/md5-cache/games-roguelike/Manifest.gz
+++ b/metadata/md5-cache/games-roguelike/Manifest.gz
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-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index ddac74946bdf..413e48c1e602 100644
--- a/metadata/md5-cache/games-simulation/Manifest.gz
+++ b/metadata/md5-cache/games-simulation/Manifest.gz
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 128241ff327d..f9765894d578 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
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/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
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
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
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
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 e84933efd8c8..29e1f419daf2 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
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/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 167e67560ec5..e68dd4e883b1 100644
--- a/metadata/md5-cache/kde-frameworks/Manifest.gz
+++ b/metadata/md5-cache/kde-frameworks/Manifest.gz
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
--- a/metadata/md5-cache/kde-plasma/Manifest.gz
+++ b/metadata/md5-cache/kde-plasma/Manifest.gz
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 4e6b111b15cd..6f238c7a7487 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/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/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-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 86a2d5db575a..0544412d00e8 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/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/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-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index f1b8d67666e4..6a90b1ecbb00 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
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-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 42fa018698ec..e2a8958cbb86 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
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-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 793d542e7329..c103b4480fd6 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/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
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
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-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 8480cba0d44c..374d31f64202 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
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
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
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 2468554c4558..aa1931aef4f9 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
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/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
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
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 7164c17eaab9..6b70a2ccbf95 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/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/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
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
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
--- a/metadata/md5-cache/sys-block/Manifest.gz
+++ b/metadata/md5-cache/sys-block/Manifest.gz
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
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
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 91b8106baf7e..f9acac88a08f 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/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/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 c9ead41c45d8..04107bce8830 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/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-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 932558c7de5c..0a13857eb7b6 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.254 b/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
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
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
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
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
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 8aaf719b0fd5..e7dd38f0153a 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
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
--- a/metadata/md5-cache/sys-power/Manifest.gz
+++ b/metadata/md5-cache/sys-power/Manifest.gz
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-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 3a16cf0f198b..7cf6d433f5a8 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/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 c0074be9877c..2af24610f4ca 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/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 fdf73e96a307..0960afc17c50 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
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-r1 b/metadata/md5-cache/x11-misc/vdpauinfo-1.5-r1
index 11e695bb236c..038f1282b4fc 100644
--- a/metadata/md5-cache/x11-misc/vdpauinfo-1.5-r1
+++ b/metadata/md5-cache/x11-misc/vdpauinfo-1.5-r1
@@ -3,7 +3,7 @@ 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
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/VDPAU/
 INHERIT=autotools flag-o-matic
 KEYWORDS=amd64 x86
 LICENSE=MIT
@@ -11,4 +11,4 @@ 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	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=165d2195c2300ab792b45cad03ae0b1f
+_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
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
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
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/guake-3.8.5 b/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
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
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
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
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 136cfc39f7a9..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-11T06:40:01Z
+TIMESTAMP 2022-08-11T12:40:07Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL0pEFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL0+KdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAFBA//TCnm9hLV2Egh50gfwMg8pc02cegkryyAQ1vYMsbVN1XEpst/lRmMSBiw
-DURV8hE4gGlHPI4AGOVpSalHBKLX7q761/cPgVPEieheO0dDmRWvpduNKQxfBXMr
-lcC7WDq2No8oubCq98KbNOiqn1qb/UoQmwQrXQwX+KjWQ0tc/AoM7gi3kE9NXwVR
-JOF6hCiV016qqTW5aBM3NXyJO7hizdep5bsbIIRj5PYzcE3Rdw9OR6YLsSj4tsVd
-3yhivg6xCSX0jfbFU644BXLLYTuTD5cwoKG2qZFYtkVFEHB1zBdkkKpuEMDoYzBO
-cZNCEc5EFXNvRRIRvJo5uSH5uTFR9blxWE4juLRPE+Zv6I5O657xFsN99tYdBOCp
-UKsfDEoYfOxzQo7FefsGa8dU9wlhGNaQMKt0GZoOIridg9LSINq2h5lkuOlW5qHo
-SLnbIB/u3dqD8F8JFr5J/5jBJdTo2YEiRiuCKB0/RcX2YI+sKLG+1lcvwaXLighI
-qLkwIaqJn2T1eGjsxRSl3dxE9NqWn+/rCfw1weg6vWTD8ue1/PxkuKmEOztHwJq5
-DYj09Vp41jZWqdzRFt5v9b9KA7u3QNfDbIMj8m24OWl8ReMUz0GNM7YWmqTUAIBz
-mpQowMuPgU4RMsWqP2v3PQU5ZlCVu1Jzt4CAGwmweA9k5/v8HIk=
-=M8Qc
+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 c02114c30f84..5782a557b641 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 11 Aug 2022 06:39:56 +0000
+Thu, 11 Aug 2022 12:40:04 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 7310493e3cc0..33d8d0d4f0f0 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Aug 11 06:39:56 AM UTC 2022
+Thu Aug 11 12:40:04 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 14a1ceb5fb22..27e7dff122c4 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 11 Aug 2022 06:45:01 +0000
+Thu, 11 Aug 2022 12:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index d8ba67716c84..edd75bf50c0a 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-04731c8c9b29638a877ab6005021b5cb476847ef 1660191647 2022-08-11T04:20:47+00:00
+e11ae782cab090dd8ad7512d507f436bdeb19d22 1660220955 2022-08-11T12:29:15+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 4e9298283d3f..290da13b2d05 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1660200002 Thu 11 Aug 2022 06:40:02 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 c02114c30f84..5782a557b641 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 11 Aug 2022 06:39:56 +0000
+Thu, 11 Aug 2022 12:40:04 +0000
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 860d329e3082..bd20214624e6 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
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-libs/Manifest.gz b/net-libs/Manifest.gz
index ea73119098c4..fb52a853dfed 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
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
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
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-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 9bfc96804843..c3dfa73e10a4 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
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 3fa1610784f2..cf07fa139821 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index bc1d3f6a5353..23d2ee7c1f6c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,11 @@
 
 #--- 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
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index b133d15043c2..140a5896fb3d 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3261,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 9b9e282078c9..e5be4435d372 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
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 aebf372056fe..ab09138c652e 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
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/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
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
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 c0252214e091..b045280e8750 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
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/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
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
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
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
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
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
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 55335515ba68..e7be0ee125e2 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
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/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 6da8c1c74835..bfdfeffc36ef 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
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-fs/Manifest.gz b/sys-fs/Manifest.gz
index a18c14ad2ae6..ff34d40c73b5 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
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
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
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
index 39693afef068..39693afef068 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.19.254.ebuild
+++ b/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
index 39693afef068..39693afef068 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.10.135.ebuild
+++ b/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
index 39693afef068..39693afef068 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.15.59.ebuild
+++ b/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
index 39693afef068..39693afef068 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.18.16.ebuild
+++ b/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
index 39693afef068..39693afef068 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.19.0.ebuild
+++ b/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
index 39693afef068..39693afef068 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.4.209.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.4.210.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index e00e8cab3fb4..427aa37a86c0 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
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
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
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-client/Manifest.gz b/www-client/Manifest.gz
index 29a3b07736f3..e8f9b927e9aa 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
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-libs/Manifest.gz b/x11-libs/Manifest.gz
index ff1d81731243..5dd9b381c0d5 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
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 2d9b277dc032..59752d467d9e 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
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 a2014ac2578a..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-r1.ebuild 605 BLAKE2B 85626a6421f67beb30919bd7702497a61297e980b8d4cfe695cd30435d23c515421ff72d8ac83d1ca87d4c164c0240b064ffbedb1db04327c91d7234996c878e SHA512 e7bb71b97809e36961beb753f382a5e176577de3a2d241f93b1997067bbc84c4e0bdcf37cf7c43ed3b317e39b1987b85700cc884a1911d6a8487359aea7d1dae
+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-r1.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.5-r1.ebuild
index 985ed1288c27..1094701a0a2e 100644
--- a/x11-misc/vdpauinfo/vdpauinfo-1.5-r1.ebuild
+++ b/x11-misc/vdpauinfo/vdpauinfo-1.5-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 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"
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
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
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
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 28a93d21efd8..916043c80e68 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
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
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-themes/Manifest.gz b/x11-themes/Manifest.gz
index 3c6e3c199ab3..1ca8df106ed7 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
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
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
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
 }