Fix build with gcc 4.3.

Package-Manager: portage-2.1.5_rc3

4 files changed, 66 insertions, 6 deletions

diff --git a/sci-biology/probcons/ChangeLog b/sci-biology/probcons/ChangeLog
index aa2dd60af288..f8379e39770e 100644
--- a/sci-biology/probcons/ChangeLog
+++ b/sci-biology/probcons/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/probcons
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/probcons/ChangeLog,v 1.7 2007/10/07 02:39:03 dberkholz Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/probcons/ChangeLog,v 1.8 2008/04/15 03:30:10 dberkholz Exp $
+
+  15 Apr 2008; Donnie Berkholz <dberkholz@gentoo.org>; +files/gcc-4.3.patch,
+  probcons-1.12.ebuild:
+  Fix build with gcc 4.3.
 
   07 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>; probcons-1.12.ebuild:
   Add needed quotes; don't specify the default for DESTTREE; add die messages.
diff --git a/sci-biology/probcons/Manifest b/sci-biology/probcons/Manifest
index 05a6ad414fe9..6004e32918d1 100644
--- a/sci-biology/probcons/Manifest
+++ b/sci-biology/probcons/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.10-fix-cxxflags.patch 845 RMD160 1e04c84b35c245623619c6d5a7128a8ab1c880af SHA1 9d3ecd0da754d899cd4b4016bf2dbffe5e9d87b6 SHA256 73a298114996b5d879b9ec3253d104464cb456d19382668cdf75bfe9f93f11de
+AUX gcc-4.3.patch 1300 RMD160 c0865d3158f7517154d0084edea3e9d50f11f79b SHA1 909160de3fee66ca4c1489f963aed78a870d0a9a SHA256 e9669d83770557834b54268f0b4e404981b91084587d69f6492c7160c1659d6b
 AUX probcons-1.12-cxxflags.patch 844 RMD160 c5f07264e5ef9d76baa22b676b26f4a51c76fc73 SHA1 a797284ff9a7df4a7b8bff9ee286594109aabdda SHA256 56e30ce88806c520296e0e06230e4020ac341e91738106aa5392d5fad4975502
 DIST probcons_v1_10.tar.gz 43004 RMD160 ba7caa3cadd702c3dc00c20f01bfb22416435784 SHA1 773d82f6883202ec41e5dee39713b5db649ef5b0 SHA256 f7a775ac4ba3b3261c0bbe5d2c203c96fc2551e67448aefbac83b461c931b518
 DIST probcons_v1_12.tar.gz 43200 RMD160 4d7d9a89c2c95f22056719c8349216ca1ba635c9 SHA1 ee6ce81777c9ce366f575ab4096ff07f39af9829 SHA256 ecf3f9ab9ad47e14787c76d1c64aeea5533d4038c4be0236c00cdd79104cf383
 EBUILD probcons-1.10.ebuild 1236 RMD160 b24658a6866f556bab2d9ee041540ed65fba961b SHA1 2302f7a9c2a1ba349b3949546187e34e2c7aeafe SHA256 86a6355ad1d5a3bc7914579262047bde097c3228d5ef88ae6a988beb3577c964
-EBUILD probcons-1.12.ebuild 1264 RMD160 bdcf009acfdb017a4e4a74961b2372c49c9fb5ff SHA1 00db7a6b48815d9ad17f70540b46ebf84e9dcb29 SHA256 49a648f04645247eba1566e77fc7eb93683245874b7ecf6158c9f141b35cb2bd
-MISC ChangeLog 1316 RMD160 9bee21ef7811ad7b8c78f4a9a0b80f48a4f42a57 SHA1 77247e2ad0604bb4fc59418d8f79c8259a85678b SHA256 e1175d69e7e8c0f9c7416d3fc1463caabcdbfe98c521a931bce046019bf565f2
+EBUILD probcons-1.12.ebuild 1300 RMD160 c19bda36915437cf2de710ac0248dd59fb30d4b3 SHA1 e26711df381c4ae673d7e64bd23a7cbc92d9e15a SHA256 e8398fc2ace90286d765c4a590c296a1f483894e3f33a1a5b821da9adfb4e21b
+MISC ChangeLog 1444 RMD160 a9069c5b153a2f622b1dbf19195ef22ec9055ca0 SHA1 455d981dc5d07f6b9c3fe33d521ea9f9019a10e4 SHA256 e5aa40ed58d122df426e4ca6adfa1054ddac68e1389681c6660649d7b31e48e0
 MISC metadata.xml 164 RMD160 2f441200f2672ab5f1efae7cbdb08b284603903c SHA1 61a50baedfd041e663d6c2a41a28b57e22dbb6de SHA256 f0897b09e661dc603041dab249d73253034659189becf1a34cca37a7d51ef72f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFIBCFLXVaO67S1rtsRAhyZAKDiUscIwkdpfvutyl5WRqXE0btCgwCg8LJ5
