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

8 files changed, 46 insertions, 126 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 0d898bbcc8e7..c890b301e1a2 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/netcdf-cxx/Manifest b/sci-libs/netcdf-cxx/Manifest
index bb7a74203b18..7c4955ed7d3a 100644
--- a/sci-libs/netcdf-cxx/Manifest
+++ b/sci-libs/netcdf-cxx/Manifest
@@ -1,8 +1,8 @@
 AUX netcdf-cxx-4.3.1-slibtool.patch 1500 BLAKE2B 6cd24e0a48c27c4c5a474acb671f98c0e4357f7dc548b03939aec95fa1cfba997b3a933524ec75939c965bc62649f10866ac100993f86f39158a4868632135a8 SHA512 c26b4dd6bb7f4d8365fbe3f1bd0940443e2b10b13c64e70cb3960e092527662c8288f4122e268b26aee36169e8e53095b7b0bd89bf21e882006db545df13dd93
 DIST netcdf-cxx-4.2.tar.gz 703482 BLAKE2B a6727b7305204d2b53e6ee951c8165b03cd07f14e5d59a306445481272d0e10eb077e4bc62a2586c57652cb8273b9098ed77836f9023817d8a9e6ef51ac2cfe8 SHA512 347ddbc518ac2186868d69417342e5146e285fc3a88f7c55edc33063f5c9a6647af7e512a03b9b6a8f67a448b85a1edcdde5df707b893f6a1527821cfd78e643
-DIST netcdf-cxx-4.3.0.tar.gz 985897 BLAKE2B 89cfd85764ff8fc730c7cb4187df21a4245cd932bcf86df4edf36eb7ae636906eaafc25cfcbb3dd58bc1d346edacd7f80daa3be9a544d5d777d32ad115cfd00f SHA512 8e77333c979513721209e6b3fde31c298e18a45d7ea08123056e8120469eb8c4024d71289fab2b9182ee19ee7b6ad22bd133525bef048a497ede4aa2e9017465
 DIST netcdf-cxx-4.3.1.tar.gz 607679 BLAKE2B 68677ba72e66d351bf6d33a2584a3a1edd9da98b41ed66e3f51f8d3d358bfd84bad3e2e06403edf76d26b2c76807ae40859995d8817725e531a27680d04f2501 SHA512 404711eb80d5e78968c0f6cbdcb08855a2778d7fd94e7ee94bdc9d1cd72848ac3327613c6437a7634349f26bc463b950092a2999abb34ddab0a47ad185547d22
+DIST netcdf-cxx4-4.3.1.tar.gz 598335 BLAKE2B e8272d9bd74cf9b814303a5b208be20228149533a9cc78cc1ef460f2cfb0086c7187afba325ab9a7b3d071e0fb9160d3b057e3bee68b679d9f504ccfecb016d8 SHA512 f5d9d26fb9f57430d0d681a9c7396bb0f03ed6446ac6fed51058dcc43690c02565da3f729f98b268b0bd923ca8b5b3cfa8340aca6a4f18f512c0c320ea20703f
 EBUILD netcdf-cxx-4.2-r301.ebuild 582 BLAKE2B 8fb2ea518e66a6d8f5fa3e9d5c7a08fc53a3f7f6a8e6674fd5c1313000329bec5ab8f35a943754c82535f1f85e407e1d734da10568e97807cb4bfd4ba729a128 SHA512 d4e87659df4e06846f20a86d7df6d24f54f6c923f966b9ca188daa7907bf96f504423d97c88a3f185b747ff112c521bf972b6374acd6614407aff7607c0d2e28
