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

[Michał Górny]

commit:     5e7f5ae2818aed534bb53d1d2f799a80407f44de
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 16:16:08 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 16:32:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e7f5ae2

sys-libs/llvm-libunwind: Port to cmake.eclass

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

 .../llvm-libunwind/llvm-libunwind-10.0.1.9999.ebuild    | 17 +++++++++--------
 .../llvm-libunwind/llvm-libunwind-10.0.1_rc1.ebuild     | 17 +++++++++--------
 .../llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild    | 17 +++++++++--------
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.9999.ebuild 
b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.9999.ebuild
index df0cdeaeb55..22f9c46e411 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
 
@@ -41,7 +42,7 @@ src_prepare() {
        # cmake eclasses suck by forcing ${S} here
        CMAKE_USE_DIR=${S} \
        S=${WORKDIR} \
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 multilib_src_configure() {
@@ -70,7 +71,7 @@ multilib_src_configure() {
                )
        fi
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 build_libcxxabi() {
@@ -88,8 +89,8 @@ build_libcxxabi() {
                -DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
        )
 
-       cmake-utils_src_configure
-       cmake-utils_src_compile
+       cmake_src_configure
+       cmake_src_compile
 }
 
 build_libcxx() {
@@ -110,8 +111,8 @@ build_libcxx() {
                -DLIBCXX_INCLUDE_TESTS=OFF
        )
 
-       cmake-utils_src_configure
-       cmake-utils_src_compile
+       cmake_src_configure
+       cmake_src_compile
 }
 
 multilib_src_test() {
@@ -122,11 +123,11 @@ multilib_src_test() {
        mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || 
die
 
        local -x LIT_PRESERVES_TMP=1
-       cmake-utils_src_make check-unwind
+       cmake_build check-unwind
 }
 
 multilib_src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        # install headers like sys-libs/libunwind
        doheader "${S}"/include/*.h

diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1_rc1.ebuild 
b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1_rc1.ebuild
index df0cdeaeb55..22f9c46e411 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1_rc1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1_rc1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
 
@@ -41,7 +42,7 @@ src_prepare() {
        # cmake eclasses suck by forcing ${S} here
        CMAKE_USE_DIR=${S} \
        S=${WORKDIR} \
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 multilib_src_configure() {
@@ -70,7 +71,7 @@ multilib_src_configure() {
                )
        fi
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 build_libcxxabi() {
@@ -88,8 +89,8 @@ build_libcxxabi() {
                -DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
        )
 
-       cmake-utils_src_configure
-       cmake-utils_src_compile
+       cmake_src_configure
+       cmake_src_compile
 }
 
 build_libcxx() {
@@ -110,8 +111,8 @@ build_libcxx() {
                -DLIBCXX_INCLUDE_TESTS=OFF
        )
 
-       cmake-utils_src_configure
-       cmake-utils_src_compile
+       cmake_src_configure
+       cmake_src_compile
 }
 
 multilib_src_test() {
@@ -122,11 +123,11 @@ multilib_src_test() {
        mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || 
die
 
        local -x LIT_PRESERVES_TMP=1
-       cmake-utils_src_make check-unwind
+       cmake_build check-unwind
 }
 
 multilib_src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        # install headers like sys-libs/libunwind
        doheader "${S}"/include/*.h

diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild 
b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild
index 796cfb52760..220f7b9c9bf 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{6,7,8} )
 inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
 
@@ -41,7 +42,7 @@ src_prepare() {
        # cmake eclasses suck by forcing ${S} here
        CMAKE_USE_DIR=${S} \
        S=${WORKDIR} \
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 multilib_src_configure() {
@@ -70,7 +71,7 @@ multilib_src_configure() {
                )
        fi
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 build_libcxxabi() {
@@ -88,8 +89,8 @@ build_libcxxabi() {
                -DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
        )
 
-       cmake-utils_src_configure
-       cmake-utils_src_compile
+       cmake_src_configure
+       cmake_src_compile
 }
 
 build_libcxx() {
@@ -110,8 +111,8 @@ build_libcxx() {
                -DLIBCXX_INCLUDE_TESTS=OFF
        )
 
-       cmake-utils_src_configure
-       cmake-utils_src_compile
+       cmake_src_configure
+       cmake_src_compile
 }
 
 multilib_src_test() {
@@ -122,11 +123,11 @@ multilib_src_test() {
        mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || 
die
 
        local -x LIT_PRESERVES_TMP=1
-       cmake-utils_src_make check-unwind
+       cmake_build check-unwind
 }
 
 multilib_src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        # install headers like sys-libs/libunwind
        doheader "${S}"/include/*.h