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/exodusii/
Date: Fri, 26 Feb 2021 21:19:40
Message-Id: 1614374364.3fa669f89210e9dcdf2ddbad75d85668ed6a5f63.asturm@gentoo
1 commit: 3fa669f89210e9dcdf2ddbad75d85668ed6a5f63
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 26 15:57:05 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 26 21:19:24 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fa669f8
7
8 sci-libs/exodusii: EAPI-7 bump, switch to cmake.eclass
9
10 I guess I was the last one to version bump, so be it.
11
12 Package-Manager: Portage-3.0.15, Repoman-3.0.2
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 sci-libs/exodusii/exodusii-6.09.ebuild | 14 +++++++-------
16 1 file changed, 7 insertions(+), 7 deletions(-)
17
18 diff --git a/sci-libs/exodusii/exodusii-6.09.ebuild b/sci-libs/exodusii/exodusii-6.09.ebuild
19 index 9d519ee88de..cfa73bffcec 100644
20 --- a/sci-libs/exodusii/exodusii-6.09.ebuild
21 +++ b/sci-libs/exodusii/exodusii-6.09.ebuild
22 @@ -1,22 +1,24 @@
23 # Copyright 1999-2021 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 -EAPI=6
27 +EAPI=7
28
29 +CMAKE_MAKEFILE_GENERATOR="emake"
30 FORTRAN_NEEDED="test"
31 -inherit cmake-utils fortran-2
32 -
33 MY_PN="${PN%ii}"
34 MY_P="${MY_PN}-${PV}"
35 +inherit cmake fortran-2
36
37 DESCRIPTION="Model developed to store and retrieve transient data for finite element analyses"
38 HOMEPAGE="https://github.com/certik/exodus"
39 SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${MY_P}.tar.gz"
40 +S="${WORKDIR}"/${MY_P}/${MY_PN}
41
42 LICENSE="BSD"
43 SLOT="0"
44 KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
45 IUSE="static-libs test"
46 +
47 RESTRICT="!test? ( test )"
48
49 RDEPEND="sci-libs/netcdf[hdf5]"
50 @@ -24,12 +26,10 @@ DEPEND="${RDEPEND}
51 test? ( app-shells/tcsh )
52 "
53
54 -S="${WORKDIR}"/${MY_P}/${MY_PN}
55 -
56 PATCHES=( "${FILESDIR}"/${P}-multilib.patch )
57
58 src_prepare() {
59 - cmake-utils_src_prepare
60 + cmake_src_prepare
61
62 if ! use test; then
63 sed -e 's:Fortran::g' -i CMakeLists.txt || die
64 @@ -46,7 +46,7 @@ src_configure() {
65 -DBUILD_TESTING=$(usex test)
66 )
67 export NETCDF_DIR="${EPREFIX}/usr/"
68 - cmake-utils_src_configure
69 + cmake_src_configure
70 }
71
72 src_test() {