Version bump. Fixes bug 324119

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 201 insertions, 2 deletions

diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index 456f8dc93b94..0e2d8ba9acdb 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,12 @@
 # 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.55 2010/05/04 19:05:48 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.56 2010/06/16 19:17:43 xarthisius Exp $
+
+*hdf5-1.8.5 (16 Jun 2010)
+
+  16 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org> +hdf5-1.8.5.ebuild,
+  +files/hdf5-1.8.5-noreturn.patch:
+  Version bump. Fixes bug 324119
 
   04 May 2010; Sébastien Fabbro <bicatali@gentoo.org> hdf5-1.8.4-r1.ebuild:
   Changed SRC_URI, per bug #317649
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 7ad335a059fe..50e3dd2b00a0 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 1821 RMD160 a20e65447625134132cb3e8e19917eb499a463e8 SHA1 b295f26b8d39fae21201449441a8ac3c0c699048 SHA256 6f03f955186e2e2870517580bd14a637e2cf0206e7547184948653e04c464bb3
 AUX hdf5-1.8.3-destdir.patch 1475 RMD160 78bc020b5b8aaef070bafd4a99a2e57f41e5e06b SHA1 7ddfa5d47759d1f7637d0c558cead7a7af63f23d SHA256 866a431b36a5998c1930af6384ff8cd11241af1f488ac5910d247b724eedd309
@@ -8,6 +11,7 @@ AUX hdf5-1.8.3-signal.patch 2226 RMD160 afe0ea8ad24fd84bed4642436c972fb5e492045e
 AUX hdf5-1.8.4-gnutools.patch 4607 RMD160 a27fcd676bc3a04ac535dd55c48a72a5317b08a9 SHA1 8aa01c68f788bfedb490dafd0252970105810eac SHA256 d4f989f289e7fb3ee8e585b10232811c17588b730013698fc439cc0fdabcb252
 AUX hdf5-1.8.4-scaleoffset.patch 1098 RMD160 4983755ff2d284c73f8479cbf11a19b1bf4ef7c2 SHA1 29be6d6cb7de5db5e10429879f9d6673b6af1519 SHA256 596568d5cf56eba73de4e88a3e7aa0c8c13f3660279ffda783e2074e846a9b2d
 AUX hdf5-1.8.4-sigbus.patch 779 RMD160 ba4c92e0ba5ef95b1459d4b570d9113acbc65613 SHA1 3fc4c90ac42b9a59f26a459e6faf6f7410b87a9a SHA256 69c0ef464d99b6c2bd3a959b8210e7772a662054b481bed7775ec21c731bf106
+AUX hdf5-1.8.5-noreturn.patch 1477 RMD160 52c0e72b78b00effe3337f6016f716b425d29f03 SHA1 88eee2a0bb02512795a61f0ceb9d54f8df454e31 SHA256 7278c504b0e252ea5d0a9d7de5b332f0f1c0981a441efb286864b9599790c0b2
 AUX hdf5-gcc4.3.3-fix.patch 412 RMD160 ee46bae5cb81382cc8d04f6d0f31bec37d88987d SHA1 a9ad925bd4107809e45faf44cd6ee88b13ca2b8a SHA256 1583e143c57181608cd34c9accc8830d665aaf01124994ef6642aead5e22bff5
 AUX hdf5-mpich2.patch 488 RMD160 f8ab476eed88267c4b79cc56ae683dc485255921 SHA1 a3f7ee6a2f682982d8a562bcc117c7fc09b69224 SHA256 a154a32a7b6dbc8edac7c72f1a6100b9f0532d2f9591681f505e949b0db6a1e5
 AUX mpd.conf 48 RMD160 289de9bb40759e3f71229cf47e4d2af83703a85f SHA1 244eee76dbf4ff269e4489d5cc7c3577c6c1fa6b SHA256 ae740cacaf2cb798921cb2092f5af98de67445e27af3f88858f3e6d2bbb127f4
