Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/parmetis/
Date: Mon, 31 Dec 2018 21:14:55
Message-Id: 1546290826.475e43d7365b80a6fa40226ff49c863bcfe0dae5.asturm@gentoo
commit:     475e43d7365b80a6fa40226ff49c863bcfe0dae5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 31 20:58:43 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 31 21:13:46 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=475e43d7

sci-libs/parmetis: EAPI-6 bump, add missing cmake-utils_src_prepare

Closes: https://bugs.gentoo.org/671994
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-libs/parmetis/parmetis-4.0.3.ebuild | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sci-libs/parmetis/parmetis-4.0.3.ebuild b/sci-libs/parmetis/parmetis-4.0.3.ebuild
index 0df1f3da634..bb48b4e600f 100644
--- a/sci-libs/parmetis/parmetis-4.0.3.ebuild
+++ b/sci-libs/parmetis/parmetis-4.0.3.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils cmake-utils toolchain-funcs
+EAPI=6
 
 # Check metis version bundled in parmetis tar ball
 # by diff of metis and parmetis tar ball
 METISPV=5.1.0
 METISP=metis-${METISPV}
+inherit cmake-utils toolchain-funcs
 
 DESCRIPTION="Parallel (MPI) unstructured graph partitioning library"
 HOMEPAGE="http://www-users.cs.umn.edu/~karypis/metis/parmetis/"
@@ -36,6 +35,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	cmake-utils_src_prepare
+
 	# libdir love
 	sed -i \
 		-e '/DESTINATION/s/lib/lib${LIB_SUFFIX}/g' \
@@ -58,7 +59,6 @@ src_prepare() {
 			-e '/add_subdirectory(include/d' \
 			-e '/add_subdirectory(libparmetis/d' \
 			CMakeLists.txt || die
-
 	fi
 
 	if use int64; then
@@ -77,8 +77,8 @@ src_configure() {
 			-DMETIS_PATH="${S}/metis"
 			-DGKRAND=ON
 			-DMETIS_INSTALL=ON
-			$(cmake-utils_use openmp OPENMP)
-			$(cmake-utils_use pcre PCRE)
+			-DOPENMP=$(usex openmp)
+			-DPCRE=$(usex pcre)
 			$@
 		)
 		cmake-utils_src_configure