commit:     df2c62a10c80eb73d5c12bf143ae1c2c2321d980
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 15 19:42:00 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 15 20:56:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df2c62a1

sci-libs/hdf5: Drop 1.8.18 and 1.10.1

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-libs/hdf5/Manifest                          |   2 -
 sci-libs/hdf5/files/hdf5-1.8.15-implicits.patch |  43 ---------
 sci-libs/hdf5/hdf5-1.10.1.ebuild                |  95 --------------------
 sci-libs/hdf5/hdf5-1.8.18.ebuild                | 111 ------------------------
 sci-libs/hdf5/metadata.xml                      |   5 +-
 5 files changed, 1 insertion(+), 255 deletions(-)

diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index e8b5dd2438c..64df5831a55 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -1,3 +1 @@
-DIST hdf5-1.10.1.tar.bz2 11769617 BLAKE2B 
66ad762aed90cea9e58a9735bf0e189d78befc40cac0e566586e967f2b3ba6f5bf8a6bfd12a2f4062f8b20900c16d467c34134c17dedfd8f345cb96bd853a2fe
 SHA512 
266b0e2f28c5fd540099a4955244ddb8c03aca3ad40d626358643f033a6ae5e9266a1d6c1d60925c7d42d24d28a1549d3305fe8ddb42cec2379af7231b93e554
 DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B 
ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2ae279d3980f57ed46722b754d3f36ecf1d6273c75e80ed1afd4bbf10c6b1c5d9408e1f83a4b2e397e7902a7d3c
 SHA512 
769e43b8672e26fe24ed68da0228c010d3d9bc950ca09f0bc60707911a2f26f2f8415c8abc8ec06e07667148d8cdb3b0c7b3e7860d9b19739629c5dfd5ce73d4
-DIST hdf5-1.8.18.tar.bz2 10081294 BLAKE2B 
cf0d0c8a41576bcf816460eaabcfab29cfffba240721a64fe584c42fbb322470f29fb93c8513f7bbdedeeb392c2fe64cd3261b47b47de5b01828dae0b1929cd3
 SHA512 
01f6d14bdd3be2ced9c63cc9e1820cd7ea11db649ff9f3a3055c18c4b0fffe777fd23baad536e3bce31c4d76fe17db64a3972762e1bb4d232927c1ca140e72b2

