Gentoo Archives: gentoo-commits

From: Kacper Kowalik <xarthisius@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/hdf5/files/, sci-libs/hdf5/
Date: Thu, 17 Nov 2011 13:47:28
Message-Id: 4b593053b1e496b4a4b29235285db701ac8bdead.xarthisius@gentoo
1 commit: 4b593053b1e496b4a4b29235285db701ac8bdead
2 Author: Kacper Kowalik (Xarthisius) <xarthisius.kk <AT> gmail <DOT> com>
3 AuthorDate: Thu Nov 17 13:47:02 2011 +0000
4 Commit: Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 17 13:47:02 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4b593053
7
8 [sci-libs/hdf5] drop old
9
10 ---
11 sci-libs/hdf5/ChangeLog | 16 ---
12 sci-libs/hdf5/files/hdf5-1.8.3-as-needed.patch | 41 --------
13 sci-libs/hdf5/files/hdf5-1.8.3-includes.patch | 11 --
14 sci-libs/hdf5/files/hdf5-1.8.3-noreturn.patch | 92 -----------------
15 sci-libs/hdf5/files/hdf5-1.8.4-gnutools.patch | 65 ------------
16 sci-libs/hdf5/files/hdf5-1.8.4-scaleoffset.patch | 18 ----
17 sci-libs/hdf5/hdf5-1.8.4-r2.ebuild | 117 ----------------------
18 sci-libs/hdf5/metadata.xml | 11 --
19 8 files changed, 0 insertions(+), 371 deletions(-)
20
21 diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
22 deleted file mode 100644
23 index 0c0ffd4..0000000
24 --- a/sci-libs/hdf5/ChangeLog
25 +++ /dev/null
26 @@ -1,16 +0,0 @@
27 -# ChangeLog for sci-libs/hdf5
28 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: $
30 -
31 - 24 Jun 2011; Justin Lecher <jlec@g.o> hdf5-1.8.4-r2.ebuild:
32 - Streamlined fortran-2 eclass usage
33 -
34 - 21 Jun 2011; Justin Lecher <jlec@g.o> hdf5-1.8.4-r2.ebuild:
35 - Added fortran-2.eclass support
36 -
37 -*hdf5-1.8.4-r2 (19 Jan 2010)
38 -
39 - 19 Jan 2010; Justin Bronder <jsbronder@g.o> -hdf5-1.8.4-r1.ebuild,
40 - +hdf5-1.8.4-r2.ebuild:
41 - revbump to avoid conflicts with portage tree.
42 -
43
44 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
45 deleted file mode 100644
46 index 677264b..0000000
47 --- a/sci-libs/hdf5/files/hdf5-1.8.3-as-needed.patch
48 +++ /dev/null
49 @@ -1,41 +0,0 @@
50 ---- hdf5-1.8.3.orig/fortran/src/Makefile.am 2009-04-15 19:10:01.053733251 +0100
51 -+++ hdf5-1.8.3/fortran/src/Makefile.am 2009-04-15 19:12:49.874557795 +0100
52 -@@ -66,6 +66,8 @@
53 - H5If.c H5Lf.c H5Of.c H5Pf.c H5Rf.c H5Sf.c H5Tf.c H5Zf.c \
54 - $(PARALLEL_COND_SRC)
55 -
56 -+libhdf5_fortran_la_LIBADD = $(top_builddir)/src/libhdf5.la
57 -+
58 - # h5fc is generated during configure.
59 - # Remove it only when distclean.
60 - DISTCLEANFILES=h5fc
61 ---- hdf5-1.8.3.orig/hl/fortran/src/Makefile.am 2009-04-15 19:10:01.245748616 +0100
62 -+++ hdf5-1.8.3/hl/fortran/src/Makefile.am 2009-04-15 19:30:56.042226227 +0100
63 -@@ -43,6 +43,7 @@
64 -
65 - libhdf5hl_fortran_la_SOURCES=H5LTfc.c H5IMfc.c H5IMcc.c H5TBfc.c H5LTff.f90 \
66 - H5IMff.f90 H5TBff.f90
67 -+libhdf5hl_fortran_la_LIBADD=$(top_builddir)/hl/src/libhdf5_hl.la
68 -
69 - # Fortran module files can have different extensions and different names
70 - # (e.g., different capitalizations) on different platforms. Write rules
71 ---- hdf5-1.8.3.orig/hl/c++/src/Makefile.am 2009-04-15 19:10:01.249750013 +0100
72 -+++ hdf5-1.8.3/hl/c++/src/Makefile.am 2009-04-15 20:16:08.812068687 +0100
73 -@@ -35,6 +35,7 @@
74 - # Source files for the library
75 - # At the moment, only the H5PT Packet Table has a C++ API.
76 - libhdf5_hl_cpp_la_SOURCES=H5PacketTable.cpp
77 -+libhdf5_hl_cpp_la_LIBADD=$(top_builddir)/hl/src/libhdf5_hl.la
78 -
79 - # Public headers
80 - include_HEADERS=H5PacketTable.h
81 ---- hdf5-1.8.3.orig/hl/src/Makefile.am 2009-05-13 17:03:11.000000000 +0200
82 -+++ hdf5-1.8.3/hl/src/Makefile.am 2009-09-10 19:22:57.489698969 +0200
83 -@@ -31,6 +31,7 @@
84 - libhdf5_hl_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE)
85 -
86 - libhdf5_hl_la_SOURCES=H5DS.c H5IM.c H5LT.c H5LTanalyze.c H5LTparse.c H5PT.c H5TB.c
87 -+libhdf5_hl_la_LIBADD=$(top_builddir)/src/libhdf5.la
88 -
89 - # Public header files (to be installed)
90 - include_HEADERS=hdf5_hl.h H5IMpublic.h H5LTpublic.h H5TBpublic.h H5DSpublic.h H5PTpublic.h
91
92 diff --git a/sci-libs/hdf5/files/hdf5-1.8.3-includes.patch b/sci-libs/hdf5/files/hdf5-1.8.3-includes.patch
93 deleted file mode 100644
94 index 5e87f6c..0000000
95 --- a/sci-libs/hdf5/files/hdf5-1.8.3-includes.patch
96 +++ /dev/null
97 @@ -1,11 +0,0 @@
98 ---- hdf5-1.8.3.orig/src/H5E.c 2009-04-15 19:10:01.081735486 +0100
99 -+++ hdf5-1.8.3/src/H5E.c 2009-04-15 20:02:06.708712912 +0100
100 -@@ -54,6 +54,8 @@
101 - /***********/
102 - /* Headers */
103 - /***********/
104 -+#define _GNU_SOURCE
105 -+#include <stdio.h>
106 - #include "H5private.h" /* Generic Functions */
107 - #include "H5Iprivate.h" /* IDs */
108 - #include "H5Epkg.h" /* Error handling */
109
110 diff --git a/sci-libs/hdf5/files/hdf5-1.8.3-noreturn.patch b/sci-libs/hdf5/files/hdf5-1.8.3-noreturn.patch
111 deleted file mode 100644
112 index 27b6f9b..0000000
113 --- a/sci-libs/hdf5/files/hdf5-1.8.3-noreturn.patch
114 +++ /dev/null
115 @@ -1,92 +0,0 @@
116 -diff -Nur hdf5-1.8.3.orig/c++/src/H5AbstractDs.cpp hdf5-1.8.3/c++/src/H5AbstractDs.cpp
117 ---- hdf5-1.8.3.orig/c++/src/H5AbstractDs.cpp 2009-04-15 19:10:01.061734089 +0100
118 -+++ hdf5-1.8.3/c++/src/H5AbstractDs.cpp 2009-04-16 10:10:56.263885963 +0100
119 -@@ -85,6 +85,8 @@
120 - else if (fromClass() == "Attribute")
121 - throw DataTypeIException("Attribute::getTypeClass", "H5Tget_class returns H5T_NO_CLASS");
122 - }
123 -+
124 -+ return (type_class);
125 - }
126 -
127 - //--------------------------------------------------------------------------
128 -diff -Nur hdf5-1.8.3.orig/hl/src/H5LTanalyze.c hdf5-1.8.3/hl/src/H5LTanalyze.c
129 ---- hdf5-1.8.3.orig/hl/src/H5LTanalyze.c 2009-04-15 19:10:01.221747499 +0100
130 -+++ hdf5-1.8.3/hl/src/H5LTanalyze.c 2009-04-16 10:10:56.267887639 +0100
131 -@@ -2329,7 +2329,7 @@
132 - return ret;
133 - }
134 -
135 --int H5LTyyerror(char *msg)
136 -+void H5LTyyerror(char *msg)
137 - {
138 - printf("ERROR: %s before \"%s\".\n", msg, yytext);
139 - }
140 -diff -Nur hdf5-1.8.3.orig/hl/src/H5LTanalyze.l hdf5-1.8.3/hl/src/H5LTanalyze.l
141 ---- hdf5-1.8.3.orig/hl/src/H5LTanalyze.l 2009-04-15 19:10:01.221747499 +0100
142 -+++ hdf5-1.8.3/hl/src/H5LTanalyze.l 2009-04-16 10:10:56.267887639 +0100
143 -@@ -181,7 +181,7 @@
144 - return ret;
145 - }
146 -
147 --int H5LTyyerror(char *msg)
148 -+void H5LTyyerror(char *msg)
149 - {
150 - printf("ERROR: %s before \"%s\".\n", msg, yytext);
151 - }
152 -diff -Nur hdf5-1.8.3.orig/hl/src/H5LTparse.c hdf5-1.8.3/hl/src/H5LTparse.c
153 ---- hdf5-1.8.3.orig/hl/src/H5LTparse.c 2009-04-15 19:10:01.221747499 +0100
154 -+++ hdf5-1.8.3/hl/src/H5LTparse.c 2009-04-16 10:10:56.267887639 +0100
155 -@@ -64,7 +64,7 @@
156 - #include<hdf5.h>
157 -
158 - extern int yylex();
159 --extern int yyerror(char *);
160 -+extern void yyerror(char *);
161 -
162 - #define STACK_SIZE 16
163 -
164 -diff -Nur hdf5-1.8.3.orig/test/dt_arith.c hdf5-1.8.3/test/dt_arith.c
165 ---- hdf5-1.8.3.orig/test/dt_arith.c 2009-04-15 19:10:01.121739118 +0100
166 -+++ hdf5-1.8.3/test/dt_arith.c 2009-04-16 10:10:56.271887918 +0100
167 -@@ -3408,6 +3408,7 @@
168 - else if(run_test==TEST_DENORM || run_test==TEST_SPECIAL)
169 - return 1;
170 - #endif
171 -+ return 1;
172 - }
173 -
174 -
175 -diff -Nur hdf5-1.8.3.orig/tools/h5dump/h5dump.c hdf5-1.8.3/tools/h5dump/h5dump.c
176 ---- hdf5-1.8.3.orig/tools/h5dump/h5dump.c 2009-04-15 19:10:01.141740794 +0100
177 -+++ hdf5-1.8.3/tools/h5dump/h5dump.c 2009-04-16 10:10:56.275888757 +0100
178 -@@ -602,6 +602,7 @@
179 - *
180 - *-------------------------------------------------------------------------
181 - */
182 -+static void leave(int ret) __attribute__ ((__noreturn__));
183 - static void
184 - leave(int ret)
185 - {
186 -diff -Nur hdf5-1.8.3.orig/tools/h5ls/h5ls.c hdf5-1.8.3/tools/h5ls/h5ls.c
187 ---- hdf5-1.8.3.orig/tools/h5ls/h5ls.c 2009-04-15 19:10:01.165741353 +0100
188 -+++ hdf5-1.8.3/tools/h5ls/h5ls.c 2009-04-16 10:10:56.279888477 +0100
189 -@@ -2147,6 +2147,7 @@
190 - *
191 - *-------------------------------------------------------------------------
192 - */
193 -+static void leave(int ret) __attribute__ ((__noreturn__));
194 - static void
195 - leave(int ret)
196 - {
197 -diff -Nur hdf5-1.8.3.orig/tools/h5stat/h5stat.c hdf5-1.8.3/tools/h5stat/h5stat.c
198 ---- hdf5-1.8.3.orig/tools/h5stat/h5stat.c 2009-04-15 19:10:01.181742750 +0100
199 -+++ hdf5-1.8.3/tools/h5stat/h5stat.c 2009-04-16 10:10:56.279888477 +0100
200 -@@ -181,6 +181,7 @@
201 - { NULL, 0, '\0' }
202 - };
203 -
204 -+static void leave(int ret) __attribute__ ((__noreturn__));
205 - static void
206 - leave(int ret)
207 - {
208
209 diff --git a/sci-libs/hdf5/files/hdf5-1.8.4-gnutools.patch b/sci-libs/hdf5/files/hdf5-1.8.4-gnutools.patch
210 deleted file mode 100644
211 index 2843afb..0000000
212 --- a/sci-libs/hdf5/files/hdf5-1.8.4-gnutools.patch
213 +++ /dev/null
214 @@ -1,65 +0,0 @@
215 ---- hdf5-1.8.4.orig/src/Makefile.am 2009-11-10 22:12:02.000000000 +0100
216 -+++ hdf5-1.8.4/src/Makefile.am 2009-12-03 13:13:36.902083292 +0100
217 -@@ -26,14 +26,52 @@
218 - # Use -g to force no optimization since many compilers (e.g., Intel) takes
219 - # a long time to compile it with any optimization on. H5detect is used
220 - # to generate H5Tinit.c once. So, optimization is not critical.
221 -+# -O0 is required for >= gcc4.3
222 - noinst_PROGRAMS = H5detect
223 --H5detect_CFLAGS = -g $(AM_CFLAGS)
224 -+H5detect_CFLAGS = -g -O0
225 -+
226 -+# Automake doesn't have a way to build with no optimization
227 -+# See http://sources.redhat.com/ml/automake/2002-08/msg00082.html
228 -+# This is the automake-produced rule with $(CFLAGS) removed
229 -+H5detect_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
230 -+ --mode=link $(CCLD) $(H5detect_CFLAGS) $(AM_LDFLAGS) \
231 -+ $(LDFLAGS) -o $@
232 -+
233 -+H5detect-H5detect.o: H5detect.c
234 -+@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
235 -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/H5detect-H5detect.Tpo $(DEPDIR)/H5detect-H5detect.Po
236 -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='H5detect.c' object='H5detect-H5detect.o' libtool=no @AMDEPBACKSLASH@
237 -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
238 -+@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
239 -+
240 -+H5detect-H5detect.obj: H5detect.c
241 -+@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`
242 -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/H5detect-H5detect.Tpo $(DEPDIR)/H5detect-H5detect.Po
243 -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='H5detect.c' object='H5detect-H5detect.obj' libtool=no @AMDEPBACKSLASH@
244 -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
245 -+@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`
246 -+
247 -+noinst_LTLIBRARIES = libH5Tconv.la
248 -+libH5Tconv_la_SOURCES = H5Tconv.c
249 -+libH5Tconv_la_CFLAGS = -g -O0
250 -+libH5Tconv_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
251 -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libH5Tconv_la_CFLAGS) \
252 -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
253 -+
254 -+libH5Tconv_la-H5Tconv.lo: H5Tconv.c
255 -+@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
256 -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libH5Tconv_la-H5Tconv.Tpo $(DEPDIR)/libH5Tconv_la-H5Tconv.Plo
257 -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='H5Tconv.c' object='libH5Tconv_la-H5Tconv.lo' libtool=yes @AMDEPBACKSLASH@
258 -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
259 -+@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
260 -+
261 -
262 - # Our main target, the HDF5 library
263 - lib_LTLIBRARIES=libhdf5.la
264 -
265 - # Add libtool numbers to the HDF5 library (from config/lt_vers.am)
266 - libhdf5_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
267 -+libhdf5_la_LIBADD = libH5Tconv.la
268 -
269 - # H5Tinit.c is a generated file, and should be cleaned.
270 - MOSTLYCLEANFILES=H5Tinit.c
271 -@@ -89,7 +127,7 @@
272 - H5S.c H5Sall.c H5Sdbg.c H5Shyper.c H5Smpio.c H5Snone.c H5Spoint.c \
273 - H5Sselect.c H5Stest.c H5SL.c H5SM.c H5SMbtree2.c \
274 - H5SMcache.c H5SMtest.c H5ST.c \
275 -- H5T.c H5Tarray.c H5Tbit.c H5Tcommit.c H5Tcompound.c H5Tconv.c \
276 -+ H5T.c H5Tarray.c H5Tbit.c H5Tcommit.c H5Tcompound.c \
277 - H5Tcset.c H5Tdbg.c H5Tdeprec.c H5Tenum.c H5Tfields.c \
278 - H5Tfixed.c \
279 - H5Tfloat.c H5Tinit.c H5Tnative.c H5Toffset.c H5Toh.c \
280
281 diff --git a/sci-libs/hdf5/files/hdf5-1.8.4-scaleoffset.patch b/sci-libs/hdf5/files/hdf5-1.8.4-scaleoffset.patch
282 deleted file mode 100644
283 index be52280..0000000
284 --- a/sci-libs/hdf5/files/hdf5-1.8.4-scaleoffset.patch
285 +++ /dev/null
286 @@ -1,18 +0,0 @@
287 ---- hdf5-1.8.4.orig/test/dsets.c 2009-11-10 22:11:59.000000000 +0100
288 -+++ hdf5-1.8.4/test/dsets.c 2009-12-03 13:13:42.239327244 +0100
289 -@@ -7402,10 +7402,14 @@
290 - nerrors += (test_nbit_compound_3(file) < 0 ? 1 : 0);
291 - nerrors += (test_scaleoffset_int(file) < 0 ? 1 : 0);
292 - nerrors += (test_scaleoffset_int_2(file) < 0 ? 1 : 0);
293 -+ /* These tests fail even if dsets is compiled with -O0,
294 -+ * which is recommended solution by HDFGROUP.
295 -+ * Problem exists at least since version 1.4.x and occurs
296 -+ * on different compilers and architectures.
297 - nerrors += (test_scaleoffset_float(file) < 0 ? 1 : 0);
298 - nerrors += (test_scaleoffset_float_2(file) < 0 ? 1 : 0);
299 - nerrors += (test_scaleoffset_double(file) < 0 ? 1 : 0);
300 -- nerrors += (test_scaleoffset_double_2(file) < 0 ? 1 : 0);
301 -+ nerrors += (test_scaleoffset_double_2(file) < 0 ? 1 : 0); */
302 - nerrors += (test_multiopen (file) < 0 ? 1 : 0);
303 - nerrors += (test_types(file) < 0 ? 1 : 0);
304 - nerrors += (test_userblock_offset(envval, my_fapl) < 0 ? 1 : 0);
305
306 diff --git a/sci-libs/hdf5/hdf5-1.8.4-r2.ebuild b/sci-libs/hdf5/hdf5-1.8.4-r2.ebuild
307 deleted file mode 100644
308 index 71fc58e..0000000
309 --- a/sci-libs/hdf5/hdf5-1.8.4-r2.ebuild
310 +++ /dev/null
311 @@ -1,117 +0,0 @@
312 -# Copyright 1999-2011 Gentoo Foundation
313 -# Distributed under the terms of the GNU General Public License v2
314 -# $Header: $
315 -
316 -EAPI=3
317 -
318 -MPI_PKG_USE_ROMIO=1
319 -
320 -inherit autotools eutils fortran-2 mpi
321 -
322 -DESCRIPTION="General purpose library and file format for storing scientific data"
323 -HOMEPAGE="http://www.hdfgroup.org/HDF5/"
324 -SRC_URI="http://www.hdfgroup.org/ftp/HDF5/current/src/${P}.tar.gz"
325 -
326 -LICENSE="NCSA-HDF"
327 -SLOT="0"
328 -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
329 -
330 -IUSE="cxx examples fortran mpi szip threads zlib"
331 -
332 -RDEPEND="
333 - fortran? ( virtual/fortran )
334 - mpi? ( $(mpi_pkg_deplist) )
335 - szip? ( >=sci-libs/szip-2.1 )
336 - zlib? ( sys-libs/zlib )"
337 -
338 -DEPEND="${RDEPEND}
339 - sys-devel/libtool:2
340 - sys-process/time"
341 -
342 -pkg_setup() {
343 - fortran && fortran-2_pkg_setup
344 - if use mpi; then
345 - if use cxx; then
346 - ewarn "Simultaneous mpi and cxx is not supported by ${PN}"
347 - ewarn "Will disable cxx interface"
348 - fi
349 - export CC=$(mpi_pkg_cc)
350 - if use fortran; then
351 - export FC=$(mpi_pkg_fc)
352 - fi
353 - fi
354 -}
355 -
356 -src_prepare() {
357 - epatch \
358 - "${FILESDIR}"/${PN}-1.8.3-as-needed.patch \
359 - "${FILESDIR}"/${PN}-1.8.3-includes.patch \
360 - "${FILESDIR}"/${PN}-1.8.3-noreturn.patch \
361 - "${FILESDIR}"/${P}-gnutools.patch \
362 - "${FILESDIR}"/${P}-scaleoffset.patch
363 -
364 - # respect gentoo examples directory
365 - sed \
366 - -e 's:$(docdir)/hdf5:$(DESTDIR)/$(docdir):' \
367 - -i $(find . -name Makefile.am) || die
368 - sed \
369 - -e '/docdir/d' \
370 - -i config/commence.am || die
371 - eautoreconf
372 - # enable shared libs by default for h5cc config utility
373 - sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" tools/misc/h5cc.in \
374 - || die "sed h5cc.in failed"
375 -}
376 -
377 -src_configure() {
378 - # threadsafe incompatible with many options
379 - local myconf="--disable-threadsafe"
380 - use threads && ! use fortran && ! use cxx && ! use mpi \
381 - && myconf="--enable-threadsafe"
382 -
383 - if use mpi; then
384 - myconf="${myconf} --disable-cxx"
385 - else
386 - # workaround for bug 285148
387 - if use cxx; then
388 - myconf="${myconf} $(use_enable cxx) CXX=$(tc-getCXX)"
389 - fi
390 - if use fortran; then
391 - myconf="${myconf} FC=$(tc-getFC)"
392 - fi
393 - fi
394 -
395 - mpi_pkg_set_ld_library_path
396 - econf $(mpi_econf_args) \
397 - --disable-sharedlib-rpath \
398 - --enable-production \
399 - --enable-strict-format-checks \
400 - --docdir=/usr/share/doc/${PF} \
401 - --enable-deprecated-symbols \
402 - --enable-shared \
403 - $(use_enable fortran) \
404 - $(use_enable mpi parallel) \
405 - $(use_with szip szlib) \
406 - $(use_with threads pthread) \
407 - $(use_with zlib) \
408 - ${myconf}
409 -}
410 -
411 -src_compile() {
412 - mpi_pkg_set_ld_library_path
413 - emake || die
414 -}
415 -
416 -src_install() {
417 - emake DESTDIR="${D}" install || die "emake install failed"
418 - mpi_dodoc README.txt
419 - if use examples; then
420 - emake DESTDIR="${D}" install-examples \
421 - || die "emake install examples failed"
422 - fi
423 -}
424 -
425 -src_test() {
426 - mpi_pkg_set_ld_library_path
427 - emake check || die
428 -}
429
430 diff --git a/sci-libs/hdf5/metadata.xml b/sci-libs/hdf5/metadata.xml
431 deleted file mode 100644
432 index dbff4da..0000000
433 --- a/sci-libs/hdf5/metadata.xml
434 +++ /dev/null
435 @@ -1,11 +0,0 @@
436 -<?xml version="1.0" encoding="UTF-8"?>
437 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
438 -<pkgmetadata>
439 -<herd>sci</herd>
440 -<longdescription>
441 - HDF5 is a file format and library for storing scientific data. HDF5
442 - was designed and implemented to address the deficiencies of HDF4.x. It
443 - has a more powerful and flexible data model, supports files larger
444 - than 2 GB, and supports parallel I/O.
445 -</longdescription>
446 -</pkgmetadata>