From c8a77dfe4d3d307c1d5dd2650b7297447d8b609d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 12 Jan 2019 16:58:08 +0000
Subject: gentoo resync : 12.01.2019

---
 sci-libs/parmetis/Manifest              |  2 +-
 sci-libs/parmetis/parmetis-4.0.3.ebuild | 31 ++++++++++++++++++-------------
 2 files changed, 19 insertions(+), 14 deletions(-)

(limited to 'sci-libs/parmetis')

diff --git a/sci-libs/parmetis/Manifest b/sci-libs/parmetis/Manifest
index 6a53363f76a6..ba9de7da7493 100644
--- a/sci-libs/parmetis/Manifest
+++ b/sci-libs/parmetis/Manifest
@@ -3,5 +3,5 @@ DIST ParMetis-3.2.0.tar.gz 5291841 BLAKE2B f18b5144f2814a83c3a0b945b1bdbad812cce
 DIST metis-5.1.0.tar.gz 4984968 BLAKE2B c5f8ff552fce7e7cc02740e6197c9deb5e05e8bc2e2e56cad0cba85705eec6990b511182930c8758fd16a18015f54c8a4827038039bc3c58ee41df468ea175bc SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25
 DIST parmetis-4.0.3.tar.gz 5567670 BLAKE2B 69a44ea8e50d8fd78046a342807b994220d03da3ab1695533d92772b1840302917a7d5d6f9eb020d9ff8ab7e5372bff0386d6354b662f58495b74f8f596c45f9 SHA512 454a91921ca35c981df11c9846a11963ff8fd8407a25179453af33f8fe69493f6dd7f2a0b8feed9a7d3f121e45b715749dd7a94873eaac2bae4cad1e535ca132
 EBUILD parmetis-3.2.0.ebuild 867 BLAKE2B 98b33fe947e2c2b596d698d6923c18c7a22c144261d1a1ac2132af047be7366a18932e4e40d2e2a513000e0b895127623be456eaaa4b40da8ef56d7e00643c8d SHA512 d7d4ba4be5f372187796ac6c6d9c80a342b54bb7a01034d84676eca9cff2e88f4cda9c4b6170560faa342038b94616a9444690fa13472372cca48c964feaa0ef
-EBUILD parmetis-4.0.3.ebuild 4025 BLAKE2B 5dc751ed37a54d10310642c30bcc6048b150bf965f5458b453ea2a622fe4c1994c69b625ee5540aec4b10d077c78595950eb812953da8e3ae7ada2c7aaba05f4 SHA512 9e613b42f111a8313528a0a293889f6c1a43e30261ce3ca1a53609831f00ba1677e8d66fcc97c487916e13ad9235589f68a458d2110dc5122c7136a526aaff61
+EBUILD parmetis-4.0.3.ebuild 4083 BLAKE2B a26a6988ac29f6e6107626141a377cb732cafb3b17aa6ac8840f8ae1cf604b6009f89f495c3833f7e7ef3cdb3cbb00645b7860463ced3b46d38f5dd5a4c86633 SHA512 902ca8d5d974ebded7aacaaf5d9d099eb42078b4c3e601a4b250c5fa5689caea6a213bab75abdb0b691c6d42026123f81e9046575fef4e877ccbb99ca71f3e80
 MISC metadata.xml 851 BLAKE2B 8c8fc30f50378b05ae59ca1f829da71f2a5cf66dfab03f645ceed4379bc8edc176fb9e5d1f1f83bbb695519a9e14bfd7855e040f56070a344791eb70eed12721 SHA512 6309c02babe871cd0bdaf509caab79dd8b81face5f6f5a39a1473284dbae6859223ae4f65d61fcf08370bac29dfd0e174cb722fbeeaeb5c80d53b749c265c73a
diff --git a/sci-libs/parmetis/parmetis-4.0.3.ebuild b/sci-libs/parmetis/parmetis-4.0.3.ebuild
index 71ee81fcbc9d..bb48b4e600fe 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' \
@@ -47,7 +48,9 @@ src_prepare() {
 	sed -i \
 		-e '/programs/d' \
 		CMakeLists.txt metis/CMakeLists.txt || die
-	use static-libs && mkdir "${WORKDIR}/${PN}_static"
+	if use static-libs; then
+		mkdir "${WORKDIR}/${PN}_static" || die
+	fi
 
 	if use mpi; then
 		export CC=mpicc CXX=mpicxx
@@ -56,14 +59,15 @@ src_prepare() {
 			-e '/add_subdirectory(include/d' \
 			-e '/add_subdirectory(libparmetis/d' \
 			CMakeLists.txt || die
-
 	fi
 
-	use int64 && \
-		sed -i -e '/IDXTYPEWIDTH/s/32/64/' metis/include/metis.h
+	if use int64; then
+		sed -i -e '/IDXTYPEWIDTH/s/32/64/' metis/include/metis.h || die
+	fi
 
-	use double-precision && \
-		sed -i -e '/REALTYPEWIDTH/s/32/64/' metis/include/metis.h
+	if use double-precision; then
+		sed -i -e '/REALTYPEWIDTH/s/32/64/' metis/include/metis.h || die
+	fi
 }
 
 src_configure() {
@@ -73,16 +77,17 @@ 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
 	}
 	parmetis_configure -DSHARED=ON
-	use static-libs && \
-		sed -i -e '/fPIC/d' metis/GKlib/GKlibSystem.cmake && \
+	if use static-libs; then
+		sed -i -e '/fPIC/d' metis/GKlib/GKlibSystem.cmake || die
 		BUILD_DIR="${WORKDIR}/${PN}_static" parmetis_configure
+	fi
 }
 
 src_compile() {
-- 
cgit v1.2.3