diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index 6dd0e82272c7d..682f57185d511 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -1,6 +1,12 @@
+DIST opencl-clang-17.0.10.tar.gz 60029 BLAKE2B 59229343ae8ee3c81f11dcb550bbcf09a4e80aad32438aa9f7180e316ea28a9585db40de35ac9d912ae7962ee7a896bafe27373bcfaf2da74343b99a436b8042 SHA512 c634fea76e8d44c50f998fb5761d3ac4a4d0d1847a40ad746a092f9dfb61f40fb16901a52b348c0be06b694688e2af96e37203b2c1313ca437d5996a5d0680f2
 DIST opencl-clang-17.0.8.tar.gz 41372 BLAKE2B 9c7d6b4ab277084d9731d3ccc5be918d5a2e59381050dc58f0a2c9f3b79efc3b12be69a2044db13186d484c8d1b397b4d4e8e69ca4756588c96f89c92df00190 SHA512 018003729903b2487385b94c6ea609fbef325a087dca14a4f1e4ecdcf40377df7b3bce3bf144539bca4b3018d4c32249411656a9bfa27c1c4e615068ec86165d
 DIST opencl-clang-18.1.7.tar.gz 36888 BLAKE2B eba2f8359c7af4e9b3919631a1e01fd94b6eec9e7bd1d593aebb4c6a43a2b7d54447c9420f2c5f2ab02adf2f4623df2cc3195084d74f9750aff5bd9a726651e2 SHA512 a8940deed549ae76021e14683cea954f5a3a55db6c4ed99e6d1b71ada7c514c2e81798668a3035a42e6bbaca13fafaa09927e31a5c7a65aa6ec0611d29b6f6fc
+DIST opencl-clang-18.1.9.tar.gz 54669 BLAKE2B 7d9085b39b8d8e2756e445d4e9b5e0a6cbbf856b0591270ef00f3d2bb62f53f86a25ec55a026e99f979edab9c5cbffdaaa6d3f76dc6a47fe652be6ff5c032a22 SHA512 a2e5b30e93a6a01622e414bd56391f0292faeb89ec67e45ebe451bd5d34f7649ec50a0bacf21fd79b3463767617948e3bc99aed3350d92756526fac527a83be9
 DIST opencl-clang-19.1.5.tar.gz 41985 BLAKE2B 1dba88914fde11e95c415bd27f77ef5d38be743cb0f799888a0229c0776d5cec36b22d17da36bfbf0bf6639620843cb8b31edae9752381be59c4e75acf60f9e9 SHA512 cdfdcbd920b61bfefa40451846155d760deb176618afae4968713ebacfb323d647f54ca0ed26d753f47c894f362573b323fc52dc51cef95ed9ca525f3cc3f34e
+DIST opencl-clang-19.1.7.tar.gz 60979 BLAKE2B 545d100d7d27d7ae444da85be47347400066938d1b7898af1b49a75cc33b6e128f39a310270c561b0069268681fcd1b8076759d4e7d74d41e8e7e690b548de31 SHA512 1755d2c530ad88689b3a0c0cdeec3db09facef40d1ffef8bf26122387c36cce7014894d9ff79f8d50392785b1164bb587ae3bc54d44f50029dc9c3cc8451db78
 DIST opencl-clang-20.1.5.tar.gz 43134 BLAKE2B ff801e655719b85c6ec1970ef102955768b634924710af393b127d8182497a62d976321888378c996e7b76c11fed75c6f04e0e96f5fd3354aafc158bc96acdb3 SHA512 43f3e82de6eb9a3f875e99e9fb6782bcaf5415744f84abf4cf6f183bc36fb533e69eb0ae30ea1ef7588e4ed4adec2b30c617cf995daa958fd29a0bdc02e975f5
+DIST opencl-clang-20.1.7.tar.gz 62170 BLAKE2B 8a0f556ce8622ad2b20076d8e3e3b0ebfd04237e91fe512054d4e4ffc111debd37f44942c290cd4df215c7e0f4766d6372338fe175048a7215170e65db59b187 SHA512 6f6d0f82c725727508fa3c15c4ec0c15c15bca8ca84582ea6c25373b4ba0eda80192eb93d3675ddb2ffe32c2c673e5c59874d20443a51e00ed45a36acd32b050
 DIST opencl-clang-21.1.5.tar.gz 43121 BLAKE2B 1fbc3331af1cc4b0ff3eebffaf93f8a8029bc22c9524bc8ffc4e5438677f7e1a985c10f5fecc49fcd1fc674fccf1a3ff43969938a61e7f1a4cf89af4a716e958 SHA512 d16e6072167ec2738f335e258b290f37378bfc0ae24376a988d0d2f6f5d5daac3a8326e2c74e0485ed0401e3e0cb28edce405d6762c8234b08f65487c5ac3c69
