commit:     ca87e11a0a364513582e01f7b044ca1da88e3122
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sun Apr 27 23:24:10 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 27 23:39:00 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca87e11a

media-gfx/openvdb: update to llvm-r2

Closes: https://bugs.gentoo.org/945347
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{openvdb-11.0.0.ebuild => openvdb-11.0.0-r1.ebuild}      | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/media-gfx/openvdb/openvdb-11.0.0.ebuild 
b/media-gfx/openvdb/openvdb-11.0.0-r1.ebuild
similarity index 97%
rename from media-gfx/openvdb/openvdb-11.0.0.ebuild
rename to media-gfx/openvdb/openvdb-11.0.0-r1.ebuild
index 82ea6a320325..0ca0ddf83ec9 100644
--- a/media-gfx/openvdb/openvdb-11.0.0.ebuild
+++ b/media-gfx/openvdb/openvdb-11.0.0-r1.ebuild
@@ -5,9 +5,9 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-LLVM_MAX_SLOT=15
+LLVM_COMPAT=( 15 )
 
-inherit cmake cuda flag-o-matic llvm multibuild python-single-r1 
toolchain-funcs
+inherit cmake cuda flag-o-matic llvm-r2 multibuild python-single-r1 
toolchain-funcs
 
 DESCRIPTION="Library for the efficient manipulation of volumetric data"
 HOMEPAGE="https://www.openvdb.org";
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.g
 
 LICENSE="MPL-2.0"
 OPENVDB_ABI=$(ver_cut 1)
-SLOT="0/${PV}"
+SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="abi$((OPENVDB_ABI + 1))-compat +abi${OPENVDB_ABI}-compat 
abi$((OPENVDB_ABI - 1))-compat abi$((OPENVDB_ABI - 2))-compat alembic ax +blosc 
cpu_flags_x86_avx cpu_flags_x86_sse4_2
        cuda doc examples jpeg +nanovdb numpy openexr png python static-libs 
test utils zlib"
@@ -43,7 +43,9 @@ RDEPEND="
        dev-libs/jemalloc:=
        dev-libs/imath:=
        ax? (
-               <llvm-core/llvm-$(( LLVM_MAX_SLOT + 1 )):=
+               $(llvm_gen_dep '
+                       llvm-core/llvm:${LLVM_SLOT}=
+               ')
        )
        blosc? (
                dev-libs/c-blosc:=
@@ -152,7 +154,7 @@ cuda_get_host_arch() {
 }
 
 pkg_setup() {
-       use ax && llvm_pkg_setup
+       use ax && llvm-r2_pkg_setup
        use python && python-single-r1_pkg_setup
 }
 

Reply via email to