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

[Michał Górny]

commit:     84e24bee8e501876705cd91c940c3984f018cedf
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 16:31:20 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 16:32:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84e24bee

sys-libs/libomp: Port to cmake.eclass

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

 sys-libs/libomp/libomp-10.0.1.9999.ebuild | 7 ++++---
 sys-libs/libomp/libomp-10.0.1_rc1.ebuild  | 7 ++++---
 sys-libs/libomp/libomp-11.0.0.9999.ebuild | 7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/sys-libs/libomp/libomp-10.0.1.9999.ebuild 
b/sys-libs/libomp/libomp-10.0.1.9999.ebuild
index b2d599eb53d..75f1323b4f5 100644
--- a/sys-libs/libomp/libomp-10.0.1.9999.ebuild
+++ b/sys-libs/libomp/libomp-10.0.1.9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{6,7,8} )
 inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1
 
@@ -70,7 +71,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() {
@@ -102,12 +103,12 @@ multilib_src_configure() {
                -DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
                -DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 multilib_src_test() {
        # respect TMPDIR!
        local -x LIT_PRESERVES_TMP=1
 
-       cmake-utils_src_make check-libomp
+       cmake_build check-libomp
 }

diff --git a/sys-libs/libomp/libomp-10.0.1_rc1.ebuild 
b/sys-libs/libomp/libomp-10.0.1_rc1.ebuild
index b2d599eb53d..75f1323b4f5 100644
--- a/sys-libs/libomp/libomp-10.0.1_rc1.ebuild
+++ b/sys-libs/libomp/libomp-10.0.1_rc1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{6,7,8} )
 inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1
 
@@ -70,7 +71,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() {
@@ -102,12 +103,12 @@ multilib_src_configure() {
                -DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
                -DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 multilib_src_test() {
        # respect TMPDIR!
        local -x LIT_PRESERVES_TMP=1
 
-       cmake-utils_src_make check-libomp
+       cmake_build check-libomp
 }

diff --git a/sys-libs/libomp/libomp-11.0.0.9999.ebuild 
b/sys-libs/libomp/libomp-11.0.0.9999.ebuild
index b2d599eb53d..75f1323b4f5 100644
--- a/sys-libs/libomp/libomp-11.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-11.0.0.9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{6,7,8} )
 inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1
 
@@ -70,7 +71,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() {
@@ -102,12 +103,12 @@ multilib_src_configure() {
                -DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
                -DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 multilib_src_test() {
        # respect TMPDIR!
        local -x LIT_PRESERVES_TMP=1
 
-       cmake-utils_src_make check-libomp
+       cmake_build check-libomp
 }