Version bump

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x5D21B852895192F9

4 files changed, 200 insertions, 2 deletions

diff --git a/sci-libs/hdf/ChangeLog b/sci-libs/hdf/ChangeLog
index c0d3a3c4be92..e8f0925229b3 100644
--- a/sci-libs/hdf/ChangeLog
+++ b/sci-libs/hdf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/hdf
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/ChangeLog,v 1.34 2013/01/04 19:19:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/ChangeLog,v 1.35 2013/02/19 11:27:09 xarthisius Exp $
+
+*hdf-4.2.9 (19 Feb 2013)
+
+  19 Feb 2013; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/hdf-4.2.9-autotools.patch, +hdf-4.2.9.ebuild:
+  Version bump
 
   04 Jan 2013; Agostino Sarubbo <ago@gentoo.org> hdf-4.2.8.ebuild:
   Stable for ppc, wrt bug #449226
diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index 0ff998f1110d..e973b546344f 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -1,10 +1,33 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 4.2.6-autotools.patch 4178 SHA256 75474d558d62214167b4690fa6a0d1f9826a64332e81e1bdd4fbe4788facad3b SHA512 456ef76f86a16f399443a3ba4b080f02fa8ec734aa602fc273f8bde7befc2a9e13caf2275f32e87d94df11169f80aa2aa8e1b0f2f503ab73964be265794fb353 WHIRLPOOL 834581f8cf04056c9320a36c1fc7816ad527f5a6675d0a968dafdc9bec3ae2c9d79036b619d24ee11d514dc8b31b0c58574b05f48d62e081879b2d0f3abf1048
 AUX 4.2.7_p1-autotools.patch 3908 SHA256 1cbe8655274b7c5f5616c80e6b212e59d06205b70e328fae640f0c8b13d10ef5 SHA512 ba33a5a2e182feca790069f730dcc2a67d1ac22985a4e4b484e28b8cff7fe55da9675d8c2c60a2a0c733035b76df9325642e7e71a38d2ba7cc4c5378cc9a133c WHIRLPOOL e29d8ea043b93cee99044cff041c2dd8287acbf8c6f21d98ee1d49963f0e3c0e47eed7554332676eb2f82efe09a6deb3d9bcb90b4ee10e7f60f64563acc271c9
+AUX hdf-4.2.9-autotools.patch 3486 SHA256 d6293b59a25804ee637713ac30814585ede853f79d07cc2392da6353eccd7a79 SHA512 c34fafadc39e43169d353bf6d5a01b814ae5d963da2cdf3b140e83dedae84b424dcfcd770aed3512e4ae4f3f358147cf01ec9a72be7e6db5d41c39443d6d44c7 WHIRLPOOL 2edbe50b6f0972e03f2e330bfd091145606aeac10ee215473bd3aae7068607d5dea51cb5b2790e8fdc6612e56d692f74446870ed491452b2a75e57181fb0659e
 AUX hdf-ppc.patch 10374 SHA256 2702189b0a7436a260b9ffa51ae4a68d598b5b2cd36845f1c7feea70bacbde8f SHA512 ac88c595e369709dc907b5f009429654c59ae1ac31869aace2656511687d0a7093d41af218768cc825181f623d0018991d1e49e0c48329766c01f608873d2ddb WHIRLPOOL 81462bfcf6b11b924a591060fbe0b5f914ab0b69614ba1ce3e39fa768426c79852bc226c21a3ff0c49c23bbab2ecf2702c5d7464423364999e589fda13db05ef
 DIST HDF4.2r4.tar.gz 3914118 SHA256 39695c85e15c391e589cfdcb98ecc9a72fbb7447f0575bff4d030d53a62e689d
 DIST hdf-4.2.8.tar.bz2 3027253 SHA256 e8a94ae2c838007ccdd55bb3cd9684adba3ded367c09803ffc84a2704f83c00f SHA512 d033007eff74d957572db8433f66e9df6fec44f67b28ddbad6e9a2d832b5504a29e9ecc5565d861b8308bab8d0dbfce19ae1e2ade0dd758d370a333819364c8e WHIRLPOOL 89ac6a092024fe2fac61bff918c14bf90e80db0b77f48e2ffe7cbf05610a3687e214c684f49e909b985c09b6baacf3dc730a15141fb44a3d59c191777c538299
