Version bump, fixing a few autotools mistakes

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

4 files changed, 197 insertions, 16 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/Manifest b/sci-libs/hdf/Manifest
index 920888028e71..202d11d16b3b 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -1,28 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 4.2.6-autotools.patch 4178 RMD160 69435c47a5719cf5ec0d428c0519a7d78883c411 SHA1 5092aba176d1cd75a166b679e01df94b963d7965 SHA256 75474d558d62214167b4690fa6a0d1f9826a64332e81e1bdd4fbe4788facad3b
+AUX 4.2.7_p1-autotools.patch 4375 RMD160 07c09c56941908fa6053c0a1f7064c45e684bb61 SHA1 530eb62ec438431f521fec6215bc8ccba5b6e740 SHA256 af9581450d6695c98fae755d62a4f58eda95b43a379179d58d3b7884702379a6
 DIST HDF4.2r4.tar.gz 3914118 RMD160 13274858f1fa0c339fab83b1f9c37314bd10d624 SHA1 000fa1be9c355c490cceed786feeb269a0d355a7 SHA256 39695c85e15c391e589cfdcb98ecc9a72fbb7447f0575bff4d030d53a62e689d
 DIST hdf-4.2.6.tar.bz2 3088411 RMD160 9b8b9ccba7f84085cff2c64090d5f7c0abf7acad SHA1 914eedbd8d4714f8bc0cc10bbbad5ad7fe1e375c SHA256 9ddfc10f8703dda17f7ccf942c50f56ffd0c7b1066dd5b34ca493a799577a05f
+DIST hdf-4.2.7-patch1.tar.bz2 3027309 RMD160 a88d919bceb9002eac3f91e2059e6d887350b22c SHA1 37950d01ca242f29bc3a9eb2d20d77f466cf3f30 SHA256 3a7b5ba0ac47e5283bee3ec365e8027e88937cd1632d001ceec33af80947d1bd
 DIST hdf-4.2_p4-patches.tar.bz2 6914 RMD160 de251f3f54c635187d507743a2bb9afb70052dfa SHA1 02575337706c2a3e4256702be7e461c40fdba026 SHA256 e04ece17fab9739f145099ee78e926ca790177033bfa102f12b328b66bbac390
 EBUILD hdf-4.2.6.ebuild 1280 RMD160 a871e6815cff4efcd08dcb5dcdc674903903851c SHA1 3f912f496398f54338af61b3a4575725c91b597b SHA256 752906b275c360abab0b553113d1bf2dde87f5823a1cdba9928c1bbf153a3e08
+EBUILD hdf-4.2.7_p1.ebuild 1331 RMD160 c8e5a78f1da22dee2fc824438f209a987f188a62 SHA1 c4d74f07995a403eecb724e4a28af05fbde39b42 SHA256 ed0fdcfb054bc0a865e215eda4169128ef5670be784d3aa05881b09c9153b084
 EBUILD hdf-4.2_p4.ebuild 2183 RMD160 b82091e343046b908e46ebae898068cf25c5a06f SHA1 ec0a6e68623c3edd447bcd8e180d825fce7b3089 SHA256 925fdcb74ec84b238e87c587feccf10a0e2b23e2bc3fa10c051da557ce287edc
-MISC ChangeLog 4936 RMD160 f5592434388a5dafd5862480d392e4e4d54f79ed SHA1 12b0a5c4e51c45f67d62b0681051f407efb2ef0f SHA256 0b7d7c194750462571988469129d1c21e0da4e4b3bd29c8202d68f287e276a57
+MISC ChangeLog 5124 RMD160 014bf705d80b42dc90eb445f6f84043ea6327b3c SHA1 b330d0dd7f103fe6570131a79246af6744cd1f65 SHA256 1fd2134f92136281915cb8da1102f857166dcc830221bee05544a3255f5b0dd9
 MISC metadata.xml 760 RMD160 4ef5d149f44169242bf9425d6c0b3a2e512fe0a1 SHA1 4c0c294751b93851300fd03ea9121f6d9f36a8d2 SHA256 a753e7be3b3935681d6aa925d90c6eff98d764b8a8dbf30ed0dfc4046df39def
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPGqkBAAoJEF0huFKJUZL5Z6kQAIBxFM4ND4qBZTxzmxIM4qbc
-CAl4Td4vkNAO4I5SFnawXsd/3+fFoocl2pHen2MmQbD06yep58HConVOAXiUme+C
-+w2gH/WCKy1ZA/+HxOSWPnLZg6YbLSHnm2lH/Z5vbaojbbEuMFj+z63lM/sLLlY+
-8vddNE/zoSokV5HEQHAQ/R/h+mq+BriUVWnqzSJDyAPADvBRYtT2JuYZknkeczun
-rgfagYfDpEq5jOwNSnOv5iDIF5QWjTaKbGXZfedsOzSUl1/07GEDhuQXaJSQZIP6
-VXaMb467SDM+qGpPip8ZlIR9g4ik9Gvn9xH2pp0SZKZ/FYbo3gGuGaq1sHPRRTdM
-dOdGzrjQSJ8xgOvezCam2mUfEorGjMRWkX4aRwVxs+coR7b14bImNtAhVPcJvGIX
-wamH4kt8FTexlSqTVgZVU9UEW/2OrBVNs73XP6HTBHefJDrqiVrlk4ZIeFtn7iHn
-JN9KiOWows2KEjqBlCmLORXrdoDJlSuSpDAUiNXxndocULXDb2b7CuxhuzhIGCPk
-y9lzBGiJnuaYO+ngvGkmwUEbBpmDQWEFXoWNTMnfGqxRkLEogC0k66tndB7FZO5Y
-3Tgfm4xzb6XvDkB2tANk5Fi4r61qb3LbiEdmxyR06N1Rhx1hRqBRSXUchjRVCVGS
-sclUTaXvyOfiBo0Oi9lC
-=3/ev
+iEYEARECAAYFAk+HjT0ACgkQ1ycZbhPLE2DtPwCfZ7ee93ZNVYRX9PTqrmtiJAXG
+FP8AnjWUCgbVQOdGZE4WqR5tQueDxJFh
+=TOzr
 -----END PGP SIGNATURE-----
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
+}