17 files changed, 212 insertions, 43 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index b35c10b32bc2..df85139cb5a7 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 0699572b99a5..e6e59a90f610 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,4 +1,6 @@
 DIST glslang-1.3.216.tar.gz 3537750 BLAKE2B 0eddc7be8a4499a283b941b51aefec5bfa3d555b8f44408f33a6993db1bea96b6dfeedb093d64117ef4ffca6ad264ea5968492af642fc2b0563bb43eff241cb8 SHA512 4ab3953df2e881e4eb923307d6ec906daaa1786a1ad1b4d7d6713d63599c8f7cfd41257d53f7caeddcc4ad8cc4aac707393d2b7a1c7452ff5e9d1ae5f84696e8
+DIST glslang-1.3.224.tar.gz 3543160 BLAKE2B 5773f884b39f2bd01bf71269e62ee3c0ee36a736249e65b6b205560227698230e708feb4137cffe7b4b30e8756c206e53663bb3942b1d5d528511ac96e8bc407 SHA512 d982fb166d07e8862b8b41d90652fd419a35a0987ff86e21b4cb760594e0c8505d927dcdb089540168ca4b47e4d89d5e150706758ff82b25011f52c1716cfbf4
 EBUILD glslang-1.3.216.ebuild 809 BLAKE2B a207750c9898380d2ca4b7b3769828d3a7e7950666282cc54a7e02f0e1b1dd0ba1834b08ca081e152cdcfe55dcf5ab165c3ad743539253e69988008e717be603 SHA512 a51a0c70ef135db12b71c6b42663f5528127602adf1327411fb81a10159461314472814e8aab044c48ff7dbb2c3e8ee9fa2e76c9eeb74725a9ed33ecdfd70f0e
+EBUILD glslang-1.3.224.ebuild 815 BLAKE2B 48e125d4206ab446a51bdf65e6b9cd86e8853ef6c6e7ab704fbd7b6370308187f671866178f4a1191c87916639a38edd61d7400783fa78c85618676b678a699f SHA512 cea3c3fd2565c395b7a01d2e98c0e879b52eef6278b351fff78ccad222554f3d9b5d987aa553254d1a143779a0a4f236054566957cbaab28b57097d0bc823a53
 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.224.ebuild b/dev-util/glslang/glslang-1.3.224.ebuild
new file mode 100644
index 000000000000..ffb48adf4b6f
--- /dev/null
+++ b/dev-util/glslang/glslang-1.3.224.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..10} )
+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/sh/Manifest b/dev-util/sh/Manifest
index 4f8acfec5626..54168d0bb9f2 100644
--- a/dev-util/sh/Manifest
+++ b/dev-util/sh/Manifest
@@ -2,4 +2,4 @@ DIST sh-3.5.1-deps.tar.xz 3113476 BLAKE2B 0998ebeacdd7c882542eea25ad5ab3131211c6
 DIST sh-3.5.1.tar.gz 222608 BLAKE2B a81af092d0f8d0ee7c05240d816a99f044bce3e35d242a815a238a27893db5bfc320efc4a0237ca9ecfa0276e4687152c87f6e0170f5326e2d0a8604f94f6adb SHA512 fd1084921254b70376b3ac47b97e2108308252fa6bd23aff1e59aaefb45a7e01c1738a46ae6f4eb255ecade77fb9659fbc8184d2473e8e4f70e520757bad506d
 EBUILD sh-3.5.1.ebuild 1124 BLAKE2B 0bde749e4856c27ab0125fb3afef356dfcd34afc588d4dc74d45389fadf1b6999245a1455fc15b5ce3424570be96c056ec5e2e06a632659d0d9a2e5dd9f03275 SHA512 94b0e355218e6cdacdd775301e6b779a74111655fbe010e0828b4f9985e753db0611eb9fb723b1f175d8651bec827e345c166a8511401bff944de460a7c283a1
 EBUILD sh-9999.ebuild 1124 BLAKE2B 0bde749e4856c27ab0125fb3afef356dfcd34afc588d4dc74d45389fadf1b6999245a1455fc15b5ce3424570be96c056ec5e2e06a632659d0d9a2e5dd9f03275 SHA512 94b0e355218e6cdacdd775301e6b779a74111655fbe010e0828b4f9985e753db0611eb9fb723b1f175d8651bec827e345c166a8511401bff944de460a7c283a1
