Version bump

Package-Manager: portage-2.2.0_alpha23/cvs/Linux x86_64

3 files changed, 122 insertions, 9 deletions

diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index 5fccddc22a81..1b6e7e788c70 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/hdf5
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.64 2010/11/05 17:29:36 xarthisius Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.65 2011/02/19 09:34:11 xarthisius Exp $
+
+*hdf5-1.8.6 (19 Feb 2011)
+
+  19 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org> +hdf5-1.8.6.ebuild:
+  Version bump
 
 *hdf5-1.8.5_p1-r1 (05 Nov 2010)
 
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index c0e579a153ae..71c0cb364d9a 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -12,16 +12,18 @@ AUX hdf5-1.8.5-noreturn.patch 1477 RMD160 52c0e72b78b00effe3337f6016f716b425d29f
 AUX mpd.conf 48 RMD160 289de9bb40759e3f71229cf47e4d2af83703a85f SHA1 244eee76dbf4ff269e4489d5cc7c3577c6c1fa6b SHA256 ae740cacaf2cb798921cb2092f5af98de67445e27af3f88858f3e6d2bbb127f4
 DIST hdf5-1.8.4.tar.gz 7181176 RMD160 e448e2326b55aa89ff0bd7488cd4291d6c5485ee SHA1 37877e29c49a6af3e23aa9ad798ef12b8ba1c05c SHA256 a992fce9387a17f175b3b188dc2a42f545a3057aeb141beb3fc3361c7521f465
 DIST hdf5-1.8.5-patch1.tar.bz2 5413471 RMD160 d25d51f49e77843c0b23ad36a733c664a34cda64 SHA1 68a073656e3b50fca5f6c6b58956bf1531ca94f9 SHA256 1028be671e24dcd9826d3eabe6c0ebe674282368689dcf0f6bb5926bc8d3be25
+DIST hdf5-1.8.6.tar.bz2 5521674 RMD160 e0feec256e61e4947367a2144d9835f569035577 SHA1 348bd881c03a9568ac4ea9071833d6119c733757 SHA256 585ddb775a2aa752ebf673f972b90fb14f3732f5f1806255d101d7adc9a53004
 EBUILD hdf5-1.8.4-r1.ebuild 3080 RMD160 8f06a86f2545d7e0829ab7e94b912b0caf5f3c5d SHA1 7780cde2b3af832de707c190a0499a6f1b801a90 SHA256 c547720f34bafe46301577a72956dac4ec0bf35bd9bc0180f790d78a8b6175cf
 EBUILD hdf5-1.8.5_p1-r1.ebuild 3088 RMD160 99d361cdd3200d5a69890505be90a15ed3ea72b6 SHA1 512819d415914cbbd57894124bbc59996dea08db SHA256 3a23fb2b81229ea6ad7adbacda63e76b562433c98e8af79e060ce7fa455b433b
-MISC ChangeLog 13456 RMD160 60770500c77ab93656c25ea6375a05e9fba6631d SHA1 35d5fe8c18a69c623f73cc9ddcbf562db953b327 SHA256 12b58df6e08fd28c54b803a6a4585f535e1def345ebc2903e9d96371ef528665
+EBUILD hdf5-1.8.6.ebuild 3036 RMD160 6a08906d62772bd1c2952a0e550657f186fdff5f SHA1 9d191950d12dec9866bb3f140bd2f1b60d7c8b67 SHA256 faf4bc5df821c4042fa663df5fecf6e67b1c73cf23ff1d77ec4416275d839269
+MISC ChangeLog 13573 RMD160 8335b153c0af4a165279447bf400c0c49bbd3800 SHA1 26b180df2d22be27800a79fa09857a19889f3ef7 SHA256 d795b7a09f2ef8ecd8e847a2f75fca9fbcea2d29e51b5695f9bf5b907f716718
 MISC metadata.xml 445 RMD160 2df0c2fd89c734fbe2efbf51563ddad59bea4814 SHA1 4ae41352074e7b3fff16e5d1de312ffb00df2251 SHA256 e1dfcebd355f246f7f4b0d644e2914cebe3cf16cad2c135fe58a6985eefb61eb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAkzUPwoACgkQIiMqcbOVdxRmhgP9F3pGqd7+SHeEFoMlrnbYHlQC
-xrtboUDVdjy9r1hUwGCMDFPtp5z+TDjdxWzov/ffOSNkkKecEPbLdp5IZFv7KgH8
-oQIq3Lhvbi/8uXes1ajnYkiQq4cY3mOlALbJmatF/vktNk+Ij44J9ne/8ljOOcgf
-uuQcG7AiyApEX9cUIHI=
-=phfC
+iJwEAQECAAYFAk1fjpgACgkQIiMqcbOVdxT3nQP/Y3HQXd440caVKIReX5re1wLN
+UkQGxT50z6xL8rW2yASh3GUK4aNFcHu0z7fkB5Tm0LdqUX2P/C4ZQ1IpAaWXg0yd
+nLwsjbXVz6xx+h8vxaQ9L0MVm/JZAraIyJ/4ouNmqEtRDttGou/WMeCUmIam07xs
+6bicGR4P5cI8uSMhpcE=
+=Eq+q
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/hdf5/hdf5-1.8.6.ebuild b/sci-libs/hdf5/hdf5-1.8.6.ebuild
new file mode 100644
index 000000000000..5eb14204c000
--- /dev/null
+++ b/sci-libs/hdf5/hdf5-1.8.6.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.6.ebuild,v 1.1 2011/02/19 09:34:11 xarthisius Exp $
+
+EAPI=2
+
+inherit autotools eutils
+
+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.bz2"
+
+LICENSE="NCSA-HDF"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="cxx debug examples fortran mpi szip threads zlib"
+
+RDEPEND="mpi? ( virtual/mpi[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 has_version 'sci-libs/hdf5[-mpi]'; then
+			ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail."
+			ewarn "Try to uninstall the current hdf5 prior to enabling mpi support."
+		fi
+		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
+			export FC=mpif90
+		fi
+	elif has_version 'sci-libs/hdf5[mpi]'; then
+		ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail."
+		ewarn "Try to uninstall the current hdf5 prior to disabling mpi support."
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8.3-as-needed.patch
+	epatch "${FILESDIR}"/${PN}-1.8.5-implicits.patch
+	epatch "${FILESDIR}"/${PN}-1.8.5-noreturn.patch
+	epatch "${FILESDIR}"/${PN}-1.8.4-scaleoffset.patch
+
+	# respect gentoo examples directory
+	sed -i -e "s:hdf5_examples:doc/${PF}/examples:g" \
+		$(find . -name Makefile.am) $(find . -name "run*.sh.in") || die
+	sed -i \
+		-e '/docdir/d' \
+		config/commence.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 debug && myconf="${myconf} --enable-codestack"
+	use threads && ! use fortran && ! use cxx && ! use mpi \
+		&& myconf="--enable-threadsafe"
+
+	if use mpi; then
+		myconf="${myconf} --disable-cxx"
+	else
+	# workaround for bug 285148
+		if use cxx; then
+			myconf="${myconf} $(use_enable cxx) CXX=$(tc-getCXX)"
+		fi
+		if use fortran; then
+			myconf="${myconf} FC=$(tc-getFC)"
+		fi
+	fi
+
+	econf \
+		--disable-sharedlib-rpath \
+		--enable-production \
+		--docdir=/usr/share/doc/${PF} \
+		--enable-deprecated-symbols \
+		--enable-shared \
+		$(use_enable debug debug all) \
+		$(use_enable fortran) \
+		$(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
+}