Added patch to allow compilation with gcc-4.3 (fixes bug #228341).

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-SENTINEL-3 i686

4 files changed, 22 insertions, 4 deletions

diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index b91277c542ab..9ee227967c69 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/hdf5
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.28 2008/06/13 13:22:24 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.29 2008/06/22 11:35:43 markusle Exp $
+
+  22 Jun 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/hdf5-1.6.6-gcc4.3.patch, hdf5-1.6.6.ebuild:
+  Added patch to allow compilation with gcc-4.3 (fixes bug #228341). 
+  Thanks much to Pinky <master_up@post.cz> for his patch.
 
   13 Jun 2008; Markus Dittrich <markusle@gentoo.org> hdf5-1.6.6.ebuild:
   Removed sparc specific mask of mpi in DEPEND in favor of package.use.mask
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index b7de20ba51e7..a284e0d09604 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -1,3 +1,4 @@
+AUX hdf5-1.6.6-gcc4.3.patch 355 RMD160 109811c4e4d434bfa09ea156e67623e50b0f89a5 SHA1 c0fe43c262723e117572b687d9f3c94910e4fddc SHA256 ca1a16f1df4c58410001ca4b06886f9df47b475100078c5e9208ff7a21ca22c1
 AUX hdf5-mpich2.patch 488 RMD160 f8ab476eed88267c4b79cc56ae683dc485255921 SHA1 a3f7ee6a2f682982d8a562bcc117c7fc09b69224 SHA256 a154a32a7b6dbc8edac7c72f1a6100b9f0532d2f9591681f505e949b0db6a1e5
 AUX mpd.conf 48 RMD160 289de9bb40759e3f71229cf47e4d2af83703a85f SHA1 244eee76dbf4ff269e4489d5cc7c3577c6c1fa6b SHA256 ae740cacaf2cb798921cb2092f5af98de67445e27af3f88858f3e6d2bbb127f4
 DIST hdf5-1.6.2.tar.gz 3879147 RMD160 75678e8859e783dbb274cdabee3d916724c46780 SHA1 1afa977b371c01e53dd6e0bd3a0d879a3f2ae5a2 SHA256 aabc23cb2c744c25b71416e25bdca3b9ca8dadb9248f22314330a33d91c599ba
@@ -8,6 +9,6 @@ EBUILD hdf5-1.6.2.ebuild 1837 RMD160 2c7e527ade607fd3d98222787db400bc86c28d37 SH
 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.5.ebuild 2718 RMD160 34c64e74f0a39be11afe0615d6e012e4bac06527 SHA1 56b099effc664f6d31d84c64163bb86d0e049f59 SHA256 7709f6054d0ecbda3f246315d850b9d7d8d455b7006652591e19da0e073176de
-EBUILD hdf5-1.6.6.ebuild 7770 RMD160 a1e24322f24ebd4d7e5ee5de1bc418b0b87ceb2d SHA1 6b39f5a535e59b95847decc343299a7ebcf5144f SHA256 5871c9b08998a6bd32ab5a41acd6ae81e6c62afd9d35bf33de05d010f36ccb8c
-MISC ChangeLog 7404 RMD160 d53f373c6e885cc26bcf3f3c4f63400944c8f561 SHA1 b16ba3985e9dbc4b30eb0b4f1ce89e299e37049e SHA256 093d4996b67248fde71ea16ef96a265d363b0c692217f07ad29723b542744c59
+EBUILD hdf5-1.6.6.ebuild 7810 RMD160 784379ad99dc84c2e28d16a87ff7fb3c295638a9 SHA1 e2a8e1a58f51746a0bf0983b4ae8ec5042becf11 SHA256 1c80d372ddefb8308ec0282f36a5f430dec2096fee79eb23af94a11d244cc0d6
+MISC ChangeLog 7639 RMD160 ea41acab53310cd17bb04b29e07395f0b9f64b4d SHA1 67a637349925f08600d77784e9f24c143eb98b73 SHA256 fd2589555f5cb458357a559317c64463af8d2fc4295f868355c2ae92be6cd29c
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
diff --git a/sci-libs/hdf5/files/hdf5-1.6.6-gcc4.3.patch b/sci-libs/hdf5/files/hdf5-1.6.6-gcc4.3.patch
new file mode 100644
index 000000000000..f7a55898eedc
--- /dev/null
+++ b/sci-libs/hdf5/files/hdf5-1.6.6-gcc4.3.patch
@@ -0,0 +1,11 @@
+diff -Naur hdf5-1.6.6/c++/src/H5PropList.cpp hdf5-1.6.6.new/c++/src/H5PropList.cpp
+--- hdf5-1.6.6/c++/src/H5PropList.cpp	2007-08-16 12:12:26.000000000 -0400
++++ hdf5-1.6.6.new/c++/src/H5PropList.cpp	2008-06-22 06:32:28.000000000 -0400
+@@ -18,6 +18,7 @@
+ #else
+ #include <iostream>
+ #endif
++#include <stdlib.h>
+ #include <string>
+ 
+ #include "H5Include.h"
diff --git a/sci-libs/hdf5/hdf5-1.6.6.ebuild b/sci-libs/hdf5/hdf5-1.6.6.ebuild
index c40173ef3264..cf86e3725640 100644
--- a/sci-libs/hdf5/hdf5-1.6.6.ebuild
+++ b/sci-libs/hdf5/hdf5-1.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.6.ebuild,v 1.10 2008/06/13 13:22:24 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.6.ebuild,v 1.11 2008/06/22 11:35:43 markusle Exp $
 
 inherit eutils fixheadtails flag-o-matic fortran toolchain-funcs
 
@@ -65,6 +65,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${P}-gcc4.3.patch
 	if use mpi; then
 	    # this is required for mpich2, and should be safe otherwise
 	    epatch "${FILESDIR}/${PN}-mpich2.patch"