Fix for gcc-4.3, drop old. Bug #226383.

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

5 files changed, 60 insertions, 24 deletions

diff --git a/app-benchmarks/bashmark/ChangeLog b/app-benchmarks/bashmark/ChangeLog
index d229d1574a14..1cda9795ddf2 100644
--- a/app-benchmarks/bashmark/ChangeLog
+++ b/app-benchmarks/bashmark/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-benchmarks/bashmark
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bashmark/ChangeLog,v 1.11 2008/01/05 16:01:49 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bashmark/ChangeLog,v 1.12 2008/06/29 10:00:27 loki_val Exp $
+
+  29 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/bashmark-0.6.2-gcc43.patch, -bashmark-0.6.1.ebuild,
+  bashmark-0.6.2.ebuild:
+  Fix for gcc-4.3, drop old. Bug #226383.
 
   05 Jan 2008; Richard Freeman <rich0@gentoo.org> bashmark-0.6.2.ebuild:
   amd64 stable - bug #204317
diff --git a/app-benchmarks/bashmark/Manifest b/app-benchmarks/bashmark/Manifest
index 88684386d964..94e00e67f7e9 100644
--- a/app-benchmarks/bashmark/Manifest
+++ b/app-benchmarks/bashmark/Manifest
@@ -1,7 +1,6 @@
 AUX bashmark-0.6.2-as-needed.patch 362 RMD160 96cc07202443f2ea40f945be3d617df3ebd79160 SHA1 73cb5ed13b7746ddb8d3798d9839f23dffc4dd39 SHA256 e15a0052cb6ca674369f979926cb6974962ec57e810599b50059c92e1c1506af
-DIST bashmark-0.6.1.tar.bz2 18927 RMD160 fe99c97249edc0d3a36c5342748bb5852e09f9e6 SHA1 9dac006170bfd410ab1832dc0776d67fcfe60a50 SHA256 97cd1e8195786dee711c6d361457d33085c6e2fe3fe3f1da251259ed1bc62555
+AUX bashmark-0.6.2-gcc43.patch 2034 RMD160 90c4ef96e17d7ca90e8bbd2aca4665bc1961e22f SHA1 48b432679fe4c105da4c923fefa216a925a9a45c SHA256 72018c7fe756c8caa375acb43fc640d4ffb5989e773dcdcea8f370f66af08fb6
 DIST bashmark-0.6.2.tar.bz2 21944 RMD160 40d0d318b98653314889fddf2b84a48b81bbfa11 SHA1 64c6397c28fddca2238a3b19943c0ec944699c72 SHA256 cdef5531069ccb9242a6c0ae3298be85053784782c4fe4a9d9518215dd2f085f
-EBUILD bashmark-0.6.1.ebuild 500 RMD160 ae412ebed859a25d20c079079181cfd8beec3975 SHA1 99a9f54bf7052dc3ad2fbed9781ff16712f4652c SHA256 4824e41a14ae0cb608701a51ec7ccc1c6616bd6162fc22a5bc8c4554bcede217
-EBUILD bashmark-0.6.2.ebuild 607 RMD160 a56d5ca6489b30742d5c97df0f5e529078ad4397 SHA1 0482fe00265fd3987a1a121fbe7495f54ddbdfef SHA256 c41d1bcfa6e59beb195dbd063808981afc69b08c201c950052423124f1659fd2
-MISC ChangeLog 1841 RMD160 8034462a68d8a1eefee681cb0c65a3e63fbf2f10 SHA1 89bcb672cf2725625a57e2362069fbba8b400675 SHA256 e4f516130a883b9d1614235d08aeb8a92c42c01f6d4d3eab09d05770c368ffc0
+EBUILD bashmark-0.6.2.ebuild 639 RMD160 f95ab70ef17d35c2498ddab17963405215a47348 SHA1 6a2f3dab62948cc6812be5d4bb269d0d23718933 SHA256 5e3714f52b4cdb9a7738e81d8acf446cbc81ec3f5bbc8282ffda45af7c893d4f
+MISC ChangeLog 2026 RMD160 2ecbbcdde4829ff833713b38f0269416b837d30e SHA1 cbab31f6565766ad66f80569c0811ef9e3ca2dc2 SHA256 96cd1a7a330679fdfc8290f35955ee9d244cb5a6c218086cf943a10d8afe5005
 MISC metadata.xml 268 RMD160 14bffab0111c258affe4eac7478d254feb13b196 SHA1 1454216e679836962a7e14a1b005c97010b736e8 SHA256 42c28f350282a2d244b43c48adb4f615aef7355c6817975e8b6dc349916f0b15
