16 files changed, 627 insertions, 2 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 11f1b6e2dcf8..8bed6a6205bb 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index f5d0d308f964..2e387640c4d6 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -15,7 +15,12 @@ DIST cmake-3.24.2-SHA-256.txt 1646 BLAKE2B 3c48226c96844c5ddd8567637a61eca697425
 DIST cmake-3.24.2-SHA-256.txt.asc 833 BLAKE2B fe6a3caa3db7b6be186e49ee5d86706f2cda9a45858bc964be5407f577195d0af74c10e66ea30faa0a35280f1c9f927732f9cc7fcb9dae8e521882955b6ef617 SHA512 a0fa1a002f2f23e8b3b8fb2689905ac618ca423b96f904bee172d6a62e6fb0c0a46394ce57474be9c9810e1d09abf3b192f595cb0e92d5c62d11b60f0c572b82
 DIST cmake-3.24.2-docs.tar.xz 492188 BLAKE2B 64e0d69ce8e739e6622b0cfde8956cb2bf67f9bf412b8d98afa1657bd30d8a2a1cf874e6422c78c222199616aac85d472ef398c83da29d5d64516384e9ed69aa SHA512 d0ef81dfe37ac2a225fe795fd3e6780e3b8fd5caa472a14ff8d036917172efd13126897c7a2a78d8269aa20e4f35c7b9be7bed14ecbfb24df332c332a4ff16c4
 DIST cmake-3.24.2.tar.gz 10396126 BLAKE2B fcfdbbce94ce6cdb3fa478afe591bc63ba25104a32edc3dd9395d7b6bd16e222f41428ef4f9982061d6d1e69b10efbc2a33cc9df4573400612b4b756b80ec348 SHA512 6f0e8e29bf0336f555ba72c4d83f35d820f8a5159cc999d48795dc57a6627b4ee3966dda84ca97d39906e35dd476ea00cf80023672cc0fad862e2996194c0674
+DIST cmake-3.24.3-SHA-256.txt 1646 BLAKE2B 739503a16c2e333c9b05a3232e2dcc56105f6933414a4a2054a582b9cf53a12c2b1a37d2189077cbcd138b8cc2828ef1819ab0fc74ded926ef0df7c7ea8c79e1 SHA512 b670acc21b98d1da22b31743f83ba10d6dbfda60341457a02639ee6f15d50462ddcd90b5992eff275d77e7cce6f074aff72abd95c539d18f191682ad87d7884e
+DIST cmake-3.24.3-SHA-256.txt.asc 833 BLAKE2B f8797072c2d30facfbbebc972c68cd1a6510331e63c67e6b665bd97dd9013e354bab68e03d578698d2f9e50c173ff8e1cac40751c7a3645be294a717f4bfee3a SHA512 bc67eaf6dba935df85ae3d7c37600259b032579813b275087332d5cc4c72dd6bdf44762260729a15f237f69f772670291bb2f2dcc4b155fb17112e0e8fa01d6b
+DIST cmake-3.24.3-docs.tar.xz 492156 BLAKE2B 92edd031189673c46e8e13a5e1200917734b918651dc01d982c25602e48cd5d5f014fa8563bdc79b3d09d90ef07a52c9d5a570a5181c59c233ba5bf450cdd5df SHA512 75806743fca976098b9b7ee777c494478142ab5686dc8ccb18510b5938c7e88cf8b3bc47321022f55f33c04bb0a7f549d70be8c765d1ec143467e679c8863132
+DIST cmake-3.24.3.tar.gz 10399876 BLAKE2B 24e2ff8cf4f63ba182dd305c14367fa0163f6187da84f7ec10b1ad6241c7df5b48f329b67ba5f7b5d3b644cba89c7adb848a3ae7196bf5b4dbfaedf178dba250 SHA512 57edf2a8c1c9edeed7fd11271083f333d940b31e0e909d9c71671465961559c505e4e22f36e68bfe1a40a01eb05fe94bc8d37b062f9be613f959f864207e3764
 EBUILD cmake-3.23.3.ebuild 7786 BLAKE2B 5157538dc24bf0f62f89c532d5cefa4725687e875780d10da41ac4c0f7c52e5f9008b8428c40da4a01ca1babc61a6fdde8656572dba67acff515e1477a789c7b SHA512 bad1b24104f29b4997800b775989a82bd5d4d7e3f26382a595f16021b98cd096ac345b4cbe5d67b7a243157d3c1dd0301594673192e06ce02579abd16827a3a2
 EBUILD cmake-3.24.2.ebuild 8809 BLAKE2B ead6e18dc3b681108680c13cde096e898cb0cfb0afddb85c52596dc8df0b5e2b7553889d6de59e53eec0fc76e27d4240355c6e9af7eeb2780af7e2f72d394896 SHA512 9131ae15daeffc6570fe433ce18de40237a7663fc9a45dc8fd91801f442b2a0eb91b55ab611e00c6db2c15726c7b7c484615d002b65ab22cc7f987e00767e148
