Add a fix for GCC 4.3 (bug #218727).

Package-Manager: portage-2.1.5_rc6

4 files changed, 211 insertions, 4 deletions

diff --git a/dev-util/oprofile/ChangeLog b/dev-util/oprofile/ChangeLog
index 53de9d886f47..1d75f683d9a9 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.45 2008/02/06 17:38:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/ChangeLog,v 1.46 2008/04/27 19:17:44 spock Exp $
+
+  27 Apr 2008; Michał Januszewski <spock@gentoo.org>
+  +files/oprofile-0.9.3-gcc43.patch, oprofile-0.9.3.ebuild:
+  Add a fix for GCC 4.3 (bug #218727).
 
   06 Feb 2008; Jeroen Roovers <jer@gentoo.org> oprofile-0.9.3.ebuild:
   Stable for HPPA too.
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
index 36dc008cd6dc..f33167b5fd28 100644
--- a/dev-util/oprofile/Manifest
+++ b/dev-util/oprofile/Manifest
@@ -1,13 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX oprofile-0.8.2.patch 669 RMD160 bec543dd9fe365427b8b8c4439fb77f9c7c93b29 SHA1 271bbf2919ca239a4a4209cc7390354cde434ec7 SHA256 192dc8b084d531baf185afe2fa889e9891fc815360c7ac9f7bcbedc82b0c6590
 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 6527 RMD160 2ef622b9ccb329ac8527d3e27d71fea45583da26 SHA1 6669ad14d5a07d43cdd55d4c7a5211a3ad108069 SHA256 041bcc3963127f31923fef43a3826ab557c53518d04a8d392ca3560bfe745847
 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
 DIST oprofile-0.9.3.tar.gz 853593 RMD160 adcacb204b9061aebf761d6545e4f0b1ba1c4608 SHA1 88aab6c2259423548977d8485467aee98b35ed33 SHA256 4f86ab165dabcc7bc4008710a66fa0ed391c083e2a8bdf8a8f5bf11c0244b2cb
 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 1925 RMD160 4e06226b51d4491f796150115e4d6cb3c05ad7ff SHA1 48bdb57f216766141ae02e4336e925eb38df2069 SHA256 a7de2408db86eeac52149fa20efb4ec1a7e669800c6b905f7f37d71dcfb4beb3
-MISC ChangeLog 5889 RMD160 bc36c49519c6a913b88aebe6f9486ac8c76ec27d SHA1 a40acaf6d33f253b07922a5a6936c0d171d1c532 SHA256 6cf7c95d1334e45e3205f26626fe3e6d193962a0f795b8508c0ee5353b16141d
+EBUILD oprofile-0.9.3.ebuild 2008 RMD160 79a275bd78747a1199d2cd97649db09d603a740a SHA1 8d8ca56c7ecefa567e1d14cb07e78e441a3f7131 SHA256 5213309b35f66005ac2a3fcbd46c2b28545758eec741d311a22229d1ccb399d7
+MISC ChangeLog 6045 RMD160 1eb2cdfdb8a0372e7a90bc1c1fafbed18246716a SHA1 3476f5719baa6b64d35ec0ff1eddb712170f241d SHA256 143c456565025bc6e26a6e82a8a2b8c667c944179cf74ce7626df40c6d0f02f5
 MISC metadata.xml 307 RMD160 c409719a8668e511d68d18b694941a938d6fcf60 SHA1 c547c9982ae42542ad182642ca3d5608f83e202a SHA256 0df423537a6bebf20bf0422e63cc497468f4926c27c0025c8703db116cdefb69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgU0T8ACgkQchej4aZK9/es/wCdEAqSrBDDEK0/3+upDgaj8H85
+bQMAnifQOpx0M3Zw7F5/YHHctVgS61PL
+=hbf+
+-----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
new file mode 100644
index 000000000000..6987febdc0a6
--- /dev/null
+++ b/dev-util/oprofile/files/oprofile-0.9.3-gcc43.patch
@@ -0,0 +1,186 @@
+--- oprofile-gcc43/pp/oparchive.cpp.orig	2007-11-20 15:47:00.000000000 -0500

++++ oprofile-gcc43/pp/oparchive.cpp	2008-02-15 10:58:50.000000000 -0500

+@@ -12,6 +12,7 @@

+

+ #include <iostream>

+ #include <fstream>

++#include <cstdlib>

+

+ #include <errno.h>

+ #include <string.h>

+diff -up oprofile-gcc43/pp/opgprof_options.cpp.orig oprofile-gcc43/pp/opgprof_options.cpp

+--- oprofile-gcc43/pp/opgprof_options.cpp.orig	2007-11-20 15:47:00.000000000 -0500

++++ oprofile-gcc43/pp/opgprof_options.cpp	2008-02-15 10:58:50.000000000 -0500

+@@ -13,6 +13,7 @@

+ #include <list>

+ #include <iterator>

+ #include <iostream>

++#include <cstdlib>

+

+ #include "opgprof_options.h"

+ #include "popt_options.h"

+diff -up oprofile-gcc43/pp/common_option.cpp.orig oprofile-gcc43/pp/common_option.cpp

+--- oprofile-gcc43/pp/common_option.cpp.orig	2007-11-20 15:46:59.000000000 -0500

++++ oprofile-gcc43/pp/common_option.cpp	2008-02-15 10:58:50.000000000 -0500

+@@ -12,6 +12,7 @@

+ #include <iostream>

+ #include <sstream>

+ #include <iterator>

++#include <cstdlib>

+

+ #include "op_config.h"

+ #include "locate_images.h"

+diff -up oprofile-gcc43/pp/opannotate_options.cpp.orig oprofile-gcc43/pp/opannotate_options.cpp

+--- oprofile-gcc43/pp/opannotate_options.cpp.orig	2008-02-13 13:57:22.000000000 -0500

++++ oprofile-gcc43/pp/opannotate_options.cpp	2008-02-15 10:58:50.000000000 -0500

+@@ -13,6 +13,7 @@

+ #include <list>

+ #include <iterator>

+ #include <iostream>

++#include <cstdlib>

+

+ #include "profile_spec.h"

+ #include "arrange_profiles.h"

+diff -up oprofile-gcc43/libregex/demangle_symbol.cpp.orig oprofile-gcc43/libregex/demangle_symbol.cpp

+--- oprofile-gcc43/libregex/demangle_symbol.cpp.orig	2007-06-03 12:50:17.000000000 -0400

++++ oprofile-gcc43/libregex/demangle_symbol.cpp	2008-02-15 10:58:50.000000000 -0500

+@@ -8,6 +8,8 @@

+  * @author John Levon

+  */

+

++#include <cstdlib>

++

+ #include "config.h"

+

+ #include "demangle_symbol.h"

+diff -up oprofile-gcc43/libpp/sample_container.cpp.orig oprofile-gcc43/libpp/sample_container.cpp

+--- oprofile-gcc43/libpp/sample_container.cpp.orig	2003-08-10 20:59:18.000000000 -0400

++++ oprofile-gcc43/libpp/sample_container.cpp	2008-02-15 10:58:50.000000000 -0500

+@@ -9,6 +9,7 @@

+  * @author John Levon

+  */

+

++#include <climits>

+ #include <set>

+ #include <numeric>

+ #include <algorithm>

+diff -up oprofile-gcc43/libpp/profile.cpp.orig oprofile-gcc43/libpp/profile.cpp

+--- oprofile-gcc43/libpp/profile.cpp.orig	2007-11-12 16:56:07.000000000 -0500

++++ oprofile-gcc43/libpp/profile.cpp	2008-02-15 10:58:50.000000000 -0500

+@@ -15,6 +15,7 @@

+ #include <iostream>

+ #include <string>

+ #include <sstream>

++#include <cstring>

+

+ #include <cerrno>

+

+diff -up oprofile-gcc43/libpp/op_header.cpp.orig oprofile-gcc43/libpp/op_header.cpp

+--- oprofile-gcc43/libpp/op_header.cpp.orig	2007-11-12 16:56:07.000000000 -0500

++++ oprofile-gcc43/libpp/op_header.cpp	2008-02-15 10:58:50.000000000 -0500

+@@ -14,6 +14,7 @@

+ #include <iomanip>

+ #include <set>

+ #include <sstream>

++#include <cstring>

+

+ #include <sys/types.h>

+ #include <sys/stat.h>

+diff -up oprofile-gcc43/libabi/opimport.cpp.orig oprofile-gcc43/libabi/opimport.cpp

+--- oprofile-gcc43/libabi/opimport.cpp.orig	2005-08-17 15:15:41.000000000 -0400

++++ oprofile-gcc43/libabi/opimport.cpp	2008-02-15 10:58:50.000000000 -0500

+@@ -17,6 +17,8 @@

+ #include <iostream>

+ #include <vector>

+ #include <cassert>

++#include <cstring>

++#include <cstdlib>

+

+ #include <sys/types.h>

+ #include <sys/stat.h>

+diff -up oprofile-gcc43/gui/oprof_start_util.cpp.orig oprofile-gcc43/gui/oprof_start_util.cpp

+--- oprofile-gcc43/gui/oprof_start_util.cpp.orig	2005-08-07 07:15:48.000000000 -0400

++++ oprofile-gcc43/gui/oprof_start_util.cpp	2008-02-15 10:58:50.000000000 -0500

+@@ -19,6 +19,7 @@

+ #include <sstream>

+ #include <iostream>

+ #include <fstream>

++#include <cstdlib>

+

+ #include <qfiledialog.h>

+ #include <qmessagebox.h>

+diff -up oprofile-gcc43/libutil++/file_manip.cpp.orig oprofile-gcc43/libutil++/file_manip.cpp

+--- oprofile-gcc43/libutil++/file_manip.cpp.orig	2007-11-12 16:56:07.000000000 -0500

++++ oprofile-gcc43/libutil++/file_manip.cpp	2008-02-15 10:58:50.000000000 -0500

+@@ -15,6 +15,8 @@

+ #include <dirent.h>

+ #include <fnmatch.h>

+ #include <utime.h>

++#include <limits.h>

++#include <stdlib.h>

+

+ #include <cstdio>

+ #include <cerrno>

+diff -up oprofile-gcc43/libutil++/bfd_support.cpp.orig oprofile-gcc43/libutil++/bfd_support.cpp

+--- oprofile-gcc43/libutil++/bfd_support.cpp.orig	2007-11-12 16:56:07.000000000 -0500

++++ oprofile-gcc43/libutil++/bfd_support.cpp	2008-02-15 10:58:50.000000000 -0500

+@@ -19,6 +19,8 @@

+ #include <fstream>

+ #include <sstream>

+ #include <string>

++#include <cstring>

++#include <cstdlib>

+

+ using namespace std;

+

+diff -up oprofile-gcc43/libutil++/child_reader.cpp.orig oprofile-gcc43/libutil++/child_reader.cpp

+--- oprofile-gcc43/libutil++/child_reader.cpp.orig	2004-01-19 15:00:27.000000000 -0500

++++ oprofile-gcc43/libutil++/child_reader.cpp	2008-02-15 10:58:50.000000000 -0500

+@@ -11,10 +11,13 @@

+

+ #include <unistd.h>

+ #include <sys/wait.h>

++#include <limits.h>

+

+ #include <cerrno>

+ #include <sstream>

+ #include <iostream>

++#include <cstring>

++#include <cstdlib>

+

+ #include "op_libiberty.h"

+ #include "child_reader.h"

+diff -up oprofile-gcc43/libutil++/bfd_spu_support.cpp.orig oprofile-gcc43/libutil++/bfd_spu_support.cpp

+--- oprofile-gcc43/libutil++/bfd_spu_support.cpp.orig	2008-02-13 13:57:18.000000000 -0500

++++ oprofile-gcc43/libutil++/bfd_spu_support.cpp	2008-02-15 10:58:50.000000000 -0500

+@@ -20,6 +20,7 @@

+ #include <fstream>

+ #include <sstream>

+ #include <string>

++#include <cstring>

+ #include <sys/types.h>

+

+ struct spu_elf {

+diff -up oprofile-gcc43/libutil++/cverb.cpp.orig oprofile-gcc43/libutil++/cverb.cpp

+--- oprofile-gcc43/libutil++/cverb.cpp.orig	2006-11-20 10:01:48.000000000 -0500

++++ oprofile-gcc43/libutil++/cverb.cpp	2008-02-15 10:58:50.000000000 -0500

+@@ -13,6 +13,7 @@

+ #include <iostream>

+ #include <map>

+ #include <string>

++#include <cstring>

+

+ #include "cverb.h"

+

+diff -up oprofile-gcc43/libutil++/op_spu_bfd.cpp.orig oprofile-gcc43/libutil++/op_spu_bfd.cpp

+--- oprofile-gcc43/libutil++/op_spu_bfd.cpp.orig	2008-02-13 13:57:18.000000000 -0500

++++ oprofile-gcc43/libutil++/op_spu_bfd.cpp	2008-02-15 10:58:50.000000000 -0500

+@@ -14,6 +14,8 @@

+ #include <sys/stat.h>

+

+ #include <iostream>

++#include <cstring>

++#include <cstdlib>

+

+ #include "op_bfd.h"

+ #include "locate_images.h"
\ No newline at end of file
diff --git a/dev-util/oprofile/oprofile-0.9.3.ebuild b/dev-util/oprofile/oprofile-0.9.3.ebuild
index 302cb76cbc1f..668c13f196b2 100644
--- a/dev-util/oprofile/oprofile-0.9.3.ebuild
+++ b/dev-util/oprofile/oprofile-0.9.3.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-util/oprofile/oprofile-0.9.3.ebuild,v 1.5 2008/02/06 17:38:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/oprofile-0.9.3.ebuild,v 1.6 2008/04/27 19:17:44 spock Exp $
 
 inherit eutils qt3 linux-info
 
@@ -18,6 +18,12 @@ DEPEND=">=dev-libs/popt-1.7-r1
 	>=sys-libs/glibc-2.3.2-r1
 	qt3? ( $(qt_min_version 3.3) )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
 src_compile() {
 	local myconf=""