gentoo auto-resync : 04:02:2023 - 21:14:48

22 files changed, 443 insertions, 16 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 4e8f2f5aafc8..e0f625368e9b 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index dff2647c7cdb..519c4ab866ed 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -5,9 +5,11 @@ DIST glslang-1.3.216.tar.gz 3537750 BLAKE2B 0eddc7be8a4499a283b941b51aefec5bfa3d
 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
+DIST glslang-1.3.239.tar.gz 3683945 BLAKE2B ffc690522814d7a28bea7168744d390a5a1c7e34e67f2037c72b2a040c8c48fbb9d46f37d74ea58b2bcf7621b0008498a9dd592da08e9e93037e3f45c5b920d6 SHA512 a7cd35c76dc4f3a4f2f1015e7495b87313472d7c766075256c0d2d0004f395f62d38d715675b49f13f66a12645175c421af4622129aeb588528397e92f51790b
 EBUILD glslang-1.3.216.ebuild 809 BLAKE2B bdd6cab8ea162ccf4f9c88a821607ce24c28353be9d569228edc64562b47a2ab758906af71c0ae92b87a76d5a5be0c0d76c7b32253b7382118d594ca6cfffe74 SHA512 3bb4d5229b400c11b9217a8fb4725475e0bd31f9cdf328de70178a002418762bef18ec55c87a5cea194e350b5023e5b4fbf9640d33e704cb88dd9e9e6344222d
 EBUILD glslang-1.3.224-r1.ebuild 874 BLAKE2B 6f42ee6e58439d3d8871619dae6cac517e20983166fea557effe63353281d26423adff1cce133e29283d6ab2c53191511aa81c5c11e8e87f569fe4eb7108ccc1 SHA512 f8b1fc565791d53b12700433a5e57e7a3172b17cf7648bf2ad3ece034469ad56831b176601ed036da5233ed47db31e4c1c5b87d5e64278f704dc62bfe7f3947e
 EBUILD glslang-1.3.231-r2.ebuild 963 BLAKE2B c3e69752a1bcc0448a59c196dc7e8fd828cb620abc41106939971a28da337f57165ca2721669c8d40f42568bb200bd12367626b9d29761aabaeec5825570a045 SHA512 a04780f1b16fd97c96aeb18e24dad17a9250e1873a8457a544ecfb4372bb0903cc68a5e18a044d7826c298f5575c69f185209adb53551bef95f4bde69a3930ad