-MISC metadata.xml 608 BLAKE2B b5a596e7ef469d9868a472e2529206776ae934de853800c0e0a520532e428fb085556282d21867dd9dd4a5c5a184feba43e119944480836da998f0ffa3c477ca SHA512 32a59e3e7d7c060fe742fd0705d7e9cf371c92df4a34c1f295b93a004e6ddebc46552a5fd54b8ca19770b194bfb79114cfffcbc4c686748a9e1d5ede317d79e9
+MISC metadata.xml 717 BLAKE2B 0f9d6a11056a5a0ba6e297601a55b88ea86ee47d08dba0da2b4367c71f2a8e5876f0513f4fc31fd0b63905ad89a9da57b95a90ecb2efce8009ef1f23dc14a109 SHA512 b9ad5206fb1d1e3e22751c6619f998635d8f17d31b75b9cc4e99516eff8ce875b4dc8597c5c25b16cc684312b3e3b458a674f5be557f4c286cf3a374716c8863
diff --git a/dev-util/sh/metadata.xml b/dev-util/sh/metadata.xml
index 02bd9ab81cf5..23226f483250 100644
--- a/dev-util/sh/metadata.xml
+++ b/dev-util/sh/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
 	<maintainer type="person" proxied="yes">
 		<email>ran.dall@icloud.com</email>
 		<name>Randall T. Vasquez</name>
diff --git a/dev-util/shfmt/Manifest b/dev-util/shfmt/Manifest
deleted file mode 100644
index 16c2adaba565..000000000000
--- a/dev-util/shfmt/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST shfmt-3.5.1-deps.tar.xz 3156352 BLAKE2B b7285570bfaad915097e608afeca239efb705b8db8fa6ad62cc0ffa2d22d9e8b99776ae47c522399f0a398deb49f347d98d7ab7805e386682e46c6b63605503b SHA512 deb91699446c5399a58416dc864ec5c4e581733b498401e342d2f0ebe16a95119d6c669104e0f1f974fa9bfdde952ae4bd57b4b9966c57551b5501ed8985d6f8
-DIST shfmt-3.5.1.tar.gz 222608 BLAKE2B a81af092d0f8d0ee7c05240d816a99f044bce3e35d242a815a238a27893db5bfc320efc4a0237ca9ecfa0276e4687152c87f6e0170f5326e2d0a8604f94f6adb SHA512 fd1084921254b70376b3ac47b97e2108308252fa6bd23aff1e59aaefb45a7e01c1738a46ae6f4eb255ecade77fb9659fbc8184d2473e8e4f70e520757bad506d
-EBUILD shfmt-3.5.1.ebuild 582 BLAKE2B a71cafa559d544831bef36972919a22ca7a8a6ba25b44e15ede80a119b04592a678104143e2535a369f7adfeda4556cd0313ed8bed348266c6bf8fb0b4c39c0e SHA512 eea1f7665e6acee619069842cb2e6af883840dd2d009cbea4b00c29e8d936e47ff48b31842ff71baf3c700f8b8a3d713f00cf922898e218551a0a1f35b1bfe0d
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/dev-util/shfmt/metadata.xml b/dev-util/shfmt/metadata.xml
deleted file mode 100644
index db463f3eeb66..000000000000
--- a/dev-util/shfmt/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/shfmt/shfmt-3.5.1.ebuild b/dev-util/shfmt/shfmt-3.5.1.ebuild
deleted file mode 100644
index 862a019cbef5..000000000000
--- a/dev-util/shfmt/shfmt-3.5.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="shell script formatter"
-HOMEPAGE="https://github.com/mvdan/sh"
-SRC_URI="https://github.com/mvdan/sh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Clear-BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="app-text/scdoc"
-
-S="${WORKDIR}/sh-${PV}"
-
-src_compile() {
-	ego build ./cmd/shfmt
-	scdoc < ./cmd/shfmt/shfmt.1.scd > shfmt.1 || die
-}
-
-src_install() {
-	dobin shfmt
-	doman shfmt.1
-}
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 2eada69b6663..acf63bf11ee5 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,4 +1,6 @@
 DIST spirv-headers-1.3.216.tar.gz 437011 BLAKE2B df48c7709c79b2132056d51e513b564539aaba335dbd68b4849aa871b688b9db5a5ec50142b3d448fe50ce6c4e5f2016e516e9e31441c8d1ad89c90c24bfe14f SHA512 951715cf62a643bfce6a3854f2206b95dd65e60b27355a2f290e829da0f06e19877e9dfcbf53f455b8a0524fb851a851742f3e16bb29be2f470cd62d3a8fc8f0
