Add patch from Debian. Add missing runtime dependency.

Package-Manager: portage-2.1.1_rc1-r7

6 files changed, 134 insertions, 9 deletions

diff --git a/dev-util/kprof/ChangeLog b/dev-util/kprof/ChangeLog
index bd75ae077da9..93c98605e959 100644
--- a/dev-util/kprof/ChangeLog
+++ b/dev-util/kprof/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/kprof
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kprof/ChangeLog,v 1.12 2006/06/25 19:33:54 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kprof/ChangeLog,v 1.13 2006/09/08 18:35:11 carlo Exp $
+
+*kprof-1.4.3-r1 (08 Sep 2006)
+
+  08 Sep 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/kprof-1.4.3-debian7.diff, +kprof-1.4.3-r1.ebuild:
+  Add patch from Debian. Add missing runtime dependency.
 
   25 Jun 2006; Simon Stelling <blubb@gentoo.org> kprof-1.4.3.ebuild:
   added ~amd64 keyword
diff --git a/dev-util/kprof/Manifest b/dev-util/kprof/Manifest
index 452b1004f851..10eae835266c 100644
--- a/dev-util/kprof/Manifest
+++ b/dev-util/kprof/Manifest
@@ -2,23 +2,34 @@ AUX kprof-1.4.3-configure-arts.diff 4399 RMD160 85c4ac75f05154ad3cb89223c296e26f
 MD5 445a7cf4aac8795bbdbb620e14eceb5e files/kprof-1.4.3-configure-arts.diff 4399
 RMD160 85c4ac75f05154ad3cb89223c296e26f0806bf7d files/kprof-1.4.3-configure-arts.diff 4399
 SHA256 dc3ab4b4e324bad82ef163673f68865104526e936604e8e6b67439920565b8d2 files/kprof-1.4.3-configure-arts.diff 4399
+AUX kprof-1.4.3-debian7.diff 2296 RMD160 dcab2af23d739bc5c283e0d8bf498dea71af4ad1 SHA1 3fdea2c3cdebf31019ac0c8f05a596f69df556ed SHA256 d34219d3a71273c56c37b7a25903b6600bafff1fa3d56f33a81d2aa5146d7b7e
+MD5 ee82485ced300b59ccf934d43e7101f3 files/kprof-1.4.3-debian7.diff 2296
+RMD160 dcab2af23d739bc5c283e0d8bf498dea71af4ad1 files/kprof-1.4.3-debian7.diff 2296
+SHA256 d34219d3a71273c56c37b7a25903b6600bafff1fa3d56f33a81d2aa5146d7b7e files/kprof-1.4.3-debian7.diff 2296
 AUX kprof-1.4.3-gcc41.patch 1219 RMD160 d808a310994257706ff28e9eed3b98a9ad1d47f1 SHA1 78ca0bf7ea4d1be2252ff760557847085d870528 SHA256 d8cfec08658a6742b10e3b3a3d222cfec154dbd2d73f2af33354396609384823
 MD5 6966f390d4108876b2b86b26c68970d1 files/kprof-1.4.3-gcc41.patch 1219
 RMD160 d808a310994257706ff28e9eed3b98a9ad1d47f1 files/kprof-1.4.3-gcc41.patch 1219
 SHA256 d8cfec08658a6742b10e3b3a3d222cfec154dbd2d73f2af33354396609384823 files/kprof-1.4.3-gcc41.patch 1219
-DIST kprof-1.4.3.tar.bz2 375770
+DIST kprof-1.4.3.tar.bz2 375770 RMD160 41d0fd0cd4bd84c19e61fee77c17bf6b6cdc45fa SHA1 275aa03fc95e9154105e5ea3dc082537944a7f64 SHA256 33a2ccb3f3fe46b7667c96d681302ee941bb564b9ffe7a27abaa2c61d0d51bb9
+EBUILD kprof-1.4.3-r1.ebuild 662 RMD160 212fb466cc2612fe394f62dbbbcd4ee855b514f1 SHA1 1fe26f7b3cba413121f443747b7da6e63f40e7d0 SHA256 fa83404a1f3f315873a0e8f8a4da4d1e7543fb4151323de974ec5b9ed7a9d8e3
+MD5 5b286c0acbb2a7fd9c21d62cbd225227 kprof-1.4.3-r1.ebuild 662
+RMD160 212fb466cc2612fe394f62dbbbcd4ee855b514f1 kprof-1.4.3-r1.ebuild 662
+SHA256 fa83404a1f3f315873a0e8f8a4da4d1e7543fb4151323de974ec5b9ed7a9d8e3 kprof-1.4.3-r1.ebuild 662
 EBUILD kprof-1.4.3.ebuild 619 RMD160 407572c3cfd4e5db3d6d70de08e7909a9cf997c7 SHA1 adb1e1d14ff513293ba264b063f20aeee4ac7607 SHA256 71bc9e4337ef1695972806b83a681dacfcf822df8e2196bf82054cb7aa01b98a
 MD5 583c6fd102129c1aacdcd058e7c143e4 kprof-1.4.3.ebuild 619
 RMD160 407572c3cfd4e5db3d6d70de08e7909a9cf997c7 kprof-1.4.3.ebuild 619
 SHA256 71bc9e4337ef1695972806b83a681dacfcf822df8e2196bf82054cb7aa01b98a kprof-1.4.3.ebuild 619