@@ -16,10 +20,21 @@ DIST hdf5-1.6.4.tar.gz 4862437 RMD160 8175af3153bb0a5a1278c01af2d3940f4fd5084f S
 DIST hdf5-1.6.7.tar.gz 5299219 RMD160 2dbbcccd32986dcd66ce804c5e90ac6c949b71f6 SHA1 9c26fe09cdad269c9a6757933f70ca164a47b8e8 SHA256 9d9a98204f8c7d82f767f27f84db2520c04f5c73a4a6348c781a0d91a296e9a2
 DIST hdf5-1.8.4-patch1.tar.gz 7180426 RMD160 69fbb9d58890abe36a19167b1511bd1073cc1935 SHA1 dd2f815d5145216fac93d0e5bf22316a2a7cc558 SHA256 8893a6e773e9140230ca638d592408a61bd1726c13784e4bdf048e8ed3591bd9
 DIST hdf5-1.8.4.tar.gz 7181176 RMD160 e448e2326b55aa89ff0bd7488cd4291d6c5485ee SHA1 37877e29c49a6af3e23aa9ad798ef12b8ba1c05c SHA256 a992fce9387a17f175b3b188dc2a42f545a3057aeb141beb3fc3361c7521f465
+DIST hdf5-1.8.5.tar.gz 7352196 RMD160 9afdb3f28ed5e6bee024995ce0a349398fc2a869 SHA1 24382b27aefcc36d8b753a11002930d7e6086e64 SHA256 4a2f38e0d8b57744433cf6647df75a7ecb79969acea86dee9b8a94f0fa5dd35b
 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.7.ebuild 7799 RMD160 992a00257e2e94d2933d61950b1a85155ce995f3 SHA1 1d51c88dc85b13f658bbfde4676de013b23da2d5 SHA256 a3cacbfed63bd26c0f9346d3e0e424b0444ce1dc6e38e2fd4fa5a87f2c9f403b
 EBUILD hdf5-1.8.4-r1.ebuild 3120 RMD160 4ee5b23198e66c6eb317a5bb7f339bee9d87c341 SHA1 3da7967aaf7cc34ea77d6e09ff8cf6f71a92b805 SHA256 004a0073d6d9e5a4ff619db114fcffe5187c8c395ce7a800c5c9aef011083f4a
 EBUILD hdf5-1.8.4_p1.ebuild 3101 RMD160 2770fb98edcf6986af4d3ef5cd47c7f4c028d297 SHA1 c0390a6a7c814211d75b2172d5b37cc925b1d060 SHA256 da11216f31d31e2910156810dd9248960a2e0a56994557217099676c2eabafc2