-EBUILD glslang-1.3.236.ebuild 969 BLAKE2B c3905ac197d64dd920117ba3bb5cebb8c4266c8616dd2506959dd0f8e42f5622046803e35c50b2d7e3ca80741faa84bec71498815779e4f78560c3137f404860 SHA512 3f7c0d2392fe9e8c6031efee41c60bc2005b92ecab46953f9fd3b5910ce3a8f1068d827c8e39ab4502de473bd8ed54fac5d865628339b662114af73a9eca2114
-EBUILD glslang-9999.ebuild 978 BLAKE2B 9710aceaa3cfe80a01694b30fd07dbe0a19248f747886dcda5ed13490cea95c84b3725948b611c17753a85ed6fc5715b815e0b1f66f9c122c212fa9cf741adac SHA512 51699de9340d8196c6ef8db3562d0995536534e83520dcfff8b1c0f2e42b0b81ab1f0160efd8d4fb3ba7665f856aa672fcaf79ec4b77bfc3359c0f4e21cb863b
+EBUILD glslang-1.3.236.ebuild 964 BLAKE2B 7fa24a007417c6d17674348c67ac9531cc3a9f231168c9756d8b16a14872801d7196f8df203e6d4d9233f59f7e5eab0282f760a601b9b5cd495a01d93923e0bf SHA512 5876ea22df90f135b11bc08f3d021f1c194f0ed3fdd5558900c39065cc33d9a16ca1b1b8ba3bdc35b3de5a821bc87b20d408f39f7b336923e8b62cd712d500a7
+EBUILD glslang-1.3.239.ebuild 979 BLAKE2B 820df800052d93dcc6e5980897ec636aaf55b52c80aa24b10e7bebe37b809d298a190470b8cb3f2bd336edd7d9133fc92e08104f12d7c085b95ca69c031a1850 SHA512 cfea61b91d5d80f8d68e1c3961cead566b1fbb501e667245a9fd288d53cac1880559bc0f1a454f1f282afcd543ef32c66826ebcab04d8dd447cc395512397fee
+EBUILD glslang-9999.ebuild 979 BLAKE2B 820df800052d93dcc6e5980897ec636aaf55b52c80aa24b10e7bebe37b809d298a190470b8cb3f2bd336edd7d9133fc92e08104f12d7c085b95ca69c031a1850 SHA512 cfea61b91d5d80f8d68e1c3961cead566b1fbb501e667245a9fd288d53cac1880559bc0f1a454f1f282afcd543ef32c66826ebcab04d8dd447cc395512397fee
 MISC metadata.xml 330 BLAKE2B c3874bbe807a8dd1a55897feadfc0a89e4cb806441390ee7e7cc317f3b533a08338a669834122ede89cefd9b6532d789aece2c29fcc6cdfc7f76a81bf382192b SHA512 1c591a28214fb76334171e4a49c8ac302b6f174f265749ad005f2503df1312e8303c92a68248775ed3db98d65107471f9cfc8cfb758c89261f283711beaac764
diff --git a/dev-util/glslang/glslang-1.3.236.ebuild b/dev-util/glslang/glslang-1.3.236.ebuild
index dde4f47b1e03..8bbb98b5eaae 100644
--- a/dev-util/glslang/glslang-1.3.236.ebuild
+++ b/dev-util/glslang/glslang-1.3.236.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 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"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
 fi
 
diff --git a/dev-util/glslang/glslang-1.3.239.ebuild b/dev-util/glslang/glslang-1.3.239.ebuild
new file mode 100644
index 000000000000..a06a97ac7bde
--- /dev/null
+++ b/dev-util/glslang/glslang-1.3.239.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..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}/${PN}-1.3.236-Install-static-libs.patch" )
+
+LICENSE="BSD"
+SLOT="0/12"
+
+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 6db825550c8f..a06a97ac7bde 100644
--- a/dev-util/glslang/glslang-9999.ebuild
+++ b/dev-util/glslang/glslang-9999.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https:/
 PATCHES=( "${FILESDIR}/${PN}-1.3.236-Install-static-libs.patch" )
 
 LICENSE="BSD"
-SLOT="0/1"
+SLOT="0/12"
 
 BDEPEND="${PYTHON_DEPS}"
 
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 7baf717f187d..0294f6b45cf7 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,3 +1,4 @@
+DIST llvm-project-08c915fa76ef91efa16df0676ed69e4fb360989f.tar.gz 179571827 BLAKE2B 856ea5787f5b3a0b3e8816ccc1a7016a5a7140da6a61544a9829625255dc7036b321b43421f4b3a21e4f0cd8a36745e5d26cb828a41c49a690ebefdff88a744c SHA512 a83121dfaad3e93bad072557715ff857eb8b912273e3a36ea13c2f6a706aa4a9233398ac56074f2cfb5de49982fb5df5e2893eddbe2fd580a51aa08a03c95e34
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
@@ -13,4 +14,5 @@ EBUILD lldb-16.0.0_pre20230107.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658
 EBUILD lldb-16.0.0_pre20230127.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
 EBUILD lldb-16.0.0_rc1.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
 EBUILD lldb-17.0.0.9999.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