-EBUILD netcdf-cxx-4.3.0.ebuild 645 BLAKE2B 92c277b2e7407e5a1bad17ee753899dadb922cea93e88a89c7938d8314c1434a267d2e2e032475260f508658462e0b9cf6233352d18e2ccb32ce6ea4b2220652 SHA512 ba13805248e038ee1932ca78c8abd99fcf3ccf6ce8cd8882fb1174f7edbb3a7286c45b3dbe396ee9971a61a39c80b9ecfa2297331a0833e71db7397bb5e0ed85
+EBUILD netcdf-cxx-4.3.1-r1.ebuild 707 BLAKE2B 7eb126a243a7e422dfcf898ae8a84cf3bb4564b1e9ac31de04c789def36f51742181cc85f34466ced76ae503852c5d59bec375ee2dd932dc40f09f1a74e35e8a SHA512 ef0384e16a50952cadbfc3ef581399767cd11019fb1950c4cbde4bdbbab3a9d0125a43b27044770de233a171b7ca8627c5aa730f9f448a015bbaf1f31c0fac52
 EBUILD netcdf-cxx-4.3.1.ebuild 753 BLAKE2B cc55b7c87f0f19a021fe90c3cbeeb8602d509691b3c2d7c1c88a525df215a4471ae8be26f4cf0c73f561f77fe77bedce118a47054caaae26c8bc5564bc6e408e SHA512 55020de4aacde4db532e654d875d1d29cb3e7d915819929b46f267ed9d289f6d86d111bcc5f8270fd5151b281ca71196ce704c0cf9d72332ce437c6429a082eb
 MISC metadata.xml 839 BLAKE2B 2cda1c652d7d7e83ebb67f70db48dc7b9a11908813739a646cb5798dd232f8eff5754c10adb0fbd206be6280fd599aacd6f63181b658623d55e17d6e73b0f4f0 SHA512 7e8f0b88ef5ad2cba94369ad26f2b27a648831b6433e05d127e4bc72ccfe6afc5eba7695f5c3cabc426a9913e599ce9b0455a087f9d606471cd351c8be5190d6
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.0.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1-r1.ebuild
index ba3408589ce6..a628593681d9 100644
--- a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.0.ebuild
+++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1-r1.ebuild
@@ -1,29 +1,31 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MYP=${PN}4-${PV}
 DESCRIPTION="C++ library for netCDF"
 HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
-SRC_URI="https://github.com/Unidata/netcdf-cxx4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MYP}"
+SRC_URI="https://downloads.unidata.ucar.edu/netcdf-cxx/${PV}/${PN}4-${PV}.tar.gz"
 
 LICENSE="UCAR-Unidata"
 SLOT="0/1"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
+# 6 out of 9 fail, reported upstream
+#RESTRICT="test"
 
 RDEPEND=">=sci-libs/netcdf-4.2:=[hdf5]"
 DEPEND="${RDEPEND}"
 
