gentoo resync : 22.01.2021

2 files changed, 34 insertions, 15 deletions

diff --git a/sci-libs/eccodes/Manifest b/sci-libs/eccodes/Manifest
index 2ab0e802ba73..25973b9bdcba 100644
--- a/sci-libs/eccodes/Manifest
+++ b/sci-libs/eccodes/Manifest
@@ -1,4 +1,5 @@
-DIST eccodes-2.16.0-Source.tar.gz 11258869 BLAKE2B 4a1b3e953fc041beed47046c6ea4f74bb18230019b71c884f1dc5a102a7bae2b9083f51b74fc4078c493d188433f08db833a571e7deadd93b6c137f975f03006 SHA512 6e8768824152d8782c1457cfe79daed32114d1b4694d2843bd02a8aa63c42ccc435b53f7db6942239b3e56999fbaaba4ecef345d39fc5c5f7a5d20ceecf4422a
+DIST eccodes-2.18.0-Source.tar.gz 11525701 BLAKE2B 9dc2861472309c0483e4e7eb7b79c2eb2eb72b1e99f8656bb0355630e8012468d9d6513fb3bab7b3fbc7b2c02c3c74d291a6a8862aa8434cdcce82868f359961 SHA512 8daf7f2e1aed055ca6402881f5473e4ae90ba24cc779005f57f99adc7468da459c7539e64f455e2122dd83df29992fd7a6dad2700c8331c4083226e091fbb629
 DIST eccodes_test_data.tar.gz 139711871 BLAKE2B f2e89207835c78fa198f0a2fba8ac2cd4ab263c9160e02005a3ca851bc71586010e7f4742cbb9240463abb9421db83b7dadc83fe798f37321a553ca9856f68d7 SHA512 24c24ec9e01d230cf542abe5c131f05b8e627dd9d170c666628bb5fd8f7b1a6aa11a35456b8d742c59f54c6aabac78658efd68b0c50779d466aba3d35b4a0231
-EBUILD eccodes-2.16.0.ebuild 2137 BLAKE2B ad6ad425ae29c385577828a3819865a8b1aa276273a061a05692cdbbb0b63c646084d1fd67522c8871cd6bd50189742b0fd6e8c2fa9682ffec3d6efd697a4c1f SHA512 214551e5bdd1159a9d0beb95a77913e5c1e6bd65cb75253fba618e4dbb4b3592368f080c61bd67547b484c5e47e4c0b3e0da2f46efc593ed2b0b85f9df3e65ae
+DIST mercator.grib2 6339 BLAKE2B b63a72c711c28fa81568d123758f61804d73886c1f8dc27ab444daf3d1a0d104ef40b1469e9940413b5311c1cdcfa5de76a9d46ea0c57d08ccfd44ab41b8d4fb SHA512 e3d4e93833345675558b58c2e6f2b5a583c52083718da05cae72dd015d2e7699ee83c2dcce695143ee5e4423c890ef80f2448146d93e87fbfff8845f6efa8178
+EBUILD eccodes-2.18.0.ebuild 2625 BLAKE2B 74828ae62c59b5cfefb1f4a1514f2b99e9ae3b58e2371d83e8e53e28361db830dc9fd2d36baab37c7dc63a82c10d49d5a8821f118d3508fa7cfe1a074eb67fd1 SHA512 505f0ca3f65a3c2c42e5cbf7d04dc72e72e6af7637699ee8149c75f1f6f603ad4c50e95a44999ac18db24fcdceb870edce93a30eccf7585c4d32e605f4e3680b
 MISC metadata.xml 662 BLAKE2B bc436a549b8fdcc428e9a77978b4acd557739e065768aecb084c9ac12aa5ac7d181d0a2b2268e9056beee4ceed358145b8d43f62cede5c994b9a17f8151c8ee2 SHA512 50900717dac24e76414607b55f7965fd9944668bfcb33035f66a68a3802c894b0783befff2008858e006138f1eabca1ee8e6d71691f5e202856e494afb77080c
