11 files changed, 247 insertions, 180 deletions
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index f4d34aef0257..83619959904e 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1 +1,3 @@
 DIST intel-graphics-compiler-1.0.17657.8.tar.gz 10690533 BLAKE2B e1b3dc3fbd1515abb030c1da791cdc91d83648cfd1a9f8dce8ed087cefdd30a4413b6b534bb67902424c8ee67e84c7d85283cf548fb6ecd413e13639f883d0c3 SHA512 3dd0a6e5aa80ea0cad3608a6940cb563fcfce72e33b2284634903319ec984d6659f6a8ea51d31dfd35b1f3ebf6b89e78c5524d3f10735f52c09f52d13ea42e7a
+DIST intel-graphics-compiler-1.0.17791.18.tar.gz 10746999 BLAKE2B d85c7888e4be962fc90ba6e2686aeba14d7ebe32c7dececdfddb0ba3726df82e43167dfc1bd0a2c4a0f72a6de481a270a4dcb6b4d5a40d785dac6c4628a27e2d SHA512 c814f667c558eebfbe1af68614c4eff7259b2d3626e317eb936e185b33b4aba7b225f33276ab09e9582164e5573b6cc52c230ab82e4689db41b3b2f4368367ec
+DIST intel-graphics-compiler-2.5.7.tar.gz 11055255 BLAKE2B 5aba91cb083b8a94cd7182f25a6a4b24832816a07aad2f0583717213a5b752c32140e47fea9a0f48523227157239e519ccf2f708e3b3398fd8f15448dc202cc5 SHA512 520e4d1b9db993a90a8933f64c00da8fa785f7f7064d9f8d48aa9791a92d75e9a5d1d49509db6d81bd5a7645cdcb542dc261f5c653001fdc05033753b06dcba6
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17791.18.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17791.18.ebuild
new file mode 100644
index 000000000000..b55ed404519d
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17791.18.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_COMPAT=( 15 )
+MY_PN="igc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit cmake flag-o-matic llvm-r1 python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0/1.0.1"
+KEYWORDS="~amd64"
+IUSE="debug vc"
+
+DEPEND="
+	dev-libs/opencl-clang:15[${LLVM_USEDEP}]
+	dev-util/spirv-tools
+	$(llvm_gen_dep '
+		llvm-core/lld:${LLVM_SLOT}
+		llvm-core/llvm:${LLVM_SLOT}
+	')
+	vc? (
+		>=dev-libs/intel-vc-intrinsics-0.21.0[${LLVM_USEDEP}]
+		dev-util/spirv-llvm-translator:15=
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	$(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	python_has_version "dev-python/mako[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
+	"${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
+	"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+)
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Don't hardcode FORTIFY_SOURCE
+	sed -e '/-D_FORTIFY_SOURCE=2/d' -i IGC/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Get LLVM version
+	local llvm_version="$(best_version -d llvm-core/llvm:${LLVM_SLOT})"
+	local llvm_version="${llvm_version%%-r*}"
+
+	# See https://github.com/intel/intel-graphics-compiler/issues/212
+	append-ldflags -Wl,-z,undefs
+
+	# See bug #893370 and https://github.com/intel/intel-graphics-compiler/issues/282
+	append-flags -U_GLIBCXX_ASSERTIONS
+
+	# See https://bugs.gentoo.org/718824
+	! use debug && append-cppflags -DNDEBUG
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS="OFF"
+		-DCCLANG_FROM_SYSTEM="ON"
+		-DCCLANG_SONAME_VERSION="${LLVM_SLOT}"
+		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix)/$(get_libdir)"
+		-DIGC_BUILD__VC_ENABLED="$(usex vc)"
+		-DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
+		-DIGC_OPTION__CLANG_MODE="Prebuilds"
+		-DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
+		-DIGC_OPTION__LLD_MODE="Prebuilds"
+		-DIGC_OPTION__LLDELF_H_DIR="$(get_llvm_prefix)/include/lld/Common"
+		-DIGC_OPTION__LLVM_MODE="Prebuilds"
+		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
+		-DIGC_OPTION__OPENCL_HEADER_PATH="/usr/lib/clang/${llvm_version##*-}/include/opencl-c.h"
+		-DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
+		-DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
+		-DIGC_OPTION__USE_KHRONOS_SPIRV_TRANSLATOR_IN_SC="ON"
+		-DIGC_OPTION__USE_PREINSTALLED_SPIRV_HEADERS="ON"
+		$(usex vc '-DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds' '')
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DINSTALL_GENX_IR="ON"
+		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/include/LLVMSPIRVLib"
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-2.5.7-r1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-2.5.7-r1.ebuild
new file mode 100644
index 000000000000..79560525949c
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-2.5.7-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_COMPAT=( 15 )
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit cmake flag-o-matic llvm-r1 python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/2.5.0"
+KEYWORDS="~amd64"
+IUSE="debug vc"
+
+DEPEND="
+	dev-libs/opencl-clang:15[${LLVM_USEDEP}]
+	dev-util/spirv-tools
+	$(llvm_gen_dep '
+		llvm-core/lld:${LLVM_SLOT}
+		llvm-core/llvm:${LLVM_SLOT}
+	')
+	vc? (
+		>=dev-libs/intel-vc-intrinsics-0.21.0[${LLVM_USEDEP}]
+		dev-util/spirv-llvm-translator:15=
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	$(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	python_has_version "dev-python/mako[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
+	"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+)
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Don't hardcode FORTIFY_SOURCE
+	sed -e '/-D_FORTIFY_SOURCE=2/d' -i IGC/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Get LLVM version
+	local llvm_version="$(best_version -d llvm-core/llvm:${LLVM_SLOT})"
+	local llvm_version="${llvm_version%%-r*}"
+
+	# See https://github.com/intel/intel-graphics-compiler/issues/212
+	append-ldflags -Wl,-z,undefs
+
+	# See bug #893370 and https://github.com/intel/intel-graphics-compiler/issues/282
+	append-flags -U_GLIBCXX_ASSERTIONS
+
+	# See https://bugs.gentoo.org/718824
+	! use debug && append-cppflags -DNDEBUG
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS="OFF"
+		-DCCLANG_FROM_SYSTEM="ON"
+		-DCCLANG_SONAME_VERSION="${LLVM_SLOT}"
+		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix)/$(get_libdir)"
+		-DIGC_BUILD__VC_ENABLED="$(usex vc)"
+		-DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
+		-DIGC_OPTION__CLANG_MODE="Prebuilds"
+		-DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
+		-DIGC_OPTION__LLD_MODE="Prebuilds"
+		-DIGC_OPTION__LLDELF_H_DIR="$(get_llvm_prefix)/include/lld/Common"
+		-DIGC_OPTION__LLVM_MODE="Prebuilds"
+		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
+		-DIGC_OPTION__OPENCL_HEADER_PATH="/usr/lib/clang/${llvm_version##*-}/include/opencl-c.h"
+		-DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
+		-DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
+		-DIGC_OPTION__USE_KHRONOS_SPIRV_TRANSLATOR_IN_SC="ON"
+		-DIGC_OPTION__USE_PREINSTALLED_SPIRV_HEADERS="ON"
+		$(usex vc '-DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds' '')
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/include/LLVMSPIRVLib"
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 6466fc6b8e1e..7e12e4cb377d 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,5 +1,3 @@
-DIST jenkins-bin-2.462.3.war 93358397 BLAKE2B 57c659aa48824144b4e685aadc4928369a10ce7ffba8715f15a4d5c267c6cf99e233e8e1a26679dc5ce711c3dc2a98e7f388635bfb79bc8e4473efe30b120dd2 SHA512 3647d09249d00b4ffc81bb4b22a51ca48f02cb0dfdb4abd0aac2930f02db0b9727f2634d11349b597ec87e2ebdfafeb412f09249517d843fd437b9f61100ea01
-DIST jenkins-bin-2.479.1.war 96008718 BLAKE2B 7e175b57dbaefbb92a03ccd0bb2420ac76b76b85ca4411195cb1f68a4f8a97be0be0f1aadf067d70ac5193b85271cc9e1d540d9cd4acd33e4b4edac30091d767 SHA512 09cda6b84a4f99d6c60688daa5f317e2283a9f36c12d88d55497d71fb70f26562ba3de2a96f2bace2e800acda67cfa658c4c6890da77537c953330c3c0a16d01
 DIST jenkins-bin-2.479.2.war 96015918 BLAKE2B fae14385c909128025cfb274254d70f62d1901c8cf86913385edc4c0cd8da06642582adbd8d46dba715aad8beb942312972d3085f4576a60b8e346049d31c7f6 SHA512 2e1645da57019919fd5dfab91b10ff2e3268257f9d81452ba6fba7e410c807e1d84fab06d886e3282411587d9e1a15850e07216104fc4ee04e7930677606ac39
-DIST jenkins-bin-2.479.war 95988810 BLAKE2B 830a544c502fd77289d870dcd9ce7bff2606be1968b58880fa69548279b7d4fe6e6842e1993a41615d54fcc2f9f8e562c3c55ad232b3af8b0b62bab3d9a58786 SHA512 3b3a3328d9d1992e0980463e37bdd7cc6e4c5115bef07252965bef29ac59d49b4a2db924dc256f0288e7034ef93ddd79965eac85d8eb6d7c189ca8c641995d3d
+DIST jenkins-bin-2.479.3.war 96806970 BLAKE2B 325402cab7cab3dbae0276abd731b84049229a42883f261fb96ed0a697dd41286ccd99d16329b5221475f89ab4148d54a1ddada24bdf80bdfa108cc600cdf31c SHA512 1cbfc32ada6303145c65794f9dacc9af7d79d4d0cc12ff49b3a0dd69c5fb543ec3d39b3f07bfdf6c4dcba080cbd81aae8eacbb415f90a9c8b17d103ef882fe9a
 DIST jenkins-bin-2.487.war 96349804 BLAKE2B ce2eaf2962e09bccdc29f7f018f7fab92e69580ac520604c9f42b43d080535ee0b93215cec20eda8e19bbd7c4a406619913554e6a436df30b1752172f74a08b1 SHA512 d6bb81200d2273b391b316119178f0ac042271bff680b1345e07a10f6ced3677923101081c02349700bff96a2dc4c70c9e60d6188c0904fec68053209003b31f
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.462.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.462.3.ebuild
deleted file mode 100644
index 1d9da3e913d7..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.462.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="The leading open source automation server"
-HOMEPAGE="https://jenkins.io/"
-SRC_URI="https://get.jenkins.io/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-S="${WORKDIR}"
-LICENSE="MIT"
-SLOT="lts"
-
-KEYWORDS="amd64 arm64 ~x86 ~amd64-linux"
-
-DEPEND="acct-group/jenkins
-	acct-user/jenkins"
-
-RDEPEND="acct-group/jenkins
-	acct-user/jenkins
-	media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	|| ( virtual/jre:17 virtual/jre:11 )"
-
-src_install() {
-	local JENKINS_DIR=/var/lib/jenkins
-
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r3.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}-r3.init jenkins
-	newconfd "${FILESDIR}"/${PN}-r1.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}-r5.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.479.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.479.3.ebuild
index 52f625f58d2a..30365fc44ded 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.479.1.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.479.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.479.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.479.ebuild
deleted file mode 100644
index 912caa1bb080..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.479.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="The leading open source automation server"
-HOMEPAGE="https://jenkins.io/"
-SRC_URI="https://get.jenkins.io/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
-
-DEPEND="acct-group/jenkins
-	acct-user/jenkins"
-
-RDEPEND="acct-group/jenkins
-	acct-user/jenkins
-	media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:lts
-	|| ( virtual/jre:21 virtual/jre:17 )"
-
-src_install() {
-	local JENKINS_DIR=/var/lib/jenkins
-
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r3.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}-r3.init jenkins
-	newconfd "${FILESDIR}"/${PN}-r1.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}-r5.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/lttng-tools/files/lttng-tools-2.13.9-slibtool.patch b/dev-util/lttng-tools/files/lttng-tools-2.13.9-slibtool.patch
deleted file mode 100644
index 634bd388b44c..000000000000
--- a/dev-util/lttng-tools/files/lttng-tools-2.13.9-slibtool.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-https://github.com/lttng/lttng-tools/pull/169
-https://github.com/lttng/lttng-tools/commit/bb1c9fc3f89c2faffb0228c0b77e32653e018a23
-
-From bb1c9fc3f89c2faffb0228c0b77e32653e018a23 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Fri, 8 Mar 2024 08:17:37 -0800
-Subject: [PATCH] Fix: baddr-statedump: use $(LIBTOOL) --mode=execute
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GNU libtool inconsistently places the compiled executable in the source
-directory or in the .libs directory where a libtool wrapper script is
-placed in the source directory.
-
-While slibtool will always place the compiled executable in the .libs
-directory and a wrapper script in the source directory.
-
-This will result with a build error when using slibtool since objcopy
-needs the executable and not the shell wrapper script, but this can be
-solved for both implementations by using $(LIBTOOL) --mode=execute on all
-commands that operate on the libtool compiled executables.
-
-Gentoo issue: https://bugs.gentoo.org/858095
-
-The GNU libtool --mode=excute is documented upstream.
-
-https://www.gnu.org/software/libtool/manual/html_node/Execute-mode.html
-https://www.gnu.org/software/libtool/manual/html_node/Debugging-executables.html
-
-And the GNU libtool behavior of when to create a wrapper script is
-documented in the 'Linking Executables' section.
-
-  "Notice that the executable, hell, was actually created in the .libs
-  subdirectory. Then, a wrapper script (or, on certain platforms, a
-  wrapper executable see Wrapper executables) was created in the current
-  directory.
-
-  Since libtool created a wrapper script, you should use libtool to
-  install it and debug it too. However, since the program does not depend
-  on any uninstalled libtool library, it is probably usable even without
-  the wrapper script."
-
-https://www.gnu.org/software/libtool/manual/html_node/Linking-executables.html
-
-And the inconsistency between GNU libtool and slibtool is documented at
-the Gentoo wiki.
-
-  "One difference between GNU libtool and slibtool is that the former will
-  conditionally place the compiled executable or a shell wrapper script in
-  the build directory, depending on whether or not the executable depends
-  on a build-local libtool library (e.g. libfoo.la). Where slibtool will
-  always place a compatible wrapper script in the build directory where
-  GNU libtool would have conditionally placed the executable. When the
-  wrapper script is created both GNU libtool and slibtool will place the
-  executable in the .libs directory within the build directory.
-  Consequently build systems, ebuilds, and other users should take care to
-  avoid scenarios like installing the wrapper script to the system instead
-  of the executable. In these cases ideally the executable would be
-  installed by the same libtool implementation that compiled it."
-
-https: //wiki.gentoo.org/wiki/Slibtool#Installing_or_using_binaries_created_by_libtool_manually
-Signed-off-by: orbea <orbea@riseup.net>
-Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
-Change-Id: I03102ed78af835daa9b9a5836c2979a5f5d4bd8c
----
- tests/regression/ust/baddr-statedump/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/regression/ust/baddr-statedump/Makefile.am b/tests/regression/ust/baddr-statedump/Makefile.am
-index f8fe26395..d37dbb6dd 100644
---- a/tests/regression/ust/baddr-statedump/Makefile.am
-+++ b/tests/regression/ust/baddr-statedump/Makefile.am
-@@ -19,11 +19,11 @@ EXTRA_DIST = test_baddr-statedump test_baddr-statedump.py
- 
- # Extract debug symbols
- prog.debug: prog
--	$(objcopy_verbose)$(OBJCOPY) --only-keep-debug prog prog.debug
-+	$(objcopy_verbose)$(LIBTOOL) --mode=execute $(OBJCOPY) --only-keep-debug prog prog.debug
- 
- # Strip and add debuglink
- prog.strip: prog.debug
--	@cp -f prog prog.strip
-+	@$(LIBTOOL) --mode=execute cp -f prog prog.strip
- 	$(objcopy_verbose)$(OBJCOPY) --strip-debug --add-gnu-debuglink=prog.debug prog.strip
- 
- all-local: prog.strip
diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest
index 71f1ff67447d..9eab21b03a4f 100644
--- a/dev-util/opencl-headers/Manifest
+++ b/dev-util/opencl-headers/Manifest
@@ -1,2 +1,3 @@
 DIST opencl-headers-2023.12.14.tar.gz 75698 BLAKE2B 2ff040112bf8a9be7bc8c8ecbf29cec1c9c718574582e7e065f3391856d3cb70d6c46b5e770d3d2e3aabb2a0040855e2b3f73cda8c9b547d4faaeedafca0bc3c SHA512 71a21f32cc2d956ef52ea197a95f21a3df5cf4e6888b533eb8cc66be0025fafe9b6477d3de813cb1ae6303032c80bc10b5e5ab1c71074f1662a6b5296fffd3d3
 DIST opencl-headers-2024.05.08.tar.gz 76977 BLAKE2B cd4e0464e2613912134946b43b8b69ccd61f0ba850825c8182e46dcb042478338fda5d993e9e48612ba42152a007be172e6da9afcfda3eb51c71e52dd2f15793 SHA512 2f1a46d58a5a9329470bab4c3662f17e81aab9558bfd9e1aafa14d3e1ab129513ab9493eeeb3cc48f0f91f0bc6b61bd54e28d7083eed58af9f34cd973cc93de1
+DIST opencl-headers-2024.10.24.tar.gz 85151 BLAKE2B d35c2ea06a1162e1716d5973b3587bd8c50420cf15cb7c13c61d16df9b94ec1df9b3e4621291d0384de40672f2f919b8df3edb5067755df2e236e596c82acfd5 SHA512 9d2ed2a8346bc3f967989091d8cc36148ffe5ff13fe30e12354cc8321c09328bbe23e74817526b99002729c884438a3b1834e175a271f6d36e8341fd86fc1ad5
diff --git a/dev-util/opencl-headers/opencl-headers-2024.10.24.ebuild b/dev-util/opencl-headers/opencl-headers-2024.10.24.ebuild
new file mode 100644
index 000000000000..529df253e94d
--- /dev/null
+++ b/dev-util/opencl-headers/opencl-headers-2024.10.24.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN="OpenCL-Headers"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Unified C language headers for the OpenCL API"
+HOMEPAGE="https://github.com/KhronosGroup/OpenCL-Headers"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.2.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.2.ebuild
index 55db9c19aaf9..02976684014e 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.2.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"