gentoo auto-resync : 29:12:2022 - 02:14:02

author: V3n3RiX <venerix@koprulu.sector> 2022-12-29 02:14:02 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-12-29 02:14:02 +0000
commit: a493ba7d75043e8e649ee8d6d4942c1f4b31d1c5 (patch)
tree: d9aef2725cb8f60bd6f5a47afa9778eb94114793
parent: d7ef5a07f47da6898dcb2d1503790c59b0470571 (diff)
309 files changed, 2310 insertions, 734 deletions
diff --git a/Manifest b/Manifest
index c28c79b60961..47ae3721c21c 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29810 BLAKE2B 8b676deb23d503841008280e02f37b49c9c34a04c1f1abffe11e724bd843049aea5a4019ce35bc88a69a1a19fbdb37405911a3243a45bf530f8e94b878daf988 SHA512 acd1b60422100c47a0b8d09949089b36d2a0a45365ce0b1a040a534969af016aaa0814bf2279a583d7ac8b7308c31f5d0609f8dac5b514594d6f7432f80379b1
-TIMESTAMP 2022-12-28T19:09:47Z
+MANIFEST Manifest.files.gz 29792 BLAKE2B 67b12ec87545b103121a610b7183fd61caccaec24fbbe8280ad3f89984961277496e2cb6a5e361d8c25e85dc7b462748d69b2e4d44108bde9cf307c6877bdf61 SHA512 6c47154f7b3643c322b7bb56ef903b680c12abdf2eca0914a9f3158dab261422ec770b62823726c813a37e0a6c3e01026e06639d35c8a682b0bb2ea3ed4a9c10
+TIMESTAMP 2022-12-29T01:39:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOslHtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOs7+NfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAFOhAAj+FRjDYQ5hmWSV15Ee5Yt6vdK4IkTrTBikxG2aA0u4PlEFBWygKYkLmE
-CNXZvu401LARuXqarEuwt47jVgdoeOnUSE4014fa8SpCHoBHJbB8fW9xshycLimj
-+X5LKn4unyHp6myr9GLB6NgruAC0mQesHRJvYZ8WQtdL8RfSzheEy9770bBdDgvN
-gau9OMvB5jb6SyNm+lxv+0gVfdZFf3LRUqf15+4xS+2gDr+b881lHrbrAVogJueM
-GJDMFpbypnQLhWtDhDoAbs3RfRzH8TXARwU1a6dKQJMCDGiQNCMlRC5zGa0bVNBD
-7asMuNI6PV8x3IILEiJ9dZbKR3hX6Enn2pXC7OSnYzN3JzNLTSlV1mKkOyJDYNfs
-SHwdYru22MdRqNOZ6qxtpEYj5bVHZabCcIpeUveAWbIZLCbKpPIodkhKQnvQPFll
-lF/yDIjJo9PR0hFGoUIcFib7D+r2dIvb9iT5Ir/7UNs9iU5FCiYRqxp+CeywW3/p
-fjggTiefV16Ody6gPXVOke6NlDX4tqvwDECuVmw22ICYnggo19mTn3Zp98IOECc+
-10lN9srsgwnLO7VhRffqGuoKfhNo/4NO4v2+Eye6zwCIT/W7x4tMmrcL9rRa9NXB
-/1k3MWPpHkc44uh5HLdsicx+SqBacZWdipeWSGvl2SGGi//btdU=
-=saie
+klCp4Q//QOyg7+JW+M+lffffOzcA8dQ8FgScf18PIm6V38Wamm/WDD+zZ7h8n9dU
+g8EUcID4O4wwoGhzimH8RrOQUb5le/WcIDmEVLnH3Lrk+lXaSpoSFKLT3ykqss3+
+y5CbezHMeUXgix58khFi+JSEG7Cnc4cjbB2ObQIUGH+a2nrccFLOAxdoglB7ikFR
+8aF+sv3rkuvBmwx5TtWsSrbnqtcmFL8DTPJOrrqknhUu//fHjk88cMZSdU+FXB1x
+8ac0nmaby9KEGWVUzgHIR/KNtTLy9I3m3R+obZyVkGznGLiOiLqp6S76h9PpRSGy
+zgUjzIONUckX6QPLHis0Qy6cudV6qjmzYQqgU8PK+15TZ1VSf96H4Pgeo5qs3eMR
+lWTTfrwFBm34UwmOKbA9s27RvRjRP1+ZPuQMpr+4ADRdREry0JqA6Gt/OeRg+A/J
+a1OojqfFEudDRSa3QmbLKPmCmqT36X1Qs8UML690d3AN45RRcdCvfrRcsTQkJbHD
+b85d/R6LuVlzWOMaaUmXtldtUBtCzvt7gc+dUf86VN/6YOIhFtDkDPJbI32yUpme
+sZsm4ejQS1EEB5iBfd1soe8YAh/98KpeDK241lX8FUWfCUM8MNI0JstokPiJf2dB
+arm0IjwNqeM9KO2ZVhD9kM3bORkZxRxMh5XqTbL+15gvzxFt8hw=
+=FOVx
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index f9aa3105016f..3e915413081f 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-alternatives/Manifest.gz b/app-alternatives/Manifest.gz
index 2efcb15c5658..f26ab781770f 100644
--- a/app-alternatives/Manifest.gz
+++ b/app-alternatives/Manifest.gz
diff --git a/app-alternatives/sh/Manifest b/app-alternatives/sh/Manifest
index 3137e367d114..317a3fd1ab1b 100644
--- a/app-alternatives/sh/Manifest
+++ b/app-alternatives/sh/Manifest
@@ -1,2 +1,2 @@
-EBUILD sh-0.ebuild 827 BLAKE2B b9615d38bd8bb2e1804f8d1bd63049986043e06592b93547803a06938aa870c3dedb825ee513bfed9926371e78fe83b5f31c4b9096c0509afaeb2445927826b8 SHA512 c23964f6d0c65ef17856cc8193516023e8590634f6623683e228f330cd652d33279cf4c8363690a126d5ed0f2d223b5d8c34722529b060acd280301804b14ee1
-MISC metadata.xml 759 BLAKE2B 4f691499f0da47c72c61999275d72604093856ff5440a7f72fdf9a6fe09ac86ce8d07e453d8a88ee9747142cf506cb4824223f9372ba2c8f0414086a3390a239 SHA512 2d2c06a26faf1cb72fea2f201a3bdabed020d8e2f1fb6bd86fdb985274a76db14080410982c74d3d5e5ccf483f1c280f2ea77d3d083d87985f36b54c190b2ec9
+EBUILD sh-0.ebuild 1475 BLAKE2B daeb47fdef6fc056335872b2f8b2ec01dfa40fd8c04aa04d7d55a13033f74b8218988bdbe182323cc285bd8107578188b6e34d8b777c3e030ee56690e689ee5a SHA512 f4a85e6c74c6eca72d9ece9546039777e12598fb66b8ba2ba289ef3e164ff6a1cc61902cf84a8d0df667a12de68c39933a304b698161fc1b6c46a75b437b58be
+MISC metadata.xml 835 BLAKE2B e54fbb98c91e127319c5f0ec81d18ed6f7a8ea192308dc4927446a0f536d163d2fc53f79396ca24189e81fdbca15a36605dd6f0010bb484bf6990afd54d004be SHA512 a96a5121a92d90898d49d61a5096491c60b261292b3c8764f2e2fbd2825f8d0aa265042d7374462df3b0e9e2d547f43791867eabc8ee6a2b262ba6983a8474a7
diff --git a/app-alternatives/sh/metadata.xml b/app-alternatives/sh/metadata.xml
index b91b8f41c94c..ab59369a30d1 100644
--- a/app-alternatives/sh/metadata.xml
+++ b/app-alternatives/sh/metadata.xml
@@ -13,6 +13,9 @@
 		<flag name="bash">
 			Symlink to <pkg>app-shells/bash</pkg>
 		</flag>
+		<flag name="busybox">
+			Symlink to <pkg>sys-apps/busybox</pkg>
+		</flag>
 		<flag name="dash">
 			Symlink to <pkg>app-shells/dash</pkg>
 		</flag>
diff --git a/app-alternatives/sh/sh-0.ebuild b/app-alternatives/sh/sh-0.ebuild
index 4cd530a89d9c..682533efb3bf 100644
--- a/app-alternatives/sh/sh-0.ebuild
+++ b/app-alternatives/sh/sh-0.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 ALTERNATIVES=(
 	bash:app-shells/bash
+	busybox:sys-apps/busybox
 	dash:app-shells/dash
 	ksh:app-shells/ksh
 	"lksh:app-shells/mksh[lksh]"
@@ -20,6 +21,19 @@ RDEPEND="
 	!!app-eselect/eselect-sh
 "
 
+pkg_setup() {
+	if [[ -z ${ROOT} ]] && use busybox ; then
+		# Needed to avoid busybox preferring internal applets over PATH lookups.
+		# https://web.archive.org/web/20221206223848/https://busybox.net/FAQ.html#standalone_shell.
+		if busybox bbconfig | grep -q "CONFIG_FEATURE_SH_STANDALONE=y" ; then
+			ewarn "busybox is configured with CONFIG_FEATURE_SH_STANDALONE=y!"
+			ewarn "This is not a safe configuration for busybox as /bin/sh."
+			ewarn "Please use savedconfig to disable CONFIG_FEATURE_SH_STANDALONE on busybox."
+			die "Aborting due to unsafe Busybox configuration (CONFIG_FEATURE_SH_STANDALONE=y)!"
+		fi
+	fi
+}
+
 src_install() {
 	dosym "$(get_alternative)" /bin/sh || die
 }
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index dd907ff33f58..be8e157e5a3c 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index a7039944742a..ab95f769033f 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -1,5 +1,8 @@
 AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611823dfe81ab72f9e1a2bd3547b8fbbae07d2108ac255a1a9dae604f9acb77744bda3a9eec2a575580558a4ca7042164c563 SHA512 4a20d61d48c456c4f5cca31b38e6f26460f781782c66ff4cd1b193eb1a48dd9fa88967989b2698b5e45a61d64c9ce3b87fba0f6b67bf507c5bb386a847f477fd
 DIST gzip-1.12.tar.xz 825548 BLAKE2B 7e2d482c08555f5fb0ff5408c0afe48c61034e9779eed6e3dd8046c847234c0a8a6bc34d49a934a54db0d73033e12c71a228d373551384a4cd663315071637e0 SHA512 116326fe991828227de150336a0c016f4fe932dfbb728a16b4a84965256d9929574a4f5cfaf3cf6bb4154972ef0d110f26ab472c93e62ec9a5fd7a5d65abea24
 DIST gzip-1.12.tar.xz.sig 833 BLAKE2B ab7b4a759ef163d67f20773607ba0408ea9f1f7c7c224f43635fc3752acc521b74dbea4ec9ebb58a2f4fa13ecae19e00779b4b56c2cb95976301445beff817aa SHA512 1f4702797f7c5f1873c2f9c2f6210ba23824455d17ee82f50f0bf24240ed5bdf0090cf85338ccf76ba82422f8b4ad3a329d8bbf1350cb094d7bd61aa45550397
+DIST gzip-1.12_p20221228.tar.xz 806448 BLAKE2B 278eb44caca7ee16ca5d0210673726a1daebef6da7eaf0a87fc24590cb4c53d4ebe2decb6b8975440e1eb2c2cfebb69f091c658f9a7430a1717f0477fec279da SHA512 87d1fccb9603ec336c89689337e3cf3cfef70054ab4416bd8380fee011e9f517555d80a2a009bd312a58c34fdaf48778e5f0e9bea350ae280b440a325a837866
+DIST gzip-1.12_p20221228.tar.xz.sig 833 BLAKE2B b59d4677d15e2461d5fa95b4d53e94914e14cad613a9766aa3e51bfcece84ec0c4dd752c0d124cb76cc2240f9460f809c5bbbab958522c795e94026c8d4206ef SHA512 09a3a6687c80d7ec7e97ebd4c679e4d162729232d77966352c2f7ddd45594d79039ff33a93592889137605412b18b7868ea19ba4f4d162a5912a3978b3d67dd2
 EBUILD gzip-1.12-r3.ebuild 2216 BLAKE2B 0e504b091287555832c27f125e50641fdb517467ff815573242a7aa6a0850e25d6343ed3a2d49f381ff87b2391d131106fb75052d32c2a7e595cdaef76d44394 SHA512 5d4468f39482473c4fbfb2241a2ed80273aaf0e9f43db141b057a0e022df92e67895216f3dec2061ee9f61f65db84120e8544ed1d74628ee7eb07e361287585d
+EBUILD gzip-1.12_p20221228.ebuild 2573 BLAKE2B 46ebe00941e3f84347d16f7dea5837b2d930c2705e8f6f7d52c745c8b851e711f8fa86cb9bdb8b4ab7ca46a93c54403abca24884371ddf43ffa4e1d815cddb56 SHA512 900099e0e672a4820cff49c808d96dc9bffad0068282c1ce8814fc26e0cb1d639e936d56435099b7c10926454670e79de57662c8791d058be916b1cebf2b2874
 MISC metadata.xml 422 BLAKE2B b3ba7db4fdf23c9b1b801f21a3230898f260b131344538ff8644bc842dcd5f6bef5e4e2f8d475267d6d39047a87c00e1138e69d49892d21d58249346bde1e57c SHA512 6241ec1357f2f326c745589a18622987e9444e515157a53cb1188a21cd90e14e392db1e31b24f833ba05647ddfcfd6a89e13f6125ca15451bceb1a14e80fbc23
diff --git a/app-arch/gzip/gzip-1.12_p20221228.ebuild b/app-arch/gzip/gzip-1.12_p20221228.ebuild
new file mode 100644
index 000000000000..5e5dd9d96e0a
--- /dev/null
+++ b/app-arch/gzip/gzip-1.12_p20221228.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gzip.asc
+inherit flag-o-matic verify-sig
+
+DESCRIPTION="Standard GNU compressor"
+HOMEPAGE="https://www.gnu.org/software/gzip/"
+if [[ ${PV} == *_p* ]] ; then
+	# Note: could put this in devspace, but if it's gone, we don't want
+	# it in tree anyway. It's just for testing.
+	MY_SNAPSHOT="$(ver_cut 1-2).31-7553"
+	SRC_URI="
+		https://meyering.net/gzip/gzip-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz
+		verify-sig? (
+			https://meyering.net/gzip/gzip-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig
+		)
+	"
+	S="${WORKDIR}"/${PN}-${MY_SNAPSHOT}
+else
+	SRC_URI="
+		mirror://gnu/gzip/${P}.tar.xz
+		verify-sig? (
+			mirror://gnu/gzip/${P}.tar.xz.sig
+		)
+	"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+if [[ ${PV} != *_p* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="pic static"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gzip )"
+RDEPEND="!app-arch/pigz[symlink(-)]"
+PDEPEND="
+	app-alternatives/gzip
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.8-install-symlinks.patch"
+)
+
+src_configure() {
+	use static && append-flags -static
+
+	# Avoid text relocation in gzip
+	use pic && export DEFS="NO_ASM"
+
+	# bug #663928
+	econf --disable-gcc-warnings
+}
+
+src_install() {
+	default
+
+	docinto txt
+	dodoc algorithm.doc gzip.doc
+
+	# Avoid conflict with app-arch/ncompress
+	rm "${ED}"/usr/bin/uncompress || die
+
+	# keep most things in /usr, just the fun stuff in /
+	# also rename them to avoid conflict with app-alternatives/gzip
+	dodir /bin
+	local x
+	for x in gunzip gzip zcat; do
+		mv "${ED}/usr/bin/${x}" "${ED}/bin/${x}-reference" || die
+	done
+	sed -i -e 's:exec gzip:&-reference:' \
+		"${ED}"/bin/{gunzip,zcat}-reference || die
+	mv "${ED}"/usr/share/man/man1/gzip{,-reference}.1 || die
+	rm "${ED}"/usr/share/man/man1/{gunzip,zcat}.1 || die
+}
+
+pkg_postinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		local ver
+		for ver in ${REPLACING_VERSIONS}; do
+			if ver_test "${ver}" -lt "1.12-r2"; then
+				ewarn "This package no longer installs 'uncompress'."
+				ewarn "Please use 'gzip -d' to decompress .Z files."
+			fi
+		done
+	fi
+
+	# ensure to preserve the symlinks before app-alternatives/gzip
+	# is installed
+	local x
+	for x in gunzip gzip zcat; do
+		if [[ ! -h ${EROOT}/bin/${x} ]]; then
+			ln -s "${x}-reference" "${EROOT}/bin/${x}" || die
+		fi
+	done
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 47b036215c41..375599daf668 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest
index 8fb76a79579c..0a7eaf921316 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -2,5 +2,6 @@ AUX vagrant.in 1872 BLAKE2B c3c5acf65ef1187061609837ab7c3df429763b6561ec462f9ce9
 DIST vagrant-2.2.18.tar.gz 1620261 BLAKE2B 8938801b383373967365ca64a79f70885a61c02221eeebf75f15fa40440dfdc585f0a0d0cafe9a01484d594dc49b98397a0724776586c2c9fe4f529b6891bb26 SHA512 4694ca499136b53fc5cbab1efd47c9175293ba84521614edbe545766b93e54dc8dc11278f7170c88f3bb05a4ca0a7c52e21deca285f848578a890858b8f21b64
 DIST vagrant-2.2.19.tar.gz 1838272 BLAKE2B cb707254379f52db8571bfe132e5b852a11998d86b43ee707e03d442ca1313da7b2612af027a58f806e0b551a6f415d121dab51cf7ea5da4292e5c2afd198ab9 SHA512 24a2e5baeac5cf8c45c012cf70dd4132b1dc7a6a5bab19d1046c91cc88e669356e2e5676d96eda6ed7293ff19ada974954969a4a59b9e4a30e2d95de27fa64e4
 EBUILD vagrant-2.2.18-r1.ebuild 2376 BLAKE2B bdc88c6507dc11cd55ea195dea180b49ead6fd603c5c64e49536af33406eb3d9f33701a922f441ad93ca498cf6ded0a25d62cca1c7faec5d85acba6778ffaf48 SHA512 a653040505f69b6c026cf568f014c174ff4d200a0b23d1589e7778b39345495a385eb01c77a24da70528e16e80d401be52cef0c59edbd809bc393c52c31d7667
+EBUILD vagrant-2.2.19-r1.ebuild 2383 BLAKE2B 7cf32ad46d575af8fa98f2b6e224509a7c177e221cd40b57c9892eddfd071ce7345a43b9eb88ce44e27ad1322ced9b983d8e03e3214941098229509491bf0953 SHA512 56feffee9624e5cbf4c7e023426d6f296af2b5e5df06b5e83cc01981c7b5d415f5723705fb3144870ffbecaf3552a3a7dbd818e5fb4dd0f6c56a084cd60500d3
 EBUILD vagrant-2.2.19.ebuild 2383 BLAKE2B ef7cb68c4b922eb11ecae35a033db6f14cc26e3822d86f4d116469613d574a05b3a135f3a1298a80629100b70613d8c2fbfd5bdc2e3dceadfa3fe42ec35939ed SHA512 fd0dd133143c4573c38226e6d535f84303bcb2c9d76caf743d6554ea9443e6e891e5102542fa26810d9a4e49e5a2c1cd51065ce2434cdb602f0d8606550689ee
 MISC metadata.xml 455 BLAKE2B 01bf09c745e55dcdf7241dfdae1349fbb403f61249c0b05944347cb2f5cdf7d6a5fc7807a3f351145a41e4a5a94a5ba22195acee7c352539144277fff4696faf SHA512 1117ae7aca289842ab10ec2cf4443bf36ef7bdcd9efd0b6d1df1879f253cc137fea027a939c52f8d6990cae7a83bffafeb69f7b10660f27d278f19578ecccabd
