[gentoo-commits] repo/gentoo:master commit in: sys-libs/libcxxabi/

[Michał Górny]

commit:     86852424cfd6e01e27fdc0926b178cc95f31d273
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  7 16:38:01 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct  7 16:41:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86852424

sys-libs/libcxxabi: Use the new version vars

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

 sys-libs/libcxxabi/libcxxabi-15.0.2.9999.ebuild        | 7 +++----
 sys-libs/libcxxabi/libcxxabi-16.0.0.9999.ebuild        | 7 +++----
 sys-libs/libcxxabi/libcxxabi-16.0.0_pre20221006.ebuild | 7 +++----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/sys-libs/libcxxabi/libcxxabi-15.0.2.9999.ebuild 
b/sys-libs/libcxxabi/libcxxabi-15.0.2.9999.ebuild
index 78be4b5b862f..130101c20cb9 100644
--- a/sys-libs/libcxxabi/libcxxabi-15.0.2.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-15.0.2.9999.ebuild
@@ -21,14 +21,13 @@ RESTRICT="!test? ( test )"
 RDEPEND+="
        !<sys-libs/libcxx-15
 "
-LLVM_MAX_SLOT=${PV%%.*}
 DEPEND="
        ${RDEPEND}
-       sys-devel/llvm:${LLVM_MAX_SLOT}
+       sys-devel/llvm:${LLVM_MAJOR}
 "
 BDEPEND="
        clang? (
-               sys-devel/clang:${LLVM_MAX_SLOT}
+               sys-devel/clang:${LLVM_MAJOR}
        )
        !test? (
                ${PYTHON_DEPS}
@@ -51,7 +50,7 @@ pkg_setup() {
        # darwin prefix builds do not have llvm installed yet, so rely on 
bootstrap-prefix
        # to set the appropriate path vars to LLVM instead of using 
llvm_pkg_setup.
        if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-               llvm_pkg_setup
+               LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
        fi
        python-any-r1_pkg_setup
 }

diff --git a/sys-libs/libcxxabi/libcxxabi-16.0.0.9999.ebuild 
b/sys-libs/libcxxabi/libcxxabi-16.0.0.9999.ebuild
index 78be4b5b862f..130101c20cb9 100644
--- a/sys-libs/libcxxabi/libcxxabi-16.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-16.0.0.9999.ebuild
@@ -21,14 +21,13 @@ RESTRICT="!test? ( test )"
 RDEPEND+="
        !<sys-libs/libcxx-15
 "
-LLVM_MAX_SLOT=${PV%%.*}
 DEPEND="
        ${RDEPEND}
-       sys-devel/llvm:${LLVM_MAX_SLOT}
+       sys-devel/llvm:${LLVM_MAJOR}
 "
 BDEPEND="
        clang? (
-               sys-devel/clang:${LLVM_MAX_SLOT}
+               sys-devel/clang:${LLVM_MAJOR}
        )
        !test? (
                ${PYTHON_DEPS}
@@ -51,7 +50,7 @@ pkg_setup() {
        # darwin prefix builds do not have llvm installed yet, so rely on 
bootstrap-prefix
        # to set the appropriate path vars to LLVM instead of using 
llvm_pkg_setup.
        if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-               llvm_pkg_setup
+               LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
        fi
        python-any-r1_pkg_setup
 }

diff --git a/sys-libs/libcxxabi/libcxxabi-16.0.0_pre20221006.ebuild 
b/sys-libs/libcxxabi/libcxxabi-16.0.0_pre20221006.ebuild
index 78be4b5b862f..130101c20cb9 100644
--- a/sys-libs/libcxxabi/libcxxabi-16.0.0_pre20221006.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-16.0.0_pre20221006.ebuild
@@ -21,14 +21,13 @@ RESTRICT="!test? ( test )"
 RDEPEND+="
        !<sys-libs/libcxx-15
 "
-LLVM_MAX_SLOT=${PV%%.*}
 DEPEND="
        ${RDEPEND}
-       sys-devel/llvm:${LLVM_MAX_SLOT}
+       sys-devel/llvm:${LLVM_MAJOR}
 "
 BDEPEND="
        clang? (
-               sys-devel/clang:${LLVM_MAX_SLOT}
+               sys-devel/clang:${LLVM_MAJOR}
        )
        !test? (
                ${PYTHON_DEPS}
@@ -51,7 +50,7 @@ pkg_setup() {
        # darwin prefix builds do not have llvm installed yet, so rely on 
bootstrap-prefix
        # to set the appropriate path vars to LLVM instead of using 
llvm_pkg_setup.
        if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-               llvm_pkg_setup
+               LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
        fi
        python-any-r1_pkg_setup
 }