summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2010-07-09 14:22:59 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2010-07-09 14:22:59 +0000
commit6adb181f1d2c53c0ae12977567b50f59621a47d6 (patch)
tree3abd9a6e8f7c069045781b9b931efa9dfb62e7c5 /sci-libs/hdf5
parentppc64 stable wrt #325069 (diff)
downloadgentoo-2-6adb181f1d2c53c0ae12977567b50f59621a47d6.tar.gz
gentoo-2-6adb181f1d2c53c0ae12977567b50f59621a47d6.tar.bz2
gentoo-2-6adb181f1d2c53c0ae12977567b50f59621a47d6.zip
Remove ancient
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/hdf5')
-rw-r--r--sci-libs/hdf5/ChangeLog7
-rw-r--r--sci-libs/hdf5/files/hdf5-1.8.3-destdir.patch30
-rw-r--r--sci-libs/hdf5/files/hdf5-1.8.3-gnutools.patch35
-rw-r--r--sci-libs/hdf5/files/hdf5-1.8.3-signal.patch65
-rw-r--r--sci-libs/hdf5/hdf5-1.6.4.ebuild69
-rw-r--r--sci-libs/hdf5/metadata.xml3
6 files changed, 6 insertions, 203 deletions
diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index 547c3529c155..3b1d1e93c0b2 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-libs/hdf5
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.61 2010/07/09 14:11:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.62 2010/07/09 14:22:58 xarthisius Exp $
+
+ 09 Jul 2010; Kacper Kowalik <xarthisius@gentoo.org> -hdf5-1.6.4.ebuild,
+ -files/hdf5-1.8.3-destdir.patch, -files/hdf5-1.8.3-gnutools.patch,
+ -files/hdf5-1.8.3-signal.patch, metadata.xml:
+ Remove ancient
09 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> hdf5-1.8.4-r1.ebuild:
ppc64 stable wrt #299710
diff --git a/sci-libs/hdf5/files/hdf5-1.8.3-destdir.patch b/sci-libs/hdf5/files/hdf5-1.8.3-destdir.patch
deleted file mode 100644
index 81243557d834..000000000000
--- a/sci-libs/hdf5/files/hdf5-1.8.3-destdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- hdf5-1.8.3.orig/config/examples.am 2009-04-15 19:10:01.037732972 +0100
-+++ hdf5-1.8.3/config/examples.am 2009-04-16 15:02:45.983768491 +0100
-@@ -63,13 +63,13 @@
- install-examples: $(INSTALL_FILES)
- @for f in X $(INSTALL_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\
-+ (set -x; $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)/$(EXAMPLEDIR)/. || exit 1);\
- fi; \
- done
-
- uninstall-examples:
-- @if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then \
-- set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES); \
-+ @if test -n "$(INSTALL_FILES)" -a -d $(DESTDIR)/$(EXAMPLEDIR); then \
-+ set -x; cd $(DESTDIR)/$(EXAMPLEDIR) && $(RM) $(INSTALL_FILES); \
- fi
-
- installcheck-local:
---- hdf5-1.8.3.orig/config/commence.am 2009-04-15 19:10:01.037732972 +0100
-+++ hdf5-1.8.3/config/commence.am 2009-04-16 15:40:53.810412317 +0100
-@@ -42,8 +42,6 @@
- LIBH5F_HL=$(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
- LIBH5CPP_HL=$(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
-
--# Install directories that automake doesn't know about
--docdir = $(exec_prefix)/doc
-
- # Scripts used to build examples
- # If only shared libraries have been installed, have h5cc build examples with
diff --git a/sci-libs/hdf5/files/hdf5-1.8.3-gnutools.patch b/sci-libs/hdf5/files/hdf5-1.8.3-gnutools.patch
deleted file mode 100644
index 55654123718a..000000000000
--- a/sci-libs/hdf5/files/hdf5-1.8.3-gnutools.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- hdf5-1.8.3.orig/config/linux-gnulibc1 2009-04-15 19:10:01.037732972 +0100
-+++ hdf5-1.8.3/config/linux-gnulibc1 2009-04-16 09:58:54.132299149 +0100
-@@ -39,8 +39,8 @@
- if test "X-" = "X-$FC"; then
- case $CC_BASENAME in
- gcc*)
-- FC=g95
-- FC_BASENAME=g95
-+ FC=gfortran
-+ FC_BASENAME=gfortran
- ;;
- pgcc*)
- FC=pgf90
---- hdf5-1.8.3.orig/src/Makefile.am 2009-04-15 19:10:01.113738280 +0100
-+++ hdf5-1.8.3/src/Makefile.am 2009-04-16 11:07:46.221186334 +0100
-@@ -27,7 +27,7 @@
- # a long time to compile it with any optimization on. H5detect is used
- # to generate H5Tinit.c once. So, optimization is not critical.
- noinst_PROGRAMS = H5detect
--H5detect_CFLAGS = -g
-+H5detect_CFLAGS = -g -O0
-
- # Our main target, the HDF5 library
- lib_LTLIBRARIES=libhdf5.la
---- hdf5-1.8.3.orig/configure.in 2009-04-15 19:10:01.345757835 +0100
-+++ hdf5-1.8.3/configure.in 2009-04-16 12:40:53.698868563 +0100
-@@ -355,7 +355,7 @@
- dnl --------------------------------------------------------------------
- dnl Check for a Fortran 9X compiler and how to include modules.
- dnl
-- AC_PROG_FC([f90 pgf90 slf90 f95 g95 xlf95 efc ifort ftn],)
-+ AC_PROG_FC([gfortran f90 pgf90 slf90 f95 g95 xlf95 efc ifort ftn],)
- AC_F9X_MODS
-
- dnl It seems that libtool (as of Libtool 1.5.14) is trying to
diff --git a/sci-libs/hdf5/files/hdf5-1.8.3-signal.patch b/sci-libs/hdf5/files/hdf5-1.8.3-signal.patch
deleted file mode 100644
index 0ef2672e11a7..000000000000
--- a/sci-libs/hdf5/files/hdf5-1.8.3-signal.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- hdf5-1.8.3.orig/src/H5detect.c 2009-04-15 19:10:01.069734368 +0100
-+++ hdf5-1.8.3/src/H5detect.c 2009-04-16 10:15:42.185227061 +0100
-@@ -109,7 +109,7 @@
- static void detect_C99_integers64(void);
- static void detect_alignments(void);
- static size_t align_g[] = {1, 2, 4, 8, 16};
--static jmp_buf jbuf_g;
-+static sigjmp_buf jbuf_g;
-
-
- /*-------------------------------------------------------------------------
-@@ -368,7 +368,7 @@
- void (*_handler2)(int) = signal(SIGSEGV, sigsegv_handler); \
- \
- _buf = (char*)malloc(sizeof(TYPE) + align_g[NELMTS(align_g) - 1]); \
-- if(setjmp(jbuf_g)) _ano++; \
-+ if(sigsetjmp(jbuf_g, 1)) _ano++; \
- if(_ano < NELMTS(align_g)) { \
- *((TYPE*)(_buf+align_g[_ano])) = _val; /*possible SIGBUS or SEGSEGV*/ \
- _val2 = *((TYPE*)(_buf+align_g[_ano])); /*possible SIGBUS or SEGSEGV*/ \
-@@ -385,7 +385,7 @@
- memcpy(_buf+align_g[_ano]+(INFO.offset/8),((char *)&_val)+(INFO.offset/8),(size_t)(INFO.precision/8)); \
- _val2 = *((TYPE*)(_buf+align_g[_ano])); \
- if(_val!=_val2) \
-- longjmp(jbuf_g, 1); \
-+ siglongjmp(jbuf_g, 1); \
- /* End Cray Check */ \
- (INFO.align)=align_g[_ano]; \
- } else { \
-@@ -456,7 +456,7 @@
- * it's not nearly as nice to work with, it does the job for
- * this simple stuff.
- *
-- * Return: Returns via longjmp to jbuf_g.
-+ * Return: Returns via siglongjmp to jbuf_g.
- *
- * Programmer: Robb Matzke
- * Thursday, March 18, 1999
-@@ -469,7 +469,7 @@
- sigsegv_handler(int UNUSED signo)
- {
- signal(SIGSEGV, sigsegv_handler);
-- longjmp(jbuf_g, 1);
-+ siglongjmp(jbuf_g, 1);
- }
-
-
-@@ -481,7 +481,7 @@
- * it's not nearly as nice to work with, it does the job for
- * this simple stuff.
- *
-- * Return: Returns via longjmp to jbuf_g.
-+ * Return: Returns via siglongjmp to jbuf_g.
- *
- * Programmer: Robb Matzke
- * Thursday, March 18, 1999
-@@ -494,7 +494,7 @@
- sigbus_handler(int UNUSED signo)
- {
- signal(SIGBUS, sigbus_handler);
-- longjmp(jbuf_g, 1);
-+ siglongjmp(jbuf_g, 1);
- #ifdef H5_HAVE_SIGLONGJMP
- siglongjmp(jbuf_g, 1);
- #endif /* H5_HAVE_SIGLONGJMP */
diff --git a/sci-libs/hdf5/hdf5-1.6.4.ebuild b/sci-libs/hdf5/hdf5-1.6.4.ebuild
deleted file mode 100644
index 2b867d6dad41..000000000000
--- a/sci-libs/hdf5/hdf5-1.6.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.4.ebuild,v 1.10 2008/02/04 07:58:32 nerdboy Exp $
-
-inherit eutils
-
-DESCRIPTION="General purpose library and file format for storing scientific data"
-HOMEPAGE="http://hdf.ncsa.uiuc.edu/HDF5/"
-SRC_URI="ftp://ftp.ncsa.uiuc.edu/HDF/HDF5/current/src/${P}.tar.gz"
-
-LICENSE="NCSA-HDF"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-# need to update szip to get sparc, alpha, and ia64 back in here,
-# as well as work out the mpi issues
-IUSE="static zlib ssl mpi hlapi szip threads debug"
-
-DEPEND="zlib? ( sys-libs/zlib )
- szip? ( sci-libs/szip )
- mpi? ( sys-cluster/mpich2 )"
-
-src_compile() {
- local myconf="--with-pic"
-
- #--disable-static conflicts with --enable-cxx, so we have to do either or
- use static && myconf="${myconf} --enable-cxx" || \
- myconf="${myconf} --disable-static"
- # fortran needs f90 support
- #myconf="${myconf} $(use_enable fortran)"
- use threads && myconf="${myconf} --with-pthread"
- use debug && myconf="${myconf} --enable-debug=all"
- use mpi && myconf="${myconf} --enable-parallel"
- use hlapi || myconf="${myconf} --disable-hl"
-
- # NOTE: the hdf5 configure script has its own interpretation of
- # the ARCH environment variable which conflicts with that of
- # ebuild/emerge. As a work around, we save the ARCH variable as
- # EBUILD_ARCH and restore it when we are done.
- EBUILD_ARCH=${ARCH}
- unset ARCH
-
- use mpi && \
- export CC="/usr/bin/mpicc"
- ./configure --prefix=/usr ${myconf} \
- $(use_enable zlib) \
- $(use_with ssl) \
- --enable-linux-lfs \
- --sysconfdir=/etc \
- --infodir=/usr/share/info \
- --mandir=/usr/share/man || die "configure failed"
-
- # restore the ARCH environment variable
- ARCH=${EBUILD_ARCH}
-
- emake || die "emake failed"
-}
-
-src_install() {
- make \
- prefix=${D}/usr \
- mandir=${D}/usr/share/man \
- docdir=${D}/usr/share/doc/${PF} \
- libdir=${D}/usr/$(get_libdir)/ \
- infodir=${D}/usr/share/info \
- install || die "make install failed"
-
- dodoc README.txt MANIFEST
- dohtml doc/html/*
-}
diff --git a/sci-libs/hdf5/metadata.xml b/sci-libs/hdf5/metadata.xml
index 5d277a37ba93..dbff4da99bc4 100644
--- a/sci-libs/hdf5/metadata.xml
+++ b/sci-libs/hdf5/metadata.xml
@@ -8,7 +8,4 @@
has a more powerful and flexible data model, supports files larger
than 2 GB, and supports parallel I/O.
</longdescription>
-<use>
- <flag name='hlapi'>Enable support for high-level library</flag>
-</use>
</pkgmetadata>