Added a compilation fix for gcc 4.1.

Package-Manager: portage-2.1_pre5-r3

5 files changed, 120 insertions, 18 deletions

diff --git a/dev-util/oprofile/ChangeLog b/dev-util/oprofile/ChangeLog
index ef8b00ba038f..d402b0dd5f12 100644
--- a/dev-util/oprofile/ChangeLog
+++ b/dev-util/oprofile/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/oprofile
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/ChangeLog,v 1.24 2006/02/12 14:42:28 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/ChangeLog,v 1.25 2006/03/05 09:27:29 spock Exp $
+
+  05 Mar 2006; Michał Januszewski <spock@gentoo.org>
+  +files/oprofile-0.9.1-gcc41-compilation-fix.diff, metadata.xml,
+  oprofile-0.9.1-r1.ebuild:
+  Added a compilation fix for gcc 4.1. Patch provided by Francesco Biscani.
 
 *oprofile-0.9.1-r1 (12 Feb 2006)
 *oprofile-0.9-r1 (12 Feb 2006)
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
index d08461b14760..dae496346518 100644
--- a/dev-util/oprofile/Manifest
+++ b/dev-util/oprofile/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a3481b283b55a6a8968dd83c7f996c68 ChangeLog 3144
-RMD160 fbad337e182c483c7f6ea3c61b262d38de363071 ChangeLog 3144
-SHA256 bde2af7a7ecc1cea2e0dd665e940397cd4cd3667f932f1eff94c15f3f5496808 ChangeLog 3144
+MD5 970a85b22e53abcd38355dcd7c2b6589 ChangeLog 3369
+RMD160 c5fb16d5a8c49d0728f50584fcdc48d1a1214dfc ChangeLog 3369
+SHA256 8c877c3c30d2815e016e3837b948679b9b101b2576b5f61744819fd75aae94a6 ChangeLog 3369
 MD5 3f9580dac61b935958e6f8671c7d6ce0 files/digest-oprofile-0.9 64
 RMD160 f71dfbdc2fc12930d6d6f672b01800c263698a3c files/digest-oprofile-0.9 64
 SHA256 67fd998d2bbc37dc8fe2d08f4f733ac5e0e422b3c55693ea906091b641d0c92e files/digest-oprofile-0.9 64
@@ -19,18 +19,21 @@ SHA256 61d4779932ffe46cf3d1481400c91211d687028300e110a6b95d5a0483e65e5a files/di
 MD5 37dee2be2710a99023888aa0be7f00cd files/oprofile-0.8.2.patch 669
 RMD160 bec543dd9fe365427b8b8c4439fb77f9c7c93b29 files/oprofile-0.8.2.patch 669
 SHA256 192dc8b084d531baf185afe2fa889e9891fc815360c7ac9f7bcbedc82b0c6590 files/oprofile-0.8.2.patch 669
+MD5 cc83ba2d8c9c4f479c64ddd79bfd8734 files/oprofile-0.9.1-gcc41-compilation-fix.diff 2222
+RMD160 29fc88fdbeed18b4bba3636db8c58dae6661406b files/oprofile-0.9.1-gcc41-compilation-fix.diff 2222
+SHA256 0e23a38332e3d0a4cf16caf384acba519f15c2892bb68c3732261a42421da175 files/oprofile-0.9.1-gcc41-compilation-fix.diff 2222
 MD5 81b4b96f8a75dd6f9401a51977208564 files/oprofile-0.9.1-opcontrol_path.diff 576
 RMD160 9e30a4c3c9cc201d2d846c2649de629644b68e17 files/oprofile-0.9.1-opcontrol_path.diff 576
 SHA256 f51d661cb4969042fef98f8c4a95ac6878945a980c312d2d38be0d3eeb734896 files/oprofile-0.9.1-opcontrol_path.diff 576