-MISC ChangeLog 1462 RMD160 844d932694cbeb4d7a0dff956a755a4ac0c26a5c SHA1 d70a7cf5291202e0edf88b0de9f142f1af70abb1 SHA256 3b5a1a4b70ff8d2f9478ea92c0fa3f9e32f2aafea0e47f8d7b282d0ade25c137
-MD5 1c9e20b3f5f38dc76847bc89c90ef377 ChangeLog 1462
-RMD160 844d932694cbeb4d7a0dff956a755a4ac0c26a5c ChangeLog 1462
-SHA256 3b5a1a4b70ff8d2f9478ea92c0fa3f9e32f2aafea0e47f8d7b282d0ade25c137 ChangeLog 1462
+MISC ChangeLog 1659 RMD160 d14af1d1ed93798494bc82466c35ae5b92732514 SHA1 e251dbafdcd6023821d2e070d46386db87af7e8b SHA256 adbe35b49aa085b57ae7170f73e969d14b07b37ac794211e7be205c87c93de4e
+MD5 ce15e680b831e702d98b0c7da5de0d25 ChangeLog 1659
+RMD160 d14af1d1ed93798494bc82466c35ae5b92732514 ChangeLog 1659
+SHA256 adbe35b49aa085b57ae7170f73e969d14b07b37ac794211e7be205c87c93de4e ChangeLog 1659
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
-MD5 520114cc01161034987be7e7d1433076 files/digest-kprof-1.4.3 64
-RMD160 786601edcc73937f7eb89616eb506d112fda108c files/digest-kprof-1.4.3 64
-SHA256 c09a732dde8737cd41fa4c03b99e010916f75753d2a6ebef8de7c4d3f54fa560 files/digest-kprof-1.4.3 64
+MD5 ada3a110c0b72d97db8c3270f06ac05a files/digest-kprof-1.4.3 238
+RMD160 ead886f892b6a412597b2a1a658fae2f7d19c92b files/digest-kprof-1.4.3 238
+SHA256 1f7dbdb9eea85e3812c881554d633bf7ee07543fa53cc4b0439e51e7a635826b files/digest-kprof-1.4.3 238
+MD5 ada3a110c0b72d97db8c3270f06ac05a files/digest-kprof-1.4.3-r1 238
+RMD160 ead886f892b6a412597b2a1a658fae2f7d19c92b files/digest-kprof-1.4.3-r1 238
+SHA256 1f7dbdb9eea85e3812c881554d633bf7ee07543fa53cc4b0439e51e7a635826b files/digest-kprof-1.4.3-r1 238
diff --git a/dev-util/kprof/files/digest-kprof-1.4.3 b/dev-util/kprof/files/digest-kprof-1.4.3
index c5e210ff45bb..d45ef18b972b 100644
--- a/dev-util/kprof/files/digest-kprof-1.4.3
+++ b/dev-util/kprof/files/digest-kprof-1.4.3
@@ -1 +1,3 @@
 MD5 d2b1286f8fea7eb1d3e67215e07d296f kprof-1.4.3.tar.bz2 375770
