gentoo auto-resync : 15:03:2023 - 12:21:13

3 files changed, 22 insertions, 96 deletions

diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index bd63a49fb848..8d252ba417ab 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -2,10 +2,8 @@ AUX netcdf-4.7.4-big-endian-test.patch 689 BLAKE2B ab28269ee5922816e7ef7834dddec
 AUX netcdf-4.8.1-big-endian-build.patch 690 BLAKE2B ee79d940d47b69c7628d325b8a4b002942d7198d0a98b7d64a843056f2b0ac8888c9bd6cf37f74f5788a1b075a309c60a9e80a1e072dd1ff45cf3213ad7ffe4d SHA512 e2dcf92063806e56ec02df8a3b2dea97b67ee58768703db2672188d9837188f7bab68a04da2df78b6130c6d87137f8b9974b91d09eab8cd90dba77aadac6ea5e
 AUX netcdf-4.9.0-fix-musl-execinfo_h.patch 1098 BLAKE2B 3c063fbf452e045b96b411ce1810ea0d535a66f90d421412c9994313303d31b3d4be3377727a0182bac27eb5cb6e675bd3007090d2a94b13dc23a1a1bc252a12 SHA512 aae74f9bef1ec09ac3a488a1305a812b18aeaec6028d57e45f667727f36421676dc20d6f9589284c7b5dbb0957c23ac426ac3ca2f05a10e1b4d6de26851405e4
 DIST netcdf-4.8.1.tar.gz 18957280 BLAKE2B 05fc6cd10cb5cbb11dc077b9a884fbc63c4cb840b241e782702da58ad9831fba065a6f1e97c2be092437735d39658482285850a00618d0582d6e4728d64c4402 SHA512 c97207867abf10d414abf34624268710f5b812c26c38f97e73afe00558b3f07917331fbc7fdb9e70b09813acf15a9a09bae2c432a3266ce10a791b9472f87a42
-DIST netcdf-4.9.0.tar.gz 19491744 BLAKE2B b669f7ccb2f7a8def9d5b944a97d101ea7b7307d6e1495a97c0966b4ac9722b404d6039dee192da759d14d52259be2ff4f49be3bfb6cbbfac48732684cbff9c3 SHA512 62cb593b99a6e9c56426175d141907572d3974de8dc39549c85337acf410539f9b7dcd9a375808e271da1d0dc93fce7586b955eddd2bb45901d9cc48a72db705
-DIST netcdf-4.9.1.tar.gz 19525310 BLAKE2B 711083c0e001ec12ec11ecc1d27b373a6e0bc4fd62a3cfe3768f607abcbd465b8485ab0b70f339964694f87f58923a34f66000043b330a6ae03504d176587ae6 SHA512 5ac41c1ce72c730db7864891aca04d9b5f3e3e5bb265801b5972ae21f0039df6b24a96c9999d35b892fb6a7347b9a313ce4fba6c05391483d642abb23a5598e0
+DIST netcdf-c-4.9.2.tar.gz 7142536 BLAKE2B b24135070d2f1f0b53fe738f8839039547eceba16d36905bb8cd7be983ce0c1127b7b01ae37dbde50087aa82fd56f00fab9bfa75c7d94fd4478031bb8a6da247 SHA512 7a96bcf673d5a9e1537d660aaf085a1dfaefc7dfb0fc96358462d92e7bbfe541184583681797e6a54d11b8588504b7d8a9b0b9bd850eecd02ed73aa2eb5ffa0d
 EBUILD netcdf-4.8.1-r1.ebuild 1810 BLAKE2B e73bab3d4748a0e509f5f6bfeae90ac10250744e3cff0bd588b9337a340c177c97cbb424f7880a5285026b997ec378631933979cfe9b4694d41e4244aabf9bb4 SHA512 aae2f847567d803b175ce97a529763f4e1c74e7a5b65fd85ec235b2451ce02c7afabaac2a90bb4904f8068f822ffac5329fefd5108d396788d36bda6968380c3
 EBUILD netcdf-4.8.1-r2.ebuild 2005 BLAKE2B 27ddd0dfc01e7ba32d889efb9085c9b16f4cdd076e860c2734ad78397d562c3eb2e1a231449983b5817968efe211ced789f0624d621d257c565ca362a02b1a3d SHA512 3672c96fca8d1d60f1757192d4d39cb0d0a5f57fe8e102de1a4bfc16449c478ae9c7fb2aeb42b669241c269d9dbd1cdba6712cfbcd52d595cc7bbdf733b0eedd