diff --git a/sci-libs/hdf5/files/hdf5-1.8.15-implicits.patch 
b/sci-libs/hdf5/files/hdf5-1.8.15-implicits.patch
deleted file mode 100644
index 72e09617097..00000000000
--- a/sci-libs/hdf5/files/hdf5-1.8.15-implicits.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/hl/src/H5LTanalyze.c
-+++ b/hl/src/H5LTanalyze.c
-@@ -40,6 +40,7 @@
- #include <string.h>
- #include <errno.h>
- #include <stdlib.h>
-+#include <unistd.h>
- 
- /* end standard C headers. */
- 
---- a/hl/src/H5LTanalyze.l
-+++ b/hl/src/H5LTanalyze.l
-@@ -16,6 +16,7 @@
- %{
- #include <stdlib.h>
- #include <string.h>
-+#include <unistd.h>
- #include <hdf5.h>
- #include "H5LTparse.h"
- 
---- a/test/cache_common.h
-+++ b/test/cache_common.h
-@@ -702,5 +702,8 @@ void validate_mdc_config(hid_t file_id,
-                          hbool_t compare_init,
-                          int test_num);
- 
-+hbool_t resize_configs_are_equal(const H5C_auto_size_ctl_t *a,
-+                                 const H5C_auto_size_ctl_t *b,
-+                                 hbool_t compare_init);
- #endif /* _CACHE_COMMON_H */
- 
---- a/testpar/t_span_tree.c
-+++ b/testpar/t_span_tree.c
-@@ -37,6 +37,9 @@
- #include "hdf5.h"
- #include "H5private.h"
- #include "testphdf5.h"
-+#define H5S_PACKAGE
-+#define H5S_TESTING
-+#include "H5Spkg.h"
- 
- 
- static void coll_write_test(int chunk_factor);

diff --git a/sci-libs/hdf5/hdf5-1.10.1.ebuild b/sci-libs/hdf5/hdf5-1.10.1.ebuild
deleted file mode 100644
index 6cf18a83be0..00000000000
--- a/sci-libs/hdf5/hdf5-1.10.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils fortran-2 flag-o-matic toolchain-funcs multilib 
versionator prefix
-
-MY_P=${PN}-${PV/_p/-patch}
-MAJOR_P=${PN}-$(get_version_component_range 1-2 ${PV})
-
-DESCRIPTION="General purpose library and file format for storing scientific 
data"
-HOMEPAGE="http://www.hdfgroup.org/HDF5/";
-SRC_URI="http://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2";
-
-LICENSE="NCSA-HDF"
-SLOT="0/${PV%%_p*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
-IUSE="cxx debug examples fortran +hl mpi static-libs szip threads zlib"
-
-REQUIRED_USE="
-       cxx? ( !mpi ) mpi? ( !cxx )
-       threads? ( !cxx !mpi !fortran !hl )"
-
-RDEPEND="
-       mpi? ( virtual/mpi[romio] )
-       szip? ( virtual/szip )
-       zlib? ( sys-libs/zlib:0= )"
-
-DEPEND="${RDEPEND}
-       sys-devel/libtool:2
-       >=sys-devel/autoconf-2.69"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-1.8.9-static_libgfortran.patch
-       "${FILESDIR}"/${PN}-1.8.9-mpicxx.patch
-       "${FILESDIR}"/${PN}-1.8.13-no-messing-ldpath.patch
-)
-
-pkg_setup() {
-       tc-export CXX CC AR # workaround for bug 285148
-       use fortran && fortran-2_pkg_setup
-
-       if use mpi; then
-               if has_version 'sci-libs/hdf5[-mpi]'; then
-                       ewarn "Installing hdf5 with mpi enabled with a previous 
hdf5 with mpi disabled may fail."
-                       ewarn "Try to uninstall the current hdf5 prior to 
enabling mpi support."
-               fi
-               export CC=mpicc
-               use fortran && export FC=mpif90
-       elif has_version 'sci-libs/hdf5[mpi]'; then
-               ewarn "Installing hdf5 with mpi disabled while having hdf5 
installed with mpi enabled may fail."
-               ewarn "Try to uninstall the current hdf5 prior to disabling mpi 
support."
-       fi
-}
-
-src_prepare() {
-       # respect gentoo examples directory
-       sed \
-               -e "s:hdf5_examples:doc/${PF}/examples:g" \
-               -i $(find . -name Makefile.am) $(find . -name "run*.sh.in") || 
die
-       sed \
-               -e '/docdir/d' \
-               -i config/commence.am || die
-       if ! use examples; then
-               sed -e '/^install:/ s/install-examples//' \
-                       -i Makefile.am || die #409091
-       fi
-       # enable shared libs by default for h5cc config utility
-       sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" tools/src/misc/h5cc.in || die
-       hprefixify m4/libtool.m4
-       autotools-utils_src_prepare
-}
-
-src_configure() {
-       local myeconfargs=(
-               --docdir="${EPREFIX}"/usr/share/doc/${PF}
-               --enable-deprecated-symbols
-               $(use debug && echo --enable-build-mode=debug || echo 
--enable-build-mode=production)
-               $(use_enable debug codestack)
-               $(use_enable cxx)
-               $(use_enable fortran)
-               $(use_enable hl)
-               $(use_enable mpi parallel)
-               $(use_enable threads threadsafe)
-               $(use_with szip szlib)
-               $(use_with threads pthread)
-               $(use_with zlib)
-       )
-       autotools-utils_src_configure
-}

