gentoo auto-resync : 27:07:2023 - 22:35:23

5 files changed, 1 insertions, 189 deletions

diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index c53f923d8d54..4dbfca6f78ce 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -1,8 +1,4 @@
 AUX netcdf-4.7.4-big-endian-test.patch 689 BLAKE2B ab28269ee5922816e7ef7834dddec974c98951a41c0025041f9ee67d92c7bfe57887f5ac8d8beb2426e2c095fc06cf4b29046a9b29873b125d681b169c9613b6 SHA512 72575f890615a05a6f1beeebfd3edcd367fe148be017a32847b0a7db96c594e6bb5d01acd865257b25410e0a22699b1beef2c54748ccb09ea5e41009f4e0f9ee
-AUX netcdf-4.8.1-big-endian-build.patch 690 BLAKE2B ee79d940d47b69c7628d325b8a4b002942d7198d0a98b7d64a843056f2b0ac8888c9bd6cf37f74f5788a1b075a309c60a9e80a1e072dd1ff45cf3213ad7ffe4d SHA512 e2dcf92063806e56ec02df8a3b2dea97b67ee58768703db2672188d9837188f7bab68a04da2df78b6130c6d87137f8b9974b91d09eab8cd90dba77aadac6ea5e
-DIST netcdf-4.8.1.tar.gz 18957280 BLAKE2B 05fc6cd10cb5cbb11dc077b9a884fbc63c4cb840b241e782702da58ad9831fba065a6f1e97c2be092437735d39658482285850a00618d0582d6e4728d64c4402 SHA512 c97207867abf10d414abf34624268710f5b812c26c38f97e73afe00558b3f07917331fbc7fdb9e70b09813acf15a9a09bae2c432a3266ce10a791b9472f87a42
 DIST netcdf-c-4.9.2.tar.gz 7142536 BLAKE2B b24135070d2f1f0b53fe738f8839039547eceba16d36905bb8cd7be983ce0c1127b7b01ae37dbde50087aa82fd56f00fab9bfa75c7d94fd4478031bb8a6da247 SHA512 7a96bcf673d5a9e1537d660aaf085a1dfaefc7dfb0fc96358462d92e7bbfe541184583681797e6a54d11b8588504b7d8a9b0b9bd850eecd02ed73aa2eb5ffa0d
-EBUILD netcdf-4.8.1-r1.ebuild 1812 BLAKE2B a7237f15cae06791b447a84e6c30d24594df1b73ed035c94e2d8ca7cd60c2757688da0253fc007ea20b4f0aa47c03d8c1a40e00857fa2c32cd524f6222ba0980 SHA512 8616293c70ae60bfd64cda75459fc9f6ff6b09aece9ff06c0bf6113e44e683c0d85d9b3d40ed49ca5fea8eec718be36430798e57cccbaa6e68067e0697ad61aa
-EBUILD netcdf-4.8.1-r2.ebuild 2005 BLAKE2B 27ddd0dfc01e7ba32d889efb9085c9b16f4cdd076e860c2734ad78397d562c3eb2e1a231449983b5817968efe211ced789f0624d621d257c565ca362a02b1a3d SHA512 3672c96fca8d1d60f1757192d4d39cb0d0a5f57fe8e102de1a4bfc16449c478ae9c7fb2aeb42b669241c269d9dbd1cdba6712cfbcd52d595cc7bbdf733b0eedd
 EBUILD netcdf-4.9.2.ebuild 1653 BLAKE2B 655ad723ceafa31b0fef856fe1f697cbbde9d677bc6be38a12629f94fbdf6eadedfb3f7703db7cd7398b27d500707d43f5777216620d64b87866b322d6685866 SHA512 016c81f6780b93a7622950699ce3a7f5a5e93f0411e65cdac83a6a25cc0b8232e7eb354fdc99c79c18828a3f7d146c4c215c4ffa4c227e19d20ade87361cf266
