15 files changed, 124 insertions, 403 deletions
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 4dfe90746ff5..b1b4ce5a43f1 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,4 +1,3 @@
-DIST glslang-1.4.321.0.tar.gz 4205817 BLAKE2B b6232a6ea85a4a690e1b12c0cd904f55eaa12fe57e8ceef64c4ae863e38b994a1ee01668b3ab1cf619e81a5899e8bb7e08cd79855c59571cc30f99eec4418034 SHA512 284c662e3902d443145e3cc9dc7d68ecadaf4a78d2d66d144624cbcb4235e1c7384712448a929b5fd4b412abddc879e9630ba0e92f62af5b57776122bf19d8cf
 DIST glslang-1.4.328.0.tar.gz 4193518 BLAKE2B db02d964e1cd1ec26050b7733d9e7b43835fc18e28dddc21e9ae0afa5914dcd92137535bafb8c888765b6f937f022254982f70a72597094f6efba9126590b126 SHA512 a732b1bfa6b4420cccfeccd2ea31fd72f026c3cd5e9e36ac906b86f15f7470ac3c0a32a22f3d9a0219d8d6c7d059a09f528e3166de129075d0c3acf63c5cd3e7
 DIST glslang-1.4.335.0.tar.gz 4247137 BLAKE2B 0a714296f02948ae19647258f04b51ffec1c6955b7cc634dfe34fa93f48c43c8c5e47fcf0f563394921e41740869b402b4c8e6cf6be8a6b6c11097ec8d67b401 SHA512 4b3774f745b80a8ed8169504d7f649fd92351281f459359288e5a4837e257039d32ece63a29bfc9367a3cb5383ec2ab7bfda6be091ba7928d9f7666776a795cb
 DIST glslang-1.4.341.0.tar.gz 4297511 BLAKE2B c9f5c1be4625e87dd79c1a16aaf7933c2607df507915f724f37d06a2d8d9b839b52a18f55076ed5138f1dea93f2328dfc499705639b741945ecd7257fa8b5a18 SHA512 f243830836f0ba6f13d6e2ccb48cee3c41f8478e0315b190f3a8e607d3723e7e687102126131a7ecc6eed5899b9de1b69c76f6f795f0f13703931e5041c47906
diff --git a/dev-util/glslang/glslang-1.4.321.0.ebuild b/dev-util/glslang/glslang-1.4.321.0.ebuild
deleted file mode 100644
index fa42e0229a0c..000000000000
--- a/dev-util/glslang/glslang-1.4.321.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..14} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
-	inherit git-r3
-else
-	GIT_COMMIT="vulkan-sdk-${PV}"
-	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}/${PN}-${GIT_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/15.4"
-
-BDEPEND="${PYTHON_DEPS}
-	~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}]
-"
-
-DEPEND="~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PCH=OFF
-		-DALLOW_EXTERNAL_SPIRV_TOOLS=ON
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/mesa_clc/Manifest b/dev-util/mesa_clc/Manifest
index b3bf8143b623..0343efd73051 100644
--- a/dev-util/mesa_clc/Manifest
+++ b/dev-util/mesa_clc/Manifest
@@ -6,3 +6,4 @@ DIST mesa-25.3.5.tar.xz 43473072 BLAKE2B 284bc47b27cdf4a8dac247b02ed8d0950009d8a
 DIST mesa-25.3.6.tar.xz 43485532 BLAKE2B ee3570c4f704ab7dea3d825aff3c6d46894ec1f52c9036c76273f68c76012fb7ecb9e9a3f97d92011fbff1593d0ec64a92d417217d5c2efd6c1f71ff5b266dd4 SHA512 73620003e1e67c6b5ad076afb19e0b250214cfb6ed830166fb70058173ec3b19a2a8f5b5a78d8cce7a70745f5e4fa439913d15d8b38ca0002455b238f5865d38
 DIST mesa-26.0.0.tar.xz 43776320 BLAKE2B 28193a6e5ddcb8babe5176a23e4e0ccb32b2ab362e99f9755d26868483d2f19d96ebce8a6ff023ebc5c2a5134c962486758e6e5bd95052de6ba18bcd038ad438 SHA512 d39d190d0a17306f0aa69033e38dd8cf458dbf8da483b768841e2dc681dd670735999b212fbe0b29be839702a20750c87d6587bd925dca10693950830a17cd55
 DIST mesa-26.0.1.tar.xz 43803076 BLAKE2B 927782ac7500b75b3e146cb2bf42965cbaa414da4141e19d90bfe87365273ce647e4bbf32987a42d6e83e34c31c0614b6296fa3fa8bba32c79124b2a37c76319 SHA512 d47072257035acfa8a5594c0cda831b4e5178169dea8a06c6657268a441e32271f8798486e837cea23f35ce3f0b4b9520a4ea4ed26b0e1267b02da4c649bc9f9