diff --git a/app-benchmarks/bashmark/bashmark-0.6.1.ebuild b/app-benchmarks/bashmark/bashmark-0.6.1.ebuild
deleted file mode 100644
index f785ffd4e592..000000000000
--- a/app-benchmarks/bashmark/bashmark-0.6.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bashmark/bashmark-0.6.1.ebuild,v 1.2 2005/06/12 18:33:22 genstef Exp $
-
-DESCRIPTION="Geno's cross platform benchmarking suite"
-HOMEPAGE="http://bashmark.coders-net.de"
-
-SRC_URI="http://bashmark.coders-net.de/download/src/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-src_install() {
-	dobin bashmark
-	dodoc ChangeLog
-}
diff --git a/app-benchmarks/bashmark/bashmark-0.6.2.ebuild b/app-benchmarks/bashmark/bashmark-0.6.2.ebuild
index d2392e2b5558..58902dd3353c 100644
--- a/app-benchmarks/bashmark/bashmark-0.6.2.ebuild
+++ b/app-benchmarks/bashmark/bashmark-0.6.2.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/app-benchmarks/bashmark/bashmark-0.6.2.ebuild,v 1.4 2008/01/05 16:01:49 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bashmark/bashmark-0.6.2.ebuild,v 1.5 2008/06/29 10:00:27 loki_val Exp $
 
 inherit eutils
 
@@ -16,7 +16,8 @@ IUSE=""
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/bashmark-0.6.2-as-needed.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 }
 
 src_install() {
diff --git a/app-benchmarks/bashmark/files/bashmark-0.6.2-gcc43.patch b/app-benchmarks/bashmark/files/bashmark-0.6.2-gcc43.patch
new file mode 100644
index 000000000000..625abdab397b
--- /dev/null
+++ b/app-benchmarks/bashmark/files/bashmark-0.6.2-gcc43.patch
@@ -0,0 +1,48 @@
+diff -NrU5 bashmark-0.6.2.orig/Benchmark.cpp bashmark-0.6.2/Benchmark.cpp
+--- bashmark-0.6.2.orig/Benchmark.cpp	2008-06-29 11:53:07.000000000 +0200
++++ bashmark-0.6.2/Benchmark.cpp	2008-06-29 11:54:02.000000000 +0200
+@@ -15,11 +15,11 @@
+  *                                                                         *
+  * You should have received a copy of the GNU General Public License       *
+  * along with this software; if not, write to the Free Software            *
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.               *
+  ***************************************************************************/
+-#include <string>
++#include <cstring>
+ #include "Benchmark.hpp"
+ #include "Stopwatch.hpp"
+ #include "Main.hpp"
+ 
+ 
+diff -NrU5 bashmark-0.6.2.orig/main.cpp bashmark-0.6.2/main.cpp
+--- bashmark-0.6.2.orig/main.cpp	2008-06-29 11:53:07.000000000 +0200
++++ bashmark-0.6.2/main.cpp	2008-06-29 11:56:40.000000000 +0200
+@@ -17,10 +17,11 @@
+  * along with this software; if not, write to the Free Software            *
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.               *
+  ***************************************************************************/
+ 
+ #include <sstream>
++#include <cstring>
+ using std::stringstream;
+ 
+ 
+ #include "Output.hpp"
+ #include "Sysinfo.hpp"
+diff -NrU5 bashmark-0.6.2.orig/Sysinfo.cpp bashmark-0.6.2/Sysinfo.cpp
+--- bashmark-0.6.2.orig/Sysinfo.cpp	2008-06-29 11:53:07.000000000 +0200
++++ bashmark-0.6.2/Sysinfo.cpp	2008-06-29 11:55:58.000000000 +0200
+@@ -15,11 +15,12 @@
+  *                                                                         *
+  * You should have received a copy of the GNU General Public License       *
+  * along with this software; if not, write to the Free Software            *
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.               *
+  ***************************************************************************/
+- 
++
++#include <cstring> 
+ #include "Sysinfo.hpp"
+ 
+ using Geno::Sysinfo;
+ using Geno::Cpu_Info;
+