-MD5 3d4a085e59f4ef22017d52452649205b metadata.xml 310
-RMD160 2f69c5a1146d8cdc1a293b375468a948a7f8d392 metadata.xml 310
-SHA256 8841385427fc5d6e14139c217050b34b99a044fded21bd4d8881c8831fed7838 metadata.xml 310
+MD5 c1a7930de5f7f9597289e4a01c0366d4 metadata.xml 307
+RMD160 c409719a8668e511d68d18b694941a938d6fcf60 metadata.xml 307
+SHA256 0df423537a6bebf20bf0422e63cc497468f4926c27c0025c8703db116cdefb69 metadata.xml 307
 MD5 d736604db5e553e455450dbce8323ba0 oprofile-0.9-r1.ebuild 2025
 RMD160 f127fc92dbdeadb02ee4273b381c30001ff8dfd8 oprofile-0.9-r1.ebuild 2025
 SHA256 d7e8b1b358cd1007e48607b13665398d618fbfaabea5a8f85c1dbda90b630c56 oprofile-0.9-r1.ebuild 2025
-MD5 891eae35194897e804ff65a88129bc49 oprofile-0.9.1-r1.ebuild 2027
-RMD160 26cbfabe7b02053328941e0940bd726485d3178a oprofile-0.9.1-r1.ebuild 2027
-SHA256 f5e1d375fa6768602a2cb4910632ed9195f26e836286c3334d38fdbce942e08b oprofile-0.9.1-r1.ebuild 2027
+MD5 394e2ad10a865a1917c10ff0b98af257 oprofile-0.9.1-r1.ebuild 2089
+RMD160 d8b6c98186890f5a9f747acaf9d2f6facee34043 oprofile-0.9.1-r1.ebuild 2089
+SHA256 db2605f099f8aa934d6c76321000fa4a1d8f0eeedbfbdd14be05c75de8aedc7f oprofile-0.9.1-r1.ebuild 2089
 MD5 135ff630712ab8618156e9c033e976e0 oprofile-0.9.1.ebuild 1969
 RMD160 a9126b6867361feeb94e82d5491e2a2e2891f27b oprofile-0.9.1.ebuild 1969
 SHA256 8ec7f7524668da44352a23df187b091c9025fad61dd429d2d8e21392f3db6307 oprofile-0.9.1.ebuild 1969
@@ -38,9 +41,9 @@ MD5 901bb3a2c4999894236a9c1e226a2527 oprofile-0.9.ebuild 1968
 RMD160 19d72381262cd0b68593f1ccb26e8b93c10d2649 oprofile-0.9.ebuild 1968
 SHA256 d1205a91902e6fcc3a7cb0625045af1925daa3a31a6208427aa58864a68cfedb oprofile-0.9.ebuild 1968
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFD70lnchej4aZK9/cRAhc7AKCHkWbfki3jW991l814QZ+Lk5Rz9ACcCyOn
-9pzEGYf+rJ+0/zUvTgYZ1Bg=
-=+31n
+iD8DBQFECq8pchej4aZK9/cRAhPvAJ9sOe5I7xFutdE2gFAIkpokK5UMBwCeNwJc
+Z2jto5eU1VgLfVdS0HkjP2E=
+=xCME
 -----END PGP SIGNATURE-----
