Update the GCC 4.3 fix to make tests work (patch by Michal Kiedrowicz).

Package-Manager: portage-2.1.5.2

3 files changed, 33 insertions, 6 deletions

diff --git a/dev-util/oprofile/ChangeLog b/dev-util/oprofile/ChangeLog
index e17efc68dad3..d4e7c07f82d7 100644
--- a/dev-util/oprofile/ChangeLog
+++ b/dev-util/oprofile/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/oprofile
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/ChangeLog,v 1.47 2008/05/07 19:19:37 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/ChangeLog,v 1.48 2008/05/31 15:12:26 spock Exp $
+
+  31 May 2008; Michał Januszewski <spock@gentoo.org>
+  files/oprofile-0.9.3-gcc43.patch:
+  Update the GCC 4.3 fix to make tests work (patch by Michal Kiedrowicz).
 
   07 May 2008; Michał Januszewski <spock@gentoo.org>
   files/oprofile-0.9.3-gcc43.patch:
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
index 7a87f8c41a7b..5508ac1e432d 100644
--- a/dev-util/oprofile/Manifest
+++ b/dev-util/oprofile/Manifest
@@ -5,7 +5,7 @@ AUX oprofile-0.8.2.patch 669 RMD160 bec543dd9fe365427b8b8c4439fb77f9c7c93b29 SHA
 AUX oprofile-0.9.1-gcc41-compilation-fix.diff 2222 RMD160 29fc88fdbeed18b4bba3636db8c58dae6661406b SHA1 5368e8f218ad979b6ffca9e3b79b8297bdd82fe2 SHA256 0e23a38332e3d0a4cf16caf384acba519f15c2892bb68c3732261a42421da175
 AUX oprofile-0.9.1-opcontrol_path.diff 576 RMD160 9e30a4c3c9cc201d2d846c2649de629644b68e17 SHA1 208e8133565654c072caadbfa5b448784d62ea3a SHA256 f51d661cb4969042fef98f8c4a95ac6878945a980c312d2d38be0d3eeb734896
 AUX oprofile-0.9.2-amd64.patch 2163 RMD160 82c2e9afc2bf6d338f382e90bcdc1a5e3fc131b2 SHA1 c5a7844a38d2b7ade57d78563a0379389f9b3455 SHA256 16419001df2cf78578e8de1244bf07b4ccd940ac92d2f369eeaa816bbe56c058
-AUX oprofile-0.9.3-gcc43.patch 6620 RMD160 b69661219745f597f16c6cd13b0204f5d6731b5b SHA1 ce5001fc205f364d23e686e5ad4fe0018268f4fc SHA256 f8daac3f955a901b91be78e59691df882dbf5c986f5a016dc61d06983892836e
+AUX oprofile-0.9.3-gcc43.patch 7398 RMD160 bf6bab5b7d1fe489a0992940cc893a1db82acc03 SHA1 4c502e095bdc2128b9891525f86d97fa614880a5 SHA256 c217da3603574d43312f50a3298705fde96cc4148aeb6f44c20a3367db7fb69e
 DIST oprofile-0.9.1-g4-counters.patch.gz 5427 RMD160 46685bcf38065aa60d1ef3c374c168f1167e1504 SHA1 46777765c11206150ba487fb1a76329ce03a0abf SHA256 0cc300f9db9d26b8298274262f5f16dbe1a97ff5fa225e30e089ccbfd35aada7
 DIST oprofile-0.9.1.tar.gz 673244 RMD160 620d06dabc913b426e0eb7e488ba9e8ec5c75321 SHA1 2faa967b15ad66e486225f0bb7849a0dab87a25a SHA256 b3ec27967f072409f692583a6fdbede5cf3dddc89ef0a7102292d8517ffb4a31
 DIST oprofile-0.9.2.tar.gz 741870 RMD160 e514b9ba6327cd84915a5b9fb5bc3b7c483484ac SHA1 5e7056ef32d91bf0c15a99bf77026980fcc017ba SHA256 4b3780ee09efe665a69151c994e0e5f01a56c57338660c18df30916904df83a6
