[gentoo-commits] repo/gentoo:master commit in: sci-libs/exodusii/files/, sci-libs/exodusii/

[Andreas Sturmlechner]

commit:     80cceb37cdd7966792abb91376759b287fd95b94
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 14 11:44:04 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 13:35:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80cceb37

sci-libs/exodusii: EAPI-6 bump, fix LIB_SUFFIX, unused cmake args

Fix dead HOMEPAGE, SRC_URI.

Closes: https://bugs.gentoo.org/644588
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 sci-libs/exodusii/exodusii-6.09.ebuild             | 29 +++++++++++-----------
 .../exodusii/files/exodusii-6.09-multilib.patch    | 18 +++++++-------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/sci-libs/exodusii/exodusii-6.09.ebuild b/sci-libs/exodusii/exodusii-6.09.ebuild
index a91a3e96e99..7f44f3f24c7 100644
--- a/sci-libs/exodusii/exodusii-6.09.ebuild
+++ b/sci-libs/exodusii/exodusii-6.09.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 FORTRAN_NEEDED="test"
-
-inherit cmake-utils fortran-2 multilib
+inherit cmake-utils fortran-2
 
 MY_PN="${PN%ii}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Model developed to store and retrieve transient data for finite element analyses"
-HOMEPAGE="https://sourceforge.net/projects/exodusii/"
-SRC_URI="mirror://sourceforge/project/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="https://github.com/certik/exodus"
+SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -29,21 +28,23 @@ S="${WORKDIR}"/${MY_P}/${MY_PN}
 PATCHES=( "${FILESDIR}"/${P}-multilib.patch )
 
 src_prepare() {
-	use test || \
-		sed \
-		-e 's:Fortran::g' \
-		-i CMakeLists.txt || die
 	cmake-utils_src_prepare
+
+	if ! use test; then
+		sed -e 's:Fortran::g' -i CMakeLists.txt || die
+	fi
 }
 
 src_configure() {
+	local libdir="$(get_libdir)"
+
 	local mycmakeargs=(
-		-DLIB_INSTALL_DIR=$(get_libdir)
-		-DNETCDF_DIR="${EPREFIX}/usr/"
+		-DLIB_SUFFIX=${libdir#lib}
 		-DPYTHON_INSTALL="${EPREFIX}/usr/share/${PN}"
-		$(cmake-utils_use_build !static-libs SHARED)
-		$(cmake-utils_use_build test TESTING)
+		-DBUILD_SHARED=$(usex !static-libs)
+		-DBUILD_TESTING=$(usex test)
 	)
+	export NETCDF_DIR="${EPREFIX}/usr/"
 	cmake-utils_src_configure
 }
 

diff --git a/sci-libs/exodusii/files/exodusii-6.09-multilib.patch b/sci-libs/exodusii/files/exodusii-6.09-multilib.patch
index 3b1b5e2ace7..5463fba5001 100644
--- a/sci-libs/exodusii/files/exodusii-6.09-multilib.patch
+++ b/sci-libs/exodusii/files/exodusii-6.09-multilib.patch
@@ -1,6 +1,6 @@
-diff -Naur exodus-6.09.orig/exodus/cbind/CMakeLists.txt exodus-6.09/exodus/cbind/CMakeLists.txt
---- exodus-6.09.orig/exodus/cbind/CMakeLists.txt	2016-05-10 13:20:06.408385120 -0600
-+++ exodus-6.09/exodus/cbind/CMakeLists.txt	2016-05-10 13:22:35.378385120 -0600
+diff -Naur a/cbind/CMakeLists.txt b/cbind/CMakeLists.txt
+--- a/cbind/CMakeLists.txt	2016-05-10 13:20:06.408385120 -0600
++++ b/cbind/CMakeLists.txt	2016-05-10 13:22:35.378385120 -0600
 @@ -293,9 +293,9 @@
  
  IF(NOT EXODUS_INSTALL_NO_LIBRARIES)
@@ -14,9 +14,9 @@ diff -Naur exodus-6.09.orig/exodus/cbind/CMakeLists.txt exodus-6.09/exodus/cbind
    INSTALL(FILES ${cbind_HEADERS} DESTINATION include COMPONENT Development)
  ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES)
  
-diff -Naur exodus-6.09.orig/exodus/CMakeLists.txt exodus-6.09/exodus/CMakeLists.txt
---- exodus-6.09.orig/exodus/CMakeLists.txt	2016-05-10 13:20:06.418385120 -0600
-+++ exodus-6.09/exodus/CMakeLists.txt	2016-05-10 13:21:25.928385120 -0600
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2016-05-10 13:20:06.418385120 -0600
++++ b/CMakeLists.txt	2016-05-10 13:21:25.928385120 -0600
 @@ -27,7 +27,7 @@
  find_library( NETCDF_LIBRARY
     NAMES netcdf
@@ -43,9 +43,9 @@ diff -Naur exodus-6.09.orig/exodus/CMakeLists.txt exodus-6.09/exodus/CMakeLists.
    $ENV{NETCDF_DIR}/libsrc/.libs
    /usr/local/hdf5/lib
    )
-diff -Naur exodus-6.09.orig/exodus/forbind/CMakeLists.txt exodus-6.09/exodus/forbind/CMakeLists.txt
---- exodus-6.09.orig/exodus/forbind/CMakeLists.txt	2016-05-10 13:20:06.418385120 -0600
-+++ exodus-6.09/exodus/forbind/CMakeLists.txt	2016-05-10 13:21:25.928385120 -0600
+diff -Naur a/forbind/CMakeLists.txt b/forbind/CMakeLists.txt
+--- a/forbind/CMakeLists.txt	2016-05-10 13:20:06.418385120 -0600
++++ b/forbind/CMakeLists.txt	2016-05-10 13:21:25.928385120 -0600
 @@ -14,7 +14,7 @@
  find_library( NETCDF_LIBRARY
     NAMES netcdf