-MISC ChangeLog 12020 RMD160 d5dce2845fc7e0004be5c799b23ad32c19df02a1 SHA1 bb881d3c28cb6d4765fd01b52e1be87f700ab15c SHA256 273b61f314706a3112c7dbedeb4f6b012f58e2594cf7d2c1eebd303eb83fae0e
+EBUILD hdf5-1.8.5.ebuild 2969 RMD160 832a0fe260abccc9b9952fbc69a997998b6d96b7 SHA1 56e87f9eb66e046f98e2096d84ac0d94481f47c3 SHA256 4bf6e1117166a249e57204c903ce523f955ff4b1807afaa5368bfc7eca7c5482
+MISC ChangeLog 12193 RMD160 652d790bd2a0591bdacf034fa006b1f0235c195b SHA1 45312b7170ea3207e6e736334542c75c5dcadc02 SHA256 03145f3caf9737a450db617903d3183140f02e087610d29ffc5977b2b50483f2
 MISC metadata.xml 583 RMD160 e788b64c56d7bff3948e246537fb293d1fc37227 SHA1 dca2df5f45e7c16c2e8ef047bf234cf96574c754 SHA256 9163a208b1b1373520a455480f75033298df06031249220fd23b5443fa3e92ed
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iJwEAQECAAYFAkwZI2AACgkQIiMqcbOVdxTPugP/SumBygxE33VyUTng5CAbHPU/
+/Njx+nTr0plA4x2Hurme/4yZDFKZNglCjp88YcVtOw4kP6Gy30fL72AFOR+szETO
+ZGTrjgHe0HbREZ+G6ahi71zsp3s7Xs8rS8sD6g9yH4kGOS4qGQNy/i25fMpxyMDH
+YvZF3bX+t/eh2WIMbhQ=
+=V0ny
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/hdf5/files/hdf5-1.8.5-noreturn.patch b/sci-libs/hdf5/files/hdf5-1.8.5-noreturn.patch
new file mode 100644
index 000000000000..40065f7b83fe
--- /dev/null
+++ b/sci-libs/hdf5/files/hdf5-1.8.5-noreturn.patch
@@ -0,0 +1,73 @@
+--- hl/src/H5LTanalyze.c
++++ hl/src/H5LTanalyze.c
+@@ -2329,7 +2329,7 @@
+    return ret;
+ }
+ 
+-int H5LTyyerror(char *msg)
++void H5LTyyerror(char *msg)
+ {
+    printf("ERROR: %s before \"%s\".\n", msg, yytext);
+ }
+--- hl/src/H5LTanalyze.l
++++ hl/src/H5LTanalyze.l
+@@ -181,7 +181,7 @@
+    return ret;
+ }
+ 
+-int H5LTyyerror(char *msg)
++void H5LTyyerror(char *msg)
+ {
+    printf("ERROR: %s before \"%s\".\n", msg, yytext);
+ }
+--- hl/src/H5LTparse.c
++++ hl/src/H5LTparse.c
+@@ -64,7 +64,7 @@
+ #include<hdf5.h>
+ 
+ extern int yylex();
+-extern int yyerror(char *);
++extern void yyerror(char *);
+ 
+ #define STACK_SIZE      16
+ 
+--- test/dt_arith.c
++++ test/dt_arith.c
+@@ -3408,6 +3408,7 @@
+     else if(run_test==TEST_DENORM || run_test==TEST_SPECIAL)
+         return 1;
+ #endif
++    return 1;
+ }
+ 
+ 
+--- tools/h5dump/h5dump.c
++++ tools/h5dump/h5dump.c
+@@ -602,6 +602,7 @@
+  *
+  *-------------------------------------------------------------------------
+  */
++static void leave(int ret) __attribute__ ((__noreturn__));
+ static void
+ leave(int ret)
+ {
+--- tools/h5ls/h5ls.c
++++ tools/h5ls/h5ls.c
+@@ -2147,6 +2147,7 @@
+  *
+  *-------------------------------------------------------------------------
+  */
++static void leave(int ret) __attribute__ ((__noreturn__));
+ static void
+ leave(int ret)
+ {
+--- tools/h5stat/h5stat.c
++++ tools/h5stat/h5stat.c
+@@ -181,6 +181,7 @@
+     { NULL, 0, '\0' }
+ };
+ 
++static void leave(int ret) __attribute__ ((__noreturn__));
+ static void
+ leave(int ret)
+ {
diff --git a/sci-libs/hdf5/hdf5-1.8.5.ebuild b/sci-libs/hdf5/hdf5-1.8.5.ebuild
new file mode 100644
index 000000000000..cc0a01c62e98
--- /dev/null
+++ b/sci-libs/hdf5/hdf5-1.8.5.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.5.ebuild,v 1.1 2010/06/16 19:17:43 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.gz"
+
+LICENSE="NCSA-HDF"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="cxx 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.3-includes.patch
+	epatch "${FILESDIR}"/${P}-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 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 \
+		--enable-strict-format-checks \
+		--docdir=/usr/share/doc/${PF} \
+		--enable-deprecated-symbols \
+		--enable-shared \
+		$(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
+}