sci-libs/metis: Ported EAPI from 5 to 6

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/2069

Signed-off-by: David Seifert <soap@gentoo.org>

diff --git a/sci-libs/metis/files/metis-4.0.1-autotools.patch b/sci-libs/metis/files/metis-4.0.1-autotools.patch
index b9623dd9ebf4aa1c230511f9df79d9ff088fafca..7422acf36c6ed1a17f854027c8ecac26d596ffb2 100644 (file)
--- a/sci-libs/metis/files/metis-4.0.1-autotools.patch
+++ b/sci-libs/metis/files/metis-4.0.1-autotools.patch
@@ -1,5 +1,5 @@
---- configure.ac       1970-01-01 01:00:00.000000000 +0100
-+++ configure.ac       2008-03-25 10:05:57.090715324 +0000
+--- a/configure.ac
++++ b/configure.ac
 @@ -0,0 +1,15 @@
 +# -*- Autoconf -*-
 +AC_PREREQ(2.59)

diff --git a/sci-libs/metis/files/metis-5.1.0-datatype.patch b/sci-libs/metis/files/metis-5.1.0-datatype.patch
index f583d05f34d9f6b645bc0711cd5f1f0b26a89378..cbca8904ff738e048943a9c839c3f6b19e420503 100644 (file)
--- a/sci-libs/metis/files/metis-5.1.0-datatype.patch
+++ b/sci-libs/metis/files/metis-5.1.0-datatype.patch
@@ -1,5 +1,5 @@
---- include/metis.orig.h       2013-03-11 20:50:00.000000000 +0100
-+++ include/metis.h    2013-03-16 12:14:59.117329640 +0100
+--- a/include/metis.h
++++ b/include/metis.h
 @@ -30,7 +30,7 @@
   GCC does provides these definitions in stdint.h, but it may require some
   modifications on other architectures.

diff --git a/sci-libs/metis/files/metis-5.1.0-multilib.patch b/sci-libs/metis/files/metis-5.1.0-multilib.patch
index 919812dc3093e96fc2273ba9ec2150b5cc3af3f8..9e72c5b1b2d3647c74d06039fa030e482ee50f25 100644 (file)
--- a/sci-libs/metis/files/metis-5.1.0-multilib.patch
+++ b/sci-libs/metis/files/metis-5.1.0-multilib.patch
@@ -1,5 +1,5 @@
---- libmetis/CMakeLists.orig.txt       2011-06-22 19:47:13.000000000 +0200
-+++ libmetis/CMakeLists.txt    2013-03-15 17:13:19.948911972 +0100
+--- a/libmetis/CMakeLists.txt
++++ b/libmetis/CMakeLists.txt
 @@ -4,13 +4,14 @@
  file(GLOB metis_sources *.c)
  # Build libmetis.

diff --git a/sci-libs/metis/files/metis-5.1.0-shared-GKlib.patch b/sci-libs/metis/files/metis-5.1.0-shared-GKlib.patch
index acfa59e60bd34dd8ae9d6993bd393b7679334679..4838201646381edc4a2773edc51d7a05476044eb 100644 (file)
--- a/sci-libs/metis/files/metis-5.1.0-shared-GKlib.patch
+++ b/sci-libs/metis/files/metis-5.1.0-shared-GKlib.patch
@@ -1,5 +1,5 @@
---- GKlib/CMakeLists.orig.txt  2013-03-11 20:50:14.000000000 +0100
-+++ GKlib/CMakeLists.txt       2013-03-17 19:53:44.220827579 +0100
+--- a/GKlib/CMakeLists.txt
++++ b/GKlib/CMakeLists.txt
 @@ -7,7 +7,7 @@
  include(GKlibSystem.cmake)
  

diff --git a/sci-libs/metis/metis-5.1.0-r2.ebuild b/sci-libs/metis/metis-5.1.0-r2.ebuild
index c91b246df85db772c5158a3d2e84f3c0dec37fed..7917340be0a4387725e6e6c08dfd636a65877529 100644 (file)
--- a/sci-libs/metis/metis-5.1.0-r2.ebuild
+++ b/sci-libs/metis/metis-5.1.0-r2.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit cmake-utils fortran-2 multilib
+inherit cmake-utils fortran-2
 
 DESCRIPTION="A package for unstructured serial graph partitioning"
 HOMEPAGE="http://www-users.cs.umn.edu/~karypis/metis/metis/"
@@ -25,7 +25,7 @@ PATCHES=(
        "${FILESDIR}"/${P}-datatype.patch
        "${FILESDIR}"/${P}-shared-GKlib.patch
        "${FILESDIR}"/${P}-multilib.patch
-       )
+)
 
 src_prepare() {
        sed \
@@ -39,7 +39,7 @@ src_configure() {
        local mycmakeargs=(
                -DGKLIB_PATH="${S}"/GKlib
                -DSHARED=TRUE
-               $(cmake-utils_use openmp)
+               -DOPENMP="$(usex openmp)"
        )
        cmake-utils_src_configure
 }