gentoo auto-resync : 30:09:2024 - 01:25:52

12 files changed, 19 insertions, 176 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 16d63036524b..83f2291d89ff 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 524cd940a7db..0002b0eeff78 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,10 +1,8 @@
 AUX intel-graphics-compiler-1.0.8173-opencl-clang_version.patch 1807 BLAKE2B ec6aac8c78d7584e043a258585cbae6218fd8aa167d853e1eea96313298df7347ab7652ec2bf83199129e07e534d52fcd200858036e3d0af2c4f79ff249104f2 SHA512 1a0db341aab280aa205965dfc82d17b29f681bde76932f8291243afad985523f601c7279b1fb772ebc4d9197e5016941a1ad07cea2b6d7199710a7ee22fd81dc
 AUX intel-graphics-compiler-1.0.8365-disable-git.patch 1140 BLAKE2B f870def1128c30c3e50a71e9eac39eccbcc9bc798be574324016c6c31ed3a3f82e1499f1aada5a2c475bd6b6c467b1b236635fdd6b5145904bc63dc53f8d75e5 SHA512 d1d53a6f4a47031ec4cdcf3f57c059536ccf571a72929da3d9070487686f91f4202d20c4d626da616250f66b31815b61fafa82b903b1f5157a226ee748097bda
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
-DIST intel-graphics-compiler-1.0.17193.2.tar.gz 9647647 BLAKE2B 81e3c159aae3d9966d775bf4844293cbd15dba394906ad7aed6d047ba0f54bc97538e8fde5ff7485b9aee7b604bd7ab3eb7d8cc343f57ea4d7abf62ddc4de3a5 SHA512 48a6986521b85a888dbcebe5a52da328000db3428c2c10590c89e3165b634eb128ac5c550971bb7de86263ab45fca838389f2e3da2b09e3268c5434d337c56a7
-DIST intel-graphics-compiler-1.0.17537.1.tar.gz 10470018 BLAKE2B d1adc0fd566ac431075a2b497820f0def77b30ab38c43c5d686fc81d808e32c2864d311e01ded8c64fb53b7d5ad5eb33f6947caf12bd4aa7fd0098a0aecf083a SHA512 5b51fad56dbd30d8c17343f5d386fb559088ba5e749a0cdfba9562c1788127781f1814affb2da16dacf8329118242d539df1866445b86b7f79e5a4fb7323b086
 DIST intel-graphics-compiler-1.0.17537.20.tar.gz 10494922 BLAKE2B 49339d6826968518506004f0f9fdb314e8ec595029a40ee94cea34b9e3c94907c1130e2aaed65c68e35fd598e080eeb9b910933c04529b3e04dfc8db5e0a8cab SHA512 ee4c20b2b800f86718f76a09aebc891327877db1d81f9d1f8a9e22203a47437665ed7790eced4ca66e7c47b9d93cb0da9db03a4216f38093981a8ee0395163cc