+DIST mesa-26.0.2.tar.xz 43830900 BLAKE2B ab15b94cd59afcd2cdfb6efab58c703965697b42b6750c71ed07c60f50310aee67474c7dc208d6d72aa2a497bdb19b135b0218c41788eaa104b0d7b71824bfd8 SHA512 0a7b9fc9b09e40345cc22d246dc1656900d74754c093882f6a39623af17fddc5f4a0c7938207c784ccf7306c5ed497be6a02c36f95c6548e01a2faa085e04c35
diff --git a/dev-util/mesa_clc/mesa_clc-26.0.2.ebuild b/dev-util/mesa_clc/mesa_clc-26.0.2.ebuild
new file mode 100644
index 000000000000..746023621fa9
--- /dev/null
+++ b/dev-util/mesa_clc/mesa_clc-26.0.2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 2023-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {18..21} )
+PYTHON_COMPAT=( python3_{10..14} )
+
+inherit llvm-r1 meson python-any-r1
+
+MY_PV="${PV/_/-}"
+
+DESCRIPTION="mesa_clc tool used for building OpenCL C to SPIR-V"
+HOMEPAGE="https://mesa3d.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	S="${WORKDIR}/mesa_clc-${MY_PV}"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	S="${WORKDIR}/mesa-${MY_PV}"
+	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+VIDEO_CARDS="asahi panfrost"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+IUSE="${IUSE_VIDEO_CARDS} debug"
+
+RDEPEND="
+	dev-util/spirv-tools
+	$(llvm_gen_dep '
+		dev-util/spirv-llvm-translator:${LLVM_SLOT}
+		llvm-core/clang:${LLVM_SLOT}=
+		=llvm-core/libclc-${LLVM_SLOT}*
+		llvm-core/llvm:${LLVM_SLOT}=
+	')
+"
+DEPEND="${RDEPEND}
+	dev-libs/expat
+	>=virtual/zlib-1.2.8:=
+	x11-libs/libdrm
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep "
+		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
+		dev-python/packaging[\${PYTHON_USEDEP}]
+		dev-python/pyyaml[\${PYTHON_USEDEP}]
+	")
+	virtual/pkgconfig
+"
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
+}
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	tools_enable video_cards_asahi asahi
+	tools_enable video_cards_panfrost panfrost
+
+	tools_list() {
+		local tools="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${tools//$'\n'/,}"
+	}
+
+	PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
+
+	use debug && EMESON_BUILDTYPE=debug
+
+	local emesonargs=(
+		-Dllvm=enabled
+		-Dshared-llvm=enabled
+		-Dmesa-clc=enabled
+		-Dinstall-mesa-clc=true
+		-Dprecomp-compiler=enabled
+		-Dinstall-precomp-compiler=true
+		-Dtools=$(tools_list "${TOOLS[*]}")
+
+		-Dgallium-drivers=''
+		-Dvulkan-drivers=''
+
+		# Set platforms empty to avoid the default "auto" setting. If
+		# platforms is empty meson.build will add surfaceless.
+		-Dplatforms=''
+
+		-Dglx=disabled
+		-Dlibunwind=disabled
+		-Dzstd=disabled
+
+		-Db_ndebug=$(usex debug false true)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/src/compiler/clc/mesa_clc
+	dobin "${BUILD_DIR}"/src/compiler/spirv/vtn_bindgen2
+	use video_cards_asahi && dobin "${BUILD_DIR}"/src/asahi/clc/asahi_clc
+	use video_cards_panfrost && dobin "${BUILD_DIR}"/src/panfrost/clc/panfrost_compile
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of tools to enable
+tools_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		TOOLS+=("$@")
+	fi
+}
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index e1cca6d8fecf..c966bbe36162 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,4 +1,3 @@
-DIST spirv-headers-1.4.321.0.tar.gz 538412 BLAKE2B 65640250e4011323ddd44aad07ce7b6fab68808331b1e7a2fbed15542d099d6ba1353cd3b2c51c9f75deb55ee1e4dca9be766ae656721f6e3cf55191d76886cd SHA512 ea28714ba07d98e8a2baca482f9c483ae525f40d03aa7987b56c1561e1f0a2c66782b620b41fc8782c7cbb4979d5125c28a20f706a25909aacca6ebee184d467
 DIST spirv-headers-1.4.328.0.tar.gz 545592 BLAKE2B 403a901f3dbc567ae75124ee048c32ef910d68a64f97f9c9ce7e322b53daf52089f816538202104a98898582587453f364cab540fa3dd2257c533bbfb15e13ee SHA512 8b4f9a0f678184fbdc9a56831ecbbc83d561555bbac2b84df91e7a00f56e8905f1e107a9a497e98ae93b231b0789661110d0e247829da14e57edd14ee40ceea5
 DIST spirv-headers-1.4.335.0.tar.gz 558628 BLAKE2B e059cfac502d393e56ebafba47bc11f49cbe619690bddfba7ebbeffc2a503734e79e8c89f3aff18bbf87377693a0d13077b6a71ca1e25a6a4332afe99e3dba43 SHA512 4906f5b310d176d7c5e83f9a4ec0b6006a39d278a6fce50f5ef29a4d5b287e5823d28007f5015b1dba60d9db352c3bb1a6190bb07ff3a6940b5a5c3ce19ee985
 DIST spirv-headers-1.4.341.0.tar.gz 561287 BLAKE2B 264ef29628a5644a099ebf352fe492f32e7b9eefbd2ca51821d7910d9611f7bb532b3342b6bfab9448337e31cc7f8cf6e15fd1e36de68799a7e94b6bb30998fa SHA512 d624371dd455c66a300344c89812598ffe11b5eedba555779f789e85c29dc67317741858c60e0744a1e6755cc0d2759b8659f0674f4cc31479c4cb6fc25ed23b
