From 538d12df95c2b8522382dce964354f07ee0da3ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Fabbro?= Date: Wed, 24 Mar 2010 05:00:11 +0000 Subject: bump --- dev-java/hdf-java/ChangeLog | 7 ++ dev-java/hdf-java/Manifest | 8 +- dev-java/hdf-java/files/hdf-java-2.6-shared.patch | 113 -------------------- .../hdf-java/files/hdf-java-2.6.1-shared.patch | 117 +++++++++++++++++++++ dev-java/hdf-java/hdf-java-2.6.1.ebuild | 61 +++++++++++ dev-java/hdf-java/hdf-java-2.6.ebuild | 61 ----------- 6 files changed, 189 insertions(+), 178 deletions(-) delete mode 100644 dev-java/hdf-java/files/hdf-java-2.6-shared.patch create mode 100644 dev-java/hdf-java/files/hdf-java-2.6.1-shared.patch create mode 100644 dev-java/hdf-java/hdf-java-2.6.1.ebuild delete mode 100644 dev-java/hdf-java/hdf-java-2.6.ebuild (limited to 'dev-java') diff --git a/dev-java/hdf-java/ChangeLog b/dev-java/hdf-java/ChangeLog index 319cf62ea..2371a8cbb 100644 --- a/dev-java/hdf-java/ChangeLog +++ b/dev-java/hdf-java/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*hdf-java-2.6.1 (24 Mar 2010) + + 24 Mar 2010; Sébastien Fabbro -hdf-java-2.6.ebuild, + +hdf-java-2.6.1.ebuild, +files/hdf-java-2.6.1-shared.patch, + -files/hdf-java-2.6-shared.patch: + Version bump + 12 Feb 2010; Sébastien Fabbro hdf-java-2.6.ebuild: Removed mpi use flag in favor of checking if hdf5 was built with mpi, see bug #302621 diff --git a/dev-java/hdf-java/Manifest b/dev-java/hdf-java/Manifest index 024180b24..bcef94181 100644 --- a/dev-java/hdf-java/Manifest +++ b/dev-java/hdf-java/Manifest @@ -1,5 +1,5 @@ -AUX hdf-java-2.6-shared.patch 3588 RMD160 cf8525d63a5e6336ed105fbfaf11d32eb5700e40 SHA1 c646d28f33f150d8799d1d5edb95683a36e4c2b0 SHA256 0a9b58894066159fa3296f3a4a9895242ced1d1bdf3b585033116f07d1c60675 -DIST hdf-java-2.6-src.tar 10383360 RMD160 1e8c56e86000cc97b46c157ee7cbee142d26ee15 SHA1 6ad4200063b9e25ecdfffb3624a5a29d71f1f92b SHA256 d2756ab58449a11cf765276d19bb8b804e809ca702b569fd4d4d94794f359481 -EBUILD hdf-java-2.6.ebuild 1413 RMD160 bf5cb7c9e88cb9b2fd33de483b4f90b049a806dc SHA1 3d0b8db39e7a9e347b5a2f80539aeca2d17aadcf SHA256 6ad85ee6318566657cd5dcacba75b88b8f915e205cf70528c4c162a3b073b094 -MISC ChangeLog 617 RMD160 6d2883de0747559e1c9deed1b00457de76f88c71 SHA1 3f081efff40490d4a59aa51f4fcb82653398abd4 SHA256 dcb5bec2a848348db058b7f92235d648e45da6dac8f80ceb0ca9ef31b9a749b7 +AUX hdf-java-2.6.1-shared.patch 3949 RMD160 16cfc4d2f8c73e78f121a8e9c58d3bc2689b37cf SHA1 261e13e4214de6d81c9c3a93775e86a1e7f46508 SHA256 86b91a04d60509492f61578a9f8590741cd72ff24e857c2b4f24be97ed1fabf1 +DIST hdf-java-2.6.1-src.tar 10393600 RMD160 ff0896df3c81a449da8d78ac4b0022439fec4666 SHA1 eec91562f208944fe5298289bc45538455487079 SHA256 1a1e97e4af7b53771b56b2897cf4cc600b3fb2cad4865a54064f899a51287703 +EBUILD hdf-java-2.6.1.ebuild 1413 RMD160 bf5cb7c9e88cb9b2fd33de483b4f90b049a806dc SHA1 3d0b8db39e7a9e347b5a2f80539aeca2d17aadcf SHA256 6ad85ee6318566657cd5dcacba75b88b8f915e205cf70528c4c162a3b073b094 +MISC ChangeLog 839 RMD160 4698097d6c0f05679ac04664c89ec00a05de1a3d SHA1 6ee8b972c5f8196e90f282e9e84cba00922a6bfc SHA256 27bfef2aa2ef7c293b03df5ebde56c3b0a030248f90228e2ed0d3dc7931dd3f1 MISC metadata.xml 695 RMD160 ba84297087b26c64b36a4a5c269187ddbfe0563f SHA1 bc11c02484fab4059dd22881d4714d7b77caed37 SHA256 97a459b5696f58666686ad9722dd445459352350eef1d568097ac420de4a4954 diff --git a/dev-java/hdf-java/files/hdf-java-2.6-shared.patch b/dev-java/hdf-java/files/hdf-java-2.6-shared.patch deleted file mode 100644 index c41b9584d..000000000 --- a/dev-java/hdf-java/files/hdf-java-2.6-shared.patch +++ /dev/null @@ -1,113 +0,0 @@ ---- configure.in.orig 2010-01-22 08:30:29.000000000 +0000 -+++ configure.in 2010-01-22 08:32:18.000000000 +0000 -@@ -177,7 +177,7 @@ - *) - if test -n "$withval" ; then - z_lib="`echo $withval |cut -f2 -d, -s`" -- ZLIB=$z_lib"/libz."$LLEXT -+ ZLIB="-L$z_lib -lz" - HAVE_ZLIB="yes" - else - ZLIB="" -@@ -211,7 +211,7 @@ - *) - if test -n "$withval" ; then - jpeg_lib="`echo $withval |cut -f2 -d, -s`" -- JPEGLIB=$jpeg_lib"/libjpeg."$LLEXT -+ JPEGLIB="-L$jpeg_lib -ljpeg" - #AC_MSG_RESULT([jpeg found: $JPEGLIB]); - HAVE_JPEG="yes" - else -@@ -246,7 +246,7 @@ - *) - if test -n "$withval" ; then - sz_lib="`echo $withval |cut -f2 -d, -s`" -- SZLIB=$sz_lib"/libsz."$LLEXT -+ SZLIB="-L$sz_lib -lsz" - #AC_MSG_RESULT([szlib found: $SZLIB]); - HAVE_SZIP="yes" - else -@@ -302,7 +302,7 @@ - ;; - esac - if test -n "$HDF4LIB"; then -- LIBS="$HDF4LIB/libdf.$LLEXT $HDF4LIB/libmfhdf.$LLEXT $LIBS" -+ LIBS="-L$HDF4LIB -ldf -lmfhdf $LIBS" - HAVE_HDF4="yes" - fi - AC_MSG_RESULT([$HAVE_HDF4]) -@@ -363,7 +363,7 @@ - *) - if test -n "$withval" ; then - hdf5_lib="`echo $withval |cut -f2 -d, -s`" -- HDF5LIB=$hdf5_lib"/libhdf.$LLEXT" -+ HDF5LIB="-L$hdf5_lib -lhdf" - hdf5_inc="`echo $withval |cut -f1 -d,`" - if test -n "$hdf5_inc"; then - HDF5INC="$hdf5_inc" -@@ -380,7 +380,7 @@ - ;; - esac - if test -n "$HDF5LIB"; then -- LIBS="$HDF5LIB/libhdf5.$LLEXT $LIBS" -+ LIBS="-L$HDF5LIB -lhdf5 $LIBS" - HAVE_HDF5="yes" - fi - AC_MSG_RESULT([$HAVE_HDF5]) -@@ -626,6 +626,7 @@ - AC_CACHE_CHECK("JH45 install directory",ac_cv_lib_JH45INST,JH45INST_FOUND=0) - fi - if test $JH45INST_FOUND -eq 1; then -+ mkdir -p $JH45INST - if test -z "$JH45INST" ; then - JH45INST=$ac_cv_lib_JH45INST; - fi -@@ -633,7 +634,7 @@ - JH45INST_FOUND=0 - fi - if test \( ! -w "$JH45INST" \); then -- AC_MSG_ERROR( [ $JAVINST : not writable ]) -+ AC_MSG_ERROR( [ $JH45INST : not writable ]) - JH45INST_FOUND=0 - fi - fi ---- native/hdflib/Makefile.in.orig 2010-01-22 08:40:36.000000000 +0000 -+++ native/hdflib/Makefile.in 2010-01-22 09:01:17.000000000 +0000 -@@ -37,7 +37,7 @@ - CFLAGS = $(DEFS) -I. -I$(JAVAINC1) -I$(JAVAINC2) -I$(HDFINC) - - # Be sure to add -lbsd if compiling in a SYSV environment --LIBS = $(HDFLIB)/libmfhdf.$(LLEXT) $(HDFLIB)/libdf.$(LLEXT) $(SZLIB) $(ZLIB) $(JPEGLIB) -lm -+LIBS = -L$(HDFLIB) -lmfhdf -ldf $(SZLIB) $(ZLIB) $(JPEGLIB) -lm - - # Macro def: object filename used - OBJECTS = hdfstructsutil.o \ -@@ -56,7 +56,7 @@ - - libjhdf: $(OBJECTS) - -mkdir -p $(LIBDIR); -- $(LD) $(LDOPT) -o $(LIBDIR)/libjhdf.$(JSLEXT) $(LDOPT2) $(OBJECTS) $(LIBS) -+ $(LD) $(LDOPT) $(LDFLAGS) -o $(LIBDIR)/libjhdf.$(JSLEXT) $(LDOPT2) $(OBJECTS) $(LIBS) - - clean: - $(RM) -f *.o so_locations $(LIBDIR)/libjhdf.$(JSLEXT) ---- native/hdf5lib/Makefile.in.orig 2010-01-22 08:40:59.000000000 +0000 -+++ native/hdf5lib/Makefile.in 2010-01-22 09:01:40.000000000 +0000 -@@ -33,7 +33,7 @@ - - CFLAGS = -DH5_USE_16_API -D_FILE_OFFSET_BITS=64 $(DEFS) -I. -I$(HDF5INC) -I$(JAVAINC1) -I$(JAVAINC2) - --LIBS = $(HDF5LIB)/libhdf5.$(LLEXT) $(ZLIB) $(SZLIB) -lm -+LIBS = -L$(HDF5LIB) -lhdf5 $(ZLIB) $(SZLIB) -lm - - # Macro def: object filename used - OBJECTS = exceptionImp.o h5Constants.o h5Imp.o h5aImp.o h5dImp.o h5fImp.o h5gImp.o h5iImp.o h5pImp.o h5rImp.o h5sImp.o h5tImp.o nativeData.o h5util.o h5zImp.o -@@ -45,7 +45,7 @@ - - libjhdf5: $(OBJECTS) - -mkdir -p $(LIBDIR); -- $(LD) $(LDOPT) -o $(LIBDIR)/libjhdf5.$(JSLEXT) $(LDOPT2) $(OBJECTS) $(LIBS) -+ $(LD) $(LDOPT) $(LDFLAGS) -o $(LIBDIR)/libjhdf5.$(JSLEXT) $(LDOPT2) $(OBJECTS) $(LIBS) - - clean: - $(RM) -f *.o so_locations $(LIBDIR)/libjhdf5.$(JSLEXT) diff --git a/dev-java/hdf-java/files/hdf-java-2.6.1-shared.patch b/dev-java/hdf-java/files/hdf-java-2.6.1-shared.patch new file mode 100644 index 000000000..95256cd45 --- /dev/null +++ b/dev-java/hdf-java/files/hdf-java-2.6.1-shared.patch @@ -0,0 +1,117 @@ +diff -Nur hdf-java.orig/configure.in hdf-java/configure.in +--- hdf-java.orig/configure.in 2010-03-23 15:41:36.000000000 +0000 ++++ hdf-java/configure.in 2010-03-24 04:53:01.000000000 +0000 +@@ -177,7 +177,7 @@ + *) + if test -n "$withval" ; then + z_lib="`echo $withval |cut -f2 -d, -s`" +- ZLIB=$z_lib"/libz."$LLEXT ++ ZLIB="-L$z_lib -lz" + HAVE_ZLIB="yes" + else + ZLIB="" +@@ -211,7 +211,7 @@ + *) + if test -n "$withval" ; then + jpeg_lib="`echo $withval |cut -f2 -d, -s`" +- JPEGLIB=$jpeg_lib"/libjpeg."$LLEXT ++ JPEGLIB="-L$jpeg_lib -ljpeg" + #AC_MSG_RESULT([jpeg found: $JPEGLIB]); + HAVE_JPEG="yes" + else +@@ -246,7 +246,7 @@ + *) + if test -n "$withval" ; then + sz_lib="`echo $withval |cut -f2 -d, -s`" +- SZLIB=$sz_lib"/libsz."$LLEXT ++ SZLIB="-L$sz_lib -lsz" + #AC_MSG_RESULT([szlib found: $SZLIB]); + HAVE_SZIP="yes" + else +@@ -302,7 +302,7 @@ + ;; + esac + if test -n "$HDF4LIB"; then +- LIBS="$HDF4LIB/libdf.$LLEXT $HDF4LIB/libmfhdf.$LLEXT $LIBS" ++ LIBS="-L$HDF4LIB -ldf -lmfhdf $LIBS" + HAVE_HDF4="yes" + fi + AC_MSG_RESULT([$HAVE_HDF4]) +@@ -363,7 +363,7 @@ + *) + if test -n "$withval" ; then + hdf5_lib="`echo $withval |cut -f2 -d, -s`" +- HDF5LIB=$hdf5_lib"/libhdf.$LLEXT" ++ HDF5LIB="-L$hdf5_lib -lhdf" + hdf5_inc="`echo $withval |cut -f1 -d,`" + if test -n "$hdf5_inc"; then + HDF5INC="$hdf5_inc" +@@ -380,7 +380,7 @@ + ;; + esac + if test -n "$HDF5LIB"; then +- LIBS="$HDF5LIB/libhdf5.$LLEXT $LIBS" ++ LIBS="-L$HDF5LIB -lhdf5 $LIBS" + HAVE_HDF5="yes" + fi + AC_MSG_RESULT([$HAVE_HDF5]) +@@ -626,16 +626,10 @@ + AC_CACHE_CHECK("JH45 install directory",ac_cv_lib_JH45INST,JH45INST_FOUND=0) + fi + if test $JH45INST_FOUND -eq 1; then ++ mkdir -p $JH45INST + if test -z "$JH45INST" ; then + JH45INST=$ac_cv_lib_JH45INST; + fi +- if test \( ! -d "$JH45INST" \); then +- JH45INST_FOUND=0 +- fi +- if test \( ! -w "$JH45INST" \); then +- AC_MSG_ERROR( [ $JAVINST : not writable ]) +- JH45INST_FOUND=0 +- fi + fi + until test $JH45INST_FOUND -eq 1; do + echo "Please type the directory in which to install the JH45" +diff -Nur hdf-java.orig/native/hdf5lib/Makefile.in hdf-java/native/hdf5lib/Makefile.in +--- hdf-java.orig/native/hdf5lib/Makefile.in 2010-03-23 15:41:36.000000000 +0000 ++++ hdf-java/native/hdf5lib/Makefile.in 2010-03-24 04:52:13.000000000 +0000 +@@ -33,7 +33,7 @@ + + CFLAGS = -DH5_USE_16_API -D_FILE_OFFSET_BITS=64 $(DEFS) -I. -I$(HDF5INC) -I$(JAVAINC1) -I$(JAVAINC2) + +-LIBS = $(HDF5LIB)/libhdf5.$(LLEXT) $(ZLIB) $(SZLIB) -lm ++LIBS = -L$(HDF5LIB) -lhdf5 $(ZLIB) $(SZLIB) -lm + + # Macro def: object filename used + OBJECTS = exceptionImp.o h5Constants.o h5Imp.o h5aImp.o h5dImp.o h5fImp.o h5gImp.o h5iImp.o h5pImp.o h5rImp.o h5sImp.o h5tImp.o nativeData.o h5util.o h5zImp.o +@@ -45,7 +45,7 @@ + + libjhdf5: $(OBJECTS) + -mkdir -p $(LIBDIR); +- $(LD) $(LDOPT) -o $(LIBDIR)/libjhdf5.$(JSLEXT) $(LDOPT2) $(OBJECTS) $(LIBS) ++ $(LD) $(LDOPT) $(LDFLAGS) -o $(LIBDIR)/libjhdf5.$(JSLEXT) $(LDOPT2) $(OBJECTS) $(LIBS) + + clean: + $(RM) -f *.o so_locations $(LIBDIR)/libjhdf5.$(JSLEXT) +diff -Nur hdf-java.orig/native/hdflib/Makefile.in hdf-java/native/hdflib/Makefile.in +--- hdf-java.orig/native/hdflib/Makefile.in 2010-03-23 15:41:36.000000000 +0000 ++++ hdf-java/native/hdflib/Makefile.in 2010-03-24 04:52:13.000000000 +0000 +@@ -37,7 +37,7 @@ + CFLAGS = $(DEFS) -I. -I$(JAVAINC1) -I$(JAVAINC2) -I$(HDFINC) + + # Be sure to add -lbsd if compiling in a SYSV environment +-LIBS = $(HDFLIB)/libmfhdf.$(LLEXT) $(HDFLIB)/libdf.$(LLEXT) $(SZLIB) $(ZLIB) $(JPEGLIB) -lm ++LIBS = -L$(HDFLIB) -lmfhdf -ldf $(SZLIB) $(ZLIB) $(JPEGLIB) -lm + + # Macro def: object filename used + OBJECTS = hdfstructsutil.o \ +@@ -56,7 +56,7 @@ + + libjhdf: $(OBJECTS) + -mkdir -p $(LIBDIR); +- $(LD) $(LDOPT) -o $(LIBDIR)/libjhdf.$(JSLEXT) $(LDOPT2) $(OBJECTS) $(LIBS) ++ $(LD) $(LDOPT) $(LDFLAGS) -o $(LIBDIR)/libjhdf.$(JSLEXT) $(LDOPT2) $(OBJECTS) $(LIBS) + + clean: + $(RM) -f *.o so_locations $(LIBDIR)/libjhdf.$(JSLEXT) diff --git a/dev-java/hdf-java/hdf-java-2.6.1.ebuild b/dev-java/hdf-java/hdf-java-2.6.1.ebuild new file mode 100644 index 000000000..cefb046d2 --- /dev/null +++ b/dev-java/hdf-java/hdf-java-2.6.1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=2 +JAVA_PKG_IUSE="doc examples source" +inherit eutils java-pkg-2 autotools + +DESCRIPTION="Java interface to the HDF5 library" +HOMEPAGE="http://www.hdfgroup.org/hdf-java-html/index.html" +SRC_URI="http://www.hdfgroup.org/ftp/HDF5/hdf-java/src/${P}-src.tar" + +LICENSE="NCSA-HDF" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="hdf" + +CDEPEND=">=sci-libs/hdf5-1.8[szip] + hdf? ( sci-libs/hdf ) + >=media-libs/jpeg-7 + sys-libs/zlib" +RDEPEND="${CDEPEND} + >=virtual/jre-1.5" + +DEPEND=">=virtual/jdk-1.5 + ${CDEPEND}" + +S="${WORKDIR}/${PN}" + +src_prepare() { + sed -i \ + -e 's|case JH5F_SCOPE_DOWN|//case JH5F_SCOPE_DOWN|' \ + native/hdf5lib/h5Constants.c || die + epatch "${FILESDIR}"/${P}-shared.patch + eautoreconf + has_version sci-libs/hdf5[mpi] && export CC=mpicc +} + +src_configure() { + local stdpath="/usr/include,/usr/$(get_libdir)" + local myconf="--with-hdf4=no --with-libjpeg=no" + use hdf && \ + myconf="--with-libjpeg=${stdpath} --with-hdf4=${stdpath}" + + econf \ + ${myconf} \ + --with-libz="${stdpath}" \ + --with-libsz="${stdpath}" \ + --with-hdf5="${stdpath}" \ + --with-jdk="$(java-config -o)/include,$(java-config -o)/jre/lib" +} + +src_compile() { + # parallel needs work. anyone? + emake -j1 || die "emake failed" +} + +src_install() { + java-pkg_dojar "lib/jhdf5.jar" + java-pkg_doso "lib/linux/libjhdf5.so" +} diff --git a/dev-java/hdf-java/hdf-java-2.6.ebuild b/dev-java/hdf-java/hdf-java-2.6.ebuild deleted file mode 100644 index cefb046d2..000000000 --- a/dev-java/hdf-java/hdf-java-2.6.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 -JAVA_PKG_IUSE="doc examples source" -inherit eutils java-pkg-2 autotools - -DESCRIPTION="Java interface to the HDF5 library" -HOMEPAGE="http://www.hdfgroup.org/hdf-java-html/index.html" -SRC_URI="http://www.hdfgroup.org/ftp/HDF5/hdf-java/src/${P}-src.tar" - -LICENSE="NCSA-HDF" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="hdf" - -CDEPEND=">=sci-libs/hdf5-1.8[szip] - hdf? ( sci-libs/hdf ) - >=media-libs/jpeg-7 - sys-libs/zlib" -RDEPEND="${CDEPEND} - >=virtual/jre-1.5" - -DEPEND=">=virtual/jdk-1.5 - ${CDEPEND}" - -S="${WORKDIR}/${PN}" - -src_prepare() { - sed -i \ - -e 's|case JH5F_SCOPE_DOWN|//case JH5F_SCOPE_DOWN|' \ - native/hdf5lib/h5Constants.c || die - epatch "${FILESDIR}"/${P}-shared.patch - eautoreconf - has_version sci-libs/hdf5[mpi] && export CC=mpicc -} - -src_configure() { - local stdpath="/usr/include,/usr/$(get_libdir)" - local myconf="--with-hdf4=no --with-libjpeg=no" - use hdf && \ - myconf="--with-libjpeg=${stdpath} --with-hdf4=${stdpath}" - - econf \ - ${myconf} \ - --with-libz="${stdpath}" \ - --with-libsz="${stdpath}" \ - --with-hdf5="${stdpath}" \ - --with-jdk="$(java-config -o)/include,$(java-config -o)/jre/lib" -} - -src_compile() { - # parallel needs work. anyone? - emake -j1 || die "emake failed" -} - -src_install() { - java-pkg_dojar "lib/jhdf5.jar" - java-pkg_doso "lib/linux/libjhdf5.so" -} -- cgit v1.2.3