1 |
commit: 8a004bcf5b2cf128738df217abaece8950b687ae |
2 |
Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Nov 25 21:14:21 2012 +0000 |
4 |
Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com> |
5 |
CommitDate: Sun Nov 25 21:14:21 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8a004bcf |
7 |
|
8 |
hdf-java: version bump |
9 |
|
10 |
Sources for older versions are not available. |
11 |
|
12 |
--- |
13 |
dev-java/hdf-java/ChangeLog | 6 + |
14 |
dev-java/hdf-java/files/hdf-java-2.9-shared.patch | 118 +++++++++++++++++++ |
15 |
dev-java/hdf-java/hdf-java-2.9.ebuild | 128 +++++++++++++++++++++ |
16 |
3 files changed, 252 insertions(+), 0 deletions(-) |
17 |
|
18 |
diff --git a/dev-java/hdf-java/ChangeLog b/dev-java/hdf-java/ChangeLog |
19 |
index 7f87c82..9600879 100644 |
20 |
--- a/dev-java/hdf-java/ChangeLog |
21 |
+++ b/dev-java/hdf-java/ChangeLog |
22 |
@@ -2,6 +2,12 @@ |
23 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
24 |
# $Header: $ |
25 |
|
26 |
+*hdf-java-2.9 (25 Nov 2012) |
27 |
+ |
28 |
+ 25 Nov 2012; Andrew Savchenko <bircoph@×××××.com> +hdf-java-2.9.ebuild, |
29 |
+ +files/hdf-java-2.9-shared.patch: |
30 |
+ Version bump. Sources for older versions are not available. |
31 |
+ |
32 |
23 May 2012; Sébastien Fabbro <bicatali@g.o> hdf-java-2.8.ebuild: |
33 |
add hack for hdf5[mpi] |
34 |
|
35 |
|
36 |
diff --git a/dev-java/hdf-java/files/hdf-java-2.9-shared.patch b/dev-java/hdf-java/files/hdf-java-2.9-shared.patch |
37 |
new file mode 100644 |
38 |
index 0000000..c089480 |
39 |
--- /dev/null |
40 |
+++ b/dev-java/hdf-java/files/hdf-java-2.9-shared.patch |
41 |
@@ -0,0 +1,118 @@ |
42 |
+--- hdf-java/configure.in.orig 2012-11-13 03:12:03.000000000 +0400 |
43 |
++++ hdf-java/configure.in 2012-11-25 21:12:40.074363619 +0400 |
44 |
+@@ -177,7 +177,7 @@ |
45 |
+ *) |
46 |
+ if test -n "$withval" ; then |
47 |
+ z_lib="`echo $withval |cut -f2 -d, -s`" |
48 |
+- ZLIB=$z_lib"/libz."$LLEXT |
49 |
++ ZLIB="-L$z_lib -lz" |
50 |
+ HAVE_ZLIB="yes" |
51 |
+ else |
52 |
+ ZLIB="" |
53 |
+@@ -211,7 +211,7 @@ |
54 |
+ *) |
55 |
+ if test -n "$withval" ; then |
56 |
+ jpeg_lib="`echo $withval |cut -f2 -d, -s`" |
57 |
+- JPEGLIB=$jpeg_lib"/libjpeg."$LLEXT |
58 |
++ JPEGLIB="-L$jpeg_lib -ljpeg" |
59 |
+ dnl AC_MSG_RESULT([jpeg found: $JPEGLIB]); |
60 |
+ HAVE_JPEG="yes" |
61 |
+ else |
62 |
+@@ -246,7 +246,7 @@ |
63 |
+ *) |
64 |
+ if test -n "$withval" ; then |
65 |
+ sz_lib="`echo $withval |cut -f2 -d, -s`" |
66 |
+- SZLIB=$sz_lib"/libsz."$LLEXT |
67 |
++ SZLIB="-L$sz_lib -lsz" |
68 |
+ dnl AC_MSG_RESULT([szlib found: $SZLIB]); |
69 |
+ HAVE_SZIP="yes" |
70 |
+ else |
71 |
+@@ -302,7 +302,7 @@ |
72 |
+ ;; |
73 |
+ esac |
74 |
+ if test -n "$HDF4LIB"; then |
75 |
+- LIBS="$HDF4LIB/libdf.$LLEXT $HDF4LIB/libmfhdf.$LLEXT $LIBS" |
76 |
++ LIBS="-L$HDF4LIB -ldf -lmfhdf $LIBS" |
77 |
+ HAVE_HDF4="yes" |
78 |
+ fi |
79 |
+ AC_MSG_RESULT([$HAVE_HDF4]) |
80 |
+@@ -363,7 +363,7 @@ |
81 |
+ *) |
82 |
+ if test -n "$withval" ; then |
83 |
+ hdf5_lib="`echo $withval |cut -f2 -d, -s`" |
84 |
+- HDF5LIB=$hdf5_lib"/libhdf.$LLEXT" |
85 |
++ HDF5LIB="-L$hdf5_lib -lhdf" |
86 |
+ hdf5_inc="`echo $withval |cut -f1 -d,`" |
87 |
+ if test -n "$hdf5_inc"; then |
88 |
+ HDF5INC="$hdf5_inc" |
89 |
+@@ -380,7 +380,7 @@ |
90 |
+ ;; |
91 |
+ esac |
92 |
+ if test -n "$HDF5LIB"; then |
93 |
+- LIBS="$HDF5LIB/libhdf5.$LLEXT $LIBS" |
94 |
++ LIBS="-L$HDF5LIB -lhdf5 $LIBS" |
95 |
+ HAVE_HDF5="yes" |
96 |
+ fi |
97 |
+ AC_MSG_RESULT([$HAVE_HDF5]) |
98 |
+@@ -637,10 +637,6 @@ |
99 |
+ if test \( ! -d "$JH45INST" \); then |
100 |
+ JH45INST_FOUND=0 |
101 |
+ fi |
102 |
+- if test \( ! -w "$JH45INST" \); then |
103 |
+- AC_MSG_ERROR( [ $JH45INST : not writable ]) |
104 |
+- JH45INST_FOUND=0 |
105 |
+- fi |
106 |
+ fi |
107 |
+ until test $JH45INST_FOUND -eq 1; do |
108 |
+ echo "Please type the directory in which to install the JH45" |
109 |
+@@ -649,10 +645,6 @@ |
110 |
+ if test \( ! -d "$JH45INST" \); then |
111 |
+ JH45INST_FOUND=0 |
112 |
+ fi |
113 |
+- if test \( ! -w "$JH45INST" \); then |
114 |
+- AC_MSG_ERROR( [ $JH45INST : not writable ]) |
115 |
+- JH45INST_FOUND=0 |
116 |
+- fi |
117 |
+ done |
118 |
+ |
119 |
+ ac_cv_lib_JH45INST=$JH45INST |
120 |
+--- a/native/hdf5lib/Makefile.in |
121 |
++++ b/native/hdf5lib/Makefile.in |
122 |
+@@ -35,7 +35,7 @@ |
123 |
+ |
124 |
+ CFLAGS = -D_FILE_OFFSET_BITS=64 $(DEFS) -I. -I$(HDF5INC) -I$(JAVAINC1) -I$(JAVAINC2) |
125 |
+ |
126 |
+-LIBS = $(HDF5LIB)/libhdf5.$(LLEXT) $(ZLIB) $(SZLIB) -lm |
127 |
++LIBS = -L$(HDF5LIB) -lhdf5 $(ZLIB) $(SZLIB) -lm |
128 |
+ |
129 |
+ # Macro def: object filename used |
130 |
+ OBJECTS = exceptionImp.o h5Constants.o h5Imp.o h5aImp.o h5dImp.o h5eImp.o h5fImp.o h5gImp.o h5iImp.o h5lImp.o h5oImp.o h5pImp.o h5rImp.o h5sImp.o h5tImp.o nativeData.o h5util.o h5zImp.o |
131 |
+@@ -47,7 +47,7 @@ |
132 |
+ |
133 |
+ libjhdf5: $(OBJECTS) |
134 |
+ -mkdir -p $(LIBDIR); |
135 |
+- $(LD) $(LDOPT) -o $(LIBDIR)/libjhdf5.$(JSLEXT) $(LDOPT2) $(OBJECTS) $(LIBS) |
136 |
++ $(LD) $(LDOPT) $(LDFLAGS) -o $(LIBDIR)/libjhdf5.$(JSLEXT) $(LDOPT2) $(OBJECTS) $(LIBS) |
137 |
+ |
138 |
+ clean: |
139 |
+ $(RM) -f *.o so_locations $(LIBDIR)/libjhdf5.$(JSLEXT) |
140 |
+--- a/native/hdflib/Makefile.in |
141 |
++++ b/native/hdflib/Makefile.in |
142 |
+@@ -41,7 +41,7 @@ |
143 |
+ CFLAGS = $(DEFS) -I. -I$(JAVAINC1) -I$(JAVAINC2) -I$(HDFINC) |
144 |
+ |
145 |
+ # Be sure to add -lbsd if compiling in a SYSV environment |
146 |
+-LIBS = $(HDFLIB)/libmfhdf.$(LLEXT) $(HDFLIB)/libdf.$(LLEXT) $(SZLIB) $(ZLIB) $(JPEGLIB) -lm |
147 |
++LIBS = -L$(HDFLIB) -lmfhdf -ldf $(SZLIB) $(ZLIB) $(JPEGLIB) -lm |
148 |
+ |
149 |
+ # Macro def: object filename used |
150 |
+ OBJECTS = hdfstructsutil.o \ |
151 |
+@@ -60,7 +60,7 @@ |
152 |
+ |
153 |
+ libjhdf: $(OBJECTS) |
154 |
+ -mkdir -p $(LIBDIR); |
155 |
+- $(LD) $(LDOPT) -o $(LIBDIR)/libjhdf.$(JSLEXT) $(LDOPT2) $(OBJECTS) $(LIBS) |
156 |
++ $(LD) $(LDOPT) $(LDFLAGS) -o $(LIBDIR)/libjhdf.$(JSLEXT) $(LDOPT2) $(OBJECTS) $(LIBS) |
157 |
+ |
158 |
+ clean: |
159 |
+ $(RM) -f *.o so_locations $(LIBDIR)/libjhdf.$(JSLEXT) |
160 |
|
161 |
diff --git a/dev-java/hdf-java/hdf-java-2.9.ebuild b/dev-java/hdf-java/hdf-java-2.9.ebuild |
162 |
new file mode 100644 |
163 |
index 0000000..98c9248 |
164 |
--- /dev/null |
165 |
+++ b/dev-java/hdf-java/hdf-java-2.9.ebuild |
166 |
@@ -0,0 +1,128 @@ |
167 |
+# Copyright 1999-2012 Gentoo Foundation |
168 |
+# Distributed under the terms of the GNU General Public License v2 |
169 |
+# $Header: $ |
170 |
+ |
171 |
+EAPI=4 |
172 |
+JAVA_PKG_IUSE="doc examples" |
173 |
+inherit eutils java-pkg-2 autotools fdo-mime |
174 |
+ |
175 |
+DESCRIPTION="Java interface to the HDF5 library" |
176 |
+HOMEPAGE="http://www.hdfgroup.org/hdf-java-html/index.html" |
177 |
+SRC_URI="http://www.hdfgroup.org/ftp/HDF5/hdf-java/src/${P}-src.tar" |
178 |
+ |
179 |
+LICENSE="NCSA-HDF" |
180 |
+SLOT="0" |
181 |
+KEYWORDS="~amd64 ~x86" |
182 |
+IUSE="hdf hdfview szip test zlib" |
183 |
+ |
184 |
+CDEPEND=">=sci-libs/hdf5-1.8[szip=,zlib=] |
185 |
+ hdf? ( sci-libs/hdf virtual/jpeg ) |
186 |
+ hdfview? ( dev-java/fits dev-java/netcdf )" |
187 |
+ |
188 |
+RDEPEND="${CDEPEND} |
189 |
+ >=virtual/jre-1.5" |
190 |
+ |
191 |
+DEPEND="${CDEPEND} |
192 |
+ >=virtual/jdk-1.5 |
193 |
+ test? ( >=dev-java/junit-4 )" |
194 |
+ |
195 |
+REQUIRED_USE="hdfview? ( hdf )" |
196 |
+ |
197 |
+# buggy test with incompatible hdf5 library versions |
198 |
+RESTRICT="test" |
199 |
+ |
200 |
+S="${WORKDIR}/${PN}" |
201 |
+ |
202 |
+src_prepare() { |
203 |
+ epatch "${FILESDIR}"/${P}-shared.patch |
204 |
+ eautoreconf |
205 |
+ rm lib/*.jar |
206 |
+ if use hdfview; then |
207 |
+ java-pkg_jar-from --into lib fits fits.jar |
208 |
+ java-pkg_jar-from --into lib netcdf netcdf.jar |
209 |
+ fi |
210 |
+ use test && java-pkg_jar-from --into lib junit-4 junit.jar |
211 |
+} |
212 |
+ |
213 |
+src_configure() { |
214 |
+ local stdpath="${EPREFIX}/usr/include,${EPREFIX}/usr/$(get_libdir)" |
215 |
+ local myconf="--with-hdf4=no --with-libjpeg=no" |
216 |
+ use hdf && \ |
217 |
+ myconf="--with-libjpeg=${stdpath} --with-hdf4=${stdpath}" |
218 |
+ use zlib && myconf="${myconf} --with-libz=${stdpath}" |
219 |
+ use szip && myconf="${myconf} --with-libsz=${stdpath}" |
220 |
+ |
221 |
+ econf \ |
222 |
+ ${myconf} \ |
223 |
+ --with-hdf5="${stdpath}" \ |
224 |
+ --with-jdk="$(java-config -o)/include,$(java-config -o)/jre/lib" |
225 |
+} |
226 |
+ |
227 |
+src_compile() { |
228 |
+ # gentoo bug #302621 |
229 |
+ has_version sci-libs/hdf5[mpi] && export CXX=mpicxx CC=mpicc |
230 |
+ |
231 |
+ # parallel needs work. anyone? |
232 |
+ emake -j1 ncsa just-hdf5 |
233 |
+ |
234 |
+ if use hdf; then |
235 |
+ sed -i \ |
236 |
+ -e "s/MAX_VAR_DIMS/H4_MAX_VAR_DIMS/" \ |
237 |
+ native/hdflib/hdfstructsutil.c || die |
238 |
+ sed -i \ |
239 |
+ -e "s/MAX_NC_NAME/H4_MAX_NC_NAME/" \ |
240 |
+ native/hdflib/hdf{vdata,sds}Imp.c || die |
241 |
+ emake -j1 just-hdf4 |
242 |
+ fi |
243 |
+ |
244 |
+ use hdfview && emake -j1 packages |
245 |
+ use examples && emake -j1 do-examples |
246 |
+ use doc && emake -j1 javadocs |
247 |
+} |
248 |
+ |
249 |
+src_test() { |
250 |
+ emake -j1 check |
251 |
+} |
252 |
+ |
253 |
+src_install() { |
254 |
+ java-pkg_dojar lib/jhdf5.jar |
255 |
+ java-pkg_doso lib/linux/libjhdf5.so |
256 |
+ |
257 |
+ if use hdf; then |
258 |
+ java-pkg_dojar lib/jhdf.jar |
259 |
+ java-pkg_doso lib/linux/libjhdf.so |
260 |
+ fi |
261 |
+ |
262 |
+ if use hdfview; then |
263 |
+ java-pkg_dojar lib/jhdf5obj.jar |
264 |
+ java-pkg_dojar lib/jhdfobj.jar |
265 |
+ java-pkg_dojar lib/ext/nc2obj.jar |
266 |
+ java-pkg_dojar lib/ext/fitsobj.jar |
267 |
+ java-pkg_dojar lib/jhdfview.jar |
268 |
+ cat <<-EOF > hdfview |
269 |
+ #!/bin/sh |
270 |
+ export CLASSPATH=\$(java-config --classpath hdf-java) |
271 |
+ \$(java-config --java) \ |
272 |
+ -Xmx1000m \ |
273 |
+ -Djava.library.path=\$(java-config --library hdf-java) \ |
274 |
+ ncsa.hdf.view.HDFView \ |
275 |
+ -root "${EROOT}" \$* |
276 |
+ EOF |
277 |
+ dobin hdfview |
278 |
+ insinto /usr/share/mime/packages |
279 |
+ doins "${FILESDIR}"/hdfview.xml |
280 |
+ newicon ncsa/hdf/view/icons/hdf_large.gif hdfview.gif |
281 |
+ make_desktop_entry hdfview "HDF Viewer" hdfview |
282 |
+ fi |
283 |
+ |
284 |
+ use doc && java-pkg_dojavadoc docs/javadocs |
285 |
+ use examples && java-pkg_doexamples examples |
286 |
+} |
287 |
+ |
288 |
+pkg_postinst() { |
289 |
+ use hdfview && fdo-mime_desktop_database_update |
290 |
+} |
291 |
+ |
292 |
+pkg_postrm() { |
293 |
+ use hdfview && fdo-mime_desktop_database_update |
294 |
+} |