+DIST hdf-4.2.9.tar.bz2 3126686 SHA256 942a54bff4da8c0733c5626b5e11162deda1adeb65c384b141f0681c935ca98a SHA512 99630177167f115f4a7f4424cf3fc77962c4eb46698f884d0e89acfe7d585aa659fd7cdf36a29246ae518675b07182223d4337a7d0aac6344ce21ccbed9aa390 WHIRLPOOL 0ed161fba7f862c1d93aebbcb6184c0b256ce71be12fa49598f9c8bf727ea1ef46c612c41908a49774b7982f5dfe577bcb8ada2c26bf2488627952040bdd9934
 DIST hdf-4.2_p4-patches.tar.bz2 6914 SHA256 e04ece17fab9739f145099ee78e926ca790177033bfa102f12b328b66bbac390
 EBUILD hdf-4.2.8.ebuild 1435 SHA256 9bd27b4956587a3b398eba2a9ef5a72162aa486309514340acbeb96836c86203 SHA512 f9b9501f08adde9604fcd30992a587dd17d5caddfc3d46b387eda7291bc5e5237d24464607283f6063ef1595cb1fae1635548fcbd800e1f2919b027e66f5aed3 WHIRLPOOL 7711ccbb0b8e13411ece71ccb431183f87aaa737c9daffa28f28bff54a5ce68ab4ab99841293cc87ff97f5e7189b8c9f72ab7b5577406fbff25fdc7f15cf883e
+EBUILD hdf-4.2.9.ebuild 1440 SHA256 cc361c45b576409da3c5a1441e9b01b3c5a34db0453af2364943a7b4fd5c6c39 SHA512 073b9d0f725f55170136da6ade30a272b5097a0ecff1404353c37181e62c764dedca0462addccbb76eaf6fd88bb992b086c4bdff72992ed38b01cc7997c9f1a0 WHIRLPOOL 9682b95fcded9d97637ecfad6c74fa808fe70ac60824f9c7b3bea76565bcc52ccd23cfd160db74f370065baa8a01e0005209102282dd3e5bec7a94d32d3dba4f
 EBUILD hdf-4.2_p4.ebuild 2178 SHA256 11ca458f55c398fe562f79cba2e4f5c85250a6173b62805bf33f0814759a9780 SHA512 d4e61a96854d77a4827ea337e2d2df5ab45334ee091f294c50e774d8dcbea9b1e4172839782579b225d89c293599aee1750417a7b743254be4de2e9e31a33c73 WHIRLPOOL 120a8702c231c5cc18a3a657bf34fb97cbcd897f13c463790513096b080f026a871c47a5364d5d01f11085ec2338c259b2048cbf9a5c650c5dc3040fc735cbfe