+EBUILD lldb-17.0.0_pre20230203.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-util/lldb/lldb-17.0.0_pre20230203.ebuild b/dev-util/lldb/lldb-17.0.0_pre20230203.ebuild
new file mode 100644
index 000000000000..985e9ba9d42f
--- /dev/null
+++ b/dev-util/lldb/lldb-17.0.0_pre20230203.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm llvm.org python-single-r1
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${LLVM_SOABI}"
+KEYWORDS=""
+IUSE="debug +libedit lzma ncurses +python test +xml"
+RESTRICT="test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	xml? ( dev-libs/libxml2:= )
+	~sys-devel/clang-${PV}
+	~sys-devel/llvm-${PV}
+"
+RDEPEND="
+	${DEPEND}
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	python? (
+		>=dev-lang/swig-3.0.11
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+	)
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+			dev-python/psutil[\${PYTHON_USEDEP}]
+		")
+		sys-devel/lld
+	)
+"
+
+LLVM_COMPONENTS=( lldb cmake llvm/utils )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LUA=OFF
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_ENABLE_LIBXML2=$(usex xml)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${LLVM_MAJOR}"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-{shell,unit}
+	# failures + hangs
+	#use python && cmake_build check-lldb-api
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 53fcf853bbae..5c36b092facc 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -4,8 +4,10 @@ AUX pkgcheck-0.10.19-fix-setup.patch 733 BLAKE2B 39033cf4509d7a46f0a638109cf1b7b
 AUX pkgcheck-0.10.20-fix-replay-bin.patch 4506 BLAKE2B 68262310538abb220ef3f3109f65656e11716160895491f00f438bd686fe6a904238b1dd29cd92db7bbbb83f2a0282e455e843b7cc8f17c9f4c47a42f8dc4a82 SHA512 42a45d64f4bcd31b510124e8091bb3aae93c906bdb90ea2332405a5b17baee43edffc45563774fbdb2a7efae795065b67f81aeef1c5b9bde7df0bdcdeab3aa48
 DIST pkgcheck-0.10.19.tar.gz 548636 BLAKE2B cc1626c1d5ad9ba6b43f99bcdb668092805eaf9797c9839812d8716ea9f454f631d2e6da4579bbf702da5aadc61adc8064a6b7d32f001aaed9a2e42f8392f24c SHA512 c3af623b5c38325f9afabaa217e29d23dce4355a0aebbed77a5efa469ac135238d0aa04b4973d84c52e68ada0cb3b391a82d58317e75a279f083470c7e69cdf6
 DIST pkgcheck-0.10.20.tar.gz 549746 BLAKE2B 72ed97d93674ffd311978d03ad3738494a752bf1b02bea5eaaaf1b066c48e8c9ec5f82b79baeeabf3e56e618c76614ee6179b7115d1d875364ac6e3fbc3c6028 SHA512 6a8c135ca44ccbfe15548bd396aba9448c29f60147920b18b8be5aa5fcd1200e0b75bc5de50fc7892ad5460ddad1e7d28a7e44025bdc581a518d136eda8b0df2
+DIST pkgcheck-0.10.21.tar.gz 559386 BLAKE2B be30dcfb0021459026059befdd9cbe661b9b2448e6997e23ce6cc28b56793acc72cd490cf07f42ad6e13a48beca52eba5ffc0b40ef981fbc7235dd9ce29bdb27 SHA512 148567658d949e4737da5bcd2329b4647296877b747a216c64a4d0839dd0b869a8ae32644784ff124f7f94e54a58acc5fc349a28c8a096a99b9488ebc04b374e
 EBUILD pkgcheck-0.10.19-r1.ebuild 2362 BLAKE2B d653ee448a74bbf5debee553a67e1e387fc0ac0f3083540b32b014991eeb27dd0b02f33697b95669ebe26fd0c84d528324b2cb5b7b51750e4e6d45309233cc6a SHA512 2da2dcd658b828c907380fb4af4d2fcd2fc7aa007615a8fa1fd36dee9cfe71b6d21ea80fcc25eddce69b54b64046a5ff5c86acd64d8dfb8f0f97d3f72a2da5dc
 EBUILD pkgcheck-0.10.19-r2.ebuild 2417 BLAKE2B 8846153b57eb01b03fdcd0d9b70f303aafc9ebe40dc2a139be4b480153d734da67ff94a42b5a7d3accf2a9cfbb73664668717c56b635d9d88bcb001b5d93b787 SHA512 5529cca4233e5c350209baae3838949954a076fe074b3dc93bab8e34c5716f0d701cb43fc443ccfb1e225ed06f3d61e21b34f566b64e0cf08167d91066016bec
 EBUILD pkgcheck-0.10.20.ebuild 2299 BLAKE2B da8d2f3c4003dece22395a782538718fb5511048dd8a0f193504875b42fbe1c330583e4491b12cc4ef0c4d85caedb7777d3b00bb562a6e5974ebfd35f93fdeb1 SHA512 d97b28760c66445cf6a466a928dd1458ebdec5bec82742609545899e6a451bd46b5ec02913ec56228da44ddba728e0fb9bf76f8e96043d91042015587ed6c419
