diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest index c6c25e69d50e3..bae5000b682d7 100644 --- a/sci-libs/netcdf/Manifest +++ b/sci-libs/netcdf/Manifest @@ -1,2 +1 @@ -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 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 afeff7e3fbd07..0000000000000 --- 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 acecc3ab2966b..710afdc8ff089 100644 --- a/sci-libs/netcdf/metadata.xml +++ b/sci-libs/netcdf/metadata.xml @@ -16,7 +16,6 @@ Support for remote data access with the built-in OPeNDAP client Add support for the Hierarchical Data Format v.4 sci-libs/hdf - Build the utilities nccopy, ncgen and ncdump Unidata/netcdf-c 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 003e1303571ff..0000000000000 --- 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 d4e17743df686..0000000000000 --- 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 -}