+DIST opencl-clang-21.1.7.tar.gz 62139 BLAKE2B 1390c234591a8ff0f51091b452eae78744aae80e3e44498e7b740205db5e16c04d12b571be64a8ed3c2b2746205e92f5d0763533c9d4700309d0b8d7e55acd4e SHA512 b039a0fb25881fde55e286c6f96a4334314c3b1dd77c9fa001a735bff9eda839b36cb0c9531c7f61425e02f140778acf69ead26cbd8d59f5a2a87602f814a815
 DIST opencl-clang-22.1.2.tar.gz 44224 BLAKE2B a87780c590ee626b81dc9b110af5d6dd986fa4af27c508519b29e89f803918f330e0c8396f0463a5562ee4ae4344b4c7ecdf0d90c538b56867990a3d02d07cd0 SHA512 79fbf1f5eb93215d70c300795ce3f5ad577dbaf42d1cb30e3e968ad99c558f33c24a3745aa33d7a57ed82e6e0c2533e571dd7dd371b523572b30afd0de1c18cc
+DIST opencl-clang-22.1.4.tar.gz 63211 BLAKE2B 1afd2ec63641f8ee5dcc3f58d6cfcaebabe6eb0fc4910d51209554ab131fa020e3a79f5b66d1e772ac3c4b873996a047780d649a3786bf12ed6b98d802bb5acb SHA512 fdcdd0343b1f06580bd35a8c82971ad03deb52481b0c1469f126f683b7fac7844ff58d652c8cf86d6c54a71c114901d51a2e603786aa03ca57ad503c064e843a
diff --git a/dev-libs/opencl-clang/opencl-clang-17.0.10.ebuild b/dev-libs/opencl-clang/opencl-clang-17.0.10.ebuild
new file mode 100644
index 0000000000000..2c6795f57d3a0
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-17.0.10.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 17 )
+
+inherit cmake llvm-r2
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PV}"
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	dev-util/spirv-llvm-translator:${SLOT}=
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}=[static-analyzer]
+		llvm-core/llvm:${LLVM_SLOT}=
+	')
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-17.0.0-clang_library_dir.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
+		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib
+		-DLLVM_VERSION_MAJOR="${LLVM_SLOT}"
+		-DPREFERRED_LLVM_VERSION="${LLVM_SLOT}"
+		-DUSE_PREBUILT_LLVM="ON"
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/opencl-clang/opencl-clang-18.1.9.ebuild b/dev-libs/opencl-clang/opencl-clang-18.1.9.ebuild
new file mode 100644
index 0000000000000..c756463c4fc8f
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-18.1.9.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 18 )
+
+inherit cmake llvm-r2
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PV}"
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	dev-util/spirv-llvm-translator:${SLOT}=
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}=[static-analyzer]
+		llvm-core/llvm:${LLVM_SLOT}=
+	')
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-17.0.0-clang_library_dir.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
+		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib
+		-DLLVM_VERSION_MAJOR="${LLVM_SLOT}"
+		-DUSE_PREBUILT_LLVM="ON"
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/opencl-clang/opencl-clang-19.1.7.ebuild b/dev-libs/opencl-clang/opencl-clang-19.1.7.ebuild
new file mode 100644
index 0000000000000..46ff5cc31d9f1
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-19.1.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 19 )
+
+inherit cmake llvm-r2
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PV}"
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	dev-util/spirv-llvm-translator:${SLOT}=
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}=[static-analyzer]
+		llvm-core/llvm:${LLVM_SLOT}=
+	')
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-17.0.0-clang_library_dir.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
+		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib
+		-DLLVM_VERSION_MAJOR="${LLVM_SLOT}"
+		-DUSE_PREBUILT_LLVM="ON"
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/opencl-clang/opencl-clang-20.1.7.ebuild b/dev-libs/opencl-clang/opencl-clang-20.1.7.ebuild
new file mode 100644
index 0000000000000..ae6c7936828f1
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-20.1.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 20 )
+
+inherit cmake llvm-r2
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PV}"
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	dev-util/spirv-llvm-translator:${SLOT}=
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}=[static-analyzer]
+		llvm-core/llvm:${LLVM_SLOT}=
+	')
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-17.0.0-clang_library_dir.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
+		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib
+		-DLLVM_VERSION_MAJOR="${LLVM_SLOT}"
+		-DUSE_PREBUILT_LLVM="ON"
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/opencl-clang/opencl-clang-21.1.7.ebuild b/dev-libs/opencl-clang/opencl-clang-21.1.7.ebuild
new file mode 100644
index 0000000000000..60a8d36e955fb
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-21.1.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 21 )
+
+inherit cmake llvm-r2
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PV}"
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	dev-util/spirv-llvm-translator:${SLOT}=
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}=[static-analyzer]
+		llvm-core/llvm:${LLVM_SLOT}=
+	')
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-17.0.0-clang_library_dir.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
+		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib
+		-DLLVM_VERSION_MAJOR="${LLVM_SLOT}"
+		-DUSE_PREBUILT_LLVM="ON"
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/opencl-clang/opencl-clang-22.1.4.ebuild b/dev-libs/opencl-clang/opencl-clang-22.1.4.ebuild
new file mode 100644
index 0000000000000..4e46325bbc6fd
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-22.1.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 22 )
+
+inherit cmake llvm-r2
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PV}"
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	dev-util/spirv-llvm-translator:${SLOT}=
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}=[static-analyzer]
+		llvm-core/llvm:${LLVM_SLOT}=
+	')
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-17.0.0-clang_library_dir.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
+		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib
+		-DLLVM_VERSION_MAJOR="${LLVM_SLOT}"
+		-DUSE_PREBUILT_LLVM="ON"
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}