Change callgrind to newer valgrind or callgrind depend thanks to Daniel Franke <franke.daniel@gmail.com> and Maurice van der Pot <griffon26@gentoo.org> in bug 136303

(Portage version: 2.1)

5 files changed, 19 insertions, 9 deletions

diff --git a/kde-base/kdesdk/ChangeLog b/kde-base/kdesdk/ChangeLog
index 330169160eb7..e2fddefa0eb1 100644
--- a/kde-base/kdesdk/ChangeLog
+++ b/kde-base/kdesdk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdesdk
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/ChangeLog,v 1.120 2006/06/02 20:17:22 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/ChangeLog,v 1.121 2006/06/11 15:58:08 genstef Exp $
+
+  11 Jun 2006; Stefan Schweizer <genstef@gentoo.org> kdesdk-3.3.2.ebuild,
+  kdesdk-3.4.3.ebuild, kdesdk-3.5.2.ebuild, kdesdk-3.5.3.ebuild:
+  Change callgrind to newer valgrind or callgrind depend thanks to Daniel
+  Franke <franke.daniel@gmail.com> and Maurice van der Pot
+  <griffon26@gentoo.org> in bug 136303
 
 *kdesdk-3.5.3 (02 Jun 2006)
 
diff --git a/kde-base/kdesdk/kdesdk-3.3.2.ebuild b/kde-base/kdesdk/kdesdk-3.3.2.ebuild
index 23662c24fb84..ab921379d289 100644
--- a/kde-base/kdesdk/kdesdk-3.3.2.ebuild
+++ b/kde-base/kdesdk/kdesdk-3.3.2.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.3.2.ebuild,v 1.7 2006/02/16 09:32:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.3.2.ebuild,v 1.8 2006/06/11 15:58:08 genstef Exp $
 inherit eutils kde-dist
 
 IUSE=""
 DESCRIPTION="KDE SDK: Cervisia, KBabel, KCachegrind, Kompare, Umbrello,..."
 KEYWORDS="x86 amd64 sparc ppc hppa"
 
-DEPEND="x86? ( dev-util/callgrind )
+DEPEND="x86? ( || ( >=dev-util/valgrind-3.2.0
+					dev-util/callgrind ) )
 	media-gfx/graphviz"
 
 RDEPEND="$DEPEND
diff --git a/kde-base/kdesdk/kdesdk-3.4.3.ebuild b/kde-base/kdesdk/kdesdk-3.4.3.ebuild
index b2b9847de8d4..ec3fa8f4304c 100644
--- a/kde-base/kdesdk/kdesdk-3.4.3.ebuild
+++ b/kde-base/kdesdk/kdesdk-3.4.3.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/kde-base/kdesdk/kdesdk-3.4.3.ebuild,v 1.7 2006/02/16 09:32:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.4.3.ebuild,v 1.8 2006/06/11 15:58:08 genstef Exp $
 
 inherit kde-dist eutils
 
@@ -9,7 +9,8 @@ DESCRIPTION="KDE SDK: Cervisia, KBabel, KCachegrind, Kompare, Umbrello,..."
 KEYWORDS="amd64 hppa ppc sparc x86"
 IUSE="berkdb subversion"
 
-DEPEND="x86? ( dev-util/callgrind )
+DEPEND="x86? ( || ( >=dev-util/valgrind-3.2.0
+					dev-util/callgrind ) )
 	subversion? ( dev-util/subversion )
 	berkdb? ( || ( =sys-libs/db-4.3*
 	               =sys-libs/db-4.2* ) )"
diff --git a/kde-base/kdesdk/kdesdk-3.5.2.ebuild b/kde-base/kdesdk/kdesdk-3.5.2.ebuild
index c5907a1369c5..0244ac0d8be4 100644
--- a/kde-base/kdesdk/kdesdk-3.5.2.ebuild
+++ b/kde-base/kdesdk/kdesdk-3.5.2.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/kde-base/kdesdk/kdesdk-3.5.2.ebuild,v 1.4 2006/05/30 04:16:36 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.5.2.ebuild,v 1.5 2006/06/11 15:58:08 genstef Exp $
 
 inherit kde-dist
 
@@ -9,7 +9,8 @@ DESCRIPTION="KDE SDK: Cervisia, KBabel, KCachegrind, Kompare, Umbrello,..."
 KEYWORDS="~amd64 ~hppa ppc sparc x86"
 IUSE="berkdb subversion"
 
-DEPEND="x86? ( dev-util/callgrind )
+DEPEND="x86? ( || ( >=dev-util/valgrind-3.2.0
+					dev-util/callgrind ) )
 	subversion? ( dev-util/subversion )
 	berkdb? ( || ( =sys-libs/db-4.3*
 	               =sys-libs/db-4.2* ) )"
diff --git a/kde-base/kdesdk/kdesdk-3.5.3.ebuild b/kde-base/kdesdk/kdesdk-3.5.3.ebuild
index cb73a8cb3cc6..41b03ddabf82 100644
--- a/kde-base/kdesdk/kdesdk-3.5.3.ebuild
+++ b/kde-base/kdesdk/kdesdk-3.5.3.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/kde-base/kdesdk/kdesdk-3.5.3.ebuild,v 1.1 2006/06/02 20:17:22 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.5.3.ebuild,v 1.2 2006/06/11 15:58:08 genstef Exp $
 
 inherit kde-dist
 
@@ -9,7 +9,8 @@ DESCRIPTION="KDE SDK: Cervisia, KBabel, KCachegrind, Kompare, Umbrello,..."
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE="berkdb subversion"
 
-DEPEND="x86? ( dev-util/callgrind )
+DEPEND="x86? ( || ( >=dev-util/valgrind-3.2.0
+					dev-util/callgrind ) )
 	subversion? ( dev-util/subversion )
 	berkdb? ( || ( =sys-libs/db-4.3*
 	               =sys-libs/db-4.2* ) )"