+DIST spirv-headers-1.3.224.tar.gz 436938 BLAKE2B a0b1ddeb89a20a9ab3fa9dc0af9574a207fba2b7ff0e588678b33e1d773c19d09ce828980f9bd7956a94d1d7b6f1f138b3b9d48b45b7b307c6ebc37962f8f8ee SHA512 fbf776a3ef1db2e7b33067b3f36c1d4189ff3d89b73058374c5020c048931f88b798b84a89209b2bee419afa56fbf9bfe9df6a7387198778b8f23e79597cb057
 EBUILD spirv-headers-1.3.216.ebuild 492 BLAKE2B e7dd5c912375e55ca2c208570cc004dfe62af4889886b772dfe98365eb3cfdac1932107c4d1b9147cb07777ffa0cde53e1bb5e916947af8c887855f8616c00b4 SHA512 1f4037508476ca38280fa1cead6c3283c88ad4e2bdc5a083b38376b3810a9d686df388e070e2a3fb1cae7195625eb36d5f8a126fbbe8304b25b3a4ba478a5710
+EBUILD spirv-headers-1.3.224.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.224.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.224.ebuild
new file mode 100644
index 000000000000..d2781b9e4327
--- /dev/null
+++ b/dev-util/spirv-headers/spirv-headers-1.3.224.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 8e81e5122a3e..778468a30e00 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,4 +1,6 @@
 DIST spirv-tools-1.3.216.tar.gz 3019645 BLAKE2B 88fed3d48f50c50276746dd2b69740482c95c83df13312e081ae4066351454f0a3afaad2f146c629ee39dd34708dd105941e2bc374146a6e9806631227372105 SHA512 85418189962611724488ea61f1b123c55c2f5ab9dd50d028c7ed1ed2965ff23e2679d514e863ac16b60a3c7c6b4fbd05e7c7ff398415e0435d72c96363b95188
+DIST spirv-tools-1.3.224.tar.gz 3033611 BLAKE2B 806c1de27d0c8dac4991dbff321fb8f62647b25b5c87d66b2f924449599e37e85ace876b848afc2e16e42f943f413e0eb759983cce95d826952809974dd9ac7d SHA512 1265db4c15d4d6c6fcb201bc958386e9c910386a82ff595b5d5f84dc03f6ab7f70f67fd59a90ffa92533b02d809305334c06228b869151cbcfdee529e90e7bbc
 EBUILD spirv-tools-1.3.216.ebuild 1220 BLAKE2B a3b228a72c7b083ac0cc7fd79b4807c15ef2a1c8ce95f063ed7363bdfd18cc0fe69aa33562eb8cdf0191964acf678260605a75c70041cfaf319f3e3fbee122c2 SHA512 2876f5f2b8a2cca96ce2816eb3ae813fac348d9b771ee6bae0f916f72ab13caf45c46a306c2977c43c7ab9db985e23f65bda0abff181d2b589a43e561f151376