+Q3ky0fEZ8EI1tJ+1+dI6VJs=
+=XLhC
+-----END PGP SIGNATURE-----
diff --git a/sci-biology/probcons/files/gcc-4.3.patch b/sci-biology/probcons/files/gcc-4.3.patch
new file mode 100644
index 000000000000..37c45c03a98f
--- /dev/null
+++ b/sci-biology/probcons/files/gcc-4.3.patch
@@ -0,0 +1,44 @@
+diff -u probcons.orig/CompareToRef.cc probcons/CompareToRef.cc
+--- probcons.orig/CompareToRef.cc	2008-04-08 16:38:46.000000000 -0700
++++ probcons/CompareToRef.cc	2008-04-08 16:39:41.000000000 -0700
+@@ -16,6 +16,7 @@
+ #include <limits>
+ #include <cstdio>
+ #include <cstdlib>
++#include <cstring>
+ #include <cerrno>
+ #include <iomanip>
+ 
+diff -u probcons.orig/FixRef.cc probcons/FixRef.cc
+--- probcons.orig/FixRef.cc	2008-04-08 16:38:46.000000000 -0700
++++ probcons/FixRef.cc	2008-04-08 16:39:33.000000000 -0700
+@@ -17,6 +17,7 @@
+ #include <algorithm>
+ #include <cstdio>
+ #include <cstdlib>
++#include <cstring>
+ #include <cerrno>
+ #include <iomanip>
+ 
+diff -u probcons.orig/Main.cc probcons/Main.cc
+--- probcons.orig/Main.cc	2008-04-08 16:38:46.000000000 -0700
++++ probcons/Main.cc	2008-04-08 16:39:14.000000000 -0700
+@@ -21,6 +21,7 @@
+ #include <climits>
+ #include <cstdio>
+ #include <cstdlib>
++#include <cstring>
+ #include <cerrno>
+ #include <iomanip>
+ 
+diff -u probcons.orig/ProjectPairwise.cc probcons/ProjectPairwise.cc
+--- probcons.orig/ProjectPairwise.cc	2008-04-08 16:38:46.000000000 -0700
++++ probcons/ProjectPairwise.cc	2008-04-08 16:39:25.000000000 -0700
+@@ -16,6 +16,7 @@
+ #include <limits>
+ #include <cstdio>
+ #include <cstdlib>
++#include <cstring>
+ #include <cerrno>
+ #include <iomanip>
+ 
diff --git a/sci-biology/probcons/probcons-1.12.ebuild b/sci-biology/probcons/probcons-1.12.ebuild
index f596a83c8176..687298923c8b 100644
--- a/sci-biology/probcons/probcons-1.12.ebuild
+++ b/sci-biology/probcons/probcons-1.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/probcons/probcons-1.12.ebuild,v 1.2 2007/10/07 02:39:03 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/probcons/probcons-1.12.ebuild,v 1.3 2008/04/15 03:30:10 dberkholz Exp $
 
 inherit eutils toolchain-funcs
 
@@ -20,6 +20,7 @@ S="${WORKDIR}/${PN}"
 src_unpack() {
 	unpack ${A}
 	epatch "${FILESDIR}"/${P}-cxxflags.patch
+	epatch "${FILESDIR}"/gcc-4.3.patch
 }
 
 src_compile() {