diff --git a/dev-util/oprofile/files/oprofile-0.9.1-gcc41-compilation-fix.diff b/dev-util/oprofile/files/oprofile-0.9.1-gcc41-compilation-fix.diff
new file mode 100644
index 000000000000..82938acd351e
--- /dev/null
+++ b/dev-util/oprofile/files/oprofile-0.9.1-gcc41-compilation-fix.diff
@@ -0,0 +1,93 @@
+--- libpp/arrange_profiles.cpp.orig	2006-02-15 13:26:05.780995781 +0100
++++ libpp/arrange_profiles.cpp	2006-02-15 13:16:37.997633075 +0100
+@@ -24,6 +24,44 @@
+ #include "parse_filename.h"
+ #include "locate_images.h"
+ 
++bool profile_classes::matches(profile_classes const & classes)
++{
++	if (v.size() != classes.v.size())
++		return false;
++
++	axis_types const axis2 = classes.axis;
++
++	switch (axis) {
++		case AXIS_EVENT:
++			break;
++		case AXIS_TGID:
++		case AXIS_TID:
++			return axis2 == AXIS_TID || axis2 == AXIS_TGID;
++		case AXIS_CPU:
++			return axis2 == AXIS_CPU;
++		case AXIS_MAX:
++			return false;
++	}
++
++	// check that the events match (same event, count)
++
++	std::vector<profile_class>::const_iterator it1 = v.begin();
++	std::vector<profile_class>::const_iterator end1 = v.end();
++	std::vector<profile_class>::const_iterator it2 = classes.v.begin();
++
++	while (it1 != end1) {
++		if (it1->ptemplate.event != it2->ptemplate.event)
++			return false;
++		if (it1->ptemplate.count != it2->ptemplate.count)
++			return false;
++		// differing unit mask is considered comparable
++		++it1;
++		++it2;
++	}
++
++	return true;
++}
++
+ using namespace std;
+ 
+ namespace {
+@@ -90,45 +128,6 @@
+ };
+ 
+ 
+-bool profile_classes::matches(profile_classes const & classes)
+-{
+-	if (v.size() != classes.v.size())
+-		return false;
+-
+-	axis_types const axis2 = classes.axis;
+-
+-	switch (axis) {
+-		case AXIS_EVENT:
+-			break;
+-		case AXIS_TGID:
+-		case AXIS_TID:
+-			return axis2 == AXIS_TID || axis2 == AXIS_TGID;
+-		case AXIS_CPU:
+-			return axis2 == AXIS_CPU;
+-		case AXIS_MAX:
+-			return false;
+-	}
+-
+-	// check that the events match (same event, count)
+-
+-	vector<profile_class>::const_iterator it1 = v.begin();
+-	vector<profile_class>::const_iterator end1 = v.end();
+-	vector<profile_class>::const_iterator it2 = classes.v.begin();
+-
+-	while (it1 != end1) {
+-		if (it1->ptemplate.event != it2->ptemplate.event)
+-			return false;
+-		if (it1->ptemplate.count != it2->ptemplate.count)
+-			return false;
+-		// differing unit mask is considered comparable
+-		++it1;
+-		++it2;
+-	}
+-
+-	return true;
+-}
+-
+-
+ /// We have more than one axis of classification, tell the user.
+ void report_error(profile_classes const & classes, axis_types newaxis)
+ {
diff --git a/dev-util/oprofile/metadata.xml b/dev-util/oprofile/metadata.xml
index cbcd6f56e91e..fd37e1470d3c 100644
--- a/dev-util/oprofile/metadata.xml
+++ b/dev-util/oprofile/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>spock@gentoo.org</email>
-  <name>Michal Januszewski</name>
-  <description>Temporary maintainership.</description>
+	<email>spock@gentoo.org</email>
+	<name>Michal Januszewski</name>
+	<description>Temporary maintainership.</description>
 </maintainer>
 </pkgmetadata>
diff --git a/dev-util/oprofile/oprofile-0.9.1-r1.ebuild b/dev-util/oprofile/oprofile-0.9.1-r1.ebuild
index e0d604969313..22c3996855ab 100644
--- a/dev-util/oprofile/oprofile-0.9.1-r1.ebuild
+++ b/dev-util/oprofile/oprofile-0.9.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/oprofile-0.9.1-r1.ebuild,v 1.1 2006/02/12 14:42:28 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/oprofile-0.9.1-r1.ebuild,v 1.2 2006/03/05 09:27:29 spock Exp $
 
 inherit eutils qt3
 
@@ -23,6 +23,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/oprofile-0.8.2.patch
 	epatch ${FILESDIR}/oprofile-0.9.1-opcontrol_path.diff
+	epatch ${FILESDIR}/oprofile-0.9.1-gcc41-compilation-fix.diff
 }
 
 src_compile() {