diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index 461158c3ba6b4..b5a3723f4a8e6 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -1,5 +1,7 @@
 DIST SPIRV-LLVM-Translator-8ef804541897a80384ae8aaaf0265ef014d0d747.tar.gz 1858936 BLAKE2B 6bc6a075054acde99724b4bb83903098ca4da4f896fe082c8cb8f2cc51044b3c0dbbf4e14b87d6df1de237bb46c77d9b0bed2555032ab29638ee717f581fd71a SHA512 f88315a4ff3ecbcf2108295ae73d891b45ac3867c9a24e1de855a113d59148a41fe03fc76886aa284738c4d01d92f52a51d410078fe501e4da4e1650919f91b2
+DIST SPIRV-LLVM-Translator-93ca5f905e3c1e9359e77d8b3191999bd5ce2c93.tar.gz 1864438 BLAKE2B 5e342209d8295daf203a6e644ec478994df81e75519e43a02fe0aea092b1ac15fef4f6e8af03a786338542bf69e96a909b58d761cb139ae403c257dc3bfc390f SHA512 575782d1185cba35a772412a0e5cf35950e13349c022069ab92c3b37249f70c94cb8a917dc30ba0485312d86feae253665177d6bf0836584ed79197283fbf8c5
 DIST spirv-headers-01e0577914a75a2569c846778c2f93aa8e6feddd.tar.gz 545892 BLAKE2B 7e6e0b6e0963a983e89c5f54e99c8013c6a4f491c87440aedb3bf747ef4e99f14bb0e2a85d67570531dcb536d39b94dbbe7459f8f8d0209eca929d66d50eb03b SHA512 e2b90e95b6f492e640cd27c090d7072f0d03c8fc7382be67cbe176fc8f3fdd78b59f5f0b906198e09808fde645427f409cb9ab8fe4843de7f7dc5b510d454a0a
+DIST spirv-headers-9268f3057354a2cb65991ba5f38b16d81e803692.tar.gz 546201 BLAKE2B 850d4cf42dae126330f7121e703f62593811c0ea8eedd4ed5b4de07ec425938820abe3af93c47049fcf6f6dd4e34b686aa8f825aada54c6351b3c9420ce6a7db SHA512 cc80f6a4d793dfaa55e24a44145b6ff3c4d9400331ff0cb975f6d287ddf35c366bd5d604e7b5243eea806153476965ae03ae1f600ef21419fae4d9f733166a89
 DIST spirv-llvm-translator-15.0.15.tar.gz 1635429 BLAKE2B 821cd883481c63263b57b0fbf97776174e3e1f939639c4b83c244afdfcb0c06a73f829b56388f0f52eb2215fe4c04e96bc6ec24926947d055c5d9534cf5f470e SHA512 5f80d57ac61f5ed634bd8e967a1f365e27849555a39e5ca86cfbee0bbce80d8da05fec96b78d91bb7a5026da6c088e9b70593067aecb6b0fe4ce8e2fb2d749be
 DIST spirv-llvm-translator-15.0.17.tar.gz 1654324 BLAKE2B 10226173ee596719a7eac7aa0b0eea5a0f919934602a68933357e71560088fd31e589d9428f6353d296d49c165c8cec0b7477a328966eedae3cefd36d58e07a3 SHA512 b997857b6d0f696729034ccc47f024f6db47c495178bd441f5658ae50f57cefdec7d3219ce1c2392f53b7729a43e7ca0161b030b727bc08562b6c173b32091a1
 DIST spirv-llvm-translator-15.0.18.tar.gz 1655118 BLAKE2B bf3ef7ffcb33911761ad0ccb60da4a53faed3a1f4b731ecd532abcc8468533e7e7fcb869d4fd29108ba306b59ae5612cd6c581b9d5fd93ee0d68ec15f99eedac SHA512 d62d30a2c7d6790ebe085343739eb01f57e0fa7609ce514d75cc169f7dd459a886952c679321108625e13563d1d456f12067a94583e0176f95d253134cf4c409
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-22.0.0_pre20251123.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-22.0.0_pre20251123.ebuild
new file mode 100644
index 0000000000000..eb483f0d45ec3
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-22.0.0_pre20251123.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# spirv-headers-tag.conf
+HASH_SPIRV="9268f3057354a2cb65991ba5f38b16d81e803692"
+LLVM_COMPAT=( 22 )
+MY_PN="SPIRV-LLVM-Translator"
+EGIT_COMMIT=93ca5f905e3c1e9359e77d8b3191999bd5ce2c93
+MY_P=${MY_PN}-${EGIT_COMMIT}
+
+inherit cmake-multilib flag-o-matic llvm-r2 multiprocessing
+
+DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+SRC_URI="
+	https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz
+		-> ${MY_P}.tar.gz
+	https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
+		-> spirv-headers-${HASH_SPIRV}.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/spirv-tools[${MULTILIB_USEDEP}]
+	llvm-core/llvm:${SLOT}=[${MULTILIB_USEDEP}]
+"
+# We need to use currently newer spirv-headers, as stable release is too old..
+# DEPEND="${RDEPEND}
+#	>=dev-util/spirv-headers-1.4.313.0
+# "
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lit
+		llvm-core/clang:${SLOT}
+	)
+"
+
+src_prepare() {
+	append-flags -fPIC
+	cmake_src_prepare
+
+	# do not force a specific LLVM version to find_package(), this only
+	# causes issues and we force a specific path anyway
+	sed -i -e '/find_package/s:${BASE_LLVM_VERSION}::' CMakeLists.txt || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCCACHE_ALLOWED="OFF"
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
+		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${WORKDIR}/SPIRV-Headers-${HASH_SPIRV}"
+		-DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die
+}