+EBUILD cmake-3.24.3.ebuild 8817 BLAKE2B 06ac24772d2c04132c85a6b6823771eaf1c1b44d6bc77ac891a0b29725d57576e4c23ca54ee7ae54ff6cf20f403909b6f890fe469fca6d5a8a2e350524f8dec6 SHA512 c945fa714a256b0a3e6d8ea713b55ea0f914f37d6776428bb89fd30c0341711130c5bf795f8c8ec3e6c4c9c103be8e93737b86e6528b6d1efe301cb600d40a84
 EBUILD cmake-9999.ebuild 8817 BLAKE2B 06ac24772d2c04132c85a6b6823771eaf1c1b44d6bc77ac891a0b29725d57576e4c23ca54ee7ae54ff6cf20f403909b6f890fe469fca6d5a8a2e350524f8dec6 SHA512 c945fa714a256b0a3e6d8ea713b55ea0f914f37d6776428bb89fd30c0341711130c5bf795f8c8ec3e6c4c9c103be8e93737b86e6528b6d1efe301cb600d40a84
 MISC metadata.xml 456 BLAKE2B 2dc475cae4d2f65744e25381b1e4fe8b6399225380d0f9fa81870813221d180b1c4b538c3f9249f80e921a1db8afab7071db206898fdec294372811dc456d1f5 SHA512 347c1e13f459dfb9bec9d52ce556526eb74e6c432ff28aed28f05dc17bba17934fff1ce2fc27765b390bb55aaa7b02d0800939eb4382eba6c4b85a62ec136f5a