-MISC metadata.xml 1065 BLAKE2B 7e661019c6f97a0720a45cc93a59079834135a1994ab9abd90b769dec892c4b0ad60f09b87b6e15ceda6ee99f289a992ca8315a1d168a3eec6d50d09b6de1273 SHA512 fe82704383f8021a861936927fc9a1450257433d6589f1b4bfef3fd0527b912543813ff8d66c6fe33d98cb7a16bcbcb26149df8d809f92fa2e48c6fb83c8455b
+MISC metadata.xml 990 BLAKE2B 17406dcf87f633cd22c32a239799a5e3bb2e89d3d7669cc1d066c137ea06a3bc2f07478d434ad0776a6843339f181623dd2e9a8cbf9d24d325e4d9d7ec66fe6f SHA512 209a76790a7ad18447cb27d880e0d741763415567ce43c05ee6551544a673a86c9e8d7ed337f08f153681b23827958b1ada462524d0c66279ad1ef55f26310ba
diff --git a/sci-libs/netcdf/files/netcdf-4.8.1-big-endian-build.patch b/sci-libs/netcdf/files/netcdf-4.8.1-big-endian-build.patch
deleted file mode 100644
index afeff7e3fbd0..000000000000
--- a/sci-libs/netcdf/files/netcdf-4.8.1-big-endian-build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Later version for 4.8.1 grabbed from Debian:
-https://sources.debian.org/patches/netcdf/1:4.8.1-1/byteswap.patch/
-
-Earlier version used:
-https://github.com/DennisHeimbigner/netcdf-c/commit/6f86660da86f279cad1f2804cf3242767de27630.patch
-https://github.com/Unidata/netcdf-c/issues/1687
-https://bugs.gentoo.org/772863
-
-Description: Add forward declarations for byteswap8 & byteswap4.
-Author: Dennis Heimbigner
-Bug: https://github.com/Unidata/netcdf-c/issues/1687
-
---- a/libdispatch/dfilter.c
-+++ b/libdispatch/dfilter.c
-@@ -20,6 +20,9 @@
- #include "hdf5internal.h"
- #endif
- 
-+static void byteswap8(unsigned char*);
-+static void byteswap4(unsigned char*);
-+
- /*
- Unified filter related code
- */
diff --git a/sci-libs/netcdf/metadata.xml b/sci-libs/netcdf/metadata.xml
index acecc3ab2966..710afdc8ff08 100644
--- a/sci-libs/netcdf/metadata.xml
+++ b/sci-libs/netcdf/metadata.xml
@@ -16,7 +16,6 @@
   <use>
     <flag name="dap">Support for remote data access with the built-in OPeNDAP client</flag>
     <flag name="hdf">Add support for the Hierarchical Data Format v.4 <pkg>sci-libs/hdf</pkg></flag>
-    <flag name="tools">Build the utilities nccopy, ncgen and ncdump</flag>
   </use>
   <upstream>
     <remote-id type="github">Unidata/netcdf-c</remote-id>
diff --git a/sci-libs/netcdf/netcdf-4.8.1-r1.ebuild b/sci-libs/netcdf/netcdf-4.8.1-r1.ebuild
deleted file mode 100644
index 003e1303571f..000000000000
--- a/sci-libs/netcdf/netcdf-4.8.1-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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:0= )
-	hdf? (
-		sci-libs/hdf:0=
-		sci-libs/hdf5:0=
-		virtual/jpeg
-	)
-	hdf5? ( sci-libs/hdf5:0=[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.8.1-big-endian-build.patch"
-	"${FILESDIR}/${PN}-4.7.4-big-endian-test.patch"
-)
-
-src_prepare() {
-	# skip test that requires network
-	sed -i -e '/run_get_hdf4_files/d' hdf4_test/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-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
-		# Enable for >4.8.1 (not yet in a release)
-		#-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
-}
diff --git a/sci-libs/netcdf/netcdf-4.8.1-r2.ebuild b/sci-libs/netcdf/netcdf-4.8.1-r2.ebuild
deleted file mode 100644
index d4e17743df68..000000000000
--- a/sci-libs/netcdf/netcdf-4.8.1-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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:0= )
-	hdf? (
-		media-libs/libjpeg-turbo:=
-		sci-libs/hdf:0=
-		sci-libs/hdf5:0=
-	)
-	hdf5? ( sci-libs/hdf5:0=[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.8.1-big-endian-build.patch"
-	"${FILESDIR}/${PN}-4.7.4-big-endian-test.patch"
-)
-
-src_prepare() {
-	# skip test that requires network
-	sed -i -e '/run_get_hdf4_files/d' hdf4_test/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-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
-		# Enable for >4.8.1 (not yet in a release)
-		#-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
-}