Add patch from Debian. Add missing runtime dependency.

(Portage version: 2.1.1_rc1-r7)

5 files changed, 115 insertions, 1 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/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"
+