diff --git a/dev-util/cmake/cmake-3.24.3.ebuild b/dev-util/cmake/cmake-3.24.3.ebuild
new file mode 100644
index 000000000000..9491df325a39
--- /dev/null
+++ b/dev-util/cmake/cmake-3.24.3.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${CMAKE_DOCS_PREBUILT:=1}
+
+CMAKE_DOCS_PREBUILT_DEV=sam
+CMAKE_DOCS_VERSION=$(ver_cut 1-3)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+CMAKE_DOCS_USEFLAG="+doc"
+
+# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
+# ... but seems fine as of 3.22.3?
+# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
+	toolchain-funcs virtualx xdg-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+if [[ ${PV} == 9999 ]] ; then
+	CMAKE_DOCS_PREBUILT=0
+
+	EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
+	inherit git-r3
+else
+	SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+	if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )"
+	fi
+
+	if [[ ${PV} != *_rc* ]] ; then
+		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
+		inherit verify-sig
+
+		SRC_URI+=" verify-sig? (
+			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
+			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
+		)"
+
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
+	fi
+fi
+
+[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="CMake"
+SLOT="0"
+IUSE="${CMAKE_DOCS_USEFLAG} emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/libarchive-3.3.3:=
+	app-crypt/rhash
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/jsoncpp-1.9.2-r2:0=
+	>=dev-libs/libuv-1.10.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( >=app-editors/emacs-23.1:* )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND+="
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+	test? ( app-arch/libarchive[zstd] )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# Prefix
+	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
+
+	# Handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
+	# Next patch needs to be reworked
+	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+	# Respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
+
+	# upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# disable running of cmake in bootstrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+		|| die "Bootstrap failed"
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then
+		default
+	else
+		cd "${DISTDIR}" || die
+
+		# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
+		verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
+		verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
+
+		cd "${WORKDIR}" || die
+
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Disable Xcode hooks, bug #652134
+		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
+			Source/CMakeLists.txt || die
+		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
+			-e '/cmGlobalXCodeGenerator.h/d' \
+			Source/cmake.cxx || die
+
+		# Disable isysroot usage with GCC, we've properly instructed
+		# where things are via GCC configuration and ldwrapper
+		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
+			Modules/Platform/Apple-GNU-*.cmake || die
+		# Disable isysroot usage with clang as well
+		sed -i -e '/_SYSROOT_FLAG/d' \
+			Modules/Platform/Apple-Clang.cmake || die
+		# Don't set a POSIX standard, system headers don't like that, #757426
+		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmLoadCommandCommand.cxx \
+			Source/cmStandardLexer.h \
+			Source/cmSystemTools.cxx \
+			Source/cmTimestamp.cxx
+		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmStandardLexer.h
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+	if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	# ODR warnings, bug #858335
+	# https://gitlab.kitware.com/cmake/cmake/-/issues/20740
+	filter-lto
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+		-DBUILD_TESTING=$(usex test)
+	)
+	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	# Fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CMakeOnly.AllFindModules: pthread issues
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    RunCMake.CompilerLauncher: also requires fortran
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+	#        it can't find a deb package that owns libc
+	#    TestUpload, which requires network access
+	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
+	local myctestargs=(
+		--output-on-failure
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
+	)
+
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 79f2ada82593..a79316ed46b5 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,7 +1,9 @@
 AUX glslang-1.3.224-Fix-cmake-file-install-dir.patch 13162 BLAKE2B fb58095f7f9c136e3d1aeacb0d7e0a1ddc4d8972a160f8e31e7542526ae9eed9c1acb07dc1bf160e58f8df2582420b9df4532c0aae723729293b0fa5b4bc24df SHA512 8eb4cf63767d83219b56996477521da067f06e0d9db52c8a5a7c842e28f988935181cacb5727795c33fc75ec81d6085c6d30f0498ed4f1a8c3e6fbe33c1cc7be
 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
 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.ebuild 815 BLAKE2B 5e6986adf59b9c16a8f7792d3cb5317bf5f98b0afdcc8aa6046a3eb3cdd136ed715dde7acc5ed2854ba0064f433f4047f034558f7cc4371bd6cfc4e898a32f64 SHA512 5d935aa37f345e8008d735208ebf4e8a14de4fafbd0cd46675f2cb23068ae8781ca9c60a43783283d775bcf9dfa72ccd99b7283d0600e74f947d9b78907afc4c
 EBUILD glslang-9999.ebuild 815 BLAKE2B 5e6986adf59b9c16a8f7792d3cb5317bf5f98b0afdcc8aa6046a3eb3cdd136ed715dde7acc5ed2854ba0064f433f4047f034558f7cc4371bd6cfc4e898a32f64 SHA512 5d935aa37f345e8008d735208ebf4e8a14de4fafbd0cd46675f2cb23068ae8781ca9c60a43783283d775bcf9dfa72ccd99b7283d0600e74f947d9b78907afc4c
 MISC metadata.xml 330 BLAKE2B c3874bbe807a8dd1a55897feadfc0a89e4cb806441390ee7e7cc317f3b533a08338a669834122ede89cefd9b6532d789aece2c29fcc6cdfc7f76a81bf382192b SHA512 1c591a28214fb76334171e4a49c8ac302b6f174f265749ad005f2503df1312e8303c92a68248775ed3db98d65107471f9cfc8cfb758c89261f283711beaac764