-EBUILD intel-graphics-compiler-1.0.17193.2.ebuild 2833 BLAKE2B b82f4761343efbb81129beda9ec47d2fa5c25de57d26a7f15be1aff3523af7f8702359fd252cfcef62696a56cd22174cde28b86af19ae2a34ce32fa55e603c97 SHA512 b831628dc0e19676ea44d243f9218eed0ff367f61811de9d30ea8144d5d69c5ea970dd8ef9e92af57f74ccb02d595e1e69ac730a276a0ea872242ff58dcb53b2
-EBUILD intel-graphics-compiler-1.0.17537.1.ebuild 2953 BLAKE2B 81b973766fe1d60443dabc62e2b0b9fd4adb2315b95ad597030f37b02d80b70451def3a36c1ab5a1e2de393f6a4c4538bcd1efc3a7491733bd760037842bfd5a SHA512 3e062c51f78b009a1f9ba79e0a809dfffe9a519d080bb6cf8d91d7859dd17d644a701ab89ebc7b40acc560c69b5eec067ca9b9fbbd17558e8999f207e047299d
-EBUILD intel-graphics-compiler-1.0.17537.20.ebuild 2953 BLAKE2B 039715072bdaff064ed696429e8bac38726690b775e39929bc4e9ed554c864fa31de15fc795b123fd95d745c710b63d10404306d5b661e712572e3bf85b32b3f SHA512 bbc087ec2170a015d7493b99de3646c862fba00d4013d473aeca56e668f8f55466206b1489d7e392fe43ef067b09758613bfc2eb2beff7e870b0b124272e43af
+DIST intel-graphics-compiler-1.0.17657.8.tar.gz 10690533 BLAKE2B e1b3dc3fbd1515abb030c1da791cdc91d83648cfd1a9f8dce8ed087cefdd30a4413b6b534bb67902424c8ee67e84c7d85283cf548fb6ecd413e13639f883d0c3 SHA512 3dd0a6e5aa80ea0cad3608a6940cb563fcfce72e33b2284634903319ec984d6659f6a8ea51d31dfd35b1f3ebf6b89e78c5524d3f10735f52c09f52d13ea42e7a
+EBUILD intel-graphics-compiler-1.0.17537.20.ebuild 2952 BLAKE2B 9d15fda922d437ce90ea878d30293e02167c0875bdf6c860853bb6039237eab581b4d28757b277ee2d2d2d64227316f0d818d2d7f009e1842377f9d602d3f18b SHA512 0b11a2b4682bfc409e50c48c705d05d92beadbfc23c593e6270937b7bda18a71795e2db554ca04ba8bf1e7ae823aec74c939fd228892e05bb9d3a16ea0dd9045
+EBUILD intel-graphics-compiler-1.0.17657.8.ebuild 2953 BLAKE2B 039715072bdaff064ed696429e8bac38726690b775e39929bc4e9ed554c864fa31de15fc795b123fd95d745c710b63d10404306d5b661e712572e3bf85b32b3f SHA512 bbc087ec2170a015d7493b99de3646c862fba00d4013d473aeca56e668f8f55466206b1489d7e392fe43ef067b09758613bfc2eb2beff7e870b0b124272e43af
 MISC metadata.xml 682 BLAKE2B c5e74bbb1a5aca5eed7cb75a19820dc9d78d7ef7a15687924d16863a82a535403ca67103ac458d4b86f380244e726a3bd20fb496f8048f999abdf89950a7092c SHA512 d5a35d2104e9aa5caaf903a9f61ca8a8c4f8b5bff3e993c9964dd63196e64b88e3e7bde2e0cff9dcee9c66bdda0cabb43c5ac8c121796626bb0e7f4013929fb3
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17193.2.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17193.2.ebuild
deleted file mode 100644
index 11d39cb91bbc..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17193.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2024 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_{10..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/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="debug vc"
-
-DEPEND="
-	dev-libs/opencl-clang:15[${LLVM_USEDEP}]
-	dev-util/spirv-tools
-	$(llvm_gen_dep '
-		sys-devel/lld:${LLVM_SLOT}
-		sys-devel/llvm:${LLVM_SLOT}
-	')
-	vc? (
-		>=dev-libs/intel-vc-intrinsics-0.18.0[${LLVM_USEDEP}]
-		dev-util/spirv-llvm-translator:15=
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
-	$(llvm_gen_dep 'sys-devel/lld:${LLVM_SLOT}')
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	python_has_version "dev-python/mako[${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 sys-devel/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=(
-		-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="${EPREFIX}/usr/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"
-		$(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-1.0.17537.20.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17537.20.ebuild
index 32d1a163115a..468f31f095cb 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17537.20.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17537.20.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="debug vc"
 
 DEPEND="
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17537.1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17657.8.ebuild
index eb568fc9d09b..32d1a163115a 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17537.1.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17657.8.ebuild
@@ -29,7 +29,7 @@ DEPEND="
 		sys-devel/llvm:${LLVM_SLOT}
 	')
 	vc? (
-		>=dev-libs/intel-vc-intrinsics-0.18.0[${LLVM_USEDEP}]
+		>=dev-libs/intel-vc-intrinsics-0.19.0[${LLVM_USEDEP}]
 		dev-util/spirv-llvm-translator:15=
 	)
 "
diff --git a/dev-util/intel-graphics-system-controller/Manifest b/dev-util/intel-graphics-system-controller/Manifest
index fcfe216354fb..7f9bcfd3cd0d 100644
--- a/dev-util/intel-graphics-system-controller/Manifest
+++ b/dev-util/intel-graphics-system-controller/Manifest
@@ -1,5 +1,3 @@
-DIST intel-graphics-system-controller-0.8.16.tar.gz 192027 BLAKE2B fc97dffcffe53b92fa03b9fbcaa2f784f3fd33e4cdfa2f85548d2f6bea60bdf1868b003a45448829685fd961f9699534781de3ce43703a378168d50bf14927ce SHA512 105950a44c3b756fa4c23aa1590e2c0ae2f83af87660af14889641465433903a9e2973c8689338a716e67799098a762885933ba53c4a8de72ca4be3dbb134a84
 DIST intel-graphics-system-controller-0.9.3.tar.gz 206474 BLAKE2B 3af1caeed8d553b017f333ddacfbccb28e6d0f370ebc93b890686417fa400fb227f46cb83cfd686808a5e308ebbc2b2534b318ea4ba8a94a237b721e0ef5be37 SHA512 758059556efa6b94702291d11ca8267a3e4258299a324388c4a8fcb9efd2a2218ad354447ea32277439fc65d52f9481441d0bd699bfae1c375b7f807e21f9d94
-EBUILD intel-graphics-system-controller-0.8.16.ebuild 1091 BLAKE2B d7e89b84fe6cf5072a509a1e87641c92cffd126a4c598da7fad8bf2966d49970b604a94ceba20ca9e3277eb8ec43cdc3a84f4a45655e62a120ca76a5bb4c0d7b SHA512 ed4f3fb565e40b5329926ca21fbe5c65fadadc4c178edfba0f665e8f59a4775a46f1707b1738fa201771eda50b3993a0e81d6db07c8dc04f64f738dd0767d0d2
-EBUILD intel-graphics-system-controller-0.9.3.ebuild 1093 BLAKE2B 4ddd26b13d3c3001b95cd690b031aa0c1033aa8685e17bc010de1afdcacb1e681a7c3ef73a3121dbc331f8c92930b355d4211039659d76106945b89717028f10 SHA512 ba337906d415f4ec73d6d5cabb955ff8b29fa294735d4345fba826f7feced91c9a9d79b90244fbe5077925ffd2241d838b83a99864cd271bc648b2870815c97d
+EBUILD intel-graphics-system-controller-0.9.3.ebuild 1092 BLAKE2B 4519257f37fe3cc4d36658f886c201a48945c2244a4df2283644344e97241e7ba90cfeaa676a539027f89552dff0eb61e92128f31a09403200bf81c012a52b38 SHA512 cdb1245665cdc45b685a3a5d952866ed7ae3ba55699155edf7254bbe2326ec615bb775df1fe333c98e52d44af1739f868613e14f82f6459fa2a2b64ad100a197
 MISC metadata.xml 674 BLAKE2B a0d4f2c1989040b8cddb6ec87f0758bcd758e442b802f61a1f04da442288724ff296185e8c982247663fea70bf8a05f3cd1091033e4bf081ec3af9a03d623c2e SHA512 afcf2cfffad24226e64efc6116e01ec0750b8ba2df62871f090727e5300f98b8e166dcc7b025a29365cf83ea38575d8f63a705ebb478c83c416b8abf4ddb0fb3
diff --git a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.16.ebuild b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.16.ebuild
deleted file mode 100644
index ff64da540208..000000000000
--- a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.16.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="igsc"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{9..12} )
-
-inherit cmake python-any-r1
-
-DESCRIPTION="Intel graphics system controller firmware update library"
-HOMEPAGE="https://github.com/intel/igsc"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/V${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="amd64"
-IUSE="+cli doc"
-
-RDEPEND=">=dev-libs/metee-3.2.4:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		${PYTHON_DEPS}
-		app-text/doxygen
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
-	)
-"
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CLI="$(usex cli)"
-		-DENABLE_DOCS="$(usex doc)"
-		-DENABLE_PERF="OFF"
-		-DENABLE_WERROR="OFF"
-
-		# If enabled, tests are automatically run during
-		# the compile phase and we cannot run them because
-		# they require permissions to access the hardware.
-		-DENABLE_TESTS="OFF"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.9.3.ebuild b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.9.3.ebuild
index 358f6dec3c36..68df71633e60 100644
--- a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.9.3.ebuild
+++ b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.9.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+cli doc"
 
 RDEPEND=">=dev-libs/metee-3.2.4:="
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index fd9a17adba98..b0f3d73ba737 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -13,11 +13,11 @@ DIST spirv-llvm-translator-18.1.3.tar.gz 1700577 BLAKE2B 0d92c6259956db9cb4a49c5
 DIST spirv-llvm-translator-18.1.4.tar.gz 1701536 BLAKE2B f9326299bd239721752c2b8dacb7ad5b053e189aae2374848c581e3a6110789c4e4078c1efb69bf8fdd01b30df445821130e92c1285b9cb791dbd290f796d183 SHA512 f0f7e9c3e6544707bb20cbda523f6081be42f5acb513d99b326ed0753f8d285bfb301934fa7ea78fc60bcb5672306f0ffb8a7937cc731c2bb08b72f4b7f5ef61
 DIST spirv-llvm-translator-19.1.0.tar.gz 1751496 BLAKE2B 13fbd34642622721d0a2f46342e549e1ce0e654a5243a76b7b5b4ccfc655e764701015758cb9ce0ae0de64ae7625f6070bb40473b178d8fdee1d586ee86e296d SHA512 646e8d812390550469aa1f0f27c9a2af09a9c16f1e2a7ec3a952be88973f70eda5dae54251f0cfe955802b97579185d964d947c2ccc41e8e6c7a1a95908f0c42
 EBUILD spirv-llvm-translator-15.0.0-r1.ebuild 1371 BLAKE2B ab7fb7701634812654c2b3410190715c581369550385ac275588fff286d02d62c17fc4a75f97ba4082a707d18d5eb55e38f2aac290bc4abe3c676da98ab04b53 SHA512 e58d8f2d6b9474d8426242f90a567dda559228e5e783a6dd965bfae20976008a468075ee615aaf4139a167dd13efb038a7d064dd2ca998899d6b4ba8cb07f402
-EBUILD spirv-llvm-translator-15.0.4.ebuild 1309 BLAKE2B 7c3b2dc390e943c7d4e3724051d5d7a35fff131f7cd8c45405e9e8a75e830aed749b24d8ec55479b816e333517071cb96cf79970401855126ebbbba6f1977c63 SHA512 2c00f91f76d0cfbd47e20a2c9c4376832fe003e9f1702175e1b6007946ad00c0f7d10f9323bed528ab65f6c340e13bd5bfbbc05a16ac6c8e455fea3edae65fc4
+EBUILD spirv-llvm-translator-15.0.4-r1.ebuild 1295 BLAKE2B 0c456fa774de474eeb49329ebedca0cc1506a5d673481dc2215c12380ed009c802dad9e493523caa86213acaebf893ec0b55f1da396247007dacc27a8fa9b132 SHA512 35670abed396815fa64abf1b0d870456de956b1b3eaab0f9fec208981637d84f32ffd059ff01d848bd676eb436334e8a931c45143654b82c0652411a6d4b11e2
 EBUILD spirv-llvm-translator-16.0.0-r1.ebuild 1531 BLAKE2B 07ae6fb702fe5bc915ab9f07cff253f7c6f2049e013f5d0d77a6d7ae020a8bfb9522b6159327e5684b9f081a48aaf467556d26c792ae65fdac6b16ad3b4b1035 SHA512 70bcfeeb07c2089a7b43f8df82492ea1aecd957fdf582cbd710b8484689796c11234369f3fd324222f3de1dffdcf7eccc482da387be962cfb74f96b18711e436
-EBUILD spirv-llvm-translator-16.0.4.ebuild 1426 BLAKE2B 4c23f74cab7885b0d5a4caa6f6458008694b8a5251b046c9239192c8622a540afeeb227bec77e1bf62a7c76df89a3372467b1597cb53ca2d657f12d14d7362d3 SHA512 89f458c6a802525348981d9cc9584de9a35d93586505ff03615922bc8151ee67ed022519079c5a3c18710cec73864c182d9917391e9c63abc020931525f51063
+EBUILD spirv-llvm-translator-16.0.4-r1.ebuild 1412 BLAKE2B d2cd71408d42d6b5f2bda60894b2c031ff00bbf73a9f3eb3e93d6fe44af0de0bd37dd7adf85d1dd328e9e351105d0eea7c978560f5921a27a613060605077cfe SHA512 c0a6a0d9def4a217cfb06e85638a9bd516ba19769bc28d8c1b1709691e05d4d85260b1a850570fc5830849dfc9a241109ec4998037d5c01ab4d691314b83bef0
 EBUILD spirv-llvm-translator-17.0.0-r2.ebuild 1512 BLAKE2B 9e642681cc67196b91532b36b44ec2817161d25423d057f6bd91fedacada2e33d12946257ff54c337143d0fbfc9d11f29816cfb485404685d209be906e75097f SHA512 96961a3225f9c10eb317741b39091341e40202e07b7a07434182e78f9b8ce5451f44b6ae8011d7e9f95b640157f2a5cf04c56b77d6b5647c806dea6fb09c97f1
-EBUILD spirv-llvm-translator-17.0.4.ebuild 1380 BLAKE2B 71ec2500be77a527a0b43ceaf5802ca523510a12e38cb6eb02a423e8701c2ad7aeb9973d00fe9d4f5c8dc75704fd74db1417c7f2baac86365b09afa932aaf429 SHA512 02e3251e460a6cd61e2c88cb5ba610a30811d6c8e452e19e79b082032c8c205ee92be733fc974dc705033c3c7871624a199ea0bc1dcd57e4cc4941fa552a23da
+EBUILD spirv-llvm-translator-17.0.4-r1.ebuild 1366 BLAKE2B a61c6ce67f44996d3c9e233c865e97ece7c170c14072260c47db65a349da1f1c233a1b7be888d1e958aeea6ebf38c6850cdf778e182ff18c2c4a0bdd2b8e094c SHA512 74097428f4ee8c3a099806ea37b25f66fa9d81356658e024c7eb4f7bff37a8dbb7bf808d06afe214099120b020b4911e66eeaab3c09dcd72a41e0b7e89857c16
 EBUILD spirv-llvm-translator-18.1.3.ebuild 1376 BLAKE2B 418e281081e7870eef0632cf158e6c8e2f918adad00d8d0683732556585026004ce40ec470179c62ee40ca2e9665703c2dd183c308d7b599cb0754993c7ca7c7 SHA512 f0af44f0c2cee1f5561f22423b079186817be3d6e6b4f5aebdc03a51b5f00f8a7cd750947c4236e7db0defd1bbabcecbb2f747106e6e367ead93908687f30ca2
 EBUILD spirv-llvm-translator-18.1.4.ebuild 1446 BLAKE2B c6ba1d1876abc6d5eb5466aae1da25168fbc914283b88ef90a9d32fa05ab1d938f752e1fe643de6e932dc46b6a91203fbc79ae84f5489ccba689f0b81bfc63a4 SHA512 8da04df1a765300c894f0d3d7c75e7a78ffe6798ba7990f284501def153e6a8674103c7c587dc0ccded32eb17d8e25e2bf3aadb8620f7a3341dfd075c72ff854
 EBUILD spirv-llvm-translator-19.1.0.ebuild 1446 BLAKE2B 529248c50bb68a7011a1ef47f5673d560cd89f3e8a36b3fc2ca8eead54a1b4208b7f312730a79d5032f449f64d55fe0b34332639afc4bbdd1045154f04a75c80 SHA512 91d302e70a233fff66a963a34bd875032844dca38069fbdf1fe6e6fcdd8b673a13cc13ae14e9b17bceab46a20792d89a16cdecd5f4b840d422da3b06e6ee6d7f
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.4.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.4-r1.ebuild
index f7eb7d04ee67..113b055e96ac 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.4.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.4-r1.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=8
 
-LLVM_MAX_SLOT="15"
+LLVM_COMPAT=( 15 )
 MY_PN="SPIRV-LLVM-Translator"
 MY_P="${MY_PN}-${PV}"
 
-inherit cmake flag-o-matic llvm
+inherit cmake flag-o-matic llvm-r1
 
 DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
 HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
@@ -46,7 +46,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DCCACHE_ALLOWED="OFF"
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
 		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
 		-DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
 		-Wno-dev
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.4.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.4-r1.ebuild
index 915d4235fe88..1d22979a7c3c 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.4.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.4-r1.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=8
 
-LLVM_MAX_SLOT="16"
+LLVM_COMPAT=( 16 )
 MY_PN="SPIRV-LLVM-Translator"
 MY_P="${MY_PN}-${PV}"
 
-inherit cmake flag-o-matic llvm multiprocessing
+inherit cmake flag-o-matic llvm-r1 multiprocessing
 
 DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
 HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
@@ -50,7 +50,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DCCACHE_ALLOWED="OFF"
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
 		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
 		-DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
 		-Wno-dev
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.4.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.4-r1.ebuild
index 096ab829dfbd..8438df3423b8 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.4.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.4-r1.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=8
 
-LLVM_MAX_SLOT="17"
+LLVM_COMPAT=( 17 )
 MY_PN="SPIRV-LLVM-Translator"
 MY_P="${MY_PN}-${PV}"
 
-inherit cmake flag-o-matic llvm multiprocessing
+inherit cmake flag-o-matic llvm-r1 multiprocessing
 
 DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
 HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
@@ -46,7 +46,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DCCACHE_ALLOWED="OFF"
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
 		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
 		-DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
 		-Wno-dev