gentoo resync : 22.10.2018

1 files changed, 16 insertions, 15 deletions

diff --git a/sci-libs/exodusii/exodusii-6.09.ebuild b/sci-libs/exodusii/exodusii-6.09.ebuild
index a91a3e96e992..1b8221b53486 100644
--- a/sci-libs/exodusii/exodusii-6.09.ebuild
+++ b/sci-libs/exodusii/exodusii-6.09.ebuild
@@ -1,22 +1,21 @@
-# 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"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 
 RDEPEND="sci-libs/netcdf[hdf5]"
@@ -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
 }