1 |
nerdboy 08/02/04 07:58:32 |
2 |
|
3 |
Modified: hdf5-1.6.2.ebuild ChangeLog hdf5-1.6.6.ebuild |
4 |
hdf5-1.6.4.ebuild hdf5-1.6.5-r1.ebuild |
5 |
hdf5-1.6.5.ebuild |
6 |
Log: |
7 |
fixed QA issues and added additional tools via use flag |
8 |
(Portage version: 2.1.4.1) |
9 |
|
10 |
Revision Changes Path |
11 |
1.7 sci-libs/hdf5/hdf5-1.6.2.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/hdf5/hdf5-1.6.2.ebuild?rev=1.7&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/hdf5/hdf5-1.6.2.ebuild?rev=1.7&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/hdf5/hdf5-1.6.2.ebuild?r1=1.6&r2=1.7 |
16 |
|
17 |
Index: hdf5-1.6.2.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.2.ebuild,v |
20 |
retrieving revision 1.6 |
21 |
retrieving revision 1.7 |
22 |
diff -u -r1.6 -r1.7 |
23 |
--- hdf5-1.6.2.ebuild 3 Dec 2007 07:21:53 -0000 1.6 |
24 |
+++ hdf5-1.6.2.ebuild 4 Feb 2008 07:58:32 -0000 1.7 |
25 |
@@ -1,6 +1,6 @@ |
26 |
-# Copyright 1999-2007 Gentoo Foundation |
27 |
+# Copyright 1999-2008 Gentoo Foundation |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.2.ebuild,v 1.6 2007/12/03 07:21:53 nerdboy Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.2.ebuild,v 1.7 2008/02/04 07:58:32 nerdboy Exp $ |
31 |
|
32 |
inherit eutils |
33 |
|
34 |
|
35 |
|
36 |
|
37 |
1.22 sci-libs/hdf5/ChangeLog |
38 |
|
39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/hdf5/ChangeLog?rev=1.22&view=markup |
40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/hdf5/ChangeLog?rev=1.22&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/hdf5/ChangeLog?r1=1.21&r2=1.22 |
42 |
|
43 |
Index: ChangeLog |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v |
46 |
retrieving revision 1.21 |
47 |
retrieving revision 1.22 |
48 |
diff -u -r1.21 -r1.22 |
49 |
--- ChangeLog 6 Dec 2007 15:11:01 -0000 1.21 |
50 |
+++ ChangeLog 4 Feb 2008 07:58:32 -0000 1.22 |
51 |
@@ -1,6 +1,9 @@ |
52 |
# ChangeLog for sci-libs/hdf5 |
53 |
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.21 2007/12/06 15:11:01 markusle Exp $ |
55 |
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
56 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.22 2008/02/04 07:58:32 nerdboy Exp $ |
57 |
+ |
58 |
+ 04 Feb 2008; Steve Arnold <nerdboy@g.o> hdf5-1.6.6.ebuild: |
59 |
+ fixed QA issues and added additional tools via use flag |
60 |
|
61 |
06 Dec 2007; Markus Dittrich <markusle@g.o> hdf5-1.6.6.ebuild: |
62 |
Fixed misplaced quotation mark (fixes bug #201479). |
63 |
|
64 |
|
65 |
|
66 |
1.4 sci-libs/hdf5/hdf5-1.6.6.ebuild |
67 |
|
68 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/hdf5/hdf5-1.6.6.ebuild?rev=1.4&view=markup |
69 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/hdf5/hdf5-1.6.6.ebuild?rev=1.4&content-type=text/plain |
70 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/hdf5/hdf5-1.6.6.ebuild?r1=1.3&r2=1.4 |
71 |
|
72 |
Index: hdf5-1.6.6.ebuild |
73 |
=================================================================== |
74 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.6.ebuild,v |
75 |
retrieving revision 1.3 |
76 |
retrieving revision 1.4 |
77 |
diff -u -r1.3 -r1.4 |
78 |
--- hdf5-1.6.6.ebuild 6 Dec 2007 15:11:01 -0000 1.3 |
79 |
+++ hdf5-1.6.6.ebuild 4 Feb 2008 07:58:32 -0000 1.4 |
80 |
@@ -1,8 +1,8 @@ |
81 |
-# Copyright 1999-2007 Gentoo Foundation |
82 |
+# Copyright 1999-2008 Gentoo Foundation |
83 |
# Distributed under the terms of the GNU General Public License v2 |
84 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.6.ebuild,v 1.3 2007/12/06 15:11:01 markusle Exp $ |
85 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.6.ebuild,v 1.4 2008/02/04 07:58:32 nerdboy Exp $ |
86 |
|
87 |
-inherit eutils flag-o-matic fortran toolchain-funcs |
88 |
+inherit eutils fixheadtails flag-o-matic fortran toolchain-funcs |
89 |
|
90 |
DESCRIPTION="General purpose library and file format for storing scientific data" |
91 |
HOMEPAGE="http://hdf.ncsa.uiuc.edu/HDF5/" |
92 |
@@ -12,7 +12,7 @@ |
93 |
SLOT="0" |
94 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
95 |
# need to update szip to get alpha, ia64, etc back in here, |
96 |
-IUSE="cxx debug fortran mpi ssl szip threads zlib " |
97 |
+IUSE="cxx debug fortran mpi ssl szip threads tools zlib " |
98 |
|
99 |
DEPEND="mpi? ( >=sys-cluster/mpich2-1.0.6 |
100 |
net-fs/nfs-utils ) |
101 |
@@ -33,25 +33,18 @@ |
102 |
# compiler is installed if the user enables fortran support. Feel |
103 |
# free to improve it... |
104 |
if use fortran ; then |
105 |
- if [ $(gcc-major-version) -ge 4 ] \ |
106 |
- && built_with_use sys-devel/gcc fortran ; then |
107 |
- FORTRAN="gfortran" |
108 |
- fortran_pkg_setup |
109 |
- export F9X="gfortran" |
110 |
- einfo "Configuring for GNU gfortran..." |
111 |
- elif |
112 |
- test -d /opt/intel/fortran90 ; then |
113 |
- FORTRAN="ifc" |
114 |
- fortran_pkg_setup |
115 |
- export F9X="ifc" |
116 |
- einfo "Configuring for Intel fortran..." |
117 |
- else |
118 |
- einfo "No F90 compiler found; please install either gcc 4 with" |
119 |
- einfo "fortran support or some other Fortran 90 compiler such" |
120 |
- einfo "as ifc or pgf90 (or disable fortran support)." |
121 |
- die "No usable Fortran 90 compiler found." |
122 |
- fi |
123 |
+ fortran_pkg_setup |
124 |
+ case "${FORTRANC}" in |
125 |
+ gfortran|ifc|ifort|f95) |
126 |
+ export F9X="${FORTRANC}" |
127 |
+ ;; |
128 |
+ g77|f77|f2c) |
129 |
+ export F9X="" |
130 |
+ ;; |
131 |
+ esac |
132 |
fi |
133 |
+ |
134 |
+ # if anyone knows of a better way to do this... |
135 |
if use mpi && ! built_with_use sys-cluster/mpich2 pvfs2 ; then |
136 |
ewarn "Your MPI library needs parallel IO support for HDF5. You" |
137 |
ewarn "must re-emerge mpich2 with USE=pvfs2." |
138 |
@@ -60,7 +53,7 @@ |
139 |
} |
140 |
|
141 |
src_unpack() { |
142 |
- unpack "${A}" |
143 |
+ unpack ${A} |
144 |
cd "${S}" |
145 |
|
146 |
if use mpi; then |
147 |
@@ -68,14 +61,14 @@ |
148 |
epatch "${FILESDIR}/${PN}-mpich2.patch" || die "mpich2 patch failed" |
149 |
fi |
150 |
|
151 |
- sed -i -e "s/tail +/tail -n +/" "${S}"/bin/release \ |
152 |
- "${S}"/tools/h5dump/testh5dump.sh.in |
153 |
+ ht_fix_file "${S}"/bin/release "${S}"/tools/h5dump/testh5dump.sh.in |
154 |
|
155 |
} |
156 |
|
157 |
src_compile() { |
158 |
- local myconf="--with-pic --enable-shared" |
159 |
+ local myconf |
160 |
|
161 |
+ # a better way to do this would also be nice, but i can't think of one |
162 |
if use cxx && ! use mpi ; then |
163 |
myconf="${myconf} --enable-cxx" |
164 |
elif use cxx && use mpi ; then |
165 |
@@ -92,7 +85,7 @@ |
166 |
|
167 |
use threads && myconf="${myconf} --with-pthread --enable-threadsafe" |
168 |
|
169 |
- if use debug; then |
170 |
+ if use debug ; then |
171 |
myconf="${myconf} --enable-debug=all" |
172 |
else |
173 |
myconf="${myconf} --enable-production" |
174 |
@@ -108,22 +101,30 @@ |
175 |
if use mpi ; then |
176 |
export NPROCS=1 |
177 |
export CC="mpicc" |
178 |
- export F9X="mpif90" |
179 |
- export LIBS="$(sh pvfs2-config --libs) -lmpich" |
180 |
- if built_with_use sys-cluster/mpich2 mpe ; then |
181 |
- myconf="${myconf} --with-mpe=/usr/include,/usr/$(get_libdir)" |
182 |
+ if built_with_use sys-cluster/mpich2 fortran ; then |
183 |
+ export F9X="mpif90" |
184 |
fi |
185 |
+ if built_with_use sys-cluster/mpich2 pvfs2 ; then |
186 |
+ export LIBS="$(sh pvfs2-config --libs) -lmpich" |
187 |
+ else |
188 |
+ export LIBS="-lmpich" |
189 |
+ fi |
190 |
+# if built_with_use sys-cluster/mpich2 mpe ; then |
191 |
+# myconf="${myconf} --with-mpe=/usr/include,/usr/$(get_libdir)" |
192 |
+# fi |
193 |
append-ldflags "${LIBS}" |
194 |
fi |
195 |
|
196 |
- ./configure --prefix=/usr ${myconf} \ |
197 |
+ econf --prefix=/usr \ |
198 |
$(use_enable zlib) \ |
199 |
$(use_with ssl) \ |
200 |
--enable-linux-lfs \ |
201 |
--sysconfdir=/etc \ |
202 |
--infodir=/usr/share/info \ |
203 |
--libdir=/usr/$(get_libdir) \ |
204 |
- --mandir=/usr/share/man || die "configure failed" |
205 |
+ --mandir=/usr/share/man \ |
206 |
+ --enable-shared --with-pic \ |
207 |
+ "${myconf}" || die "configure failed" |
208 |
|
209 |
# restore the ARCH environment variable |
210 |
ARCH="${EBUILD_ARCH}" |
211 |
@@ -147,6 +148,7 @@ |
212 |
} |
213 |
|
214 |
src_install() { |
215 |
+ # emake install and einstall cause sandbox violations here |
216 |
make \ |
217 |
prefix="${D}"usr \ |
218 |
mandir="${D}"usr/share/man \ |
219 |
@@ -155,15 +157,30 @@ |
220 |
infodir="${D}usr"/share/info \ |
221 |
install || die "make install failed" |
222 |
|
223 |
- dolib.a "${S}"/tools/lib/.libs/libh5tools.a \ |
224 |
- "${S}"/test/.libs/libh5test.a || die "dolib.a failed" |
225 |
- insinto /usr/$(get_libdir) |
226 |
- doins "${S}"/tools/lib/libh5tools.la \ |
227 |
- "${S}"/test/libh5test.la || die "doins failed" |
228 |
- dolib.so "${S}"/test/.libs/lib*so* || die "dolib.so failed" |
229 |
- |
230 |
- exeinto /usr/bin |
231 |
- newexe "${S}"/bin/iostats iostats.pl || die "newexe failed" |
232 |
+ if use tools ; then |
233 |
+ dolib.a "${S}"/tools/lib/.libs/libh5tools.a \ |
234 |
+ "${S}"/test/.libs/libh5test.a || die "dolib.a failed" |
235 |
+ insinto /usr/$(get_libdir) |
236 |
+ doins "${S}"/tools/lib/libh5tools.la \ |
237 |
+ "${S}"/test/libh5test.la || die "doins failed" |
238 |
+ dolib.so "${S}"/test/.libs/libh5test.so.0.0.0 \ |
239 |
+ || die "dolib.so failed" |
240 |
+ doins "${S}"/test/.libs/libh5test.so.0 \ |
241 |
+ "${S}"/test/.libs/libh5test.so || die "doins failed" |
242 |
+ |
243 |
+ exeinto /usr/bin |
244 |
+ newexe "${S}"/bin/iostats iostats.pl || die "newexe failed" |
245 |
+ |
246 |
+ exeinto /usr/share/"${PN}/test-tools" |
247 |
+ cd "${S}"/test |
248 |
+ doexe big bittests fillval lheap file_handle istore set_extent \ |
249 |
+ srb_append cache flush1 srb_read cmpd_dset flush2 srb_write \ |
250 |
+ dangle gass_append links stab dsets dtypes enum extend external \ |
251 |
+ gass_read mount gass_write getname gheap hyperslab mtime ntypes \ |
252 |
+ ohdr reserved stream_test testhdf5 ttsafe unlink |
253 |
+ cd "${S}" |
254 |
+ use mpi && doexe testpar/testphdf5 testpar/t_mpi |
255 |
+ fi |
256 |
|
257 |
dodoc README.txt MANIFEST |
258 |
dohtml doc/html/* |
259 |
|
260 |
|
261 |
|
262 |
1.10 sci-libs/hdf5/hdf5-1.6.4.ebuild |
263 |
|
264 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/hdf5/hdf5-1.6.4.ebuild?rev=1.10&view=markup |
265 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/hdf5/hdf5-1.6.4.ebuild?rev=1.10&content-type=text/plain |
266 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/hdf5/hdf5-1.6.4.ebuild?r1=1.9&r2=1.10 |
267 |
|
268 |
Index: hdf5-1.6.4.ebuild |
269 |
=================================================================== |
270 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.4.ebuild,v |
271 |
retrieving revision 1.9 |
272 |
retrieving revision 1.10 |
273 |
diff -u -r1.9 -r1.10 |
274 |
--- hdf5-1.6.4.ebuild 3 Dec 2007 07:21:53 -0000 1.9 |
275 |
+++ hdf5-1.6.4.ebuild 4 Feb 2008 07:58:32 -0000 1.10 |
276 |
@@ -1,6 +1,6 @@ |
277 |
-# Copyright 1999-2007 Gentoo Foundation |
278 |
+# Copyright 1999-2008 Gentoo Foundation |
279 |
# Distributed under the terms of the GNU General Public License v2 |
280 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.4.ebuild,v 1.9 2007/12/03 07:21:53 nerdboy Exp $ |
281 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.4.ebuild,v 1.10 2008/02/04 07:58:32 nerdboy Exp $ |
282 |
|
283 |
inherit eutils |
284 |
|
285 |
|
286 |
|
287 |
|
288 |
1.6 sci-libs/hdf5/hdf5-1.6.5-r1.ebuild |
289 |
|
290 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/hdf5/hdf5-1.6.5-r1.ebuild?rev=1.6&view=markup |
291 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/hdf5/hdf5-1.6.5-r1.ebuild?rev=1.6&content-type=text/plain |
292 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/hdf5/hdf5-1.6.5-r1.ebuild?r1=1.5&r2=1.6 |
293 |
|
294 |
Index: hdf5-1.6.5-r1.ebuild |
295 |
=================================================================== |
296 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.5-r1.ebuild,v |
297 |
retrieving revision 1.5 |
298 |
retrieving revision 1.6 |
299 |
diff -u -r1.5 -r1.6 |
300 |
--- hdf5-1.6.5-r1.ebuild 5 Dec 2007 14:45:21 -0000 1.5 |
301 |
+++ hdf5-1.6.5-r1.ebuild 4 Feb 2008 07:58:32 -0000 1.6 |
302 |
@@ -1,6 +1,6 @@ |
303 |
-# Copyright 1999-2007 Gentoo Foundation |
304 |
+# Copyright 1999-2008 Gentoo Foundation |
305 |
# Distributed under the terms of the GNU General Public License v2 |
306 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.5-r1.ebuild,v 1.5 2007/12/05 14:45:21 markusle Exp $ |
307 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.5-r1.ebuild,v 1.6 2008/02/04 07:58:32 nerdboy Exp $ |
308 |
|
309 |
inherit fortran eutils toolchain-funcs |
310 |
|
311 |
|
312 |
|
313 |
|
314 |
1.6 sci-libs/hdf5/hdf5-1.6.5.ebuild |
315 |
|
316 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/hdf5/hdf5-1.6.5.ebuild?rev=1.6&view=markup |
317 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/hdf5/hdf5-1.6.5.ebuild?rev=1.6&content-type=text/plain |
318 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/hdf5/hdf5-1.6.5.ebuild?r1=1.5&r2=1.6 |
319 |
|
320 |
Index: hdf5-1.6.5.ebuild |
321 |
=================================================================== |
322 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.5.ebuild,v |
323 |
retrieving revision 1.5 |
324 |
retrieving revision 1.6 |
325 |
diff -u -r1.5 -r1.6 |
326 |
--- hdf5-1.6.5.ebuild 5 Dec 2007 14:45:21 -0000 1.5 |
327 |
+++ hdf5-1.6.5.ebuild 4 Feb 2008 07:58:32 -0000 1.6 |
328 |
@@ -1,6 +1,6 @@ |
329 |
-# Copyright 1999-2007 Gentoo Foundation |
330 |
+# Copyright 1999-2008 Gentoo Foundation |
331 |
# Distributed under the terms of the GNU General Public License v2 |
332 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.5.ebuild,v 1.5 2007/12/05 14:45:21 markusle Exp $ |
333 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.5.ebuild,v 1.6 2008/02/04 07:58:32 nerdboy Exp $ |
334 |
|
335 |
inherit eutils |
336 |
|
337 |
|
338 |
|
339 |
|
340 |
-- |
341 |
gentoo-commits@l.g.o mailing list |