diff --git a/dev-util/glslang/glslang-1.3.231.ebuild b/dev-util/glslang/glslang-1.3.231.ebuild
new file mode 100644
index 000000000000..a87aaeeb9345
--- /dev/null
+++ b/dev-util/glslang/glslang-1.3.231.ebuild
@@ -0,0 +1,28 @@
+# 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"
+
+LICENSE="BSD"
+SLOT="0"
+
+BDEPEND="${PYTHON_DEPS}"
+
+# Bug 698850
+RESTRICT="test"
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 6ab1dd1712d3..d6f84cd84a84 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -2,8 +2,10 @@ AUX meson-0.63-xtools-support.patch 1136 BLAKE2B 7600b29f1c4accbf33ca587b848566d
 DIST meson-0.62.2.tar.gz 2038542 BLAKE2B 51446cd348f3e8681a61ebecf95f5aafcafd90654e3c86d87ee2b68239237bd889b667f3c6543faba7d4b98d7e0ed73d96c6a988913e5262d3b9611b80ff8db2 SHA512 4089588701f0f702eb3b794e0ede78b99f13ec7545d1a7470c7bfd6a857de59673684a543928dd578402578c53f38365a3a59e3e29022fd30a525353818a4195
 DIST meson-0.63.2.tar.gz 2063397 BLAKE2B 765ef8994168bb149cce4dbbbdab4a5531b1c1119db5dace1a66c2728241830c7de075d586187d3f987fcc99e4181176a5910da56552ba735dda110a641d2541 SHA512 770d8d82502c5cd419123e09f6a445d2cbaea4463c5fa79f1497c868bf5defc5e5779a6e550ef5fcf75d57322d2b25b61574f4df0cbf001c4325c6abdbbc30b4
 DIST meson-0.63.3.tar.gz 2067612 BLAKE2B aa6052330f15aa6b1f64598a60075ea3b245ba4b53d65e760670fd526e3e462c110f95e710a83f91ab32f316fdb66dff1783c79ea832ed11d263fe0a3304eaa8 SHA512 6855b2bfe05d592419bfeaf4346c3d1079319f14de995109c09a7e5e9770cef829f66d659553337b3e54ca0dd6c497bccd4abef720f299173077b664d905864b
+DIST meson-0.64.0rc2.tar.gz 2091707 BLAKE2B 7c02770adbc010abf6536ba4dd09a2a14a74be260bfb6bcffd71db2225eada4ede530ce93d6d6014a1155a659d9b3631bc5828ace4bbfaadf7586002d3b517ce SHA512 d32b0b449e671bcbaf02b9156f5d75f569465f54ea1760ffe110e3087e327aa6420ee16eb74b75d1a38001c971cfd5d7f503892a6c038e2726cea4428bdee8bd
 EBUILD meson-0.62.2.ebuild 2848 BLAKE2B 0f1794a5141c01af083d614e9acd9d37461a0ffc68f71d33177bf934efe1261c260c1518e502552193d45814529335e9a98ba1ceb78349cf243bcdbe6eb3b12d SHA512 d333739fa3d7557cf9e84950004c1539c072ce43a3dcd88bd1409af4961ab2a37cf2989ed34fd0c6e80bf79d66a53f0e7e9d550e5e802d8b70ecc7f54a3dcd68
 EBUILD meson-0.63.2-r1.ebuild 2947 BLAKE2B 9a65ea044fa4c3c8dc8b26e98f1859364597d336ccb7c58d78fad3048abbabbb6c8a722351a8a4e6704f3935c6dac84a2386498e635fad2d690b852c719faec1 SHA512 0c9a751013f170417ad67a87903c537ca5b28422e5529fc1235f5fe2777df6cfd92a4c6b4a179287e4766283946342cacd6011a3a106b0bc9dfc2bc66c01d629
 EBUILD meson-0.63.3.ebuild 2955 BLAKE2B ce83a122ad852be0032506fdde5a0948ce56fc94acb61f84002dfece2c36320040fbae9c4ced3f37023bac0fcf97c9d391c5286d2401a941ff7d0f2e786f2703 SHA512 abaa87cd7153c900120c1dcdffec5ea4232128a6848a7f5cdb736b07f906bd28dd6942b5bea39f9841f7be2c087c9ddd7cbb0cf3cb519e5a5731d0b0f1e5ccdd
