Added patch to fix compilation problems with gcc-4.3

Package-Manager: portage-2.1.5_rc6

4 files changed, 60 insertions, 8 deletions

diff --git a/app-benchmarks/bonnie++/ChangeLog b/app-benchmarks/bonnie++/ChangeLog
index 8b66218c4bf3..5bb674ed8913 100644
--- a/app-benchmarks/bonnie++/ChangeLog
+++ b/app-benchmarks/bonnie++/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-benchmarks/bonnie++
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie++/ChangeLog,v 1.21 2007/09/17 21:03:36 phreak Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie++/ChangeLog,v 1.22 2008/05/02 14:21:50 dev-zero Exp $
+
+  02 May 2008; Tiziano Müller <dev-zero@gentoo.org>
+  +files/bonnie++-1.93c-missing_include.patch, bonnie++-1.93c.ebuild:
+  Added patch to fix compilation problems with gcc-4.3
 
   17 Sep 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing johnm from metadata.xml (see #186467 for reference).
diff --git a/app-benchmarks/bonnie++/Manifest b/app-benchmarks/bonnie++/Manifest
index 51742368b797..9553ac869421 100644
--- a/app-benchmarks/bonnie++/Manifest
+++ b/app-benchmarks/bonnie++/Manifest
@@ -1,5 +1,6 @@
 AUX bonnie++-1.93c-64bit.patch 646 RMD160 52a1aaeb105a092cd09a4e24c0d68ca759e5661d SHA1 890fb4fa59cdef57fb8aa672d6c5e3a4b4aa7770 SHA256 4cf8cd8809d97558993faa838236d133eec38ba1971cebce140bbb032021674b
+AUX bonnie++-1.93c-missing_include.patch 1514 RMD160 c15b99879127e51dc6f2da755d5df820ddd3b691 SHA1 6fe1b9282d09ae2c6fcf1c1ddf185d6b4e95ecd8 SHA256 b11d30969937e07af1153b9a32a96064c7ce08c6cee5b446a82eae0429028d90
 DIST bonnie++-1.93c.tgz 109175 RMD160 8754ce76854464d8df3f4b4e3adafbe6ea4746bf SHA1 85f670f5b82accb62ca2cff82e94cbbaefd5aedb SHA256 1520b088613f4308d07d85af767cf01120420f8c2b674c66cb50feccfea905a9
-EBUILD bonnie++-1.93c.ebuild 949 RMD160 e2d1706b4fdd1b296627bf8a55bdbe62295b9ea7 SHA1 a9b97e92a608b3639f9be0a61aeb58eaec412299 SHA256 353ba963aa761dd733cce35d7125e0f1238dbc5c3f4bcf660d09740321fcb840
-MISC ChangeLog 3729 RMD160 69ccfd43007387ac067508309c87ffea853a5652 SHA1 2891406140b0ed4773cbc29c259e6411c6470ae7 SHA256 32d1e8ed45a19dac405faabe6214b4b8fa61bbf93a5429d268e298dc64668dc3
+EBUILD bonnie++-1.93c.ebuild 999 RMD160 8a36dadb9eef722271f29febb995fcee6302dc1e SHA1 cefeea1c45c09b585229a69339723172100ae891 SHA256 182d75becf24c189de3a47853b4f0dc7e962d99638b7371e8006f388c73c9f28
+MISC ChangeLog 3910 RMD160 e41600060476f19fb4ab2dfa604efe216cdbf00b SHA1 b8e4284b8ea777df861c2ec80bd5a5c07331078a SHA256 368c2f59a7b77875e45aca9b0876763af601fd6facfd86752a50fbf57fa17bdb
 MISC metadata.xml 412 RMD160 e3f3062f8e45abd287cd61463334aef3b439073b SHA1 b24c29f70c3176493d3e984da3103104fb4f732b SHA256 478db6e370e234a9358c710998da3ef80dc35e978f7ff18a9bccb6c0cc2f36d8
diff --git a/app-benchmarks/bonnie++/bonnie++-1.93c.ebuild b/app-benchmarks/bonnie++/bonnie++-1.93c.ebuild
index c4c5b454eeac..af17d32ac654 100644
--- a/app-benchmarks/bonnie++/bonnie++-1.93c.ebuild
+++ b/app-benchmarks/bonnie++/bonnie++-1.93c.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie++/bonnie++-1.93c.ebuild,v 1.10 2006/05/21 09:16:36 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie++/bonnie++-1.93c.ebuild,v 1.11 2008/05/02 14:21:50 dev-zero Exp $
 
 inherit eutils
 
@@ -17,8 +17,9 @@ DEPEND=""
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-64bit.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-64bit.patch" \
+		"${FILESDIR}/${P}-missing_include.patch"
 }
 
 src_compile() {
diff --git a/app-benchmarks/bonnie++/files/bonnie++-1.93c-missing_include.patch b/app-benchmarks/bonnie++/files/bonnie++-1.93c-missing_include.patch
new file mode 100644
index 000000000000..2afe02b496bd
--- /dev/null
+++ b/app-benchmarks/bonnie++/files/bonnie++-1.93c-missing_include.patch
@@ -0,0 +1,46 @@
+diff -Naur bonnie++-1.93c.orig/bon_csv2html.cpp bonnie++-1.93c/bon_csv2html.cpp
+--- bonnie++-1.93c.orig/bon_csv2html.cpp	2008-05-02 14:12:19.000000000 +0200
++++ bonnie++-1.93c/bon_csv2html.cpp	2008-05-02 14:13:57.000000000 +0200
+@@ -3,6 +3,7 @@
+ #include <vector>
+ #include <string.h>
+ #include <math.h>
++#include <stdlib.h>
+ 
+ // Maximum number of items expected on a csv line
+ #define MAX_ITEMS 48
+diff -Naur bonnie++-1.93c.orig/getc_putc.cpp bonnie++-1.93c/getc_putc.cpp
+--- bonnie++-1.93c.orig/getc_putc.cpp	2008-05-02 14:12:19.000000000 +0200
++++ bonnie++-1.93c/getc_putc.cpp	2008-05-02 14:19:15.000000000 +0200
+@@ -12,6 +12,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <string.h>
+ #include <vector>
+ 
+ #include "duration.h"
+diff -Naur bonnie++-1.93c.orig/getc_putc_helper.cpp bonnie++-1.93c/getc_putc_helper.cpp
+--- bonnie++-1.93c.orig/getc_putc_helper.cpp	2008-05-02 14:12:19.000000000 +0200
++++ bonnie++-1.93c/getc_putc_helper.cpp	2008-05-02 14:19:57.000000000 +0200
+@@ -7,6 +7,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <string.h>
+ #include "duration.h"
+ #include <vector>
+ #include "getc_putc.h"
+diff -Naur bonnie++-1.93c.orig/zcav.cpp bonnie++-1.93c/zcav.cpp
+--- bonnie++-1.93c.orig/zcav.cpp	2008-05-02 14:12:19.000000000 +0200
++++ bonnie++-1.93c/zcav.cpp	2008-05-02 14:20:42.000000000 +0200
+@@ -9,6 +9,9 @@
+ #include "getopt.h"
+ #endif
+ 
++#include <stdlib.h>
++#include <string.h>
++
+ #define TOO_MANY_LOOPS 100
+ 
+ void usage()