1 |
commit: 1debce5a43abf2d63a60f23e4b2b18d2ade4c35d |
2 |
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Dec 21 17:22:44 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 27 03:35:37 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1debce5a |
7 |
|
8 |
sci-libs/cgnslib: bump to EAPI 7 |
9 |
|
10 |
Switch to cmake.eclass |
11 |
|
12 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
13 |
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com> |
14 |
Closes: https://github.com/gentoo/gentoo/pull/18749 |
15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
16 |
|
17 |
sci-libs/cgnslib/cgnslib-3.4.0.ebuild | 19 +++++++++++-------- |
18 |
1 file changed, 11 insertions(+), 8 deletions(-) |
19 |
|
20 |
diff --git a/sci-libs/cgnslib/cgnslib-3.4.0.ebuild b/sci-libs/cgnslib/cgnslib-3.4.0.ebuild |
21 |
index 880fa6bd580..d7da6448621 100644 |
22 |
--- a/sci-libs/cgnslib/cgnslib-3.4.0.ebuild |
23 |
+++ b/sci-libs/cgnslib/cgnslib-3.4.0.ebuild |
24 |
@@ -1,12 +1,15 @@ |
25 |
# Copyright 1999-2020 Gentoo Authors |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
-EAPI=6 |
29 |
+EAPI=7 |
30 |
|
31 |
FORTRAN_NEEDED="fortran" |
32 |
FORTRAN_STANDARD="90 2003" |
33 |
|
34 |
-inherit cmake-utils fortran-2 |
35 |
+# fails to build with ninja |
36 |
+CMAKE_MAKEFILE_GENERATOR="emake" |
37 |
+ |
38 |
+inherit cmake fortran-2 |
39 |
|
40 |
DESCRIPTION="CFD General Notation System standard library" |
41 |
HOMEPAGE="http://www.cgns.org/" |
42 |
@@ -42,7 +45,7 @@ src_prepare() { |
43 |
# dont hard code link |
44 |
sed -e '/link_directories/d' \ |
45 |
-i src/tools/CMakeLists.txt src/cgnstools/*/CMakeLists.txt || die |
46 |
- cmake-utils_src_prepare |
47 |
+ cmake_src_prepare |
48 |
} |
49 |
|
50 |
src_configure() { |
51 |
@@ -58,20 +61,20 @@ src_configure() { |
52 |
-DHDF5_NEED_SZIP="$(usex szip)" |
53 |
-DHDF5_NEED_ZLIB="$(usex szip)" |
54 |
) |
55 |
- cmake-utils_src_configure |
56 |
+ cmake_src_configure |
57 |
} |
58 |
|
59 |
src_compile() { |
60 |
# hack to allow parallel building by first producing fortran module |
61 |
use fortran && cd "${BUILD_DIR}"/src && emake cgns_f.o |
62 |
- cmake-utils_src_compile |
63 |
+ cmake_src_compile |
64 |
} |
65 |
|
66 |
src_install() { |
67 |
- cmake-utils_src_install |
68 |
+ cmake_src_install |
69 |
dodoc README.md release_docs/Release.txt |
70 |
use static-libs || rm "${ED}"/usr/$(get_libdir)/libcgns.a |
71 |
use doc && dodoc release_docs/*.pdf |
72 |
- insinto /usr/share/doc/${PF} |
73 |
- use examples && doins -r src/examples |
74 |
+ docompress -x /usr/share/doc/${PF}/examples |
75 |
+ use examples && dodoc -r src/examples |
76 |
} |