13 files changed, 340 insertions, 0 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 7ac2f8671db1..599dff3a63e2 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index bc7dc384acab..f408dcab5e46 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -8,6 +8,9 @@ DIST ccache-4.7.4.tar.xz.asc 833 BLAKE2B e155f9cb695794a28771a928d50e18705441b9f
 DIST ccache-4.8-docs.tar.xz 80280 BLAKE2B e8e00dd10a00670ff3a0c3f5ab0966469fa5246de64724e24d0287020d4636fb5a1f59421aaa094d05b88bd20efd2a4a06e46dfb957bcf77ad2ea61fd02551c9 SHA512 e0036a7f86b458028c6e24158f95b62e40d9f659031e16adc59c067096bb728f1cb583a2edecaf2118f15b8e00f028fa6f1cfa2466fba76b7c870cca93a883eb
 DIST ccache-4.8.2.tar.xz 560888 BLAKE2B ca907c16b353fabfb8e6479a076aa5cf791e6150f2b16eabf1817d4955d9b5f0200d4b12527ba0493ad9b2d7567adaaf8416bbff858a66fff5a5687328ab7395 SHA512 2edf8da79a9286eb4ed5b6dc2063b55fb97e22a40d1c501c6f17b2f0ce32dfc02e99754afbabbd24fed8312e13e5b8bfc20687d0b5c0cf19fbf64e3adc7bb25b
 DIST ccache-4.8.2.tar.xz.asc 833 BLAKE2B ea92ceaf9873a1a8373414bb7ad74f101873cbf3bae2ba1c6986d40018b8f37d2fd7cab8d0bcbdfb7cbd167edf0128edb2a6d61ecce2645018a01d450aae25a9 SHA512 6182b7a793d5142c1d9d627b6ea058ac524b6914a85d9628788f7eeea7b762c5422ef6007c404fe9b5d77841b69382289ffb6efbf931c9507940c10bee8ff95f
+DIST ccache-4.8.3.tar.xz 569724 BLAKE2B 53211db0e516eea9739b8f05bf6a3db678b4b5cff7af741469360556da20a320e4a40253ca9e51568045a394d3497b428413ff6cf77f4273aa4906357b427d1f SHA512 e0e344cd215de67fe060b36fb1b902bab61454477624fbe41d2ec57fdd721cec9c8920ca834f0ef0ccfeedb961b17143f18197497557887d88911ff66e330478
+DIST ccache-4.8.3.tar.xz.asc 833 BLAKE2B e800b7bdce705db3ced97f0fe008e8391811f9c7c49e815b6cd2cf220cf1107f3941d29d7bcdd10f79da4e6cad9766243e482011aeb5a170e1c5920b6ebdd726 SHA512 2e2298a3cf800d9de669f560269bd07ca2b76f761198af10f7174759ea95a23518dedce83f481bdd392bb60adbd736e5dd2c21af88beb761c0f589f685737586
 EBUILD ccache-4.7.4.ebuild 2489 BLAKE2B c96ba952f7f90c54812fcc1ead1bc4adf7b036937b2d80a05c0bebc54cdf3cdaac456e8918b6f4905cb38c19aa98d9c912624d22bfd76c0ae35d32e8c7cea6dd SHA512 90802b6ff902bb7cced6947824d38ea90bf8da66b48dec9cc7f1584193f4fb3f4d50217685306e1504118a55a46c6680f27b6a59368c835058171ef33f772e4b
 EBUILD ccache-4.8.2.ebuild 3691 BLAKE2B badc4104825f2084cd748ac5cfd0e128fabad802a177dd89ebe82ca428e1eab8c74094604889ae984370dc0298d0196e312872e17539ac7d0becff1848a9cb2f SHA512 879f7d2969fef27e9604f4c5c0811916fd0de6b8fed9c309b65146ca1f0394e00f2293c280b11a985545f4f546efebf9add0449cdff7939de51e9d375456871c
