Version bump, fixing a few autotools mistakes

(Portage version: 2.1.10.44/cvs/Linux x86_64)

3 files changed, 189 insertions, 1 deletions

diff --git a/sci-libs/hdf/ChangeLog b/sci-libs/hdf/ChangeLog
index 6d6c054d7775..5396f56cee7c 100644
--- a/sci-libs/hdf/ChangeLog
+++ b/sci-libs/hdf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/hdf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/ChangeLog,v 1.24 2012/01/21 12:00:52 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/ChangeLog,v 1.25 2012/04/13 02:19:32 bicatali Exp $
+
+*hdf-4.2.7_p1 (13 Apr 2012)
+
+  13 Apr 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/4.2.7_p1-autotools.patch, +hdf-4.2.7_p1.ebuild:
+  Version bump, fixing a few autotools mistakes
 
   21 Jan 2012; Kacper Kowalik <xarthisius@gentoo.org>
   files/4.2.6-autotools.patch:
diff --git a/sci-libs/hdf/files/4.2.7_p1-autotools.patch b/sci-libs/hdf/files/4.2.7_p1-autotools.patch
new file mode 100644
index 000000000000..a7ea40e5e268
--- /dev/null
+++ b/sci-libs/hdf/files/4.2.7_p1-autotools.patch
@@ -0,0 +1,129 @@
+diff -Nur hdf-4.2.7-patch1.orig/configure.ac hdf-4.2.7-patch1/configure.ac
+--- hdf-4.2.7-patch1.orig/configure.ac	2012-03-18 03:45:46.000000000 +0000
++++ hdf-4.2.7-patch1/configure.ac	2012-04-13 03:04:17.000000000 +0100
+@@ -200,20 +200,6 @@
+ dnl Build static libraries by default. Furthermore, fortran shared libraries
+ dnl are unsupported. Disallow a user from enabling both shared libraries and
+ dnl fortran.
+-if test "X${enable_shared}" != "Xyes"; then
+-    enable_shared="no"
+-fi
+-
+-if test "X${enable_shared}" = "Xyes"; then
+-    if test "X${BUILD_FORTRAN}" = "Xyes"; then
+-        AC_MSG_ERROR([Cannot build shared fortran libraries. Please configure with --disable-fortran flag.])
+-    fi
+-fi
+-
+-AC_PROG_INSTALL
+-AC_PROG_LN_S
+-
+-AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH])
+ 
+ AC_CHECK_PROGS([YACC], ['bison -y' byacc yacc], [none], [])
+ 
+@@ -404,6 +390,8 @@
+ 
+     if test -z "$HAVE_SZIP"; then
+       AC_MSG_ERROR([couldn't find szlib library])
++    else
++      USE_COMP_SZIP="yes"
+     fi
+     ;;
+   no)
+@@ -447,7 +435,7 @@
+ 
+     AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [unset HAVE_SZIP])
+ 
+-    if test -z "$HAVE_SZIP"; then
++    if test "X$HAVE_SZIP" != "Xyes"; then
+       AC_MSG_ERROR([couldn't find szlib library])
+     else
+       USE_COMP_SZIP="yes"
+@@ -703,7 +691,7 @@
+ dnl ======================================================================
+ dnl Libtool initialization
+ dnl ======================================================================
+-LT_INIT(dlopen disable-shared) 
++LT_INIT(dlopen) 
+ LT_OUTPUT
+ 
+ dnl ======================================================================
+@@ -781,11 +769,6 @@
+ dnl ------------------------------------------------------------------------
+ dnl Check to see if libtool has enabled shared libraries. Set a conditional
+ dnl as some Makefiles will build based on availability of shared libraries.
+-if (./libtool --features | grep '^enable shared libraries' > /dev/null); then
+-  enable_shared=yes
+-else
+-  enable_shared=no
+-fi
+ 
+ dnl ------------------------------------------------------------------------
+ dnl Specify shared library extension the host machine should recognize.
+@@ -840,23 +823,8 @@
+ dnl name of the compiler and the reported version number.
+ AC_SUBST([F77_VERSION])
+ dnl Strip anything that looks like a flag off of $F77
+-F77_NOFLAGS=`echo $F77 | sed 's/ -.*//'`
+-
+-if `echo $F77_NOFLAGS | grep ^/ >/dev/null 2>&1`; then
+-  F77_VERSION="$F77"
+-else
+-  F77_VERSION="$F77";
+-  for x in `echo $PATH | sed -e 's/:/ /g'`; do
+-    if test -x $x/$F77_NOFLAGS; then
+-      F77_VERSION="$x/$F77"
+-      break
+-    fi
+-  done
+-fi
+-if test -n "$fc_version_info"; then
+-  F77_VERSION="$F77_VERSION ( $fc_version_info)"
+-fi
+ 
++F77_VERSION="$F77";
+ 
+ dnl This part doesn't work yet since HDF4 config files do not contain
+ dnl information for fortran_vendor and fortran_version. 
+diff -Nur hdf-4.2.7-patch1.orig/hdf/test/fortestF.f hdf-4.2.7-patch1/hdf/test/fortestF.f
+--- hdf-4.2.7-patch1.orig/hdf/test/fortestF.f	2012-03-18 03:44:01.000000000 +0000
++++ hdf-4.2.7-patch1/hdf/test/fortestF.f	2012-04-13 02:20:45.000000000 +0100
+@@ -203,7 +203,7 @@
+ 
+ 	if (cmd .NE. 'Test' .AND. cmd .NE. 'test') then
+ 	 print *, 'Unknown Command: ', cmd, param
+-	 print *, 'Try one of "Skip", "Test", "Verbosity" or "Cleanup"'
++	 print *, 'Try one of Skip, Test, Verbosity or Cleanup'
+ 	 retcode = -1
+ 	 return
+ 	endif
+diff -Nur hdf-4.2.7-patch1.orig/mfhdf/libsrc/Makefile.am hdf-4.2.7-patch1/mfhdf/libsrc/Makefile.am
+--- hdf-4.2.7-patch1.orig/mfhdf/libsrc/Makefile.am	2012-03-18 03:44:00.000000000 +0000
++++ hdf-4.2.7-patch1/mfhdf/libsrc/Makefile.am	2012-04-13 02:20:45.000000000 +0100
+@@ -32,10 +32,11 @@
+ else
+ libmfhdf_la_SOURCES = $(CSOURCES)
+ endif
++libmfhdf_la_LIBADD = $(top_builddir)/hdf/src/libdf.la
+ 
+ if HDF_BUILD_XDR
+ XDRLIB = ../xdr/libxdr.la
+-libmfhdf_la_LIBADD = $(XDRLIB)
++libmfhdf_la_LIBADD += $(XDRLIB)
+ endif
+ 
+ if HDF_BUILD_NETCDF
+@@ -50,11 +51,7 @@
+ # fortran has been disabled in configure. The Fortran linker gets confused 
+ # when shared libraries are enabled, so when Fortran is not enabled,
+ # this replaces the Fortran link macro with the C link macro.
+-if HDF_BUILD_FORTRAN
+-    # do nothing
+-else
+-    F77LINK = $(LINK)
+-endif
++
+ 
+ #############################################################################
+ ##                          And the cleanup                                ##
diff --git a/sci-libs/hdf/hdf-4.2.7_p1.ebuild b/sci-libs/hdf/hdf-4.2.7_p1.ebuild
new file mode 100644
index 000000000000..3d61e44cdc75
--- /dev/null
+++ b/sci-libs/hdf/hdf-4.2.7_p1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/hdf-4.2.7_p1.ebuild,v 1.1 2012/04/13 02:19:32 bicatali Exp $
+
+EAPI=4
+inherit eutils fortran-2 toolchain-funcs autotools flag-o-matic
+
+MYP=${P/_p/-patch}
+
+DESCRIPTION="General purpose library and format for storing scientific data"
+HOMEPAGE="http://www.hdfgroup.org/hdf4.html"
+SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
+
+LICENSE="NCSA-HDF"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE="fortran szip static-libs"
+
+RDEPEND="virtual/jpeg
+	sys-libs/zlib
+	fortran? ( virtual/jpeg )
+	szip? ( >=sci-libs/szip-2 )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-autotools.patch
+	eautoreconf
+	[[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--enable-production=gentoo \
+		--disable-netcdf \
+		$(use_enable fortran) \
+		$(use_enable static-libs static) \
+		$(use_with szip szlib) \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	default
+	dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt
+	cd "${ED}"usr
+	mv bin/ncgen{,-hdf} || die
+	mv bin/ncdump{,-hdf} || die
+	mv share/man/man1/ncgen{,-hdf}.1 || die
+	mv share/man/man1/ncdump{,-hdf}.1 || die
+}