diff --git a/app-emulation/vagrant/vagrant-2.2.19-r1.ebuild b/app-emulation/vagrant/vagrant-2.2.19-r1.ebuild
new file mode 100644
index 000000000000..bb916546e995
--- /dev/null
+++ b/app-emulation/vagrant/vagrant-2.2.19-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt"
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit bash-completion-r1 optfeature ruby-fakegem
+
+DESCRIPTION="A tool for building and distributing development environments"
+HOMEPAGE="https://vagrantup.com/"
+SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${RDEPEND}
+	app-arch/libarchive
+	net-misc/curl
+"
+
+ruby_add_rdepend "
+	>=dev-ruby/bcrypt_pbkdf-1.0.0
+	>=dev-ruby/childprocess-4.0.0
+	>=dev-ruby/ed25519-1.2.4
+	dev-ruby/erubi
+	>=dev-ruby/hashicorp-checkpoint-0.1.5
+	>=dev-ruby/i18n-1.8:1
+	>=dev-ruby/listen-3.6
+	<dev-ruby/log4r-1.1.11
+	>=dev-ruby/mime-types-3.3:*
+	>=dev-ruby/rubyzip-2.0
+	>=dev-ruby/net-scp-3.0.0
+	>=dev-ruby/net-sftp-3.0
+	>=dev-ruby/net-ssh-6.1.0
+	dev-ruby/rest-client:2
+	>=dev-ruby/vagrant_cloud-3.0.5
+	>=dev-ruby/rexml-3.2.5
+"
+
+ruby_add_bdepend "
+	>=dev-ruby/rake-12.3.3
+	test? (
+		dev-ruby/rspec
+		dev-ruby/rspec-its
+		dev-ruby/webmock
+	)
+"
+
+all_ruby_prepare() {
+	# remove bundler support
+	sed -i '/[Bb]undler/d' Rakefile || die
+	rm Gemfile || die
+	rm tasks/bundler.rake || die
+
+	sed -e ':rake\|rspec\|webmock: s:~>:>=:' \
+		-e ':bcrypt_pbkdf\|hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|net-sftp\|childprocess: s:~>:>=:' \
+		-e '/fake_ftp/ s:^#*:#:' \
+		-e '/wdm/ s:^#*:#:' \
+		-e '/winrm/ s:^#*:#:' \
+		-e '/rb-kqueue/ s:^#*:#:' \
+		-e '/ruby_dep/ s:^#*:#:' \
+		-i ${PN}.gemspec || die
+
+	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newbashcomp contrib/bash/completion.sh ${PN}
+
+	# provide executable similar to upstream:
+	# https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
+	dobin "${PN}"
+
+	# directory for plugins.json
+	keepdir /var/lib/vagrant
+
+	insinto /usr/share/vim/vimfiles/syntax/
+	doins contrib/vim/vagrantfile.vim
+
+	optfeature_header "Optional emulation/container backends:"
+	optfeature "VirtualBox support" app-emulation/virtualbox
+	optfeature "Docker support" app-containers/docker
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 9da0949dcfd3..f8a0bb6a617a 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/qcma/Manifest b/app-misc/qcma/Manifest
index c4c8c4af159c..13b579618a71 100644
--- a/app-misc/qcma/Manifest
+++ b/app-misc/qcma/Manifest
@@ -1,6 +1,6 @@
 DIST qcma-0.4.1.tar.gz 239952 BLAKE2B 342272cc1bab74e34f545ed7c54b7f12732723e55f53224b16a2525bea161f49d4ec799e1e1f868af63067f3021a73389eac581299582a9410aa372e55ea265a SHA512 d061c43528dcb5b361f5e3f7cb303926df29f86f22603a9bc25326c1056344478dae6335d5f82d3f2e56ce98154cb5b1b3e94a3ab1128d7c79d42f8bf92fc7ec
 DIST qcma-0.4.2_pre20181227.tar.gz 244336 BLAKE2B 5a7a33384d4c73050954901e8e8f31ac72d4a2e1ae285389197eedcafe2c9f5d035588bbd330ba72c20048bd889b483259ab5824ad1ba7bdee7351b848ab2e12 SHA512 3379b5b804c169f3dcc1bd3079cffbaa016248631e69563d3e509dcc4de198f259edc5a69bcea4f65cfa16c366d1a2919bdf7aa6703b6648a6f218e9d58f806c
-EBUILD qcma-0.4.1-r2.ebuild 1322 BLAKE2B e0eca553836b23136cd6bdbdd561fcb8dcbd9619a51558b0694da4bb1a979133bae8d56fc1a4ad010b82cda916722069ce27b85fbf1f175c0616cf5b80f61442 SHA512 286d7874a5b68b6945b2c184a187c09a16962d68e895d0669c9139fc6a006114946febe59410dfc2a598f679b15cfbba7a26bcaf1c6ee724dd180623512eddc3
-EBUILD qcma-0.4.2_pre20181227-r2.ebuild 1397 BLAKE2B 4ec5b620756b2e98b7ef9f68fc6b0216a2cb9c35789852afefff39946d8a88155dabc867be084a070312b5ed5bb091914e322489f2185c1bc05cd9aed6c1b3ca SHA512 de590429cc281208561aa95e64a30c8ad8df2e7035afd2edab8b068d59f7fd9b23fad33b2ad062baa7c7fd1e994863b77048ce7f2f88445c056d76112081ddf8
-EBUILD qcma-9999.ebuild 1268 BLAKE2B aab086c46036a2ec77c384ca871e989bcc6434eb0200ed3e28ba4273380b21654c367bc1eeebeb393a0063e7b75d83edcbe31c18769ab12c9e619e00968aaa18 SHA512 93951cec18b511cc0f18379cd55d03c7528a7e549b58f398f1e5a0b696ca0bba3c5ec52e88196793f06dd7fd03f2f4b7c0100d61a9c53d9b90b4032f741fb873
+EBUILD qcma-0.4.1-r2.ebuild 1534 BLAKE2B f2cf2d3dde4fea6fbafa7443e33795517d4b8616b3fda10bdfd2b3638df25233d32d4c13ff172e77b6d306715716ed019410a4e583e4b489cf3f3affce1307ab SHA512 fa1e73ad3754f1dcc908c6aae3caa792aa2e38b4a8038df7f34a2e67ec760bf5c0985a6b1879686fe6dad28fbeb1cccecf0e173657ff24f2b0da7597f267d39c
+EBUILD qcma-0.4.2_pre20181227-r2.ebuild 1609 BLAKE2B 583a62025dde6bce7f7e75c05a8de199159a7c53ba53c1eb3207ad15e655ecd97328e408a6137a291fb5dbc09fa12019f69d040b5db295bd0235a8c201884a25 SHA512 8a013b2caa2bf955c12a2863ddb10756899651a2c97492ac5027c04bed4a5f3ae0880a5169dae58688d96e735b69da676fb99043d35e23c6accf32d1e4784970
+EBUILD qcma-9999.ebuild 1480 BLAKE2B a92ac6c09e2ff2d89a10404af348561b4f13a29bdbf0c9c6e76d01c821f290659402e59ed0d5e56eba5e4c0f307431889da931e05e58769f28e6cc20260a75c9 SHA512 8d39391dcf5eaffd499831036beb2c20707a0cb1312db947edc8059ffdfa836f132c6a75d781fbe5d23cd463d9e3c7affc0928f469e07c9cd8c641a3e3669d9b
 MISC metadata.xml 334 BLAKE2B 0618d573d0000cc0aaad937504d506dbff0a774fbf43760d92fe987e1872792b35559cf61eba5b5b72ed910c1551290144c7090938e0ec937df8d3b0fdb6f88a SHA512 8a716e5fbb4c9dcd7185a92c37024654fb9ba9ee2c0afca36878c7dd39dd6eba539c8324cfcd963424c369618a959e0156f4db1a6cba34c06b4cb664bcde816f
diff --git a/app-misc/qcma/qcma-0.4.1-r2.ebuild b/app-misc/qcma/qcma-0.4.1-r2.ebuild
index 011ad13717ee..d6c461d3cc9c 100644
--- a/app-misc/qcma/qcma-0.4.1-r2.ebuild
+++ b/app-misc/qcma/qcma-0.4.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit qmake-utils
+inherit qmake-utils xdg-utils
 
 DESCRIPTION="Cross-platform content manager assistant for the PS Vita"
 HOMEPAGE="https://github.com/codestation/qcma"
@@ -51,3 +51,15 @@ src_install() {
 	insinto /usr/share/${PN}/translations
 	doins common/resources/translations/${PN}_*.qm
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-misc/qcma/qcma-0.4.2_pre20181227-r2.ebuild b/app-misc/qcma/qcma-0.4.2_pre20181227-r2.ebuild
index d294019b2044..bd1e2fe321dc 100644
--- a/app-misc/qcma/qcma-0.4.2_pre20181227-r2.ebuild
+++ b/app-misc/qcma/qcma-0.4.2_pre20181227-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit qmake-utils vcs-snapshot
+inherit qmake-utils vcs-snapshot xdg-utils
 
 GIT_COMMIT="65f0eab8ca0640447d2e84cdc5fadc66d2c07efb"
 
@@ -53,3 +53,15 @@ src_install() {
 	insinto /usr/share/${PN}/translations
 	doins common/resources/translations/${PN}_*.qm
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-misc/qcma/qcma-9999.ebuild b/app-misc/qcma/qcma-9999.ebuild
index 7b9f7476760f..ce4bbebe7511 100644
--- a/app-misc/qcma/qcma-9999.ebuild
+++ b/app-misc/qcma/qcma-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit qmake-utils git-r3
+inherit qmake-utils git-r3 xdg-utils
 
 DESCRIPTION="Cross-platform content manager assistant for the PS Vita"
 HOMEPAGE="https://github.com/codestation/qcma"
@@ -51,3 +51,15 @@ src_install() {
 	insinto /usr/share/${PN}/translations
 	doins common/resources/translations/${PN}_*.qm
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index efb0962fce43..9da71e5277cb 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/zsh-completions/Manifest b/app-shells/zsh-completions/Manifest
index b43facbcb8e1..1c669ebe600a 100644
--- a/app-shells/zsh-completions/Manifest
+++ b/app-shells/zsh-completions/Manifest
@@ -1,6 +1,6 @@
 DIST zsh-completions-0.33.0.tar.gz 285049 BLAKE2B bcbbb2966a48f1b8c06e14f14432e147b4a4ca28c7d9769b4a108e3d4e005c37874c93c836c8636dabb860780077ccc5d9ebbd339f63c34fd16975ec5486a5c4 SHA512 8eaa7d9d2a58e8e2daa6ba7d9a8498e607b271bfd0484184482ec610e7f647ca72ba945f6897b2d619918304a18d048c4b079dae0993dc660cba61d4bce1e0a3
 DIST zsh-completions-0.34.0.tar.gz 304543 BLAKE2B 75afed3059e889f92843099ad3eddae1f939a7d9a46d87a8048c5742b44699c2da13a9c2ea00ca2ea02898472199f064c420aac8943338e3b22189a7cc0d23b4 SHA512 643e967a77ab708c6316a9b43edd8b411f133aa4abe10bf69d3f5e545b2128423ad80d3509e7f9077b30cb8a83f60fe8d4355ed0a697dadffe1e1aaac6597c04
 EBUILD zsh-completions-0.33.0.ebuild 843 BLAKE2B 0a8e51b5762f251b8c4325a550c15e3ae7fd4e76d4eb20b4606ff00c9589bb2f4b74c4d550a87ddf6cb7f12d5a574a0ba831b406f2fea1fef3923f736512bf93 SHA512 d703a7ec472e293b3460201c1c956e98f36fb449345e6e5f72b472ebc715806b12ff2991c02e0cb862eb050fb8018f3a984a762548146ce6fdfd255c9dc7e69a
-EBUILD zsh-completions-0.34.0.ebuild 838 BLAKE2B 27db4b4d68e5b4d9245ab2b46875a20aaa8595f8490c81f8a8ab1ba448a57be86c8c96c9586863fdb24f6ca2ea78c20c6df7f80b0959f43465aa0079682eb7e0 SHA512 a73b715fbc90e2fef9a092c2ad9c5bd5962892111fb23baf802083682c6c3c40522b5d8c13e5edf1900a149664cb012bf7f799d0ca33db2260a329d06c093c00
+EBUILD zsh-completions-0.34.0.ebuild 831 BLAKE2B d9183e12c94a4f57221ae98104ffe07efca825aaae02caeb3040994be6eed52236e4e526b321495617f1eec043eee8831be28329443baf6953feca553cf7442c SHA512 7e87040dbc1bd2ec8972dbdf2e1705575df491cea165a9f7969ff98a82ae7d3d040cd6d65bd9a838641186541ea6163034f44dba8799d2a1cc8d5ee11232733b
 EBUILD zsh-completions-9999.ebuild 838 BLAKE2B 27db4b4d68e5b4d9245ab2b46875a20aaa8595f8490c81f8a8ab1ba448a57be86c8c96c9586863fdb24f6ca2ea78c20c6df7f80b0959f43465aa0079682eb7e0 SHA512 a73b715fbc90e2fef9a092c2ad9c5bd5962892111fb23baf802083682c6c3c40522b5d8c13e5edf1900a149664cb012bf7f799d0ca33db2260a329d06c093c00
 MISC metadata.xml 288 BLAKE2B 174d6d6870a6068602ca3be5fd6e935cbf74e0e548c94fe4a8809d41b453e82d811448bfc127307e7dadc92c841b6d8a3316af800a561c3a6ba75dd5e58e7030 SHA512 7ee80de6103ac19b2195a9bda9708a1f2b6ab2f38ca8f5d93d277b8fcbecadcc763802a8399fe038f7ed57f48a87ddd280d8a70f0ec0bb2c5b92c70fc7311842
diff --git a/app-shells/zsh-completions/zsh-completions-0.34.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.34.0.ebuild
index f5ebe5d49325..ec9a9ddd1f80 100644
--- a/app-shells/zsh-completions/zsh-completions-0.34.0.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-0.34.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/zsh-users/zsh-completions.git"
 else
 	SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="Additional completion definitions for Zsh"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index e582bd59bd1c..6fc6c3358865 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/opendbx/Manifest b/dev-db/opendbx/Manifest
index e4f318ddf047..baec258a80b7 100644
--- a/dev-db/opendbx/Manifest
+++ b/dev-db/opendbx/Manifest
@@ -5,6 +5,6 @@ DIST opendbx-1.4.5.tar.gz 582915 BLAKE2B 7a11947f73ba3a3d407fecf7600589b64a6a80b
 DIST opendbx-1.4.6.tar.gz 587514 BLAKE2B 0a6c983ac1ebdc3ad9390185938f32e13ba9ff2ced6d41390421e1e3a1e9eb639a85d89da7ce2dd67f05fd2fcaebb2f53146f43678e548511403d8cdc4de88da SHA512 dd6d53d29157057dbf4e273fd82c7694e8bc626d3409d6ab9c25627a0fec96418326550fa8004b5341facdc4cd8aae12516224e8bb84e2562482885780ff0e55
 EBUILD opendbx-1.4.5-r2.ebuild 2271 BLAKE2B 52345a7669dc302e51be45739873085b0f83a52378a74146bc3b99ce6499e33972dc93584725cb81f42dbd8f62077c39bc974e4c37f458d6b8c3a812038a4788 SHA512 38a6057399ade663f977057534870d7476e85d8b96cc049b63bdefc5d4a49dc26fe4b6a89d08f1eb88ffe8cbbc1ab9ab4760d99797850a4f9bb47dc21b0ad540
 EBUILD opendbx-1.4.6-r4.ebuild 2273 BLAKE2B cf76ca813702b9ce8565eb421368b475c94cb4fc2fa8bf656086cbc90e9afb97bec1866b27b1a294108162de6b9dfb3a8a6d7c1e570fb2e7dcf46e7f31fa84eb SHA512 ef1eb9fc4bbbd3d767f0dc2581021a202cc602813d6478b8a8bc2d85b24163f51cdc752701407b9d4f312c4143bd08374d13e5780b97c4edfd4bae4eb768c2b1
-EBUILD opendbx-1.4.6-r5.ebuild 2427 BLAKE2B daf89f52d54dbee9a5f151e14694d6a0883d361a56125117b48951d8ffbb489d6c8029eb4c36d77a0e5ab79e0f7dc336bb6f241cefef781d7c7396a7af0dde6c SHA512 fad1974a20f28f532e873a0b2d4853da991bf6d08a73aac1c140717907bc638177110ce47f77be6160545cec97a96814c2549c716923bd601822b048255ed089
+EBUILD opendbx-1.4.6-r5.ebuild 2425 BLAKE2B 781a56db8841b8de991c90fed771562b4b13fbb3baf09cac4947a1bb67f450a4b63e9509beeb3ff3eddb4e1caaea8910aea0fd1c1801322f57da7f4d00f1f61b SHA512 540cf68cae95be043da81401ca63ba9e09289c154c20919878076de7eb94e5eb7ab1593b705f63c68155edb0b94f6ceae60e8c6e083893cef90e96c122535b25
 EBUILD opendbx-1.5.0-r3.ebuild 2297 BLAKE2B 84770123737231a2f7158c1088055042822e9f2f5d356736c85d98fd1f76e44c0f04540cc38aaf7a223444c51c2ba287deb718959a93f25c234eba41e515a178 SHA512 c54cad8abc5fafe274351e5b134afe684e9c100657481c8284885497a8c40384c0fdd4f2c7617b05d6fbcbcb75b83735c6ac527f3fd976929248efe1ae7b15c0
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-db/opendbx/opendbx-1.4.6-r5.ebuild b/dev-db/opendbx/opendbx-1.4.6-r5.ebuild
index 9fc129f26fcc..a84c00e4f96d 100644
--- a/dev-db/opendbx/opendbx-1.4.6-r5.ebuild
+++ b/dev-db/opendbx/opendbx-1.4.6-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.linuxnetworks.de/opendbx/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="firebird +man +mysql oracle postgres sqlite"
 RESTRICT="firebird? ( bindist )"
 
diff --git a/dev-db/oracle-instantclient/Manifest b/dev-db/oracle-instantclient/Manifest
index 74122e4bae83..8293cd41b4dc 100644
--- a/dev-db/oracle-instantclient/Manifest
+++ b/dev-db/oracle-instantclient/Manifest
@@ -39,5 +39,5 @@ DIST instantclient-tools-linux.x64-19.11.0.0.0dbru.zip 1085194 BLAKE2B 321e1cd77
 DIST instantclient-tools-linux.x64-21.3.0.0.0.zip 1149632 BLAKE2B 3ad6ee973f813733e48c58f9a18d1dad321f9fb886d9460c2bc8f9d766d5a021722b34d9d9ea0ffb7a8466a38f5cf816bc55767b668e5cb5ee59b549fe4fc4ca SHA512 4c47b51f4801cab6d71a201c12ddb7a30616050584630107968a50457d4eca0e92f3344505bdd8f36481924a21a508d476c9f26ed111bad846f4a8feab98110d
 EBUILD oracle-instantclient-18.5.0.0.ebuild 11731 BLAKE2B 6973e8d04c5157faa3b335ebcd0d6cecfb6f9c2f50de29a2d68b17bcab051504a681183fedbfe4c3d95cd0835c0bb0d8efbfc1c6f796932bdb2cee492c3f45c2 SHA512 560692a0b0f5e17b1cf20ea515c328fcb5ae329c0a9e623b78217acad8647210457d8a509dad033d7ef5a642401d1f505ae9476ac298808d6d6a4a2db19931f1
 EBUILD oracle-instantclient-19.11.0.0.0.ebuild 10765 BLAKE2B 2484cffb6fa28164bfec6fec848a1e1401ba7d4cb76fb6d875d0c3c77a33ff9228b42a85d8f4af3db1931e2b7667d8aa046d1bc89500003b5dc0c0d9f699be8c SHA512 0bb565c38138f795606b06f6ac1cf297b1e6aa10bd84045aad97c4d9f4ffa3d84f73e5b26eaf61543ee158deddf719ac0b8fb36ebe5c3a1dcc99cb8f3cc1d6a6
-EBUILD oracle-instantclient-21.3.0.0.0.ebuild 10672 BLAKE2B f6cdf959030761dc9a3502ed8eb67b8d5763938f37ce6d348edf7a69483a86fdaf25f1e8891142755b5b2cf355daa5ba34f70b9acd6793d4768cc7e4f327aaa1 SHA512 311f3a0d045af2e468146099c9dfdaac597b76b52f1c07339582e5194e65015d2fe741184b9733aa888fa3b2897b7e08451f7b679897ae87ecedaa611289ef6b
+EBUILD oracle-instantclient-21.3.0.0.0.ebuild 10671 BLAKE2B 3261e2c7cb6334187dd3622ef39a1ea197b24ea9738cba7ef52a97135651e822e32a1c18423f5cafceeccc2f3fde1c0abd07bba2f15687649294b5f01e1a5e4f SHA512 cf153160ca31cff3afd258e56150be9862f1e5c69563ba27d7480f570f8dce177fc8b21b3aa41101d91099ccf46e35d0126f8625ea746e5f014cdac51dcdea0d
 MISC metadata.xml 909 BLAKE2B adaa309170d33386196df2dd8e986fc40ce1ac48de76d8e017c5d98d5fe8341c5e4b41c2200f8d02be2bd8d4e9f395917571dd3bafb2491fe2f0651de43a044e SHA512 ff478c324fb82ccaf512f678af5eac61a4a0a7fed58679e12244aa9badd6e839e7a55fc3f0959efb9d8a41d85823b7adce472bd64554132dcd7f1719b16cc09b
diff --git a/dev-db/oracle-instantclient/oracle-instantclient-21.3.0.0.0.ebuild b/dev-db/oracle-instantclient/oracle-instantclient-21.3.0.0.0.ebuild
index aed8a1a49856..18e18ca2dbf5 100644
--- a/dev-db/oracle-instantclient/oracle-instantclient-21.3.0.0.0.ebuild
+++ b/dev-db/oracle-instantclient/oracle-instantclient-21.3.0.0.0.ebuild
@@ -71,7 +71,7 @@ SRC_URI="
 
 LICENSE="OTN"
 SLOT="0/${MY_SOVER}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 RESTRICT="mirror splitdebug test"
 
 DEPEND="app-arch/unzip"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 1168270d7875..5356a287134d 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/mirage-clock/Manifest b/dev-ml/mirage-clock/Manifest
index 56cba7f1da8c..8da5a6231d50 100644
--- a/dev-ml/mirage-clock/Manifest
+++ b/dev-ml/mirage-clock/Manifest
@@ -1,3 +1,5 @@
 DIST mirage-clock-3.1.0.tar.gz 8441 BLAKE2B a8cc3b1ab3f929c4c28ce5f0dfe30d316b1d9445f4fd053743d5e224e8b5630c9ae2d12804ca690488a238c6aa8cd8b197ca8ca7d9e49b902964570c78ed946b SHA512 e4518a6c47e18c7fd3fd910de2f68cacb18735d59bcfffc79b676c8526466f2134979805222c39496588ef6f16a8f6b1fb79fec478459a3ec474fb60118c5551
+DIST mirage-clock-4.2.0.tar.gz 8440 BLAKE2B 37c701a92ec8cdf71e9d297ec09992f313f1b3637146988b8fac3e7c6e21be4eb2ebe622fdf1ae52612b2cf51e6cbfa87750c62bf68f126d3e61789d461a4a31 SHA512 7c32adf30505fe35a1313c162731b96e283a883dbc18d530344830a1f76d3397a6dd3b76a4ac3024aa02ff917d228c953c9ebdfeeae1f48686e776007234edda
 EBUILD mirage-clock-3.1.0.ebuild 452 BLAKE2B 5291492e74ec3a717e645043c4b57f9b64a70f18b646f2633fdb34695df2182de0e6e8e8840ed7fa6b8a23f51c6442894612f81bd74025facd1c397471b7a6d0 SHA512 29901d65ec09f6b236533704cc6c482328a4bb9ddbe64b3bef5f1b08c84703ca8505275ee11ce1fc4401d83dc942229bca23ac857de3d95bd0e099db98f2e2fe
+EBUILD mirage-clock-4.2.0.ebuild 545 BLAKE2B 34fe007681c115324fb3d3622ef82e703bca773f114ca9a92b5c455a6fe1cd2b5998f0654271001e325f159041a39b6ef43d2127fac03c18ff3e564f6540f43c SHA512 469f375baf132a00be33cb85ad5c424028f38239714c68bd60a837ae78bdefc84a1e15e1cecc876f5aa772d0cde6da792952f5d180f7317fb5c3d8712273dca3
 MISC metadata.xml 317 BLAKE2B 5d20eb97520a74386bc19338271150e0eb97c39233e07b6ec09b7816084b8e7abe8c0e7bf5eb0f6f06d0a2991930ce77fbd9f31829da9169d0749ba529df248c SHA512 f0b47c1683afc2b2c4f3e8b22561638c3027f2a8a8f74c7e83c7caebe4e8730cb79b2e28ddaacaede20e13ff1428062dba30000eccd76d6137cd8ad1e1042ba2
diff --git a/dev-ml/mirage-clock/mirage-clock-4.2.0.ebuild b/dev-ml/mirage-clock/mirage-clock-4.2.0.ebuild
new file mode 100644
index 000000000000..5e66c4963037
--- /dev/null
+++ b/dev-ml/mirage-clock/mirage-clock-4.2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Portable clock implementation for Unix and Xen"
+HOMEPAGE="https://github.com/mirage/mirage-clock"
+SRC_URI="https://github.com/mirage/mirage-clock/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+BDEPEND="dev-ml/dune-configurator"
+
+src_install() {
+	dune-install mirage-clock mirage-clock-solo5 mirage-clock-unix
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index bfd1fb2462c7..f3e4324d4eaa 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 6ff90ea17922..4fdc04b86ec2 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,5 +1,7 @@
 DIST py-filelock-3.8.0.gh.tar.gz 204748 BLAKE2B 719f965eddf9a76aaa7d3700ffbd29df3856fdcd76aa184b12a1e3b3341a5d8681f05ebd7239b48a0ffbc942aebc8574ff3878177100ba659347a904945b2234 SHA512 a9b63ab9a6697334eb8c561c422e8ec6febd0b7b203c0ebb4cfd1e4281f16cc0ef5145121c90f3c08bec88f13e219c0655142e3d3f856163702a0d32e14cd5ce
 DIST py-filelock-3.8.2.gh.tar.gz 204940 BLAKE2B a83fbea21690f82680ab5d024cbca6e52b5f6490854fa1d14a98191a4e56edea41c0a8bda9dd396f8b9c5b83187d9f976011440ca00987fbe4e96cd1e311a244 SHA512 2d5f7f49cf2d112a060156391eeb600040b9ae8619a9795173b9888ee977ec718432beff68bfefca290791b14f8cefca6d2a92defd78132822dc3596493aaa23
+DIST py-filelock-3.9.0.gh.tar.gz 205047 BLAKE2B 3995f7ad27bb09ca75310c4ada7645f2dd16c09ddb39663394f315443851037f2f9cf08eecb507eba521479696ad1004978d3fdd300a7128ac3354fce2e57d5f SHA512 1235ae9ebdb4c84b0c30e68be91e01eb1acbfcd15c85202fa54a3b91e4e507f221926f8886e1ec91acd4f71d2d88c08f536529b4cebfd2de4fb90118f5dc242e
 EBUILD filelock-3.8.0.ebuild 836 BLAKE2B 3399d607ee709460a41219a3b8cc31cb98e3ba9e333e1ca81543fedeec17944c88a752aca7292ad5730132c81f8d8ad0d2c654f180bac202aa7729dd18fb5719 SHA512 5c1193f6d50553f5a82182bb2111412c22eb28965d68bdd3c9356cd2abfed719e7c4a9bc6923309dd37dfe05f2a8763f12f0a80a79d016b2d2edbda020ae5a3e
 EBUILD filelock-3.8.2.ebuild 844 BLAKE2B 0d6a77dc5134bef2d81a12fb0b3e6101ca4b719d0fc323770c7e686c7d78ce27fa316e172bf56a77b86d27eb013cb6ccb26f7e7639e79c4d77b464b380e3b263 SHA512 bfc386ea39a752e464846570c068434c0220fcaca26f9c45c38fce54fcd0055e4c775c786870b7a4268da9480500ecd114de2d5a85bf2d20034f444cfc76f61c
+EBUILD filelock-3.9.0.ebuild 830 BLAKE2B 33f422c86030cda8c0233268cb82b2cd0a43d5e04942e5d1bf0fdb38cd9c309e6ebfa534c79ac6b12763f1105893dffa46dbfbb7a48af21623d4aca02be34843 SHA512 42a1c50a4ddc723f98b85145a82ac60b8d6efe6e3e5acb430cd32991b967b399fdc7b131fdc9e1b6b019efec201e127890242d11a300e4bc1abf4856cd5894ce
 MISC metadata.xml 373 BLAKE2B 8923cea15313a2a4cad1af3e5e6c5623ac9855d3de37b6e43ff5249504d2bf07e1e334ce6ea8d9c397e03e3a05585cec0233e841a0a9f6c30d43eaa26b488933 SHA512 c114595146c326243756d0053476677b8b8c7541a253a0c739827e9b0f93c2a695d7289ee5a17c4a1a79639c02bf1396d2df4d8e20aaac9402c9d80f55be2f7b
diff --git a/dev-python/filelock/filelock-3.9.0.ebuild b/dev-python/filelock/filelock-3.9.0.ebuild
new file mode 100644
index 000000000000..bcb4d61210d0
--- /dev/null
+++ b/dev-python/filelock/filelock-3.9.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=hatchling
+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/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
index e0064d9e9683..9df7357ba07a 100644
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@@ -1,4 +1,6 @@
 AUX mock-4.0.3-py310.patch 2849 BLAKE2B a23047a6a872f7badb845388c3dcfb6c554824e524a094c09762a8749b3f6c292ddd58a1843cc540892a1a850f639af254a74abbfffb70deda4b756dca7dec9f SHA512 ad4448a85267aab11a35c761896779d66b45c2a38b6208226eeddcbbb7b28bac840f11fb9d69b72781383a82334a37b00dfac601fd9fe16f842da93c1b4ee3bb
 DIST mock-4.0.3.gh.tar.gz 80318 BLAKE2B bc0dc8b97129eaa2f0f9c89898157ea5de398f59f4e2ebc07318cf745b74d1f1bcc989774600ec88ce1956f9fe16f9464f101ea5df5cd23b3a58b432d19feb8a SHA512 adfdab253eb3bc1b6cb767c58ffa3a8a5c5f88da0f04ea6680e0d87da59177972d2d99bfe0a770ac2ed4f809ca6a090a9d0f789eea8f4365ef2c54f8e8792e89
+DIST mock-5.0.0.gh.tar.gz 83866 BLAKE2B 7c0718f8d43325b293b070f37c39ccf539a80460ac7e7b724674deb02154157a7dd62a81cd439e19589cee66f256f111f0feec9f8790f16c70948fac3745b43b SHA512 acde3099cb8daf49dffc390faffc45f94c9f1dd24f196ef613b0677cd88d1b55b5cbd04604ff540731e919784242c1cc341065fae99c347c6dfbb3d8115fc2fe
 EBUILD mock-4.0.3-r1.ebuild 867 BLAKE2B eb394dfe8d34ba9c00879e98c972e802908ba9313d90acf4425fa048236ddaec98db5745360d237e1369e2e5a3c9c6d841860f6b3bd4a6913fb2172ce64355e3 SHA512 ce209606b78052b54f71873b98df4df33055255630d73a454cd3184a021b01d5c32ee4c81dde04a66e1b072fec3d2c30aad12536d9461ea2f32f5a2e70fea8b8
+EBUILD mock-5.0.0.ebuild 811 BLAKE2B 474022746aa38bdb6c0b54f30a8b10ed8928967d96963deaaba2e8133b2a8dd84f9d7f6c6c82cfbc72b0381564fc1966064ff6af629884664eec2b0198624b3e SHA512 b161e1c45ec931f44a4ed0c74f9597abef794b018296b1efa9b53795a60a6cde77f64211341b07078adfad073cf7767bd0ec91233b7af432d157dc64da6bb6c1
 MISC metadata.xml 390 BLAKE2B ab0f000e11ee427d56fa28e307764a2c1864ce74bc679a491ab005a70d2bf8502d9a82b5d1941fcc268438880f8f950587aa090de9e611a520f89a49c78c0cbc SHA512 8456ad417374be30c038abce5a232d1075b8685e6432be93f49a74f327239354e14edfddf5e4a473264fb09bc0e4e6059489c1d0d651e8391ab0678d22987aeb
diff --git a/dev-python/mock/mock-5.0.0.ebuild b/dev-python/mock/mock-5.0.0.ebuild
new file mode 100644
index 000000000000..44bde8bc459b
--- /dev/null
+++ b/dev-python/mock/mock-5.0.0.ebuild
@@ -0,0 +1,35 @@
+# 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="Rolling backport of unittest.mock for all Pythons"
+HOMEPAGE="
+	https://github.com/testing-cabal/mock/
+	https://pypi.org/project/mock/
+"
+SRC_URI="
+	https://github.com/testing-cabal/mock/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+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 ~x64-solaris"
+
+RDEPEND="
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	local DOCS=( CHANGELOG.rst README.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
index 988d68ef95cc..0680552e96f6 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -1,5 +1,7 @@
 DIST platformdirs-2.5.4.gh.tar.gz 20645 BLAKE2B c995b881bf25d215ffbcfa4d9fd6721d763d2c27e306961965cd16da00bffce5a1e8dc3ebb48f0f499dbc0f5a079fcffbe0755913f61bc3e8a7192e951e8f18b SHA512 35e2f4ff4d289d6d83172105c716b3a337dc55b52be6d4ac653460e6e5696cce2256a645b2e91a8bab4a17f8a6c6e49b4a005924ede8da7ef2d03ede35061703
 DIST platformdirs-2.6.0.gh.tar.gz 20779 BLAKE2B 5958cff9e3583091c365aea0b3380fc02b273d529868587cda80713db43794c5b69df729390152611d1611aa8a29a5aff84d26a4ccd8777bbd800b3c982bb0fe SHA512 727e057197b1f50cd6e9c0afcba042c9c0f85e061a8667f04548966e6d3d8eb80ce35d07d6578f98fc66273f31caf2a0dc7db9599f2f55fe2e89493803c4db57
+DIST platformdirs-2.6.1.gh.tar.gz 21135 BLAKE2B 65cd34d5fcc3aea46f216780d3a069d39395e0e9af1cff7a7af8511318c165233fff50ad6610ccd48a1e98e1dc4ca68f1cb2d6156a2c4e2a4523f04c09abdd0e SHA512 aff9d091ffad8e110aa2b3d615da65e3618b20f26f007210a9cb75d5e7d72d9ab8309e7e5a139f344f9f6dbedb419ab97848f8301e5104a667a6def58f947a6e
 EBUILD platformdirs-2.5.4.ebuild 824 BLAKE2B 707f36f3b4f32713a600b55f760b8bc017285742749536e14029f79c7a6923a887ba453376b1bbd22d274c98e10d39070731803da36463a7849879a691aadfc6 SHA512 47f989d76004af0ad8f44844908b4fb56846cde0eb5bfd23e269f3034128af5e1ea9ade2a089f712c57272f345a3d0f50419fbffcdc07a038c694a4d1c57aa83
 EBUILD platformdirs-2.6.0.ebuild 832 BLAKE2B 9e2c472e6d643e1d037f016ce3c098009d1f3fcddef63bb733296b71f1b7bf2557936e47b31dcb7e2c02d92559c64900b96722ba22d0cb12cb7d6a301040c88c SHA512 fd49086d3e3966e633538504910d3b89fdacfc1e7ed3d53b5882dbddf22514452ba9ecf4f65b3c1d8a1307a3268891ba114a94c319b0c843c0112c391461c824
+EBUILD platformdirs-2.6.1.ebuild 838 BLAKE2B d267043a6e202d799b08df2efa380ff2301f1c099a346c5f50dbdbf94736a0251442a84820f06ec516c380bdc45b16b81fdd837ae42e61d5e64c8cd88e321088 SHA512 c7f3bbd59c316ee83d6269a622f6adb1e9ce87b1dbf1c75ac9bc7265ced8d6b32542f72e0137a52d5ee5e1db32dbac822e79f0fa4356ef438b4486cd6e4a53a9
 MISC metadata.xml 383 BLAKE2B b8c8c1593d154e7a38ca4bc450c14ca21f2411ea1d71f67e9631c1def0acace43ebb6e67adc0c4a1f5f14aadfbce44d0d815fc3696410bef66c826fd5fb00a45 SHA512 f4ba6722e1cf661b3febe10bb15755a9cbc30226a08bdcabfa3d80be87b42d662d6a1edb3412ad79e8f36836a6dd4fd91a83dae29725ec47041056dc1f1f9b75
diff --git a/dev-python/platformdirs/platformdirs-2.6.1.ebuild b/dev-python/platformdirs/platformdirs-2.6.1.ebuild
new file mode 100644
index 000000000000..0b566d529d88
--- /dev/null
+++ b/dev-python/platformdirs/platformdirs-2.6.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
+HOMEPAGE="
+	https://pypi.org/project/platformdirs/
+	https://github.com/platformdirs/platformdirs/
+"
+SRC_URI="
+	https://github.com/platformdirs/platformdirs/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	>=dev-python/hatch-vcs-0.3[${PYTHON_USEDEP}]
+	test? (
+		dev-python/appdirs[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index c81139d7e2f9..70775ec776c6 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -1,5 +1,7 @@
 AUX pyquery-1.4.1-network-tests.patch 613 BLAKE2B d9e9f2e11c2183f6759a90e35d60a96a3522790743da1d3ec21ad8006e40d98753fb90c14c14c705ab781b08143c52ecf04722d25928f3abe44ebabb59d04342 SHA512 e6ba986a24bf1adf9e1d6c5f4d59fc28a5a613062aa691f84d760c82beeb77d9198a655795e2701dec05184c4fef377cb4bb6f5cc75f49d2ecf798770cb8f86a
 AUX pyquery-1.4.1-tests-pypy.patch 715 BLAKE2B 9f0ef9cf79cddbd90fb6cac1d6297c98f495f5e258b78f4dbac92c4ce3b26e302614a424bad25b9cab2f6a08f8c8e07525d57a6c1ccfd1c4e51893768704edfa SHA512 ba78b8db4c934598de0aeb37ba76e3eda96b123ebd6a85f458dcd8e8a8d13a37935989dcdb9a282748b188267137f85fe6ad3dfa2c0670f77e76ccae47c819ca
 DIST pyquery-1.4.3.tar.gz 47448 BLAKE2B 32451dfc8f8160207b4be12006ceba3098b8cb344bfa3e80ccf75f8cfca9542614ae78b9bfec773139cbbf12434201f92f8b4738e7d9e6241b3addfeb1bc8dda SHA512 cb61326e38f78763ca15de09e3a56dad776b3d4831b54eabf295db0f9af8bf04599642c73f5db3e3172b86d7b66ba2ef626c8cba2dfb458af6ac432d15ea7cba
+DIST pyquery-2.0.0.tar.gz 45210 BLAKE2B 2c1d052d310541b36f526e72906681ea03e0d55be16202c98ab5d5b9f5fc408b7612a353100937381639a03f8871b8bf691c6b0d5ad09dec8cc6f2e2ced7944d SHA512 316a479acd23e371b6e70550681527b15203e7ab62f4722375335180f13d9b48d9170abf308bb26b6180d954de4f8dfea5f90426cb820c5e888cc56f8a99ba33
 EBUILD pyquery-1.4.3-r1.ebuild 1062 BLAKE2B 2926dee0ed1ddf8804702e2768150eb5118f38d9dcbaedca1cdc821b3db5ac6d7cf97ef6945a92b2fba7fc49a28c3a60e7e827587af6c3316a6a5ea548762de4 SHA512 fcae523a7ced35db8c70d89bd8ee707806288eb156324844541726e327f1ac46c9958c233c80994b022fb9dc855832df3a4b4b4b172c633a815e5ad01bdc8047
+EBUILD pyquery-2.0.0.ebuild 1096 BLAKE2B 5b57077823f5c39997dc4d33135ee95daeef52bff3ea1c1454693d19850a5c34d8a097c9891219ab88f1fce38e645f872a82f31c13f6844f333e52c919e2eec7 SHA512 f03dd620b73323cc6369de15d0e7d1fa3c2ac0af0354dd097b5faa391e187ca8f0f552191fa18b7c2c2849968c552d43092454a06b435b609febe195e52c4dcc
 MISC metadata.xml 401 BLAKE2B 0b74798cdf7529c934996c257374138a47c2d0e9a2b1b6b14511bf913f092d41c09291ecd9bf878b9aff3bf6e0956b0fbf9a59f721e236090aaa5a81db913c80 SHA512 f056c0982c8e233a79b23e9cdcbfcf6b6221e7cbceed7f5966fead5b9f8b7add936754de95650b2b0b8a5c2f5d9d76642ac861baba7379185acc886f01ee92a0
diff --git a/dev-python/pyquery/pyquery-2.0.0.ebuild b/dev-python/pyquery/pyquery-2.0.0.ebuild
new file mode 100644
index 000000000000..db800b1d1d74
--- /dev/null
+++ b/dev-python/pyquery/pyquery-2.0.0.ebuild
@@ -0,0 +1,45 @@
+# 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 optfeature
+
+DESCRIPTION="A jQuery-like library for python"
+HOMEPAGE="
+	https://github.com/gawel/pyquery/
+	https://pypi.org/project/pyquery/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
+	>=dev-python/cssselect-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/webtest[${PYTHON_USEDEP}]
+		dev-python/webob[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# needs network
+	tests/test_pyquery.py::TestWebScrappingEncoding::test_get
+)
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup4
+}
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index d93ae3039eaf..a7ecb7458766 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -3,9 +3,11 @@ DIST tox-3.28.0.gh.tar.gz 309472 BLAKE2B 9896411426f6aebb3efa468c01696ecc5f17ec3
 DIST tox-4.0.16.gh.tar.gz 283676 BLAKE2B b9b8149dcfa141518cb18a0ac3263c65f4928fc068357d7a513971d7037cc60cb4b3627d61d3e3479622b9fcbdc235356ca97cde993ab47db7abf4755854b17d SHA512 db4428b576dd3b669969b2390203ba6a0efa85f60073374b32c7ff1273745dde59ef0ffd404a7db98ca9056c5d5b5bd1811b51af7b475c116816c150c4d88c4c
 DIST tox-4.0.17.gh.tar.gz 284062 BLAKE2B 65055fd793fa5d4006d0082a89d7f42452cc5b3d1507a87875175db334bf177efeefa8b3e671d9042b795d8f21898ea1b1650cb1337bb9581a3b83ce8b42fec7 SHA512 065f4b91c32902fc8a65b5529e615af428a5ee8f8ad5cebee6c4ba14ceea315844cda8c6d2a882ba34baf7369d5676f210752d89d1cb3f9e2c7d7af790481193
 DIST tox-4.0.18.gh.tar.gz 284137 BLAKE2B b507b0a15664656f381bc06356adb04c5fdfbe52deeef673e4ccc3d7a45d8cec10de80f6fe141a35bf529b020d5d8579c4dd6e4e3aa323bad320c7fcc6c34d18 SHA512 cd10cd4194002644d57fc63295099fccf6ffdaa2eeaf7bfe2f47c85d76dc115f9faa78ce0cfc43603b11ec04abaf4d41fe653fa48bff71e71ab7d102356ec5b8
+DIST tox-4.0.19.gh.tar.gz 284319 BLAKE2B f0ed3d300e0fadfaa5725589cea91511ed0c37937dc3761b203cfd1f0a5cf4033b6006e693521c932d3af64feb150951c046f5853a8b9bb9e37dcf3c5db4de95 SHA512 27d01b96acf4f7650b5a4a3ad80293ea884ee6791ff2e734cb64c94551943af1fb91804944f7ae82937fe4172522c0d5e4f24e84d35012d11657adc49702fc88
 EBUILD tox-3.27.1.ebuild 1916 BLAKE2B ab2496317d588c05936d57132d1c759c9a14f18c10fb50d6188b7bee5bd20de9f06b5d8945a908cbf021f4b7036ba6d23dcf19aad63af9d6cd6bf6baa598ad32 SHA512 b038f9976de8af46ac663faa169a06fad1bd28ef61738679fd70faa5e655c0c85ed3a8e4efddee2dd2aff8cc3fe9f5ec133311d122c6bab15c487a5a074a6c11
 EBUILD tox-3.28.0.ebuild 1924 BLAKE2B d2a5ac59691e8ad704bb64840925d192df827d533c2b17bafa31b95da83a235c28109e911f78e294b12924a99114adad5bbe44cbba67fe8d2d584c9839a70d59 SHA512 aa919c8b15403b9992a772bf0296f4cae2bef39c4ded509f732a13869504f7af15cf43f26c9f401e31794c481a5e1dc4e91c18e65c31a4e159d7b9a2cb1c99ea
 EBUILD tox-4.0.16.ebuild 2396 BLAKE2B a5c1a60c46d8c215c763101be08df17dba5366f23f1e9e4d619b451a82d4df721378f012b7e3a88ad7dc91a5a12fd8c46e57b724eca3d1c0f4e3dc0e2ac12627 SHA512 55f2e10601f9c8d5f942bd58748292ffdf0661426e0c8cac38808eb819080e5b1a8fb7fb6022cfdf701c58dd40646651a5efd3608d3857ace31597019c9ff679
 EBUILD tox-4.0.17.ebuild 2401 BLAKE2B c637640a6adefa4dce637fb723174ca35d3214c8a4f656cdd8558aeebc2f3ba0e826473131a852a330cb5d26201d58eba226c0bb7a407c783c6e76d98abbc67d SHA512 568a571e2c2d68f3fb4f8783a00a19d76a18a9cb8e481411005461d474582199d82e8a1830b531bb52950ba7ed850330d09e37a520a77ee9b875c6d091e4eb0d
 EBUILD tox-4.0.18.ebuild 2401 BLAKE2B c637640a6adefa4dce637fb723174ca35d3214c8a4f656cdd8558aeebc2f3ba0e826473131a852a330cb5d26201d58eba226c0bb7a407c783c6e76d98abbc67d SHA512 568a571e2c2d68f3fb4f8783a00a19d76a18a9cb8e481411005461d474582199d82e8a1830b531bb52950ba7ed850330d09e37a520a77ee9b875c6d091e4eb0d
+EBUILD tox-4.0.19.ebuild 2401 BLAKE2B c637640a6adefa4dce637fb723174ca35d3214c8a4f656cdd8558aeebc2f3ba0e826473131a852a330cb5d26201d58eba226c0bb7a407c783c6e76d98abbc67d SHA512 568a571e2c2d68f3fb4f8783a00a19d76a18a9cb8e481411005461d474582199d82e8a1830b531bb52950ba7ed850330d09e37a520a77ee9b875c6d091e4eb0d
 MISC metadata.xml 382 BLAKE2B 7c0704c5c187ce4a7972fe0372b23c5537a81a8d62fd83436d9558a61761f10764adb5a4d5f6795f0dd1fe905afa604c0be77fe1d48d291847f6ae65dc1b032c SHA512 9d0ced4df9352a81034a50d5766a01534ae8fa889985d99cc9e2a8d0889e31c6c11550677d9a5a74e2aab57c320192ce3a42708a6d23b0419ee34a6054398344
diff --git a/dev-python/tox/tox-4.0.19.ebuild b/dev-python/tox/tox-4.0.19.ebuild
new file mode 100644
index 000000000000..98dc8a8f2545
--- /dev/null
+++ b/dev-python/tox/tox-4.0.19.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P/_}
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="
+	https://tox.readthedocs.io/
+	https://github.com/tox-dev/tox/
+	https://pypi.org/project/tox/
+"
+SRC_URI="
+	https://github.com/tox-dev/tox/archive/${PV/_}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc"
+
+RDEPEND="
+	>=dev-python/cachetools-5.2[${PYTHON_USEDEP}]
+	>=dev-python/chardet-5.1[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3.8.2[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.6[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-1[${PYTHON_USEDEP}]
+	>=dev-python/pyproject-api-1.2.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	>=dev-python/virtualenv-20.17.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/hatch-vcs-0.3[${PYTHON_USEDEP}]
+	test? (
+		dev-python/build[${PYTHON_USEDEP}]
+		>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/flaky-3.7[${PYTHON_USEDEP}]
+		>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-3.1[${PYTHON_USEDEP}]
+		>=dev-python/re-assert-1.1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/time-machine-2.8.2[${PYTHON_USEDEP}]
+		' 'python*')
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+src_prepare() {
+	# the minimal bounds in tox are entirely meaningless and new packaging
+	# breaks setuptools
+	sed -i -e '/packaging/s:>=22::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# devpi_process is not packaged, and has lots of dependencies
+	cat > "${T}"/devpi_process.py <<-EOF || die
+		def IndexServer(*args, **kwargs): raise NotImplementedError()
+	EOF
+
+	local -x PYTHONPATH=${T}:${PYTHONPATH}
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
+	)
+	local EPYTEST_IGNORE=(
+		# requires devpi*
+		tests/test_provision.py
+	)
+	if ! has_version "dev-python/time_machine[${PYTHON_USEDEP}]"; then
+		EPYTEST_IGNORE+=(
+			tests/util/test_spinner.py
+		)
+	fi
+
+	epytest
+}
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index ee926ab67229..9619dbb41293 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,3 +1,5 @@
 DIST XlsxWriter-RELEASE_3.0.3.tar.gz 35519702 BLAKE2B f4dfa6b286dda94a1a44d8168b8e17f7a37f2f59a23aa3a5ed0efa46b5d8bdcdb831e99a61924e22755c6a921c23f5c540c048152cd07363841ff09a49549c79 SHA512 92a53226aa9ee9f8493fe7171ce752f3a13ef8f3107aecbef896f17022e93bd7dbccb5e619fcbbb3598102030b190d75508d4dacce20b9643eead59a4441f6aa
+DIST XlsxWriter-RELEASE_3.0.4.gh.tar.gz 35033608 BLAKE2B 49a54380f1753077f0d9e56024a09ffd9d26540daeb03c270e892ae986c8e36fb0ce74ab96e62b1cb15adebbb51ba2093b6b1e356077433537af62ededd79d5c SHA512 e10bbbcc975ee3c2395c642c7a04e53d792b8c739c9f5acbb3858b47963a0f9b68ac565d96d4a9f9c87b104fc02b8930b0629e753d53735892e10bd17e5c1fcc
 EBUILD xlsxwriter-3.0.3.ebuild 682 BLAKE2B e7f600dcf87d96c6d3a8091595c9fb54280cf57d52e696ca519a60cb2400e07d0b0331390592d709fa43200d45beee8b4820baf38b91c20251e11f659ad87e6a SHA512 1706167c674010af8c82584a43d44b1cb9d0dd843083991d8779e8b3ed074f7ab247ed9b338018aa86d082ada0fe6e1c222e5d030829831d7f79da94f5ac1f7d
+EBUILD xlsxwriter-3.0.4.ebuild 691 BLAKE2B 974587d841d96cac4ba0b13670b18b2997311478d9eb1247aff839b062cb13a86a4ca6e82fc034bedc7462d5e66a0d186216d1c07665673c70887ba61281339f SHA512 8312aefead1b468289c3bbb9af6ea9058740992ffc6dc61a181dfaadaf884901e85b401ead0d5a08adaa4cf5bb52dc133a4f905ac8f2920c3a4d5b74a24831e4
 MISC metadata.xml 411 BLAKE2B e41e1e6dddecef73fff1c0bd74d51b023694ea6eb162022679a2939819f5c3339b1e76d00e25f761c46f66d323a5ad7085ed86fb13fbe3f53526c75004a68e93 SHA512 63242ff274e1dde596e50f9360e1247084b7bae05cd42d60605700c49e33b53849529578cf532415b899bd2ccd04066f99e97c6e80d53c13f71522a041579976
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.0.4.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.0.4.ebuild
new file mode 100644
index 000000000000..eb7598818634
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-3.0.4.ebuild
@@ -0,0 +1,28 @@
+# 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
+
+TAG=RELEASE_${PV}
+MY_P=XlsxWriter-${TAG}
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="
+	https://github.com/jmcnamara/XlsxWriter/
+	https://pypi.org/project/XlsxWriter/
+"
+SRC_URI="
+	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/xxhash/Manifest b/dev-python/xxhash/Manifest
index abce1682c341..329ea5db2e65 100644
--- a/dev-python/xxhash/Manifest
+++ b/dev-python/xxhash/Manifest
@@ -1,3 +1,5 @@
 DIST xxhash-3.1.0.tar.gz 74389 BLAKE2B c2c7467aca51a397366c9de47104831f2d3d732b6b287e3fce4a0481d21bf059330dd63e1372b8da3aa9354efbc3de6ba106501d86c907b5783f7192e5e7c9a1 SHA512 a1d78dbbcc8fc8e41b6bc1d9e571df6951d4545fe61b198427db6f8c99058a095cf20e09951acc7bf9b432963f8b234741ae1f15ebb19972e69be0c59c9eb165
+DIST xxhash-3.2.0.tar.gz 74561 BLAKE2B d2c32b9a556eaaa67d961e130b017ff82944fbec983f24e0356436a7a23927faaba118328eff508e288e0757a1379b5ff88a48c2130eb9b3cf347e178cfc810d SHA512 bbe903b95de3e91177064986adc5c945a9b7058650ea2b5cc10ee162a15a42909dc69f95b86081b8d276960f309b4bacf895ad263a9d9188fa66bb216d76dcd5
 EBUILD xxhash-3.1.0.ebuild 642 BLAKE2B 780e793bd61bc77ca61cde7f81478e4fce42643e27f7d420cd4d231f65a4b3d597a61b585a5649a77c2ecfe71901257e95d5009a04cdba0506cec2fb175218a7 SHA512 3eb9a4d78a37c42fd23d9e605f2a6d039e564f6de7e91b62a09b2fba0c56f5726bfeb476b681a3b6aa9b8ce887992b350ef24657c2280af944c3f0dbbae0173f
+EBUILD xxhash-3.2.0.ebuild 643 BLAKE2B 11caa932669c9b9520203ab8ffce3b7d6b124c51d12d9f4f9b50b3d325725eeeb2d317373ae76275c2409b9fe708123bc0ae3c10593435b83736124de97ca2bc SHA512 a982cda9805c18660553543b4d8379378d1be6e3dfc97878f99ff869f4e825231f98c46ebd8c0d6f1484a8d3c407566fbd0a314c6927a77607c7fb21faae296d
 MISC metadata.xml 561 BLAKE2B 80182c778f9e8055e3d9c8a0adf1eea293724fac6706eb76ace27655a6e6ccaf7ab0fe8d4b0dbaf411183ae10da34b0452dc461f12faeb35e06f3253ea5ab48f SHA512 d2bd317bff748d00be51a87bd3cfe93ed3ecd2e758262fea0042cfd3c70051fb72940fde06822fd1ba972b8ce21c33f4a1a5bb5ae14c7c68e25c661e24d7ff68
diff --git a/dev-python/xxhash/xxhash-3.2.0.ebuild b/dev-python/xxhash/xxhash-3.2.0.ebuild
new file mode 100644
index 000000000000..dc94bedd6f45
--- /dev/null
+++ b/dev-python/xxhash/xxhash-3.2.0.ebuild
@@ -0,0 +1,38 @@
+# 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="Python binding for the xxHash library"
+HOMEPAGE="
+	https://github.com/ifduyue/python-xxhash/
+	https://pypi.org/project/xxhash/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="
+	>=dev-libs/xxhash-0.8.0
+"
+RDEPEND="
+	${DEPEND}
+"
+
+distutils_enable_tests unittest
+
+python_configure_all() {
+	export XXHASH_LINK_SO=1
+}
+
+python_test() {
+	cd tests || die
+	eunittest
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c837923c0ca8..218d02e746c0 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 6a00690b6311..4e846e1cc105 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,10 +1,13 @@
 AUX glslang-1.3.224-Fix-cmake-file-install-dir.patch 13162 BLAKE2B fb58095f7f9c136e3d1aeacb0d7e0a1ddc4d8972a160f8e31e7542526ae9eed9c1acb07dc1bf160e58f8df2582420b9df4532c0aae723729293b0fa5b4bc24df SHA512 8eb4cf63767d83219b56996477521da067f06e0d9db52c8a5a7c842e28f988935181cacb5727795c33fc75ec81d6085c6d30f0498ed4f1a8c3e6fbe33c1cc7be
 AUX glslang-1.3.231-Install-static-libs.patch 2628 BLAKE2B 4d70627a22636bb2d47b6f6295a7e47f74e485227f8673e92998dad46ef8cb35cbd581b85d744fe6cec24ac1d0458689e3aad3b703a83e2cac369da3c5bd5bff SHA512 f5e4ad9cd39ce4be50aba81c075dbca3f05a84190ba54cbd36fdb494c003e1c45d8878e03aefb9ff341c6959d465207782f2e285f8b28d9b9bff60ceb5c4a9b8
+AUX glslang-1.3.236-Install-static-libs.patch 1460 BLAKE2B f17b5b7325e112d52a65767166530c9976833a2a893e608fe89c662a2e84feccd8e51b36a620dcf94b269cbeb96307744b4376799821dd4d4e422ad8fd887b14 SHA512 032da16afb9ca98bb0377625fc16458c641836fb3bb63940818c1bf4b068b6fe03b3f14b03cf00e10991236ca20d292293c67d02dbc429b2e3714e6a8bf85b19
 DIST glslang-1.3.216.tar.gz 3537750 BLAKE2B 0eddc7be8a4499a283b941b51aefec5bfa3d555b8f44408f33a6993db1bea96b6dfeedb093d64117ef4ffca6ad264ea5968492af642fc2b0563bb43eff241cb8 SHA512 4ab3953df2e881e4eb923307d6ec906daaa1786a1ad1b4d7d6713d63599c8f7cfd41257d53f7caeddcc4ad8cc4aac707393d2b7a1c7452ff5e9d1ae5f84696e8
 DIST glslang-1.3.224.tar.gz 3543160 BLAKE2B 5773f884b39f2bd01bf71269e62ee3c0ee36a736249e65b6b205560227698230e708feb4137cffe7b4b30e8756c206e53663bb3942b1d5d528511ac96e8bc407 SHA512 d982fb166d07e8862b8b41d90652fd419a35a0987ff86e21b4cb760594e0c8505d927dcdb089540168ca4b47e4d89d5e150706758ff82b25011f52c1716cfbf4
 DIST glslang-1.3.231.tar.gz 3657070 BLAKE2B 3a33854d165e966f339027f73d0f05bf4a2df5998f379529413209eaca2b3e95939ead4bb606e7f65effb7a32e81ce40f4bd7af94b2e6fbad1ed8d809f6a1f19 SHA512 2235c476b03bcb93ac9d0d8a88fdf980f6435086d7ce13a1d9c8ff223880d788a49f35e7392f1b5af9174da7b501a171b80ce4e89bc0c6d609d2b737da982e56
+DIST glslang-1.3.236.tar.gz 3659402 BLAKE2B 7ee37cf00e5d9bd821253d7c907d29422410cf6809f7ec09551b1d0b08e53924add24595a52b241017b69890037ea91660be1ea5645e18cb1e0bba80ad224a5b SHA512 4758b137a31bc6ef999c6b00f4d4a55c0edc879eb09082acbc22a56549a53e61ee5a67e705a40f679f2e25f3a5f1245c14a880e646febc5270e8374809debcb3
 EBUILD glslang-1.3.216.ebuild 809 BLAKE2B a207750c9898380d2ca4b7b3769828d3a7e7950666282cc54a7e02f0e1b1dd0ba1834b08ca081e152cdcfe55dcf5ab165c3ad743539253e69988008e717be603 SHA512 a51a0c70ef135db12b71c6b42663f5528127602adf1327411fb81a10159461314472814e8aab044c48ff7dbb2c3e8ee9fa2e76c9eeb74725a9ed33ecdfd70f0e
 EBUILD glslang-1.3.224-r1.ebuild 874 BLAKE2B adb8e53b4667fc094fed4f3568bb82a338906bc6056c2975fa04ce3346c43c79a4140c052efdd286b37eb6f6350b0b70fcbc343fc5e35592ee36d3e7f0f531c2 SHA512 9ace062e32cd94a8691afe87c4d838c639b1227fa8cd7bca53ab9999cd031a5734ad620dbcfa54a34ff741efc91968f62f4099474e45aba76e261a2b5bfe8e74
 EBUILD glslang-1.3.231-r2.ebuild 963 BLAKE2B d11d386b707d88221f5c343656a633e587d954416d5e57b20c4c19542ff474cc6f4dbb75c6f6f3d65272231191c2fd00080ba8a016f3953c84e1e2f74d81e6d8 SHA512 e74c76895c057becf0b0af51a135241d99df48b4814c7cceb755ad4591f3f877ba122460d8cbdce72bc3f85cae3071f622f70678fc7319c89f26e8d793579ecb
-EBUILD glslang-9999.ebuild 978 BLAKE2B 35807072685f3364ccb38b47af47cf8f6ed3c918b246312877a22659b20af6cb8d3f6a0dc7a404a1fdc0d55c4d516804621cd6b543f1efac28bc8908a3c559a8 SHA512 069143c55a6c62101a4efe4f220e219e4970592663be8c5fcc89fed2c80ae5ff5393a2ee363d74af747b92e2b5aaaecdb15955ef5f821da5ec128cee7899c225
+EBUILD glslang-1.3.236.ebuild 969 BLAKE2B 6f11eb37e246b2ed1c1fe0887907131b715faa57081b824a2e91642d23bafdcf9cf55fce8cf09d1dbb8426c0263314cb034a6738b8a05b04dba4478b9a9955b0 SHA512 d9c97a111902298a6cadfb01c5fd9e77f8afe0b3bfaba773644f6836a60a408ffa22d8707247d0fd9cb3450ec08c5d957390945fb9a8ee752482b984e5ce7bb9
+EBUILD glslang-9999.ebuild 978 BLAKE2B ca18b9b116c80bffcacce02c29b629dc308903f4e9ac65c186b2977eaded341bf153bbf35e41a05d1a5bdd1a9b7f90e626c1e68c40fdc6f8867b5bd05c174c2f SHA512 d14a3497bce484549bfa9ba0cfa99f361302f6dd69d862cc02ed9e43ab5533cbb80808904b9767e9bf4b933b73034f700db4c77e69d6fac56b247dbf4993124b
 MISC metadata.xml 330 BLAKE2B c3874bbe807a8dd1a55897feadfc0a89e4cb806441390ee7e7cc317f3b533a08338a669834122ede89cefd9b6532d789aece2c29fcc6cdfc7f76a81bf382192b SHA512 1c591a28214fb76334171e4a49c8ac302b6f174f265749ad005f2503df1312e8303c92a68248775ed3db98d65107471f9cfc8cfb758c89261f283711beaac764
diff --git a/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch b/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch
new file mode 100644
index 000000000000..826e0f6cd856
--- /dev/null
+++ b/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch
@@ -0,0 +1,39 @@
+diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt
+index b44cbc73..41f6de93 100644
+--- a/OGLCompilersDLL/CMakeLists.txt
++++ b/OGLCompilersDLL/CMakeLists.txt
+@@ -41,7 +41,7 @@ if(WIN32)
+     source_group("Source" FILES ${SOURCES})
+ endif(WIN32)
+ 
+-if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
++if(ENABLE_GLSLANG_INSTALL)
+     install(TARGETS OGLCompiler EXPORT glslang-targets)
+ 
+     # Backward compatibility
+diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
+index a8b14911..57ec1efd 100644
+--- a/glslang/CMakeLists.txt
++++ b/glslang/CMakeLists.txt
+@@ -203,7 +203,7 @@ endif()
+ ################################################################################
+ if(ENABLE_GLSLANG_INSTALL)
+     install(TARGETS glslang EXPORT glslang-targets)
+-    if(NOT BUILD_SHARED_LIBS)
++    if(BUILD_SHARED_LIBS)
+         install(TARGETS MachineIndependent EXPORT glslang-targets)
+         install(TARGETS GenericCodeGen EXPORT glslang-targets)
+ 
+diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt
+index 16eb939b..959788dc 100644
+--- a/glslang/OSDependent/Unix/CMakeLists.txt
++++ b/glslang/OSDependent/Unix/CMakeLists.txt
+@@ -52,7 +52,7 @@ else()
+     target_link_libraries(OSDependent Threads::Threads)
+ endif()
+ 
+-if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
++if(ENABLE_GLSLANG_INSTALL)
+     install(TARGETS OSDependent EXPORT glslang-targets)
+ 
+     # Backward compatibility
diff --git a/dev-util/glslang/glslang-1.3.236.ebuild b/dev-util/glslang/glslang-1.3.236.ebuild
new file mode 100644
index 000000000000..519eb9fd2b13
--- /dev/null
+++ b/dev-util/glslang/glslang-1.3.236.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
+	inherit git-r3
+else
+	SNAPSHOT_COMMIT="sdk-${PV}.0"
+	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
+fi
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
+
+PATCHES=( "${FILESDIR}/${P}-Install-static-libs.patch" )
+
+LICENSE="BSD"
+SLOT="0/1"
+
+BDEPEND="${PYTHON_DEPS}"
+
+# Bug 698850
+RESTRICT="test"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PCH=OFF
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild
index c7d6b2354929..cfde31bd6156 100644
--- a/dev-util/glslang/glslang-9999.ebuild
+++ b/dev-util/glslang/glslang-9999.ebuild
@@ -19,7 +19,7 @@ fi
 DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
 HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
 
-PATCHES=( "${FILESDIR}/${PN}-1.3.231-Install-static-libs.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.3.236-Install-static-libs.patch" )
 
 LICENSE="BSD"
 SLOT="0/1"
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index ad95092c10d6..93412859b4bc 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,4 +1,6 @@
 DIST spirv-headers-1.3.231.tar.gz 439643 BLAKE2B 034f3ff56a36dbd62290980f55ead654af209eb23359b541b6d6de72f8c6dbd67d7e0ca5c64f0e2b2f29077a19b224909c507d373a17b76010862df3222e8a08 SHA512 227d0ae49d3095813cb48b5657858df4caebfc4c711b5d8b1d358f4b37f40b482d4cc7ca4d91cb029c32c8ba6af73221ba0fa02724e795a46dc324f2bc832ff9
+DIST spirv-headers-1.3.236.tar.gz 445166 BLAKE2B cf64f91a3d4368f876fb5834c0fa42d36861519b842fee8789515752dc8cb519266579cec8be26f3e0ea2917884b3bad2644f337adf9184cda139224cbc33240 SHA512 0cd35cbff41b5dc6f78c5129c138c83e099c8bea63eca9dfc8fdf0a19fed015b9d4435fc8e1c8d98997f1c673162b289842e0bbe3ba243f798bc631cd92d85d2
 EBUILD spirv-headers-1.3.231.ebuild 490 BLAKE2B c201f868fb03e46dee492548ac8d1997912eace7559d041dab2d15b8a7b5c46285d906930df30dfb2e629a1f89a9be2605aa0ec53719cfdd20edd0e6fd607726 SHA512 4a8e6249a2909bb240faab351d9f5a205c22281ec595ef151eccb5a0250a9c3cb7ad4902d998f59bff7b1a7a9a963063ef6e95f2a88f13942865a6c856ef6961
+EBUILD spirv-headers-1.3.236.ebuild 496 BLAKE2B 7c7b854fda101666d14c7eba05b9706f879ab4e1748857cbcfe25b067ce8bbebdf1331becf379aa4666d656a00d0da66263d4e069f28842036ea333161c1f943 SHA512 a43005d93629a551dd4d3781f18e6dc68c5076ace8a8b108ac9889acb2685fadb3180d5843a4240fa5acf318ce915a738849b6eda9aedcd309ce6bd48b9a0cdb
 EBUILD spirv-headers-99999999.ebuild 607 BLAKE2B f94f54dc76cecce5116f6840334c3dc2b03c9b7e447765c491777562dc76cb94d2da530e4b678e7d2bde5b8b164b7aaee4421d2f05fde27c18c95e26e0fed2a0 SHA512 93a76d5a2dcb393607f194893ab1edeb28e158c22806a6bf144b345e368e57611f3114d2ad3d7b352d2c941b70ddf042b2325ed018e3cc9c4b4c5a2f7f3bde3b
 MISC metadata.xml 431 BLAKE2B c29407612814c966f4134687e901ffff31be3990b771b3584f6517640098ba2cdf131ae84bcdc3da8398d77d1d51e3d6fe0180c564c0e8272406d246a5661578 SHA512 599da456349756e1ec66a1b36d9c05322c5aff088dc4741239a647550ba816333a2dab0e05049215e6d4b08222e06f3aa5a1f76697c7a15eda31b571afa3299a
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.236.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.236.ebuild
new file mode 100644
index 000000000000..d2781b9e4327
--- /dev/null
+++ b/dev-util/spirv-headers/spirv-headers-1.3.236.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Machine-readable files for the SPIR-V Registry"
+HOMEPAGE="https://www.khronos.org/registry/spir-v/"
+EGIT_COMMIT="sdk-${PV}"
+SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index c7325ec5b4f3..5d363c646c5f 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,4 +1,6 @@
 DIST spirv-tools-1.3.231.tar.gz 3044417 BLAKE2B f59afde3ec653e9ed0e8c43814e2ec8e9e379d3872c5f277215948d57ff4dc29374525e42fb5cace08d59c8322c28a9077c3573691242c5aaf4b057865ed7cf1 SHA512 d38ca24b9316e9e878f56e63a08ee40d7cae5aa947546f4d9e789d71b81d0f551fcafacce09d59e9874e284705f55f98e5fdc0acc27ec429fab02f9762e47952
+DIST spirv-tools-1.3.236.tar.gz 3079909 BLAKE2B 97c773b3bee60d3889f9bda49d0b729ce199fab1d6ac211f0bcc9fd0ec2d1d770ed6dccd603cf9beae82541d009fa37bc6d5e1a3a8cae82985c84e3bcfbc4149 SHA512 c70287582cc42eca1a4b81259217f02e4d7003503d43a2aabc24b3c6c50b9081768bdd69ed8a9c8489b1e9a52e9762629c920a96eb2ef43a96e9ead7a1438674
 EBUILD spirv-tools-1.3.231.ebuild 1220 BLAKE2B 96dfaafd75bc5e5160b7c8e170f2a94774e810e00593265badea7658bc6bc0183ba24ee894a0e0fce8d94d5c33f003fd6418b02246354ec924d5c39a64b6137d SHA512 86d1b8636bf23f4239e013bbfec7bdef228e1b94c4b91d520483cf7be75cfd6b91c2b1c8525cd7821586e02efd2de77adc6d743f8ceeb0090cf2a28cee10c797
+EBUILD spirv-tools-1.3.236.ebuild 1226 BLAKE2B 30bd8124f68d6a7600e94a9827c3b9fb117d7a5e858ecaba87c38bc227f9c44c96dbe897789e8c5b6df40a82840488deea5c63579ca4f9657f204acf48fa55b8 SHA512 2a49fdffe892283d85c7199c2bf01f7f8f67bb086725fd5c9f7c1218c7a6fa3c8f4f4e3db975bdcb502a8eabb633f13fb55601bf8f3f448779ec7ba3820f53b0
 EBUILD spirv-tools-99999999.ebuild 1228 BLAKE2B 14e6632663e0d507cfc0734669fcff523de12e8cc2d59e9d393f5f5fd7f497d583bc45fd163a8846b87d299406f7c1522c43d87359e8c3e7339f6238739002bc SHA512 f27542e6f9d50175e25ee80bb51a9c9dfab57746b76d225bab006803f8a21d79474beb05bbab1868ef6e52f1a8f74bfd7c2bc95ebab2aae788525ca869331cb6
 MISC metadata.xml 429 BLAKE2B 8d9917ace6eaaab8b826f48bc6f38c629efc5245a5356d821632867b8a65246180dcc14927db6ed1e025a32d7bb248aa35e3a7095c79bff5a2e91b3d880de997 SHA512 3f076c95eb788258a2451c3b54a013eeb936fed744b68499f53970590fc846d79b9724198ed54300a57395b1f4f2a657840bf8aa7ff25dcef8cdf28aa7f35ae3
diff --git a/dev-util/spirv-tools/spirv-tools-1.3.236.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.236.ebuild
new file mode 100644
index 000000000000..0e9cb686acc2
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-1.3.236.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=SPIRV-Tools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="sdk-${PV}.0"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
+fi
+
+DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# Tests fail upon finding symbols that do not match a regular expression
+# in the generated library. Easily hit with non-standard compiler flags
+RESTRICT="test"
+COMMON_DEPEND="~dev-util/spirv-headers-${PV}"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND=""
+BDEPEND="${PYTHON_DEPS}
+	${COMMON_DEPEND}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DSPIRV-Headers_SOURCE_DIR=${ESYSROOT}/usr/"
+		"-DSPIRV_WERROR=OFF"
+		"-DSPIRV_TOOLS_BUILD_STATIC=OFF"
+		"-DBUILD_SHARED_LIBS=ON"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 34ebac92d875..d8ad2ba156d2 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -9,6 +9,6 @@ DIST valgrind-3.19.0.tar.bz2 16403296 BLAKE2B d3ccd25789ec4d87a0ddab58d8098246a3
 DIST valgrind-3.20.0.tar.bz2 16469274 BLAKE2B 8217dcfc185c7f6601fedd8d53bb35d260b985b8049c8c73a26151db6650b1607e8e53b614652c40962ea7382b9301c4b234a933c8d81f57e649ebf3f703e630 SHA512 d6bfb9284d0410134ee7e2a5975b13c01508dd5587b562947d8197b3c113b76fdfac88c4072948be68bbf0dbeb17b4d1acb1412ce898adaa83c30ae2c6a1c12b
 EBUILD valgrind-3.18.1.ebuild 3703 BLAKE2B 8cebf6e55574abde88bb9cb173c35ccb283b1b7c4d62664d26137478f5174b6ca7c366100e09540357caa27d4a221d8e3b5225aaa019fd6b1c7cfe6928932569 SHA512 eba7ba77309a201722ccb4b1e30e1ab7f41a3b90344e4003c64e34cc3e7d71adcba2efe829b31622e9fc2258a49ecda0e84a1b48bd245e8b795518b31d868cac
 EBUILD valgrind-3.19.0.ebuild 3959 BLAKE2B a4599eeb28141def0b522a3e23abe83db44ec8ea47e1438ea2e10abb9bf49fc643e2c1fc7d8cab414ae4108479041575c30c8b204ae296f22b1076fea013db53 SHA512 ae7bc5cdb6f2fc9a882508ea7d7e5407851354fb34a4e8f1dbe5e48814e0d30426c2ab9089217ce4ab57716b4bee42fa54d24e70fe90d8316f956ddc261cf432
-EBUILD valgrind-3.20.0.ebuild 3961 BLAKE2B cd9b4302f8328a36e1eda9259ba7d2fa8001b026091af28c45c5326fa355672e70b9fe17ff2069f8d22e5b398792be6adfe78a2960312d46f5994c17139b3f9b SHA512 f11852be4e55637fa386ac70010032de11b268c1bc3d94f5a7e45811a0312449afc3fc328099eabd0a4d0dd380c878bba8def671120167f47e4e25c8cc37293f
+EBUILD valgrind-3.20.0.ebuild 3958 BLAKE2B 4a7666d750a258ebdb52b57be786bc6e26343499853fd19012f3599b9e2267aa489630bf593800ca493cbc7d5216029fa2b30f6ad7b9b67d3eb0c9abff5739fa SHA512 2927c9e9813368d08f16a212ad4ed04c04f596ef86de8c28e3b4d2421dfa29dc7873cfa06183a082c9a0636c9a412a3fd15ba702aaab2c3a7dc05eb8dc8ccf89
 EBUILD valgrind-9999.ebuild 3921 BLAKE2B c0f5ce239d2e5990afe6f272de7006219c9ca97e8859ec9491f64f7211c6760f5feecd453356ea3e89e77d14dfa4c27375259c1aa1d886ee0ee028611221fb84 SHA512 655489b4b0cb46f12607edd429277fd677db5793dfbd6e4743c3ac02e160353e3238802c1923d14e533ac040242478730d5091ab756e00ad505b1da832f6eed1
 MISC metadata.xml 1028 BLAKE2B 5e6d52b6a5e657f56dc8da70f83d340c8ad8ff1448b109916d77a51b62f9018dafaf20586684d9d5c0984647df9fb3886b9fc0fabcfd62bcd13ef8d5e1de223e SHA512 1b9bd9d815de416b73e03bb13f88b662b14b4c135a36549ea5ad69a59c9395a240b80c30e6847eaecc2318ca88a2081e71fed41af2e9eed5162dfca78c7af920
diff --git a/dev-util/valgrind/valgrind-3.20.0.ebuild b/dev-util/valgrind/valgrind-3.20.0.ebuild
index 6fc8047bd5a3..500034e6c541 100644
--- a/dev-util/valgrind/valgrind-3.20.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.20.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="-* amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index a702fe091c88..e021c1ca6d18 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-headers-1.3.231.tar.gz 1691630 BLAKE2B 321ad1d472a80ec31e0bbc80e8eb79ef831a385415e216b2ddf83014fcf4c3fda804fb8d085be10b35bd9454ab42cada4bf3d7f25d3d854cd607f7afd8ace906 SHA512 3d460c2e768de02f8bf5ad2963c4c75c4efe03be3d6a5a752c54676307fc2913fd765c7955bee4da42a9f9c64c20b984ffde805c3561b4e97d2b4120049e88ab
+DIST vulkan-headers-1.3.236.tar.gz 1764629 BLAKE2B bcab4628979aba6121779f876010cca18308b42b2eea5f7e2c9ab45855914a5ef8f2f217a9853feca461c2fd002ad44696b60ef229c4a2f187aacb7e68ae3dd4 SHA512 f4623a9076896403ceff2c97b02bbda0692535be01dba0a51a1faaa015d9c57c47aaa0960505b94553f24b4efb9ebb84adac5a949d341bbb13898d734e6c722c
 EBUILD vulkan-headers-1.3.231.ebuild 629 BLAKE2B 1bd403ce0eefd80fce8a633e99222321bfd5cbd6cc29ad5d53e22c94aa04214f850be41d314d396696f64ae1d360cc2cfaac878c2bf5f2cd03b41bf715a649d6 SHA512 7916ac21e93195e7ffab10a2def2d905ba91aaec0cf0f63992028d48ccf332f65ccb4948a5b4cd12260d217c3c08f892423b466efe5367319b3676ffac217f8e
+EBUILD vulkan-headers-1.3.236.ebuild 635 BLAKE2B 6aecf86175de5bd7199734da984a00c644ff4601fdc56da3937bf4c3bcb0025302b9beae478d32f4a9cad0a7d5de751efd3caf6d31bfbcfbaee022c9e2f26941 SHA512 e740f8b3d7060f8f73eab968b43db0c0a9144cda4863cc7fa6661bd32562f36adc7a4fa00c7074551e5c3f44288ecb4b2b1204034725bb27b464bfe025a4073f
 EBUILD vulkan-headers-9999.ebuild 635 BLAKE2B 6aecf86175de5bd7199734da984a00c644ff4601fdc56da3937bf4c3bcb0025302b9beae478d32f4a9cad0a7d5de751efd3caf6d31bfbcfbaee022c9e2f26941 SHA512 e740f8b3d7060f8f73eab968b43db0c0a9144cda4863cc7fa6661bd32562f36adc7a4fa00c7074551e5c3f44288ecb4b2b1204034725bb27b464bfe025a4073f
 MISC metadata.xml 432 BLAKE2B 04c6e302b541f48dd20c84c7da9e82cad1b53d8040e796034992e8e110e3a815acc76e3067d12ce12fe2d7501d797b1e0340231d7f8216c4bf7576a053f5ffb7 SHA512 89ef7a8b4de02a0726aacaabc87904bd4f5484567d21ec6dcfa15dc7f84a3a3915a3202febf4f779fdc54762b3731cd0384235a7908c46b1adf3cbc38effa5f4
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.236.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.236.ebuild
new file mode 100644
index 000000000000..591287d773f0
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-1.3.236.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Headers
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
+fi
+
+DESCRIPTION="Vulkan Header files and API registry"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index ccba329cf390..e15cb09d7d13 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-tools-1.3.231.tar.gz 876613 BLAKE2B 5c57e5f1f101d79b2bc57a7033a438c470db0d089beaeafa69865f95f14a55c0f71fcc0fb0dea1d898ddcdb80364abb883805e6b60f488a2b5b56bb42cffd4e9 SHA512 b6b1404e3d77e85c5f5d7e111193503e9b2a409a506692a862fcfc01a57d3ee5c6410f47dc7175175b817a1f0e9af62b7a99934c33c68f90babd698aeaeb0b8f
+DIST vulkan-tools-1.3.236.tar.gz 880927 BLAKE2B 0d2b885057d063946140489eae4fb08ad8ff3172d23243f746c74090a20990901b18126cfb41efdd38b24f7c2e7dcd62dd3453f0f6130c618632592a4ecb1d31 SHA512 aa3b934ab084a29ae2503be96f0af69c52b693525cd5bd641c85b5a6f79ec3b7a48ba1b08a1a898229f80086bd5fc819b8ad4019835490653edadcf2d086b9f3
 EBUILD vulkan-tools-1.3.231.ebuild 1946 BLAKE2B 11081633d2d16468a477c2394b9782d95897412adeceb885259c8b59abd21cdc3e6ae86835b6d357bb8f0b40dddebfc708bac3f2ddc48426554e54c0230f1b22 SHA512 52b41f44269b5bf16880c9ec5bd4236b49a766312d8d980c98bfc177d53e5de9ed9f0cdaf37d039c71ccaff5546fd3a5f09a850a8aac0582548c27a7a36ae232
+EBUILD vulkan-tools-1.3.236.ebuild 1951 BLAKE2B 6a7cd950fe0ef6becdea897357f8e02440db2ae4c426ac2e5bb7ca139cc5b194545d082a09230c08fc4e3f3613f89cc0da74f60c9b362fcb072cce42c79a834d SHA512 190a32fb9346c17850fb8c741432990a16e8877cb797e37b15989395e06e708a990229dd9637244de5dd5e8d4e5a02404718b4c4ea6a1461c272c881afc4fb09
 EBUILD vulkan-tools-9999.ebuild 1951 BLAKE2B 6a7cd950fe0ef6becdea897357f8e02440db2ae4c426ac2e5bb7ca139cc5b194545d082a09230c08fc4e3f3613f89cc0da74f60c9b362fcb072cce42c79a834d SHA512 190a32fb9346c17850fb8c741432990a16e8877cb797e37b15989395e06e708a990229dd9637244de5dd5e8d4e5a02404718b4c4ea6a1461c272c881afc4fb09
 MISC metadata.xml 500 BLAKE2B 9fb4ff756cb14accac7b9c8e262ba8fc0108f68acaeaad81085ea91939ef683a21dfdb68ac4689e71c6b3b490e758af2711b1c436c65a7aa0e3b030aec982c93 SHA512 03a8e309f115934d5195da8aaa7bcd3e4f95f28269671a2eb8426941bb9bae815bcd3448d2e97006ddb2ab7ec52179117604b6fbf0f293e4285b303da573d435
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.236.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.236.ebuild
new file mode 100644
index 000000000000..8a1f2672d510
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.3.236.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Tools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv"
+	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
+fi
+
+DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cube wayland +X"
+
+# Cube demo only supports one window system at a time
+REQUIRED_USE="cube? ( ^^ ( X wayland ) )"
+
+BDEPEND="${PYTHON_DEPS}
+	>=dev-util/cmake-3.10.2
+	cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	~media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	~dev-util/vulkan-headers-${PV}
+"
+
+pkg_setup() {
+	MULTILIB_CHOST_TOOLS=(
+		/usr/bin/vulkaninfo
+	)
+
+	use cube && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/vkcube
+		/usr/bin/vkcubepp
+	)
+
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_VULKANINFO=ON
+		-DBUILD_CUBE=$(usex cube)
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
+	)
+
+	use cube && mycmakeargs+=(
+		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
+		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index c8834db428a1..277447b9d284 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest
index 0927a14174ea..187f6593cf19 100644
--- a/media-gfx/superslicer/Manifest
+++ b/media-gfx/superslicer/Manifest
@@ -8,5 +8,5 @@ AUX superslicer-2.5.59.0-openexr3.patch 2361 BLAKE2B d351d05190977e55047504d13ab
 AUX superslicer-2.5.59.0-wxgtk3-wayland.patch 489 BLAKE2B d801db8b71aff816c3703628beb2e90d06ec4d85b982cd137e005eb4542aae308140c21b3b6fb1c72c07dd3e90e38668d6c2a69df054bdd414c43b9f8fcea57f SHA512 495d8d62c8cdf4ff9a075366dbc2db5c80a1c99bcd23172db9cf64dd649d70acbca44182722a71d790feb84c9a67a81403d75ff33b77444a1251b1f45f7b4b9e
 DIST superslicer-2.5.59.0-profiles.tar.gz 15322406 BLAKE2B cfa89697e832e0601746cb21250e258617bcc0966dd111c82ae43a9720b3ffb760f57827a1f35c8ad57a23a7ffb4c78e48ec76d6e40b364f321d0f83c4d10939 SHA512 bbdc6bfa8e21a4bdbca903a367f033f9cb5a1966bd0688bcc81314ba9ee45fee37cb892c82be35e865137c4df7c1fabceb8e6de46316338df2af4a590de91c76
 DIST superslicer-2.5.59.0.tar.gz 45360646 BLAKE2B da65610270ed4c7d55b5bc495d9970812af94f424345088782b3a45b97fcf0f4b58bdc0417b89ed49e21d8c250535baa7cb74344f43438fbde8daf1b3acfacdd SHA512 1d2c0316c91bf0d65fb366806e9ea868bc93fae33deb580a324ce065fd3789ff1b600e9ace400db4988b371b1c36ef0c3ea2b52cde0d48984f312dd8d7ef3a1c
-EBUILD superslicer-2.5.59.0-r3.ebuild 2244 BLAKE2B 0900a5070cbb47c86a352fcf925ca5ce5083643cec94f2e76ea0e1562d5729c2f7ef1b489f181e5f7a969bd0e402cf6952d97ad2849405c731ba3e3b6c2f5d39 SHA512 85d16abf564bff432a3c65342d5a2d0d7173d6118f4acdb6e66d0cedaff328dcaaa24aac0fc2d443c5607a6b045f380bad6583e2dc5a73536eef7e5115465dd0
+EBUILD superslicer-2.5.59.0-r3.ebuild 2243 BLAKE2B dd9727cfb208c694890deccc696845ad8dc0ce48a17a244513c333854b782dba9103b713482909cfb6238ec3063514f68b960750c2a2a5a667355d8373beef91 SHA512 a8dca57479744a2de97e2dc6feb37a5b41a3a5e44878d8fdb37689d70895ff7eafd782ee4178df65738c4c995aaba81f1e4eaa2dbfd22f6d09c54e197315b61e
 MISC metadata.xml 413 BLAKE2B a43550366844e53b0ebed37197d33bf38efb555eee344f053f90e35e939263e3959301fdd072d5b6925d1e3e0d1fd629e2f459356e2f227006f8784a4364fc11 SHA512 8e1abc223f2e24cca551b08cbc37910f2a43319fce7299e52dd586dd6454c83e98e59b8d14c18613c8894fdca33d04297affa2da1f4aa001a5e200e4b5f2c331
diff --git a/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild b/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild
index 5316cceb3c63..083ab1fda40d 100644
--- a/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild
+++ b/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RESTRICT="test"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 73e83a45d350..b62a62f66f04 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index f7c8b44aba53..135dcb54f67c 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,6 +1,8 @@
 AUX vulkan-layers-1.3.231-Make-BUILD_WERROR-actually-work.patch 879 BLAKE2B c9468c7ebada19d1a252b6dc6f8dcc6edd2f5497e86cba815a4da900ad933f619ea8589071d86a387810b07d3cb58fcabcb4a86c15742e539f7333d55679abc3 SHA512 c8f86399a58cd2454c11e2e240def31b4dade136d1546da0b23c77d89de767dc9c126ac3e77a585cd56d82f5557a0316e439f1f724f4ab8e615d28520e66497a
 AUX vulkan-layers-1.3.231-cmake-Cleanup-find_package-SPIRV-code.patch 5089 BLAKE2B e76b6fdedf175c246e227e1317243ceb1842b19ad7f64cc0d7ffa4935f554dbdf5664ee8907b47ac22e7308110ea0faced11aa40f3870f059a9679b4ef1db6f1 SHA512 28cad48b59458e21e8a46d3e7ea915a8d7358962e2c0a7f99db1db99ed9d6090a129be874cce7fc528991476ccc41acccc1f1627b449dfdb8555ce8173dbb179
 DIST vulkan-layers-1.3.231.tar.gz 4408601 BLAKE2B 9b777559a540c34c5f86a93b15c42a223b8b7fd517f06e28d7bd0ba0fdc938063fd86126f7cdb43e692f3cc22296b5f8df924c2f39e3ead38325b2e1442bf3a6 SHA512 550ff2f5d718ab1a272977f3beb89f653107a7a2b89209408233cb3b969206d1d9383e0e8933343bc71fc920dd80e0cf62ad3baa588b671f24ce04cb93d4b606
+DIST vulkan-layers-1.3.236.tar.gz 4519779 BLAKE2B 087ecbfc4e460dbdd65009262d3ddedbed72258742ec902ac6e6e89d779aa350f819d4aa2aad4a30d365bdfb079c25ccaec265b9c5b56066e082db4701300095 SHA512 0ebb9d44b1a465a28702e12c80c6accb55dbd6a53ce2f1eb8e8cd627583a217544e21e8eb7e1619620458d756c0cde244bcde331710ab8244e113e302839f479
 EBUILD vulkan-layers-1.3.231.ebuild 1658 BLAKE2B 290cb1394b931cdc45350f5173b1bf2cdd8311af02143e9a15101ddabb7da469b5dc0853596614c64f4236ba1e865e5a7b4314857be0a431b6e856a38dea4636 SHA512 0986e8a61ca261985ddcc584838b899c52bb1f1ce7fbf0a09e5534e209539b05bb136ee23d37fc4ac276fcc3868d980976063859d244d5b610c3e91b0075442d
+EBUILD vulkan-layers-1.3.236.ebuild 1530 BLAKE2B 1f35deb8626817ae6db0ea115f2138a6a025c7fba787e045ba9e849ab4a9f9635b895e132eef8b2b0fc4c87aeba6a6b75043ba7970322c88fef3797ee4226430 SHA512 a587392d6c95a8ca022b27ae96b27accf9937effa95a3a26af8d7960f4e16c758d6910c0d558199afb78b5819f36b40a8a686acdf0e9577ebd33600e1d4f0f92
 EBUILD vulkan-layers-9999.ebuild 1533 BLAKE2B 9e2705767f971e0e640e0d2ca94835d1ab35fa33125ef7994b262840dfc9c08d01a9009b5880f313246d951f9a69a56175e1b2852bcb2a7d3c4df16851ebf8a8 SHA512 548e1b678c893d772e3c18401da553081e7f7248d5d5f6b3ac72d5924817c3203b17dec7142d47ed2453c2648c6003471c71ccb0c8808050ee77509a42693d85
 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.236.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.236.ebuild
new file mode 100644
index 000000000000..4651b8594c3a
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.236.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-ValidationLayers
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
+fi
+
+DESCRIPTION="Vulkan Validation Layers"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="wayland X"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
+RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-cpp/robin-hood-hashing-3.11.5
+	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
+	~dev-util/vulkan-headers-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_LAYER_SUPPORT_FILES=ON
+		-DBUILD_WERROR=OFF
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DBUILD_TESTS=OFF
+		-DVulkanRegistry_DIR="${ESYSROOT}/usr/share/vulkan/registry"
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 1c2fe70d8e68..902733801446 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-loader-1.3.231.tar.gz 1609720 BLAKE2B 0e6c2bdb6934502cd7f315636cf17dc0eeca7b990f8573944dcf5aec775272ce8c246efe51ee0395e0c2ed23c63a584be104d8a49a556c6d17e0fa66fda772cf SHA512 07f1a8e7737d9609a138b4e9740f9c2228db1ac56f8ddbf3c1ec0ec3b745647002ba3af4725347941dae2feb63e7c33c9db5f14ab98d2f47dfd2181a559ba849
+DIST vulkan-loader-1.3.236.tar.gz 1646230 BLAKE2B dd4448f32ef6f9ba25cb9bfd07549213ce787bfe21fd7d677fed55940173f583457f9082b75a497f4849afa3584fc147f3973c8d59f2a6a10ab16a10753ad5f8 SHA512 d80f979775e6a98b1a68e079b825984a03c76ecc04d9a8e979ff751f0f0825234662b15f2096a1c183f35bce8a1cfc16dda3238ad8f192f1622da74b9ee4e078
 EBUILD vulkan-loader-1.3.231.ebuild 1722 BLAKE2B c63c31356baef1b2a547f183d4be776b8c8826426b7ada3d2b17dd9583936f102917fbb082b398c929bdc54b87e01749308996ddf8ec80ac9efd6785c2b15eea SHA512 27b112a05d865d20cdd766fb46395967ee22966bfb481194636c340a8657bebc77f696d4d5a826d9b212c4ae6a1612ecc4e357634b4b4174269ac402665af89f
-EBUILD vulkan-loader-9999.ebuild 1752 BLAKE2B b388bec1cfcb652262cd3da49722be05f8905a251949e8a69dca7dd29562bc77c1cd0dd95b1c100b7e30a6f242e88283bc1c159df284886fdd91052e4bfc059d SHA512 2a7b8d50a8317dd4ea7c454ccd5aefc3995f49a2e1c794161331c7fc8277d7dbe64b8ffcee3acc7b49675c9fe44994c91063527696aae137a52b59f3978d8ec3
+EBUILD vulkan-loader-1.3.236.ebuild 1750 BLAKE2B 4915a5b13732028fb1c307b740359526c97dbee6a12a1cb27fb32fa5e86621b88f5f95855204ccc1f4bf491b5a79c4d57dffba6c93bc80d775db3c94f22fdf2e SHA512 e07527b14dd629de30f550ea9610210a6afc6388cd1e1fe2fd9c643407f1b99ff32f9b49a26e3cff9f21e6829084c07db67e1973925421c04eb34ae71e4921ed
+EBUILD vulkan-loader-9999.ebuild 1774 BLAKE2B a0d21e47557eb8b7784dc51e04580ae38e7fc41ecda5e3173ba4d0aba6fc063c51ae746f18be3a4ab3c5f2751783456e22353fad04f78d7e0e214ff09532b659 SHA512 221c14b0b2bb12e25c33f40016e11a4f4bfb9d0d3deca16aa8cd49442f109473c986ada5f89d99a3cb0eb7f5769590d48477d7b3ee180aa9131cb689809dd6c1
 MISC metadata.xml 520 BLAKE2B 5f5add8ab6dcec0fec9ffd20f5dbfababeff0a441855c641e1791727c4dd1c9eb17cebee79b9c4c325c355b1efc91b25f0c6246d11b010dde2109e38d9df6178 SHA512 4274ba14bdeddfe766c7394cbbb44c52aa4726f096ef2567e427fff6a710fe3de23466cb742f40162f4c2890f3a3a62e326364e45680ac1b8a0bca47db0e6e34
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.236.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.236.ebuild
new file mode 100644
index 000000000000..12218ef24e7b
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.3.236.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Loader
+inherit flag-o-matic cmake-multilib toolchain-funcs
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-sdk-${PV}
+fi
+
+DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="layers wayland X"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
+DEPEND="
+	~dev-util/vulkan-headers-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+	# Integrated clang assembler doesn't work with x86 - Bug #698164
+	if tc-is-clang && [[ ${ABI} == x86 ]]; then
+		append-cflags -fno-integrated-as
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_TESTS=OFF
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
+		-DENABLE_WERROR=OFF
+	)
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	keepdir /etc/vulkan/icd.d
+
+	cmake_src_install
+}
+
+pkg_postinst() {
+	einfo "USE=demos has been dropped as per upstream packaging"
+	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
+}
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 6c8c92090b8c..91126dbe41df 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -50,6 +50,7 @@ multilib_src_configure() {
 		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
 		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
+		-DENABLE_WERROR=OFF
 	)
 	cmake_src_configure
 }
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index cb1baff079c0..42803e7cfcf3 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 05e6b81a0b77..2d66d9f1088d 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Dec 2022 19:09:42 +0000
+Thu, 29 Dec 2022 01:39:43 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 8f69ec45c3c4..6f5567dc4553 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 538785 BLAKE2B a42e589b6c2be5ab4486b79822a326a12b3725dbc28e32cbb116cd453b6899511ab2026524f136171407f678f9acafd852f1a2a245b8caed5bad581d2eb86337 SHA512 8ff81ddfe9cd2569ab4fe6eabe9daf23f1f66918aba5cae55ff8241b2bb330fac90cb5595df81455bfa98b51ed1c6e965c73508fe1b662e752525e3e27b52956
-TIMESTAMP 2022-12-28T19:09:46Z
+TIMESTAMP 2022-12-29T01:39:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOslHpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOs7+JfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAGJA//bZn8RloRQKqa9d+/Me4A6vwvGZY6itOqxzZQ8Gou9NjhqL4E+FzQ6wdh
-uN0TnMWZfnijAqsS/3NUzNL9Hfk4iAOiOe3/WkWuLT/u2GsK2CsIxaLA59V10pfu
-CFMOms32PrVzRPis1W2904NPAXGFDNmCpu776ZRNhMqEyas6CD/PjkWLg9NkN1gr
-1CfKaBnqNEKFv1rRUjH4SDvxyzETJw37VnKsFTVUmpisrcQyfFC/BaSvjna47bds
-2kQST8lYEg2q0DYtQEXt/be/JzK+X8dRyBnap0ZEdZ5kjUszwe3HeHFy7FVr/Cvu
-hikbS77tVGhnbkfxIBQXvxFKHu6hzm3h/bCwDyl7Ycg5vpy+c74H1FSqU2/89PbP
-qi70LmrpvVIDHQM9OpQ7j6/jtB4JJfNS8GYWjBC7JFfFfCbm3g0g1FELsMb2vVuI
-lOuHM0dSJ3syxLX0HKkh+X375SpT9reeA2WZUwLTkiCBM/kYfY1KOpAO+k35l2n+
-mpf0reWddEH7cqfD+Xe7zpnK5ZMjxe/F2pLr4OL0w6piTF29kU0/bRo3TzVrfEMa
-1jYRFArP96fYWREOiLDlzEvmfOeu9q2rdKxnmnRxUi53AFJpDKprKbOfcTgG0PhI
-R1XWa5qESDodfD3QtteAemqTN4LgjFv6aZ/FSjSGRVeps+fa2RI=
-=woxM
+klAX1A/+OuxKYjDu95H6YKQ7Xaf2G+wJYF8H1IaL2fgWwpkDy6dTfGRyLaEAJxQ0
+egwX6jhKzzlM97Q4qVU7ABtSQr7SAHCYXecgUiXVAEh1UBLL3U7EmBYU+W9Qtroz
+znHfJg//iDiemeIr5NkPIY4D89kftI+IE2M6T/7sFiFpTD+eLgUZQLLHY6o87aN9
+9cxTJWU3usck213ik2dNv7JsbSWX5N5lSGSNSHSEe5flSD0kiIc2AiDKEuNB97Z/
+zm1dT6e0NTsaMoeYxZpu9W8N9O+K+Rp9udhMhezQ+f6r6Hz6+sgXkfFZ+ScSwsCH
+EU6c8acnlxj6Po55Q6c3rPbCa/hMKbtXab4yZr4GqgTN8Lxo24nxWeO9l3vRTv6u
+6MUW/R23wkawOYK2b2i+VC/q5Yh6LYxtxhuFPLhHVKOuwpYjP8JrppZmvVXHcmA/
+dechs+Q1q4fFFYzzHKasAjA79XY3VdJlEDWFGXJhLQbTPebkGnaxK0WMzVl2ZgCf
+D4+bGodjk8QcXpBZj/L9L67v9WHoh5gPPMa0OPlh57Hyvv0aS4pf6VOJ7vFynnUt
+Af9vxnCJ891WtVMvgDm2ARK79dAGtmu76gITa0sQBBlOm/1oM1KjbgcWASmgcYmv
+KiRVNVweYJ7W9B+gtHs1AjbM3j3hOhC4VqfUHAjgGwH9+3ELclA=
+=5LJ4
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 218dfa66fe48..2d66d9f1088d 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Dec 2022 19:09:43 +0000
+Thu, 29 Dec 2022 01:39:43 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 0c05a6ebeeb0..5fa9998edb4d 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-alternatives/Manifest.gz b/metadata/md5-cache/app-alternatives/Manifest.gz
index 59be8ef8036f..701b949c192c 100644
--- a/metadata/md5-cache/app-alternatives/Manifest.gz
+++ b/metadata/md5-cache/app-alternatives/Manifest.gz
diff --git a/metadata/md5-cache/app-alternatives/sh-0 b/metadata/md5-cache/app-alternatives/sh-0
index ba8531353f4e..75c1f835a182 100644
--- a/metadata/md5-cache/app-alternatives/sh-0
+++ b/metadata/md5-cache/app-alternatives/sh-0
@@ -1,13 +1,13 @@
-DEFINED_PHASES=install postrm
+DEFINED_PHASES=install postrm setup
 DESCRIPTION=/bin/sh (POSIX shell) symlink
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Base/Alternatives
 INHERIT=app-alternatives
-IUSE=+bash dash ksh lksh mksh
+IUSE=+bash busybox dash ksh lksh mksh
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=CC0-1.0
-RDEPEND=!!app-eselect/eselect-sh bash? ( app-shells/bash ) dash? ( app-shells/dash ) ksh? ( app-shells/ksh ) lksh? ( app-shells/mksh[lksh] ) mksh? ( app-shells/mksh )
-REQUIRED_USE=^^ ( bash dash ksh lksh mksh )
+RDEPEND=!!app-eselect/eselect-sh bash? ( app-shells/bash ) busybox? ( sys-apps/busybox ) dash? ( app-shells/dash ) ksh? ( app-shells/ksh ) lksh? ( app-shells/mksh[lksh] ) mksh? ( app-shells/mksh )
+REQUIRED_USE=^^ ( bash busybox dash ksh lksh mksh )
 SLOT=0
 _eclasses_=app-alternatives	7e9cb9b9eda5c46d0e04f3c992226ff2
-_md5_=f472713e35370f3e931c2a3e0f455154
+_md5_=ce9accc61f5648f4596947d1f04d4ecb
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 46d136d879ed..541df96a14c0 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/gzip-1.12_p20221228 b/metadata/md5-cache/app-arch/gzip-1.12_p20221228
new file mode 100644
index 000000000000..f0c9d93669a2
--- /dev/null
+++ b/metadata/md5-cache/app-arch/gzip-1.12_p20221228
@@ -0,0 +1,14 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-gzip ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install postinst unpack
+DESCRIPTION=Standard GNU compressor
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/gzip/
+INHERIT=flag-o-matic verify-sig
+IUSE=pic static verify-sig
+LICENSE=GPL-3+
+PDEPEND=app-alternatives/gzip
+RDEPEND=!app-arch/pigz[symlink(-)]
+SLOT=0
+SRC_URI=https://meyering.net/gzip/gzip-1.12.31-7553.tar.xz -> gzip-1.12_p20221228.tar.xz verify-sig? ( https://meyering.net/gzip/gzip-1.12.31-7553.tar.xz.sig -> gzip-1.12_p20221228.tar.xz.sig )
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=b7c3f0c81349d22accfd07320e22fbe2
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index d95bee916a01..14abf9ba81dc 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/vagrant-2.2.19-r1 b/metadata/md5-cache/app-emulation/vagrant-2.2.19-r1
new file mode 100644
index 000000000000..7d8984d00d80
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/vagrant-2.2.19-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/bcrypt_pbkdf-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/childprocess-4.0.0[ruby_targets_ruby27(-)] >=dev-ruby/ed25519-1.2.4[ruby_targets_ruby27(-)] dev-ruby/erubi[ruby_targets_ruby27(-)] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.8:1[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.6[ruby_targets_ruby27(-)] <dev-ruby/log4r-1.1.11[ruby_targets_ruby27(-)] >=dev-ruby/mime-types-3.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rubyzip-2.0[ruby_targets_ruby27(-)] >=dev-ruby/net-scp-3.0.0[ruby_targets_ruby27(-)] >=dev-ruby/net-sftp-3.0[ruby_targets_ruby27(-)] >=dev-ruby/net-ssh-6.1.0[ruby_targets_ruby27(-)] dev-ruby/rest-client:2[ruby_targets_ruby27(-)] >=dev-ruby/vagrant_cloud-3.0.5[ruby_targets_ruby27(-)] >=dev-ruby/rexml-3.2.5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( >=dev-ruby/rake-12.3.3[ruby_targets_ruby27(-)] test? ( dev-ruby/rspec[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] dev-ruby/webmock[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A tool for building and distributing development environments
+EAPI=7
+HOMEPAGE=https://vagrantup.com/
+INHERIT=bash-completion-r1 optfeature ruby-fakegem
+IUSE=test ruby_targets_ruby27 test test
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=app-arch/libarchive net-misc/curl ruby_targets_ruby27? ( >=dev-ruby/bcrypt_pbkdf-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/childprocess-4.0.0[ruby_targets_ruby27(-)] >=dev-ruby/ed25519-1.2.4[ruby_targets_ruby27(-)] dev-ruby/erubi[ruby_targets_ruby27(-)] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.8:1[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.6[ruby_targets_ruby27(-)] <dev-ruby/log4r-1.1.11[ruby_targets_ruby27(-)] >=dev-ruby/mime-types-3.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rubyzip-2.0[ruby_targets_ruby27(-)] >=dev-ruby/net-scp-3.0.0[ruby_targets_ruby27(-)] >=dev-ruby/net-sftp-3.0[ruby_targets_ruby27(-)] >=dev-ruby/net-ssh-6.1.0[ruby_targets_ruby27(-)] dev-ruby/rest-client:2[ruby_targets_ruby27(-)] >=dev-ruby/vagrant_cloud-3.0.5[ruby_targets_ruby27(-)] >=dev-ruby/rexml-3.2.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hashicorp/vagrant/archive/v2.2.19.tar.gz -> vagrant-2.2.19.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=432f794230cf9225809c53e9266c9529
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 5683bb9401cb..6214a009e611 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/qcma-0.4.1-r2 b/metadata/md5-cache/app-misc/qcma-0.4.1-r2
index 22854ddc83a2..2725a3db4684 100644
--- a/metadata/md5-cache/app-misc/qcma-0.4.1-r2
+++ b/metadata/md5-cache/app-misc/qcma-0.4.1-r2
@@ -1,15 +1,15 @@
 BDEPEND=dev-qt/linguist-tools:5
-DEFINED_PHASES=configure install prepare
+DEFINED_PHASES=configure install postinst postrm prepare
 DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 media-libs/vitamtp:0 ffmpeg? ( media-video/ffmpeg:= ) x11-libs/libnotify:0
 DESCRIPTION=Cross-platform content manager assistant for the PS Vita
 EAPI=8
 HOMEPAGE=https://github.com/codestation/qcma
-INHERIT=qmake-utils
+INHERIT=qmake-utils xdg-utils
 IUSE=+ffmpeg
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 media-libs/vitamtp:0 ffmpeg? ( media-video/ffmpeg:= ) x11-libs/libnotify:0
 SLOT=0
 SRC_URI=https://github.com/codestation/qcma/archive/v0.4.1.tar.gz -> qcma-0.4.1.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=2314120dcee217313889089a4f030c2b
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=9b615d4796f60d944a6e304b3fc5d6de
diff --git a/metadata/md5-cache/app-misc/qcma-0.4.2_pre20181227-r2 b/metadata/md5-cache/app-misc/qcma-0.4.2_pre20181227-r2
index bf414d073076..ff70a9f09c29 100644
--- a/metadata/md5-cache/app-misc/qcma-0.4.2_pre20181227-r2
+++ b/metadata/md5-cache/app-misc/qcma-0.4.2_pre20181227-r2
@@ -1,15 +1,15 @@
 BDEPEND=dev-qt/linguist-tools:5
-DEFINED_PHASES=configure install prepare unpack
+DEFINED_PHASES=configure install postinst postrm prepare unpack
 DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 media-libs/vitamtp:0 ffmpeg? ( media-video/ffmpeg:= ) x11-libs/libnotify:0
 DESCRIPTION=Cross-platform content manager assistant for the PS Vita
 EAPI=8
 HOMEPAGE=https://github.com/codestation/qcma
-INHERIT=qmake-utils vcs-snapshot
+INHERIT=qmake-utils vcs-snapshot xdg-utils
 IUSE=+ffmpeg
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 media-libs/vitamtp:0 ffmpeg? ( media-video/ffmpeg:= ) x11-libs/libnotify:0
 SLOT=0
 SRC_URI=https://github.com/codestation/qcma/archive/65f0eab8ca0640447d2e84cdc5fadc66d2c07efb.tar.gz -> qcma-0.4.2_pre20181227.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
-_md5_=cb8613a2ab380e20385ec32bcb41766a
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=06ce69cd523c8b1a41e566ce5fbb9d91
diff --git a/metadata/md5-cache/app-misc/qcma-9999 b/metadata/md5-cache/app-misc/qcma-9999
index 189a04285ce2..3f617109421c 100644
--- a/metadata/md5-cache/app-misc/qcma-9999
+++ b/metadata/md5-cache/app-misc/qcma-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-qt/linguist-tools:5 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install prepare unpack
+DEFINED_PHASES=configure install postinst postrm prepare unpack
 DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 media-libs/vitamtp:0 ffmpeg? ( media-video/ffmpeg:= ) x11-libs/libnotify:0
 DESCRIPTION=Cross-platform content manager assistant for the PS Vita
 EAPI=8
 HOMEPAGE=https://github.com/codestation/qcma
-INHERIT=qmake-utils git-r3
+INHERIT=qmake-utils git-r3 xdg-utils
 IUSE=+ffmpeg
 LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 media-libs/vitamtp:0 ffmpeg? ( media-video/ffmpeg:= ) x11-libs/libnotify:0
 SLOT=0
-_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=7400c3856a9cd9e4901ceec4601116f5
+_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=0ac764cf30ebed18afe79f0d436b0ae1
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 142f45b7cecd..4012c8064751 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/zsh-completions-0.34.0 b/metadata/md5-cache/app-shells/zsh-completions-0.34.0
index 39871ede2a26..1731d969aff0 100644
--- a/metadata/md5-cache/app-shells/zsh-completions-0.34.0
+++ b/metadata/md5-cache/app-shells/zsh-completions-0.34.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Additional completion definitions for Zsh
 EAPI=8
 HOMEPAGE=https://github.com/zsh-users/zsh-completions
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=Apache-2.0 BSD MIT ZSH
 RDEPEND=app-shells/zsh
 SLOT=0
 SRC_URI=https://github.com/zsh-users/zsh-completions/archive/0.34.0.tar.gz -> zsh-completions-0.34.0.tar.gz
-_md5_=a9dca35ec37d7cb868a27d013de91110
+_md5_=c572cb0d93e13be2f4ae17962cf63a52
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 8509a5d60bec..b03af6de6806 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/opendbx-1.4.6-r5 b/metadata/md5-cache/dev-db/opendbx-1.4.6-r5
index 160e9f7181fd..3ecec7258b8c 100644
--- a/metadata/md5-cache/dev-db/opendbx-1.4.6-r5
+++ b/metadata/md5-cache/dev-db/opendbx-1.4.6-r5
@@ -5,7 +5,7 @@ EAPI=6
 HOMEPAGE=https://www.linuxnetworks.de/doc/index.php/OpenDBX
 INHERIT=autotools flag-o-matic
 IUSE=firebird +man +mysql oracle postgres sqlite
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) oracle? ( dev-db/oracle-instantclient[sdk] ) firebird? ( dev-db/firebird )
 REQUIRED_USE=|| ( firebird mysql oracle postgres sqlite )
@@ -13,4 +13,4 @@ RESTRICT=firebird? ( bindist )
 SLOT=0
 SRC_URI=https://www.linuxnetworks.de/opendbx/download/opendbx-1.4.6.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5bee86cf8e0e7064f6b8f4fbe281e528
+_md5_=bb78f07c0e8f14d280aa317dd415c2f3
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-21.3.0.0.0 b/metadata/md5-cache/dev-db/oracle-instantclient-21.3.0.0.0
index bbb5a1234e05..50ccac161e64 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-21.3.0.0.0
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-21.3.0.0.0
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://www.oracle.com/database/technologies/instant-client.html
 INHERIT=pax-utils multilib-minimal
 IUSE=jdbc odbc precomp +sdk +sqlplus tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=OTN
 RDEPEND=>=dev-libs/libaio-0.3.109-r5[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/glibc odbc? ( dev-db/unixODBC )
 REQUIRED_USE=precomp? ( sdk )
@@ -13,4 +13,4 @@ RESTRICT=mirror splitdebug test
 SLOT=0/21.1
 SRC_URI=abi_x86_32? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-basic-linux-21.3.0.0.0.zip jdbc? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-jdbc-linux-21.3.0.0.0.zip ) odbc? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-odbc-linux-21.3.0.0.0.zip ) precomp? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-precomp-linux-21.3.0.0.0.zip ) !abi_x86_64? ( sdk? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-sdk-linux-21.3.0.0.0.zip ) sqlplus? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-sqlplus-linux-21.3.0.0.0.zip ) tools? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-tools-linux-21.3.0.0.0.zip ) ) ) abi_x86_64? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-basic-linux.x64-21.3.0.0.0.zip jdbc? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-jdbc-linux.x64-21.3.0.0.0.zip ) odbc? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-odbc-linux.x64-21.3.0.0.0.zip ) precomp? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-precomp-linux.x64-21.3.0.0.0.zip ) sdk? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-sdk-linux.x64-21.3.0.0.0.zip ) sqlplus? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-sqlplus-linux.x64-21.3.0.0.0.zip ) tools? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-tools-linux.x64-21.3.0.0.0.zip ) )
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=d0dfc65010878d2d078b6b5aa54c7a68
+_md5_=1c9afb88874fda29ab339aca9f3248c6
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 1c731acbde03..e0536fb5abe8 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/mirage-clock-4.2.0 b/metadata/md5-cache/dev-ml/mirage-clock-4.2.0
new file mode 100644
index 000000000000..5636efb79813
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/mirage-clock-4.2.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune-configurator dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Portable clock implementation for Unix and Xen
+EAPI=8
+HOMEPAGE=https://github.com/mirage/mirage-clock
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=ISC
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/4.2.0
+SRC_URI=https://github.com/mirage/mirage-clock/archive/v4.2.0.tar.gz -> mirage-clock-4.2.0.tar.gz
+_eclasses_=dune	05e1ecac420bb190bc7f981fdd670d96	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=eafc925d2d1f60088443afa0f11453e7
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index eab1157b6be4..8f2f362e70d9 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/filelock-3.9.0 b/metadata/md5-cache/dev-python/filelock-3.9.0
new file mode 100644
index 000000000000..4df628ef1818
--- /dev/null
+++ b/metadata/md5-cache/dev-python/filelock-3.9.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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.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.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.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=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.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1: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.9.0.tar.gz -> py-filelock-3.9.0.gh.tar.gz
+_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=64d6dedee0f85fed66cdbcf6b868289c
diff --git a/metadata/md5-cache/dev-python/mock-5.0.0 b/metadata/md5-cache/dev-python/mock-5.0.0
new file mode 100644
index 000000000000..44017c92dfe7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mock-5.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/six-1.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.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.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[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=Rolling backport of unittest.mock for all Pythons
+EAPI=8
+HOMEPAGE=https://github.com/testing-cabal/mock/ https://pypi.org/project/mock/
+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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=>=dev-python/six-1.9[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.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1: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/testing-cabal/mock/archive/5.0.0.tar.gz -> mock-5.0.0.gh.tar.gz
+_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=10dee4222233f154e4deabb19d06ed97
diff --git a/metadata/md5-cache/dev-python/platformdirs-2.6.1 b/metadata/md5-cache/dev-python/platformdirs-2.6.1
new file mode 100644
index 000000000000..35d9c82a956f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/platformdirs-2.6.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/hatch-vcs-0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/appdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[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.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.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.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=A small Python module for determining appropriate platform-specific dirs
+EAPI=8
+HOMEPAGE=https://pypi.org/project/platformdirs/ https://github.com/platformdirs/platformdirs/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1: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/platformdirs/platformdirs/archive/2.6.1.tar.gz -> platformdirs-2.6.1.gh.tar.gz
+_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=7103f8b66f48a94ee754343d39aa7005
diff --git a/metadata/md5-cache/dev-python/pyquery-2.0.0 b/metadata/md5-cache/dev-python/pyquery-2.0.0
new file mode 100644
index 000000000000..1e7795222cf6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyquery-2.0.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( >=dev-python/lxml-2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cssselect-1.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/webob-1.1.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.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.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[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
+DEPEND=test? ( dev-python/beautifulsoup4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/webtest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/webob[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DESCRIPTION=A jQuery-like library for python
+EAPI=8
+HOMEPAGE=https://github.com/gawel/pyquery/ https://pypi.org/project/pyquery/
+INHERIT=distutils-r1 optfeature
+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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD
+RDEPEND=>=dev-python/lxml-2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cssselect-1.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/webob-1.1.9[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.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pyquery/pyquery-2.0.0.tar.gz
+_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=a6131157440add52b21cf9e089db2d31
diff --git a/metadata/md5-cache/dev-python/tox-4.0.19 b/metadata/md5-cache/dev-python/tox-4.0.19
new file mode 100644
index 000000000000..7f6cd769a588
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tox-4.0.19
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/hatch-vcs-0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flaky-3.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/psutil-5.9.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-xdist-3.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/re-assert-1.1[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/time-machine-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-python/time-machine-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/time-machine-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/time-machine-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( >=dev-python/cachetools-5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.4.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyproject-api-1.2.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/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/virtualenv-20.17.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.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.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.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=virtualenv-based automation of test activities
+EAPI=8
+HOMEPAGE=https://tox.readthedocs.io/ https://github.com/tox-dev/tox/ https://pypi.org/project/tox/
+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 ~ppc
+LICENSE=MIT
+RDEPEND=>=dev-python/cachetools-5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.4.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyproject-api-1.2.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/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/virtualenv-20.17.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/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1: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/tox/archive/4.0.19.tar.gz -> tox-4.0.19.gh.tar.gz
+_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=bfddd86cb8ce5c24869e75f062eabb2f
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-3.0.4 b/metadata/md5-cache/dev-python/xlsxwriter-3.0.4
new file mode 100644
index 000000000000..253fc1562608
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xlsxwriter-3.0.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.1.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.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python module for creating Excel XLSX files
+EAPI=8
+HOMEPAGE=https://github.com/jmcnamara/XlsxWriter/ https://pypi.org/project/XlsxWriter/
+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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1: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/jmcnamara/XlsxWriter/archive/RELEASE_3.0.4.tar.gz -> XlsxWriter-RELEASE_3.0.4.gh.tar.gz
+_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=8df20325b12ad52da474cffcd8fa6f24
diff --git a/metadata/md5-cache/dev-python/xxhash-3.2.0 b/metadata/md5-cache/dev-python/xxhash-3.2.0
new file mode 100644
index 000000000000..7b11179f6db9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xxhash-3.2.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( >=dev-libs/xxhash-0.8.0 dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/xxhash-0.8.0
+DESCRIPTION=Python binding for the xxHash library
+EAPI=8
+HOMEPAGE=https://github.com/ifduyue/python-xxhash/ https://pypi.org/project/xxhash/
+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-libs/xxhash-0.8.0 python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1: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/x/xxhash/xxhash-3.2.0.tar.gz
+_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=afb9bc548288ae96c42863b6436393e1
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index aaecaad2014b..d3e3f87af241 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/glslang-1.3.236 b/metadata/md5-cache/dev-util/glslang-1.3.236
new file mode 100644
index 000000000000..b61597c95e92
--- /dev/null
+++ b/metadata/md5-cache/dev-util/glslang-1.3.236
@@ -0,0 +1,14 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator
+EAPI=7
+HOMEPAGE=https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang
+INHERIT=cmake-multilib python-any-r1
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RESTRICT=test
+SLOT=0/1
+SRC_URI=https://github.com/KhronosGroup/glslang/archive/sdk-1.3.236.0.tar.gz -> glslang-1.3.236.tar.gz
+_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=0735ae61a359af5d9a238a3a7e236283
diff --git a/metadata/md5-cache/dev-util/glslang-9999 b/metadata/md5-cache/dev-util/glslang-9999
index 0c2d7bf3a29c..0d70128abb9f 100644
--- a/metadata/md5-cache/dev-util/glslang-9999
+++ b/metadata/md5-cache/dev-util/glslang-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RESTRICT=test
 SLOT=0/1
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8ab127b8bea7b2976c1fa6bb09d91774
+_md5_=f69799e882d0e2e224acb82cb0563fe4
diff --git a/metadata/md5-cache/dev-util/spirv-headers-1.3.236 b/metadata/md5-cache/dev-util/spirv-headers-1.3.236
new file mode 100644
index 000000000000..9a1395acd367
--- /dev/null
+++ b/metadata/md5-cache/dev-util/spirv-headers-1.3.236
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Machine-readable files for the SPIR-V Registry
+EAPI=7
+HOMEPAGE=https://www.khronos.org/registry/spir-v/
+INHERIT=cmake
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-1.3.236.tar.gz -> spirv-headers-1.3.236.tar.gz
+_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=81b12c9a364b2fd160f0105bff08900e
diff --git a/metadata/md5-cache/dev-util/spirv-tools-1.3.236 b/metadata/md5-cache/dev-util/spirv-tools-1.3.236
new file mode 100644
index 000000000000..3c88714874f5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/spirv-tools-1.3.236
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11[xml(+)] >=dev-lang/python-3.10.9:3.10[xml(+)] >=dev-lang/python-3.9.16:3.9[xml(+)] >=dev-lang/python-3.8.16:3.8[xml(+)] ) ~dev-util/spirv-headers-1.3.236 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=~dev-util/spirv-headers-1.3.236
+DESCRIPTION=Provides an API and commands for processing SPIR-V modules
+EAPI=7
+HOMEPAGE=https://github.com/KhronosGroup/SPIRV-Tools
+INHERIT=cmake-multilib python-any-r1
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/SPIRV-Tools/archive/sdk-1.3.236.0.tar.gz -> spirv-tools-1.3.236.tar.gz
+_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=5ba3d21c7af07b8542c2f785869f238e
diff --git a/metadata/md5-cache/dev-util/valgrind-3.20.0 b/metadata/md5-cache/dev-util/valgrind-3.20.0
index 54570367f1ea..21aeab424fdb 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.20.0
+++ b/metadata/md5-cache/dev-util/valgrind-3.20.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.valgrind.org
 INHERIT=autotools flag-o-matic toolchain-funcs multilib pax-utils
 IUSE=mpi
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=https://sourceware.org/pub/valgrind/valgrind-3.20.0.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=66752756b0f05f9254f6132990541e84
+_md5_=9a60cfd5ae844779606c96d9c42060a0
diff --git a/metadata/md5-cache/dev-util/vulkan-headers-1.3.236 b/metadata/md5-cache/dev-util/vulkan-headers-1.3.236
new file mode 100644
index 000000000000..407cfb965c16
--- /dev/null
+++ b/metadata/md5-cache/dev-util/vulkan-headers-1.3.236
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-util/cmake-3.10.2 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Vulkan Header files and API registry
+EAPI=7
+HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers
+INHERIT=cmake
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.3.236.0.tar.gz -> vulkan-headers-1.3.236.tar.gz
+_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=51a6cbf13a8a3127870988894998f781
diff --git a/metadata/md5-cache/dev-util/vulkan-tools-1.3.236 b/metadata/md5-cache/dev-util/vulkan-tools-1.3.236
new file mode 100644
index 000000000000..899304444539
--- /dev/null
+++ b/metadata/md5-cache/dev-util/vulkan-tools-1.3.236
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) >=dev-util/cmake-3.10.2 cube? ( ~dev-util/glslang-1.3.236:=[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-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=~media-libs/vulkan-loader-1.3.236:=[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?,X?] wayland? ( 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(-)?] ) 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(-)?] 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(-)?] ) ~dev-util/vulkan-headers-1.3.236
+DESCRIPTION=Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS
+EAPI=7
+HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Tools
+INHERIT=cmake-multilib python-any-r1
+IUSE=cube wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv
+LICENSE=Apache-2.0
+RDEPEND=~media-libs/vulkan-loader-1.3.236:=[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?,X?] wayland? ( 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(-)?] ) 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(-)?] 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(-)?] )
+REQUIRED_USE=cube? ( ^^ ( X wayland ) )
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-1.3.236.0.tar.gz -> vulkan-tools-1.3.236.tar.gz
+_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=28a45e5357141256d8e821d490466e7e
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 0b68fcb64d4e..bfa9846705b5 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/superslicer-2.5.59.0-r3 b/metadata/md5-cache/media-gfx/superslicer-2.5.59.0-r3
index 58e11a470cc8..b7357c757590 100644
--- a/metadata/md5-cache/media-gfx/superslicer-2.5.59.0-r3
+++ b/metadata/md5-cache/media-gfx/superslicer-2.5.59.0-r3
@@ -7,11 +7,11 @@ HOMEPAGE=https://github.com/supermerill/SuperSlicer/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake wxwidgets xdg flag-o-matic
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT
 RDEPEND=dev-cpp/eigen:3 dev-cpp/tbb:= dev-libs/boost:=[nls] dev-libs/cereal dev-libs/expat dev-libs/glib:2 dev-libs/gmp:= dev-libs/mpfr:= dev-libs/imath:= >=media-gfx/openvdb-8.2:= net-misc/curl[adns] media-libs/glew:0= media-libs/libpng:0= media-libs/qhull:= sci-libs/nlopt >=sci-mathematics/cgal-5.0:= sys-apps/dbus sys-libs/zlib:= virtual/glu virtual/opengl x11-libs/gtk+:3 x11-libs/wxGTK:3.0-gtk3[X,opengl]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/supermerill/SuperSlicer/archive/refs/tags/2.5.59.0.tar.gz -> superslicer-2.5.59.0.tar.gz https://github.com/slic3r/slic3r-profiles/archive/748fbdfd2ac077e4e415868e7bc963740b92aa8e.tar.gz -> superslicer-2.5.59.0-profiles.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a3c51297745ba5fce855656fb08540ce
+_md5_=58cca0227ce4bd05db7729736715de70
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 80d72b7466d1..76e43cbc4735 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/vulkan-layers-1.3.236 b/metadata/md5-cache/media-libs/vulkan-layers-1.3.236
new file mode 100644
index 000000000000..4e17943cdecd
--- /dev/null
+++ b/metadata/md5-cache/media-libs/vulkan-layers-1.3.236
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/cmake-3.10.2 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=~dev-util/spirv-tools-1.3.236:=[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-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) >=dev-cpp/robin-hood-hashing-3.11.5 ~dev-util/glslang-1.3.236:=[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-util/vulkan-headers-1.3.236 wayland? ( 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(-)?] ) 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(-)?] 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=Vulkan Validation Layers
+EAPI=7
+HOMEPAGE=https://github.com/KhronosGroup/Vulkan-ValidationLayers
+INHERIT=cmake-multilib python-any-r1
+IUSE=wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=~dev-util/spirv-tools-1.3.236:=[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/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-1.3.236.0.tar.gz -> vulkan-layers-1.3.236.tar.gz
+_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=7ddb34b955a9fa7b1c3db533f74aab49
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-1.3.236 b/metadata/md5-cache/media-libs/vulkan-loader-1.3.236
new file mode 100644
index 000000000000..db620b595a8f
--- /dev/null
+++ b/metadata/md5-cache/media-libs/vulkan-loader-1.3.236
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/cmake-3.10.2 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=~dev-util/vulkan-headers-1.3.236 wayland? ( 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(-)?] ) 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(-)?] 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=Vulkan Installable Client Driver (ICD) Loader
+EAPI=7
+HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Loader
+INHERIT=flag-o-matic cmake-multilib toolchain-funcs
+IUSE=layers wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+PDEPEND=layers? ( media-libs/vulkan-layers:=[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/KhronosGroup/Vulkan-Loader/archive/sdk-1.3.236.tar.gz -> vulkan-loader-1.3.236.tar.gz
+_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=7bbb60c9b25abf3706b77903cb26eadc
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-9999 b/metadata/md5-cache/media-libs/vulkan-loader-9999
index 09b8266679b9..142bfff09472 100644
--- a/metadata/md5-cache/media-libs/vulkan-loader-9999
+++ b/metadata/md5-cache/media-libs/vulkan-loader-9999
@@ -11,4 +11,4 @@ PDEPEND=layers? ( media-libs/vulkan-layers:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 PROPERTIES=live
 SLOT=0
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=24776c5b74b8c2629306fa34e4c03d42
+_md5_=d5fdf9c1f380eccf886372c725381417
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 9566b70d38e8..468589a8c0b3 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/curl-7.87.0 b/metadata/md5-cache/net-misc/curl-7.87.0
index 3a9f3454f124..76b4861b0556 100644
--- a/metadata/md5-cache/net-misc/curl-7.87.0
+++ b/metadata/md5-cache/net-misc/curl-7.87.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://curl.se/
 INHERIT=autotools prefix multilib-minimal verify-sig
 IUSE=+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls nghttp3 quiche abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=curl
 RDEPEND=ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:=[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(-)?] dev-libs/nettle:=[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-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:=[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-misc/ca-certificates ) openssl? ( dev-libs/openssl:=[sslv3(-)=,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(-)?] ) nss? ( dev-libs/nss: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-libs/nss-pem app-misc/ca-certificates ) rustls? ( net-libs/rustls-ffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:=[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(-)?] ) adns? ( net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[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(-)?] zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_rustls ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.se/download/curl-7.87.0.tar.xz verify-sig? ( https://curl.se/download/curl-7.87.0.tar.xz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=4eee3dfacc2aec7578b99f214126de1d
+_md5_=6ebd48bcd9dbf7093e1aa86769b75929
diff --git a/metadata/md5-cache/net-misc/openssh-9.0_p1-r6 b/metadata/md5-cache/net-misc/openssh-9.0_p1-r6
deleted file mode 100644
index 834098cb4af4..000000000000
--- a/metadata/md5-cache/net-misc/openssh-9.0_p1-r6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/autoconf virtual/pkgconfig || ( >=sys-devel/gcc-config-2.6 >=sys-devel/clang-toolchain-symlinks-14-r1:14 >=sys-devel/clang-toolchain-symlinks-15-r1:15 >=sys-devel/clang-toolchain-symlinks-16-r1:* ) verify-sig? ( sec-keys/openpgp-keys-openssh ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install postinst preinst prepare pretend test unpack
-DEPEND=acct-group/sshd acct-user/sshd !static? ( !<sys-devel/gcc-config-2.6 audit? ( sys-process/audit ) ldns? ( net-libs/ldns net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0= ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) virtual/os-headers kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) static? ( !<sys-devel/gcc-config-2.6 audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] ) virtual/libcrypt:=[static-libs(+)] >=sys-libs/zlib-1.2.3:=[static-libs(+)] )
-DESCRIPTION=Port of OpenBSD's free SSH release
-EAPI=7
-HOMEPAGE=https://www.openssh.com/
-INHERIT=user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
-IUSE=abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD GPL-2
-RDEPEND=acct-group/sshd acct-user/sshd !static? ( !<sys-devel/gcc-config-2.6 audit? ( sys-process/audit ) ldns? ( net-libs/ldns net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0= ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) pam? ( >=sys-auth/pambase-20081028 ) !prefix? ( sys-apps/shadow ) X? ( x11-apps/xauth )
-REQUIRED_USE=hpn? ( ssl ) ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !sctp ssl !xmss ) xmss? ( ssl ) test? ( ssl ) test? ( !xmss )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-9.0p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.0p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-AES-CTR-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-PeakTput-15.2.diff ) X509? ( https://roumenpetrov.info/openssh/x509-13.4.1/openssh-9.0p1+x509-13.4.1.diff.gz ) verify-sig? ( mirror://openbsd/OpenSSH/portable/openssh-9.0p1.tar.gz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	user-info	83547b4df3e1ba5a6bf91a0837eaa664	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=71009e515de774359f52ac6fe8adaab6
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 0d5e482d8111..fe9caf83aa50 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.7.12 b/metadata/md5-cache/net-vpn/tor-0.4.7.12
index 860441fe50c8..c6c0c52317b4 100644
--- a/metadata/md5-cache/net-vpn/tor-0.4.7.12
+++ b/metadata/md5-cache/net-vpn/tor-0.4.7.12
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.torproject.org/
 INHERIT=python-any-r1 readme.gentoo-r1 systemd verify-sig
 IUSE=caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos
+KEYWORDS=amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos
 LICENSE=BSD GPL-2
 RDEPEND=acct-user/tor acct-group/tor dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/tor-0.4.7.12.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.7.12.tar.gz verify-sig? ( https://dist.torproject.org/tor-0.4.7.12.tar.gz.sha256sum https://dist.torproject.org/tor-0.4.7.12.tar.gz.sha256sum.asc )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=af9ed70b582848d24bbf82c03c59534f
+_md5_=ae970286139a596fab23771dee87b83c
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index fddff8595f05..ce62dffb9453 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-tor-20221213 b/metadata/md5-cache/sec-keys/openpgp-keys-tor-20221213
index 15e41b58b0c5..6d54d1556d38 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-tor-20221213
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-tor-20221213
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=OpenPGP keys used by the Tor project
 EAPI=8
 HOMEPAGE=https://www.torproject.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://keys.openpgp.org/vks/v1/by-fingerprint/1C1BC007A9F607AA8152C040BEA7B180B1491921 -> tor-20221213-1C1BC007A9F607AA8152C040BEA7B180B1491921.asc https://keys.openpgp.org/vks/v1/by-fingerprint/B74417EDDF22AC9F9E90F49142E86A2A11F48D36 -> tor-20221213-B74417EDDF22AC9F9E90F49142E86A2A11F48D36.asc https://keys.openpgp.org/vks/v1/by-fingerprint/2133BC600AB133E1D826D173FE43009C4607B1FB -> tor-20221213-2133BC600AB133E1D826D173FE43009C4607B1FB.asc https://keys.openpgp.org/vks/v1/by-fingerprint/EF6E286DDA85EA2A4BA7DE684E2C6E8793298290 -> tor-20221213-EF6E286DDA85EA2A4BA7DE684E2C6E8793298290.asc
-_md5_=b619e92d86c4710073f505902b1bab58
+_md5_=1f3a27de92d2b489e57fff17b734d828
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index b2f66a20d53b..ced979e49091 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/hponcfg-4.6.0.0 b/metadata/md5-cache/sys-apps/hponcfg-4.6.0.0
deleted file mode 100644
index 541a54d078c7..000000000000
--- a/metadata/md5-cache/sys-apps/hponcfg-4.6.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-arch/rpm2targz
-DESCRIPTION=HP Lights-Out Online Configuration Utility (HPONCFG)
-EAPI=6
-HOMEPAGE=http://h20564.www2.hpe.com/hpsc/swd/public/detail?swItemId=MTX_5ab6295f49964f16a699064f29
-INHERIT=pax-utils rpm versionator
-KEYWORDS=-* amd64 x86
-LICENSE=hpe
-RDEPEND=elibc_glibc? ( >sys-libs/glibc-2.14 )
-SLOT=0
-SRC_URI=amd64? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/6/x86_64/current/hponcfg-4.6.0-0.x86_64.rpm ) x86? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/6/i686/current/hponcfg-4.6.0-0.i386.rpm )
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6fa45d35789eadd1f05d0c6ed48b59b5
diff --git a/metadata/md5-cache/sys-apps/hponcfg-5.4.0.0 b/metadata/md5-cache/sys-apps/hponcfg-5.4.0.0
deleted file mode 100644
index 7ff51ce4fd37..000000000000
--- a/metadata/md5-cache/sys-apps/hponcfg-5.4.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/rpm2targz
-DEFINED_PHASES=install unpack
-DESCRIPTION=HP Lights-Out Online Configuration Utility (HPONCFG)
-EAPI=7
-HOMEPAGE=http://h20564.www2.hpe.com/hpsc/swd/public/detail?swItemId=MTX_5ab6295f49964f16a699064f29
-INHERIT=pax-utils rpm
-KEYWORDS=-* amd64
-LICENSE=hpe
-RDEPEND=elibc_glibc? ( >sys-libs/glibc-2.14 )
-SLOT=0
-SRC_URI=amd64? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/7/x86_64/current/hponcfg-5.4.0-0.x86_64.rpm )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	pax-utils	91d47e5d20627c717aa878b9167c62a8	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c882ad1cb96339931b4761d6aa377d99
diff --git a/metadata/md5-cache/sys-apps/hponcfg-5.6.0.0 b/metadata/md5-cache/sys-apps/hponcfg-5.6.0.0
index 02bc63dd9c4a..438b9388cbe3 100644
--- a/metadata/md5-cache/sys-apps/hponcfg-5.6.0.0
+++ b/metadata/md5-cache/sys-apps/hponcfg-5.6.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=HP Lights-Out Online Configuration Utility (HPONCFG)
 EAPI=7
 HOMEPAGE=http://h20564.www2.hpe.com/hpsc/swd/public/detail?swItemId=MTX_5ab6295f49964f16a699064f29
 INHERIT=pax-utils rpm
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=hpe
 RDEPEND=elibc_glibc? ( >sys-libs/glibc-2.14 )
 SLOT=0
 SRC_URI=amd64? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/7/x86_64/current/hponcfg-5.6.0-0.x86_64.rpm )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	pax-utils	91d47e5d20627c717aa878b9167c62a8	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9a32764a8db09b5cfbbc509a05892486
+_md5_=d3274b92e88ad2a1ec7ebb80f8515653
diff --git a/metadata/md5-cache/sys-apps/hponcfg-5.6.0.0-r1 b/metadata/md5-cache/sys-apps/hponcfg-5.6.0.0-r1
new file mode 100644
index 000000000000..21f4f06738cd
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/hponcfg-5.6.0.0-r1
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/rpm2targz
+DEFINED_PHASES=install unpack
+DESCRIPTION=HP Lights-Out Online Configuration Utility (HPONCFG)
+EAPI=8
+HOMEPAGE=https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-a00007610en_us
+INHERIT=pax-utils rpm
+KEYWORDS=-* ~amd64
+LICENSE=hpe
+RDEPEND=elibc_glibc? ( >sys-libs/glibc-2.14 )
+SLOT=0
+SRC_URI=https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/7/x86_64/current/hponcfg-5.6.0-0.x86_64.rpm
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	pax-utils	91d47e5d20627c717aa878b9167c62a8	rpm	f73e907469f65e52192f110dec72dce0
+_md5_=a9c3c40b72931e1123056fc0fe8b2d46
diff --git a/metadata/md5-cache/sys-apps/texinfo-7.0.1-r1 b/metadata/md5-cache/sys-apps/texinfo-7.0.1-r1
new file mode 100644
index 000000000000..704f6b51cdb0
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/texinfo-7.0.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=sys-devel/gettext-0.19.6 )
+DEFINED_PHASES=configure prepare
+DEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:= virtual/perl-Data-Dumper virtual/perl-Encode standalone? ( >=dev-lang/perl-5.8.1 ) !standalone? ( >=dev-lang/perl-5.8.1:= ) nls? ( virtual/libintl )
+DESCRIPTION=The GNU info program and utilities
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/texinfo/
+INHERIT=flag-o-matic toolchain-funcs
+IUSE=nls +standalone static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3+
+RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:= virtual/perl-Data-Dumper virtual/perl-Encode standalone? ( >=dev-lang/perl-5.8.1 ) !standalone? ( >=dev-lang/perl-5.8.1:= ) nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://gnu/texinfo/texinfo-7.0.1.tar.xz
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=7a0d402f2dc6a0b075e7ba1d049db6db
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 5de6f1590c93..98aadc1bda48 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/torque-6.0.4-r3 b/metadata/md5-cache/sys-cluster/torque-6.0.4-r3
new file mode 100644
index 000000000000..e1ab4b8af705
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/torque-6.0.4-r3
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst preinst prepare setup
+DEPEND=sys-libs/zlib sys-libs/readline:0= dev-libs/libxml2 dev-libs/boost cpusets? ( sys-apps/hwloc:= ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk:0= dev-lang/tcl:0= ) syslog? ( virtual/logger ) !!games-util/qstat sys-libs/ncurses:* !!sys-cluster/slurm
+DESCRIPTION=Resource manager and queuing system based on OpenPBS
+EAPI=8
+HOMEPAGE=http://www.adaptivecomputing.com/products/open-source/torque
+INHERIT=autotools flag-o-matic linux-info toolchain-funcs
+IUSE=autorun cgroups cpusets +crypt doc munge nvidia quickcommit server +syslog tk
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=torque-2.5
+RDEPEND=sys-libs/zlib sys-libs/readline:0= dev-libs/libxml2 dev-libs/boost cpusets? ( sys-apps/hwloc:= ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk:0= dev-lang/tcl:0= ) syslog? ( virtual/logger ) !!games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh ) !dev-libs/uthash
+SLOT=0
+SRC_URI=https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e9217cbab1542792d646f59a6.tar.gz -> torque-6.0.4-gh-20170829.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/torque-6.0.4-gcc7.patch https://dev.gentoo.org/~sam/distfiles/sys-cluster/torque/torque-6.0.4-glibc-2.34-pthread.patch.bz2
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=bbe5b8cf93bfe5872628a2dfd8b3fc79
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 5d8b771d6820..dc01594ebde5 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/crossdev-20221228 b/metadata/md5-cache/sys-devel/crossdev-20221228
new file mode 100644
index 000000000000..bdf27ec8390d
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/crossdev-20221228
@@ -0,0 +1,11 @@
+BDEPEND=app-arch/xz-utils
+DEFINED_PHASES=install
+DESCRIPTION=Gentoo Cross-toolchain generator
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Crossdev
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/portage-2.1 app-shells/bash sys-apps/gentoo-functions
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-devel/crossdev/crossdev-20221228.tar.xz https://dev.gentoo.org/~vapier/dist/crossdev-20221228.tar.xz
+_md5_=1f3826bf8ed18477fb39c1fbacb50e99
diff --git a/metadata/md5-cache/sys-devel/gcc-config-2.9 b/metadata/md5-cache/sys-devel/gcc-config-2.9
new file mode 100644
index 000000000000..11d9c33dc0ce
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-config-2.9
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=Utility to manage compilers
+EAPI=8
+HOMEPAGE=https://gitweb.gentoo.org/proj/gcc-config.git/
+IUSE=+cc-wrappers +native-symlinks
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/gentoo-functions-0.10
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc-config/gcc-config-2.9.tar.xz
+_md5_=39451caeec5fbe4eb55be3ea11cf6b4d
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 819b9b40a511..e92e1f622d2d 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14950 BLAKE2B 792d84278cbe0a78d43b0cbb185ce7da147c07c1faedbacd7778de8536404dd2ec06d331e0958b852e139d4f3aeefcd8741db7653ef0e8e10d007dc8fa05b9a0 SHA512 3c8e9c9c1402b1f78060806a88692459aaec8ee174db356633010b585f8cae388bd62391f0982b36f56334725d482889e3a10511f24a2d0abf2fd1f9a3601110
-TIMESTAMP 2022-12-28T19:09:46Z
+TIMESTAMP 2022-12-29T01:39:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOslHpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOs7+JfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCzFA//c4UZK6i5ASe/tcrVNRqTeNpGmJ4a9FRTSUXY00zWxWycKSsVs6RmV+Ag
-wl3l8Vx4tbCSuQWWfp9ewFG+Y7m8tA8ccioSZxBjA9Jf5hzbnwQW48F2YZazK+RH
-ZyF4UmUJ40qmVxBlKW4iidSP8unpeb++br0/QJa1t0oOmSFT1n+3Yeqs2/eeIyS9
-So3qu+vFUDi9UI5+NM0pa7r7aDq/vA7043FUcwwqME6DWbj1ewVbm6T5xfK/wPxr
-iYL7yCmdZAqOf1yDIqbDxwu6O7hcgQT7HyXA18Jo2ruC8m9C7RxLyrq/Y+ACUvvY
-qfOxhtEB0w7U1WJw3MY7X1/zHkj5u2imJUgNnNXucx8D4GEUDEakwuxvvZjKlHp6
-5E9D3I3o/npUlZuC9lv+IkNmBLaN2RBgjfFonHT1z3Ie5jyDQ4xxDzG/VyYtuCOI
-8XBQPkmTzQPKXfBRoNbh6RrDD6LnU6oU7coUhpeD5tb2eH+odOg4HNB05xwVld+p
-LOGcYYG8hGbhP1OS2AZyOf5sKN2hdMdnYpI40MDUjcho2pj0us2DPiaeTZY6b+pJ
-OH3j6FLrmPmFyQDACy1IKyEM1DqbAC2Z23WJDrSlweTmKWF56p3Uq3hHn506xmg6
-Tg7nNrXhzB6u5Kgd2CPPkDxKaQ/GD2xtaCw8FtI4rxXyF7DT9aQ=
-=TbPP
+klCEBg/9FbOOE0OKvQW3PLFpnn6te4+adS0jW9S00bjjQhVUUMpcM7tpitpbu8TR
+UfaMSyzI8h/NtajwHs0m29UiELUHq+Fz6pnlLH5NEdGmvEXrT5WMiNpdLHuEmEW6
+ij+hrLebT/8ZOZdlmO9gsWlOBWK1EaqHz6ve0N/kLNx1PYTTE4/f32GTy/e5aWCC
+LKx9I0IyDqIsOXCd01HCPEX0ljZhf38A6bgoarsPcKjzUL8Cen+kPFVnmf7t5Vpc
+X6FY+AHRC9rbsZWO+nxQv9Gn+KDHQJMaV29Kh9RJC8caBN3FH4N271MmvK0vyi2i
+1JxGIB3c0HKeoQ6YNtjU7G1VVEWIdNWtLzrHmnacQjiQ2PJ6tzZ0PBxuhFFBCP1O
+HcZYvvtOtYdt5da+53yLoQZYE3ijVR+moqhsQ1+xfUiz/LzZLJ9PuSPnHTsy6eI5
+TSYDZcwh0f/R408WdjukaATWEb/ASggxFj0i2Yz4cnO2vI6/1l6oP5R4fA0FO8OK
+yFxIdmUjMuDxEXAegww0rPxhwPnQmPcZHPz6LY8I9f3R7OHLM1YtIMN+/OCj8CGE
+NMUBThepd0JZjuM2+y29PfAWHDhqSP3vcVWt2tsUS2+y0nv+napCFYDiCkLnEj/s
+VAs4mAAAQVGt2huuIRXTBqO3cz+QGk1vdb3yRwifmTQavcXZ4QY=
+=gIdy
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 218dfa66fe48..2d66d9f1088d 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Dec 2022 19:09:43 +0000
+Thu, 29 Dec 2022 01:39:43 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index c246159ff056..17cb0024a11e 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Dec 28 07:09:42 PM UTC 2022
+Thu Dec 29 01:39:43 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 10e23ed52c0b..6ff4a6b638ca 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Dec 2022 19:15:01 +0000
+Thu, 29 Dec 2022 01:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 8b30580252c9..ebf3671cb204 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-8a71794f106aa0cf9eae4036f33a56a95d8e04ec 1672253972 2022-12-28T18:59:32+00:00
+7c38ca60beb2109038fc103c7c489a887b475066 1672277728 2022-12-29T01:35:28+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index ff5492db03b3..628751a72805 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1672254601 Wed 28 Dec 2022 07:10:01 PM UTC
+1672278001 Thu 29 Dec 2022 01:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 05e6b81a0b77..2d66d9f1088d 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Dec 2022 19:09:42 +0000
+Thu, 29 Dec 2022 01:39:43 +0000
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 98234dea1ab0..21c245624564 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 434a930ee6f1..ba702afe337d 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -11,5 +11,5 @@ DIST curl-7.86.0.tar.xz.asc 488 BLAKE2B a9abe2f3af801b3a48be7db09cb82b6bb83bd26a
 DIST curl-7.87.0.tar.xz 2547932 BLAKE2B b272ec928c5ef1728434630d8910f58834327a30570913df9d47921a2810d002bd88b81371005197db857d3a53386420c1e28b1e463e6241d46c1e50fbce0c13 SHA512 aa125991592667280dce3788aabe81487cf8c55b0afc59d675cc30b76055bb7114f5380b4a0e3b6461a8f81bf9812fa26d493a85f7e01d84263d484a0d699ee7
 DIST curl-7.87.0.tar.xz.asc 488 BLAKE2B 031d8236b357bd3c519548b181254dc0aea1efc1375738bce04f4f331d35bafe99d1ca394ecf5943ede7cae040854b6d2b478fd305147eb7330f8d50e5d95c96 SHA512 0bcc12bafc4ae50d80128af2cf4bf1a1ec6018ebb8d5b9c49f52b51c0c25acc77e820858965656549ef43c1f923f4e5fe75b0a3523623154b4cfb9dc8a1d76e4
 EBUILD curl-7.86.0-r3.ebuild 8760 BLAKE2B 60e6eedd747a7ad46bcc5de3a5e2abedbdb91539863fd7f518afd34383ce3912da321ff5de5df94395a9a94b078902382d9d920df79f0a3f7e8d0265bb1cab44 SHA512 800c3aa95abd8b47322b1055d888726e05ed895537153b0beff1977cf8ab2798f209d463efaadad2ae40e1e8e7e8c45cb1a8e10dc0861b4808d44910b4c85cbf
-EBUILD curl-7.87.0.ebuild 8620 BLAKE2B aec174a0e8b4a343bba6fb8a2883785206c3469074c0896d7b4c3ea697bd97845d4bf7db74ee5743a302e20d512a9420f3615cccb67b64833235c335234276c9 SHA512 61b1877e5ad6d5e07426b1eaa53419f40a91538fd5e40bf593a6800a0b56e482fa2abb66a65455c7400af2daf4385241490406775fd3152f6b715d067316afec
+EBUILD curl-7.87.0.ebuild 8616 BLAKE2B 556c6769664d373e0dcc8dccecbb47fa49f18d188def74ace164d1b9a72eb616b924c9b3ea10bd0f2aff8166909b3294b0ea154764d00494a8c0d4e136674acb SHA512 ec0dcca24c68da1a9d68a42c17c716d58e6763116c7bc67e60dfa7acd1e32ba98401aba51c3bfa397617667bf71a3deb0fdcca0ca0d8e2d27dbdef1ef3f824f4
 MISC metadata.xml 2158 BLAKE2B 2b99163e490c531d73aa8c62d428ff4e994537b140e159548d74d52a7c46a2b5e04c992a541298253464f7eaab447d7a680140aadc6b33ecd7d69c35b6aaf6c5 SHA512 a3313197aeedaa7f347e3b6b791d8e5e3bda4292225afcc457ec21cd883347c4cdccaeaa79a7c212e061fdb339be3706815d425d09d8511a4d984f9318164797
diff --git a/net-misc/curl/curl-7.87.0.ebuild b/net-misc/curl/curl-7.87.0.ebuild
index 9e455b269cd4..68fc4577aa21 100644
--- a/net-misc/curl/curl-7.87.0.ebuild
+++ b/net-misc/curl/curl-7.87.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://curl.se/download/${P}.tar.xz
 
 LICENSE="curl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
 IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls"
 IUSE+=" nghttp3 quiche"
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 82fc719f3464..bb28f27dfda1 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -25,10 +25,6 @@ AUX sshd_at.service 177 BLAKE2B 0e78184f58cb4c68fb834953fac3ce01f9e39e9eb1a84c03
 DIST openssh-8_5_P1-hpn-AES-CTR-15.2.diff 30096 BLAKE2B f0c020dd2403806c79d4c37a019996d275655b04997301e247f5c4dd7fad35d12b3b7c25afb1b078d915ef2a4ae02f736f0aec9ba2a8c56a405d7ca303bcadf7 SHA512 4c2dbf99a9b5953fdb955f700272bbaeaa025f108a8860d2190197962b849f8385327af82c4d6a3a130a7fba35a74a8ec9437d642867601acb29817c49632a8f
 DIST openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 51428 BLAKE2B 370b88a7da7f148bf5a4d445f05cf593b486e9df53bba027e2e179726f534b68cf9d94edd6e53024e0b6ff5f20e568727bc9d26c94d0d415603602a80d3ad241 SHA512 2d8d887901164b33b2799ff3ec72e86a39ae4a1696e52bcee0872dbae7772fcc534351e6e7f87126ee71b164c74e9091350f14b782f4b242a09f09b4f50d047a
 DIST openssh-8_5_P1-hpn-PeakTput-15.2.diff 2429 BLAKE2B 849bf3c313719ab7a25c75e82d5dc5ac98365a038b2a66fe58d01eae5b20c7777258b94b5830e799d6909e75c69753cda05a910f3bdab9606fb7d5efa68e05f1 SHA512 c4a56fab55fabd1d902d45f235b603708d43f969920e45c9a57e557dccfa9cade2ec61f26d1ace938f6f73e79f17b12f119b5aea9166cbda8e3435b910500914
-DIST openssh-9.0p1+x509-13.4.1.diff.gz 1146757 BLAKE2B 070d6bc23179a581e4fe79412274f11399009ba69ad643cc354ec9cd6392ffb0a651fd2d7f310c52c60a9c626140b9c823e2f19c600f15ac9cdf992707274bcb SHA512 4aaa86c1a785741b28c5e2738cf6de6fa7965ac8692165a8b18fe7677aeb0996979f23b45306781e6be75d34fb39294659be5ae016ab4a82ef2a73bedcc6e8e7
-DIST openssh-9.0p1-sctp-1.2.patch.xz 6768 BLAKE2B 8a18aea57b0b3f8f0a641870f0cd1570c6cc48d1e28ef7261344918905e94a548d3a3acb6feb1c6ef13f0c6cacf2b845163cad2b96ab20cb9fc58a49aeb699c1 SHA512 d6aa5f32464d5f3e2e63e9ba82108f33bdaa890e2adf2ccc47ce0d672979fc67510d9dd7561b17eaba0c2f11a8eb565029b0ebff3b2d050e9e04e6143aedb8a3
-DIST openssh-9.0p1.tar.gz 1822183 BLAKE2B 49724a400951964d659d136908657940f79e150056728cc4dadf8ff8652a832f7fd46eebb47b15085e57fca4b00c77d1ec4dd1b056ea2bbcee89f54a121ed5e2 SHA512 613ae95317e734868c6a60d9cc5af47a889baa3124bbdd2b31bb51dd6b57b136f4cfcb5604cca78a03bd500baab9b9b45eaf77e038b1ed776c86dce0437449a9
-DIST openssh-9.0p1.tar.gz.asc 833 BLAKE2B e29ff08f10feee7347c02a7ce4b33b8d9c71a26656f0430a2511c25bc6b5006f1683d845826a68ff4eed068b30c911e273cb34e5b4880854d55a776415474019 SHA512 7b1445764058435d2fa8a9c7553643983650d4232036c088e46e44beeb538d32cba88f775b1be9da5f21a01d6caea59b3dc4714507781e9cb946546fa54f169f
 DIST openssh-9.1_p1-X509-glue-13.5.patch.xz 1092 BLAKE2B 19da945547472048d01a6ec26f28cba11afe1a0590a115582d1e21a852b6b66589b091ab4440d57952200522318aeffb7d9404e53f9532ae80e47685c24c4097 SHA512 96de9f59bacfd99aa9ef03362d55d88b3eea0acc57a11fb72e5c612bfb0f5e48455b0a0d0add9a8a5524b9d4701f47db1ff7859f1d3c2a12947b27292961cbd5
 DIST openssh-9.1_p1-X509-glue-14.0.1.patch.xz 1096 BLAKE2B cf5568982c9b2b69ee9f99f3e80459aed7b89f1350362e550ae8db3e5eee4a6d2e07879f962262a05c9745d39f34a3ae83792595c61f0ac287226ee9e0ec2a1b SHA512 18c65c97cc8c436fa8e28c0ad9f0a3874f1fb745d75e0bfb76c180bc148ae14a5f6cc5c2b2fa7261d76a8e1234f28fe869bd7f64ed282bf39c88cc3f20932be5
 DIST openssh-9.1_p1-hpn-15.2-X509-14.0.1-glue.patch.xz 5536 BLAKE2B 4629e62287f2bc36fe1eb830e4c47c5482e36650c1e725978e150e4f2a233d58b5bd1286024bdbef4d05586bb3e5d13c51fbd191dfe7429fdb06a278c564a777 SHA512 03467605b57ab3fb7ef2a9be175cf3708fa92234f3f0abfa74ea371c9ee90f2c01a3311022e282823c7bb67249d65aabf89f1574b917dc798c51847e57b0e33f
@@ -39,7 +35,6 @@ DIST openssh-9.1p1+x509-14.0.1.diff.gz 1236304 BLAKE2B 389e652a7cca4d7322d784e51
 DIST openssh-9.1p1-sctp-1.2.patch.xz 6772 BLAKE2B 8393c1ca5f0df7e4d490cef5c38d50d45da83a9c3f650e9af15d95825f9e682a6aaf6a0e85fc1704d41d6567aec8f0b34e43b20652e0141008ccdbe91426dfac SHA512 6750394d0fb7b7f93a0e4f94204e53277cc341c5b2427130559e443557dbb95f2e85a71cfe8d40cfa17dd015b0f3880f79a1f868374e60e94e8385c9b45acec5
 DIST openssh-9.1p1.tar.gz 1838747 BLAKE2B 287b6b1cc4858b27af88f4a4674670afff1fb5b99461892083393c53ef3747c5a0fcd90cba95d2c27465a919e00f7f42732c93af4f306665ba0393bbb7a534f5 SHA512 a1f02c407f6b621b1d0817d1a0c9a6839b67e416c84f3b76c63003b119035b24c19a1564b22691d1152e1d2d55f4dc7eb1af2d2318751e431a99c4efa77edc70
 DIST openssh-9.1p1.tar.gz.asc 833 BLAKE2B 83efe3c705f6a02c25a9fc9bac2a4efd77470598d9e0fcb86dff2d265c58cffec1afecad3621769b2bd78ac25884f0ee20ae9b311e895db93e3bb552dffd6e74 SHA512 47dc7295f9694250bcbb86d7ca0830a47da4f3df7795bb05ebaf1590284ccce5317022c536bea1b09bd2fa4d8013295cc0de287ebe3f9dc605582077e9f11ddd
-EBUILD openssh-9.0_p1-r6.ebuild 17502 BLAKE2B bfdb6f817ee3042e7a7f407b3fcef7d398f96899e1a9090e197afd625ebab39e83f4ec76fe7582fbed41cbfa2e84350f7edd648e03bc83f3c560751379d9d44e SHA512 260f6c0d2f46517debec42cec0993b4cfefb0adc480b3e0d3cdf8e80c3f5ba89da1013994c7db2c61143a43af4374536a21d1e62f8af742fd394933eead529db
 EBUILD openssh-9.1_p1-r1.ebuild 17832 BLAKE2B b29a9cae52c16dd29382dc57454879e26bae5f1bd18edf87541c7cee8de3fa907eb1d27770235124267c73e9adafbe85c61c16b7eb3be047e3c3ba0da2e447f1 SHA512 2aacdffce384c2c50bb946d202cb1397c36eff5dbaafe741e5f412321828a057fb876a7ded8db8d88ad99c603c35da219ff59ecd7c84b2a7f20c2216fc290658
 EBUILD openssh-9.1_p1.ebuild 17810 BLAKE2B 302fca36aa0f354186744a3220f430e61c3f2ca1f3dda7de7c98f47e6a476715aee1a023451f27cfb1bb07ee50ec1bbc28a05e8f70c2937d391519b9a8423725 SHA512 871fc233d0532c5b84a171a46e3a9ccd5888833145413547e5d8c7bfc0a761280446c61440103dd132e2bd2f73cb6f35c0f90ae41a4975e3d9c2fd506ba0de29
 MISC metadata.xml 1957 BLAKE2B f5921abe3735fc6b8f8c6e88f3c3c11201c32ac91f7426150a51619b430f8c15c2afb0a9dcb9b3b5099fe7e5f193a05514064029392df6d0815a7fb67c2b96cf SHA512 6189845b640943147020d4a0fe04be66f58433809edded6fe98824b51c704faef9c3fc4c0d7a604391afcfcee62c0a47e25d36024b9145c4f1e332fe27db7f0a
diff --git a/net-misc/openssh/openssh-9.0_p1-r6.ebuild b/net-misc/openssh/openssh-9.0_p1-r6.ebuild
deleted file mode 100644
index eb042a3fb063..000000000000
--- a/net-misc/openssh/openssh-9.0_p1-r6.ebuild
+++ /dev/null
@@ -1,499 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_}
-
-# PV to USE for HPN patches
-#HPN_PV="${PV^^}"
-HPN_PV="8.5_P1"
-
-HPN_VER="15.2"
-HPN_PATCHES=(
-	${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff
-	${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff
-	${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff
-)
-
-SCTP_VER="1.2"
-SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
-X509_VER="13.4.1"
-X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="https://www.openssh.com/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )}
-	${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )}
-	${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
-	verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc )
-"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssh.org.asc
-S="${WORKDIR}/${PARCH}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	hpn? ( ssl )
-	ldns? ( ssl )
-	pie? ( !static )
-	static? ( !kerberos !pam )
-	X509? ( !sctp ssl !xmss )
-	xmss? ( ssl  )
-	test? ( ssl )
-"
-
-# tests currently fail with XMSS
-REQUIRED_USE+="test? ( !xmss )"
-
-# Blocker on older gcc-config for bug #872416
-LIB_DEPEND="
-	!<sys-devel/gcc-config-2.6
-	audit? ( sys-process/audit[static-libs(+)] )
-	ldns? (
-		net-libs/ldns[static-libs(+)]
-		net-libs/ldns[ecdsa(+),ssl(+)]
-	)
-	libedit? ( dev-libs/libedit:=[static-libs(+)] )
-	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
-	security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] )
-	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
-	ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] )
-	virtual/libcrypt:=[static-libs(+)]
-	>=sys-libs/zlib-1.2.3:=[static-libs(+)]
-"
-RDEPEND="
-	acct-group/sshd
-	acct-user/sshd
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( sys-libs/pam )
-	kerberos? ( virtual/krb5 )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) )
-	static? ( ${LIB_DEPEND} )
-"
-RDEPEND="${RDEPEND}
-	pam? ( >=sys-auth/pambase-20081028 )
-	!prefix? ( sys-apps/shadow )
-	X? ( x11-apps/xauth )
-"
-# Weird dep construct for newer gcc-config for bug #872416
-BDEPEND="
-	sys-devel/autoconf
-	virtual/pkgconfig
-	|| (
-		>=sys-devel/gcc-config-2.6
-		>=sys-devel/clang-toolchain-symlinks-14-r1:14
-		>=sys-devel/clang-toolchain-symlinks-15-r1:15
-		>=sys-devel/clang-toolchain-symlinks-16-r1:*
-	)
-	verify-sig? ( sec-keys/openpgp-keys-openssh )
-"
-
-pkg_pretend() {
-	# this sucks, but i'd rather have people unable to `emerge -u openssh`
-	# than not be able to log in to their server any more
-	local missing=()
-	check_feature() { use "${1}" && [[ -z ${!2} ]] && missing+=( "${1}" ); }
-	check_feature hpn HPN_VER
-	check_feature sctp SCTP_PATCH
-	check_feature X509 X509_PATCH
-	if [[ ${#missing[@]} -ne 0 ]] ; then
-		eerror "Sorry, but this version does not yet support features"
-		eerror "that you requested: ${missing[*]}"
-		eerror "Please mask ${PF} for now and check back later:"
-		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
-		die "Missing requested third party patch."
-	fi
-
-	# Make sure people who are using tcp wrappers are notified of its removal. #531156
-	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
-		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
-		ewarn "you're trying to use it.  Update your ${EROOT}/etc/hosts.{allow,deny} please."
-	fi
-}
-
-src_unpack() {
-	default
-
-	# We don't have signatures for HPN, X509, so we have to write this ourselves
-	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${PARCH}.tar.gz{,.asc}
-}
-
-src_prepare() {
-	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
-		pathnames.h || die
-
-	# don't break .ssh/authorized_keys2 for fun
-	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
-	eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch
-	eapply "${FILESDIR}"/${PN}-8.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
-	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
-	eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
-	eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch
-	eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch
-	eapply "${FILESDIR}"/${PN}-8.9_p1-allow-ppoll_time64.patch #834019
-	eapply "${FILESDIR}"/${PN}-8.9_p1-gss-use-HOST_NAME_MAX.patch #834044
-	eapply "${FILESDIR}"/${PN}-9.0_p1-implicit-func-decl-vsnprintf.patch
-
-	[[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
-
-	local PATCHSET_VERSION_MACROS=()
-
-	if use X509 ; then
-		pushd "${WORKDIR}" &>/dev/null || die
-		eapply "${FILESDIR}/${P}-X509-glue-"${X509_VER}".patch"
-		popd &>/dev/null || die
-
-		eapply "${WORKDIR}"/${X509_PATCH%.*}
-		eapply "${FILESDIR}/${PN}-9.0_p1-X509-uninitialized-delay.patch"
-
-		# We need to patch package version or any X.509 sshd will reject our ssh client
-		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
-		# error
-		einfo "Patching package version for X.509 patch set ..."
-		sed -i \
-			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
-			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
-
-		einfo "Patching version.h to expose X.509 patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
-	fi
-
-	if use sctp ; then
-		eapply "${WORKDIR}"/${SCTP_PATCH%.*}
-
-		einfo "Patching version.h to expose SCTP patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE/a #define SSH_SCTP        \"-sctp-${SCTP_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in SCTP patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
-
-		einfo "Disabling known failing test (cfgparse) caused by SCTP patch ..."
-		sed -i \
-			-e "/\t\tcfgparse \\\/d" \
-			"${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
-	fi
-
-	if use hpn ; then
-		local hpn_patchdir="${T}/${P}-hpn${HPN_VER}"
-		mkdir "${hpn_patchdir}" || die
-		cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die
-		pushd "${hpn_patchdir}" &>/dev/null || die
-		eapply "${FILESDIR}"/${PN}-8.9_p1-hpn-${HPN_VER}-glue.patch
-		use X509 && eapply "${FILESDIR}"/${PN}-8.9_p1-hpn-${HPN_VER}-X509-glue.patch
-		use sctp && eapply "${FILESDIR}"/${PN}-8.5_p1-hpn-${HPN_VER}-sctp-glue.patch
-		popd &>/dev/null || die
-
-		eapply "${hpn_patchdir}"
-
-		use X509 || eapply "${FILESDIR}/openssh-8.6_p1-hpn-version.patch"
-
-		einfo "Patching Makefile.in for HPN patch set ..."
-		sed -i \
-			-e "/^LIBS=/ s/\$/ -lpthread/" \
-			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
-
-		einfo "Patching version.h to expose HPN patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER//./v}\"" \
-			"${S}"/version.h || die "Failed to sed-in HPN patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
-
-		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
-			einfo "Disabling known non-working MT AES cipher per default ..."
-
-			cat > "${T}"/disable_mtaes.conf <<- EOF
-
-			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
-			# and therefore disabled per default.
-			DisableMTAES yes
-			EOF
-			sed -i \
-				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
-				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
-
-			sed -i \
-				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
-				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
-		fi
-	fi
-
-	if use X509 || use sctp || use hpn ; then
-		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
-		sed -i \
-			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
-			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
-
-		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
-		sed -i \
-			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
-			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
-
-		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
-		sed -i \
-			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
-			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
-	fi
-
-	sed -i \
-		-e "/#UseLogin no/d" \
-		"${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)"
-
-	eapply_user #473004
-
-	# These tests are currently incompatible with PORTAGE_TMPDIR/sandbox
-	sed -e '/\t\tpercent \\/ d' \
-		-i regress/Makefile || die
-
-	tc-export PKG_CONFIG
-	local sed_args=(
-		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
-		# Disable PATH reset, trust what portage gives us #254615
-		-e 's:^PATH=/:#PATH=/:'
-		# Disable fortify flags ... our gcc does this for us
-		-e 's:-D_FORTIFY_SOURCE=2::'
-	)
-
-	# The -ftrapv flag ICEs on hppa #505182
-	use hppa && sed_args+=(
-		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
-		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
-	)
-	# _XOPEN_SOURCE causes header conflicts on Solaris
-	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
-		-e 's/-D_XOPEN_SOURCE//'
-	)
-	sed -i "${sed_args[@]}" configure{.ac,} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	addwrite /dev/ptmx
-
-	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
-	use static && append-ldflags -static
-	use xmss && append-cflags -DWITH_XMSS
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# Solaris' glob.h doesn't have things like GLOB_TILDE, configure
-		# doesn't check for this, so force the replacement to be put in
-		# place
-		append-cppflags -DBROKEN_GLOB
-	fi
-
-	# use replacement, RPF_ECHO_ON doesn't exist here
-	[[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no
-
-	local myconf=(
-		--with-ldflags="${LDFLAGS}"
-		--disable-strip
-		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-		--sysconfdir="${EPREFIX}"/etc/ssh
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
-		--datadir="${EPREFIX}"/usr/share/openssh
-		--with-privsep-path="${EPREFIX}"/var/empty
-		--with-privsep-user=sshd
-		$(use_with audit audit linux)
-		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
-		# We apply the sctp patch conditionally, so can't pass --without-sctp
-		# unconditionally else we get unknown flag warnings.
-		$(use sctp && use_with sctp)
-		$(use_with ldns)
-		$(use_with libedit)
-		$(use_with pam)
-		$(use_with pie)
-		$(use_with selinux)
-		$(usex X509 '' "$(use_with security-key security-key-builtin)")
-		$(use_with ssl openssl)
-		$(use_with ssl ssl-engine)
-		$(use_with !elibc_Cygwin hardening) #659210
-	)
-
-	if use elibc_musl; then
-		# musl defines bogus values for UTMP_FILE and WTMP_FILE
-		# https://bugs.gentoo.org/753230
-		myconf+=( --disable-utmp --disable-wtmp )
-	fi
-
-	# Workaround for Clang 15 miscompilation with -fzero-call-used-regs=all
-	# bug #869839 (https://github.com/llvm/llvm-project/issues/57692)
-	tc-is-clang && myconf+=( --without-hardening )
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	local tests=( compat-tests )
-	local shell=$(egetshell "${UID}")
-	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
-		ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
-		ewarn "user, so we will run a subset only."
-		tests+=( interop-tests )
-	else
-		tests+=( tests )
-	fi
-
-	local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1
-	mkdir -p "${HOME}"/.ssh || die
-	emake -j1 "${tests[@]}" </dev/null
-}
-
-# Gentoo tweaks to default config files.
-tweak_ssh_configs() {
-	local locale_vars=(
-		# These are language variables that POSIX defines.
-		# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02
-		LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
-
-		# These are the GNU extensions.
-		# https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html
-		LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
-	)
-
-	# First the server config.
-	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
-
-	# Allow client to pass locale environment variables. #367017
-	AcceptEnv ${locale_vars[*]}
-
-	# Allow client to pass COLORTERM to match TERM. #658540
-	AcceptEnv COLORTERM
-	EOF
-
-	# Then the client config.
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
-
-	# Send locale environment variables. #367017
-	SendEnv ${locale_vars[*]}
-
-	# Send COLORTERM to match TERM. #658540
-	SendEnv COLORTERM
-	EOF
-
-	if use pam ; then
-		sed -i \
-			-e "/^#UsePAM /s:.*:UsePAM yes:" \
-			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
-			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
-			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
-			"${ED}"/etc/ssh/sshd_config || die
-	fi
-
-	if use livecd ; then
-		sed -i \
-			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
-			"${ED}"/etc/ssh/sshd_config || die
-	fi
-}
-
-src_install() {
-	emake install-nokeys DESTDIR="${D}"
-	fperms 600 /etc/ssh/sshd_config
-	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd-r1.initd sshd
-	newconfd "${FILESDIR}"/sshd-r1.confd sshd
-
-	if use pam; then
-		newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-	fi
-
-	tweak_ssh_configs
-
-	doman contrib/ssh-copy-id.1
-	dodoc CREDITS OVERVIEW README* TODO sshd_config
-	use hpn && dodoc HPN-README
-	use X509 || dodoc ChangeLog
-
-	diropts -m 0700
-	dodir /etc/skel/.ssh
-	rmdir "${ED}"/var/empty || die
-
-	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
-	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
-}
-
-pkg_preinst() {
-	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then
-		show_ssl_warning=1
-	fi
-}
-
-pkg_postinst() {
-	local old_ver
-	for old_ver in ${REPLACING_VERSIONS}; do
-		if ver_test "${old_ver}" -lt "5.8_p1"; then
-			elog "Starting with openssh-5.8p1, the server will default to a newer key"
-			elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
-			elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
-		fi
-		if ver_test "${old_ver}" -lt "7.0_p1"; then
-			elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
-			elog "Make sure to update any configs that you might have.  Note that xinetd might"
-			elog "be an alternative for you as it supports USE=tcpd."
-		fi
-		if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518
-			elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
-			elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
-			elog "adding to your sshd_config or ~/.ssh/config files:"
-			elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
-			elog "You should however generate new keys using rsa or ed25519."
-
-			elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
-			elog "to 'prohibit-password'.  That means password auth for root users no longer works"
-			elog "out of the box.  If you need this, please update your sshd_config explicitly."
-		fi
-		if ver_test "${old_ver}" -lt "7.6_p1"; then
-			elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
-			elog "Furthermore, rsa keys with less than 1024 bits will be refused."
-		fi
-		if ver_test "${old_ver}" -lt "7.7_p1"; then
-			elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality."
-			elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option"
-			elog "if you need to authenticate against LDAP."
-			elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details."
-		fi
-		if ver_test "${old_ver}" -lt "8.2_p1"; then
-			ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you"
-			ewarn "will not be able to establish new sessions. Restarting sshd over a ssh"
-			ewarn "connection is generally safe."
-		fi
-	done
-
-	if [[ -n ${show_ssl_warning} ]]; then
-		elog "Be aware that by disabling openssl support in openssh, the server and clients"
-		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
-		elog "and update all clients/servers that utilize them."
-	fi
-
-	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
-		elog ""
-		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
-		elog "and therefore disabled at runtime per default."
-		elog "Make sure your sshd_config is up to date and contains"
-		elog ""
-		elog "  DisableMTAES yes"
-		elog ""
-		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
-		elog ""
-	fi
-}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 2fb4531cd5ed..4ba97f8d4ba3 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 644517ca4853..f1e450299194 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -11,5 +11,5 @@ DIST tor-0.4.7.12.tar.gz 8009573 BLAKE2B 13e9a796d9e5b024aa01b9aaab389b580df4164
 DIST tor-0.4.7.12.tar.gz.sha256sum 86 BLAKE2B 0402bdf641c8142f91df7a80ad726ce3a1eeb3265f385b5b818440e6c25a5424db467714baee0dfaaf61edf482814a1de5c4d53fd4d61a26c194037a71928580 SHA512 c9a197bb563b05632cc5bfe4dfe5d2dd02427591816997726e2fbc9ec94b17d52295f33c946bea51ac6a2ef76d94a14b9e96daf951eeab57a8ee0d7d513c62c1
 DIST tor-0.4.7.12.tar.gz.sha256sum.asc 716 BLAKE2B c148062a35e232d08cd1e0971e467cddee7836932984f778ab923ff38e717c2a8f3985ff63591002b179eaeb12e04b066366a2a3ed76e00d436a76f0eacaea67 SHA512 afa1208758f0b385cea36660db4739353237b5a4608c374db9115e3584ba96bdabe18ea811752a847eb3e5012919c9f3ed06129f1ec40465d18dc27de4b961fc
 EBUILD tor-0.4.7.11.ebuild 3182 BLAKE2B 0a9d4c581b51b370fba88c124df05938111ea4cc404b6f134f364a705ef0d07b106b1eddedaa67ddab845948f8840745eb08032aae874b9906ea4705a30a76eb SHA512 d237932416e70bf209f389bd18ff43f7fb4e95c61f6b141ae609b90b9428550e296f23f9ea26e7f758237c1719663639cd22215629aabb56ab1a002ab734d242
-EBUILD tor-0.4.7.12.ebuild 3188 BLAKE2B 948b2ab80d768661c147fe3d214af39b4c50182ad9a6656f2e3f44d2c069411579526ced7e149128c56fd0d979d6061726c0fc6315991c02de1b7469f3b0be22 SHA512 4d706594f7d17e5e77ada92519001c2b9a790e41398f84ebb7fbf7bb2a61eb9ffdd303e9c154c4b304fab185429d2a37e14177b236ef1865a514c5085e702f2e
+EBUILD tor-0.4.7.12.ebuild 3182 BLAKE2B dff408c48a7f2ed744feb922e8879f1c5b3c9cd6217cb713c737a8d83495b63b0d765fd937acd885d2189dd4e20f3d5933a7d755a8075b342a261ea8580a3323 SHA512 79515b99143e6f7bdcce73ff21a1af59cda3ae88b7eeeb7cb522f3366ab6a2e172cdcd073d3bb19bd9ad649d30b6a4f77b5c6c49db6a4c8782336a3bc933170a
 MISC metadata.xml 550 BLAKE2B 483cfc846fb5d2996ca0b1b947df203a3470c8ea4a9ed655ce7c40b6ee3bde22d9fc41945c1fda79bfd2f5d91c6c7886e8b3fa1b6f385c802722ddba927980be SHA512 85ff349fc58d1e122c8ae0476a6143585190928c1abf0d4b228ad7f2e991e813d19a8b75a89421acfb96fc8c1d73e34be0c1a0ff70c9c68594518047a0de3df9
diff --git a/net-vpn/tor/tor-0.4.7.12.ebuild b/net-vpn/tor/tor-0.4.7.12.ebuild
index de5e0e4c2145..88e164965eb1 100644
--- a/net-vpn/tor/tor-0.4.7.12.ebuild
+++ b/net-vpn/tor/tor-0.4.7.12.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_PF}"
 LICENSE="BSD GPL-2"
 SLOT="0"
 if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
+	KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos"
 fi
 IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
 RESTRICT="!test? ( test )"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 24ad4926ef03..ae82fc8d15d6 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/default/linux/mips/23.0/eapi b/profiles/default/linux/mips/23.0/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/make.defaults b/profiles/default/linux/mips/23.0/make.defaults
new file mode 100644
index 000000000000..54bc24e5fac5
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/make.defaults
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mips-unknown-linux-gnu"
+CHOST_n32="mips64-unknown-linux-gnuabin32"
+CHOST_n64="mips64-unknown-linux-gnuabi64"
diff --git a/profiles/default/linux/mips/23.0/mipsel/eapi b/profiles/default/linux/mips/23.0/mipsel/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/mipsel/make.defaults b/profiles/default/linux/mips/23.0/mipsel/make.defaults
new file mode 100644
index 000000000000..58571c559dcf
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/make.defaults
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mipsel-unknown-linux-gnu"
+CHOST_n32="mips64el-unknown-linux-gnuabin32"
+CHOST_n64="mips64el-unknown-linux-gnuabi64"
diff --git a/profiles/default/linux/mips/23.0/mipsel/multilib/eapi b/profiles/default/linux/mips/23.0/mipsel/multilib/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/multilib/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/mipsel/multilib/n32/eapi b/profiles/default/linux/mips/23.0/mipsel/multilib/n32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/multilib/n32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/mipsel/multilib/n32/make.defaults b/profiles/default/linux/mips/23.0/mipsel/multilib/n32/make.defaults
new file mode 100644
index 000000000000..b91472d0279c
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/multilib/n32/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mipsel-unknown-linux-gnu"
+CHOST_n32="mips64el-unknown-linux-gnuabin32"
+CHOST_n64="mips64el-unknown-linux-gnuabi64"
+
+CHOST=${CHOST_n32}
diff --git a/profiles/default/linux/mips/23.0/mipsel/multilib/n32/parent b/profiles/default/linux/mips/23.0/mipsel/multilib/n32/parent
new file mode 100644
index 000000000000..b2a231799a71
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/multilib/n32/parent
@@ -0,0 +1,2 @@
+../..
+../../../../../../../arch/mips/mipsel/mips64el/multilib/n32
diff --git a/profiles/default/linux/mips/23.0/mipsel/multilib/n32/systemd/eapi b/profiles/default/linux/mips/23.0/mipsel/multilib/n32/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/multilib/n32/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/mipsel/multilib/n32/systemd/parent b/profiles/default/linux/mips/23.0/mipsel/multilib/n32/systemd/parent
new file mode 100644
index 000000000000..f7739b405877
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/multilib/n32/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/mips/23.0/mipsel/multilib/n64/eapi b/profiles/default/linux/mips/23.0/mipsel/multilib/n64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/multilib/n64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/mipsel/multilib/n64/make.defaults b/profiles/default/linux/mips/23.0/mipsel/multilib/n64/make.defaults
new file mode 100644
index 000000000000..6413aabdf532
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/multilib/n64/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mipsel-unknown-linux-gnu"
+CHOST_n32="mips64el-unknown-linux-gnuabin32"
+CHOST_n64="mips64el-unknown-linux-gnuabi64"
+
+CHOST=${CHOST_n64}
diff --git a/profiles/default/linux/mips/23.0/mipsel/multilib/n64/parent b/profiles/default/linux/mips/23.0/mipsel/multilib/n64/parent
new file mode 100644
index 000000000000..d74eb45cf1dc
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/multilib/n64/parent
@@ -0,0 +1,2 @@
+../..
+../../../../../../../arch/mips/mipsel/mips64el/multilib/n64
diff --git a/profiles/default/linux/mips/23.0/mipsel/multilib/n64/systemd/eapi b/profiles/default/linux/mips/23.0/mipsel/multilib/n64/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/multilib/n64/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/mipsel/multilib/n64/systemd/parent b/profiles/default/linux/mips/23.0/mipsel/multilib/n64/systemd/parent
new file mode 100644
index 000000000000..f7739b405877
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/multilib/n64/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/mips/23.0/mipsel/multilib/o32/eapi b/profiles/default/linux/mips/23.0/mipsel/multilib/o32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/multilib/o32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/mipsel/multilib/o32/make.defaults b/profiles/default/linux/mips/23.0/mipsel/multilib/o32/make.defaults
new file mode 100644
index 000000000000..e9cc91c33347
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/multilib/o32/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mipsel-unknown-linux-gnu"
+CHOST_n32="mips64el-unknown-linux-gnuabin32"
+CHOST_n64="mips64el-unknown-linux-gnuabi64"
+
+CHOST=${CHOST_o32}
diff --git a/profiles/default/linux/mips/23.0/mipsel/multilib/o32/parent b/profiles/default/linux/mips/23.0/mipsel/multilib/o32/parent
new file mode 100644
index 000000000000..5fe2ba62654a
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/multilib/o32/parent
@@ -0,0 +1,2 @@
+../..
+../../../../../../../arch/mips/mipsel/mips64el/multilib/o32
diff --git a/profiles/default/linux/mips/23.0/mipsel/multilib/parent b/profiles/default/linux/mips/23.0/mipsel/multilib/parent
new file mode 100644
index 000000000000..5d7957a6376e
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/multilib/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/mips/mipsel/mips64el/multilib
diff --git a/profiles/default/linux/mips/23.0/mipsel/n32/eapi b/profiles/default/linux/mips/23.0/mipsel/n32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/n32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/mipsel/n32/make.defaults b/profiles/default/linux/mips/23.0/mipsel/n32/make.defaults
new file mode 100644
index 000000000000..b91472d0279c
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/n32/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mipsel-unknown-linux-gnu"
+CHOST_n32="mips64el-unknown-linux-gnuabin32"
+CHOST_n64="mips64el-unknown-linux-gnuabi64"
+
+CHOST=${CHOST_n32}
diff --git a/profiles/default/linux/mips/23.0/mipsel/n32/parent b/profiles/default/linux/mips/23.0/mipsel/n32/parent
new file mode 100644
index 000000000000..58de0a92430a
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/n32/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/mips/mipsel/mips64el/n32
diff --git a/profiles/default/linux/mips/23.0/mipsel/n32/systemd/eapi b/profiles/default/linux/mips/23.0/mipsel/n32/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/n32/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/mipsel/n32/systemd/parent b/profiles/default/linux/mips/23.0/mipsel/n32/systemd/parent
new file mode 100644
index 000000000000..44f88d3e2df0
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/n32/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/profiles/default/linux/mips/23.0/mipsel/n64/eapi b/profiles/default/linux/mips/23.0/mipsel/n64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/n64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/mipsel/n64/make.defaults b/profiles/default/linux/mips/23.0/mipsel/n64/make.defaults
new file mode 100644
index 000000000000..6413aabdf532
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/n64/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mipsel-unknown-linux-gnu"
+CHOST_n32="mips64el-unknown-linux-gnuabin32"
+CHOST_n64="mips64el-unknown-linux-gnuabi64"
+
+CHOST=${CHOST_n64}
diff --git a/profiles/default/linux/mips/23.0/mipsel/n64/parent b/profiles/default/linux/mips/23.0/mipsel/n64/parent
new file mode 100644
index 000000000000..ef8c3e992d72
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/n64/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/mips/mipsel/mips64el/n64
diff --git a/profiles/default/linux/mips/23.0/mipsel/n64/systemd/eapi b/profiles/default/linux/mips/23.0/mipsel/n64/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/n64/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/mipsel/n64/systemd/parent b/profiles/default/linux/mips/23.0/mipsel/n64/systemd/parent
new file mode 100644
index 000000000000..44f88d3e2df0
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/n64/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/profiles/default/linux/mips/23.0/mipsel/o32/eapi b/profiles/default/linux/mips/23.0/mipsel/o32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/o32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/mipsel/o32/make.defaults b/profiles/default/linux/mips/23.0/mipsel/o32/make.defaults
new file mode 100644
index 000000000000..e9cc91c33347
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/o32/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mipsel-unknown-linux-gnu"
+CHOST_n32="mips64el-unknown-linux-gnuabin32"
+CHOST_n64="mips64el-unknown-linux-gnuabi64"
+
+CHOST=${CHOST_o32}
diff --git a/profiles/default/linux/mips/23.0/mipsel/o32/parent b/profiles/default/linux/mips/23.0/mipsel/o32/parent
new file mode 100644
index 000000000000..f4b62c6e996d
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/o32/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/mips/mipsel/o32
diff --git a/profiles/default/linux/mips/23.0/mipsel/o32/systemd/eapi b/profiles/default/linux/mips/23.0/mipsel/o32/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/o32/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/mipsel/o32/systemd/parent b/profiles/default/linux/mips/23.0/mipsel/o32/systemd/parent
new file mode 100644
index 000000000000..44f88d3e2df0
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/o32/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/profiles/default/linux/mips/23.0/mipsel/parent b/profiles/default/linux/mips/23.0/mipsel/parent
new file mode 100644
index 000000000000..4d84ba7b9c08
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/parent
@@ -0,0 +1,2 @@
+..
+../../../../../arch/mips/mipsel
diff --git a/profiles/default/linux/mips/23.0/multilib/eapi b/profiles/default/linux/mips/23.0/multilib/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/multilib/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/multilib/n32/eapi b/profiles/default/linux/mips/23.0/multilib/n32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/multilib/n32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/multilib/n32/make.defaults b/profiles/default/linux/mips/23.0/multilib/n32/make.defaults
new file mode 100644
index 000000000000..2cc2bf3ea2aa
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/multilib/n32/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mips-unknown-linux-gnu"
+CHOST_n32="mips64-unknown-linux-gnuabin32"
+CHOST_n64="mips64-unknown-linux-gnuabi64"
+
+CHOST=${CHOST_n32}
diff --git a/profiles/default/linux/mips/23.0/multilib/n32/parent b/profiles/default/linux/mips/23.0/multilib/n32/parent
new file mode 100644
index 000000000000..c48bd8858ef8
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/multilib/n32/parent
@@ -0,0 +1,2 @@
+../..
+../../../../../../arch/mips/mips64/multilib/n32
diff --git a/profiles/default/linux/mips/23.0/multilib/n32/systemd/eapi b/profiles/default/linux/mips/23.0/multilib/n32/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/multilib/n32/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/multilib/n32/systemd/parent b/profiles/default/linux/mips/23.0/multilib/n32/systemd/parent
new file mode 100644
index 000000000000..44f88d3e2df0
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/multilib/n32/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/profiles/default/linux/mips/23.0/multilib/n64/eapi b/profiles/default/linux/mips/23.0/multilib/n64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/multilib/n64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/multilib/n64/make.defaults b/profiles/default/linux/mips/23.0/multilib/n64/make.defaults
new file mode 100644
index 000000000000..1399cfe601ff
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/multilib/n64/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mips-unknown-linux-gnu"
+CHOST_n32="mips64-unknown-linux-gnuabin32"
+CHOST_n64="mips64-unknown-linux-gnuabi64"
+
+CHOST=${CHOST_n64}
diff --git a/profiles/default/linux/mips/23.0/multilib/n64/parent b/profiles/default/linux/mips/23.0/multilib/n64/parent
new file mode 100644
index 000000000000..c77705fe7e43
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/multilib/n64/parent
@@ -0,0 +1,2 @@
+../..
+../../../../../../arch/mips/mips64/multilib/n64
diff --git a/profiles/default/linux/mips/23.0/multilib/o32/eapi b/profiles/default/linux/mips/23.0/multilib/o32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/multilib/o32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/multilib/o32/make.defaults b/profiles/default/linux/mips/23.0/multilib/o32/make.defaults
new file mode 100644
index 000000000000..0a835e38d25b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/multilib/o32/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mips-unknown-linux-gnu"
+CHOST_n32="mips64-unknown-linux-gnuabin32"
+CHOST_n64="mips64-unknown-linux-gnuabi64"
+
+CHOST=${CHOST_o32}
diff --git a/profiles/default/linux/mips/23.0/multilib/o32/parent b/profiles/default/linux/mips/23.0/multilib/o32/parent
new file mode 100644
index 000000000000..19367dfc91e9
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/multilib/o32/parent
@@ -0,0 +1,2 @@
+../..
+../../../../../../arch/mips/mips64/multilib/o32
diff --git a/profiles/default/linux/mips/23.0/multilib/parent b/profiles/default/linux/mips/23.0/multilib/parent
new file mode 100644
index 000000000000..107ec55840f4
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/multilib/parent
@@ -0,0 +1,2 @@
+..
+../../../../../arch/mips/mips64/multilib
diff --git a/profiles/default/linux/mips/23.0/musl/eapi b/profiles/default/linux/mips/23.0/musl/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/musl/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/eapi b/profiles/default/linux/mips/23.0/musl/mipsel/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/musl/mipsel/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/make.defaults b/profiles/default/linux/mips/23.0/musl/mipsel/make.defaults
new file mode 100644
index 000000000000..53daa27ad9fb
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/musl/mipsel/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Disable sandbox because its currently broken on mipsel-musl
+FEATURES="-sandbox"
diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/n64/eapi b/profiles/default/linux/mips/23.0/musl/mipsel/n64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/musl/mipsel/n64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/n64/make.defaults b/profiles/default/linux/mips/23.0/musl/mipsel/n64/make.defaults
new file mode 100644
index 000000000000..26dbb0e4c1dc
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/musl/mipsel/n64/make.defaults
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="mips64el-gentoo-linux-musl"
+CHOST_n64="${CHOST}"
+LIBDIR_n64="lib"
diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/n64/parent b/profiles/default/linux/mips/23.0/musl/mipsel/n64/parent
new file mode 100644
index 000000000000..e92fcf7cbf75
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/musl/mipsel/n64/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../arch/mips/mipsel/mips64el/n64
diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/o32/eapi b/profiles/default/linux/mips/23.0/musl/mipsel/o32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/musl/mipsel/o32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/o32/make.defaults b/profiles/default/linux/mips/23.0/musl/mipsel/o32/make.defaults
new file mode 100644
index 000000000000..d0dec15ac7be
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/musl/mipsel/o32/make.defaults
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="mipsel-gentoo-linux-musl"
+CHOST_o32="${CHOST}"
+LIBDIR_o32="lib"
diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/o32/parent b/profiles/default/linux/mips/23.0/musl/mipsel/o32/parent
new file mode 100644
index 000000000000..85db6caf16e5
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/musl/mipsel/o32/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../arch/mips/mipsel/o32
diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/parent b/profiles/default/linux/mips/23.0/musl/mipsel/parent
new file mode 100644
index 000000000000..f2bcf2737c18
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/musl/mipsel/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/mips/mipsel
diff --git a/profiles/default/linux/mips/23.0/musl/n64/eapi b/profiles/default/linux/mips/23.0/musl/n64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/musl/n64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/musl/n64/make.defaults b/profiles/default/linux/mips/23.0/musl/n64/make.defaults
new file mode 100644
index 000000000000..90dd88675350
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/musl/n64/make.defaults
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="mips64-gentoo-linux-musl"
+CHOST_n64="${CHOST}"
+LIBDIR_n64="lib"
diff --git a/profiles/default/linux/mips/23.0/musl/n64/parent b/profiles/default/linux/mips/23.0/musl/n64/parent
new file mode 100644
index 000000000000..0a2e2f270682
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/musl/n64/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/mips/mips64/n64
diff --git a/profiles/default/linux/mips/23.0/musl/o32/eapi b/profiles/default/linux/mips/23.0/musl/o32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/musl/o32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/musl/o32/make.defaults b/profiles/default/linux/mips/23.0/musl/o32/make.defaults
new file mode 100644
index 000000000000..4027a830450d
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/musl/o32/make.defaults
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="mips-gentoo-linux-musl"
+CHOST_o32="${CHOST}"
+LIBDIR_o32="lib"
diff --git a/profiles/default/linux/mips/23.0/musl/o32/parent b/profiles/default/linux/mips/23.0/musl/o32/parent
new file mode 100644
index 000000000000..6d4edaa24a38
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/musl/o32/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/mips/o32
diff --git a/profiles/default/linux/mips/23.0/musl/parent b/profiles/default/linux/mips/23.0/musl/parent
new file mode 100644
index 000000000000..9ef7663a23b6
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/musl/parent
@@ -0,0 +1,3 @@
+..
+../../../../../features/musl
+../../../../../features/wd40
diff --git a/profiles/default/linux/mips/23.0/n32/eapi b/profiles/default/linux/mips/23.0/n32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/n32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/n32/make.defaults b/profiles/default/linux/mips/23.0/n32/make.defaults
new file mode 100644
index 000000000000..2cc2bf3ea2aa
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/n32/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mips-unknown-linux-gnu"
+CHOST_n32="mips64-unknown-linux-gnuabin32"
+CHOST_n64="mips64-unknown-linux-gnuabi64"
+
+CHOST=${CHOST_n32}
diff --git a/profiles/default/linux/mips/23.0/n32/parent b/profiles/default/linux/mips/23.0/n32/parent
new file mode 100644
index 000000000000..ae0dc9302892
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/n32/parent
@@ -0,0 +1,2 @@
+..
+../../../../../arch/mips/mips64/n32
diff --git a/profiles/default/linux/mips/23.0/n32/systemd/eapi b/profiles/default/linux/mips/23.0/n32/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/n32/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/n32/systemd/parent b/profiles/default/linux/mips/23.0/n32/systemd/parent
new file mode 100644
index 000000000000..7e061533c151
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/n32/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/profiles/default/linux/mips/23.0/n64/eapi b/profiles/default/linux/mips/23.0/n64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/n64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/n64/make.defaults b/profiles/default/linux/mips/23.0/n64/make.defaults
new file mode 100644
index 000000000000..1399cfe601ff
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/n64/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mips-unknown-linux-gnu"
+CHOST_n32="mips64-unknown-linux-gnuabin32"
+CHOST_n64="mips64-unknown-linux-gnuabi64"
+
+CHOST=${CHOST_n64}
diff --git a/profiles/default/linux/mips/23.0/n64/parent b/profiles/default/linux/mips/23.0/n64/parent
new file mode 100644
index 000000000000..801102774c66
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/n64/parent
@@ -0,0 +1,2 @@
+..
+../../../../../arch/mips/mips64/n64
diff --git a/profiles/default/linux/mips/23.0/n64/systemd/eapi b/profiles/default/linux/mips/23.0/n64/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/n64/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/n64/systemd/parent b/profiles/default/linux/mips/23.0/n64/systemd/parent
new file mode 100644
index 000000000000..7e061533c151
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/n64/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/profiles/default/linux/mips/23.0/o32/eapi b/profiles/default/linux/mips/23.0/o32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/o32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/o32/make.defaults b/profiles/default/linux/mips/23.0/o32/make.defaults
new file mode 100644
index 000000000000..0a835e38d25b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/o32/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mips-unknown-linux-gnu"
+CHOST_n32="mips64-unknown-linux-gnuabin32"
+CHOST_n64="mips64-unknown-linux-gnuabi64"
+
+CHOST=${CHOST_o32}
diff --git a/profiles/default/linux/mips/23.0/o32/parent b/profiles/default/linux/mips/23.0/o32/parent
new file mode 100644
index 000000000000..347406129648
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/o32/parent
@@ -0,0 +1,2 @@
+..
+../../../../../arch/mips/o32
diff --git a/profiles/default/linux/mips/23.0/o32/systemd/eapi b/profiles/default/linux/mips/23.0/o32/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/o32/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/o32/systemd/parent b/profiles/default/linux/mips/23.0/o32/systemd/parent
new file mode 100644
index 000000000000..7e061533c151
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/o32/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/profiles/default/linux/mips/23.0/parent b/profiles/default/linux/mips/23.0/parent
new file mode 100644
index 000000000000..50be433109ef
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/parent
@@ -0,0 +1,2 @@
+..
+../../../../releases/23.0
diff --git a/profiles/default/linux/mips/23.0/split-usr/eapi b/profiles/default/linux/mips/23.0/split-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/eapi b/profiles/default/linux/mips/23.0/split-usr/mipsel/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/eapi b/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/n32/eapi b/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/n32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/n32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/n32/make.defaults b/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/n32/make.defaults
new file mode 100644
index 000000000000..b91472d0279c
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/n32/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mipsel-unknown-linux-gnu"
+CHOST_n32="mips64el-unknown-linux-gnuabin32"
+CHOST_n64="mips64el-unknown-linux-gnuabi64"
+
+CHOST=${CHOST_n32}
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/n32/parent b/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/n32/parent
new file mode 100644
index 000000000000..9dfde5b4bd8b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/n32/parent
@@ -0,0 +1,2 @@
+../..
+../../../../../../../../arch/mips/mipsel/mips64el/multilib/n32
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/n64/eapi b/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/n64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/n64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/n64/make.defaults b/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/n64/make.defaults
new file mode 100644
index 000000000000..6413aabdf532
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/n64/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mipsel-unknown-linux-gnu"
+CHOST_n32="mips64el-unknown-linux-gnuabin32"
+CHOST_n64="mips64el-unknown-linux-gnuabi64"
+
+CHOST=${CHOST_n64}
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/n64/parent b/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/n64/parent
new file mode 100644
index 000000000000..d21b9a398f83
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/n64/parent
@@ -0,0 +1,2 @@
+../..
+../../../../../../../../arch/mips/mipsel/mips64el/multilib/n64
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/o32/eapi b/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/o32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/o32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/o32/make.defaults b/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/o32/make.defaults
new file mode 100644
index 000000000000..e9cc91c33347
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/o32/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mipsel-unknown-linux-gnu"
+CHOST_n32="mips64el-unknown-linux-gnuabin32"
+CHOST_n64="mips64el-unknown-linux-gnuabi64"
+
+CHOST=${CHOST_o32}
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/o32/parent b/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/o32/parent
new file mode 100644
index 000000000000..74ed5d697921
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/o32/parent
@@ -0,0 +1,2 @@
+../..
+../../../../../../../../arch/mips/mipsel/mips64el/multilib/o32
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/parent b/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/parent
new file mode 100644
index 000000000000..03ad6889fa97
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/multilib/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../arch/mips/mipsel/mips64el/multilib
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/n32/eapi b/profiles/default/linux/mips/23.0/split-usr/mipsel/n32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/n32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/n32/make.defaults b/profiles/default/linux/mips/23.0/split-usr/mipsel/n32/make.defaults
new file mode 100644
index 000000000000..b91472d0279c
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/n32/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mipsel-unknown-linux-gnu"
+CHOST_n32="mips64el-unknown-linux-gnuabin32"
+CHOST_n64="mips64el-unknown-linux-gnuabi64"
+
+CHOST=${CHOST_n32}
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/n32/parent b/profiles/default/linux/mips/23.0/split-usr/mipsel/n32/parent
new file mode 100644
index 000000000000..bb8b11580750
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/n32/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../arch/mips/mipsel/mips64el/n32
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/n64/eapi b/profiles/default/linux/mips/23.0/split-usr/mipsel/n64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/n64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/n64/make.defaults b/profiles/default/linux/mips/23.0/split-usr/mipsel/n64/make.defaults
new file mode 100644
index 000000000000..6413aabdf532
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/n64/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mipsel-unknown-linux-gnu"
+CHOST_n32="mips64el-unknown-linux-gnuabin32"
+CHOST_n64="mips64el-unknown-linux-gnuabi64"
+
+CHOST=${CHOST_n64}
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/n64/parent b/profiles/default/linux/mips/23.0/split-usr/mipsel/n64/parent
new file mode 100644
index 000000000000..e92fcf7cbf75
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/n64/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../arch/mips/mipsel/mips64el/n64
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/o32/eapi b/profiles/default/linux/mips/23.0/split-usr/mipsel/o32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/o32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/o32/make.defaults b/profiles/default/linux/mips/23.0/split-usr/mipsel/o32/make.defaults
new file mode 100644
index 000000000000..e9cc91c33347
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/o32/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mipsel-unknown-linux-gnu"
+CHOST_n32="mips64el-unknown-linux-gnuabin32"
+CHOST_n64="mips64el-unknown-linux-gnuabi64"
+
+CHOST=${CHOST_o32}
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/o32/parent b/profiles/default/linux/mips/23.0/split-usr/mipsel/o32/parent
new file mode 100644
index 000000000000..85db6caf16e5
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/o32/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../arch/mips/mipsel/o32
diff --git a/profiles/default/linux/mips/23.0/split-usr/mipsel/parent b/profiles/default/linux/mips/23.0/split-usr/mipsel/parent
new file mode 100644
index 000000000000..f2bcf2737c18
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/mips/mipsel
diff --git a/profiles/default/linux/mips/23.0/split-usr/multilib/eapi b/profiles/default/linux/mips/23.0/split-usr/multilib/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/multilib/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/split-usr/multilib/n32/eapi b/profiles/default/linux/mips/23.0/split-usr/multilib/n32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/multilib/n32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/split-usr/multilib/n32/make.defaults b/profiles/default/linux/mips/23.0/split-usr/multilib/n32/make.defaults
new file mode 100644
index 000000000000..2cc2bf3ea2aa
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/multilib/n32/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mips-unknown-linux-gnu"
+CHOST_n32="mips64-unknown-linux-gnuabin32"
+CHOST_n64="mips64-unknown-linux-gnuabi64"
+
+CHOST=${CHOST_n32}
diff --git a/profiles/default/linux/mips/23.0/split-usr/multilib/n32/parent b/profiles/default/linux/mips/23.0/split-usr/multilib/n32/parent
new file mode 100644
index 000000000000..ec6ec650fa90
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/multilib/n32/parent
@@ -0,0 +1,2 @@
+../..
+../../../../../../../arch/mips/mips64/multilib/n32
diff --git a/profiles/default/linux/mips/23.0/split-usr/multilib/n64/eapi b/profiles/default/linux/mips/23.0/split-usr/multilib/n64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/multilib/n64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/split-usr/multilib/n64/make.defaults b/profiles/default/linux/mips/23.0/split-usr/multilib/n64/make.defaults
new file mode 100644
index 000000000000..1399cfe601ff
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/multilib/n64/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mips-unknown-linux-gnu"
+CHOST_n32="mips64-unknown-linux-gnuabin32"
+CHOST_n64="mips64-unknown-linux-gnuabi64"
+
+CHOST=${CHOST_n64}
diff --git a/profiles/default/linux/mips/23.0/split-usr/multilib/n64/parent b/profiles/default/linux/mips/23.0/split-usr/multilib/n64/parent
new file mode 100644
index 000000000000..9ccecd3f9529
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/multilib/n64/parent
@@ -0,0 +1,2 @@
+../..
+../../../../../../../arch/mips/mips64/multilib/n64
diff --git a/profiles/default/linux/mips/23.0/split-usr/multilib/o32/eapi b/profiles/default/linux/mips/23.0/split-usr/multilib/o32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/multilib/o32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/split-usr/multilib/o32/make.defaults b/profiles/default/linux/mips/23.0/split-usr/multilib/o32/make.defaults
new file mode 100644
index 000000000000..0a835e38d25b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/multilib/o32/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mips-unknown-linux-gnu"
+CHOST_n32="mips64-unknown-linux-gnuabin32"
+CHOST_n64="mips64-unknown-linux-gnuabi64"
+
+CHOST=${CHOST_o32}
diff --git a/profiles/default/linux/mips/23.0/split-usr/multilib/o32/parent b/profiles/default/linux/mips/23.0/split-usr/multilib/o32/parent
new file mode 100644
index 000000000000..396437c9e0da
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/multilib/o32/parent
@@ -0,0 +1,2 @@
+../..
+../../../../../../../arch/mips/mips64/multilib/o32
diff --git a/profiles/default/linux/mips/23.0/split-usr/multilib/parent b/profiles/default/linux/mips/23.0/split-usr/multilib/parent
new file mode 100644
index 000000000000..904cc5a93e9a
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/multilib/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/mips/mips64/multilib
diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/eapi b/profiles/default/linux/mips/23.0/split-usr/musl/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/musl/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/eapi b/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/make.defaults b/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/make.defaults
new file mode 100644
index 000000000000..53daa27ad9fb
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Disable sandbox because its currently broken on mipsel-musl
+FEATURES="-sandbox"
diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/n64/eapi b/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/n64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/n64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/n64/make.defaults b/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/n64/make.defaults
new file mode 100644
index 000000000000..26dbb0e4c1dc
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/n64/make.defaults
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="mips64el-gentoo-linux-musl"
+CHOST_n64="${CHOST}"
+LIBDIR_n64="lib"
diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/n64/parent b/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/n64/parent
new file mode 100644
index 000000000000..7ddcaf7ebefb
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/n64/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../arch/mips/mipsel/mips64el/n64
diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/o32/eapi b/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/o32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/o32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/o32/make.defaults b/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/o32/make.defaults
new file mode 100644
index 000000000000..d0dec15ac7be
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/o32/make.defaults
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="mipsel-gentoo-linux-musl"
+CHOST_o32="${CHOST}"
+LIBDIR_o32="lib"
diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/o32/parent b/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/o32/parent
new file mode 100644
index 000000000000..e0296df48f7b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/o32/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../arch/mips/mipsel/o32
diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/parent b/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/parent
new file mode 100644
index 000000000000..06ca5406ea73
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../arch/mips/mipsel
diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/n64/eapi b/profiles/default/linux/mips/23.0/split-usr/musl/n64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/musl/n64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/n64/make.defaults b/profiles/default/linux/mips/23.0/split-usr/musl/n64/make.defaults
new file mode 100644
index 000000000000..90dd88675350
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/musl/n64/make.defaults
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="mips64-gentoo-linux-musl"
+CHOST_n64="${CHOST}"
+LIBDIR_n64="lib"
diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/n64/parent b/profiles/default/linux/mips/23.0/split-usr/musl/n64/parent
new file mode 100644
index 000000000000..1490152882c9
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/musl/n64/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../arch/mips/mips64/n64
diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/o32/eapi b/profiles/default/linux/mips/23.0/split-usr/musl/o32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/musl/o32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/o32/make.defaults b/profiles/default/linux/mips/23.0/split-usr/musl/o32/make.defaults
new file mode 100644
index 000000000000..4027a830450d
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/musl/o32/make.defaults
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="mips-gentoo-linux-musl"
+CHOST_o32="${CHOST}"
+LIBDIR_o32="lib"
diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/o32/parent b/profiles/default/linux/mips/23.0/split-usr/musl/o32/parent
new file mode 100644
index 000000000000..4c02cb42398d
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/musl/o32/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../arch/mips/o32
diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/parent b/profiles/default/linux/mips/23.0/split-usr/musl/parent
new file mode 100644
index 000000000000..bd0ef6ecac62
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/musl/parent
@@ -0,0 +1,3 @@
+..
+../../../../../../features/musl
+../../../../../../features/wd40
diff --git a/profiles/default/linux/mips/23.0/split-usr/n32/eapi b/profiles/default/linux/mips/23.0/split-usr/n32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/n32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/split-usr/n32/make.defaults b/profiles/default/linux/mips/23.0/split-usr/n32/make.defaults
new file mode 100644
index 000000000000..2cc2bf3ea2aa
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/n32/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mips-unknown-linux-gnu"
+CHOST_n32="mips64-unknown-linux-gnuabin32"
+CHOST_n64="mips64-unknown-linux-gnuabi64"
+
+CHOST=${CHOST_n32}
diff --git a/profiles/default/linux/mips/23.0/split-usr/n32/parent b/profiles/default/linux/mips/23.0/split-usr/n32/parent
new file mode 100644
index 000000000000..b22762bc0309
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/n32/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/mips/mips64/n32
diff --git a/profiles/default/linux/mips/23.0/split-usr/n64/eapi b/profiles/default/linux/mips/23.0/split-usr/n64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/n64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/split-usr/n64/make.defaults b/profiles/default/linux/mips/23.0/split-usr/n64/make.defaults
new file mode 100644
index 000000000000..1399cfe601ff
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/n64/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mips-unknown-linux-gnu"
+CHOST_n32="mips64-unknown-linux-gnuabin32"
+CHOST_n64="mips64-unknown-linux-gnuabi64"
+
+CHOST=${CHOST_n64}
diff --git a/profiles/default/linux/mips/23.0/split-usr/n64/parent b/profiles/default/linux/mips/23.0/split-usr/n64/parent
new file mode 100644
index 000000000000..0a2e2f270682
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/n64/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/mips/mips64/n64
diff --git a/profiles/default/linux/mips/23.0/split-usr/o32/eapi b/profiles/default/linux/mips/23.0/split-usr/o32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/o32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/23.0/split-usr/o32/make.defaults b/profiles/default/linux/mips/23.0/split-usr/o32/make.defaults
new file mode 100644
index 000000000000..0a835e38d25b
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/o32/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST_o32="mips-unknown-linux-gnu"
+CHOST_n32="mips64-unknown-linux-gnuabin32"
+CHOST_n64="mips64-unknown-linux-gnuabi64"
+
+CHOST=${CHOST_o32}
diff --git a/profiles/default/linux/mips/23.0/split-usr/o32/parent b/profiles/default/linux/mips/23.0/split-usr/o32/parent
new file mode 100644
index 000000000000..6d4edaa24a38
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/o32/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/mips/o32
diff --git a/profiles/default/linux/mips/23.0/split-usr/parent b/profiles/default/linux/mips/23.0/split-usr/parent
new file mode 100644
index 000000000000..598ca888c8c2
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/split-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/split-usr
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 2dee6382c145..eda20d1574b5 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -206,6 +206,7 @@ app-alternatives/gzip:reference - Symlink to app-arch/gzip.
 app-alternatives/lex:flex - Symlink to sys-devel/flex.
 app-alternatives/lex:reflex - Symlink to sys-devel/reflex.
 app-alternatives/sh:bash - Symlink to app-shells/bash
+app-alternatives/sh:busybox - Symlink to sys-apps/busybox
 app-alternatives/sh:dash - Symlink to app-shells/dash
 app-alternatives/sh:ksh - Symlink to app-shells/ksh
 app-alternatives/sh:lksh - Symlink to lksh from app-shells/mksh
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 7eac097d0d64..6ea6a5222cc1 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-tor/Manifest b/sec-keys/openpgp-keys-tor/Manifest
index 46e6e56c408a..b32458a5fde2 100644
--- a/sec-keys/openpgp-keys-tor/Manifest
+++ b/sec-keys/openpgp-keys-tor/Manifest
@@ -10,5 +10,5 @@ DIST tor-B74417EDDF22AC9F9E90F49142E86A2A11F48D36.asc 17678 BLAKE2B b8e67ef2ecbe
 DIST tor-EF6E286DDA85EA2A4BA7DE684E2C6E8793298290.asc 25282 BLAKE2B de300d1d17009c636ee0090e26d88b7779ae56bfb00eb7602356bc0ac7a0f7b85c98f81b834409ba23e278e6895bdf3a3e0654df5436a363c9fdeda203050e57 SHA512 4b5d2ef8e5778201298517e20cbdbc8dbf8734872fed5fc162b3aa6897d0a96d193670da068e72dd25e4de0765e8b6ba18ed6dc72f2ed1e7b98a86a8e37dfd8b
 EBUILD openpgp-keys-tor-20210425.ebuild 782 BLAKE2B ea10311624f6b42315cd0693e2d6b14dbe968c1c4323ed4bc0dbcb9aa1099c57c6315d8ed4d627650cbf3bcc3c991d369b4185a67da731d2dae36545c8a841ae SHA512 54b8415fe2a4612c23fdc79d2715503cc2d71a7f88c51f07b1404d960403101fb01700bf497cbd3ab480686201bc023806d3bf7dc0505e213c94059c51bda934
 EBUILD openpgp-keys-tor-20220216.ebuild 1162 BLAKE2B 8116fa155adb81b326c1b2145ad3fad82eb6180ff5b88140e8a1bec78e8cc6f737b987df5fa5e39826ed23ffe1f0bc4d182e35899e888121b1930db70922cce0 SHA512 9cd8d738a4b93a1d48bc75b8cb9717e46c10b24bd51851d24ce9d14a6264510a4fc8ac7c7c264efc83dee921a0abe0bc4e45889da9e1569d9302a9bb2cbc59db
-EBUILD openpgp-keys-tor-20221213.ebuild 1193 BLAKE2B a2675afe29127e3a2b816d4093c41c3d7d8ed210aa5ee927bb43b51aeb70456d1633c207522033127b6866b041420db94cb2f4e256775fefa465eac48f10fbc3 SHA512 8b4329fafb03fa7990853aa6decb101221b4bf995a98c894d23f540d8a82ace0f4f3c8b16c0066f03995a0385f31bd2f1137858c029d80526a940b0107571fb4
+EBUILD openpgp-keys-tor-20221213.ebuild 1186 BLAKE2B 841d1bd90223d44be6d19665cbaa8a8094cb7333bb3486abc7fa8e2d5a80654e14e7fb74e849ced4504548e67a1db3e893a3ce28e4234c0b48cab5bc6d1614a5 SHA512 7f8c7bd097d3ea8bf3672ce469927743ae62f59a495fde4dc7fdbc61bc12bfe0416ea523961e8269184af01bbe6fe32dbff89b86343f4917ef53164b2599f23f
 MISC metadata.xml 244 BLAKE2B 8b44ad915c7470dba875443abdb9ebff369d6cbff7799e4c6e5e3086a6efe2c4e726d7cc9566cb100cf5495c2140536b37d7866fb714049a112e66250149bd4a SHA512 364def9dfdb2958b61f03be5cd88d8068a078e12879c0488429c7c31103533a13a22c19c4bd9e361d994b786f7ce6f18708d5dfd82ffc7b271811019c83f0c7a
diff --git a/sec-keys/openpgp-keys-tor/openpgp-keys-tor-20221213.ebuild b/sec-keys/openpgp-keys-tor/openpgp-keys-tor-20221213.ebuild
index ce29e33c1f39..0dd6bb210a87 100644
--- a/sec-keys/openpgp-keys-tor/openpgp-keys-tor-20221213.ebuild
+++ b/sec-keys/openpgp-keys-tor/openpgp-keys-tor-20221213.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 src_install() {
 	local files=( ${A} )
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 6c88fba4ed78..ce044dd0f923 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/hponcfg/Manifest b/sys-apps/hponcfg/Manifest
index 2bf39aa27569..0517a8f32430 100644
--- a/sys-apps/hponcfg/Manifest
+++ b/sys-apps/hponcfg/Manifest
@@ -1,10 +1,6 @@
-DIST hponcfg-4.6.0-0.i386.rpm 39344 BLAKE2B a1fb8c4237eae8caa90086b49dd89ad641c77663e0c98f82ec97724564437837223ea3acd15136aaf6c575e35923f2e804766c51179771aead9800ecae424cd1 SHA512 534e2d656349e34c539755d807456a671363640ca8dd6853787dbf7f2a594acb88478b59b2e21ca07b8c6f118f6ad3c2e0eb1ec072484db6a8fb707bd593e0e7
-DIST hponcfg-4.6.0-0.x86_64.rpm 44121 BLAKE2B 5fb073a0789380527066087a14e1806bd98a7ee76da18facbc578b0aff397a73df8a3236c22939bda4e8af19e3b6a03670947998c666fdd9b8e390a77be6d9e3 SHA512 830abe6816295fa7e0888e0848d707ab41510a9ea6dc17d01fd5de2fa56faf49af43ef6698aa379ac8baa6ab729262e77e209b90103ce67d45bf6f0b2d4df142
-DIST hponcfg-5.4.0-0.x86_64.rpm 59246 BLAKE2B 50979eec63121ad89fa2e13eb286236b1cd6fc02269ba93767a9cf19a7782aea570577f98cb307e75c73fcac1fc8bc8c281f21187be157cb816253751d263ed6 SHA512 55583acd1a9e5a639fe63ecff051af9676518130e431ba76a0cdbf2ba18f4b600aaae8388895631eb0b9be343e110b5fe39dc4ab844c3a2afef0bc601756c04c
 DIST hponcfg-5.5.0-0.x86_64.rpm 60092 BLAKE2B 8a81b1b0e3f0cd81e5a3861d1f7e0f5a07ed32cd0efac2c77d8c8b94666a44daf7cb289e53b1610cb5ea66782c256dce652f897f15370a2c7d129ffc6c47f6c1 SHA512 478b94f9a99be7f1cab10e909d33b804a0831159c5829dbdcfa78df02aa5fd9a140f0f036c2e9556e2ffb90ac85bf0efcfddc137665fd438c6379fa0eb43ce74
 DIST hponcfg-5.6.0-0.x86_64.rpm 60457 BLAKE2B 88ed71e20e7c7db28b0228974ed0ca41726d3b1f976005b211013028c9ca9a8704c26119c2a41525458e87515d06c57232d109d795fd9bb0096366f91d7523d7 SHA512 7685584ff9ab3f3f23ff77017de194ba935cbddee2ba8946299ed25399fd67ce58697fc754071ecf2c6e3f926a82da89307088cf8b721efd3667397025a73db7
-EBUILD hponcfg-4.6.0.0.ebuild 1214 BLAKE2B 81641e95bcf8eaae323e8a465bfbd524aaf544fa13b4535a83c8d69e8c484f5d74c97028e43481833b301002af8128fbbf4dd4f67c1882240a93a1ae2cdad04f SHA512 bbf4e33582cab5cbe33339537e9e66f2c6c7185f8447d25d51e08e3f873225d7252d019acfc7f17d78d932b283bf7f6af2a1912d952746921405daa02e69231b
-EBUILD hponcfg-5.4.0.0.ebuild 947 BLAKE2B 5e433cfbfc8f468656740ec1bfa24d99703d90312b1217e61cf504a37d38d18eaed1a9763707f9550268061d32ee904752caabf9eba25b2b909c15388fe22979 SHA512 b2e65d46faf05e6c90c1eca0bfe96ea3efbd8f79c908e659522cba6159afc9bfdc98ec80dd408d4fa15200256a4f40ffd07bdbf278f8ef6a4d6d42c61b0ea87c
 EBUILD hponcfg-5.5.0.0.ebuild 947 BLAKE2B 0856cfdb8d0e2cd6c36783759951cb2fa4e898706d6707e7f2e7a26b4cea9c4d307cd6cb0597cb90705fcad2db0e7b72a5540b7ceeed0e899fc0e0c8b7b40ea2 SHA512 31da07f1ec9cd69e5c63398c1656a81e70556b6a68c8fff152be26946a34b6c0df441f567ae6c29955129b4c481f13fe41275f664aa18ccebc2b809cf5430261
-EBUILD hponcfg-5.6.0.0.ebuild 948 BLAKE2B 76e3bdf08867b9e40723653b6df4590b3607a318e4fa7f874d1f6dbbe88b18ac5d8144d9f09747980e60f99e9c121f10fe89958b3d80a0a3c7fb7002c5c56eb7 SHA512 9f464b7d7b9134027d1a4c416266e63b94377c3293e733ddd8c484e78ca4ae03beda42a3411bd27862c8459979a8d3c18fe4df32872e16c740cd3e13d47c117b
+EBUILD hponcfg-5.6.0.0-r1.ebuild 900 BLAKE2B c61e9f3de219609c5e8bea863a6a04246926c2b52cf4c4df29ceb1d3b6a7dbff9c8b2da420624e4e7bcc8d39707f874e4514cfeb51f8c5d5d5dfa41e978ac913 SHA512 d3c5e2a20b6f9bd19921b2bd423637126cede70fd254ea7f39644642a734c27b952ba3026b43415f291ba3da989e4c6ed0917f12d3891e78f77484878df1f7d2
+EBUILD hponcfg-5.6.0.0.ebuild 947 BLAKE2B f916ec55f3e2c6f67f6ff913a42e454e4342ea0af549c6afc22cfe4855ffb862a179b39d8c43dcf347cd0f461b6521853473ce9d2c4ffede2181a8befa825413 SHA512 68cb28b27ff42a479615877f64859eb2290e88f9403b6c61fe80e06cbd3777a48c0dcd54e2fd98ae6675af516c2952d263a678d10b4c206a6e5545c3c0ce10fe
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-apps/hponcfg/hponcfg-4.6.0.0.ebuild b/sys-apps/hponcfg/hponcfg-4.6.0.0.ebuild
deleted file mode 100644
index d8e4a559205d..000000000000
--- a/sys-apps/hponcfg/hponcfg-4.6.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pax-utils rpm versionator
-
-MY_PV=$(replace_version_separator 3 '-')
-
-DESCRIPTION="HP Lights-Out Online Configuration Utility (HPONCFG)"
-HOMEPAGE="http://h20564.www2.hpe.com/hpsc/swd/public/detail?swItemId=MTX_5ab6295f49964f16a699064f29"
-SRC_URI="
-	amd64? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/6/x86_64/current/${PN}-${MY_PV}.x86_64.rpm )
-	x86? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/6/i686/current/${PN}-${MY_PV}.i386.rpm )"
-
-LICENSE="hpe"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="elibc_glibc? ( >sys-libs/glibc-2.14 )"
-
-S="${WORKDIR}"
-
-QA_PRESTRIPPED="/usr/sbin/hponcfg /usr/li.*/libcpqc.*"
-
-src_install() {
-	dosbin sbin/hponcfg
-
-	# When bumping, verify SONAME (scanelf -S libhponcfg64.so)!
-	if use amd64; then
-		newlib.so "${S}"/usr/lib64/libhponcfg64.so libcpqci64.so.3
-		dosym libcpqci64.so.3 /usr/$(get_libdir)/libhponcfg64.so
-	elif use x86; then
-		newlib.so "${S}"/usr/lib/libhponcfg.so libcpqci.so.3
-		dosym libcpqci.so.3 /usr/$(get_libdir)/libhponcfg.so
-	fi
-
-	dodoc "${S}"/usr/share/doc/hponcfg/*
-
-	pax-mark m "${D}"usr/sbin/hponcfg
-}
diff --git a/sys-apps/hponcfg/hponcfg-5.4.0.0.ebuild b/sys-apps/hponcfg/hponcfg-5.6.0.0-r1.ebuild
index 8afc8cddad42..d0ac235482e9 100644
--- a/sys-apps/hponcfg/hponcfg-5.4.0.0.ebuild
+++ b/sys-apps/hponcfg/hponcfg-5.6.0.0-r1.ebuild
@@ -1,22 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit pax-utils rpm
 
 MY_PV=$(ver_rs 3 '-')
 
 DESCRIPTION="HP Lights-Out Online Configuration Utility (HPONCFG)"
-HOMEPAGE="http://h20564.www2.hpe.com/hpsc/swd/public/detail?swItemId=MTX_5ab6295f49964f16a699064f29"
-SRC_URI="amd64? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/7/x86_64/current/${PN}-${MY_PV}.x86_64.rpm )"
+HOMEPAGE="https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-a00007610en_us"
+SRC_URI="https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/7/x86_64/current/${PN}-${MY_PV}.x86_64.rpm"
 
 LICENSE="hpe"
 SLOT="0"
-KEYWORDS="-* amd64"
-IUSE=""
+KEYWORDS="-* ~amd64"
 
-DEPEND=""
 RDEPEND="elibc_glibc? ( >sys-libs/glibc-2.14 )"
 
 S="${WORKDIR}"
diff --git a/sys-apps/hponcfg/hponcfg-5.6.0.0.ebuild b/sys-apps/hponcfg/hponcfg-5.6.0.0.ebuild
index 867b52259c96..65d9db612401 100644
--- a/sys-apps/hponcfg/hponcfg-5.6.0.0.ebuild
+++ b/sys-apps/hponcfg/hponcfg-5.6.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="amd64? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/7/x86_64/cur
 
 LICENSE="hpe"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 31ac45a1b635..19456ef188c6 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,6 +1,9 @@
 AUX texinfo-6.8-undo-gnulib-nonnul.patch 7627 BLAKE2B d8edefca829682e0bbebfecf1c97fd25874ecf0ec65228643c1a5d54558a22970ec2e6d532d37269fdb8a7359eb02c990b2c221591c8ececa3f17c6642c47516 SHA512 c6a482433af9a44e597ace4e92b6d5faf1c7aa6deaab7e474f4158769c31e4cf203f21d4697e071d29104b6b78ae06f353becc5da6aa1276ae9a3e39506a2af9
+AUX texinfo-7.0.1-info-groff-crash.patch 1668 BLAKE2B 8ef2d58d49dcd2372557f012237b4d8f3b4b6cbbe8a73745409868955458910647943eaf6bce67dbc659c959fdb8885c5f4bc2b9f521d4206a1c2788a0b2acde SHA512 4afded892571f4772b8ba9dcdd0fab9a9de6a119450f4dd6ce9031ca85612f0d5e0b39646da41d595563d9944bcb75872eb2530fc5266f928f171e4e95d6afbc
+AUX texinfo-7.0.1-lto-type-mismatch.patch 1154 BLAKE2B 852f3c217ee856747534410f8776dc7dc206d4bcfd1197cfe4b08a2ecc914710a588b33c54d226f01e8e7b8a4f64397946d11eaa8114197169382a521f574e14 SHA512 6dd8701ebe4065fffdbc63fb2f08baf9918c0716e06740864aa9b43bb0e0731d748471c5e93a6287004b7314e97d17f459220673d72373fd5f70ddc77539ec19
 DIST texinfo-6.8.tar.xz 4961528 BLAKE2B 0256dac5ba9c7f171c970644907b763f7a88fd9995111244df0458591aed1a0fe94c76045dde69f9138d65d6f780aae6869bbbc013f58e04ae7c62456b222bbb SHA512 0ff9290b14e4d83e32b889cfa24e6d065f98b2a764daf6b92c6c895fddbb35258398da6257c113220d5a4d886f7b54b09c4b117ca5eacfee6797f9bffde0f909
 DIST texinfo-7.0.1.tar.xz 4890348 BLAKE2B 9d61722e7ff8a71e05770552050cc861d778b9faa95f801e40d4353601a5692f01ad8e794dfb0e7b5b29efa2c701de4a76505732a806b0303b5c1fe0599816f1 SHA512 8e1616341fbbfe0cd90bd1b0452874c75b99d88dffe5f88c53fdc32f00d67c07c15c6c774b241e1f7507f0347314737e533854939c3be6334ca9feb9cd049009
 EBUILD texinfo-6.8.ebuild 1717 BLAKE2B 0ce639bd82dac4bcc580415852c093773954c2f33a811133fcb4ee8361e30935b40ba2796bfe807f848bbebe3acf5985fb549f11dfc6d90dbcb397ab0fc959ea SHA512 017f861563fe14381776c7fb62b79b8a99059e63d0f752a4b8dc71559ba57c6c56307ef751bea42b01c1afd3ebfface75c108be260f920f1a1fc6e3ffd72c40f
+EBUILD texinfo-7.0.1-r1.ebuild 1865 BLAKE2B 29598b7002b2cc2137031d4013b471943533fb559cc278d61590d1a7f4245019dbdc489640dfaf5bc3702e1c515615d64f0ebe176f373b31109bf0f41d32a94b SHA512 5f9abfc3c799e4e26b94a323bbf6a969f7c6eff5793a91e2c8b4cad50b21e79060cf8478c6df67c7a821fc8054feda66a0329a94aa56e4dedda80930c0b202c1
 EBUILD texinfo-7.0.1.ebuild 1765 BLAKE2B e3f5a92d0a214945414813167e2e35848cefb8f6359e71c01e75bf2e0a0663073aa0b847ba2afd31fee544dcf0adfcb19467ace9b066834d5888d5f0fa8a6c07 SHA512 94bd17b16fe0aee5f511750dcdeb937813f9fac837585edb63eab2ac2505eb265311ce4366b487f1254693449d20e89be35881f3c1b12d7ffbca109030a31683
 MISC metadata.xml 588 BLAKE2B 4e5549f1b07df4c081d2cc03691f0f8ba13c0f8f86807a7e5e87ea618080895a2714f169e9a1294226e71207ed88586a027092a328ab618f417ae3a74ac2586b SHA512 343c287a2c0c7f7bcbd5a40373c0aebe718d46042947abcb8364fed0aeb6dd7e585e9d226ef5bfb0084074d085510e802faf3a3c08b1489ed35556b6c14d1015
diff --git a/sys-apps/texinfo/files/texinfo-7.0.1-info-groff-crash.patch b/sys-apps/texinfo/files/texinfo-7.0.1-info-groff-crash.patch
new file mode 100644
index 000000000000..d215ae719ccb
--- /dev/null
+++ b/sys-apps/texinfo/files/texinfo-7.0.1-info-groff-crash.patch
@@ -0,0 +1,44 @@
+https://git.savannah.gnu.org/cgit/texinfo.git/commit/?h=release/7.0&id=86185e7cedafd011376d0efb6f7e028231dbf641
+
+From 86185e7cedafd011376d0efb6f7e028231dbf641 Mon Sep 17 00:00:00 2001
+From: Gavin Smith <gavinsmith0123@gmail.com>
+Date: Mon, 12 Dec 2022 18:40:01 +0000
+Subject: =?UTF-8?q?*=20info/util.c=20(text=5Fbuffer=5Ficonv):=20Correctly?=
+ =?UTF-8?q?=20update=20arguments=20for=20iconv=20in=20loop.=20=20Crash=20f?=
+ =?UTF-8?q?or=20"info=20groff"=20reported=20by=20Jakub=20Wilk=20via=20Hilm?=
+ =?UTF-8?q?ar=20Preu=C3=9Fe=20<hille42@web.de>.?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+--- a/info/util.c
++++ b/info/util.c
+@@ -350,11 +350,11 @@ text_buffer_iconv (struct text_buffer *buf, iconv_t iconv_state,
+   size_t iconv_ret;
+   size_t extra_alloc = 1;
+ 
+-  outptr = text_buffer_base (buf) + text_buffer_off (buf);
+-  out_bytes_left = text_buffer_space_left (buf);
+-
+   while (1)
+     {
++      outptr = text_buffer_base (buf) + text_buffer_off (buf);
++      out_bytes_left = text_buffer_space_left (buf);
++
+       iconv_ret = iconv (iconv_state, inbuf, inbytesleft,
+                          &outptr, &out_bytes_left);
+       if (iconv_ret != (size_t) -1)
+@@ -362,10 +362,7 @@ text_buffer_iconv (struct text_buffer *buf, iconv_t iconv_state,
+ 
+       /* If we ran out of space, allocate more and try again. */
+       if (errno == E2BIG)
+-        {
+-          text_buffer_alloc (buf, (extra_alloc *= 4));
+-          out_bytes_left = text_buffer_space_left (buf);
+-        }
++        text_buffer_alloc (buf, (extra_alloc *= 4));
+       else
+         break; /* let calling code deal with it */
+     }
+-- 
+cgit v1.1
diff --git a/sys-apps/texinfo/files/texinfo-7.0.1-lto-type-mismatch.patch b/sys-apps/texinfo/files/texinfo-7.0.1-lto-type-mismatch.patch
new file mode 100644
index 000000000000..a8906195480e
--- /dev/null
+++ b/sys-apps/texinfo/files/texinfo-7.0.1-lto-type-mismatch.patch
@@ -0,0 +1,31 @@
+https://git.savannah.gnu.org/cgit/texinfo.git/patch/?id=952b333db85f88fb51c7e051b15063d95cf7dfc8
+https://lists.gnu.org/archive/html/bug-texinfo/2022-12/msg00034.html
+https://bugs.gentoo.org/863713
+
+From 952b333db85f88fb51c7e051b15063d95cf7dfc8 Mon Sep 17 00:00:00 2001
+From: Gavin Smith <gavinsmith0123@gmail.com>
+Date: Sat, 10 Dec 2022 01:10:38 +0000
+Subject: =?UTF-8?q?*=20install-info/install-info.c=20(error):=20Declare=20?=
+ =?UTF-8?q?as=20static=20to=20avoid=20clash=20with=20error=20function=20fr?=
+ =?UTF-8?q?om=20glibc,=20called=20from=20gnulib.=20Report=20from=20Sam=20J?=
+ =?UTF-8?q?ames=20<sam@gentoo.org>=20and=20suggested=20solution=20from=20A?=
+ =?UTF-8?q?rsen=20Arsenovi=C4=87=20<arsen@aarsen.me>.?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+--- a/install-info/install-info.c
++++ b/install-info/install-info.c
+@@ -214,7 +214,9 @@ vdiag (const char *fmt, const char *diagtype, va_list ap)
+   putc ('\n', stderr);
+ }
+ 
+-void
++/* declare as static to avoid clash with glibc error function, called from
++   gnulib. */
++static void
+ error (const char *fmt, ...)
+ {
+   va_list ap;
+-- 
+cgit v1.1
diff --git a/sys-apps/texinfo/texinfo-7.0.1-r1.ebuild b/sys-apps/texinfo/texinfo-7.0.1-r1.ebuild
new file mode 100644
index 000000000000..ac7dbea1ee77
--- /dev/null
+++ b/sys-apps/texinfo/texinfo-7.0.1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: if your package uses the texi2dvi utility, it must depend on the
+# virtual/texi2dvi package to pull in all the right deps.  The tool is not
+# usable out-of-the-box because it requires the large tex packages.
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU info program and utilities"
+HOMEPAGE="https://www.gnu.org/software/texinfo/"
+
+if [[ $(ver_cut 3) -ge 90 ]] ; then
+	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="nls +standalone static"
+
+RDEPEND="
+	!=app-text/tetex-2*
+	>=sys-libs/ncurses-5.2-r2:=
+	virtual/perl-Data-Dumper
+	virtual/perl-Encode
+	standalone? ( >=dev-lang/perl-5.8.1 )
+	!standalone?  ( >=dev-lang/perl-5.8.1:= )
+	nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( >=sys-devel/gettext-0.19.6 )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-lto-type-mismatch.patch
+	"${FILESDIR}"/${P}-info-groff-crash.patch
+)
+
+src_prepare() {
+	default
+
+	if use prefix ; then
+		sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die
+		touch doc/{texi2dvi,texi2pdf,pdftexi2dvi}.1
+	fi
+}
+
+src_configure() {
+	# Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions
+	# bug #622576
+	local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}"
+	local -x PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}"
+
+	use static && append-ldflags -static
+
+	local myeconfargs=(
+		--cache-file="${S}"/config.cache
+		$(use_enable nls)
+		$(use_enable !standalone perl-xs)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 6872dc933b90..05130dc6907b 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 29ba0e054430..944f03ed7640 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -15,4 +15,5 @@ DIST torque-6.0.4-gcc7.patch 50412 BLAKE2B 43748e9bfd3811abdfeb56f93dd517fcb07a6
 DIST torque-6.0.4-gh-20170829.tar.gz 6182495 BLAKE2B f9156ae4ffe388a7f3fa0df142e5f2d48c16fd7b8c148a3a80cd1c977eb0c1ef4a455da275f993100867be043422526ed05c53734e707851083d6d23ee1a2cc4 SHA512 8f1101adb89e06617de501f7956e126633b78b495baeb7980d3c534d34537cc604a3cf0a7c23c48eb2554b26cc13672b0e00c75d0f722d63ac4d42d57388ed94
 DIST torque-6.0.4-glibc-2.34-pthread.patch.bz2 6266 BLAKE2B b5175b8bfe2deabe86b067f1ec5269770bcf096c6e875b8fd3cb404a976c9cb550ddcbe6e4ebb1e59c96044f95c285519e70fb4acd5c9db86c3050093ff65b3b SHA512 dbe0bd6000c140e1fe9b36e55c1a844701406a563bd178b9c972793b83282f3434e2160da5280666dcc0934c2b88e36c0a2b9518ffe7695b23d73fce0a07388d
 EBUILD torque-6.0.4-r2.ebuild 5952 BLAKE2B 8ab710b71a0f7911949a0560aa263675e6e7820bdf23b046646bcbe692a3f26c03f67671ae5e742db0a093f2564ce5beaabe094849534f785e0a11ece9a4114d SHA512 609c0ef88c19549f3b60f7cdb3c3963ac78d48aa814dfe00155bfd75d71f0f735fe32ea8a898338343a120a32c2e804e12d3e097a11c528b51764afcdec7dd5b
-MISC metadata.xml 787 BLAKE2B 9bc7fb21c260237df6dcb50fe453f4113be2927bbe7b9ebf3816cb734e0d5a52f9acac84834c3e38fd268823137f5ec0b7a971b0eb2f28e6c44fc3c8213d648b SHA512 8ba369e5064bb9b15cb8ef4c6265723e5cacf5ebb5efda56949b5e69b824d6b366adb0ab6a3f1d4ccd316999b13b6bdf98936af3f5528451a864a1f9b6314cb3
+EBUILD torque-6.0.4-r3.ebuild 5999 BLAKE2B 1054daf54b14a3407cf3196294458a8e6d005de58b2c9e47eed2b9aa61a856fb1c49d376e4473d70674e0b65ed646b5d53a264bd0489aaaa7a747672bce8cd6f SHA512 d438900d1e73c2544fb919d32d8665a7bb511d70e02bfb64d9eb95380856e2de724c4b4a4adedba444f820aacdbf2a16cd70f743be15eddc488368e178039bed
+MISC metadata.xml 854 BLAKE2B 77be0da422efef3efbe4a151f45b82f3cc5efdb2da91345bd245d23b1b3f93e8e9bbfff40c7aa4ab149a66574f8113360bf6cce8f630fa3ff17bbcf7a580c896 SHA512 a296b3a82abc530aff7672cf70fe06b26c61dff95476ca33a6692fb7cb5fabaa3873e6e1666721b8066ff524273ea6ebf20681a8418e849f94995b4493d4496f
diff --git a/sys-cluster/torque/metadata.xml b/sys-cluster/torque/metadata.xml
index afd1ec84a4a9..4ce5f5914612 100644
--- a/sys-cluster/torque/metadata.xml
+++ b/sys-cluster/torque/metadata.xml
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cluster@gentoo.org</email>
-    <name>Gentoo Cluster Project</name>
-  </maintainer>
-  <use>
-    <flag name="autorun">Enable the AUTORUN_JOBS codebase</flag>
-    <flag name="cgroups">Enable pbs_mom to use linux cgroups to isolate jobs</flag>
-    <flag name="cpusets">Enable pbs_mom to utilize linux cpusets if available</flag>
-    <flag name="munge">Enable authentication via munge</flag>
-    <flag name="nvidia">Enable management of Nvidia GPUs</flag>
-    <flag name="quickcommit">Enable the QUICKCOMMIT codebase</flag>
-    <flag name="server">Enable compilation of pbs_server and pbs_sched</flag>
-  </use>
+	<maintainer type="project">
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
+	<use>
+		<flag name="autorun">Enable the AUTORUN_JOBS codebase</flag>
+		<flag name="cgroups">Enable pbs_mom to use linux cgroups to isolate jobs</flag>
+		<flag name="cpusets">Enable pbs_mom to utilize linux cpusets if available</flag>
+		<flag name="munge">Enable authentication via munge</flag>
+		<flag name="nvidia">Enable management of Nvidia GPUs</flag>
+		<flag name="quickcommit">Enable the QUICKCOMMIT codebase</flag>
+		<flag name="server">Enable compilation of pbs_server and pbs_sched</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">adaptivecomputing/torque</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-cluster/torque/torque-6.0.4-r3.ebuild b/sys-cluster/torque/torque-6.0.4-r3.ebuild
new file mode 100644
index 000000000000..6799806e325e
--- /dev/null
+++ b/sys-cluster/torque/torque-6.0.4-r3.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_COMMIT="6a0b37f85c7d644e9217cbab1542792d646f59a6"
+inherit autotools flag-o-matic linux-info toolchain-funcs
+
+DESCRIPTION="Resource manager and queuing system based on OpenPBS"
+HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
+SRC_URI="
+	https://github.com/adaptivecomputing/torque/archive/${MY_COMMIT}.tar.gz -> ${P}-gh-20170829.tar.gz
+	https://dev.gentoo.org/~juippis/distfiles/tmp/torque-6.0.4-gcc7.patch
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-glibc-2.34-pthread.patch.bz2
+"
+
+LICENSE="torque-2.5"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="autorun cgroups cpusets +crypt doc munge nvidia quickcommit server +syslog tk"
+
+DEPEND_COMMON="
+	sys-libs/zlib
+	sys-libs/readline:0=
+	dev-libs/libxml2
+	dev-libs/boost
+	cpusets? ( sys-apps/hwloc:= )
+	munge? ( sys-auth/munge )
+	nvidia? ( >=x11-drivers/nvidia-drivers-275 )
+	tk? (
+		dev-lang/tk:0=
+		dev-lang/tcl:0=
+	)
+	syslog? ( virtual/logger )
+	!!games-util/qstat
+"
+
+# libncurses.so is only needed for configure check on readline
+DEPEND="
+	${DEPEND_COMMON}
+	sys-libs/ncurses:*
+	!!sys-cluster/slurm
+"
+
+RDEPEND="
+	${DEPEND_COMMON}
+	crypt? ( net-misc/openssh )
+	!crypt? ( net-misc/netkit-rsh )
+	!dev-libs/uthash
+"
+
+# Torque should depend on dev-libs/uthash but that's pretty much impossible
+# to patch in as they ship with a broken configure such that files referenced
+# by the configure.ac and Makefile.am are missing.
+# http://www.supercluster.org/pipermail/torquedev/2014-October/004773.html
+
+S="${WORKDIR}"/${PN}-6a0b37f85c7d644e9217cbab1542792d646f59a6
+
+PATCHES=(
+	"${DISTDIR}"/${P}-gcc7.patch
+	"${FILESDIR}"/${PN}-6.0.3-fix-emptystring-comparison.patch
+	"${FILESDIR}"/${P}-no-openssl.patch
+	"${FILESDIR}"/${P}-error_buf_overflow_prevent.patch
+	"${WORKDIR}"/${P}-glibc-2.34-pthread.patch
+	"${FILESDIR}"/${P}-pthreads-deux.patch
+)
+
+pkg_setup() {
+	PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/${PN}}"
+
+	# Find a Torque server to use.  Check environment, then
+	# current setup (if any), and fall back on current hostname.
+	if [[ -z "${PBS_SERVER_NAME}" ]]; then
+		if [ -f "${EROOT}/${PBS_SERVER_HOME}/server_name" ]; then
+			PBS_SERVER_NAME="$(<${EROOT}/${PBS_SERVER_HOME}/server_name)"
+		else
+			PBS_SERVER_NAME=$(hostname -f)
+		fi
+	fi
+
+	if use cpusets || use cgroups; then
+		if ! use kernel_linux; then
+			einfo
+			elog "    Torque currently only has support for cpusets and cgroups in linux."
+			elog "Assuming you didn't really want this USE flag and ignoring its state."
+			einfo
+		else
+			linux-info_pkg_setup
+			if ! linux_config_exists || ! linux_chkconfig_present CPUSETS; then
+				einfo
+				elog "    Torque support for cpusets will require that you recompile"
+				elog "your kernel with CONFIG_CPUSETS enabled."
+				einfo
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	# We install to a valid location, no need to muck with ld.so.conf
+	# --without-loadlibfile is supposed to do this for us...
+	sed -i '/mk_default_ld_lib_file || return 1/d' buildutils/pbs_mkdirs.in || die
+	eautoreconf
+}
+
+src_configure() {
+	append-cflags "-fpermissive"
+
+	# Force Bash for configure as there's a lot of issues with configure.ac and such here
+	CONFIG_SHELL="${BROOT}/bin/bash" econf \
+		$(use_enable tk gui) \
+		$(use_enable tk tcl-qstat) \
+		$(use_enable syslog) \
+		$(use_enable server) \
+		--disable-drmaa \
+		$(use_enable munge munge-auth) \
+		$(use_enable nvidia nvidia-gpus) \
+		$(usex crypt "--with-rcp=scp" "--with-rcp=mom_rcp") \
+		$(usex kernel_linux $(use_enable cpusets cpuset) --disable-cpuset) \
+		$(usex kernel_linux $(use_enable cgroups) --disable-cgroups) \
+		$(use_enable autorun) \
+		$(use_enable quickcommit) \
+		--with-server-home=${PBS_SERVER_HOME} \
+		--with-environ=/etc/pbs_environment \
+		--with-default-server=${PBS_SERVER_NAME} \
+		--disable-gcc-warnings \
+		--disable-silent-rules \
+		--with-tcp-retry-limit=2 \
+		--without-loadlibfile
+}
+
+src_compile() {
+	# The .c files are C++, and $(CC) is misused.
+	emake CC="$(tc-getCXX)"
+}
+
+src_install() {
+	local dir
+
+	DOCS=( CHANGELOG README.* Release_Notes )
+	use doc && DOCS+=( doc/admin_guide.ps doc/*.pdf )
+
+	default
+
+	# The build script isn't alternative install location friendly,
+	# So we have to fix some hard-coded paths in tclIndex for xpbs* to work
+	for file in $(find "${ED}" -iname tclIndex); do
+		sed \
+			-e "s/${ED//\// }/ /" \
+			-i "${file}" || die
+	done
+
+	for dir in $(find "${ED}/${PBS_SERVER_HOME}" -type d); do
+		keepdir "${dir#${ED}}"
+	done
+
+	if use server; then
+		newinitd "${FILESDIR}"/pbs_server-init.d-munge pbs_server
+		newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched
+	fi
+
+	newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom
+	newconfd "${FILESDIR}"/${PN}-conf.d-munge ${PN}
+	newinitd "${FILESDIR}"/trqauthd-init.d trqauthd
+	newenvd "${FILESDIR}"/${PN}-env.d 25${PN}
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	if [[ -f "${EROOT}/etc/pbs_environment" ]]; then
+		cp "${EROOT}/etc/pbs_environment" "${ED}"/etc/pbs_environment || die
+	fi
+
+	if use server && [[ -f "${EROOT}/${PBS_SERVER_HOME}/server_priv/nodes" ]]; then
+		cp \
+			"${EROOT}/${PBS_SERVER_HOME}/server_priv/nodes" \
+			"${ED}/${PBS_SERVER_HOME}/server_priv/nodes" || die
+	fi
+
+	echo "${PBS_SERVER_NAME}" > "${ED}${PBS_SERVER_HOME}/server_name" || die
+
+	# Fix up the env.d file to use our set server home.
+	sed \
+		-e "s:/var/spool/${PN}:${PBS_SERVER_HOME}:g" \
+		-i "${ED}"/etc/env.d/25${PN} || die
+
+	if use munge; then
+		sed -i 's,\(PBS_USE_MUNGE=\).*,\11,' "${ED}"/etc/conf.d/${PN} || die
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog "If this is the first time torque has been installed, then you are not"
+		elog "ready to start the server.  Please refer to the documentation located at:"
+		elog "http://docs.adaptivecomputing.com/torque/${PV//./-}/adminGuide/torquehelp.htm#topics/torque/1-installConfig/initializeConfigOnServer.htm"
+	fi
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index b1c0d104910a..ae04cdfb076d 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 578ea5262166..35493658804e 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,6 +1,8 @@
 DIST crossdev-20220909.tar.xz 29480 BLAKE2B 9c3ef9d9b8f13c81f9d2e21f8914158c04035a105ee1ac90ba30cb23a69744c9c6959bbcfd2e50d29144fc79937e5e585054d2eedfb2ced65a88467e509243be SHA512 86e8900a13095b7b12b00d739d28e2921f98818cd62daccfe6d750ce02113d0ef2d5e470b500bbfb80a9cf8f05b2a13882ac9963c3f1a4e1b7454bc1201df183
 DIST crossdev-20221227.tar.xz 29548 BLAKE2B c990ca8494db59e0dd5792fc0327d50424a816e2584eb1aff369185ce56c5cba00db783300d5eda709944df92da2679df792c6b090f9ebfb21dc65e63dccd779 SHA512 e5ae34234d6527f792ed30747f962afff9920cf85e449671651a9bf5726bce7b5cf4009d3be2e0965732857420de0937a5d7c78e61025e7f437d95a15cb56685
+DIST crossdev-20221228.tar.xz 29568 BLAKE2B 0458a338a872a27058240c816abfcf9116703d18b687da0050213f834d5aba5df87552e16999fca7d0340aab5b8738ee0edb6ccfb656579b99f20357c077e326 SHA512 16d9d72f74c3b0d6c587c16eb8bea405c7c8eb3effc59fac55027d02348db2e10aacd9098b6f42479574a014783022737325acfaf63031e430fdf90391fa574b
 EBUILD crossdev-20220909.ebuild 883 BLAKE2B eac24bd668c81ef156ed0f51ed782249785a44c5fc4ab7f8960e13b7b4fba68c2d511be86a3c6ba661fbc8f067bc2d0ed684c4e5ba1531706d15c5fb1dc56492 SHA512 9e673283dfa83e0b8a988d2ed71c95bdd6102de15a27c3d3d1d6247a2ddb867f03ad64ad559c1056983b9fdd004853048ddc3453f899e7c3cd93b4b92e176937
 EBUILD crossdev-20221227-r1.ebuild 857 BLAKE2B 2be1472a076f1731cf4ba22c0730795c740892b17360f68ac53970c15d5f4ae0eb129f80f8a263f4a73c61546ad8edc4de9d316eb3fa2e397d37420511371cf1 SHA512 8974a9315193fe03ab3cea7aa7689eadb44ef02c2f694fe54463164dd69f88f6ea4127e1e03714783601af9e9e722102873bd15c4e57f7b8dbd5ae34f9754bab
+EBUILD crossdev-20221228.ebuild 857 BLAKE2B 2be1472a076f1731cf4ba22c0730795c740892b17360f68ac53970c15d5f4ae0eb129f80f8a263f4a73c61546ad8edc4de9d316eb3fa2e397d37420511371cf1 SHA512 8974a9315193fe03ab3cea7aa7689eadb44ef02c2f694fe54463164dd69f88f6ea4127e1e03714783601af9e9e722102873bd15c4e57f7b8dbd5ae34f9754bab
 EBUILD crossdev-99999999.ebuild 857 BLAKE2B 2be1472a076f1731cf4ba22c0730795c740892b17360f68ac53970c15d5f4ae0eb129f80f8a263f4a73c61546ad8edc4de9d316eb3fa2e397d37420511371cf1 SHA512 8974a9315193fe03ab3cea7aa7689eadb44ef02c2f694fe54463164dd69f88f6ea4127e1e03714783601af9e9e722102873bd15c4e57f7b8dbd5ae34f9754bab
 MISC metadata.xml 491 BLAKE2B 92c9cbc3f52be1f863dfcadca6504f1bf0a22dd6a0fe958d0407be1a00acbcf4ea591e4bb84b9d654df87039b2ead8fd3557839078f70c001f1c101ae78e71c4 SHA512 bb7c32d398a5486565c5c317509881bcfbf9da17ce3fecb562c34c8a4e432dc96ff4f53f0784ee37eda4a868ad9d764d864cffc1f052ff449cf39ed9d5419d59
diff --git a/sys-devel/crossdev/crossdev-20221228.ebuild b/sys-devel/crossdev/crossdev-20221228.ebuild
new file mode 100644
index 000000000000..a3a84da996ad
--- /dev/null
+++ b/sys-devel/crossdev/crossdev-20221228.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+if [[ ${PV} == "99999999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git"
+else
+	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
+		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo Cross-toolchain generator"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	>=sys-apps/portage-2.1
+	app-shells/bash
+	sys-apps/gentoo-functions
+"
+BDEPEND="app-arch/xz-utils"
+
+src_install() {
+	default
+
+	if [[ ${PV} == "99999999" ]] ; then
+		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
+	fi
+}
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index f407c72212bb..a9c667babd76 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,4 +1,6 @@
 DIST gcc-config-2.8.tar.xz 17968 BLAKE2B aa34e681ef0c86bb846d89b816b46276f5c7c32974c785a9611a903a4fe165c997a34664abe17aa4d8720a96f194054e5d8c371a6c9270b1c235d7539094436c SHA512 5e91df44fb7782b9ad41ed06fbd53f74868c059f892c6c2b8195ebaa899905dd9f502562887f1a3765dd6b61698e956d01c6fa6f97a535cf16e26e70fcd902ba
+DIST gcc-config-2.9.tar.xz 18032 BLAKE2B 6ee4d89a7fc2c211cb2ce0f6b0802ac300b30deccf6e54cd80a548d6e2e878097ad93cb0174485df8611780cf29e0c3c7590f726409f369a92c6d780db5c167f SHA512 11fa782699ffcca38eee9ef3ca8dbdfdda68459bdad80ca3378ae07e0ee7c114a494c3362e05dc39d69d9770808f2b97bc682aec49e3c3483e7ba0c4498d57f3
 EBUILD gcc-config-2.8.ebuild 1671 BLAKE2B e02d37cb1ce4b15e7bf315c3998db51e5b444a17c84a2b012315fcfba583d8ff3bdd622a83d97cb857069e59992013085a5e1e037b16e3498cdbfe1f1c99ca4c SHA512 efb4e4d37dcdfed5a92d00920fdd71ad13b7bef6784b2798981bb8b97a55cf572aefd02553d4c0ff6088df0cd68dfb5af2dd85a5b8be9f5d26316a3acb855a16
+EBUILD gcc-config-2.9.ebuild 1679 BLAKE2B 07b599672153259777e9d2cd67066378bb1bc5725487d84e71958b2b34cd059e8c04227a2b8ec52c732313356594c7c5bc05fd39979f9b08c3a038d90840e037 SHA512 99b1269318b5fbd6f44b48a9712871578c5758939cb88f0d808d89b55cbc20cec683e12fa39672a30575cba224e62fd4850bc981c058d74cbf37581e87399805
 EBUILD gcc-config-9999.ebuild 1679 BLAKE2B 07b599672153259777e9d2cd67066378bb1bc5725487d84e71958b2b34cd059e8c04227a2b8ec52c732313356594c7c5bc05fd39979f9b08c3a038d90840e037 SHA512 99b1269318b5fbd6f44b48a9712871578c5758939cb88f0d808d89b55cbc20cec683e12fa39672a30575cba224e62fd4850bc981c058d74cbf37581e87399805
 MISC metadata.xml 533 BLAKE2B 09d7ad23670553dc578f92d35dddd92b9421d7ef75e8920498bb16e451cce64a626a7479ece4c1ae1f8d7b67b5cd79c7033d0cf87cd48a788639b6f746fda5cc SHA512 ce12b8cbbe543ee3a1f51cd06c577ec5e99f48863445053858f36ae50ea68e1100da598dd44cef787de0cce8ad392350f95e7fd9071b70aa488a0d31cce7e22c
diff --git a/sys-devel/gcc-config/gcc-config-2.9.ebuild b/sys-devel/gcc-config/gcc-config-2.9.ebuild
new file mode 100644
index 000000000000..7ff12f007e38
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-2.9.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git"
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Utility to manage compilers"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+cc-wrappers +native-symlinks"
+
+RDEPEND=">=sys-apps/gentoo-functions-0.10"
+
+_emake() {
+	emake \
+		PV="${PVR}" \
+		SUBLIBDIR="$(get_libdir)" \
+		USE_CC_WRAPPERS="$(usex cc-wrappers)" \
+		USE_NATIVE_LINKS="$(usex native-symlinks)" \
+		TOOLCHAIN_PREFIX="${CHOST}-" \
+		"$@"
+}
+
+src_compile() {
+	_emake
+}
+
+src_install() {
+	_emake DESTDIR="${D}" install
+}
+
+pkg_postinst() {
+	# Do we have a valid multi ver setup ?
+	local x
+	for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
+		gcc-config ${x}
+	done
+
+	# USE flag change can add or delete files in /usr/bin worth recaching
+	if [[ ! ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow update all
+	fi
+
+	if ! has_version "sys-devel/gcc[gcj(-)]" && [[ -x "${EROOT}"/usr/bin/gcj ]] ; then
+		# Warn about obsolete /usr/bin/gcj for bug #804178
+		ewarn "Obsolete GCJ wrapper found: ${EROOT}/usr/bin/gcj!"
+		ewarn "Please delete this file unless you know it is needed (e.g. custom gcj install)."
+		ewarn "If you have no idea what this means, please delete the file:"
+		ewarn " rm ${EROOT}/usr/bin/gcj"
+	fi
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-12-29 02:14:02 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-12-29 02:14:02 +0000
commit	a493ba7d75043e8e649ee8d6d4942c1f4b31d1c5 (patch)
tree	d9aef2725cb8f60bd6f5a47afa9778eb94114793
parent	d7ef5a07f47da6898dcb2d1503790c59b0470571 (diff)