[gentoo-commits] repo/gentoo:master commit in: dev-util/spirv-llvm-translator/

["Conrad Kostecki" <conikost@gentoo.org>]

commit:     8c7dc3245cbbf2b552174948f4c4a6eeb0d1596c
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 21:14:55 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 09:52:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c7dc324

dev-util/spirv-llvm-translator: migrate to llvm-r1

Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/38807
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 ...nslator-15.0.4.ebuild => spirv-llvm-translator-15.0.4-r1.ebuild} | 6 +++---
 ...nslator-16.0.4.ebuild => spirv-llvm-translator-16.0.4-r1.ebuild} | 6 +++---
 ...nslator-17.0.4.ebuild => spirv-llvm-translator-17.0.4-r1.ebuild} | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

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
similarity index 91%
rename from dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.4.ebuild
rename to 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
similarity index 90%
rename from dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.4.ebuild
rename to 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
similarity index 90%
rename from dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.4.ebuild
rename to 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