+RMD160 41d0fd0cd4bd84c19e61fee77c17bf6b6cdc45fa kprof-1.4.3.tar.bz2 375770
+SHA256 33a2ccb3f3fe46b7667c96d681302ee941bb564b9ffe7a27abaa2c61d0d51bb9 kprof-1.4.3.tar.bz2 375770
diff --git a/dev-util/kprof/files/digest-kprof-1.4.3-r1 b/dev-util/kprof/files/digest-kprof-1.4.3-r1
new file mode 100644
index 000000000000..d45ef18b972b
--- /dev/null
+++ b/dev-util/kprof/files/digest-kprof-1.4.3-r1
@@ -0,0 +1,3 @@
+MD5 d2b1286f8fea7eb1d3e67215e07d296f kprof-1.4.3.tar.bz2 375770
+RMD160 41d0fd0cd4bd84c19e61fee77c17bf6b6cdc45fa kprof-1.4.3.tar.bz2 375770
+SHA256 33a2ccb3f3fe46b7667c96d681302ee941bb564b9ffe7a27abaa2c61d0d51bb9 kprof-1.4.3.tar.bz2 375770
diff --git a/dev-util/kprof/files/kprof-1.4.3-debian7.diff b/dev-util/kprof/files/kprof-1.4.3-debian7.diff
new file mode 100644
index 000000000000..cc7bc5132ad6
--- /dev/null
+++ b/dev-util/kprof/files/kprof-1.4.3-debian7.diff
@@ -0,0 +1,80 @@
+--- kprof/parseprofile_fnccheck.h	2002-09-09 23:47:13.000000000 +0200
++++ kprof/parseprofile_fnccheck.h	2005-09-02 11:17:00.000000000 +0200
+@@ -22,7 +22,7 @@
+ #endif
+ 
+ class CProfileInfo;
+-class QString;
++class QTextStream;
+ 
+ class CParseProfile_fnccheck : public CParseProfile
+ {
+--- kprof/parseprofile_gprof.h	2002-07-16 20:32:42.000000000 +0200
++++ kprof/parseprofile_gprof.h	2005-09-02 11:17:39.000000000 +0200
+@@ -23,6 +23,7 @@
+ #endif
+ 
+ class CProfileInfo;
++class QTextStream;
+ 
+ class CParseProfile_gprof : public CParseProfile
+ {
+--- kprof/parseprofile_pose.h	2002-09-09 23:47:13.000000000 +0200
++++ kprof/parseprofile_pose.h	2005-09-02 11:17:20.000000000 +0200
+@@ -22,7 +22,7 @@
+ #endif
+ 
+ class CProfileInfo;
+-class QString;
++class QTextStream;
+ 
+ class CParseProfile_pose : public CParseProfile
+ {
+--- kprof/kprofwidget.cpp	2004-10-28 17:03:05.000000000 +0200
++++ kprof/kprofwidget.cpp	2005-09-02 08:31:22.000000000 +0200
+@@ -834,15 +834,7 @@
+ void KProfWidget::gprofStdout (KProcess *, char *buffer, int buflen)
+ {
+ 	BEGIN;
+-	
+-	char* newbuf = new char[buflen];
+-	strncpy(newbuf, buffer, buflen);
+-	newbuf[buflen] = '\0';
+-
+-	mGProfStdout += QString::fromLocal8Bit (newbuf, buflen);
+-
+-	delete [] newbuf;
+-
++	mGProfStdout += QString::fromLocal8Bit (buffer, buflen);
+ 	END;
+ }
+ 
+--- kprof/parseprofile_gprof.cpp	2005-08-25 16:08:04.000000000 +0200
++++ kprof/parseprofile_gprof.cpp	2005-08-25 16:11:07.000000000 +0200
+@@ -119,8 +119,6 @@
+ 			{
+ 				CProfileInfo *p = new CProfileInfo;
+ 				p->ind				= profile.count ();
+-				p->cumPercent		= fields[0].toFloat ();
+-				p->cumSeconds		= fields[1].toFloat ();
+ 				p->selfSeconds		= fields[2].toFloat ();
+ 				if (fields[3][0].isDigit ())
+ 				{
+@@ -221,6 +219,17 @@
+ 
+ 				if (e->primary == true && count.find ('+') != -1)
+ 					e->recursive = true;
++				
++				// if this is a primary entry, get the total time and percentage
++				if (e->primary == true)
++				{
++					CProfileInfo *tPrimary = locateProfileEntry (e->name, profile);
++					if (tPrimary != NULL)
++					{
++						tPrimary->cumPercent		= fields[1].toFloat ();
++						tPrimary->cumSeconds		= tPrimary->selfSeconds + fields[3].toFloat ();
++					}
++				}
+ 
+ 				if (callGraphBlock.count () == callGraphBlock.size ())
+ 					callGraphBlock.resize (callGraphBlock.size () + 32);
diff --git a/dev-util/kprof/kprof-1.4.3-r1.ebuild b/dev-util/kprof/kprof-1.4.3-r1.ebuild
new file mode 100644
index 000000000000..6e216c2e2788
--- /dev/null
+++ b/dev-util/kprof/kprof-1.4.3-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kprof/kprof-1.4.3-r1.ebuild,v 1.1 2006/09/08 18:35:11 carlo Exp $
+
+inherit kde eutils
+
+S=${WORKDIR}/${PN}
+
+DESCRIPTION="A KDE3 visual tool helping developers to analyze the profiling results generated by code profilers."
+HOMEPAGE="http://kprof.sourceforge.net/"
+SRC_URI="mirror://sourceforge/kprof/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="media-gfx/graphviz"
+need-kde 3.5
+
+PATCHES="${FILESDIR}/${P}-configure-arts.diff
+	${FILESDIR}/kprof-1.4.3-debian7.diff"
+