-EBUILD netcdf-4.9.0.ebuild 1851 BLAKE2B d6378eebacee1769d6f99b9702ed9a18b1295fc99554b66d3d61e8b40e1d4a1dd973efea929491f69be3fe4b5cf897220541df78f2c81dd87c5415beb3ce9590 SHA512 c3edd8b82bb64e85c6b649b80c4a0ae7621e9ad05063dbfb5a79cf4c93f4c954b54464840c32a296126857cae521c65d805aa7b65423acefd6b762253c32a75a
-EBUILD netcdf-4.9.1.ebuild 1725 BLAKE2B a33540ff9542919a2e089ed9b141c596d2cf72c2b6ad8ccebe94bd4076e5755b97a70f510e1610d84de3cf96fcb72abea21bef903524f59d965e967bfa6597b6 SHA512 068b82410fd873e543e44bb38db43952737e50a2f2da77355d9fa92f31fe33f5f05d430c5a52aff0270a314fae831e8ecbe424cb3b7388955abfb849b0afe49b
+EBUILD netcdf-4.9.2.ebuild 1654 BLAKE2B 7980440850a11d845ded55dfb7ea5b6c734ff3ee6614975e6547b8aacf5eccea6b18aeb721aa3de1d41a4a984d1c3593ec97d8bed1590176de3e3f20d84db353 SHA512 7ab15e7ce560a40d5a86f26e6e23d14c81a58d658ad7af8ac50ebbb9f35db8ee7030654317c9d1bc99f0ce30651a69e6d1aeacfa52854f1c43fb5c7078bc4c0d
 MISC metadata.xml 1065 BLAKE2B 7e661019c6f97a0720a45cc93a59079834135a1994ab9abd90b769dec892c4b0ad60f09b87b6e15ceda6ee99f289a992ca8315a1d168a3eec6d50d09b6de1273 SHA512 fe82704383f8021a861936927fc9a1450257433d6589f1b4bfef3fd0527b912543813ff8d66c6fe33d98cb7a16bcbcb26149df8d809f92fa2e48c6fb83c8455b
