[gentoo-commits] repo/gentoo:master commit in: sci-libs/cgnslib/

[Sam James]

commit:     1debce5a43abf2d63a60f23e4b2b18d2ade4c35d
Author:     Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Mon Dec 21 17:22:44 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 03:35:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1debce5a

sci-libs/cgnslib: bump to EAPI 7

Switch to cmake.eclass

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18749
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/cgnslib/cgnslib-3.4.0.ebuild | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/sci-libs/cgnslib/cgnslib-3.4.0.ebuild 
b/sci-libs/cgnslib/cgnslib-3.4.0.ebuild
index 880fa6bd580..d7da6448621 100644
--- a/sci-libs/cgnslib/cgnslib-3.4.0.ebuild
+++ b/sci-libs/cgnslib/cgnslib-3.4.0.ebuild
@@ -1,12 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED="fortran"
 FORTRAN_STANDARD="90 2003"
 
-inherit cmake-utils fortran-2
+# fails to build with ninja
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake fortran-2
 
 DESCRIPTION="CFD General Notation System standard library"
 HOMEPAGE="http://www.cgns.org/";
@@ -42,7 +45,7 @@ src_prepare() {
        # dont hard code link
        sed -e '/link_directories/d' \
                -i src/tools/CMakeLists.txt src/cgnstools/*/CMakeLists.txt || 
die
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -58,20 +61,20 @@ src_configure() {
                -DHDF5_NEED_SZIP="$(usex szip)"
                -DHDF5_NEED_ZLIB="$(usex szip)"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_compile() {
        # hack to allow parallel building by first producing fortran module
        use fortran && cd "${BUILD_DIR}"/src && emake cgns_f.o
-       cmake-utils_src_compile
+       cmake_src_compile
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        dodoc README.md release_docs/Release.txt
        use static-libs || rm "${ED}"/usr/$(get_libdir)/libcgns.a
        use doc && dodoc release_docs/*.pdf
-       insinto /usr/share/doc/${PF}
-       use examples && doins -r src/examples
+       docompress -x /usr/share/doc/${PF}/examples
+       use examples && dodoc -r src/examples
 }