early stable bump for gdal (required), plus new testing version

(Portage version: 2.1_rc1-r3)

4 files changed, 87 insertions, 4 deletions

diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index 8b3e4c125a99..7edbf53f384a 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-libs/hdf5
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.11 2006/05/21 21:44:41 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.12 2006/05/25 23:22:32 nerdboy Exp $
+
+*hdf5-1.6.5 (25 May 2006)
+
+  25 May 2006; Steve Arnold <nerdboy@gentoo.org> hdf5-1.6.4.ebuild,
+  +hdf5-1.6.5.ebuild:
+  Early stable bump for gdal (required), plus new testing version
+  (since the only real issue besides the sparc bug was the mpi thing).
+  To do: 1) resolve virtual/mpi issues for ppc64 and others
+	 2) need fix for buss error on sparc
+         3) get szip support working for other arches
 
   21 May 2006; Steve Arnold <nerdboy@gentoo.org> hdf5-1.6.2.ebuild,
   hdf5-1.6.4.ebuild:
diff --git a/sci-libs/hdf5/files/digest-hdf5-1.6.5 b/sci-libs/hdf5/files/digest-hdf5-1.6.5
new file mode 100644
index 000000000000..0e151bfe2241
--- /dev/null
+++ b/sci-libs/hdf5/files/digest-hdf5-1.6.5
@@ -0,0 +1,3 @@
+MD5 67187b3253b89f1f41756b7fd4396ecf hdf5-1.6.5.tar.gz 4930666
+RMD160 70db16a832f77aa6d0c97da517353665304b7b27 hdf5-1.6.5.tar.gz 4930666
+SHA256 85b7cfc1e34db544fa93f5bf7effe189a5e1eb97f0cfa7b212adc11915a756b2 hdf5-1.6.5.tar.gz 4930666
diff --git a/sci-libs/hdf5/hdf5-1.6.4.ebuild b/sci-libs/hdf5/hdf5-1.6.4.ebuild
index 472c2a794580..5e3a063e5ded 100644
--- a/sci-libs/hdf5/hdf5-1.6.4.ebuild
+++ b/sci-libs/hdf5/hdf5-1.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.4.ebuild,v 1.5 2006/05/21 21:44:41 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.4.ebuild,v 1.6 2006/05/25 23:22:32 nerdboy Exp $
 
 inherit eutils
 
@@ -10,8 +10,9 @@ SRC_URI="ftp://ftp.ncsa.uiuc.edu/HDF/HDF5/current/src/${P}.tar.gz"
 
 LICENSE="NCSA-HDF"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-# should try to get alpha ia64 and sparc back in here
+KEYWORDS="amd64 ppc ~ppc64 x86"
+# need to update szip to get sparc, alpha, and ia64 back in here, 
+# as well as work out the mpi issues
 IUSE="static zlib ssl mpi hlapi szip threads debug"
 
 DEPEND="zlib? ( sys-libs/zlib )
diff --git a/sci-libs/hdf5/hdf5-1.6.5.ebuild b/sci-libs/hdf5/hdf5-1.6.5.ebuild
new file mode 100644
index 000000000000..78141a5e06c6
--- /dev/null
+++ b/sci-libs/hdf5/hdf5-1.6.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.5.ebuild,v 1.1 2006/05/25 23:22:32 nerdboy Exp $
+
+inherit eutils
+
+DESCRIPTION="General purpose library and file format for storing scientific data"
+HOMEPAGE="http://hdf.ncsa.uiuc.edu/HDF5/"
+SRC_URI="ftp://ftp.ncsa.uiuc.edu/HDF/HDF5/current/src/${P}.tar.gz"
+
+LICENSE="NCSA-HDF"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+# need to update szip to get sparc, alpha, and ia64 back in here,
+# as well as work out the mpi issues
+IUSE="static zlib ssl mpi hlapi szip threads debug"
+
+DEPEND="zlib? ( sys-libs/zlib )
+		szip? ( sci-libs/szip )
+		mpi? ( virtual/mpi )"
+
+src_compile() {
+	local myconf="--with-pic"
+
+	#--disable-static conflicts with --enable-cxx, so we have to do either or
+	use static && myconf="${myconf} --enable-cxx" || \
+	    myconf="${myconf} --disable-static"
+	# fortran needs f90 support
+	#myconf="${myconf} $(use_enable fortran)"
+	use threads && myconf="${myconf} --with-pthread"
+	use debug && myconf="${myconf} --enable-debug=all"
+	use mpi && myconf="${myconf} --enable-parallel"
+	use hlapi || myconf="${myconf} --disable-hl"
+
+	# NOTE: the hdf5 configure script has its own interpretation of
+	# the ARCH environment variable which conflicts with that of
+	# ebuild/emerge. As a work around, we save the ARCH variable as
+	# EBUILD_ARCH and restore it when we are done.
+	EBUILD_ARCH=${ARCH}
+	unset ARCH
+
+	use mpi && \
+	export CC="/usr/bin/mpicc"
+	./configure --prefix=/usr ${myconf} \
+		$(use_enable zlib) \
+		$(use_with ssl) \
+		--enable-linux-lfs  \
+		--sysconfdir=/etc \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man || die "configure failed"
+
+	# restore the ARCH environment variable
+	ARCH=${EBUILD_ARCH}
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make \
+		prefix=${D}/usr \
+		mandir=${D}/usr/share/man \
+		docdir=${D}/usr/share/doc/${PF} \
+		libdir=${D}/usr/$(get_libdir)/ \
+		infodir=${D}/usr/share/info \
+		install || die "make install failed"
+
+	dodoc README.txt COPYING MANIFEST
+	dohtml doc/html/*
+}