-EBUILD meson-9999.ebuild 2955 BLAKE2B ce83a122ad852be0032506fdde5a0948ce56fc94acb61f84002dfece2c36320040fbae9c4ced3f37023bac0fcf97c9d391c5286d2401a941ff7d0f2e786f2703 SHA512 abaa87cd7153c900120c1dcdffec5ea4232128a6848a7f5cdb736b07f906bd28dd6942b5bea39f9841f7be2c087c9ddd7cbb0cf3cb519e5a5731d0b0f1e5ccdd
+EBUILD meson-0.64.0_rc2.ebuild 2993 BLAKE2B 8de951e68e2e639bee2c67537ed1d0ba59143a12b1dc79baedd91ed106d5ace14bd78ea0050b75eec0f23d0ce9a59b827a3b2d225fbf518a4476b3d7de29ed39 SHA512 3d04983da5cdd69caade1c6235409099cd8aa9e37ee2c7f10f21456276d6b515a4f85ec8801596f3ca1477e3ac6cf8bc2189d1a49e905a15c7f0ad7a83b1bb08
+EBUILD meson-9999.ebuild 2993 BLAKE2B 8de951e68e2e639bee2c67537ed1d0ba59143a12b1dc79baedd91ed106d5ace14bd78ea0050b75eec0f23d0ce9a59b827a3b2d225fbf518a4476b3d7de29ed39 SHA512 3d04983da5cdd69caade1c6235409099cd8aa9e37ee2c7f10f21456276d6b515a4f85ec8801596f3ca1477e3ac6cf8bc2189d1a49e905a15c7f0ad7a83b1bb08
 MISC metadata.xml 480 BLAKE2B 5d3a0af4d84e497dcc2ccd5eb680e898beda896d5c37dc71fcaad2fe63f436f758d356990a5bca06baee9d265389b6e7084daec90d13c004f5523df4d0badbff SHA512 748f91fc17a18302ad0892d458e8e59650ab23dd3db5e83da85cfbca03d7932633c37b16f039faa12d87f6e4ec75a7a7fe4cc22f17328e61d57d99b073b6df3f
