commit: 92ea2e6dce27c52e8f8039bf0c60fd85f89d8e10
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 9 22:21:20 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 9 23:04:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92ea2e6d
sci-libs/hdf: Drop 4.2.13-r1 and 4.2.15 (r0)
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/hdf/Manifest | 1 -
.../files/hdf-4.2.11-enable-fortran-shared.patch | 35 ---------
.../hdf/files/hdf-4.2.11-fix-szip-detection.patch | 27 -------
.../hdf/files/hdf-4.2.13-fix-xdr-configure.patch | 13 ----
sci-libs/hdf/files/hdf-4.2.13-linux-tirpc.patch | 29 --------
sci-libs/hdf/hdf-4.2.13-r1.ebuild | 83 ----------------------
sci-libs/hdf/hdf-4.2.15.ebuild | 77 --------------------
7 files changed, 265 deletions(-)
diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index f263bbc2c62b..d44550729bb1 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -1,3 +1,2 @@
-DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B
3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899
SHA512
d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
DIST hdf-4.2.15-arch-patches-1.tar.bz2 7187 BLAKE2B
461e3d7c5e3603fb909d59d6fb23b59f64ef6a6c4e58fe85ddf906a8f27918ac25d3928f5c705290d9d778e1ed07b009bd0602409c05d13a06905d58f2a2cfff
SHA512
616c39d06fb6f479a7bed88a89828530ac32018dae827259b76d6e177e5b50378722b60532533a02ae534dddc445f4e360e7a19a28e2cf9728549e5ee27c3e67
DIST hdf-4.2.15.tar.bz2 3647900 BLAKE2B
b1d60ee880563bf64ae6eae4c66f86afe55f4c512f06c84c154de30034fa7a65cfa2b9bd68fbf8a055bb42b57215455ac8967f2a73ec88b361750aa07e0da5e6
SHA512
7d4037800ef8950ed74f225355ef5458444bed26fc189fbbd2ce7d36009998013ac1f6ba5d4e60834acf8f6f73550357238745acc35e162679919400a48191e9
diff --git a/sci-libs/hdf/files/hdf-4.2.11-enable-fortran-shared.patch
b/sci-libs/hdf/files/hdf-4.2.11-enable-fortran-shared.patch
deleted file mode 100644
index 7d48a8a0ca97..000000000000
--- a/sci-libs/hdf/files/hdf-4.2.11-enable-fortran-shared.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- hdf-4.2.11.orig/configure.ac 2016-03-16 20:07:45.093493050 +0000
-+++ hdf-4.2.11/configure.ac 2016-03-16 20:15:56.767311873 +0000
-@@ -224,20 +224,6 @@
- ## Build static libraries by default. Furthermore, fortran shared libraries
- ## are unsupported. Disallow a user from enabling both shared libraries and
- ## fortran.
--if test "X${enable_shared}" != "Xyes"; then
-- enable_shared="no"
--fi
--
--if test "X${enable_shared}" = "Xyes"; then
-- if test "X${BUILD_FORTRAN}" = "Xyes"; then
-- AC_MSG_ERROR([Cannot build shared fortran libraries. Please configure
with --disable-fortran flag.])
-- fi
--fi
--
--AC_PROG_INSTALL
--AC_PROG_LN_S
--
--AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH])
-
- AC_CHECK_PROGS([YACC], ['bison -y' byacc yacc], [none], [])
-
-@@ -847,11 +833,6 @@
- ## ------------------------------------------------------------------------
- ## Check to see if libtool has enabled shared libraries. Set a conditional
- ## as some Makefiles will build based on availability of shared libraries.
--if (./libtool --features | grep '^enable shared libraries' > /dev/null); then
-- enable_shared=yes
--else
-- enable_shared=no
--fi
-
- ## ------------------------------------------------------------------------
- ## Specify shared library extension the host machine should recognize.
diff --git a/sci-libs/hdf/files/hdf-4.2.11-fix-szip-detection.patch
b/sci-libs/hdf/files/hdf-4.2.11-fix-szip-detection.patch
deleted file mode 100644
index 4486eb959b82..000000000000
--- a/sci-libs/hdf/files/hdf-4.2.11-fix-szip-detection.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- hdf-4.2.11.orig/configure.ac 2016-03-16 20:07:45.093493050 +0000
-+++ hdf-4.2.11/configure.ac 2016-03-16 22:08:06.232711036 +0000
-@@ -473,12 +473,14 @@
- yes)
- HAVE_SZIP="yes"
- AC_CHECK_HEADERS([szlib.h], [HAVE_SZLIB_H="yes"], [unset HAVE_SZIP])
-- if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
-+ if test "x$HAVE_SZIP" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
- AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [unset HAVE_SZIP])
- fi
-
- if test -z "$HAVE_SZIP"; then
- AC_MSG_ERROR([couldn't find szlib library])
-+ else
-+ USE_COMP_SZIP="yes"
- fi
- ;;
- no)
-@@ -525,7 +527,7 @@
- AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [unset HAVE_SZIP])
- fi
-
-- if test -z "$HAVE_SZIP"; then
-+ if test "x$HAVE_SZIP" != "xyes"; then
- AC_MSG_ERROR([couldn't find szlib library])
- else
- USE_COMP_SZIP="yes"
diff --git a/sci-libs/hdf/files/hdf-4.2.13-fix-xdr-configure.patch
b/sci-libs/hdf/files/hdf-4.2.13-fix-xdr-configure.patch
deleted file mode 100644
index a4514ab267ec..000000000000
--- a/sci-libs/hdf/files/hdf-4.2.13-fix-xdr-configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: hdf-4.2.13/configure.ac
-===================================================================
---- hdf-4.2.13.orig/configure.ac
-+++ hdf-4.2.13/configure.ac
-@@ -676,7 +676,7 @@ case "$host" in
- *) ;;
- esac
-
--if test "X$BUILD_XDR" != "Xyes"; then
-+if test "X$BUILD_XDR" = "Xyes"; then
- AC_TRY_LINK([
- #include <rpc/types.h>
- #include <rpc/xdr.h>], [xdr_int],
diff --git a/sci-libs/hdf/files/hdf-4.2.13-linux-tirpc.patch
b/sci-libs/hdf/files/hdf-4.2.13-linux-tirpc.patch
deleted file mode 100644
index 963388f66982..000000000000
--- a/sci-libs/hdf/files/hdf-4.2.13-linux-tirpc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: hdf-4.2.13/configure.ac
-===================================================================
---- hdf-4.2.13.orig/configure.ac
-+++ hdf-4.2.13/configure.ac
-@@ -673,6 +673,9 @@ case "$host" in
- *-pc-cygwin*)
- LIBS="$LIBS -ltirpc"
- CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc" ;;
-+ *-pc-linux*)
-+ LIBS="$LIBS -ltirpc"
-+ CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc" ;;
- *) ;;
- esac
-
-@@ -703,6 +706,14 @@ if test "X$BUILD_XDR" != "Xyes"; then
- HAVE_RPC="yes"
- AC_CHECK_HEADER([rpc.h],[:], [unset HAVE_RPC])
- AC_CHECK_LIB([tirpc], [xdr_opaque],[:], [unset HAVE_RPC])
-+ if test -z "$HAVE_RPC"; then
-+ AC_MSG_ERROR([couldn't find tirpc library])
-+ fi
-+ ;;
-+ *-pc-linux*)
-+ HAVE_RPC="yes"
-+ AC_CHECK_HEADER([rpc/rpc.h],[:], [unset HAVE_RPC])
-+ AC_CHECK_LIB([tirpc], [xdr_opaque],[:], [unset HAVE_RPC])
- if test -z "$HAVE_RPC"; then
- AC_MSG_ERROR([couldn't find tirpc library])
- fi
diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild
b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
deleted file mode 100644
index cf5dc153dc11..000000000000
--- a/sci-libs/hdf/hdf-4.2.13-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2 toolchain-funcs autotools flag-o-matic
-
-MYP=${P/_p/-patch}
-
-DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="https://www.hdfgroup.org/hdf4.html";
-SRC_URI="https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2";
-
-SLOT="0"
-LICENSE="NCSA-HDF"
-KEYWORDS="amd64 ~ia64 ppc -sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples fortran szip static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( szip )"
-
-RDEPEND="
- net-libs/libtirpc
- sys-libs/zlib
- virtual/jpeg:0
- szip? ( virtual/szip )"
-DEPEND="${RDEPEND}
- test? ( virtual/szip )"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.2.11-fix-szip-detection.patch
- "${FILESDIR}"/${PN}-4.2.11-enable-fortran-shared.patch
- "${FILESDIR}"/${PN}-4.2.13-fix-xdr-configure.patch
- "${FILESDIR}"/${PN}-4.2.13-linux-tirpc.patch
-)
-
-src_prepare() {
- default
- sed -i -e 's/-R/-L/g' config/commence.am || die #rpath
- eautoreconf
-}
-
-src_configure() {
- [[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
- # GCC 10 workaround
- # bug #723014
- append-fflags $(test-flags-FC -fallow-argument-mismatch)
-
- econf \
- --enable-shared \
- --enable-production=gentoo \
- --disable-netcdf \
- $(use_enable fortran) \
- $(use_enable static-libs static) \
- $(use_with szip szlib) \
- CC="$(tc-getCC)"
-}
-
-src_install() {
- default
-
- if ! use static-libs; then
- find "${ED}" -name '*.la' -delete || die
- fi
-
- dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt
-
- cd "${ED}"usr
- if use examples; then
- mv share/hdf4_examples share/doc/${PF}/examples || die
- docompress -x /usr/share/doc/${PF}/examples
- else
- rm -r share/hdf4_examples || die
- fi
-
- mv bin/ncgen{,-hdf} || die
- mv bin/ncdump{,-hdf} || die
- mv share/man/man1/ncgen{,-hdf}.1 || die
- mv share/man/man1/ncdump{,-hdf}.1 || die
-}
diff --git a/sci-libs/hdf/hdf-4.2.15.ebuild b/sci-libs/hdf/hdf-4.2.15.ebuild
deleted file mode 100644
index 7f129df09b6b..000000000000
--- a/sci-libs/hdf/hdf-4.2.15.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2 toolchain-funcs autotools flag-o-matic
-
-DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="https://www.hdfgroup.org/hdf4.html";
-SRC_URI="https://support.hdfgroup.org/ftp/HDF/releases/${PN^^}${PV}/src/${P}.tar.bz2";
-
-SLOT="0"
-LICENSE="NCSA-HDF"
-KEYWORDS="amd64 ~ia64 ~ppc -riscv -sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples fortran szip static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( szip )"
-
-RDEPEND="
- net-libs/libtirpc
- sys-libs/zlib
- virtual/jpeg:0
- szip? ( virtual/szip )"
-DEPEND="${RDEPEND}
- test? ( virtual/szip )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.2.15-enable-fortran-shared.patch
- "${FILESDIR}"/${PN}-4.2.15-fix-rpch-location.patch
-)
-
-src_prepare() {
- default
- sed -i -e 's/-R/-L/g' config/commence.am || die #rpath
- eautoreconf
-}
-
-src_configure() {
- [[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
- # GCC 10 workaround
- # bug #723014
- append-fflags $(test-flags-FC -fallow-argument-mismatch)
-
- econf \
- --enable-shared \
- --enable-production=gentoo \
- --disable-netcdf \
- $(use_enable fortran) \
- $(use_enable static-libs static) \
- $(use_with szip szlib) \
- CC="$(tc-getCC)"
-}
-
-src_install() {
- default
-
- if ! use static-libs; then
- find "${ED}" -name '*.la' -delete || die
- fi
-
- dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt
-
- cd "${ED}/usr" || die
- if use examples; then
- mv share/hdf4_examples share/doc/${PF}/examples || die
- docompress -x /usr/share/doc/${PF}/examples
- else
- rm -r share/hdf4_examples || die
- fi
-
- mv bin/ncgen{,-hdf} || die
- mv bin/ncdump{,-hdf} || die
- mv share/man/man1/ncgen{,-hdf}.1 || die
- mv share/man/man1/ncdump{,-hdf}.1 || die
-}
