summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-10-14 14:45:32 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-10-14 15:35:06 +0200
commit5c772bb3f055335b6c91bf20d5ab85c75dde6f8d (patch)
tree167300150c6f01c2b78d0ba0a37178565d9af9f2
parentsci-libs/exodusii: EAPI-6 bump, fix LIB_SUFFIX, unused cmake args (diff)
downloadgentoo-5c772bb3f055335b6c91bf20d5ab85c75dde6f8d.tar.gz
gentoo-5c772bb3f055335b6c91bf20d5ab85c75dde6f8d.tar.bz2
gentoo-5c772bb3f055335b6c91bf20d5ab85c75dde6f8d.zip
sci-libs/nemesis: EAPI-6 bump, drop unused cmake args
Fix dead HOMEPAGE, SRC_URI. Bug: https://bugs.gentoo.org/644588 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11
-rw-r--r--sci-libs/nemesis/files/nemesis-6.09-multilib.patch6
-rw-r--r--sci-libs/nemesis/nemesis-6.09.ebuild22
2 files changed, 13 insertions, 15 deletions
diff --git a/sci-libs/nemesis/files/nemesis-6.09-multilib.patch b/sci-libs/nemesis/files/nemesis-6.09-multilib.patch
index d0f05f23a2d2..09b5c9a60377 100644
--- a/sci-libs/nemesis/files/nemesis-6.09-multilib.patch
+++ b/sci-libs/nemesis/files/nemesis-6.09-multilib.patch
@@ -1,10 +1,10 @@
nemesis/CMakeLists.txt | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
-diff --git a/nemesis/CMakeLists.txt b/nemesis/CMakeLists.txt
+diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64aff5d..bed5ede 100644
---- a/nemesis/CMakeLists.txt
-+++ b/nemesis/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -19,7 +19,7 @@
find_library( NETCDF_LIBRARY netcdf
$ENV{ACCESS}/lib/shared
diff --git a/sci-libs/nemesis/nemesis-6.09.ebuild b/sci-libs/nemesis/nemesis-6.09.ebuild
index 4bd332e3b01c..3e18bd12f610 100644
--- a/sci-libs/nemesis/nemesis-6.09.ebuild
+++ b/sci-libs/nemesis/nemesis-6.09.ebuild
@@ -1,21 +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
-inherit cmake-utils multilib
+inherit cmake-utils
MY_PN="exodus"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Enhancement to the EXODUSII finite element database model"
-HOMEPAGE="https://sourceforge.net/projects/exodusii/"
-SRC_URI="mirror://sourceforge/project/${MY_PN}ii/${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 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
+IUSE="static-libs"
DEPEND="
sci-libs/exodusii
@@ -32,13 +32,11 @@ src_prepare() {
}
src_configure() {
- mycmakeargs=(
- -DLIB_INSTALL_DIR=$(get_libdir)
- -DNETCDF_DIR="${EPREFIX}/usr/"
- -DEXODUS_DIR="${EPREFIX}/usr/"
- $(cmake-utils_use !static-libs BUILD_SHARED_LIBS)
- $(cmake-utils_use test BUILD_TESTING)
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=$(usex !static-libs)
)
+ export NETCDF_DIR="${EPREFIX}/usr/"
+ export EXODUS_DIR="${EPREFIX}/usr/"
cmake-utils_src_configure
}