diff --git a/sci-libs/netcdf/netcdf-4.9.0.ebuild b/sci-libs/netcdf/netcdf-4.9.0.ebuild
deleted file mode 100644
index 651ca0381223..000000000000
--- a/sci-libs/netcdf/netcdf-4.9.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Scientific library and interface for array oriented data access"
-HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
-SRC_URI="https://github.com/Unidata/netcdf-c/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-c-${PV}
-
-LICENSE="UCAR-Unidata"
-# SONAME of libnetcdf.so
-SLOT="0/19"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 -riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="+dap doc examples hdf +hdf5 mpi szip test tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/libxml2
-	dap? ( net-misc/curl:= )
-	hdf? (
-		media-libs/libjpeg-turbo:=
-		sci-libs/hdf:=
-		sci-libs/hdf5:=
-	)
-	hdf5? ( sci-libs/hdf5:=[hl(+),mpi=,szip=,zlib] )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
-
-REQUIRED_USE="
-	test? ( tools )
-	szip? ( hdf5 )
-	mpi? ( hdf5 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.7.4-big-endian-test.patch
-	"${FILESDIR}"/${PN}-4.9.0-fix-musl-execinfo_h.patch
-)
-
-src_configure() {
-	use mpi && export CC=mpicc
-
-	# Temporary workaround for test breakage
-	# https://github.com/Unidata/netcdf-c/issues/1983
-	# bug #827042
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		-DENABLE_DAP_REMOTE_TESTS=OFF
-		#-DENABLE_HDF4_FILE_TESTS=OFF
-		-DENABLE_LIBXML2=ON
-		-DBUILD_UTILITIES=$(usex tools)
-		-DENABLE_DAP=$(usex dap)
-		-DENABLE_DOXYGEN=$(usex doc)
-		-DENABLE_EXAMPLES=$(usex examples)
-		-DENABLE_HDF4=$(usex hdf)
-		-DENABLE_NETCDF_4=$(usex hdf5)
-		-DENABLE_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	# Fails parallel tests: bug #621486
-	cmake_src_test -j1
-}
-
-src_install() {
-	cmake_src_install
-
-	# bug #827188
-	sed -i -e "s:${EPREFIX}/usr/$(get_libdir)/libdl.so;:dl;:" "${ED}/usr/$(get_libdir)/cmake/netCDF/netCDFTargets.cmake" || die
-}
diff --git a/sci-libs/netcdf/netcdf-4.9.1.ebuild b/sci-libs/netcdf/netcdf-4.9.2.ebuild
index 675b1dc809fc..e6baac873848 100644
--- a/sci-libs/netcdf/netcdf-4.9.1.ebuild
+++ b/sci-libs/netcdf/netcdf-4.9.2.ebuild
@@ -3,36 +3,40 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic
+inherit cmake
 
 DESCRIPTION="Scientific library and interface for array oriented data access"
 HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
-SRC_URI="https://github.com/Unidata/netcdf-c/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://downloads.unidata.ucar.edu/netcdf-c/${PV}/${PN}-c-${PV}.tar.gz"
 S="${WORKDIR}"/${PN}-c-${PV}
 
 LICENSE="UCAR-Unidata"
 # SONAME of libnetcdf.so
 SLOT="0/19"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 -riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="+dap doc examples hdf +hdf5 mpi szip test tools"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 -riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="+dap doc examples hdf +hdf5 mpi szip test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-libs/libxml2
+RDEPEND="
+	dev-libs/libxml2
 	dap? ( net-misc/curl:= )
 	hdf? (
 		media-libs/libjpeg-turbo:=
 		sci-libs/hdf:=
 		sci-libs/hdf5:=
 	)
-	hdf5? ( sci-libs/hdf5:=[hl(+),mpi=,szip=,zlib] )"
+	hdf5? ( sci-libs/hdf5:=[hl(+),mpi=,szip=,zlib] )
+"
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+"
 
 REQUIRED_USE="
-	test? ( tools )
 	szip? ( hdf5 )
-	mpi? ( hdf5 )"
+	mpi? ( hdf5 )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.7.4-big-endian-test.patch
@@ -41,16 +45,11 @@ PATCHES=(
 src_configure() {
 	use mpi && export CC=mpicc
 
-	# Temporary workaround for test breakage
-	# https://github.com/Unidata/netcdf-c/issues/1983
-	# bug #827042
-	append-flags -fno-strict-aliasing
-
 	local mycmakeargs=(
 		-DENABLE_DAP_REMOTE_TESTS=OFF
 		#-DENABLE_HDF4_FILE_TESTS=OFF
 		-DENABLE_LIBXML2=ON
-		-DBUILD_UTILITIES=$(usex tools)
+		-DBUILD_UTILITIES=ON
 		-DENABLE_DAP=$(usex dap)
 		-DENABLE_DOXYGEN=$(usex doc)
 		-DENABLE_EXAMPLES=$(usex examples)
@@ -62,6 +61,11 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_test() {
+	# Still needs -j1 as of 4.9.2, see bug #621486 (fixes in 4.9.1 weren't enough)
+	cmake_src_test -j1
+}
+
 src_install() {
 	cmake_src_install