New version. Added MPI support. Removed obsolete versions.

(Portage version: 2.0.51.19)

9 files changed, 31 insertions, 117 deletions

diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index 9cd0d604aa76..8f8bfb6281b3 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sci-libs/hdf5
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.4 2005/04/01 17:12:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.5 2005/04/17 20:55:44 ribosome Exp $
+
+*hdf5-1.6.4 (17 Apr 2005)
+
+  17 Apr 2005; Olivier Fisette <ribosome@gentoo.org> -hdf5-1.4.5.ebuild,
+  -hdf5-1.6.0.ebuild, -hdf5-1.6.1.ebuild, +hdf5-1.6.4.ebuild:
+  Removed obsolete versions.
+
+*hdf5-1.6.4 (17 Apr 2005)
+
+  17 Apr 2005; Olivier Fisette <ribosome@gentoo.org> +hdf5-1.6.4.ebuild:
+  New version. Added MPI support.
 
   01 Apr 2005; Aron Griffis <agriffis@gentoo.org> hdf5-1.6.2.ebuild:
   stable on ia64
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 673003056ff6..a86b1c2c1fb3 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -1,4 +1,5 @@
 MD5 099ca103e642ee0a4396b19c7ce2ecbd hdf5-1.6.2.ebuild 1587
+MD5 4fe12c4343e859e36a2badb6fd625308 hdf5-1.6.4.ebuild 1762
 MD5 f2f8572199d5a3b64151cb03110b91cd hdf5-1.4.5.ebuild 1431
 MD5 ec2dd26bb05da8031fecafdaea7a8a56 hdf5-1.6.1.ebuild 1589
 MD5 796683f9b63678eecf54ee42b8622eb3 hdf5-1.6.0.ebuild 1569
@@ -8,3 +9,4 @@ MD5 eb29b80216a0a85ed3dbe10cd7e9cb0f files/digest-hdf5-1.4.5 69
 MD5 65fa18117e012e612d6e02d2964b857a files/digest-hdf5-1.6.0 63
 MD5 325f4b92c8b4cc354a8d21a7d94e4bdd files/digest-hdf5-1.6.1 63
 MD5 e5bd4cad7b0583c6bcb603869b5582e9 files/digest-hdf5-1.6.2 63
