drop old

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

10 files changed, 9 insertions, 509 deletions

diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index e507a54b3e3d..a9f37cb5359a 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/hdf5
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.90 2012/06/17 18:55:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.91 2012/06/17 20:23:04 xarthisius Exp $
+
+  17 Jun 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  -files/hdf5-1.8.3-as-needed.patch, -files/hdf5-1.8.3-includes.patch,
+  -files/hdf5-1.8.3-noreturn.patch, -files/hdf5-1.8.4-gnutools.patch,
+  -files/hdf5-1.8.4-scaleoffset.patch, -files/hdf5-1.8.4-sigbus.patch,
+  -files/hdf5-1.8.5-implicits.patch, -files/hdf5-1.8.5-noreturn.patch,
+  -hdf5-1.8.4-r1.ebuild:
+  drop old
 
   17 Jun 2012; Raúl Porcel <armin76@gentoo.org> hdf5-1.8.8-r1.ebuild:
   alpha/ia64/sparc stable wrt #417607
diff --git a/sci-libs/hdf5/files/hdf5-1.8.3-as-needed.patch b/sci-libs/hdf5/files/hdf5-1.8.3-as-needed.patch
deleted file mode 100644
index 6b1f43835aed..000000000000
--- a/sci-libs/hdf5/files/hdf5-1.8.3-as-needed.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- fortran/src/Makefile.am.orig	2009-04-15 19:10:01.053733251 +0100
-+++ fortran/src/Makefile.am	2009-04-15 19:12:49.874557795 +0100
-@@ -66,6 +66,8 @@
-          H5If.c H5Lf.c H5Of.c H5Pf.c H5Rf.c H5Sf.c H5Tf.c H5Zf.c        \
-          $(PARALLEL_COND_SRC)
- 
-+libhdf5_fortran_la_LIBADD = $(top_builddir)/src/libhdf5.la
-+
- # h5fc is generated during configure.
- # Remove it only when distclean.
- DISTCLEANFILES=h5fc
---- hl/fortran/src/Makefile.am.orig	2009-04-15 19:10:01.245748616 +0100
-+++ hl/fortran/src/Makefile.am	2009-04-15 19:30:56.042226227 +0100
-@@ -43,6 +43,7 @@
- 
- libhdf5hl_fortran_la_SOURCES=H5LTfc.c  H5IMfc.c H5IMcc.c H5TBfc.c H5LTff.f90  \
-                 H5IMff.f90 H5TBff.f90
-+libhdf5hl_fortran_la_LIBADD=$(top_builddir)/hl/src/libhdf5_hl.la
- 
- # Fortran module files can have different extensions and different names
- # (e.g., different capitalizations) on different platforms.  Write rules
---- hl/c++/src/Makefile.am.orig	2009-04-15 19:10:01.249750013 +0100
-+++ hl/c++/src/Makefile.am	2009-04-15 20:16:08.812068687 +0100
-@@ -35,6 +35,7 @@
- # Source files for the library
- # At the moment, only the H5PT Packet Table has a C++ API.
- libhdf5_hl_cpp_la_SOURCES=H5PacketTable.cpp
-+libhdf5_hl_cpp_la_LIBADD=$(top_builddir)/hl/src/libhdf5_hl.la
- 
- # Public headers
- include_HEADERS=H5PacketTable.h
---- hl/src/Makefile.am.orig	2009-05-13 17:03:11.000000000 +0200
-+++ hl/src/Makefile.am	2009-09-10 19:22:57.489698969 +0200
-@@ -31,6 +31,7 @@
- libhdf5_hl_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE)
- 
- libhdf5_hl_la_SOURCES=H5DS.c H5IM.c H5LT.c H5LTanalyze.c H5LTparse.c H5PT.c H5TB.c
-+libhdf5_hl_la_LIBADD=$(top_builddir)/src/libhdf5.la
- 
- # Public header files (to be installed)
- include_HEADERS=hdf5_hl.h H5IMpublic.h H5LTpublic.h H5TBpublic.h H5DSpublic.h H5PTpublic.h
diff --git a/sci-libs/hdf5/files/hdf5-1.8.3-includes.patch b/sci-libs/hdf5/files/hdf5-1.8.3-includes.patch
deleted file mode 100644
index 5e87f6c97a5b..000000000000
--- a/sci-libs/hdf5/files/hdf5-1.8.3-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- hdf5-1.8.3.orig/src/H5E.c	2009-04-15 19:10:01.081735486 +0100
-+++ hdf5-1.8.3/src/H5E.c	2009-04-15 20:02:06.708712912 +0100
-@@ -54,6 +54,8 @@
- /***********/
- /* Headers */
- /***********/
-+#define _GNU_SOURCE
-+#include <stdio.h>
- #include "H5private.h"		/* Generic Functions			*/
- #include "H5Iprivate.h"		/* IDs                                  */
- #include "H5Epkg.h"		/* Error handling		  	*/
diff --git a/sci-libs/hdf5/files/hdf5-1.8.3-noreturn.patch b/sci-libs/hdf5/files/hdf5-1.8.3-noreturn.patch
deleted file mode 100644
index 27b6f9b32a62..000000000000
--- a/sci-libs/hdf5/files/hdf5-1.8.3-noreturn.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -Nur hdf5-1.8.3.orig/c++/src/H5AbstractDs.cpp hdf5-1.8.3/c++/src/H5AbstractDs.cpp
---- hdf5-1.8.3.orig/c++/src/H5AbstractDs.cpp	2009-04-15 19:10:01.061734089 +0100
-+++ hdf5-1.8.3/c++/src/H5AbstractDs.cpp	2009-04-16 10:10:56.263885963 +0100
-@@ -85,6 +85,8 @@
-       else if (fromClass() == "Attribute")
- 	 throw DataTypeIException("Attribute::getTypeClass", "H5Tget_class returns H5T_NO_CLASS");
-    }
-+
-+   return (type_class);
- }
- 
- //--------------------------------------------------------------------------
-diff -Nur hdf5-1.8.3.orig/hl/src/H5LTanalyze.c hdf5-1.8.3/hl/src/H5LTanalyze.c
---- hdf5-1.8.3.orig/hl/src/H5LTanalyze.c	2009-04-15 19:10:01.221747499 +0100
-+++ hdf5-1.8.3/hl/src/H5LTanalyze.c	2009-04-16 10:10:56.267887639 +0100
-@@ -2329,7 +2329,7 @@
-    return ret;
- }
- 
--int H5LTyyerror(char *msg)
-+void H5LTyyerror(char *msg)
- {
-    printf("ERROR: %s before \"%s\".\n", msg, yytext);
- }
-diff -Nur hdf5-1.8.3.orig/hl/src/H5LTanalyze.l hdf5-1.8.3/hl/src/H5LTanalyze.l
---- hdf5-1.8.3.orig/hl/src/H5LTanalyze.l	2009-04-15 19:10:01.221747499 +0100
-+++ hdf5-1.8.3/hl/src/H5LTanalyze.l	2009-04-16 10:10:56.267887639 +0100
-@@ -181,7 +181,7 @@
-    return ret;
- }
- 
--int H5LTyyerror(char *msg)
-+void H5LTyyerror(char *msg)
- {
-    printf("ERROR: %s before \"%s\".\n", msg, yytext);
- }
-diff -Nur hdf5-1.8.3.orig/hl/src/H5LTparse.c hdf5-1.8.3/hl/src/H5LTparse.c
---- hdf5-1.8.3.orig/hl/src/H5LTparse.c	2009-04-15 19:10:01.221747499 +0100
-+++ hdf5-1.8.3/hl/src/H5LTparse.c	2009-04-16 10:10:56.267887639 +0100
-@@ -64,7 +64,7 @@
- #include<hdf5.h>
- 
- extern int yylex();
--extern int yyerror(char *);
-+extern void yyerror(char *);
- 
- #define STACK_SIZE      16
- 
-diff -Nur hdf5-1.8.3.orig/test/dt_arith.c hdf5-1.8.3/test/dt_arith.c
---- hdf5-1.8.3.orig/test/dt_arith.c	2009-04-15 19:10:01.121739118 +0100
-+++ hdf5-1.8.3/test/dt_arith.c	2009-04-16 10:10:56.271887918 +0100
-@@ -3408,6 +3408,7 @@
-     else if(run_test==TEST_DENORM || run_test==TEST_SPECIAL)
-         return 1;
- #endif
-+    return 1;
- }
- 
- 
-diff -Nur hdf5-1.8.3.orig/tools/h5dump/h5dump.c hdf5-1.8.3/tools/h5dump/h5dump.c
---- hdf5-1.8.3.orig/tools/h5dump/h5dump.c	2009-04-15 19:10:01.141740794 +0100
-+++ hdf5-1.8.3/tools/h5dump/h5dump.c	2009-04-16 10:10:56.275888757 +0100
-@@ -602,6 +602,7 @@
-  *
-  *-------------------------------------------------------------------------
-  */
-+static void leave(int ret) __attribute__ ((__noreturn__));
- static void
- leave(int ret)
- {
-diff -Nur hdf5-1.8.3.orig/tools/h5ls/h5ls.c hdf5-1.8.3/tools/h5ls/h5ls.c
---- hdf5-1.8.3.orig/tools/h5ls/h5ls.c	2009-04-15 19:10:01.165741353 +0100
-+++ hdf5-1.8.3/tools/h5ls/h5ls.c	2009-04-16 10:10:56.279888477 +0100
-@@ -2147,6 +2147,7 @@
-  *
-  *-------------------------------------------------------------------------
-  */
-+static void leave(int ret) __attribute__ ((__noreturn__));
- static void
- leave(int ret)
- {
-diff -Nur hdf5-1.8.3.orig/tools/h5stat/h5stat.c hdf5-1.8.3/tools/h5stat/h5stat.c
---- hdf5-1.8.3.orig/tools/h5stat/h5stat.c	2009-04-15 19:10:01.181742750 +0100
-+++ hdf5-1.8.3/tools/h5stat/h5stat.c	2009-04-16 10:10:56.279888477 +0100
-@@ -181,6 +181,7 @@
-     { NULL, 0, '\0' }
- };
- 
-+static void leave(int ret) __attribute__ ((__noreturn__));
- static void
- leave(int ret)
- {
diff --git a/sci-libs/hdf5/files/hdf5-1.8.4-gnutools.patch b/sci-libs/hdf5/files/hdf5-1.8.4-gnutools.patch
deleted file mode 100644
index 2843afb2cf47..000000000000
--- a/sci-libs/hdf5/files/hdf5-1.8.4-gnutools.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- hdf5-1.8.4.orig/src/Makefile.am	2009-11-10 22:12:02.000000000 +0100
-+++ hdf5-1.8.4/src/Makefile.am	2009-12-03 13:13:36.902083292 +0100
-@@ -26,14 +26,52 @@
- # Use -g to force no optimization since many compilers (e.g., Intel) takes
- # a long time to compile it with any optimization on.  H5detect is used
- # to generate H5Tinit.c once. So, optimization is not critical.
-+# -O0 is required for >= gcc4.3
- noinst_PROGRAMS = H5detect
--H5detect_CFLAGS = -g $(AM_CFLAGS)
-+H5detect_CFLAGS = -g -O0
-+
-+# Automake doesn't have a way to build with no optimization
-+# See http://sources.redhat.com/ml/automake/2002-08/msg00082.html
-+# This is the automake-produced rule with $(CFLAGS) removed
-+H5detect_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CCLD) $(H5detect_CFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
-+
-+H5detect-H5detect.o: H5detect.c
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(H5detect_CFLAGS) -MT H5detect-H5detect.o -MD -MP -MF $(DEPDIR)/H5detect-H5detect.Tpo -c -o H5detect-H5detect.o `test -f 'H5detect.c' || echo '$(srcdir)/'`H5detect.c
-+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/H5detect-H5detect.Tpo $(DEPDIR)/H5detect-H5detect.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='H5detect.c' object='H5detect-H5detect.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(H5detect_CFLAGS) -c -o H5detect-H5detect.o `test -f 'H5detect.c' || echo '$(srcdir)/'`H5detect.c
-+
-+H5detect-H5detect.obj: H5detect.c
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(H5detect_CFLAGS) -MT H5detect-H5detect.obj -MD -MP -MF $(DEPDIR)/H5detect-H5detect.Tpo -c -o H5detect-H5detect.obj `if test -f 'H5detect.c'; then $(CYGPATH_W) 'H5detect.c'; else $(CYGPATH_W) '$(srcdir)/H5detect.c'; fi`
-+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/H5detect-H5detect.Tpo $(DEPDIR)/H5detect-H5detect.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='H5detect.c' object='H5detect-H5detect.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(H5detect_CFLAGS) -c -o H5detect-H5detect.obj `if test -f 'H5detect.c'; then $(CYGPATH_W) 'H5detect.c'; else $(CYGPATH_W) '$(srcdir)/H5detect.c'; fi`
-+
-+noinst_LTLIBRARIES = libH5Tconv.la
-+libH5Tconv_la_SOURCES = H5Tconv.c
-+libH5Tconv_la_CFLAGS =  -g -O0
-+libH5Tconv_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libH5Tconv_la_CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+
-+libH5Tconv_la-H5Tconv.lo: H5Tconv.c
-+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libH5Tconv_la_CFLAGS) -MT libH5Tconv_la-H5Tconv.lo -MD -MP -MF $(DEPDIR)/libH5Tconv_la-H5Tconv.Tpo -c -o libH5Tconv_la-H5Tconv.lo `test -f 'H5Tconv.c' || echo '$(srcdir)/'`H5Tconv.c
-+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libH5Tconv_la-H5Tconv.Tpo $(DEPDIR)/libH5Tconv_la-H5Tconv.Plo
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='H5Tconv.c' object='libH5Tconv_la-H5Tconv.lo' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libH5Tconv_la_CFLAGS) -c -o libH5Tconv_la-H5Tconv.lo `test -f 'H5Tconv.c' || echo '$(srcdir)/'`H5Tconv.c
-+
- 
- # Our main target, the HDF5 library
- lib_LTLIBRARIES=libhdf5.la
- 
- # Add libtool numbers to the HDF5 library (from config/lt_vers.am)
- libhdf5_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
-+libhdf5_la_LIBADD = libH5Tconv.la
- 
- # H5Tinit.c is a generated file, and should be cleaned.
- MOSTLYCLEANFILES=H5Tinit.c
-@@ -89,7 +127,7 @@
-         H5S.c H5Sall.c H5Sdbg.c H5Shyper.c H5Smpio.c H5Snone.c H5Spoint.c \
-         H5Sselect.c H5Stest.c H5SL.c H5SM.c H5SMbtree2.c \
-         H5SMcache.c H5SMtest.c H5ST.c \
--        H5T.c H5Tarray.c H5Tbit.c H5Tcommit.c H5Tcompound.c H5Tconv.c \
-+        H5T.c H5Tarray.c H5Tbit.c H5Tcommit.c H5Tcompound.c \
-         H5Tcset.c H5Tdbg.c H5Tdeprec.c H5Tenum.c H5Tfields.c \
-         H5Tfixed.c \
-         H5Tfloat.c H5Tinit.c H5Tnative.c H5Toffset.c H5Toh.c \
diff --git a/sci-libs/hdf5/files/hdf5-1.8.4-scaleoffset.patch b/sci-libs/hdf5/files/hdf5-1.8.4-scaleoffset.patch
deleted file mode 100644
index be52280d0488..000000000000
--- a/sci-libs/hdf5/files/hdf5-1.8.4-scaleoffset.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- hdf5-1.8.4.orig/test/dsets.c	2009-11-10 22:11:59.000000000 +0100
-+++ hdf5-1.8.4/test/dsets.c	2009-12-03 13:13:42.239327244 +0100
-@@ -7402,10 +7402,14 @@
-         nerrors += (test_nbit_compound_3(file) < 0 		? 1 : 0);
-         nerrors += (test_scaleoffset_int(file) < 0 		? 1 : 0);
-         nerrors += (test_scaleoffset_int_2(file) < 0 	? 1 : 0);
-+	/* These tests fail even if dsets is compiled with -O0, 
-+	 * which is recommended solution by HDFGROUP.
-+	 * Problem exists at least since version 1.4.x and occurs
-+	 * on different compilers and architectures.
-         nerrors += (test_scaleoffset_float(file) < 0 	? 1 : 0);
-         nerrors += (test_scaleoffset_float_2(file) < 0 	? 1 : 0);
-         nerrors += (test_scaleoffset_double(file) < 0 	? 1 : 0);
--        nerrors += (test_scaleoffset_double_2(file) < 0 	? 1 : 0);
-+        nerrors += (test_scaleoffset_double_2(file) < 0 	? 1 : 0); */
-         nerrors += (test_multiopen (file) < 0		? 1 : 0);
-         nerrors += (test_types(file) < 0       		? 1 : 0);
-         nerrors += (test_userblock_offset(envval, my_fapl) < 0     	? 1 : 0);
diff --git a/sci-libs/hdf5/files/hdf5-1.8.4-sigbus.patch b/sci-libs/hdf5/files/hdf5-1.8.4-sigbus.patch
deleted file mode 100644
index 8efa69b8881b..000000000000
--- a/sci-libs/hdf5/files/hdf5-1.8.4-sigbus.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: hdf5-1.8.4/src/H5detect.c
-===================================================================
---- hdf5-1.8.4.orig/src/H5detect.c	2010-01-29 12:21:36.000000000 +0100
-+++ hdf5-1.8.4/src/H5detect.c	2010-01-29 12:21:52.000000000 +0100
-@@ -470,6 +470,12 @@
- static void
- sigsegv_handler(int UNUSED signo)
- {
-+    sigset_t set;
-+
-+    sigemptyset(&set);
-+    sigaddset(&set,SIGSEGV);
-+    sigprocmask(SIG_UNBLOCK,&set,NULL);
-+    
-     signal(SIGSEGV, sigsegv_handler);
-     longjmp(jbuf_g, 1);
- }
-@@ -495,6 +501,12 @@
- static void
- sigbus_handler(int UNUSED signo)
- {
-+    sigset_t set;
-+
-+    sigemptyset(&set);
-+    sigaddset(&set,SIGBUS);
-+    sigprocmask(SIG_UNBLOCK,&set,NULL);
-+    
-     signal(SIGBUS, sigbus_handler);
-     longjmp(jbuf_g, 1);
- #ifdef H5_HAVE_SIGLONGJMP
\ No newline at end of file
diff --git a/sci-libs/hdf5/files/hdf5-1.8.5-implicits.patch b/sci-libs/hdf5/files/hdf5-1.8.5-implicits.patch
deleted file mode 100644
index 89a9998a7ee0..000000000000
--- a/sci-libs/hdf5/files/hdf5-1.8.5-implicits.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Fix implicit function declarations
-
---- hdf5-1.8.5-patch1/tools/misc/talign.c
-+++ hdf5-1.8.5-patch1/tools/misc/talign.c
-@@ -23,6 +23,7 @@
- 
- #include "hdf5.h"
- #include "H5private.h"
-+#include "h5tools.h"
- 
- const char *fname = "talign.h5";
- const char *setname = "align";
---- hdf5-1.8.5-patch1/tools/lib/h5tools_utils.c
-+++ hdf5-1.8.5-patch1/tools/lib/h5tools_utils.c
-@@ -31,6 +31,7 @@
- #include "h5tools_utils.h"
- #include "H5private.h"
- #include "h5trav.h"
-+#include "h5diff.h"
- 
- /* global variables */
- int   nCols = 80;
---- hdf5-1.8.5-patch1/src/H5E.c
-+++ hdf5-1.8.5-patch1/src/H5E.c
-@@ -54,6 +54,8 @@
- /***********/
- /* Headers */
- /***********/
-+#define _GNU_SOURCE
-+#include <stdio.h>
- #include "H5private.h"		/* Generic Functions			*/
- #include "H5Iprivate.h"		/* IDs                                  */
- #include "H5Epkg.h"		/* Error handling		  	*/
---- hdf5-1.8.5-patch1/src/H5Eint.c
-+++ hdf5-1.8.5-patch1/src/H5Eint.c
-@@ -37,6 +37,8 @@
- /***********/
- /* Headers */
- /***********/
-+#define _GNU_SOURCE
-+#include <stdio.h>
- #include "H5private.h"		/* Generic Functions			*/
- #include "H5Epkg.h"		/* Error handling		  	*/
- #include "H5Iprivate.h"		/* IDs                                  */
---- hdf5-1.8.5-patch1/tools/h5copy/h5copygentest.c
-+++ hdf5-1.8.5-patch1/tools/h5copy/h5copygentest.c
-@@ -20,6 +20,7 @@
- #include "hdf5.h"
- #include "H5private.h"
- #include "h5tools.h"
-+#include "h5tools_utils.h"
- 
- /* Name of tool */
- #define PROGRAMNAME "h5copygentest"
---- hdf5-1.8.5-patch1/tools/h5repack/testh5repack_detect_szip.c
-+++ hdf5-1.8.5-patch1/tools/h5repack/testh5repack_detect_szip.c
-@@ -17,7 +17,7 @@
- #include "h5repack.h"
- #include "h5tools.h"
- #include "h5test.h"
--
-+#include "h5tools_utils.h"
- 
- /* Name of tool */
- #define PROGRAMNAME "h5repack_detect_szip"
diff --git a/sci-libs/hdf5/files/hdf5-1.8.5-noreturn.patch b/sci-libs/hdf5/files/hdf5-1.8.5-noreturn.patch
deleted file mode 100644
index 40065f7b83fe..000000000000
--- a/sci-libs/hdf5/files/hdf5-1.8.5-noreturn.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- hl/src/H5LTanalyze.c
-+++ hl/src/H5LTanalyze.c
-@@ -2329,7 +2329,7 @@
-    return ret;
- }
- 
--int H5LTyyerror(char *msg)
-+void H5LTyyerror(char *msg)
- {
-    printf("ERROR: %s before \"%s\".\n", msg, yytext);
- }
---- hl/src/H5LTanalyze.l
-+++ hl/src/H5LTanalyze.l
-@@ -181,7 +181,7 @@
-    return ret;
- }
- 
--int H5LTyyerror(char *msg)
-+void H5LTyyerror(char *msg)
- {
-    printf("ERROR: %s before \"%s\".\n", msg, yytext);
- }
---- hl/src/H5LTparse.c
-+++ hl/src/H5LTparse.c
-@@ -64,7 +64,7 @@
- #include<hdf5.h>
- 
- extern int yylex();
--extern int yyerror(char *);
-+extern void yyerror(char *);
- 
- #define STACK_SIZE      16
- 
---- test/dt_arith.c
-+++ test/dt_arith.c
-@@ -3408,6 +3408,7 @@
-     else if(run_test==TEST_DENORM || run_test==TEST_SPECIAL)
-         return 1;
- #endif
-+    return 1;
- }
- 
- 
---- tools/h5dump/h5dump.c
-+++ tools/h5dump/h5dump.c
-@@ -602,6 +602,7 @@
-  *
-  *-------------------------------------------------------------------------
-  */
-+static void leave(int ret) __attribute__ ((__noreturn__));
- static void
- leave(int ret)
- {
---- tools/h5ls/h5ls.c
-+++ tools/h5ls/h5ls.c
-@@ -2147,6 +2147,7 @@
-  *
-  *-------------------------------------------------------------------------
-  */
-+static void leave(int ret) __attribute__ ((__noreturn__));
- static void
- leave(int ret)
- {
---- tools/h5stat/h5stat.c
-+++ tools/h5stat/h5stat.c
-@@ -181,6 +181,7 @@
-     { NULL, 0, '\0' }
- };
- 
-+static void leave(int ret) __attribute__ ((__noreturn__));
- static void
- leave(int ret)
- {
diff --git a/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild b/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild
deleted file mode 100644
index b6b1b9fa50cc..000000000000
--- a/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild,v 1.18 2011/07/06 15:00:48 xarthisius Exp $
-
-EAPI=3
-
-inherit autotools eutils fortran-2
-
-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/prev-releases/${P}/src/${P}.tar.gz"
-
-LICENSE="NCSA-HDF"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="cxx examples fortran mpi szip threads zlib"
-
-RDEPEND="
-	fortran? ( virtual/fortran )
-	mpi? ( || (
-			sys-cluster/openmpi[romio]
-			sys-cluster/mpich2[romio] ) )
-	szip? ( >=sci-libs/szip-2.1 )
-	zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
-	sys-devel/libtool:2
-	sys-process/time"
-
-pkg_setup() {
-	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
-		if use cxx; then
-			ewarn "Simultaneous mpi and cxx is not supported by ${PN}"
-			ewarn "Will disable cxx interface"
-		fi
-		export CC=mpicc
-		if use fortran; then
-			export FC=mpif90
-		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() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.8.3-as-needed.patch \
-		"${FILESDIR}"/${PN}-1.8.3-includes.patch \
-		"${FILESDIR}"/${PN}-1.8.3-noreturn.patch \
-		"${FILESDIR}"/${P}-gnutools.patch \
-		"${FILESDIR}"/${P}-scaleoffset.patch \
-		"${FILESDIR}"/${P}-sigbus.patch
-
-	# respect gentoo examples directory
-	sed \
-		-e 's:$(docdir)/hdf5:$(DESTDIR)/$(docdir):' \
-		-i $(find . -name Makefile.am) || die
-	sed \
-		-e '/docdir/d' \
-		-i config/commence.am || die
-	eautoreconf
-	# enable shared libs by default for h5cc config utility
-	sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" tools/misc/h5cc.in \
-		|| die "sed h5cc.in failed"
-}
-
-src_configure() {
-	# threadsafe incompatible with many options
-	local myconf="--disable-threadsafe"
-	use threads && ! use fortran && ! use cxx && ! use mpi \
-		&& myconf="--enable-threadsafe"
-
-	if use mpi; then
-		myconf="${myconf} --disable-cxx"
-	else
-	# workaround for bug 285148
-		if use cxx; then
-			myconf="${myconf} $(use_enable cxx) CXX=$(tc-getCXX)"
-		fi
-		if use fortran; then
-			myconf="${myconf} FC=$(tc-getFC)"
-		fi
-	fi
-
-	econf \
-		--disable-sharedlib-rpath \
-		--enable-production \
-		--enable-strict-format-checks \
-		--docdir=/usr/share/doc/${PF} \
-		--enable-deprecated-symbols \
-		--enable-shared \
-		$(use_enable fortran) \
-		$(use_enable mpi parallel) \
-		$(use_with szip szlib) \
-		$(use_with threads pthread) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README.txt
-	if use examples; then
-		emake DESTDIR="${D}" install-examples \
-			|| die "emake install examples failed"
-	fi
-}