Version bump. mpi and fortran do not compile together, so disable simultaneous mpi/fortran uses until patch

Package-Manager: portage-2.2_rc50/cvs/Linux x86_64

3 files changed, 116 insertions, 3 deletions

diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index b814b36f7df1..12820e0d5486 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,12 @@
-# ChangeLog for sci-libs/hdf5
+B1;1704;0c# ChangeLog for sci-libs/hdf5
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.42 2009/10/12 19:58:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.43 2009/11/20 22:41:05 bicatali Exp $
+
+*hdf5-1.8.4 (20 Nov 2009)
+
+  20 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org> +hdf5-1.8.4.ebuild:
+  Version bump. mpi and fortran do not compile together, so disable
+  simultaneous mpi/fortran uses until patch
 
   12 Oct 2009; Jeroen Roovers <jer@gentoo.org> hdf5-1.8.3-r1.ebuild:
   Stable for HPPA (bug #245707).
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index c35e59d42b29..f628c6e2d657 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX hdf5-1.6.6-gcc4.3.patch 355 RMD160 109811c4e4d434bfa09ea156e67623e50b0f89a5 SHA1 c0fe43c262723e117572b687d9f3c94910e4fddc SHA256 ca1a16f1df4c58410001ca4b06886f9df47b475100078c5e9208ff7a21ca22c1
 AUX hdf5-1.8.3-as-needed.patch 1909 RMD160 86c153a302d2730d94ab2c741fb71eb66de6b271 SHA1 aafc558d4a5bf58d78ff807f79a81b0f2ef8f8f3 SHA256 11d4fba2970b68666d65e31178f2a07630c0c1f46ef7b18bfa16d49de776a649
 AUX hdf5-1.8.3-destdir.patch 1758 RMD160 3e8992fa473603d72189b2309ae1be9a66bbdc18 SHA1 a37816332fb9f4b7556435fefcc3b2dade4a4c69 SHA256 d28654fddf341969e2a3ba9878c68d6ca868bae07ff2ff2fa75c636119f9a8d7
@@ -14,11 +17,20 @@ DIST hdf5-1.6.5.tar.gz 4930666 RMD160 70db16a832f77aa6d0c97da517353665304b7b27 S
 DIST hdf5-1.6.6.tar.gz 5299558 RMD160 e7cf3f8d6aa5f34ef10cabf650ed43d644e54f1b SHA1 c8a9ec598cf0debb694a1d7034fd85bbd67f173b SHA256 432d02f2d6988999d3d18caa6680af3cef14c8a7537c98e7adbaa8f873fba2a7
 DIST hdf5-1.6.7.tar.gz 5299219 RMD160 2dbbcccd32986dcd66ce804c5e90ac6c949b71f6 SHA1 9c26fe09cdad269c9a6757933f70ca164a47b8e8 SHA256 9d9a98204f8c7d82f767f27f84db2520c04f5c73a4a6348c781a0d91a296e9a2
 DIST hdf5-1.8.3.tar.gz 7175884 RMD160 7b279306b5458f39dc7343c14a7c7c88459823a3 SHA1 0bf66eb5d964472eae4b6c2bb26e669dcd188140 SHA256 2e124dfd59ca00dee693c06cf2517d14b361769e65edbc1c3940063437d0a5e3
+DIST hdf5-1.8.4.tar.gz 7181176 RMD160 e448e2326b55aa89ff0bd7488cd4291d6c5485ee SHA1 37877e29c49a6af3e23aa9ad798ef12b8ba1c05c SHA256 a992fce9387a17f175b3b188dc2a42f545a3057aeb141beb3fc3361c7521f465
 EBUILD hdf5-1.6.2.ebuild 1837 RMD160 2c7e527ade607fd3d98222787db400bc86c28d37 SHA1 a1b5e54d886d09074665512428c7a1ea23f28437 SHA256 612db1a50d632dd5b0d1c63d557888c4e5765a0debf774552443cdb1dde3a49c
 EBUILD hdf5-1.6.4.ebuild 2098 RMD160 348a6f05d7677e372688ca5ecdcdea36c90df7c9 SHA1 aaeed445389bad0630f518e0778f900af9614fb1 SHA256 469176113ea60bc95a7efa63ca24e6d53baeab71660a44eaa23088fedfd911af
 EBUILD hdf5-1.6.5-r1.ebuild 6638 RMD160 b19d0ec9f56fa0ba1423a494798ab79bccc1380d SHA1 ca0a6106c94fd1745e6852b89f4e119d7d10f461 SHA256 c59e90e1383173906eb59d78bb48a57acebc94530e596501db8f6d5ee8268226
 EBUILD hdf5-1.6.6.ebuild 7782 RMD160 2ee70cea539827f28e08f18638703d9a0a87a40e SHA1 cbe8ba966c6435269a84bc120189fb63ac559f8a SHA256 ab6325efffbf410230cf8df6391e33d925c6b0ed9f7b0fcaddf57c8d174ed8fd
 EBUILD hdf5-1.6.7.ebuild 7834 RMD160 7075472110e03e5cb3b2450be55b6553841af1a5 SHA1 4396cd6dfc671ff9963f75a06ff00e7a34448c46 SHA256 ed3dfb77a31b871f430711e266b9844e1032891c5c1c7d53e4a01eb725393973
 EBUILD hdf5-1.8.3-r1.ebuild 2435 RMD160 ee9b11586a1515abfd0d3182cf119b8f6b1a4011 SHA1 41e03d5c7ee325af7843e701930d216517845f3b SHA256 eb220cc4691c19ba0ade57d30f619013440d11c6be50194d15c8c9027481e09e
-MISC ChangeLog 10065 RMD160 ca90e2743a7d8e31e0c2d3919117ca7011b5909c SHA1 473951cdb0f79760c6a6598a4c3262ec1e03674b SHA256 2b4279fd8c67a5041fa5dd23f7eb9ed5fbdf907dc51161a7039070c9663249c4
+EBUILD hdf5-1.8.4.ebuild 2589 RMD160 9ab5c738f180a86555e56a84d349295a44e063af SHA1 ca3602e03ad4d78fd2edbc8df5d7befeb4ca8036 SHA256 2470ffb601a6b6a28118dee52bea0c8fc50420f983a0249c351b42961a92398f
+MISC ChangeLog 10295 RMD160 9aa7f1ce1aab0ad7dcca427af5470c704922fcdb SHA1 8124be4c7d0e765b7b6bed1f40713cb0d65e8278 SHA256 cb45d3b2972dd683c5fd3ba09f1cb9715f8859bff62d3f1fbfe58c62f5f4c64b
 MISC metadata.xml 649 RMD160 1b9a1fca35d2d3f57bd4295590a195d2e185ac7b SHA1 3f660a0e5cbad641be13c544a3ef115121c590fb SHA256 108e74754b00646a4e0196b4c305711e210beb91f64ab3ef188369037bc2eea2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAksHJQoACgkQ1ycZbhPLE2ALzwCgmn8iZPJadIS+mxWjyov0QWux
+osYAn24Rcyr7W4MWBxZJwsTAiKmVDgls
+=Ypmm
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/hdf5/hdf5-1.8.4.ebuild b/sci-libs/hdf5/hdf5-1.8.4.ebuild
new file mode 100644
index 000000000000..290181d484df
--- /dev/null
+++ b/sci-libs/hdf5/hdf5-1.8.4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.4.ebuild,v 1.1 2009/11/20 22:41:05 bicatali Exp $
+
+EAPI=2
+inherit eutils autotools
+
+DESCRIPTION="General purpose library and file format for storing scientific data"
+HOMEPAGE="http://www.hdfgroup.org/HDF5/"
+SRC_URI="http://www.hdfgroup.org/ftp/HDF5/current/src/${P}.tar.gz"
+
+LICENSE="NCSA-HDF"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="cxx examples fortran mpi szip threads zlib"
+
+RDEPEND="mpi? ( || (
+			sys-cluster/openmpi[romio]
+			sys-cluster/mpich2[romio]
+			>=sys-cluster/lam-mpi-7.1.4[romio] ) )
+	szip? ( >=sci-libs/szip-2.1 )
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2.2
+	sys-process/time"
+
+pkg_setup() {
+	if use mpi; then
+		if use cxx; then
+			ewarn "Simultaneous mpi and cxx is not supported by ${PN}"
+			ewarn "Will disable cxx interface"
+		fi
+		export CC=mpicc
+		if use fortran; then
+			# can't make mpi and fortran to work
+			#export FC=mpif90
+			ewarn "Simultaneous use of mpi and fortran for ${PN} will not compile"
+			ewarn "Disabling fortran interface"
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8.3-as-needed.patch
+	epatch "${FILESDIR}"/${PN}-1.8.3-includes.patch
+	epatch "${FILESDIR}"/${PN}-1.8.3-noreturn.patch
+	epatch "${FILESDIR}"/${PN}-1.8.3-destdir.patch
+	epatch "${FILESDIR}"/${PN}-1.8.3-signal.patch
+
+	# gentoo examples directory
+	sed -i \
+		-e 's:$(docdir)/hdf5:$(docdir):' \
+		$(find . -name Makefile.am) || die
+	eautoreconf
+	# enable shared libs by default for h5cc config utility
+	sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" tools/misc/h5cc.in \
+		|| die "sed h5cc.in failed"
+}
+
+src_configure() {
+	# threadsafe incompatible with many options
+	local myconf="--disable-threadsafe"
+	use threads && ! use fortran && ! use cxx && ! use mpi \
+		&& myconf="--enable-threadsafe"
+
+	if use mpi; then
+		myconf="${myconf} --disable-cxx --disable-fortran"
+	else
+		myconf="${myconf} $(use_enable cxx) $(use_enable fortran)"
+	fi
+
+	econf \
+		--disable-sharedlib-rpath \
+		--enable-production \
+		--enable-strict-format-checks \
+		--docdir=/usr/share/doc/${PF} \
+		--enable-deprecated-symbols \
+		--enable-shared \
+		$(use_enable mpi parallel) \
+		$(use_with szip szlib) \
+		$(use_with threads pthread) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README.txt
+	if use examples; then
+		emake DESTDIR="${D}" install-examples \
+			|| die "emake install examples failed"
+	fi
+}