Fix include files for gcc-4.3 compat wrt bug #228915

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686

4 files changed, 21 insertions, 14 deletions

diff --git a/dev-libs/gmp/ChangeLog b/dev-libs/gmp/ChangeLog
index bf10f7b86f9a..25228075dd07 100644
--- a/dev-libs/gmp/ChangeLog
+++ b/dev-libs/gmp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/gmp
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.94 2008/05/02 04:46:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.95 2008/07/12 20:30:13 loki_val Exp $
+
+  12 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/gmp-4.2.2-cstdio-stdfile.patch, gmp-4.2.2-r1.ebuild:
+  Fix include files for gcc-4.3 compat wrt bug #228915
 
   02 May 2008; Mike Frysinger <vapier@gentoo.org>
   files/gmp-4.1.4-noexecstack.patch:
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index b1682745f183..45cee86cbb4d 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 4.2.2/mpf_set_str.c.diff 1062 RMD160 455375f049ff8ef809e796441ec7a83ec648287b SHA1 8e5133ec2dbf4c19738faf90f8df5343cf2533f1 SHA256 245601a618cc7fd52e11495ace7d5183dc4822eb7e8089bb5175ec519fc786cd
 AUX gmp-4.1.4-noexecstack.patch 474 RMD160 22aa94eded1650432202b93a79900be1c85a779b SHA1 fd7ca0feb59aa319ba30bdbc71b7796a0a457d76 SHA256 68601777151a1628d7bc839eddd037685c5d2e76c9453166890a5eb3cf6000c3
 AUX gmp-4.2.1-s390.diff 1848 RMD160 04eecb2aaae4c444841e40b33abd38a662254632 SHA1 38ba90ffd6cd9d66e07c5f71b4608e3ad9d32a6b SHA256 13c6b01e71534af2c353d79b7afd171f158b8fa6e3299e0f7c0335e516ce67ec
 AUX gmp-4.2.2-ABI-multilib.patch 12425 RMD160 b30e1a237252663199457f5f020de7fb81118e2a SHA1 d716749bad6f7996f6862bc8468eb2c7b6c89c42 SHA256 deac10a8fd120e3b8d2a566c5babfea3cf7e6ecf6cc234fe7787b4ffecacb521
+AUX gmp-4.2.2-cstdio-stdfile.patch 348 RMD160 aa3bed32f9641771f634316b34a350b648e2eae1 SHA1 a3a167cd9d6cdbbcdf6b82bd6df2c7303579b71b SHA256 a8380e52ead61c90e6e2649a08e737f8217c0951052f578c2d77a77bb1c3997a
 DIST gmp-4.2.2.tar.bz2 1747068 RMD160 4021720f78b02244197c0c49522289e7fe81aad9 SHA1 8c5f9798956f9b0162a25a56477a3566a92abc72 SHA256 2b2c0aacafa2dc41f4604b381349d49596921e38a58bf782b0d70b33f548657b
 DIST gmp-man-4.2.2.pdf 1002466 RMD160 20b37f581d5c993fcc3e092123d5554efc8b2a81 SHA1 706dfd027e208b089f95bf9ff494d298dfa5b4b7 SHA256 44a5dcfbf1bef54c5244e2a1960c479e18b9740849daffb844472c60bc8e962c
-EBUILD gmp-4.2.2-r1.ebuild 2073 RMD160 e3390d596c131879e9153de7aaf690a56cadfd61 SHA1 d93cba522df3ecf62c08b75145efa158d4cbca1c SHA256 a250ca38c6a3c3e3f544b8968322677bd0e381094913af60fc7fc55d5f8fea34
+EBUILD gmp-4.2.2-r1.ebuild 2130 RMD160 8a1fc21ca0b9bd436e4f796c1a191448e81493d8 SHA1 2ebbe7f5fb690cca61c7ef0303e5ecd09007723f SHA256 32edada9c4db462eceb40f3eb28d590107466e12a9e7dc62efb18a4640297b7d
 EBUILD gmp-4.2.2.ebuild 2058 RMD160 907d052000da0d202e660d1d848495851da11d8b SHA1 aad3a4dda5bd8f35c27a0fc2d340c69df9312c3c SHA256 1c9b5dc08b6dafa0164783858f992e42c10699a051eb249e578acc10f6b79120
-MISC ChangeLog 12923 RMD160 0070a4a61cc6660c7aad22e33ca62fb4267584fb SHA1 4fa999b41a41b92400fb79030cea1d7cd5209f4a SHA256 5a9b033ed1e85476a913e2e979e2f9582cfb5e00abe96f6efb84af421cfcc8c7
+MISC ChangeLog 13096 RMD160 4185e4ecd95f0f47a25aa732526b2ca4b2dd7cd1 SHA1 d2909627eef49f88d0678d847168dc1b1cf6f15a SHA256 4826574fdfad53b2506461a7a69f6fd5f0a33efc9f76791929a2a34c0c1ff94d
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFIGpyTj9hvisErhMIRAmocAJ9wFmHxugWgtUQ3VjAzkqr4n8h46QCg6OwF
-diqXriLBQmOI+GliYdRs5gU=
-=RYpu
------END PGP SIGNATURE-----
diff --git a/dev-libs/gmp/files/gmp-4.2.2-cstdio-stdfile.patch b/dev-libs/gmp/files/gmp-4.2.2-cstdio-stdfile.patch
new file mode 100644
index 000000000000..5246b966a089
--- /dev/null
+++ b/dev-libs/gmp/files/gmp-4.2.2-cstdio-stdfile.patch
@@ -0,0 +1,11 @@
+diff -Naurp gmp-4.2.2-orig/gmp-h.in gmp-4.2.2/gmp-h.in
+--- gmp-4.2.2-orig/gmp-h.in	2007-09-03 10:05:40.000000000 -0600
++++ gmp-4.2.2/gmp-h.in	2008-07-07 16:32:50.000000000 -0600
+@@ -517,6 +517,7 @@ typedef __mpq_struct *mpq_ptr;
+ #if defined (__cplusplus)
+ extern "C" {
+ #ifdef _GMP_H_HAVE_FILE
++#include <cstdio>
+ using std::FILE;
+ #endif
+ #endif
diff --git a/dev-libs/gmp/gmp-4.2.2-r1.ebuild b/dev-libs/gmp/gmp-4.2.2-r1.ebuild
index 7bb0e0002e44..036a96056741 100644
--- a/dev-libs/gmp/gmp-4.2.2-r1.ebuild
+++ b/dev-libs/gmp/gmp-4.2.2-r1.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/dev-libs/gmp/gmp-4.2.2-r1.ebuild,v 1.1 2008/05/02 04:23:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.2.2-r1.ebuild,v 1.2 2008/07/12 20:30:13 loki_val Exp $
 
 inherit flag-o-matic eutils libtool
 
@@ -24,6 +24,7 @@ src_unpack () {
 	epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
 	epatch "${FILESDIR}"/${PN}-4.2.2-ABI-multilib.patch
 	epatch "${FILESDIR}"/${PN}-4.2.1-s390.diff
+	epatch "${FILESDIR}"/${PN}-4.2.2-cstdio-stdfile.patch
 
 	sed -i -e 's:ABI = @ABI@:GMPABI = @GMPABI@:' \
 		Makefile.in */Makefile.in */*/Makefile.in