[gentoo-commits] proj/sci:master commit in: dev-java/hdf-java/files/, dev-java/hdf-java/

[Sebastien Fabbro]

commit:     d1eab7926aafc61b736f2ecd58c8b4760eedd27a
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 30 04:51:08 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Nov 30 04:51:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d1eab792

dev-java/hdf-java: cleaned for old version, buggy

Package-Manager: portage-2.2.01.21313-prefix
RepoMan-Options: --force

---
 dev-java/hdf-java/ChangeLog                       |    6 +-
 dev-java/hdf-java/files/hdf-java-2.7-shared.patch |  112 ------------------
 dev-java/hdf-java/files/hdf-java-2.8-shared.patch |  107 -----------------
 dev-java/hdf-java/hdf-java-2.7.ebuild             |   85 --------------
 dev-java/hdf-java/hdf-java-2.8.ebuild             |  128 ---------------------
 5 files changed, 5 insertions(+), 433 deletions(-)

diff --git a/dev-java/hdf-java/ChangeLog b/dev-java/hdf-java/ChangeLog
index 9600879..f621d1d 100644
--- a/dev-java/hdf-java/ChangeLog
+++ b/dev-java/hdf-java/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Nov 2012; Sébastien Fabbro <bicatali@g.o>
+  -files/hdf-java-2.7-shared.patch, -files/hdf-java-2.8-shared.patch,
+  -hdf-java-2.7.ebuild, -hdf-java-2.8.ebuild:
+  dev-java/hdf-java: cleaned for old version, buggy
+
 *hdf-java-2.9 (25 Nov 2012)
 
   25 Nov 2012; Andrew Savchenko <bircoph@×××××.com> +hdf-java-2.9.ebuild,
@@ -56,4 +61,3 @@
   22 Jan 2010; Sébastien Fabbro <bicatali@g.o> +hdf-java-2.6.ebuild,
   +files/hdf-java-2.6-shared.patch, +metadata.xml:
   Initial import. Ebuild initially submitted by Guillaume Horel, bug #301049
-

