Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/nemesis/files/, sci-libs/nemesis/
Date: Sun, 14 Oct 2018 13:35:27
Message-Id: 1539524106.5c772bb3f055335b6c91bf20d5ab85c75dde6f8d.asturm@gentoo
1 commit: 5c772bb3f055335b6c91bf20d5ab85c75dde6f8d
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 14 12:45:32 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 14 13:35:06 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c772bb3
7
8 sci-libs/nemesis: EAPI-6 bump, drop unused cmake args
9
10 Fix dead HOMEPAGE, SRC_URI.
11
12 Bug: https://bugs.gentoo.org/644588
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14 Package-Manager: Portage-2.3.51, Repoman-2.3.11
15
16 sci-libs/nemesis/files/nemesis-6.09-multilib.patch | 6 +++---
17 sci-libs/nemesis/nemesis-6.09.ebuild | 22 ++++++++++------------
18 2 files changed, 13 insertions(+), 15 deletions(-)
19
20 diff --git a/sci-libs/nemesis/files/nemesis-6.09-multilib.patch b/sci-libs/nemesis/files/nemesis-6.09-multilib.patch
21 index d0f05f23a2d..09b5c9a6037 100644
22 --- a/sci-libs/nemesis/files/nemesis-6.09-multilib.patch
23 +++ b/sci-libs/nemesis/files/nemesis-6.09-multilib.patch
24 @@ -1,10 +1,10 @@
25 nemesis/CMakeLists.txt | 15 ++++++++-------
26 1 file changed, 8 insertions(+), 7 deletions(-)
27
28 -diff --git a/nemesis/CMakeLists.txt b/nemesis/CMakeLists.txt
29 +diff --git a/CMakeLists.txt b/CMakeLists.txt
30 index 64aff5d..bed5ede 100644
31 ---- a/nemesis/CMakeLists.txt
32 -+++ b/nemesis/CMakeLists.txt
33 +--- a/CMakeLists.txt
34 ++++ b/CMakeLists.txt
35 @@ -19,7 +19,7 @@
36 find_library( NETCDF_LIBRARY netcdf
37 $ENV{ACCESS}/lib/shared
38
39 diff --git a/sci-libs/nemesis/nemesis-6.09.ebuild b/sci-libs/nemesis/nemesis-6.09.ebuild
40 index 4bd332e3b01..3e18bd12f61 100644
41 --- a/sci-libs/nemesis/nemesis-6.09.ebuild
42 +++ b/sci-libs/nemesis/nemesis-6.09.ebuild
43 @@ -1,21 +1,21 @@
44 -# Copyright 1999-2016 Gentoo Foundation
45 +# Copyright 1999-2018 Gentoo Authors
46 # Distributed under the terms of the GNU General Public License v2
47
48 -EAPI=5
49 +EAPI=6
50
51 -inherit cmake-utils multilib
52 +inherit cmake-utils
53
54 MY_PN="exodus"
55 MY_P="${MY_PN}-${PV}"
56
57 DESCRIPTION="Enhancement to the EXODUSII finite element database model"
58 -HOMEPAGE="https://sourceforge.net/projects/exodusii/"
59 -SRC_URI="mirror://sourceforge/project/${MY_PN}ii/${MY_P}.tar.gz"
60 +HOMEPAGE="https://github.com/certik/exodus"
61 +SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${MY_P}.tar.gz"
62
63 LICENSE="BSD"
64 SLOT="0"
65 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
66 -IUSE="static-libs test"
67 +IUSE="static-libs"
68
69 DEPEND="
70 sci-libs/exodusii
71 @@ -32,13 +32,11 @@ src_prepare() {
72 }
73
74 src_configure() {
75 - mycmakeargs=(
76 - -DLIB_INSTALL_DIR=$(get_libdir)
77 - -DNETCDF_DIR="${EPREFIX}/usr/"
78 - -DEXODUS_DIR="${EPREFIX}/usr/"
79 - $(cmake-utils_use !static-libs BUILD_SHARED_LIBS)
80 - $(cmake-utils_use test BUILD_TESTING)
81 + local mycmakeargs=(
82 + -DBUILD_SHARED_LIBS=$(usex !static-libs)
83 )
84 + export NETCDF_DIR="${EPREFIX}/usr/"
85 + export EXODUS_DIR="${EPREFIX}/usr/"
86 cmake-utils_src_configure
87 }