Fixed bug #136047 and fixed the valgrind part of bug #136303

Package-Manager: portage-2.1_rc4

3 files changed, 25 insertions, 16 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 703d23df05ad..9325d03a0fa9 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.61 2006/06/09 20:01:40 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.62 2006/06/11 12:12:37 griffon26 Exp $
+
+  11 Jun 2006; Maurice van der Pot <griffon26@gentoo.org>
+  valgrind-3.2.0.ebuild:
+  Fixed bug #136047 as proposed by Jean Bréfort <jean.brefort@normalesup.org>
+  and added a blocking dep for callgrind as part of a fix for bug #136303
+  reported by Daniel Franke <franke.daniel@gmail.com>.
 
   09 Jun 2006; Maurice van der Pot <griffon26@gentoo.org>
   -files/valgrind-2.2.0-current-macro-clash.patch,
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 212fc28b283e..1a163a56f3da 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -11,14 +11,14 @@ EBUILD valgrind-3.1.1.ebuild 2295 RMD160 1705e387c08805525bc5940b9f2125939bde68d
 MD5 f9024a1595460a5e2e9f0cc4e17e2ac3 valgrind-3.1.1.ebuild 2295
 RMD160 1705e387c08805525bc5940b9f2125939bde68d7 valgrind-3.1.1.ebuild 2295
 SHA256 ea1c69a5fd78410b1d96aaf330cc123d7cafa70cfdb37cba6769c674c0ed63d6 valgrind-3.1.1.ebuild 2295
-EBUILD valgrind-3.2.0.ebuild 2389 RMD160 1545a74c577b12288521c3b8d8b297a3c2e30f9c SHA1 7fa8144c8292788933eb9ee7e8477a90f135a5f1 SHA256 07eb7e6d7c692e1e3122195ba38dae1d7a8ae68f6660e1951d26a6326e19fe0d
-MD5 7fb0ca8f315909ee5c91add35f706e0f valgrind-3.2.0.ebuild 2389
-RMD160 1545a74c577b12288521c3b8d8b297a3c2e30f9c valgrind-3.2.0.ebuild 2389
-SHA256 07eb7e6d7c692e1e3122195ba38dae1d7a8ae68f6660e1951d26a6326e19fe0d valgrind-3.2.0.ebuild 2389
-MISC ChangeLog 8266 RMD160 8cfcc7eae81a11094b607d9271fefb1a9a06ee14 SHA1 ddcf7e951dfff13ee0d70ca52bf8bcddfca93bc9 SHA256 5e9552fba7d13e7ce1cfdbe89566c4eeea1c124fc45042c7fe42d028da3ab332
-MD5 3ad8b6c9a3f07cb7fe9402418d2b7f0e ChangeLog 8266
-RMD160 8cfcc7eae81a11094b607d9271fefb1a9a06ee14 ChangeLog 8266
-SHA256 5e9552fba7d13e7ce1cfdbe89566c4eeea1c124fc45042c7fe42d028da3ab332 ChangeLog 8266
+EBUILD valgrind-3.2.0.ebuild 2331 RMD160 7e94ba7a092ce4f556f69e528bc8448b61140fe4 SHA1 8f77e2559f0bc6abc3c3078c23f4409da41388c4 SHA256 e7f56d59a0663ebc436f099f2a3734af98a7773ab9287e5efacdaee41287d7ce
+MD5 f05518ac721c11c14137680a85b92fb6 valgrind-3.2.0.ebuild 2331
+RMD160 7e94ba7a092ce4f556f69e528bc8448b61140fe4 valgrind-3.2.0.ebuild 2331
+SHA256 e7f56d59a0663ebc436f099f2a3734af98a7773ab9287e5efacdaee41287d7ce valgrind-3.2.0.ebuild 2331
+MISC ChangeLog 8558 RMD160 d1c9f329e75aff1322e9e9dfc9648daec89da49d SHA1 7534e3300f9666fbd8a3d3fcab44a24924a6dfc6 SHA256 9eb3a83736c4108ae2ff93e25b7ea6efde5c8669b740278f4c68860d48adc308
+MD5 1f4dfe47df02bb9893e58508533fdb28 ChangeLog 8558
+RMD160 d1c9f329e75aff1322e9e9dfc9648daec89da49d ChangeLog 8558
+SHA256 9eb3a83736c4108ae2ff93e25b7ea6efde5c8669b740278f4c68860d48adc308 ChangeLog 8558
 MISC metadata.xml 1003 RMD160 e8ef4473e3545a4b98d46101edb49923112ac9e0 SHA1 f76bd7adb86b156832175f968d60c6372fcf8968 SHA256 2bf62ba94d772ac968485392127cf4f4303cccf5a1e6d0733d80507005ca7847
 MD5 799f0b61a3a686b4074bd61acc572c5c metadata.xml 1003
 RMD160 e8ef4473e3545a4b98d46101edb49923112ac9e0 metadata.xml 1003
@@ -32,7 +32,7 @@ SHA256 1ba63845b7f8fb25dc46455242f49a78dd7ef8a8e4515be2939712d7184f2b74 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEidOuMGnpIbeahxwRArdzAJ4w/KSZ4qqMVQ9yVltx+17kSPl1DQCgwRhJ
-U3tpqY/tBkKVRsBVlutco9k=
-=OLIJ
+iD8DBQFEjAi+MGnpIbeahxwRApwIAKCqjs7ec4ML3IJ09h/8D8qF3L8LqACgoTk2
+19Q0HQCYj3tL1aSq8mtWayE=
+=QGmc
 -----END PGP SIGNATURE-----
diff --git a/dev-util/valgrind/valgrind-3.2.0.ebuild b/dev-util/valgrind/valgrind-3.2.0.ebuild
index ef35ee4a951b..e0cce9629f2e 100644
--- a/dev-util/valgrind/valgrind-3.2.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.2.0.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/valgrind/valgrind-3.2.0.ebuild,v 1.1 2006/06/07 09:24:49 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.2.0.ebuild,v 1.2 2006/06/11 12:12:37 griffon26 Exp $
 
 inherit eutils flag-o-matic
 
@@ -16,6 +16,8 @@ IUSE="X"
 # bug #49147 (bogus stacktrace in gdb with --db-attach=yes) does not seem to be applicable anymore
 #RESTRICT="strip"
 
+RDEPEND="!dev-util/callgrind"
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -34,9 +36,6 @@ src_unpack() {
 	einfo "Regenerating autotools files..."
 	autoconf || die "autoconf failed"
 	automake || die "automake failed"
-
-	# fix for amd64 no-multilib profile till valgrind 3.2.0 is out (bug #114407)
-	use amd64 && (has_multilib_profile || epatch "${FILESDIR}/valgrind-3.1.0-amd64-nomultilib-fix.patch")
 }
 
 src_compile() {
@@ -57,6 +56,10 @@ src_compile() {
 	# Optionally build in X suppression files
 	use X && myconf="--with-x" || myconf="--with-x=no"
 
+	if use amd64 && ! has_multilib_profile; then
+		myconf="${myconf} --enable-only64bit"
+	fi
+
 	econf ${myconf} || die "Configure failed!"
 	emake || die "Make failed!"
 }