bump

4 files changed, 47 insertions, 36 deletions

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 <bicatali@gentoo.org> -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 <bicatali@gentoo.org> 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.1-shared.patch
index c41b9584d..95256cd45 100644
--- a/dev-java/hdf-java/files/hdf-java-2.6-shared.patch
+++ b/dev-java/hdf-java/files/hdf-java-2.6.1-shared.patch
@@ -1,5 +1,6 @@
---- configure.in.orig	2010-01-22 08:30:29.000000000 +0000
-+++ configure.in	2010-01-22 08:32:18.000000000 +0000
+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
@@ -54,7 +55,7 @@
  	HAVE_HDF5="yes"
  fi
  AC_MSG_RESULT([$HAVE_HDF5])
-@@ -626,6 +626,7 @@
+@@ -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
@@ -62,37 +63,19 @@
  	if test -z "$JH45INST" ; then
  		JH45INST=$ac_cv_lib_JH45INST;
  	fi
-@@ -633,7 +634,7 @@
- 		JH45INST_FOUND=0
- 	fi
- 	if test \( ! -w "$JH45INST" \); then
+-	if test \( ! -d "$JH45INST" \); then
+-		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
+-		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
+ 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)
@@ -111,3 +94,24 @@
  
  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.ebuild b/dev-java/hdf-java/hdf-java-2.6.1.ebuild
index cefb046d2..cefb046d2 100644
--- a/dev-java/hdf-java/hdf-java-2.6.ebuild
+++ b/dev-java/hdf-java/hdf-java-2.6.1.ebuild