@@ -13,12 +13,12 @@ DIST oprofile-0.9.3.tar.gz 853593 RMD160 adcacb204b9061aebf761d6545e4f0b1ba1c460
 EBUILD oprofile-0.9.1-r1.ebuild 2150 RMD160 77e15ccadba2fd9179e956a93c54c05e793acd19 SHA1 ee6085b0096d48ddb95678b86b8ccf7b50c6c87b SHA256 eed11c78a7770fd59371fd327a860726c09790c71b2d12e1f84b1338a42372a8
 EBUILD oprofile-0.9.2.ebuild 2006 RMD160 8ef5b9260cdf6b8b2285303b7c9515d194ec451c SHA1 77b72461d1a951745c33dfe603932c0d60bddcd3 SHA256 ba1a33b45aee693950d135344b1ccfbe7555a039f512408fd9de76c0b7be0709
 EBUILD oprofile-0.9.3.ebuild 2008 RMD160 79a275bd78747a1199d2cd97649db09d603a740a SHA1 8d8ca56c7ecefa567e1d14cb07e78e441a3f7131 SHA256 5213309b35f66005ac2a3fcbd46c2b28545758eec741d311a22229d1ccb399d7
-MISC ChangeLog 6282 RMD160 4674fd96a3cd628c498456eba08b9c4a75af979d SHA1 425452e5dc3b7196fca8ce51d883f86239aada7a SHA256 9dcdda67ae6b54ce550b49cf67f757390e33b166efd65d347a14d1cc944b1d8c
+MISC ChangeLog 6447 RMD160 945421c404a55c657f3528225b57f665aa57f934 SHA1 a85511eedd9c98ba82597b2bf82dba26d1ad21e6 SHA256 81d63d5077f91ea1d0dc37f891a1d026754c4c6589fbb1c3cb99faf967a15978
 MISC metadata.xml 307 RMD160 c409719a8668e511d68d18b694941a938d6fcf60 SHA1 c547c9982ae42542ad182642ca3d5608f83e202a SHA256 0df423537a6bebf20bf0422e63cc497468f4926c27c0025c8703db116cdefb69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgiAJ4ACgkQchej4aZK9/cZQQCfSqkucHdKbvddZ2as53iVQUEW
-VvMAn2YOQtJFnJoLLB53SYBuGBYV5p5x
-=n9Ed
+iEYEARECAAYFAkhBauYACgkQchej4aZK9/eT6ACfRa1aASIIGahkI4g0DYoWvLhR
+aRYAnRHUCg/Sd5F62mRt8GT56SB6TYQ5
+=gTx8
 -----END PGP SIGNATURE-----
diff --git a/dev-util/oprofile/files/oprofile-0.9.3-gcc43.patch b/dev-util/oprofile/files/oprofile-0.9.3-gcc43.patch
index 35b6a4cf0a1b..722c87c73fa6 100644
--- a/dev-util/oprofile/files/oprofile-0.9.3-gcc43.patch
+++ b/dev-util/oprofile/files/oprofile-0.9.3-gcc43.patch
@@ -188,3 +188,26 @@ diff -urp oprofile-0.9.3-orig/pp/opgprof_options.cpp oprofile-0.9.3/pp/opgprof_o
  
  #include "opgprof_options.h"
  #include "popt_options.h"
+diff -urp oprofile-0.9.3-orig/libabi/tests/abi_test.cpp oprofile-0.9.3/libabi/tests/abi_test.cpp
+--- oprofile-0.9.3-orig/libabi/tests/abi_test.cpp	2007-07-16 20:22:17.000000000 +0200
++++ oprofile-0.9.3/libabi/tests/abi_test.cpp	2008-05-23 14:31:44.000000000 +0200
+@@ -17,6 +17,8 @@
+ 
+ #include <fstream>
+ #include <iostream>
++#include <cstdlib>
++#include <cstring>
+ 
+ using namespace std;
+ 
+diff -urp oprofile-0.9.3-orig/libregex/tests/regex_test.cpp oprofile-0.9.3/libregex/tests/regex_test.cpp
+--- oprofile-0.9.3-orig/libregex/tests/regex_test.cpp	2007-07-16 20:22:17.000000000 +0200
++++ oprofile-0.9.3/libregex/tests/regex_test.cpp	2008-05-23 14:32:25.000000000 +0200
+@@ -20,6 +20,7 @@
+ 
+ #include <iostream>
+ #include <fstream>
++#include <cstdlib>
+ 
+ using namespace std;
+