-src_configure() {
-	econf --disable-static
-}
+S="${WORKDIR}/${MYP}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-slibtool.patch
+)
 
 src_install() {
 	default
 	use examples && dodoc -r examples
-
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/netcdf-fortran/Manifest b/sci-libs/netcdf-fortran/Manifest
index 48d70f48d8a4..f5801e5cf7c5 100644
--- a/sci-libs/netcdf-fortran/Manifest
+++ b/sci-libs/netcdf-fortran/Manifest
@@ -1,5 +1,5 @@
-DIST netcdf-fortran-4.5.3.tar.gz 1805683 BLAKE2B f32a36a77872e039a0c03a1f1ccdbb00761309dc7d255a1203b0a1971464e75d87f56230f28a5d5928ca3e7e388f52c4622836c2cea3d35b286161b8044e375b SHA512 fe4b2f6f8c44bf4fdeebe3cbd57ee44ccee15a70075428bb68f0d33b70f9291b68b542965634a27fb4be5a59c756d672a3d264f2628391861edb98a244e072b4
 DIST netcdf-fortran-4.5.4.tar.gz 2011867 BLAKE2B bc98522be63c705193a22ce877c41abdc064a05afab2186891d8a0bbe9da8f0ba3f7eae6610e8b4e006b26ad8e3ea5fd8d57349054949a38f3a2fd9dfefb85c5 SHA512 a704f6483f2c8b8bf2353615a3e4b784294bd790588cfc13193c617e776e330edb17fa16da69e1a0b6c767308992321e01399ba2067c32f6ae6b3cb9ff72c3ee
-EBUILD netcdf-fortran-4.5.3.ebuild 1136 BLAKE2B 18dbe075b340157b64dae7600f8fe151d2cf370f59c8b129919952a6468e5e674086d7c0d80473699df301c53ede93081117a2485b35549bd0e22947af51c114 SHA512 a76df5cdddf2fc151052321141105656e0b532e4baf293906f9cab184917efe7419fc0e9fb01fb9bd26b42534c37856fc5487d281382c9a0674ab64626adcc0b
+DIST netcdf-fortran-4.5.4.upstream.tar.gz 1085665 BLAKE2B 616fba5a8dfa69c4a48df72222cbc2adf24dadcbda01d95e97b64a23a76038dd75988b481eb3d73e6ae5d20c011c5dc23cf2e0f3a3ae020a12742fe93644de2c SHA512 a03a9a57476983096cdc610405869696c6c0345039da9f386e345932bf439f49aa012501d31f4ab0100688211a3abfc7487a8413cf9a0b3907dc1f8ee50d8000
+EBUILD netcdf-fortran-4.5.4-r1.ebuild 926 BLAKE2B 1c69a86e96ed2f9e7da56c9d21c6b0dd536c17078c0cd8d2d91b1ff25cd5cb2e52d0f1a92dedcfc1672b33eed960c4600cd1376c527046638122ca2f2b30c4fa SHA512 3bb7721be67865eb68cb9f35b6e1745a7c3cb2013a08a9c0c4bd1cd9c22fb9122f171b2a1e27d2d4d57c4ffacf005a97538e27696a3f98347d4e7dab8eca6c7a
 EBUILD netcdf-fortran-4.5.4.ebuild 919 BLAKE2B fd474d4710fa2ba8098f75e452e2b940acdc2da3791c8d03bc0352d1452fba8381b73216a6bfc4655a8128b7b98a5b63da997e48e52c47caba0045a2006328df SHA512 ec8d06f3820e9afbf75142fe69c012f6f9ea911d1a735675b681e70c2334b4accf8a2868900fed58288d0d424b604f19ae2d9ffff686a28331265482159d67a0
 MISC metadata.xml 839 BLAKE2B d1e207fbff3f9156dae38cf50061bcd12c6020597f015d513997c6781a111b21af791ad77536b16f6f4ba8a6caeeb69932f763cd23d3f488d362dfd46ecf3265 SHA512 9e14fb6d6eae551b58eecd88156ce33a47267e8e57dcd024b70ee31993d8026bc4a1e4a42f3d63a9f91a43dca5e80bb435f926692dcf2ec215d1f544826f40f8
diff --git a/sci-libs/netcdf-fortran/netcdf-fortran-4.5.3.ebuild b/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4-r1.ebuild
index c5e5ff3a2d11..d9969bd8da43 100644
--- a/sci-libs/netcdf-fortran/netcdf-fortran-4.5.3.ebuild
+++ b/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4-r1.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 FORTRAN_STANDARD="77 90"
 
-inherit autotools fortran-2 flag-o-matic
+inherit fortran-2
 
 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-fortran/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+# TODO: drop .upstream suffix on next bump
+SRC_URI="https://downloads.unidata.ucar.edu/netcdf-fortran/${PV}/${P}.tar.gz -> ${P}.upstream.tar.gz"
 
 LICENSE="UCAR-Unidata"
 SLOT="0/7"
@@ -17,22 +18,13 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs"
 
 RDEPEND="sci-libs/netcdf"
-DEPEND="${RDEPEND}
-	dev-lang/cfortran"
+DEPEND="
+	${RDEPEND}
+	dev-lang/cfortran
+"
 BDEPEND="doc? ( app-doc/doxygen )"
 
-src_prepare() {
-	default
-	eautoreconf
-}
-
 src_configure() {
-	# GCC 10 workaround
-	# bug #723274
-	# (As of 4.5.3, configure is meant to check for this flag & use it
-	# but it doesn't seem to be doing that.)
-	append-fflags $(test-flags-FC -fallow-argument-mismatch)
-
 	econf \
 		--disable-valgrind \
 		--with-temp-large="${T}" \
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