diff options
author | 2011-12-22 17:36:29 +0000 | |
---|---|---|
committer | 2011-12-22 17:36:29 +0000 | |
commit | 0fc165a2b55f63ec17086b5528258c47822bddc1 (patch) | |
tree | 5fa3f5bbc322f43ec1607634e8c86d8f415ef7d3 /sci-libs | |
parent | Version bump. (diff) | |
download | historical-0fc165a2b55f63ec17086b5528258c47822bddc1.tar.gz historical-0fc165a2b55f63ec17086b5528258c47822bddc1.tar.bz2 historical-0fc165a2b55f63ec17086b5528258c47822bddc1.zip |
Version bump
Package-Manager: portage-2.1.10.41/cvs/Linux x86_64
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/hdf/ChangeLog | 8 | ||||
-rw-r--r-- | sci-libs/hdf/Manifest | 13 | ||||
-rw-r--r-- | sci-libs/hdf/files/4.2.6-autotools.patch | 140 | ||||
-rw-r--r-- | sci-libs/hdf/hdf-4.2.6.ebuild | 48 |
4 files changed, 203 insertions, 6 deletions
diff --git a/sci-libs/hdf/ChangeLog b/sci-libs/hdf/ChangeLog index 103427cd0324..b1d00ed040cc 100644 --- a/sci-libs/hdf/ChangeLog +++ b/sci-libs/hdf/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-libs/hdf # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/ChangeLog,v 1.21 2011/06/21 15:17:25 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/ChangeLog,v 1.22 2011/12/22 17:36:28 bicatali Exp $ + +*hdf-4.2.6 (22 Dec 2011) + + 22 Dec 2011; Sébastien Fabbro <bicatali@gentoo.org> + +files/4.2.6-autotools.patch, +hdf-4.2.6.ebuild: + Version bump 21 Jun 2011; Justin Lecher <jlec@gentoo.org> hdf-4.2_p4.ebuild: Add dependency on virtual/fortran diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest index 4486995a84fc..387ba08edac9 100644 --- a/sci-libs/hdf/Manifest +++ b/sci-libs/hdf/Manifest @@ -1,15 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX 4.2.6-autotools.patch 4656 RMD160 4b018639c931ba066bc397d27d5058791e8ed6ee SHA1 5f1999d6d9335ef6e9e70e12531f3e72a2b4a7e2 SHA256 b7d50495650b441ae483ef7d67dc7377f07191b30d12ec10c716039731e4a22c 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_p4-patches.tar.bz2 6914 RMD160 de251f3f54c635187d507743a2bb9afb70052dfa SHA1 02575337706c2a3e4256702be7e461c40fdba026 SHA256 e04ece17fab9739f145099ee78e926ca790177033bfa102f12b328b66bbac390 +EBUILD hdf-4.2.6.ebuild 1257 RMD160 0cc5b91fb1fd0c5d77109bb57c27ec92e4b5fda7 SHA1 e441e88f7723b515defc9fda606cc161a1d30260 SHA256 c28b12bed8a77e27b469bc2ebdd01b0d44cf9b77bd537c5b6fe0bf61b9707507 EBUILD hdf-4.2_p4.ebuild 2183 RMD160 b82091e343046b908e46ebae898068cf25c5a06f SHA1 ec0a6e68623c3edd447bcd8e180d825fce7b3089 SHA256 925fdcb74ec84b238e87c587feccf10a0e2b23e2bc3fa10c051da557ce287edc -MISC ChangeLog 4493 RMD160 add9aef97c5b6617689a65d5c5ec4cdaae3c8022 SHA1 30809a25de090898a2dede23ee45530e9e2f0b29 SHA256 d23e7eeac9d2387e8b48e566e62c825ed6d1f55f35d978804db6f371deab9c17 +MISC ChangeLog 4645 RMD160 79cd29296af215d1c54036ad6e199de2981b02a1 SHA1 28b21df25f2c9dd91dabc84d7998cdaefbc997b0 SHA256 fe60148527d1e238d22846a4cea93ed778afd0935f2fc3a403e6087f576a6e51 MISC metadata.xml 760 RMD160 4ef5d149f44169242bf9425d6c0b3a2e512fe0a1 SHA1 4c0c294751b93851300fd03ea9121f6d9f36a8d2 SHA256 a753e7be3b3935681d6aa925d90c6eff98d764b8a8dbf30ed0dfc4046df39def -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk4AtgYACgkQgAnW8HDreRb4kQCgiKri397tkazB5JRDZUIwKFEx -vg4An0q0Vo4ALcIioI7Is4T2MFD9OY2t -=hkdS +iEYEARECAAYFAk7zasgACgkQ1ycZbhPLE2BLXwCfaNB4YKWiU/nVZ9MIxArwv9qa +qF8An0Xj9CjQHtOIeZp9Cods1nd98aNY +=aTUo -----END PGP SIGNATURE----- diff --git a/sci-libs/hdf/files/4.2.6-autotools.patch b/sci-libs/hdf/files/4.2.6-autotools.patch new file mode 100644 index 000000000000..c3b8bb7112b7 --- /dev/null +++ b/sci-libs/hdf/files/4.2.6-autotools.patch @@ -0,0 +1,140 @@ +diff -Nur hdf-4.2.6.orig/configure.ac hdf-4.2.6/configure.ac +--- hdf-4.2.6.orig/configure.ac 2011-12-21 23:40:35.000000000 +0000 ++++ hdf-4.2.6/configure.ac 2011-12-22 00:36:53.000000000 +0000 +@@ -199,20 +199,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], []) + +@@ -389,7 +375,7 @@ + + dnl ---------------------------------------------------------------------- + dnl Is the szip library present? +-AC_SUBST(USE_COMP_SZIP) USE_COMP_SZIP="no" ++AC_SUBST([USE_COMP_SZIP]) USE_COMP_SZIP="no" + AC_ARG_WITH([szlib], + [AC_HELP_STRING([--with-szlib=DIR], + [Use szlib library [default=no]])],, +@@ -445,14 +431,13 @@ + fi + + AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [unset HAVE_SZIP]) +- ++ ;; ++esac + if test -z "$HAVE_SZIP"; then + AC_MSG_ERROR([couldn't find szlib library]) + else + USE_COMP_SZIP="yes" + fi +- ;; +-esac + + dnl Check to see if SZIP has encoder + if test "X$HAVE_SZIP" = "Xyes"; then +@@ -702,7 +687,7 @@ + dnl ====================================================================== + dnl Libtool initialization + dnl ====================================================================== +-LT_INIT(dlopen disable-shared) ++LT_INIT(dlopen) + LT_OUTPUT + + dnl ====================================================================== +@@ -780,11 +765,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. +@@ -841,26 +821,7 @@ + dnl Strip anything that looks like a flag off of $F77 + dnl Report anything stripped as a flag in RFLAGS and + dnl only the compiler in F77_VERSION. +-F77_NOFLAGS=`echo $F77 | sed 's/ -.*//'` +-FFLAGS_TO_ADD=`echo $F77 | grep - | sed 's/.* -/-/'` +-if test -n $FFLAGS_TO_ADD; then +- FFLAGS="$FFLAGS_TO_ADD$FFLAGS" +-fi +- +-if `echo $F77_NOFLAGS | grep ^/ >/dev/null 2>&1`; then +- F77_VERSION="$F77_NOFLAGS" +-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_NOFLAGS" +- 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 +diff -Nur hdf-4.2.6.orig/hdf/test/fortestF.f hdf-4.2.6/hdf/test/fortestF.f +--- hdf-4.2.6.orig/hdf/test/fortestF.f 2011-12-21 23:40:35.000000000 +0000 ++++ hdf-4.2.6/hdf/test/fortestF.f 2011-12-21 23:47:04.000000000 +0000 +@@ -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.6.orig/mfhdf/libsrc/Makefile.am hdf-4.2.6/mfhdf/libsrc/Makefile.am +--- hdf-4.2.6.orig/mfhdf/libsrc/Makefile.am 2011-12-21 23:40:35.000000000 +0000 ++++ hdf-4.2.6/mfhdf/libsrc/Makefile.am 2011-12-21 23:48:07.000000000 +0000 +@@ -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.6.ebuild b/sci-libs/hdf/hdf-4.2.6.ebuild new file mode 100644 index 000000000000..e117743fa098 --- /dev/null +++ b/sci-libs/hdf/hdf-4.2.6.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/hdf-4.2.6.ebuild,v 1.1 2011/12/22 17:36:28 bicatali Exp $ + +EAPI=4 +inherit eutils fortran-2 toolchain-funcs autotools flag-o-matic + +DESCRIPTION="General purpose library and format for storing scientific data" +HOMEPAGE="http://www.hdfgroup.org/hdf4.html" +SRC_URI="ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/${P}.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}" + +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) +} + +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 +} |