commit:     e61d174a4f1e0ebe62f2b684d74fb15256928ffc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 10 11:10:38 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb 10 11:13:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e61d174a

dev-libs/libclc: Migrate to llvm-r1

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-libs/libclc/libclc-18.1.0_rc2.ebuild         | 40 +++++-------------------
 dev-libs/libclc/libclc-19.0.0.9999.ebuild        | 40 +++++-------------------
 dev-libs/libclc/libclc-19.0.0_pre20240203.ebuild | 40 +++++-------------------
 3 files changed, 21 insertions(+), 99 deletions(-)

diff --git a/dev-libs/libclc/libclc-18.1.0_rc2.ebuild 
b/dev-libs/libclc/libclc-18.1.0_rc2.ebuild
index 70dacd0cf8da..15a69aca7556 100644
--- a/dev-libs/libclc/libclc-18.1.0_rc2.ebuild
+++ b/dev-libs/libclc/libclc-18.1.0_rc2.ebuild
@@ -3,8 +3,9 @@
 
 EAPI=8
 
+LLVM_COMPAT=( {15..17} )
 PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org python-any-r1
+inherit cmake llvm.org llvm-r1 python-any-r1
 
 DESCRIPTION="OpenCL C library"
 HOMEPAGE="https://libclc.llvm.org/";
@@ -13,46 +14,19 @@ LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
 SLOT="0"
 IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 
-LLVM_MAX_SLOT=17
 BDEPEND="
        ${PYTHON_DEPS}
-       || (
-               (
-                       sys-devel/clang:17
-                       spirv? ( dev-util/spirv-llvm-translator:17 )
-               )
-               (
-                       sys-devel/clang:16
-                       spirv? ( dev-util/spirv-llvm-translator:16 )
-               )
-               (
-                       sys-devel/clang:15
-                       spirv? ( dev-util/spirv-llvm-translator:15 )
-               )
-               (
-                       sys-devel/clang:14
-                       spirv? ( dev-util/spirv-llvm-translator:14 )
-               )
-               (
-                       sys-devel/clang:13
-                       spirv? ( dev-util/spirv-llvm-translator:13 )
-               )
-       )
+       $(llvm_gen_dep '
+               sys-devel/clang:${LLVM_SLOT}
+               spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} )
+       ')
 "
 
 LLVM_COMPONENTS=( libclc )
 llvm.org_set_globals
 
-llvm_check_deps() {
-       if use spirv; then
-               has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
-                       return 1
-       fi
-       has_version -b "sys-devel/clang:${LLVM_SLOT}"
-}
-
 pkg_setup() {
-       llvm_pkg_setup
+       llvm-r1_pkg_setup
        python-any-r1_pkg_setup
 }
 

diff --git a/dev-libs/libclc/libclc-19.0.0.9999.ebuild 
b/dev-libs/libclc/libclc-19.0.0.9999.ebuild
index 70dacd0cf8da..15a69aca7556 100644
--- a/dev-libs/libclc/libclc-19.0.0.9999.ebuild
+++ b/dev-libs/libclc/libclc-19.0.0.9999.ebuild
@@ -3,8 +3,9 @@
 
 EAPI=8
 
+LLVM_COMPAT=( {15..17} )
 PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org python-any-r1
+inherit cmake llvm.org llvm-r1 python-any-r1
 
 DESCRIPTION="OpenCL C library"
 HOMEPAGE="https://libclc.llvm.org/";
@@ -13,46 +14,19 @@ LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
 SLOT="0"
 IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 
-LLVM_MAX_SLOT=17
 BDEPEND="
        ${PYTHON_DEPS}
-       || (
-               (
-                       sys-devel/clang:17
-                       spirv? ( dev-util/spirv-llvm-translator:17 )
-               )
-               (
-                       sys-devel/clang:16
-                       spirv? ( dev-util/spirv-llvm-translator:16 )
-               )
-               (
-                       sys-devel/clang:15
-                       spirv? ( dev-util/spirv-llvm-translator:15 )
-               )
-               (
-                       sys-devel/clang:14
-                       spirv? ( dev-util/spirv-llvm-translator:14 )
-               )
-               (
-                       sys-devel/clang:13
-                       spirv? ( dev-util/spirv-llvm-translator:13 )
-               )
-       )
+       $(llvm_gen_dep '
+               sys-devel/clang:${LLVM_SLOT}
+               spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} )
+       ')
 "
 
 LLVM_COMPONENTS=( libclc )
 llvm.org_set_globals
 
-llvm_check_deps() {
-       if use spirv; then
-               has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
-                       return 1
-       fi
-       has_version -b "sys-devel/clang:${LLVM_SLOT}"
-}
-
 pkg_setup() {
-       llvm_pkg_setup
+       llvm-r1_pkg_setup
        python-any-r1_pkg_setup
 }
 

diff --git a/dev-libs/libclc/libclc-19.0.0_pre20240203.ebuild 
b/dev-libs/libclc/libclc-19.0.0_pre20240203.ebuild
index 70dacd0cf8da..15a69aca7556 100644
--- a/dev-libs/libclc/libclc-19.0.0_pre20240203.ebuild
+++ b/dev-libs/libclc/libclc-19.0.0_pre20240203.ebuild
@@ -3,8 +3,9 @@
 
 EAPI=8
 
+LLVM_COMPAT=( {15..17} )
 PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org python-any-r1
+inherit cmake llvm.org llvm-r1 python-any-r1
 
 DESCRIPTION="OpenCL C library"
 HOMEPAGE="https://libclc.llvm.org/";
@@ -13,46 +14,19 @@ LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
 SLOT="0"
 IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 
-LLVM_MAX_SLOT=17
 BDEPEND="
        ${PYTHON_DEPS}
-       || (
-               (
-                       sys-devel/clang:17
-                       spirv? ( dev-util/spirv-llvm-translator:17 )
-               )
-               (
-                       sys-devel/clang:16
-                       spirv? ( dev-util/spirv-llvm-translator:16 )
-               )
-               (
-                       sys-devel/clang:15
-                       spirv? ( dev-util/spirv-llvm-translator:15 )
-               )
-               (
-                       sys-devel/clang:14
-                       spirv? ( dev-util/spirv-llvm-translator:14 )
-               )
-               (
-                       sys-devel/clang:13
-                       spirv? ( dev-util/spirv-llvm-translator:13 )
-               )
-       )
+       $(llvm_gen_dep '
+               sys-devel/clang:${LLVM_SLOT}
+               spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} )
+       ')
 "
 
 LLVM_COMPONENTS=( libclc )
 llvm.org_set_globals
 
-llvm_check_deps() {
-       if use spirv; then
-               has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
-                       return 1
-       fi
-       has_version -b "sys-devel/clang:${LLVM_SLOT}"
-}
-
 pkg_setup() {
-       llvm_pkg_setup
+       llvm-r1_pkg_setup
        python-any-r1_pkg_setup
 }
 

Reply via email to