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

Package-Manager: portage-2.1

6 files changed, 39 insertions, 29 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/Manifest b/kde-base/kdesdk/Manifest
index 4ec6701ff00c..2f5845fb3caa 100644
--- a/kde-base/kdesdk/Manifest
+++ b/kde-base/kdesdk/Manifest
@@ -6,26 +6,26 @@ DIST kdesdk-3.3.2.tar.bz2 4358995 RMD160 d9577986e2f6c811f7847e33e03aaaddca2a1aa
 DIST kdesdk-3.4.3.tar.bz2 4584263
 DIST kdesdk-3.5.2.tar.bz2 4877103 RMD160 ac15ff6e6b10b19ce2197b9fd7848453acdfc1a5 SHA1 463975860e7881f2d67c20ec2f5f2e34858e5966 SHA256 a6d4d8177fceb225de328a0f71852baa9a591754fb403678b6c3f1c1283a50fd
 DIST kdesdk-3.5.3.tar.bz2 4909060 RMD160 53555dfd14889003d596790b8566b0f7f6dabc32 SHA1 6d463bff975605bef1ab89fe78ce6d9a8284fb64 SHA256 b600fe704db89a15cf908e36314dcfd7edfb896ee535fac00f5bf87b7eeb9971
-EBUILD kdesdk-3.3.2.ebuild 527 RMD160 7deb25ffe401736838c0d748dee7afaeb3b3c235 SHA1 2dc2f1ad6ac3955f373b89a864fdb91c562e9856 SHA256 caa18de15f5622640c88f01bed0827d94f261f7b00de0c19db66000d572ef186
-MD5 e1e0ca400275b14e34f96547c6e2edd1 kdesdk-3.3.2.ebuild 527
-RMD160 7deb25ffe401736838c0d748dee7afaeb3b3c235 kdesdk-3.3.2.ebuild 527
-SHA256 caa18de15f5622640c88f01bed0827d94f261f7b00de0c19db66000d572ef186 kdesdk-3.3.2.ebuild 527
-EBUILD kdesdk-3.4.3.ebuild 1285 RMD160 7acb9ca4790ea025171dd6a8d267c38770c5d133 SHA1 7432c25d54fc5f6eb2d0de13dde7a4742b896e9b SHA256 33e2ae438bcb328c9c9943efe781730588085d78412274d6b7efc53e8cbe8746
-MD5 95517709776adda367c02b8d630fd84c kdesdk-3.4.3.ebuild 1285
-RMD160 7acb9ca4790ea025171dd6a8d267c38770c5d133 kdesdk-3.4.3.ebuild 1285
-SHA256 33e2ae438bcb328c9c9943efe781730588085d78412274d6b7efc53e8cbe8746 kdesdk-3.4.3.ebuild 1285
-EBUILD kdesdk-3.5.2.ebuild 1089 RMD160 e3a5df9973cfb12013e60050af3afdbdb826a045 SHA1 b1d329d0b0cbd537d5e502cd1ef5884f1bb233aa SHA256 25196295541e782aeb145d53a9e88ffc48cdcc32e0391a7056d55ed3a2318470
-MD5 89e2e635e50945c1415dd5686a77fc95 kdesdk-3.5.2.ebuild 1089
-RMD160 e3a5df9973cfb12013e60050af3afdbdb826a045 kdesdk-3.5.2.ebuild 1089
-SHA256 25196295541e782aeb145d53a9e88ffc48cdcc32e0391a7056d55ed3a2318470 kdesdk-3.5.2.ebuild 1089
-EBUILD kdesdk-3.5.3.ebuild 1093 RMD160 786fed32253598e6b68854fc9041d47c70cb724d SHA1 a0edef0ca82e0f0158ecbeba3d420008ca1e7517 SHA256 f8dc355edfc47179da53720ee65682c490400267682a18d83ff7b32041979e7a
-MD5 cd708a2ce3921e51c06646c5435d9144 kdesdk-3.5.3.ebuild 1093
-RMD160 786fed32253598e6b68854fc9041d47c70cb724d kdesdk-3.5.3.ebuild 1093
-SHA256 f8dc355edfc47179da53720ee65682c490400267682a18d83ff7b32041979e7a kdesdk-3.5.3.ebuild 1093
-MISC ChangeLog 15552 RMD160 bcc1cc8d4c460f5b5f1c3f742812adcbe1f0f2f0 SHA1 481d0cd86363527b38b1ea722b968f56af8c2748 SHA256 5e787fa40bae87387ea37fd4161542797887e97834ae81a56dc7fc1a67b5b054
-MD5 a4346fac82374c21cd496963cd09a9f7 ChangeLog 15552
-RMD160 bcc1cc8d4c460f5b5f1c3f742812adcbe1f0f2f0 ChangeLog 15552
-SHA256 5e787fa40bae87387ea37fd4161542797887e97834ae81a56dc7fc1a67b5b054 ChangeLog 15552
+EBUILD kdesdk-3.3.2.ebuild 563 RMD160 b9fd061195cc1e2e747879d6d69acbc641cd143b SHA1 89fd34f7dcac99f0bcf94d3a3c435294fecc906e SHA256 45c44364de6ffc68050c4e4542f90a10cadd7bd5291d8d92159d83f2dbfb4afa
+MD5 47bb7ec3c8cd2f4535ec71ea32f49585 kdesdk-3.3.2.ebuild 563
+RMD160 b9fd061195cc1e2e747879d6d69acbc641cd143b kdesdk-3.3.2.ebuild 563
+SHA256 45c44364de6ffc68050c4e4542f90a10cadd7bd5291d8d92159d83f2dbfb4afa kdesdk-3.3.2.ebuild 563
+EBUILD kdesdk-3.4.3.ebuild 1321 RMD160 f81b9d7ee3e0e26174c68d5243dbf0926cb8ffc4 SHA1 834eb7fae1ee4f7820d5f60ebd5317ad974e5ba9 SHA256 65f60e0f298f030494dcc6415cd45f28e8ba0024c280036e3b5994a9ec6d623c
+MD5 a120b0bd3839e70970f375b868ea0e80 kdesdk-3.4.3.ebuild 1321
+RMD160 f81b9d7ee3e0e26174c68d5243dbf0926cb8ffc4 kdesdk-3.4.3.ebuild 1321
+SHA256 65f60e0f298f030494dcc6415cd45f28e8ba0024c280036e3b5994a9ec6d623c kdesdk-3.4.3.ebuild 1321
+EBUILD kdesdk-3.5.2.ebuild 1128 RMD160 c1fc70134747dc8bde1fb20e4bf2120c483217e0 SHA1 02ad55abba2dbb0bbb8d92d8ac1f126b94563017 SHA256 2bb1a187a57c4e56e2dffeeff232e4b6ceff74bef6763c72d8a7184444a9fa0d
+MD5 c2ac69c066310ec8e384316dc5473c3e kdesdk-3.5.2.ebuild 1128
+RMD160 c1fc70134747dc8bde1fb20e4bf2120c483217e0 kdesdk-3.5.2.ebuild 1128
+SHA256 2bb1a187a57c4e56e2dffeeff232e4b6ceff74bef6763c72d8a7184444a9fa0d kdesdk-3.5.2.ebuild 1128
+EBUILD kdesdk-3.5.3.ebuild 1131 RMD160 2e036ab926672b384e5451992da384fa6c76a550 SHA1 6d36f922887ee43b856bb0943f08d2425615440e SHA256 1a97f54c50201156e68733abaf86258bdefa2b53be06eab5c5ce3e56cfb1fd4b
+MD5 5f365b566cb330d8340f1985948e98fb kdesdk-3.5.3.ebuild 1131
+RMD160 2e036ab926672b384e5451992da384fa6c76a550 kdesdk-3.5.3.ebuild 1131
+SHA256 1a97f54c50201156e68733abaf86258bdefa2b53be06eab5c5ce3e56cfb1fd4b kdesdk-3.5.3.ebuild 1131
+MISC ChangeLog 15864 RMD160 edae8894fa915eddff2484163175a3fb3799032f SHA1 90aa3982a9beb49834f2ee7ce88bdaf0540f26d5 SHA256 6784917cea4355cbd7e9d5526adbe6c1ad9aa9b06152e1e4c3a0246873406b48
+MD5 ad4170eb444fb9ad91268fafde06d1d1 ChangeLog 15864
+RMD160 edae8894fa915eddff2484163175a3fb3799032f ChangeLog 15864
+SHA256 6784917cea4355cbd7e9d5526adbe6c1ad9aa9b06152e1e4c3a0246873406b48 ChangeLog 15864
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
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* ) )"