+EBUILD ccache-4.8.3.ebuild 3783 BLAKE2B 6d712601070506130b50b51424e65ffa00f92a449abbbd72f97e803cb0e491e8f0da21c5195c58c04e4a81d4b85d4b5d5a36dc2c49a32ae49af742e75b00b179 SHA512 a97e990cb37d9ed86b8e164ea380249cceddc2ed736144ca730f8dbd1fc303f32d95639cbbf2d91b88398889ceaef670a1e427a239ae67000d179af496810717
 MISC metadata.xml 710 BLAKE2B 0a93cf3dd4222eb2fd500c3cafdff3c01eacecc489a471270922fc5dd1daf58cd1398ddfb7ab4d271a6e84d5a3da5c3e7a341b1e7994af7b10fd432318de7c5e SHA512 dbfa6b8d8f435e25887b25ce25df65184a7f315986ee60a1c723d0e6592ca73bc7414b6650014812eb882e7e39bed953eaa21139a414043c50c018a7b780e6f1
diff --git a/dev-util/ccache/ccache-4.8.3.ebuild b/dev-util/ccache/ccache-4.8.3.ebuild
new file mode 100644
index 000000000000..b514b4aee0cb
--- /dev/null
+++ b/dev-util/ccache/ccache-4.8.3.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# XXX: We don't use CCACHE_* for these vars like we do in e.g. cmake/libabigail/qemu
+# because Portage unsets them. Aaaah!
+#
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${MY_DOCS_PREBUILT:=1}
+
+MY_DOCS_PREBUILT_DEV=sam
+MY_DOCS_VERSION=$(ver_cut 1-2)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+MY_DOCS_USEFLAG="+doc"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+	SRC_URI+=" !doc? ( https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz )"
+	MY_DOCS_USEFLAG="doc"
+fi
+
+# https://ccache.dev/license.html
+LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
+LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	app-arch/zstd:=
+	redis? ( dev-libs/hiredis:= )
+"
+RDEPEND="
+	${DEPEND}
+	dev-util/shadowman
+	sys-apps/gentoo-functions
+"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+=" test? ( dev-libs/elfutils )"
+BDEPEND="
+	doc? ( dev-ruby/asciidoctor )
+	verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )
+"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+	"${FILESDIR}"/${PN}-4.0-objdump.patch
+	"${FILESDIR}"/${PN}-4.8-avoid-run-user.patch
+)
+
+src_unpack() {
+	# Avoid aborting on the doc tarball
+	if use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc}
+	fi
+
+	default
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_configure() {
+	# Mainly used in tests
+	tc-export CC OBJDUMP
+
+	# Avoid dependency on libstdc++.so. Useful for cases when
+	# we would like to use ccache to build older gcc which injects
+	# into ccache locally built (possibly outdated) libstdc++
+	# See bug #761220 for examples.
+	#
+	# Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
+	use static-c++ && append-ldflags -static-libstdc++
+
+	local mycmakeargs=(
+		-DENABLE_DOCUMENTATION=$(usex doc)
+		-DENABLE_TESTING=$(usex test)
+		-DZSTD_FROM_INTERNET=OFF
+		-DHIREDIS_FROM_INTERNET=OFF
+		-DREDIS_STORAGE_BACKEND=$(usex redis)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	dobin ccache-config
+	insinto /usr/share/shadowman/tools
+	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
+
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if ! use doc && [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${MY_DOCS_VERSION}-docs/doc/*.[0-8]
+	fi
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
+		eselect compiler-shadow remove ccache
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} ]] ; then
+		eselect compiler-shadow update ccache
+	fi
+}
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 24144136b8b8..87fc3c4e1f08 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,5 +1,7 @@
 AUX glslang-1.3.236-Install-static-libs.patch 1460 BLAKE2B f17b5b7325e112d52a65767166530c9976833a2a893e608fe89c662a2e84feccd8e51b36a620dcf94b269cbeb96307744b4376799821dd4d4e422ad8fd887b14 SHA512 032da16afb9ca98bb0377625fc16458c641836fb3bb63940818c1bf4b068b6fe03b3f14b03cf00e10991236ca20d292293c67d02dbc429b2e3714e6a8bf85b19
 DIST glslang-1.3.250.tar.gz 3707963 BLAKE2B 24096c88307dfca765bb5fdbcebe1ec8f658ee640408f89cf2e17b3dd35c4870fa2de07403fe754991d953a4b171a75f499638c599c3045e2560fae0c871dabe SHA512 deacf79bd036ee472235ae138028c8e7d39527feda387d4ac648edf2c6e93d958b983ba85cdbb5136ff336942e220dddedf44bdc890ed731bdc942cdf1fa045c
+DIST glslang-1.3.261.tar.gz 3705459 BLAKE2B 0576d87d6172910ec8853c44920614745be7c244bd70e1f424f07de3befabf93745142ddbc242cedde7ca3c646017104bd6dec2bc6a4c1ff29ac3b4041d68a7a SHA512 dc26a6b4311319e2897141bbb424eac6fc7deec99b90ac87c1f734701a8d52d55e5a6884183583f526580fe173ace01f5a5bc666658e1699a57d2e522f0edc84
 EBUILD glslang-1.3.250.ebuild 973 BLAKE2B 919386f57885af782452f75a529139be6a81c0d709a5262cb574981988067e145bd24623fc668d9e72beade43d6eba17cf808bae4e1418806ac69850f143e268 SHA512 81a8570342bdf685bea69252a6d52b7295562ec22d1f176dddc92fcf9ea648bd2fb7ce1e827f1bd3e34b87fe59d0f10bfd8ae12faf15e652b61e903493f3d3a7
+EBUILD glslang-1.3.261.ebuild 979 BLAKE2B 1bac169298a1f7c67bf43db9eaff12c1ebbe9f379c37bcc99a87329577c1052688f68a8647ca8b2edefefe1e4ce02b05ce4870a9bdcc173eb67ee31d164c2e2d SHA512 c3031962d7b8fb0915676a02866fd2a72ee5ca8304434f5d8315426eb716183e409edbd37241275baee30a3d7f7670ca56a494d545190f618e4c7a48df75778e
 EBUILD glslang-9999.ebuild 979 BLAKE2B 1bac169298a1f7c67bf43db9eaff12c1ebbe9f379c37bcc99a87329577c1052688f68a8647ca8b2edefefe1e4ce02b05ce4870a9bdcc173eb67ee31d164c2e2d SHA512 c3031962d7b8fb0915676a02866fd2a72ee5ca8304434f5d8315426eb716183e409edbd37241275baee30a3d7f7670ca56a494d545190f618e4c7a48df75778e
 MISC metadata.xml 330 BLAKE2B c3874bbe807a8dd1a55897feadfc0a89e4cb806441390ee7e7cc317f3b533a08338a669834122ede89cefd9b6532d789aece2c29fcc6cdfc7f76a81bf382192b SHA512 1c591a28214fb76334171e4a49c8ac302b6f174f265749ad005f2503df1312e8303c92a68248775ed3db98d65107471f9cfc8cfb758c89261f283711beaac764
diff --git a/dev-util/glslang/glslang-1.3.261.ebuild b/dev-util/glslang/glslang-1.3.261.ebuild
new file mode 100644
index 000000000000..0ddc071bafdc
--- /dev/null
+++ b/dev-util/glslang/glslang-1.3.261.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
+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/12"
+
+# Bug 698850
+RESTRICT="test"
+
+BDEPEND="${PYTHON_DEPS}"
+
+PATCHES=( "${FILESDIR}/${PN}-1.3.236-Install-static-libs.patch" )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PCH=OFF
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 6b7ef6e50d95..4d78469e8483 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,4 +1,6 @@
 DIST spirv-headers-1.3.250.tar.gz 452385 BLAKE2B 17d9dc0edad8b927ed1e7d097f62c84244ce5d115c2d7123faa936df8a7275c3946aa741fa403e7b812a8e776e8a32604fabbdd1120d5e5717d9ff9233a4a22c SHA512 1179b202ebb482a2f63e623dcfb1921ad9f5f4dfe242708e6cc139d9453fbf12ad7aacde783fae20789f742303568e1d3c0c2efacfa7b40c3ac421be68470b07
+DIST spirv-headers-1.3.261.tar.gz 456103 BLAKE2B 72c63212dae5411999c0f45a4f14e0bfd91edad1df1085a66aab2dff1d44dde5021d6c4d2b0e5454cb1d8b79ff4e2e888ca97aa0f3d209502d7c5041cb325d4c SHA512 284cb51312f58782621723ac4cbfbd97e23eb4f5a719035922e32fa5d0089206fdf98d17455b907bd26c986bd7102f597f49e4f22ceaf31cd7b7ac0e9face1fe
 EBUILD spirv-headers-1.3.250.ebuild 485 BLAKE2B 07d6992389d1c0f25f1a5679f61aecfbf131f04e89d45a84a0da80f59cbf77fab92cece1c6d7f083426e894f063761e2ce56540804a6c88d660222ce38da6273 SHA512 b45f1a2d062f2274ca4f284ff58026acde56262b1bb0cbbf1c2fc855f98c72e6220c039391c47e37b5ff0f4a16782976ac95503b3f4bb58cd221c9fc178b07db
+EBUILD spirv-headers-1.3.261.ebuild 491 BLAKE2B f2a3798599b605e018e673aa95ab6da049b5574e1e5f9d6ffed0520d7af9a3ffea7d1ef2526ade11104292b26900f18f894230ff88246f787bf92d2d8d002f44 SHA512 71c17c57d9a73fc3442f406de8d8b137d5741b6cc50044773ea5afd1848efc4e3b8936cabca9783bf6052a9c081bf7ec3296ca8f2af97690dba9eb17a8aa37df
 EBUILD spirv-headers-99999999.ebuild 627 BLAKE2B 2afb9324b81fe1eba43b57ae833bcddf2e3604d5a9c3ff7642c953ee7c851d53659dab2657b5837df1de2881813b572a112553ea74a6db5a639e2dfdd1b3ec87 SHA512 905adf590cc16585ab05d5ebb8e397f144c4fcdb542ebb4b95f68dd0edc2335d3bf352817484c276e8e4f08fc70115a96a1ef865be6e870f02b008d693649758
 MISC metadata.xml 431 BLAKE2B c29407612814c966f4134687e901ffff31be3990b771b3584f6517640098ba2cdf131ae84bcdc3da8398d77d1d51e3d6fe0180c564c0e8272406d246a5661578 SHA512 599da456349756e1ec66a1b36d9c05322c5aff088dc4741239a647550ba816333a2dab0e05049215e6d4b08222e06f3aa5a1f76697c7a15eda31b571afa3299a
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.261.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.261.ebuild
new file mode 100644
index 000000000000..d1dc2b83875d
--- /dev/null
+++ b/dev-util/spirv-headers/spirv-headers-1.3.261.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Machine-readable files for the SPIR-V Registry"
+HOMEPAGE="https://registry.khronos.org/SPIR-V/"
+EGIT_COMMIT="sdk-${PV}"
+SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 2381807a2eb2..eb911c194790 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,4 +1,6 @@
 DIST spirv-tools-1.3.250.tar.gz 3113062 BLAKE2B a6951f957282eace3f65c81041070b6afd78ea87d50ef76c049827b537e94f75fbc3b7d9326ff0bcd1663d51611c7b01c8d5d8c2336ea151ab69ccb41b0ea308 SHA512 777733c6a25c5bad9802e7a33e913a051ccc3d740acb24c9255cc3ab5d08fce529991696310e3a58ca52e79a214c8dc74f811ab357135a85e82b6c10c8701289
+DIST spirv-tools-1.3.261.tar.gz 3140272 BLAKE2B 2ec477c28d62e792ea86ec460fe4a3320f6f162376822e2d30f229187bc6c9c8f61f32695f459f5f75cdc836cad0da189b4e81fc0e82869c0398ddcb367c6af4 SHA512 b494c8daf0e863f100926636c6a8e44d34b9423d548afd6ddf81dbc44b171543246a934d90e943f9bc75e180a6554c15724ab4e1f9561725abd41c46a76befb3
 EBUILD spirv-tools-1.3.250.ebuild 1139 BLAKE2B 833a35f4c755499e79dc79ece9711e8259064978648390dd1a2e35bd2ef853dd7a5af17565f9c4e8355d85ba8cb97a08c46e969cfb670baa02bec6180a23c66e SHA512 376785c2de54d17e6d5bcb69660dd506963c064a9aa3c56143276201da4b5dc5de6de231e2d0feaf5329ad53a2abb188f14d9f1b5b8485087362ccff76479ee0
+EBUILD spirv-tools-1.3.261.ebuild 1145 BLAKE2B 4b9807fcde398902b6bc269f90f2d1510b33159325eb799b7ac61bb8e32cdb4d295ef41192415c4c0867c27f2a897a070a84d1a634f739b41c71ff2f6c465fac SHA512 4c86b2177d524a11b93e57a711d4678ea4da4458cb74a208487f8697f87a5d8f90f21aefba0d24eca03d8d7eda4189a4926e38acce6da42b24ec287e32c616b4
 EBUILD spirv-tools-99999999.ebuild 1148 BLAKE2B e4093574ecbb82263180ef72f2bb93841ece149065561868aaf13456cfa7c2f80ac7f36f6b095445e1c0ad56dc2be8f70df30f6e058a206be4afee23e494f242 SHA512 0734ff5a8c4566f097e495fd508845d14dafaafc14b33481e3ee7e2b1fdfbbd2735d04069d689e0b9fd38c8fc0af1a929987a118d94c3bf05d2022178afc49b9
 MISC metadata.xml 429 BLAKE2B 8d9917ace6eaaab8b826f48bc6f38c629efc5245a5356d821632867b8a65246180dcc14927db6ed1e025a32d7bb248aa35e3a7095c79bff5a2e91b3d880de997 SHA512 3f076c95eb788258a2451c3b54a013eeb936fed744b68499f53970590fc846d79b9724198ed54300a57395b1f4f2a657840bf8aa7ff25dcef8cdf28aa7f35ae3
diff --git a/dev-util/spirv-tools/spirv-tools-1.3.261.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.261.ebuild
new file mode 100644
index 000000000000..e5c15a8932d4
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-1.3.261.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=SPIRV-Tools
+PYTHON_COMPAT=( python3_{9..12} )
+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"
+
+DEPEND="~dev-util/spirv-headers-${PV}"
+RDEPEND=""
+BDEPEND="${PYTHON_DEPS}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DSPIRV-Headers_SOURCE_DIR="${ESYSROOT}"/usr/
+		-DSPIRV_WERROR=OFF
+		-DSPIRV_TOOLS_BUILD_STATIC=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index c69093e478e7..56e7e7091dce 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-headers-1.3.250.tar.gz 1964567 BLAKE2B 1b0b44d10ff2f030b8b5f3c85befae8a1e7467e32155cebd554b97fa129d9dcc417f9035bbc537280767fc13850814ff23b759868236cac593ba53c3a791cd7f SHA512 bfd63791522a1e578b2b310c51d80e92d29dadc36085ac36f951d3b8cd87acc960494673b4b890621e9ca21beda66ba5bd5518645abc5b62fa5523a9024be259
+DIST vulkan-headers-1.3.261.tar.gz 2046060 BLAKE2B 80336cbd6363a19e251f77a0bf535c291d8507a7283cc15885a80bdae7f347524998155024e1255ab43e317fc79e63a596cf1064bea6e9cae018ce8fbd3c3414 SHA512 7781c2da5a9b7c217bbbd0fe0ce9ee5a4fc218144404a2620063048b672c1cccad2adb3bdc8d49ba92cb0889a62c60d94dc85030995bb0db9bb1bfb2e48e18d3
 EBUILD vulkan-headers-1.3.250.ebuild 594 BLAKE2B 6faa9ea68b845b6d6fc5426e4eeeb9fa133a11bb420931496137c9f563005e6be84da1a8b2ab97afc9dfe55443589aa4ddbee028712e964f5bd24d219ab9e8d9 SHA512 6b72e8ccc8a6d85669eea09484848283aaa81b10a09c48c0f5822a94c108d956f4a7f2ca1b2db07965f94bda667c380c9194135eebadcfa7e38294814484be6a
+EBUILD vulkan-headers-1.3.261.ebuild 600 BLAKE2B 0daf239aa649fb07a0cf75f53b709fdd45da34d5ab5d03bea21de97dd15871a440859ace5089d7de99665af2b1eac52ab4b312bad809d22ccb5a1ba858828a8b SHA512 c5c5e86b12dec0b97c1dcc1ef5edfa993665f99ff573892e7426ee7533829a72884e8b5eb4b19ec27d289c8cdb0c383299aa41c05f543e6af54455b2ecf06a1c
 EBUILD vulkan-headers-9999.ebuild 600 BLAKE2B 0daf239aa649fb07a0cf75f53b709fdd45da34d5ab5d03bea21de97dd15871a440859ace5089d7de99665af2b1eac52ab4b312bad809d22ccb5a1ba858828a8b SHA512 c5c5e86b12dec0b97c1dcc1ef5edfa993665f99ff573892e7426ee7533829a72884e8b5eb4b19ec27d289c8cdb0c383299aa41c05f543e6af54455b2ecf06a1c
 MISC metadata.xml 432 BLAKE2B 04c6e302b541f48dd20c84c7da9e82cad1b53d8040e796034992e8e110e3a815acc76e3067d12ce12fe2d7501d797b1e0340231d7f8216c4bf7576a053f5ffb7 SHA512 89ef7a8b4de02a0726aacaabc87904bd4f5484567d21ec6dcfa15dc7f84a3a3915a3202febf4f779fdc54762b3731cd0384235a7908c46b1adf3cbc38effa5f4
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.261.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.261.ebuild
new file mode 100644
index 000000000000..fdef9654420b
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-1.3.261.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 2644d9c44c55..9a18c946088a 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-tools-1.3.250.tar.gz 785979 BLAKE2B d496f3859d3884cc2aaffdae62db9776f56dae1a45cc74bf093517d299fb9ff4e28d6a5227436c30faeab3fb5bceed6dec1a82bc327c539c9038b1a08960ab50 SHA512 7eecdd98e6be2f5dc66b32ed9962b0b7225f94d6185b490da0a6f3c6699ef6626a4db28615c73ecf6370efd6ccd5904e352c78947ec50dec57e32ae734f134b2
+DIST vulkan-tools-1.3.261.tar.gz 801309 BLAKE2B be85d035157312c423c6f574519825facc7e9d5313126171b0b50a1605478fe271370faa55bc6732857189668f3e102ad429e4191a12e7be5e2113c1a712dcad SHA512 8bc30ead031ad6bceb7e54a1b70f26048847a30147d86638ced9d621b11ef64b1e97f41394b068458f5c8ad6e30216aba6e14765e971fa9e6a49773a47593fe5
 EBUILD vulkan-tools-1.3.250.ebuild 1895 BLAKE2B 1b71bcace1fcc8cc5c5d583b6856b47d41becc29b004172ad6a53348df7c21acd996e98f9df9948ef3073b0ad6ac788da02b7d97b501eff6256acb1afb5d5558 SHA512 cc0fa23ea5dd85387bade167131c38fb65fad1ef6cdda792c42c9925335d542b091b19a2ba708a11d484f8e574815b3c6cae84969b055d2ff5764ec558008118
+EBUILD vulkan-tools-1.3.261.ebuild 1900 BLAKE2B 97bda2609c518a4f1db8bbc53f602713e4bd76f7e78d51d9b3a937f8a8ea109aa6ca66cb6f8a896dd32ceb9bc669a9f0669fe1ba4501646a8a2734ec1204cc0a SHA512 f7b531b3f67a4b3ac6e5316fe84b6ea783171d61ee20dbf2c3be71bbb634a6ec41a0456a8deaa46f20725c527943ad8fd1bb19e58e65a2942072f3f247ea9325
 EBUILD vulkan-tools-9999.ebuild 1900 BLAKE2B 97bda2609c518a4f1db8bbc53f602713e4bd76f7e78d51d9b3a937f8a8ea109aa6ca66cb6f8a896dd32ceb9bc669a9f0669fe1ba4501646a8a2734ec1204cc0a SHA512 f7b531b3f67a4b3ac6e5316fe84b6ea783171d61ee20dbf2c3be71bbb634a6ec41a0456a8deaa46f20725c527943ad8fd1bb19e58e65a2942072f3f247ea9325
 MISC metadata.xml 500 BLAKE2B 9fb4ff756cb14accac7b9c8e262ba8fc0108f68acaeaad81085ea91939ef683a21dfdb68ac4689e71c6b3b490e758af2711b1c436c65a7aa0e3b030aec982c93 SHA512 03a8e309f115934d5195da8aaa7bcd3e4f95f28269671a2eb8426941bb9bae815bcd3448d2e97006ddb2ab7ec52179117604b6fbf0f293e4285b303da573d435
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.261.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.261.ebuild
new file mode 100644
index 000000000000..1269dcab52ee
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.3.261.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-Tools
+PYTHON_COMPAT=( python3_{9..12} )
+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}
+	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_WERROR=OFF
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
+	)
+
+	use cube && mycmakeargs+=(
+		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
+		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
+	)
+
+	cmake_src_configure
+}