-MISC ChangeLog 6560 SHA256 df3d6c8930069da0cec8e1683dec352315f95f9493d0961b5cb4bba9ccb324f8 SHA512 3607c5ad9e6d01b4566d2a5d4216cbd9cabb30ff7a49ef62af76d6a6265f85daa8a49e84b21c50371777fe82d8ca13c12a15ff4286df0bfea263a67f5cc41b6c WHIRLPOOL be541b77531ef2d7060dedbc3cc0a83465fdeac279f00efe1bf8f920877d5660f433e66660fcc97e87e1c42c02ab8b53a7197be8b43bcbdc94c4f167f3c1f146
+MISC ChangeLog 6718 SHA256 cb405c5c481142bc3066f42bcdb4de4829a9288dda3adbf42cb64c51f5c19b53 SHA512 ba23b06f3c3ce76f310afae9b8f2a77f8ff643096b10868c0f189a0f425e020a667e48d161acbbfb64b3ef1145415cce41ea1f10d3fbd4f49169deb6f8f1e38d WHIRLPOOL 378ae7d309a44a42d058eae558d9e25c34ee27c8c762373744e23de62268c1408f8dfc36612abac230987802a082c9086f7443ace902aba70befce852934cad3
 MISC metadata.xml 762 SHA256 2a3f47728f208bb059411efc4c8ea5fcba18dc6504b79ca5bb4155c2dfe87eab SHA512 23961dc14add2e7375da79e39caec4a61f20e16314cd88a278c3c887dec828a354ad48f49694ba9b699d80398d40d71b396b6017f0d4c01682b318f3157b845e WHIRLPOOL 9e797341edaea73c417221b812670a6092d6057f4934fbd624e27a12dcf864884bdd2ec61279e5bcd11f3507568ab2a65c98cbfea340130591b31834ee764213
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRI2GbAAoJEF0huFKJUZL5UoAP/3B9hNdmX7QT6BnmaFD7nSJD
+ffPGqDnsOu2jjbdLemm+cljKcJID2qURsnG9LTZwHs1qqHEOxHnUNV0UHUBFNRw3
+PgndaQgB3lRufVmHChfWNsv0CLwHNI/iBRg13rZVuKLKEkLSGUATJHQ5hgQD4p9i
+lCz55iedPnDO947jz/lbxKzeO5n9xAmRW2DLn/LnZCAG2U8IfWtBQhh6xwvxoN14
+cP1+ZtKC8Uef6RlPb1enr2zeQGQ9b+Gj7SOzjKLJi8IWGVnTcNkex7ia2y9QhajQ
+37bpJsQMNwd8jX9Iti1wwH+mGPC2V52ZRZemSsFckW6h+rsmRIZcMVI8z5tvbnxc
+D4SdJOQ+JsR80hhyUo4jH9SZfvJRMgtShzKxw8SauNqqj97hYAUzAIVQfOQfm2YD
+i/JQDHQG7lSE+aubeCrdlojY4ljQEvahkWXoUg2aoXxJ68zoGbcBNSOVVgdCrPGU
+9WWg8S4koR7mwauElrPBojN89CMnfruMZVIqHEPg2os+V1izYWgZkSRaPQEBoMC5
+Fv8DlWwv8yjoCJBpYcDEuJlrkjTbjLm9dxvyyQluY4C1S3KwxJrQkiyE6mobJ4E2
+Dn1aA+uZr+uYTLfVzS5TSo88xF1m1iOC0a2Dy6THdD2lfIk3iJq6iwnnernzXpGf
+rRNgao0T10UITJveU5/P
+=sIfA
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/hdf/files/hdf-4.2.9-autotools.patch b/sci-libs/hdf/files/hdf-4.2.9-autotools.patch
new file mode 100644
index 000000000000..a31946a0dfee
--- /dev/null
+++ b/sci-libs/hdf/files/hdf-4.2.9-autotools.patch
@@ -0,0 +1,112 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -216,20 +216,6 @@ AC_SUBST([BUILD_FORTRAN])
+ ## Build static libraries by default. Furthermore, fortran shared libraries
+ ## are unsupported. Disallow a user from enabling both shared libraries and
+ ## 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], [])
+ 
+@@ -261,7 +247,7 @@ AC_SUBST([LT_STATIC_EXEC])
+ ## ======================================================================
+ ## Libtool initialization
+ ## ======================================================================
+-LT_INIT([dlopen disable-shared])
++LT_INIT([dlopen])
+ LT_OUTPUT
+ 
+ ## ----------------------------------------------------------------------
+@@ -453,6 +439,8 @@ case "$withval" in
+ 
+     if test -z "$HAVE_SZIP"; then
+       AC_MSG_ERROR([couldn't find szlib library])
++    else
++      USE_COMP_SZIP="yes"
+     fi
+     ;;
+   no)
+@@ -496,7 +484,7 @@ case "$withval" in
+ 
+     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"
+@@ -837,11 +825,6 @@ done
+ ## ------------------------------------------------------------------------
+ ## Check to see if libtool has enabled shared libraries. Set a conditional
+ ## 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
+ 
+ ## ------------------------------------------------------------------------
+ ## Specify shared library extension the host machine should recognize.
+@@ -911,22 +894,7 @@ fi
+ ## name of the compiler and the reported version number.
+ AC_SUBST([F77_VERSION])
+ ## 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"
+ 
+ ## This part doesn't work yet since HDF4 config files do not contain
+ ## information for fortran_vendor and fortran_version. 
+--- a/hdf/test/fortestF.f
++++ b/hdf/test/fortestF.f
+@@ -203,7 +203,7 @@ C Skip command
+ 
+ 	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
+--- a/mfhdf/libsrc/Makefile.am
++++ b/mfhdf/libsrc/Makefile.am
+@@ -32,10 +32,11 @@ libmfhdf_la_SOURCES = $(CSOURCES) $(FSOURCES)
+ else
+ libmfhdf_la_SOURCES = $(CSOURCES)
+ endif
++libmfhdf_la_LIBADD = $(top_builddir)/hdf/src/libdf.la
+ 
+ if HDF_BUILD_XDR
+ XDRLIB = $(top_builddir)/mfhdf/xdr/libxdr.la
+-libmfhdf_la_LIBADD = $(XDRLIB)
++libmfhdf_la_LIBADD += $(XDRLIB)
+ endif
+ 
+ if HDF_BUILD_NETCDF
diff --git a/sci-libs/hdf/hdf-4.2.9.ebuild b/sci-libs/hdf/hdf-4.2.9.ebuild
new file mode 100644
index 000000000000..aa928acc72a5
--- /dev/null
+++ b/sci-libs/hdf/hdf-4.2.9.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/hdf-4.2.9.ebuild,v 1.1 2013/02/19 11:27:09 xarthisius Exp $
+
+EAPI=4
+
+FORTRAN_NEEDED=fortran
+
+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"
+
+SLOT="0"
+LICENSE="NCSA-HDF"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="fortran szip static-libs"
+
+RDEPEND="
+	sys-libs/zlib
+	virtual/jpeg
+	szip? ( >=sci-libs/szip-2 )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MYP}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-autotools.patch \
+		"${FILESDIR}"/${PN}-ppc.patch
+	sed -i -e 's/-R/-L/g' config/commence.am || die #rpath
+	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
+}