diff --git a/dev-util/spirv-headers/spirv-headers-1.4.321.0.ebuild b/dev-util/spirv-headers/spirv-headers-1.4.321.0.ebuild
deleted file mode 100644
index 6c7db0458302..000000000000
--- a/dev-util/spirv-headers/spirv-headers-1.4.321.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=SPIRV-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/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
-fi
-
-DESCRIPTION="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://registry.khronos.org/SPIR-V/ https://github.com/KhronosGroup/SPIRV-Headers"
-
-LICENSE="MIT"
-SLOT="0"
-
-src_configure() {
-	local mycmakeargs=(
-		-DSPIRV_HEADERS_ENABLE_TESTS=OFF
-		-DSPIRV_HEADERS_ENABLE_INSTALL=ON
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index a2b8768adca4..903d4cdbebbd 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,4 +1,3 @@
-DIST spirv-tools-1.4.321.0.tar.gz 3336926 BLAKE2B a7a5d9c8ccd8c224ceb4199fe03eb393cf0b931a8b060d825fc91fecc43f5444e63e8f8ea5d00589acda5981b8a8a51b53bc054f590a133bba20a607b303f7cf SHA512 ae133c7b27b2a4f472ecb2928120a3beec01fb306abfe5c1e315982d8ad98f67be8639e646c1172a5257d4a9010b000e6a5924b567d7878bf942a7b87cac4abc
 DIST spirv-tools-1.4.328.0.tar.gz 3393733 BLAKE2B fe0639e4a970ab041343587d654ca6629ed2e4eb841ac482e762a6bd1d0164901ada658960b865c5781699ac151eb4807f3d7d9b19ff8935e2a92ff2285e2e1f SHA512 a87f8ba15a0a58e34fe0de9a3eaf0e299deccd9ec98f0c27566d4dfd15abcce3f2599df93c8bfeb287b3ef3b8e4ff34332bca83e21204d75068ab21d8dd30229
 DIST spirv-tools-1.4.335.0.tar.gz 3424516 BLAKE2B b15438d4cea587e2ece3eff46c8fd50d0e698932943bc685c53a2ee1310124ac32c5f976be01ad667ace9f7b8011eefadc2018b2561eaa1055bce26cc5f8995c SHA512 57c394422d73655559a9a9ba72d96cf376269547824a827023b9626fa8d63ab8df7bb1391dbc56d2b566decde592717d525c68633791105f8b82ed70624f241f
 DIST spirv-tools-1.4.341.0.tar.gz 3455701 BLAKE2B cfcbbd215c925d0f80eabcc54ebfa3ec994d9d3b00d91113726fa9fc91773015cc6a495ea5e240b7d4f3c651cdb20fa21eefb59491c0e0990cbb69c994e6f108 SHA512 429954f382e3a4006c012642509d0530001eb56e802686f35b1dd33a21167e08e2b164cb2f32e8acdd66da7f5bea6046aa184945d7138d3b0b929e512437c40d
diff --git a/dev-util/spirv-tools/spirv-tools-1.4.321.0.ebuild b/dev-util/spirv-tools/spirv-tools-1.4.321.0.ebuild
deleted file mode 100644
index f4695f09b6da..000000000000
--- a/dev-util/spirv-tools/spirv-tools-1.4.321.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=SPIRV-Tools
-PYTHON_COMPAT=( python3_{10..14} )
-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="vulkan-sdk-${PV}"
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc 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"
-IUSE="test"
-RESTRICT="!test? ( 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_SKIP_TESTS=$(usex !test)
-		-DSPIRV_TOOLS_BUILD_STATIC=OFF
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	CMAKE_SKIP_TESTS=(
-		# Not relevant for us downstream
-		spirv-tools-copyrights
-		# Tests fail upon finding symbols that do not match a regular expression
-		# in the generated library. Easily hit with non-standard compiler flags
-		spirv-tools-symbol-exports.*
-	)
-
-	multilib-minimal_src_test
-}
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 5539863d04fa..3a9c82cdf0e5 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,4 +1,3 @@
-DIST vulkan-headers-1.4.321.0.tar.gz 2760195 BLAKE2B 4ba6770ca648d91afb94f6e6c8b88bee6f0dfc77f329e98b124a9d2da4eab44bf5a466e1e1451e58e1f9bed04326ac0454c659782a204625cd042d8d05dc9d44 SHA512 e69e56a53bbe75557d7fcf23879ef1ebcebec2187d0d1122563e78a6aee3999b832431c7b4b9a934f280a07aacca367b8f2dd087cf88e085826945fddb894cd6
 DIST vulkan-headers-1.4.328.0.tar.gz 2765889 BLAKE2B 87626665045956d600bfea1c520ebe9f3d00ed33b24ed566112a3e9fbad641963316e81e610bbb0e7caf6dabe5756e5aa6e338aa574a378cfb445f94030bf4b6 SHA512 613a330e37cb4c4c4d17d77e10d47e7482a6cd143a1ae618fdd0f2f0af05b1cdb4ddeebc44f6395d6dee5766a322b9ea9a16ad3cf9e4fffef30d804b976093ee
 DIST vulkan-headers-1.4.335.0.tar.gz 2871481 BLAKE2B 9c13381381e1ce3f2a26c3a56f89c163f946e35680e011d4285d24529c1faef219ddf472eb344666d662e58d738d4d497a247bf13474c1ebe1eefdb8bd29c84b SHA512 1ec6aabf2267137dfe661fdc36bc25cc44b7c3ac3c6f0bbd8a1a1f5da30619e244ebfb905620c30002b914525d37ac7933f5a7dfd10117888f66d7c1b129612f
 DIST vulkan-headers-1.4.341.0.tar.gz 3058600 BLAKE2B 1806b1e982e84f64c6db699e8ba33666edcfd734e42ec0db7a48fce905488831d88021d3b633b9eea5e55f8d68abda6ff39db69c09ae931351f0bfbac1221c2a SHA512 aa6d517304663c55c67bdd8578518a399a1188c6c3a92fac4ee29738f96f6a66b61ebc9c606c20d52f5cbb47976757bfcab35576eca7c839dfda1cdd65074c29
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.4.321.0-r1.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.4.321.0-r1.ebuild
deleted file mode 100644
index 0b9cc056c852..000000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.4.321.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2025 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/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
-fi
-
-DESCRIPTION="Vulkan Header files and API registry"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DVULKAN_HEADERS_ENABLE_MODULE=OFF
-		-DVULKAN_HEADERS_ENABLE_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	# VULKAN_HEADERS_ENABLE_MODULE doesn't seem to be working so just
-	# delete the modules manually
-	cmake_src_install
-	find "${ED}" -name "*.cppm" -type f -delete || die
-}
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 72883b5aca05..f61292617f7f 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,4 +1,3 @@
-DIST vulkan-tools-1.4.321.0.tar.gz 807441 BLAKE2B 81ead6eabd9089203d4f092693f6aafba0e4ffd4f6e8fa0d8f5442353efdfb390314d366a67d842d87a9cb2db5a0d24d30f1455cfc3eedfe6dffe34f4c79c670 SHA512 163b6348064b807ae22ed14945d558fdb18789af22f4bca4dcd017699eef41bae4ca86114297c02f6caed7206882676fca9bc58b9acdae2db46356d266af307a
 DIST vulkan-tools-1.4.328.0.tar.gz 798521 BLAKE2B a65a4ff396d8ecb0da4bbf4c3541f1b30b7338d78fe3f348b3fcc564e4d503e23f6101392d3352e823d29286c510b199a6e36599f626c4350b5afa4d6e2ba272 SHA512 61ff1b61efd536c10ab6edc71c56bec9fe5ca42c827fae6dfc5af84c729597143c9530b5a050c95fa4a8c4eb390ad8956bdd8f42d29ffa1da2e53397073fa0b0
 DIST vulkan-tools-1.4.335.0.tar.gz 791395 BLAKE2B 9a043e05e44b761a5b23326f33b16429652b11b43c500dd6ff5104c0959dd8bd37f3f75f94827555ddaa99e779eebc508b719f9ebb2945a8a2fb7083db5decbf SHA512 6563105c9ebcd57fea0afeaaf81e03b11dfe893037ca8fd2ae688e0ce4d55b74c274cdf66a207c6bbb67f8e30761976423b1e13ef2e8e3246076de97051e5b6d
 DIST vulkan-tools-1.4.341.0.tar.gz 804878 BLAKE2B 8701c16818475c0afe5e5b6c8adee2a153c188ed93ea7daf5b1b60ec733e649f8c3ac66b7f51f91c3ced305c752f5e56fc40133382a15d5eeaa616bb4fd0e86d SHA512 0fad33d732e034489acea4745abfb21fb27619114bfdfa0923cc4baa7e22be65c1dfd10309bfdd9926fe943cd1c8d86521fbd7c326ce46a7c468e1428736db29
