gentoo new year resync : 01.01.2021

2 files changed, 35 insertions, 18 deletions

diff --git a/sci-libs/cgnslib/Manifest b/sci-libs/cgnslib/Manifest
index f40a3a8e33d4..03cd56cf491a 100644
--- a/sci-libs/cgnslib/Manifest
+++ b/sci-libs/cgnslib/Manifest
@@ -1,5 +1,5 @@
 DIST cgnslib-3.3.0.tar.gz 3314889 BLAKE2B 3b8af11e04c211ca60f512c7995e9b23e0dd79180f3443f238562216073740de6b845c5bb78d6fb017bbf41e5249c1f58c27130047fd50afb4b20bbc778a046b SHA512 eb5c79d3830f8ee1fa30a67fbf32133c13a276c4b18a553826e4670bd4aa7262d7751bccb74c5e208cd47703f9076bde2e2e0db70408c88fde3ac11b638e6ff3
 DIST cgnslib-3.4.0.tar.gz 3393312 BLAKE2B 279d4502ff70701df6a266495ccc7750e9c51ac14bd3d5072ae8e1448b4f1e4afaefaaf254cf0afe1cc984e4d9fc7d5c161f7696f62726aaf567990ded3c9056 SHA512 e26cfb0d9f3061242d327a6c18fe40ed51bf63b61ae0d6b5cce7e6b4aa623b00e1c3fd9fe240d993323c6f4eec043fde5296a82b1f9108027f945300eec541ec
 EBUILD cgnslib-3.3.0.ebuild 2000 BLAKE2B 46ef19a44d29f372e00dea7eefd869e6eb7a19368b9660fe98f905954478b1b2b64235bbc0b385cf8a4b2a98f3f6460d8eb090ea9824fcbe0dd469a210a92223 SHA512 b0267e8f0f1e69cd6008a650c9c9baccb7efbc360d6a81c5a8fb29c5d06b829c834066d335c05e4162d486c34a02ec0dd25059991653182779097d8f368c22f9
-EBUILD cgnslib-3.4.0.ebuild 1943 BLAKE2B 37b583d0eab7c94aacb3cc9b4aa435c7ce21954a98a66f157881e71ea7a063cbad4b32a244b12be831a641e68042f86dbfc88a617714ba113e63d4f3ae94bbe8 SHA512 3eb50cc045678bd10c93fe269b8b046d1a924e954e39f16cf2f0011ba2c8297cb187d368b69784a8b60a765edf79352817abef2c50e4ab56febb9bbe92437895
+EBUILD cgnslib-3.4.0.ebuild 2084 BLAKE2B 51a8a6dd325255f70d60ce55ddc4870f6bee34cc30f7c98672626288be4ac17ae2a274ff31f80ec4262b6dd92cc4ac0513d26863177432674c7edf66a43771c8 SHA512 21b14ae07d64569ae4db22afb03b0623948beb190a99486e00a6565c10ca2adc77345acc75dfb2cde5c1adf9be27f21e34a117bbcfd4741f43ae5cfb59c0fa6f
 MISC metadata.xml 1126 BLAKE2B 9ee9f1c8457293509d5b8cb4c0b64b4f1dcc7b4858d0f7ba99e79388118be318b8567719ca7deffa8b161e5d0acbba125c63b07baf61864e77f0ae6502f74a34 SHA512 969a67120b9dd3878f479e9ae2e2274c31c477660f1ffec8f67bd033ccd5d35588bd454b8e82efcede970c1393336c3c36f66aedba07b4d8c1b93c053a78efad
diff --git a/sci-libs/cgnslib/cgnslib-3.4.0.ebuild b/sci-libs/cgnslib/cgnslib-3.4.0.ebuild
index e5889cb043ad..6eac6426bb89 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-2019 Gentoo Authors
+# 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/"
@@ -16,7 +19,15 @@ LICENSE="ZLIB"
 SLOT="0/3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples fortran hdf5 legacy mpi static-libs szip test tools"
-RESTRICT="!test? ( test )"
+RESTRICT="
+	fortran? ( test )
+	!test? ( test )
+"
+
+REQUIRED_USE="
+	mpi? ( hdf5 )
+	szip? ( hdf5 )
+"
 
 RDEPEND="hdf5? ( sci-libs/hdf5:=[mpi=,szip=] )
 	tools? (
@@ -37,41 +48,47 @@ pkg_setup() {
 src_prepare() {
 	# gentoo libdir
 	sed -e 's|/lib|/'$(get_libdir)'|' \
-            -e '/DESTINATION/s|lib|'$(get_libdir)'|g' \
-            -i src/CMakeLists.txt || die
+		-e '/DESTINATION/s|lib|'$(get_libdir)'|g' \
+		-i src/CMakeLists.txt || die
 	# 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() {
 	local mycmakeargs=(
 		-DCGNS_BUILD_SHARED=ON
-		-DCGNS_USED_SHARED=ON
+		-DCGNS_USE_SHARED=ON
 		-DCGNS_BUILD_CGNSTOOLS="$(usex tools)"
 		-DCGNS_ENABLE_FORTRAN="$(usex fortran)"
 		-DCGNS_ENABLE_HDF5="$(usex hdf5)"
 		-DCGNS_ENABLE_LEGACY="$(usex legacy)"
 		-DCGNS_ENABLE_TESTS="$(usex test)"
-		-DHDF5_NEED_MPI="$(usex mpi)"
-		-DHDF5_NEED_SZIP="$(usex szip)"
-		-DHDF5_NEED_ZLIB="$(usex szip)"
 	)
-	cmake-utils_src_configure
+
+	if use hdf5; then
+		mycmakeargs+=(
+			-DHDF5_NEED_MPI="$(usex mpi)"
+			-DHDF5_NEED_SZIP="$(usex szip)"
+			-DHDF5_NEED_ZLIB="$(usex szip)"
+		)
+	fi
+
+	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 *pdf release_docs/*.pdf
-	insinto /usr/share/doc/${PF}
-	use examples && doins -r src/examples
+	use doc && dodoc release_docs/*.pdf
+	docompress -x /usr/share/doc/${PF}/examples
+	use examples && dodoc -r src/examples
 }