+MD5 fb3e8576ccd8943ddf6557ebda554f0b files/digest-hdf5-1.6.4 63
diff --git a/sci-libs/hdf5/files/digest-hdf5-1.4.5 b/sci-libs/hdf5/files/digest-hdf5-1.4.5
deleted file mode 100644
index 89e8b7c68598..000000000000
--- a/sci-libs/hdf5/files/digest-hdf5-1.4.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 657553ddfee1a7da0b5e2718203bcb44 hdf5-1.4.5-post2.tar.gz 3046682
diff --git a/sci-libs/hdf5/files/digest-hdf5-1.6.0 b/sci-libs/hdf5/files/digest-hdf5-1.6.0
deleted file mode 100644
index 37d31d40362d..000000000000
--- a/sci-libs/hdf5/files/digest-hdf5-1.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6002dd2774931ec8c429671cb416d26e hdf5-1.6.0.tar.gz 3788918
diff --git a/sci-libs/hdf5/files/digest-hdf5-1.6.1 b/sci-libs/hdf5/files/digest-hdf5-1.6.1
deleted file mode 100644
index b5dff7ee4d6d..000000000000
--- a/sci-libs/hdf5/files/digest-hdf5-1.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 db1ea5374572412b6e75f7916effe064 hdf5-1.6.1.tar.gz 3865040
diff --git a/sci-libs/hdf5/files/digest-hdf5-1.6.4 b/sci-libs/hdf5/files/digest-hdf5-1.6.4
new file mode 100644
index 000000000000..1fc0a2f53d0d
--- /dev/null
+++ b/sci-libs/hdf5/files/digest-hdf5-1.6.4
@@ -0,0 +1 @@
+MD5 a837391b633fc4c6681905d89047c032 hdf5-1.6.4.tar.gz 4862437
diff --git a/sci-libs/hdf5/hdf5-1.4.5.ebuild b/sci-libs/hdf5/hdf5-1.4.5.ebuild
deleted file mode 100644
index cfef6b25d7e6..000000000000
--- a/sci-libs/hdf5/hdf5-1.4.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.4.5.ebuild,v 1.1 2004/12/28 20:55:37 ribosome Exp $
-
-DESCRIPTION="HDF5 is a general purpose library and file format for storing scientific data."
-SRC_URI="ftp://ftp.ncsa.uiuc.edu/HDF/HDF5/current/src/${P}-post2.tar.gz"
-HOMEPAGE="http://hdf.ncsa.uiuc.edu/HDF5/"
-
-LICENSE="NCSA-HDF"
-KEYWORDS="x86"
-SLOT="0"
-IUSE="static zlib"
-
-DEPEND="zlib? ( sys-libs/zlib )"
-
-# set the source directory
-S=${WORKDIR}/${P}-post2
-
-src_compile() {
-	local myconf
-
-	use static || myconf="--disable-static"
-	use zlib || myconf="${myconf} --disable-zlib"
-
-	# 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
-
-	./configure ${myconf} --enable-linux-lfs \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "configure failed"
-
-	# restore the ARCH environment variable
-	ARCH=${EBUILD_ARCH}
-
-	make || die "emake failed"
-}
-
-src_install() {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die "make install failed"
-
-	dodoc README.txt COPYING MANIFEST
-	dohtml doc/html/*
-}
diff --git a/sci-libs/hdf5/hdf5-1.6.0.ebuild b/sci-libs/hdf5/hdf5-1.6.0.ebuild
deleted file mode 100644
index 628f8996ee8a..000000000000
--- a/sci-libs/hdf5/hdf5-1.6.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.0.ebuild,v 1.1 2004/12/28 20:55:37 ribosome Exp $
-
-DESCRIPTION="HDF5 is a general purpose library and file format for storing scientific data."
-SRC_URI="ftp://ftp.ncsa.uiuc.edu/HDF/HDF5/current/src/${P}.tar.gz"
-HOMEPAGE="http://hdf.ncsa.uiuc.edu/HDF5/"
-
-LICENSE="NCSA-HDF"
-KEYWORDS="x86"
-SLOT="0"
-IUSE="static zlib ssl"
-
-DEPEND="zlib? ( sys-libs/zlib )"
-
-src_compile() {
-	local myconf
-
-	#--disable-static conflicts with --enable-cxx, so we have to do either or
-	use static && myconf="--enable-cxx" || myconf="--disable-static"
-	use zlib || myconf="${myconf} --disable-zlib"
-	use ssl && myconf="${myconf} --with-ssl"
-
-	# 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
-
-	./configure ${myconf} --enable-linux-lfs --with-gnu-ld \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "configure failed"
-
-	# restore the ARCH environment variable
-	ARCH=${EBUILD_ARCH}
-
-	make || die "emake failed"
-}
-
-src_install() {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		docdir=${D}/usr/share/doc/${PF} \
-		infodir=${D}/usr/share/info \
-		install || die "make install failed"
-
-	dodoc README.txt COPYING MANIFEST
-	dohtml doc/html/*
-}
diff --git a/sci-libs/hdf5/hdf5-1.6.1.ebuild b/sci-libs/hdf5/hdf5-1.6.4.ebuild
index 96659169a867..5888289ac9df 100644
--- a/sci-libs/hdf5/hdf5-1.6.1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.6.4.ebuild
@@ -1,17 +1,21 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.1.ebuild,v 1.1 2004/12/28 20:55:37 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.4.ebuild,v 1.1 2005/04/17 20:55:44 ribosome Exp $
 
-DESCRIPTION="general purpose library and file format for storing scientific data"
+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="x86 ~ppc ~sparc ~alpha ~ia64 amd64"
-IUSE="static zlib ssl"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="static zlib ssl mpi hlapi szip"
 
-DEPEND="zlib? ( sys-libs/zlib )"
+DEPEND="zlib? ( sys-libs/zlib )
+		szip? ( sci-libs/szip )
+		mpi? ( || ( sys-cluster/lam-mpi sys-cluster/mpich ) )"
 
 src_compile() {
 	local myconf
@@ -20,6 +24,8 @@ src_compile() {
 	use static && myconf="--enable-cxx" || myconf="--disable-static"
 	use zlib || myconf="${myconf} --disable-zlib"
 	use ssl && myconf="${myconf} --with-ssl"
+	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
@@ -28,6 +34,8 @@ src_compile() {
 	EBUILD_ARCH=${ARCH}
 	unset ARCH
 
+	use mpi && \
+	export CC="/usr/bin/mpicc"
 	./configure ${myconf} --enable-linux-lfs --with-gnu-ld \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -37,7 +45,7 @@ src_compile() {
 	# restore the ARCH environment variable
 	ARCH=${EBUILD_ARCH}
 
-	make || die "emake failed"
+	emake || die "emake failed"
 }
 
 src_install() {
@@ -45,6 +53,7 @@ src_install() {
 		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"