commit:     5e1e9330b2f37b8f873df973bc8438d4db1ef1d4
Author:     Gerhard Bräunlich <wippbox <AT> gmx <DOT> net>
AuthorDate: Thu Aug 11 15:08:02 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 17:18:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e1e9330

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 <AT> gentoo.org>

 sci-libs/metis/files/metis-4.0.1-autotools.patch    | 4 ++--
 sci-libs/metis/files/metis-5.1.0-datatype.patch     | 4 ++--
 sci-libs/metis/files/metis-5.1.0-multilib.patch     | 4 ++--
 sci-libs/metis/files/metis-5.1.0-shared-GKlib.patch | 4 ++--
 sci-libs/metis/metis-5.1.0-r2.ebuild                | 8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)

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 b9623dd..7422acf 100644
--- 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 f583d05..cbca890 100644
--- 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 919812d..9e72c5b 100644
--- 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 acfa59e..4838201 100644
--- 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 c91b246..7917340 100644
--- 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
 }

Reply via email to