[gentoo-commits] repo/gentoo:master commit in: sci-libs/trilinos/

["Matthias Maier" <tamiko@gentoo.org>]

commit:     8f6434447c3dad61edb79cbe027584ce3f3dbc53
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 12 04:52:17 2021 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Nov 12 04:57:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f643444

sci-libs/trilinos: migrate from cmake-utils to cmake eclass

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 sci-libs/trilinos/trilinos-13.0.1-r1.ebuild | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/sci-libs/trilinos/trilinos-13.0.1-r1.ebuild b/sci-libs/trilinos/trilinos-13.0.1-r1.ebuild
index 06a28401dc9..1b0396047b3 100644
--- a/sci-libs/trilinos/trilinos-13.0.1-r1.ebuild
+++ b/sci-libs/trilinos/trilinos-13.0.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake-utils toolchain-funcs multilib
+inherit cmake toolchain-funcs multilib
 
 DESCRIPTION="Scientific library collection for large scale problems"
 HOMEPAGE="http://trilinos.sandia.gov/"
@@ -183,15 +183,14 @@ src_configure() {
 	#
 	export CC=mpicc CXX=mpicxx && tc-export CC CXX
 
-	#
-	# cmake-utils eclass patches the base directory CMakeLists.txt
-	# which does not work for complex Trilinos CMake modules
-	#
-	CMAKE_BUILD_TYPE=RELEASE cmake-utils_src_configure
+	# Trilinos needs a custom build type:
+	local CMAKE_BUILD_TYPE=Release
+
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# Clean up the mess:
 	mv "${ED}"/bin "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"