diff --git a/dev-util/vulkan-tools/files/vulkan-tools-1.4.321-fix-cube-wayland.patch b/dev-util/vulkan-tools/files/vulkan-tools-1.4.321-fix-cube-wayland.patch
deleted file mode 100644
index 024d81a7338e..000000000000
--- a/dev-util/vulkan-tools/files/vulkan-tools-1.4.321-fix-cube-wayland.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-https://bugs.gentoo.org/959725
-https://github.com/KhronosGroup/Vulkan-Tools/issues/1130
-https://github.com/KhronosGroup/Vulkan-Tools/pull/1134
-https://github.com/KhronosGroup/Vulkan-Tools/commit/105d6c1fede00c3a9055e5a531ebf3d99bac406e
-
-From f546743016f5301c063f2c50af0ea43dd2485ef4 Mon Sep 17 00:00:00 2001
-From: Charles Giessen <charles@lunarg.com>
-Date: Thu, 17 Jul 2025 09:56:40 -0500
-Subject: [PATCH] build: Remove pkg-config provided library names
-
-The library names of Xcb, Xlib, and Wayland do not need to be queried from pkg-config,
-instead they can be hardcoded to use the fallback names.
-
-The intent of querying the library names was to prevent issues where the hardcoded name
-was not the platform-appropriate name. But because <library>_LINK_LIBRARIES can have
-more than one library name, the logic to assign <library>_LINK_LIBRARIES into a compile
-definition breaks horribly. While it is possible to handle this in CMake, the dlopen code would
-also have to handle it which is much more error prone.
---- a/cube/CMakeLists.txt
-+++ b/cube/CMakeLists.txt
-@@ -307,16 +307,6 @@ if (ANDROID)
-     return()
- endif()
- 
--if (XCB_LINK_LIBRARIES)
--    target_compile_definitions(vkcube PRIVATE "XCB_LIBRARY=\"${XCB_LINK_LIBRARIES}\"")
--endif()
--if (X11_LINK_LIBRARIES)
--    target_compile_definitions(vkcube PRIVATE "XLIB_LIBRARY=\"${X11_LINK_LIBRARIES}\"")
--endif()
--if (WAYLAND_CLIENT_LINK_LIBRARIES)
--    target_compile_definitions(vkcube PRIVATE "WAYLAND_LIBRARY=\"${WAYLAND_CLIENT_LINK_LIBRARIES}\"")
--endif()
--
- # ----------------------------------------------------------------------------
- # vkcubepp
- 
-@@ -360,16 +350,6 @@ target_include_directories(vkcubepp PRIVATE .)
- target_compile_definitions(vkcubepp PRIVATE ${ENABLED_CUBE_PLATFORMS})
- target_link_libraries(vkcubepp ${CMAKE_DL_LIBS} Vulkan::Headers)
- 
--if (XCB_LINK_LIBRARIES )
--    target_compile_definitions(vkcubepp PUBLIC "XCB_LIBRARY=\"${XCB_LINK_LIBRARIES}\"")
--endif()
--if (X11_LINK_LIBRARIES)
--    target_compile_definitions(vkcubepp PUBLIC "XLIB_LIBRARY=\"${X11_LINK_LIBRARIES}\"")
--endif()
--if (WAYLAND_CLIENT_LINK_LIBRARIES)
--    target_compile_definitions(vkcubepp PUBLIC "WAYLAND_LIBRARY=\"${WAYLAND_CLIENT_LINK_LIBRARIES}\"")
--endif()
--
- if(APPLE)
-     install(
-         TARGETS vkcubepp
---- a/cube/wayland_loader.h
-+++ b/cube/wayland_loader.h
-@@ -80,9 +80,6 @@ static PFN_wl_display_disconnect cube_wl_display_disconnect = NULL;
- 
- static inline void *initialize_wayland() {
-     void *wayland_library = NULL;
--#if defined(WAYLAND_LIBRARY)
--    wayland_library = dlopen(WAYLAND_LIBRARY, RTLD_NOW | RTLD_LOCAL);
--#endif
-     if (NULL == wayland_library) {
-         wayland_library = dlopen("libwayland-client.so.0", RTLD_NOW | RTLD_LOCAL);
-     }
---- a/cube/xcb_loader.h
-+++ b/cube/xcb_loader.h
-@@ -88,9 +88,6 @@ static PFN_xcb_screen_next cube_xcb_screen_next = NULL;
- 
- void *initialize_xcb() {
-     void *xcb_library = NULL;
--#if defined(XCB_LIBRARY)
--    xcb_library = dlopen(XCB_LIBRARY, RTLD_NOW | RTLD_LOCAL);
--#endif
-     if (NULL == xcb_library) {
-         xcb_library = dlopen("libxcb.so.1", RTLD_NOW | RTLD_LOCAL);
-     }
---- a/cube/xlib_loader.h
-+++ b/cube/xlib_loader.h
-@@ -72,9 +72,6 @@ static PFN_XFlush cube_XFlush = NULL;
- 
- void* initialize_xlib() {
-     void* xlib_library = NULL;
--#if defined(XLIB_LIBRARY)
--    xlib_library = dlopen(XLIB_LIBRARY, RTLD_NOW | RTLD_LOCAL);
--#endif
-     if (NULL == xlib_library) {
-         xlib_library = dlopen("libX11.so.6", RTLD_NOW | RTLD_LOCAL);
-     }
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.4.321.0-r1.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.4.321.0-r1.ebuild
deleted file mode 100644
index e4c458418ca3..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.4.321.0-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=Vulkan-Tools
-PYTHON_COMPAT=( python3_{10..14} )
-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/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv"
-	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
-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 test X"
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-	cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libxcb:=[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	~dev-util/vulkan-headers-${PV}
-	X? ( x11-libs/libXrandr[${MULTILIB_USEDEP}] )
-	test? ( ~media-libs/vulkan-loader-${PV}[${MULTILIB_USEDEP},wayland?,X?] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/vulkan-tools-1.4.321-fix-cube-wayland.patch
-)
-
-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 -DGIT_BRANCH_NAME=\\\"gentoo\\\" -DGIT_TAG_INFO=\\\"${PV//./_}\\\""
-		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_VULKANINFO=ON
-		-DBUILD_CUBE=$(usex cube)
-		-DBUILD_TESTS=$(usex test)
-		-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"
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	if use cube; then
-		einfo "As of version 1.4.304.0, the window system for 'vkcube' and 'vkcubepp'"
-		einfo "can be selected at runtime using the '--wsi' runtime argument."
-		einfo "For example, Wayland can be selected using '--wsi wayland'."
-		einfo "As such, 'vkcube-wayland' has been removed and the runtime argument"
-		einfo "must be used instead. See 'vkcube --help' for more information."
-	fi
-}
diff --git a/dev-util/vulkan-utility-libraries/Manifest b/dev-util/vulkan-utility-libraries/Manifest
index 886faa53fc2b..67ecc7611458 100644
--- a/dev-util/vulkan-utility-libraries/Manifest
+++ b/dev-util/vulkan-utility-libraries/Manifest
@@ -1,4 +1,3 @@
-DIST vulkan-utility-libraries-1.4.321.0.tar.gz 625949 BLAKE2B b283c2a716472d77ba12f07221f043afeb457615538b92a4544f478ec9face954ec970a6443d56b5f949a051d047d913e94a5ce5666bcf754b0a6eb7b1292cda SHA512 764e3150aee1a13a81ff66f8b8690c4aa1874bd91a811470ff7dd5cd8d0e79d10f7e4d84962300bdf19405944d7b69c2840175d319e0718bfb19841373bcba22
 DIST vulkan-utility-libraries-1.4.328.0.tar.gz 1241530 BLAKE2B 21cafbcf066b69340d7c36851f9fb3174c7795d40160e52327a01f0a5800ab8cdf119d5eba8f12199476be32503d60509308b9acfc3b6033c4c86c5558fc649a SHA512 598c03da7c4a76be6ee95d74fc4a00908b0dc3165e82ec0eec01c329c0a79654d827f8eeada8d9b4e173443b848c15cd71c23c965ac799d7d4d354cf76cc68e9
 DIST vulkan-utility-libraries-1.4.335.0.tar.gz 1505429 BLAKE2B f165d70024a7cdccf535ceebdc9a09e0d4f3c3402b782f84fb9da75d3bbcd64cabbcd8aa59cc0b2b3ad1534b79c1e57d9044c277a6062750c4abe009502f8216 SHA512 ed46883cf35c888f9fd77c433a5b612a81c267b263c0e6ac4441ea677112584375529485767f69ec3628664b2ffe4005bc1f90e1f0c1a53d27b2998a8552564a
 DIST vulkan-utility-libraries-1.4.341.0.tar.gz 1517906 BLAKE2B 436277d4cc6b528bd4f6801bde15b3c8f31c6210ccc1bbdb203141f5768db5fbc7e89672d2bee50f7548125448056d88dbb1b56ad730f63afb98a28b2f4fee04 SHA512 254b2f6e11ce8baac5ddb3f3ae0abf55b2cb4e5f5e1883826d57b5becab6b01176e832b4451c6080a4a1ef945cd5e634a78018e2fe6d1ace2e487c1770ef4b0f
diff --git a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.4.321.0.ebuild b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.4.321.0.ebuild
deleted file mode 100644
index 3a8bbec319f2..000000000000
--- a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.4.321.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=Vulkan-Utility-Libraries
-PYTHON_COMPAT=( python3_{10..14} )
-PYTHON_REQ_USE="xml(+)"
-inherit cmake-multilib dot-a python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	inherit git-r3
-else
-	EGIT_COMMIT="vulkan-sdk-${PV}"
-	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="Share code across various Vulkan repositories"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Utility-Libraries"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="~dev-util/vulkan-headers-${PV}
-	test? (
-		dev-cpp/gtest
-		>=dev-cpp/magic_enum-0.9.7
-	)"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.313.0-magic_enum-0.9.7.patch
-)
-
-src_configure() {
-	lto-guarantee-fat
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	strip-lto-bytecode
-}