+EBUILD pkgcheck-0.10.21.ebuild 2208 BLAKE2B 7a591201ab467e2a2c463ab85f71145aa7dced2636d097305f79d59630075e39d6f11d2905362b281fef12ea55020bc274a870f162bdc5a70c24428c8674027d SHA512 337087d18df1524c74217e6373aa02aaacc32cc8fc50fd934e40b38157ca62fd1111e3f1cce0388740daa6b5c67f1d25a38c252f31e5eed7266389e6869262e1
 EBUILD pkgcheck-9999.ebuild 2208 BLAKE2B 9df86718b0572e354aecf6b68f251be51538dca36e4a42e79fdb0ab7a48911b5b79ebe033cbf7814f1c5a1105a4065d5790e3ba388c1d8f77c42e735a4d179ac SHA512 d63bf1d5c01fbd1e8d6a93e7176c0b6aceba20dfda43eff12ad12a91eca4f6f52aeb1d1d0a65c521205bb05244789b1fef563fbc5cff6a7c639d7b0221dec52c
 MISC metadata.xml 455 BLAKE2B b544db3532ef1da966833d5edbc79988cc1fd85b6d6276476684b49d4485814d6e2d969e742d3633c8176e7f37cae6614dae1654fd1424d71475f022166f6e6a SHA512 5abd1584f486e88992bab8c51c191b4915a5854752130f8a591147ff4b2af2102fdc8ab182e7358c3e4bbb3fdc8400563a250e2dba1793d365f0edc7c5f7c33a
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.21.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.21.ebuild
new file mode 100644
index 000000000000..66e807c20cc1
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.10.21.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit elisp-common distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcheck.git
+		https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="emacs"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.10.5[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.19[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-libs/tree-sitter
+	dev-libs/tree-sitter-bash
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
+	emacs? (
+		>=app-editors/emacs-24.1:*
+		app-emacs/ebuild-mode
+		app-emacs/flycheck
+	)
+"
+BDEPEND="${RDEPEND}
+	dev-python/wheel
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+distutils_enable_tests pytest
+
+export USE_SYSTEM_TREE_SITTER_BASH=1
+
+src_compile() {
+	distutils-r1_src_compile
+
+	if use emacs ; then
+	   pushd "${S}"/contrib/emacs >/dev/null || die
+	   elisp-compile *.el
+	   popd >/dev/null || die
+	fi
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+
+	if use emacs ; then
+		elisp-install ${PN} "${S}"/contrib/emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 93412859b4bc..87861d4b80b2 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,6 +1,8 @@
 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
+DIST spirv-headers-1.3.239.tar.gz 446227 BLAKE2B 43c115f2b9661b682455034479a056cbef9cb9d4d9e60be88a1d5e16354dbfc907c1719f0d90cb0a0d243e420b552b150b915baaa9aecf998604197f26ba214b SHA512 f537becf7940cc31bc7b578f33be1ca55264414f205582dff0c569bdbae085e78760ea317a32e6d3fe3510e29554ea1b1a00bf9e4df3e20cd4de6e998a891a5d
 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-1.3.236.ebuild 491 BLAKE2B 343b07d74f844dda6581638b5346d4ae919656f0fb7d2a4d3cc40c2a5fa1e8c8cbf25a36026ba28de405e53dafb11b8ac6318b3768f5e2e94efa636f2d9fe1a7 SHA512 6ff5dba35ec3767c09cbf9eb6cc73027c44421e404ef73888a8aded74f3d8a26f0ac1051ff073f295be46156c57b0a94f7cdf5bc35012db16df4cce52252d7cf
+EBUILD spirv-headers-1.3.239.ebuild 496 BLAKE2B b63906f764151035e35e858924e487af0327baad302f9136594348257d25d7be7aaccc793f66028d8dbb15794d4ed5d4b5a1ca57196ef04a2b6b4ef736b7354b SHA512 4ce32c4294768530a04916a8a1bc722aca84a61f5567f490ae78febeb5b78f793cd89d1137e79661ee2eae4f59602fdadf2ed9d9bc82096a7d5b5204b0335a05
 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
index d2781b9e4327..f03b7977ce7f 100644
--- a/dev-util/spirv-headers/spirv-headers-1.3.236.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.3.236.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~x86"
 
 S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.239.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.239.ebuild
new file mode 100644
index 000000000000..0cd1fc6fda3a
--- /dev/null
+++ b/dev-util/spirv-headers/spirv-headers-1.3.239.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2023 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 a963f6e38b11..8e2070db57fd 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,6 +1,8 @@
 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
+DIST spirv-tools-1.3.239.tar.gz 3088996 BLAKE2B b7900fee1b5fca47802cd168766c3bc2f316fd69380670a8f0241df607c8fb41e8534d699330e38fa33ca1632a63fe54fb6c69def68d5b7a30b4229598fdcd21 SHA512 77c06e9127e9f5ab5c83b2bae181a9e626adc4f37d10122a1ed62904dd7e05f78f5eb75f4213d8d986bc78f60f247ed23ddc2552fcbb8355c0160fb559d32707
 EBUILD spirv-tools-1.3.231.ebuild 1220 BLAKE2B e8d490e3840624a5533e37486e6f4be4729620f9380f4a06a6a39d5d5039aa89842ab4943d9d1c46a894a0ccfb3ddeeccead254fddfa8c0b92191f4c02d31592 SHA512 e5beef1c4b15767e101aa9611dd2cb128385b15daebf0419cd79ac6f6a1db553800bc95de3d73a535ae436bb7268a4d645059ec08ba1d64a966e92673477a003
-EBUILD spirv-tools-1.3.236.ebuild 1226 BLAKE2B 0268794a12474fbb7017a54c47d70286dcdb8052ef54ae4096a5eaeccfbfff19a334c07e07a555ca9adee445374e2fbc0a4ae996db8d72e4ccf004e00d10ed45 SHA512 3809f0b0f3f87510dbaf93897bcdad70f1b10081bf8382067606bf20ed86846a7ca70b12cca675fd3a1bce121299745e7e72e3f710c6299cd0edab1c01081fe4
-EBUILD spirv-tools-99999999.ebuild 1228 BLAKE2B 8f918ddc08a7e2215125f26bf91ae9e95550d5081a32d98bdbcc262016d67b01670418f7b07abd2dc5cdb296cd7b89dd1364ee725ec14b1c1cc8b2bb08f6074b SHA512 a407c3990e4b46dd8c536d4235a64a96ab7c4da1061e9d539bef27ca497e46d6f6a70856b1f5454719d398ad0da6032e8047aa8c161b9c29b21750c526cf93b4
+EBUILD spirv-tools-1.3.236.ebuild 1221 BLAKE2B e733c628a086a3dbdcc78199b559e8095506431311bffcb14546246b46ba2d7014261e3c7c107bf6b133656ad6c041ccc917e7b8b3d4b35911370a9cf62f3c8f SHA512 4e4a620e8c2ab1714fb617d258a54d49968f83f6a61790931c5c676a2ec53831bfe41b5a38cd493befc46761000cbb5b924a912792c7c1fda0a8b1fcc9756a92
+EBUILD spirv-tools-1.3.239.ebuild 1226 BLAKE2B 0268794a12474fbb7017a54c47d70286dcdb8052ef54ae4096a5eaeccfbfff19a334c07e07a555ca9adee445374e2fbc0a4ae996db8d72e4ccf004e00d10ed45 SHA512 3809f0b0f3f87510dbaf93897bcdad70f1b10081bf8382067606bf20ed86846a7ca70b12cca675fd3a1bce121299745e7e72e3f710c6299cd0edab1c01081fe4
+EBUILD spirv-tools-99999999.ebuild 1228 BLAKE2B ec10365d54afa9556a31793932aaedeb4a1e2c05a9b85c1a8a76c40e0e5f9454ecefa1d98f81c08758f8ff8bf35befbcebf26498d999cb3907192c448ce6b55c SHA512 dc57eac61ed4319d8311120d9ae006fd2f6576e7ae8fd3d012e6f33ee126e9b11a96b402fb863a70c5fc975610933e7345e7bdc5a761b8754daec7d0d878a3fa
 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
index 60fc92cd8f72..8321ae2c67a6 100644
--- a/dev-util/spirv-tools/spirv-tools-1.3.236.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-1.3.236.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 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"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~x86"
 	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
 fi
 
diff --git a/dev-util/spirv-tools/spirv-tools-1.3.239.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.239.ebuild
new file mode 100644
index 000000000000..60fc92cd8f72
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-1.3.239.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=SPIRV-Tools
+PYTHON_COMPAT=( python3_{9..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/spirv-tools/spirv-tools-99999999.ebuild b/dev-util/spirv-tools/spirv-tools-99999999.ebuild
index d831414a72b5..957ed0481b83 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.224"
+COMMON_DEPEND="~dev-util/spirv-headers-1.3.239"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND=""
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index e021c1ca6d18..552f2b36ba74 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,6 +1,8 @@
 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
+DIST vulkan-headers-1.3.239.tar.gz 1804393 BLAKE2B ea7ab92539aa32a6973bb590b84e4004195eea1f41b3499b33c1f915514243e7d06c603f0dd9feb4d04a455dd732940f512d2acca150372ebf02b007e670b27d SHA512 d7b0bf3f41f0f4a43c89c13cabfeb99401b069e6d0358b03befef465cba7e6a34e1608e62d981d0d905f5cc6327334cdca4e249ebb2305ce1ae81ebcfb62dc20
 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-1.3.236.ebuild 630 BLAKE2B a7b995ffe71db19b7f69ad18091c81b119162ece54ec682243c60c4d9210b2b9cb3003accfa1cd9b81b6cc935bf23e802c1c3d368436b14759b06820f9cb3a43 SHA512 b7490bb58d7e529ff143965b5293929675e14a750a1c4f01d16500d312ff92e11ad1d54dee1045b48f9b67ab3bb20bfccd8e2c86ebf624787be08a1efc912ef1
+EBUILD vulkan-headers-1.3.239.ebuild 635 BLAKE2B 35ebd0553085abc262335f9c112439188fd74383d2f7d869ccba3394f1baec1434770a1b6121d195fd41f56c4328dcf37a247de46afbbbf8733e45071f1f19fc SHA512 60d3f0c9427ca0e7477f62ee3e162bb0b3210da0a18b0166832c3ce2a3fa0bb89c0a3575c036d2552d0427c706a6282979b9c11f46ee8c1ee6e5b32baab9e8a7
 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
index 591287d773f0..da159ac24c4a 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.3.236.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.3.236.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	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"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~x86"
 	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
 fi
 
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.239.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.239.ebuild
new file mode 100644
index 000000000000..309f5cf64421
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-1.3.239.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 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 80120348ee70..5adb217e9610 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,6 +1,8 @@
 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
+DIST vulkan-tools-1.3.239.tar.gz 775603 BLAKE2B ff2b07454b603a72f0f07c575c09b431f0ec996bab2d5adc66d8d5f1456b0897f3796a33c5658949c92f895b67cbc67ad777975697693cc677db69400549e824 SHA512 9397f71dba2b741dd43c101472ab5961e64b46a7252fca1aa2f3b7c2afbe44b789a25c13536c8eb5dbd6600d0c741330493b73177d805db38ff1542364ef4764
 EBUILD vulkan-tools-1.3.231.ebuild 1946 BLAKE2B 357ff477e3502a3a7cc5f8c40b88214f92227a24cdd8f70d9c833c7d52241d78a8851877a00c9bc1b4794508991b1a67eadbb220b00d8ae654c50906bb6e1391 SHA512 d9c971f9661be7bee81ade9a830ec9db694a02f31df706997ea8a94099f9c5f0d5e94f1c5c60f55b67f4b4a29494bd70a8a62667f0c0907b420bd9a6320d8df8
-EBUILD vulkan-tools-1.3.236.ebuild 1951 BLAKE2B 679a2e825af0539f021c528b90809e7bc9a42a60e3c31c1dd942fdbf8cdf8d8d8154cc22cd925c89654bf1d153b69b195f6dbd04e5cb82d85d7c492c78e6fab9 SHA512 8c77fa219293ec41314d259b9b4bb5c7903aa0dbdb893ca82d2f2bb1a61f301b2ba8f3a21d0d3b85d89120173511f9c98684ade9e09220de8b3f2ae5cb3d04ab
+EBUILD vulkan-tools-1.3.236.ebuild 1946 BLAKE2B 357ff477e3502a3a7cc5f8c40b88214f92227a24cdd8f70d9c833c7d52241d78a8851877a00c9bc1b4794508991b1a67eadbb220b00d8ae654c50906bb6e1391 SHA512 d9c971f9661be7bee81ade9a830ec9db694a02f31df706997ea8a94099f9c5f0d5e94f1c5c60f55b67f4b4a29494bd70a8a62667f0c0907b420bd9a6320d8df8
+EBUILD vulkan-tools-1.3.239.ebuild 1951 BLAKE2B 679a2e825af0539f021c528b90809e7bc9a42a60e3c31c1dd942fdbf8cdf8d8d8154cc22cd925c89654bf1d153b69b195f6dbd04e5cb82d85d7c492c78e6fab9 SHA512 8c77fa219293ec41314d259b9b4bb5c7903aa0dbdb893ca82d2f2bb1a61f301b2ba8f3a21d0d3b85d89120173511f9c98684ade9e09220de8b3f2ae5cb3d04ab
 EBUILD vulkan-tools-9999.ebuild 1951 BLAKE2B 679a2e825af0539f021c528b90809e7bc9a42a60e3c31c1dd942fdbf8cdf8d8d8154cc22cd925c89654bf1d153b69b195f6dbd04e5cb82d85d7c492c78e6fab9 SHA512 8c77fa219293ec41314d259b9b4bb5c7903aa0dbdb893ca82d2f2bb1a61f301b2ba8f3a21d0d3b85d89120173511f9c98684ade9e09220de8b3f2ae5cb3d04ab
 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
index 59d64d894e7a..223c7aa75fbf 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.3.236.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.3.236.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	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"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv"
 	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
 fi
 
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.239.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.239.ebuild
new file mode 100644
index 000000000000..59d64d894e7a
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.3.239.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Tools
+PYTHON_COMPAT=( python3_{9..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
+}