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/
Date: Fri, 26 Feb 2021 21:19:42
Message-Id: 1614374365.39ece2fce2b047089e1db2383542266f8d707528.asturm@gentoo
1 commit: 39ece2fce2b047089e1db2383542266f8d707528
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 26 15:51:05 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 26 21:19:25 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39ece2fc
7
8 sci-libs/nemesis: 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/nemesis/nemesis-6.09.ebuild | 22 ++++++++++------------
16 1 file changed, 10 insertions(+), 12 deletions(-)
17
18 diff --git a/sci-libs/nemesis/nemesis-6.09.ebuild b/sci-libs/nemesis/nemesis-6.09.ebuild
19 index 3e18bd12f61..b975520655c 100644
20 --- a/sci-libs/nemesis/nemesis-6.09.ebuild
21 +++ b/sci-libs/nemesis/nemesis-6.09.ebuild
22 @@ -1,16 +1,15 @@
23 -# Copyright 1999-2018 Gentoo Authors
24 +# Copyright 1999-2021 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 -EAPI=6
28 +EAPI=7
29
30 -inherit cmake-utils
31 -
32 -MY_PN="exodus"
33 -MY_P="${MY_PN}-${PV}"
34 +MY_P="exodus-${PV}"
35 +inherit cmake
36
37 DESCRIPTION="Enhancement to the EXODUSII finite element database model"
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}/${PN}
41
42 LICENSE="BSD"
43 SLOT="0"
44 @@ -19,16 +18,15 @@ IUSE="static-libs"
45
46 DEPEND="
47 sci-libs/exodusii
48 - sci-libs/netcdf"
49 + sci-libs/netcdf
50 +"
51 RDEPEND="${DEPEND}"
52
53 -S="${WORKDIR}"/${MY_P}/${PN}
54 -
55 PATCHES=( "${FILESDIR}"/${P}-multilib.patch )
56
57 src_prepare() {
58 - find ../exodus -delete || die
59 - cmake-utils_src_prepare
60 + rm -r ../exodus || die
61 + cmake_src_prepare
62 }
63
64 src_configure() {
65 @@ -37,7 +35,7 @@ src_configure() {
66 )
67 export NETCDF_DIR="${EPREFIX}/usr/"
68 export EXODUS_DIR="${EPREFIX}/usr/"
69 - cmake-utils_src_configure
70 + cmake_src_configure
71 }
72
73 src_test() {