-EBUILD spirv-tools-99999999.ebuild 1228 BLAKE2B 3d7ad81cdaf91ad2c6435aa056c5098e4586a6f5e6feb439a04de85cbce76e09c2b79752098bbcd501834ee1c76759164392a15ebb9f4e05a7f8715471ee2877 SHA512 098477315939049c5e21b6cde461d4b51d3ce9fd5ebc902a5fa78907405b3747e7d832bf72679c917e26fe8d658bdd68c1afdf95635e715c8713fcded4bc4f7a
+EBUILD spirv-tools-1.3.224.ebuild 1226 BLAKE2B 67c721c2db2450209078f77172271257a4f9a16c5044d1b17d27749571fadb128901612cccd8fe51ac507c9c396d44e1d937bed1254be3045af428cea0ff6ffb SHA512 87051cc73651da3cbdafd4fe884166840f49a425c8a250a50a99209595e885b13c59f08e5edf866f0e233ff711d961c0ae03fd832dee1ab09ed61aa00a583ac6
+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.224.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.224.ebuild
new file mode 100644
index 000000000000..06111f85f500
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-1.3.224.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..10} )
+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/spirv-tools/spirv-tools-99999999.ebuild b/dev-util/spirv-tools/spirv-tools-99999999.ebuild
index 1d92ea5b84a4..f3ccc5e19462 100644
--- a/dev-util/spirv-tools/spirv-tools-99999999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-99999999.ebuild
@@ -26,7 +26,7 @@ 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-1.3.216"
+COMMON_DEPEND="~dev-util/spirv-headers-1.3.224"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND=""
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 697fa26e5eac..ffbbdefd382c 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-headers-1.3.216.tar.gz 1489322 BLAKE2B a6bdc5d0517405b121861f18c330dc9db28df9c7d48994c6131e047ff640f6dd858cd3fa6efe70d8feb910d3b51c4a7d5676c8d87eefbddbedc30ff3b6af6ace SHA512 cabce62c3e681c2f89f808a0838300f859d1ea046f0036f44c5191f5a9ebbc15058507cd5d07519c34b81ba602058a137f27142c58d4e6c84b2ad382431d675a
+DIST vulkan-headers-1.3.224.tar.gz 1521365 BLAKE2B 08e6e1badb473dfb760e20ee8a60f83cd288f33c4ad136026d2aecf474e1da13008691453886ee092e87cbd2ebbbbcf6bfcdff963276bdc8464521e07551ffa2 SHA512 856d80869267ba9c934400313cca1f9af67c1169974d70d21aed7469a39bf6d1821a95072a81edf8cdd463a62d766d478ee1c28bfc0f17a45b55ebd1634b9984
 EBUILD vulkan-headers-1.3.216.ebuild 629 BLAKE2B 1bd403ce0eefd80fce8a633e99222321bfd5cbd6cc29ad5d53e22c94aa04214f850be41d314d396696f64ae1d360cc2cfaac878c2bf5f2cd03b41bf715a649d6 SHA512 7916ac21e93195e7ffab10a2def2d905ba91aaec0cf0f63992028d48ccf332f65ccb4948a5b4cd12260d217c3c08f892423b466efe5367319b3676ffac217f8e
+EBUILD vulkan-headers-1.3.224.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.224.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.224.ebuild
new file mode 100644
index 000000000000..591287d773f0
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-1.3.224.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 2ca887a20326..cc89ed9cb2c0 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-tools-1.3.216.tar.gz 866091 BLAKE2B 750b7d26de64844162f13bb5f2c82b134c0996e2bf23883b381fc05bb8eb26c19ef3a8dc4da63543096473845952115a8e3213ee3972baa9b01104adaa09ed82 SHA512 57d152072ecad744256397e357d756f82457929a026a29127a079ea7b3b805b99ece1e0eddfecb215882a8de18cf9ab3c32c4c90126e261bc582ad05ae6173e2
+DIST vulkan-tools-1.3.224.tar.gz 868481 BLAKE2B 464e923f1bd7f72b0c9fab1ba6afa0aa179355f0ebd17c4cd6eeaf84b61efde61c60ce982d0eb081f88a64659dc5676eba77b9782e00df9d9214594806699d98 SHA512 89d2fddaaa710c78020e03b133c947afd79e9bfd1b4de711e5ac8f3e3bd5486e75960dc5a5cb7722ec55a6973233ca8a438e19627b59aaacad1c54040fdd6acb
 EBUILD vulkan-tools-1.3.216.ebuild 1946 BLAKE2B 8112a58006428329551368ecc8e628b030a5c9d10b7038266a7e6643009c46b0132719c1deab56d9f8c4c58ebe716f5a979df40e4b99d592089550d1392a158e SHA512 f22187590f9f5702d52e58d5e3658233a769e9cd355a092b722cdd9039d939313f8b151716a233ae74969a29098ae878f3aab69bbf2f9ccb3a54b20b5e40cd8a
+EBUILD vulkan-tools-1.3.224.ebuild 1951 BLAKE2B 9069d1dd31ec8d161e6e47a6ecad7633bc80affa209b284da295efb612a9d173bc4c245fe57d02c81011fd63621b263654e247d800c88eac9de8e2adea1c7e7b SHA512 7a228ad92a1340d66f4de3e45c84c29d82da6e6c0bfbdfb292484d76466c90bd2dca2e632c1c389f91ea2bb7cd1471f1c4d27a28e5f3918ad77cab59ecaf277b
 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.224.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.224.ebuild
new file mode 100644
index 000000000000..3f1b0f2646e7
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.3.224.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..10} )
+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
+}