[gentoo-commits] repo/gentoo:master commit in: dev-util/lldb/

[Michał Górny]

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

dev-util/lldb: Use the new version vars

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

 dev-util/lldb/lldb-15.0.2.9999.ebuild        | 4 ++--
 dev-util/lldb/lldb-16.0.0.9999.ebuild        | 4 ++--
 dev-util/lldb/lldb-16.0.0_pre20221006.ebuild | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-util/lldb/lldb-15.0.2.9999.ebuild 
b/dev-util/lldb/lldb-15.0.2.9999.ebuild
index fd12eb1fbf30..0772ababd155 100644
--- a/dev-util/lldb/lldb-15.0.2.9999.ebuild
+++ b/dev-util/lldb/lldb-15.0.2.9999.ebuild
@@ -56,7 +56,7 @@ LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support 
llvm/utils/unittest )
 llvm.org_set_globals
 
 pkg_setup() {
-       LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+       LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
        python-single-r1_pkg_setup
 }
 
@@ -86,7 +86,7 @@ src_configure() {
                # of -ltinfo)
                -DCURSES_NEED_NCURSES=ON
 
-               
-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${PV%_*}"
+               
-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${LLVM_VERSION}"
 
                -DPython3_EXECUTABLE="${PYTHON}"
        )

diff --git a/dev-util/lldb/lldb-16.0.0.9999.ebuild 
b/dev-util/lldb/lldb-16.0.0.9999.ebuild
index fd12eb1fbf30..0772ababd155 100644
--- a/dev-util/lldb/lldb-16.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-16.0.0.9999.ebuild
@@ -56,7 +56,7 @@ LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support 
llvm/utils/unittest )
 llvm.org_set_globals
 
 pkg_setup() {
-       LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+       LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
        python-single-r1_pkg_setup
 }
 
@@ -86,7 +86,7 @@ src_configure() {
                # of -ltinfo)
                -DCURSES_NEED_NCURSES=ON
 
-               
-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${PV%_*}"
+               
-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${LLVM_VERSION}"
 
                -DPython3_EXECUTABLE="${PYTHON}"
        )

diff --git a/dev-util/lldb/lldb-16.0.0_pre20221006.ebuild 
b/dev-util/lldb/lldb-16.0.0_pre20221006.ebuild
index fd12eb1fbf30..0772ababd155 100644
--- a/dev-util/lldb/lldb-16.0.0_pre20221006.ebuild
+++ b/dev-util/lldb/lldb-16.0.0_pre20221006.ebuild
@@ -56,7 +56,7 @@ LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support 
llvm/utils/unittest )
 llvm.org_set_globals
 
 pkg_setup() {
-       LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+       LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
        python-single-r1_pkg_setup
 }
 
@@ -86,7 +86,7 @@ src_configure() {
                # of -ltinfo)
                -DCURSES_NEED_NCURSES=ON
 
-               
-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${PV%_*}"
+               
-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${LLVM_VERSION}"
 
                -DPython3_EXECUTABLE="${PYTHON}"
        )