diff --git a/dev-util/meson/meson-0.64.0_rc2.ebuild b/dev-util/meson/meson-0.64.0_rc2.ebuild
new file mode 100644
index 000000000000..9bcc50e7e8c8
--- /dev/null
+++ b/dev-util/meson/meson-0.64.0_rc2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2016-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit git-r3
+else
+	MY_P=${P/_/}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+	if [[ ${PV} != *_rc* ]] ; 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
+fi
+
+inherit bash-completion-r1 distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		dev-util/ninja
+		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
+		virtual/pkgconfig
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.63-xtools-support.patch
+)
+
+python_prepare_all() {
+	local disable_unittests=(
+		# ASAN and sandbox both want control over LD_PRELOAD
+		# https://bugs.gentoo.org/673016
+		-e 's/test_generate_gir_with_address_sanitizer/_&/'
+
+		# ASAN is unsupported on some targets
+		# https://bugs.gentoo.org/692822
+		-e 's/test_pch_with_address_sanitizer/_&/'
+
+		# https://github.com/mesonbuild/meson/issues/7203
+		-e 's/test_templates/_&/'
+
+		# Broken due to python2 wrapper
+		-e 's/test_python_module/_&/'
+	)
+
+	sed -i "${disable_unittests[@]}" unittests/*.py || die
+
+	# Broken due to python2 script created by python_wrapper_setup
+	rm -r "test cases/frameworks/1 boost" || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	(
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		# 'test cases/unit/73 summary' expects 80 columns
+		export COLUMNS=80
+
+		# If JAVA_HOME is not set, meson looks for javac in PATH.
+		# If javac is in /usr/bin, meson assumes /usr/include is a valid
+		# JDK include path. Setting JAVA_HOME works around this broken
+		# autodetection. If no JDK is installed, we should end up with an empty
+		# value in JAVA_HOME, and the tests should get skipped.
+		export JAVA_HOME=$(java-config -O 2>/dev/null)
+
+		# Call python3 instead of EPYTHON to satisfy test_meson_uninstalled.
+		python3 run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+
+	insinto /usr/share/zsh/site-functions
+	doins data/shell-completions/zsh/_meson
+
+	dobashcomp data/shell-completions/bash/meson
+}
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index f2e31397c003..9bcc50e7e8c8 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -13,7 +13,10 @@ else
 	MY_P=${P/_/}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+	if [[ ${PV} != *_rc* ]] ; 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
 fi
 
 inherit bash-completion-r1 distutils-r1 toolchain-funcs
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 4a7611fe652c..8eb1ac79925a 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,4 +1,6 @@
 DIST spirv-headers-1.3.224.tar.gz 436938 BLAKE2B a0b1ddeb89a20a9ab3fa9dc0af9574a207fba2b7ff0e588678b33e1d773c19d09ce828980f9bd7956a94d1d7b6f1f138b3b9d48b45b7b307c6ebc37962f8f8ee SHA512 fbf776a3ef1db2e7b33067b3f36c1d4189ff3d89b73058374c5020c048931f88b798b84a89209b2bee419afa56fbf9bfe9df6a7387198778b8f23e79597cb057
+DIST spirv-headers-1.3.231.tar.gz 439643 BLAKE2B 034f3ff56a36dbd62290980f55ead654af209eb23359b541b6d6de72f8c6dbd67d7e0ca5c64f0e2b2f29077a19b224909c507d373a17b76010862df3222e8a08 SHA512 227d0ae49d3095813cb48b5657858df4caebfc4c711b5d8b1d358f4b37f40b482d4cc7ca4d91cb029c32c8ba6af73221ba0fa02724e795a46dc324f2bc832ff9
 EBUILD spirv-headers-1.3.224.ebuild 490 BLAKE2B c201f868fb03e46dee492548ac8d1997912eace7559d041dab2d15b8a7b5c46285d906930df30dfb2e629a1f89a9be2605aa0ec53719cfdd20edd0e6fd607726 SHA512 4a8e6249a2909bb240faab351d9f5a205c22281ec595ef151eccb5a0250a9c3cb7ad4902d998f59bff7b1a7a9a963063ef6e95f2a88f13942865a6c856ef6961
+EBUILD spirv-headers-1.3.231.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.231.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.231.ebuild
new file mode 100644
index 000000000000..d2781b9e4327
--- /dev/null
+++ b/dev-util/spirv-headers/spirv-headers-1.3.231.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 abf9ec3601ad..f8a0e31f7639 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,4 +1,6 @@
 DIST spirv-tools-1.3.224.tar.gz 3033611 BLAKE2B 806c1de27d0c8dac4991dbff321fb8f62647b25b5c87d66b2f924449599e37e85ace876b848afc2e16e42f943f413e0eb759983cce95d826952809974dd9ac7d SHA512 1265db4c15d4d6c6fcb201bc958386e9c910386a82ff595b5d5f84dc03f6ab7f70f67fd59a90ffa92533b02d809305334c06228b869151cbcfdee529e90e7bbc
+DIST spirv-tools-1.3.231.tar.gz 3044417 BLAKE2B f59afde3ec653e9ed0e8c43814e2ec8e9e379d3872c5f277215948d57ff4dc29374525e42fb5cace08d59c8322c28a9077c3573691242c5aaf4b057865ed7cf1 SHA512 d38ca24b9316e9e878f56e63a08ee40d7cae5aa947546f4d9e789d71b81d0f551fcafacce09d59e9874e284705f55f98e5fdc0acc27ec429fab02f9762e47952
 EBUILD spirv-tools-1.3.224.ebuild 1220 BLAKE2B a3b228a72c7b083ac0cc7fd79b4807c15ef2a1c8ce95f063ed7363bdfd18cc0fe69aa33562eb8cdf0191964acf678260605a75c70041cfaf319f3e3fbee122c2 SHA512 2876f5f2b8a2cca96ce2816eb3ae813fac348d9b771ee6bae0f916f72ab13caf45c46a306c2977c43c7ab9db985e23f65bda0abff181d2b589a43e561f151376
+EBUILD spirv-tools-1.3.231.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.231.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.231.ebuild
new file mode 100644
index 000000000000..0e9cb686acc2
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-1.3.231.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/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index e807f6c64fd7..5e7fa0dad474 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-headers-1.3.224.tar.gz 1521365 BLAKE2B 08e6e1badb473dfb760e20ee8a60f83cd288f33c4ad136026d2aecf474e1da13008691453886ee092e87cbd2ebbbbcf6bfcdff963276bdc8464521e07551ffa2 SHA512 856d80869267ba9c934400313cca1f9af67c1169974d70d21aed7469a39bf6d1821a95072a81edf8cdd463a62d766d478ee1c28bfc0f17a45b55ebd1634b9984
+DIST vulkan-headers-1.3.231.tar.gz 1691630 BLAKE2B 321ad1d472a80ec31e0bbc80e8eb79ef831a385415e216b2ddf83014fcf4c3fda804fb8d085be10b35bd9454ab42cada4bf3d7f25d3d854cd607f7afd8ace906 SHA512 3d460c2e768de02f8bf5ad2963c4c75c4efe03be3d6a5a752c54676307fc2913fd765c7955bee4da42a9f9c64c20b984ffde805c3561b4e97d2b4120049e88ab
 EBUILD vulkan-headers-1.3.224.ebuild 629 BLAKE2B 1bd403ce0eefd80fce8a633e99222321bfd5cbd6cc29ad5d53e22c94aa04214f850be41d314d396696f64ae1d360cc2cfaac878c2bf5f2cd03b41bf715a649d6 SHA512 7916ac21e93195e7ffab10a2def2d905ba91aaec0cf0f63992028d48ccf332f65ccb4948a5b4cd12260d217c3c08f892423b466efe5367319b3676ffac217f8e
+EBUILD vulkan-headers-1.3.231.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.231.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.231.ebuild
new file mode 100644
index 000000000000..591287d773f0
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-1.3.231.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 bc97f3162ef3..f9896043fb19 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-tools-1.3.224.tar.gz 868481 BLAKE2B 464e923f1bd7f72b0c9fab1ba6afa0aa179355f0ebd17c4cd6eeaf84b61efde61c60ce982d0eb081f88a64659dc5676eba77b9782e00df9d9214594806699d98 SHA512 89d2fddaaa710c78020e03b133c947afd79e9bfd1b4de711e5ac8f3e3bd5486e75960dc5a5cb7722ec55a6973233ca8a438e19627b59aaacad1c54040fdd6acb
+DIST vulkan-tools-1.3.231.tar.gz 876613 BLAKE2B 5c57e5f1f101d79b2bc57a7033a438c470db0d089beaeafa69865f95f14a55c0f71fcc0fb0dea1d898ddcdb80364abb883805e6b60f488a2b5b56bb42cffd4e9 SHA512 b6b1404e3d77e85c5f5d7e111193503e9b2a409a506692a862fcfc01a57d3ee5c6410f47dc7175175b817a1f0e9af62b7a99934c33c68f90babd698aeaeb0b8f
 EBUILD vulkan-tools-1.3.224.ebuild 1946 BLAKE2B 8112a58006428329551368ecc8e628b030a5c9d10b7038266a7e6643009c46b0132719c1deab56d9f8c4c58ebe716f5a979df40e4b99d592089550d1392a158e SHA512 f22187590f9f5702d52e58d5e3658233a769e9cd355a092b722cdd9039d939313f8b151716a233ae74969a29098ae878f3aab69bbf2f9ccb3a54b20b5e40cd8a
+EBUILD vulkan-tools-1.3.231.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.231.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.231.ebuild
new file mode 100644
index 000000000000..8a1f2672d510
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.3.231.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
+}