diff --git a/sci-libs/hdf5/hdf5-1.8.18.ebuild b/sci-libs/hdf5/hdf5-1.8.18.ebuild
deleted file mode 100644
index 4057134a614..00000000000
--- a/sci-libs/hdf5/hdf5-1.8.18.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils fortran-2 flag-o-matic toolchain-funcs multilib
-
-MY_P=${PN}-${PV/_p/-patch}
-
-DESCRIPTION="General purpose library and file format for storing scientific 
data"
-HOMEPAGE="http://www.hdfgroup.org/HDF5/";
-#SRC_URI="https://support.hdfgroup.org/ftp/HDF5/releases/${MY_P}/src/${MY_P}.tar.bz2";
-# TODO: return to proper SRC_URI once upstream fixes their release
-SRC_URI="https://support.hdfgroup.org/ftp/HDF5/current18/src/${MY_P}.tar.bz2";
-
-LICENSE="NCSA-HDF"
-SLOT="0/${PV%%_p*}"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
-IUSE="cxx debug examples fortran fortran2003 +hl mpi static-libs szip threads 
zlib"
-
-REQUIRED_USE="
-       threads? ( !cxx !mpi !fortran !hl )
-       fortran2003? ( fortran )"
-
-RDEPEND="
-       mpi? ( virtual/mpi[romio] )
-       szip? ( virtual/szip )
-       zlib? ( sys-libs/zlib:0= )"
-
-DEPEND="${RDEPEND}
-       sys-devel/libtool:2
-       >=sys-devel/autoconf-2.69"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-1.8.9-static_libgfortran.patch
-       "${FILESDIR}"/${PN}-1.8.9-mpicxx.patch
-       "${FILESDIR}"/${PN}-1.8.13-no-messing-ldpath.patch
-       "${FILESDIR}"/${PN}-1.8.15-implicits.patch
-)
-
-pkg_setup() {
-       tc-export CXX CC AR # workaround for bug 285148
-       if use fortran; then
-               use fortran2003 && FORTRAN_STANDARD=2003
-               fortran-2_pkg_setup
-       fi
-       if use mpi; then
-               if has_version 'sci-libs/hdf5[-mpi]'; then
-                       ewarn "Installing hdf5 with mpi enabled with a previous 
hdf5 with mpi disabled may fail."
-                       ewarn "Try to uninstall the current hdf5 prior to 
enabling mpi support."
-               fi
-               export CC=mpicc
-               use fortran && export FC=mpif90
-               if use cxx ; then
-                       export CXX=mpicxx
-                       ewarn "USE='mpi cxx' requires a configuration 
unsupported by upstream. Use at your own risk."
-                       ewarn "In particular, the C++ API is not parallel safe."
-               fi
-       elif has_version 'sci-libs/hdf5[mpi]'; then
-               ewarn "Installing hdf5 with mpi disabled while having hdf5 
installed with mpi enabled may fail."
-               ewarn "Try to uninstall the current hdf5 prior to disabling mpi 
support."
-       fi
-}
-
-src_prepare() {
-       # respect gentoo examples directory
-       sed \
-               -e "s:hdf5_examples:doc/${PF}/examples:g" \
-               -i $(find . -name Makefile.am) $(find . -name "run*.sh.in") || 
die
-       sed \
-               -e '/docdir/d' \
-               -i config/commence.am || die
-       if ! use examples; then
-               sed -e '/^install:/ s/install-examples//' \
-                       -i Makefile.am || die #409091
-       fi
-       # enable shared libs by default for h5cc config utility
-       sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" tools/misc/h5cc.in || die
-       # bug #419677
-       use prefix && \
-               append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir) \
-               -Wl,-rpath,"${EPREFIX}"/$(get_libdir)
-       autotools-utils_src_prepare
-}
-
-src_configure() {
-       local myeconfargs=(
-               --enable-production
-               --docdir="${EPREFIX}"/usr/share/doc/${PF}
-               --enable-deprecated-symbols
-               $(use_enable prefix sharedlib-rpath)
-               $(use_enable debug debug all)
-               $(use_enable debug codestack)
-               $(use_enable cxx)
-               $(use_enable fortran)
-               $(use_enable fortran2003)
-               $(use_enable hl)
-               $(use_enable mpi parallel)
-               $(use_enable threads threadsafe)
-               $(use_with szip szlib)
-               $(use_with threads pthread)
-               $(use_with zlib)
-               $(use mpi && use cxx && echo --enable-unsupported)
-       )
-       autotools-utils_src_configure
-}

diff --git a/sci-libs/hdf5/metadata.xml b/sci-libs/hdf5/metadata.xml
index 9c9d5071aa8..040542a30ae 100644
--- a/sci-libs/hdf5/metadata.xml
+++ b/sci-libs/hdf5/metadata.xml
@@ -12,9 +12,6 @@
   than 2 GB, and supports parallel I/O.
 </longdescription>
   <use>
-    <flag name="fortran2003">Enable new features that require Fortran 2003 
-  (http://www.hdfgroup.org/HDF5/doc/fortran/NewFeatures_F2003.pdf)</flag>
-    <flag name="hl">Enable high level API
-  (https://support.hdfgroup.org/HDF5/doc/HL/index.html)</flag>
+    <flag name="hl">Enable high level API 
(https://support.hdfgroup.org/HDF5/doc/HL/index.html)</flag>
   </use>
 </pkgmetadata>

Reply via email to