diff --git a/dev-java/hdf-java/files/hdf-java-2.7-shared.patch b/dev-java/hdf-java/files/hdf-java-2.7-shared.patch
deleted file mode 100644
index 3b863a2..0000000
--- a/dev-java/hdf-java/files/hdf-java-2.7-shared.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-Respect LDFLAGS, properly use shared libraries
-
-http://bugs.gentoo.org/show_bug.cgi?id=301049
-
-Patch written by Guillaume Horel <guillaume.horel@×××××.com>
---- a/configure.in
-+++ b/configure.in
-@@ -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"
-     	dnl 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"
- 		dnl 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 -lmhdf $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])
-@@ -628,10 +628,6 @@
- 	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"
---- a/native/hdf5lib/Makefile.in
-+++ b/native/hdf5lib/Makefile.in
-@@ -35,7 +35,7 @@
- 
- CFLAGS = -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 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
-@@ -47,7 +47,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)
---- a/native/hdflib/Makefile.in
-+++ b/native/hdflib/Makefile.in
-@@ -41,7 +41,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 \
-@@ -60,7 +60,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/files/hdf-java-2.8-shared.patch b/dev-java/hdf-java/files/hdf-java-2.8-shared.patch
deleted file mode 100644
index 2375fb5..0000000
--- a/dev-java/hdf-java/files/hdf-java-2.8-shared.patch
+++ /dev/null
@@ -1,107 +0,0 @@
---- a/configure.in.orig	2011-11-29 20:19:58.000000000 +0000
-+++ b/configure.in	2012-04-14 22:06:05.000000000 +0100
-@@ -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"
-       dnl 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"/libszip."$LLEXT
-+    SZLIB="-L$sz_lib -lsz"
-     dnl 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])
-@@ -637,10 +637,6 @@
-   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"
---- a/native/hdf5lib/Makefile.in
-+++ b/native/hdf5lib/Makefile.in
-@@ -35,7 +35,7 @@
- 
- CFLAGS = -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 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
-@@ -47,7 +47,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)
---- a/native/hdflib/Makefile.in
-+++ b/native/hdflib/Makefile.in
-@@ -41,7 +41,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 \
-@@ -60,7 +60,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.7.ebuild b/dev-java/hdf-java/hdf-java-2.7.ebuild
deleted file mode 100644
index 7f31dd7..0000000
--- a/dev-java/hdf-java/hdf-java-2.7.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-JAVA_PKG_IUSE="doc examples"
-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/releases/HDF-JAVA/HDF-JAVA-${PV}/src/${P}-src.tar"
-
-LICENSE="NCSA-HDF"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="hdf szip zlib test"
-
-CDEPEND=">=sci-libs/hdf5-1.8[szip=,zlib=]
-	hdf? (
-		sci-libs/hdf
-		virtual/jpeg
-	)"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-shared.patch
-	eautoreconf
-	rm lib/*.jar
-}
-
-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}"
-	use zlib &&	myconf="${myconf} --with-libz=${stdpath}"
-	use szip && myconf="${myconf} --with-libsz=${stdpath}"
-
-	econf \
-		${myconf} \
-		--with-hdf5="${stdpath}" \
-		--with-jdk="$(java-config -o)/include,$(java-config -o)/jre/lib"
-}
-
-src_compile() {
-	# parallel needs work. anyone?
-	emake -j1 just-hdf5 || die
-
-	if use hdf; then
-		sed -i "s/MAX_VAR_DIMS/H4_MAX_VAR_DIMS/" \
-		native/hdflib/hdfstructsutil.c || die
-		sed -i "s/MAX_NC_NAME/H4_MAX_NC_NAME/" \
-		native/hdflib/hdfvdataImp.c || die
-		sed -i "s/MAX_NC_NAME/H4_MAX_NC_NAME/" \
-		native/hdflib/hdfsdsImp.c || die
-		emake -j1 just-hdf4|| die
-	fi
-
-	if use examples; then
-		emake -j1 do-examples || die
-	fi
-
-	if use doc; then
-		emake -j1 javadocs || die
-	fi
-}
-
-src_install() {
-	java-pkg_dojar "lib/jhdf5.jar"
-	java-pkg_doso "lib/linux/libjhdf5.so"
-
-	if 	use hdf; then
-		java-pkg_dojar "lib/jhdf.jar"
-		java-pkg_doso "lib/linux/libjhdf.so"
-	fi
-	use doc && java-pkg_dojavadoc "docs/javadocs"
-	use examples && java-pkg_doexamples "examples"
-}

diff --git a/dev-java/hdf-java/hdf-java-2.8.ebuild b/dev-java/hdf-java/hdf-java-2.8.ebuild
deleted file mode 100644
index 98c9248..0000000
--- a/dev-java/hdf-java/hdf-java-2.8.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-JAVA_PKG_IUSE="doc examples"
-inherit eutils java-pkg-2 autotools fdo-mime
-
-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 hdfview szip test zlib"
-
-CDEPEND=">=sci-libs/hdf5-1.8[szip=,zlib=]
-	hdf? ( sci-libs/hdf virtual/jpeg )
-	hdfview? ( dev-java/fits dev-java/netcdf )"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5
-	test? ( >=dev-java/junit-4 )"
-
-REQUIRED_USE="hdfview? ( hdf )"
-
-# buggy test with incompatible hdf5 library versions
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-shared.patch
-	eautoreconf
-	rm lib/*.jar
-	if use hdfview; then
-		java-pkg_jar-from --into lib fits fits.jar
-		java-pkg_jar-from --into lib netcdf netcdf.jar
-	fi
-	use test && java-pkg_jar-from --into lib junit-4 junit.jar
-}
-
-src_configure() {
-	local stdpath="${EPREFIX}/usr/include,${EPREFIX}/usr/$(get_libdir)"
-	local myconf="--with-hdf4=no --with-libjpeg=no"
-	use hdf && \
-		myconf="--with-libjpeg=${stdpath} --with-hdf4=${stdpath}"
-	use zlib &&	myconf="${myconf} --with-libz=${stdpath}"
-	use szip && myconf="${myconf} --with-libsz=${stdpath}"
-
-	econf \
-		${myconf} \
-		--with-hdf5="${stdpath}" \
-		--with-jdk="$(java-config -o)/include,$(java-config -o)/jre/lib"
-}
-
-src_compile() {
-	# gentoo bug #302621
-	has_version sci-libs/hdf5[mpi] && export CXX=mpicxx CC=mpicc
-
-	# parallel needs work. anyone?
-	emake -j1 ncsa just-hdf5
-
-	if use hdf; then
-		sed -i \
-			-e "s/MAX_VAR_DIMS/H4_MAX_VAR_DIMS/" \
-			native/hdflib/hdfstructsutil.c || die
-		sed -i \
-			-e "s/MAX_NC_NAME/H4_MAX_NC_NAME/" \
-			native/hdflib/hdf{vdata,sds}Imp.c || die
-		emake -j1 just-hdf4
-	fi
-
-	use hdfview && emake -j1 packages
-	use examples && emake -j1 do-examples
-	use doc && emake -j1 javadocs
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	java-pkg_dojar lib/jhdf5.jar
-	java-pkg_doso lib/linux/libjhdf5.so
-
-	if use hdf; then
-		java-pkg_dojar lib/jhdf.jar
-		java-pkg_doso lib/linux/libjhdf.so
-	fi
-
-	if use hdfview; then
-		java-pkg_dojar lib/jhdf5obj.jar
-		java-pkg_dojar lib/jhdfobj.jar
-		java-pkg_dojar lib/ext/nc2obj.jar
-		java-pkg_dojar lib/ext/fitsobj.jar
-		java-pkg_dojar lib/jhdfview.jar
-		cat <<-EOF > hdfview
-			#!/bin/sh
-			export CLASSPATH=\$(java-config --classpath hdf-java)
-			\$(java-config --java) \
-				-Xmx1000m \
-				-Djava.library.path=\$(java-config --library hdf-java) \
-				ncsa.hdf.view.HDFView \
-				-root "${EROOT}" \$*
-		EOF
-		dobin hdfview
-		insinto /usr/share/mime/packages
-		doins "${FILESDIR}"/hdfview.xml
-		newicon ncsa/hdf/view/icons/hdf_large.gif hdfview.gif
-		make_desktop_entry hdfview "HDF Viewer" hdfview
-	fi
-
-	use doc && java-pkg_dojavadoc docs/javadocs
-	use examples && java-pkg_doexamples examples
-}
-
-pkg_postinst() {
-	use hdfview && fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	use hdfview && fdo-mime_desktop_database_update
-}