diff --git a/sci-libs/eccodes/eccodes-2.16.0.ebuild b/sci-libs/eccodes/eccodes-2.18.0.ebuild
index e7b28f72d27a..62965ad9e82e 100644
--- a/sci-libs/eccodes/eccodes-2.16.0.ebuild
+++ b/sci-libs/eccodes/eccodes-2.18.0.ebuild
@@ -1,26 +1,33 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
-inherit cmake-utils fortran-2 python-any-r1
+inherit cmake fortran-2 python-any-r1
 
 MY_P="${P}-Source"
 
 DESCRIPTION="A set of encoding/decoding APIs and tools for WMO GRIB, BUFR, and GTS messages"
 HOMEPAGE="https://confluence.ecmwf.int/display/ECC"
 SRC_URI="https://confluence.ecmwf.int/download/attachments/45757960/${MY_P}.tar.gz
-	extra-test? ( http://download.ecmwf.org/test-data/eccodes/${PN}_test_data.tar.gz )"
+	extra-test? ( http://download.ecmwf.org/test-data/eccodes/${PN}_test_data.tar.gz
+	http://download.ecmwf.org/test-data/eccodes/data/mercator.grib2 )"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
-IUSE="defs examples extra-test -fortran memfs netcdf jpeg2k png python szip test threads"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="threads? ( !fortran ) test? ( defs !memfs ) extra-test? ( test ) !test? ( memfs? ( python ) )"
+IUSE="+defs examples extra-test fortran memfs netcdf jpeg2k openmp png python szip test threads"
+
+REQUIRED_USE="
+	fortran? ( !threads ( openmp ) )
+	openmp? ( !threads ( fortran ) )
+	threads? ( !fortran !openmp )
+	test? ( defs !memfs )
+	extra-test? ( test )
+	!test? ( memfs? ( python ) )"
 
 RDEPEND="
 	sys-libs/zlib
@@ -34,6 +41,8 @@ DEPEND="${RDEPEND}
 
 BDEPEND="virtual/pkgconfig"
 
+RESTRICT="!test? ( test )"
+
 S="${WORKDIR}/${MY_P}"
 
 CMAKE_BUILD_TYPE=RelWithDebInfo
@@ -45,24 +54,29 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DINSTALL_LIB_DIR="$(get_libdir)"
+		-DCMAKE_SKIP_INSTALL_RPATH=TRUE
 		-DENABLE_ECCODES_THREADS=$(usex threads TRUE FALSE)
+		-DENABLE_ECCODES_OMP_THREADS=$(usex openmp TRUE FALSE)
 		-DENABLE_EXAMPLES=OFF  # no need to build examples
 		-DENABLE_INSTALL_ECCODES_DEFINITIONS=$(usex defs TRUE FALSE)
 		-DENABLE_FORTRAN=$(usex fortran TRUE FALSE)
 		-DENABLE_PYTHON=OFF  # py2 support is deprecated
 		-DENABLE_NETCDF=$(usex netcdf TRUE FALSE)
 		-DENABLE_JPG=$(usex jpeg2k TRUE FALSE)
+		-DENABLE_JPG_LIBOPENJPEG=$(usex jpeg2k TRUE FALSE)
 		-DENABLE_PNG=$(usex png TRUE FALSE)
 		-DENABLE_MEMFS=$(usex memfs TRUE FALSE)
 		-DENABLE_EXTRA_TESTS=$(usex extra-test TRUE FALSE)
 		-DBUILD_SHARED_LIBS=ON
-		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
 	)
-	cmake-utils_src_configure
+	use fortran && mycmakeargs+=( -DCMAKE_Fortran_FLAGS="-fallow-argument-mismatch" )
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use examples; then
 		insinto "/usr/share/${PN}/examples"
@@ -73,7 +87,11 @@ src_install() {
 }
 
 src_test() {
-	use extra-test && cp -r "${WORKDIR}"/data/* "${BUILD_DIR}"/data/
+	if use extra-test; then
+		touch "${WORKDIR}"/data/.downloaded
+		cp -r "${WORKDIR}"/data/* "${BUILD_DIR}"/data/
+		cp "${DISTDIR}"/mercator.grib2 "${BUILD_DIR}"/data/
+	fi
 
-	cmake-utils_src_test
+	cmake_src_test
 }