Added workaround to valgrind for bug #129776 and corrected installation of docs

(Portage version: 2.1_rc4)

3 files changed, 26 insertions, 10 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 9325d03a0fa9..fde5ae5ecd53 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.62 2006/06/11 12:12:37 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.63 2006/06/14 17:07:34 griffon26 Exp $
+
+  14 Jun 2006; Maurice van der Pot <griffon26@gentoo.org>
+  valgrind-3.1.1.ebuild, valgrind-3.2.0.ebuild:
+  Now replacing -O3 with -O2 if compiling with gcc 3.3.x for bug #129776
+  reported by Fabian Groffen <grobian@gentoo.org>. Also corrected location 
+  of docs for valgrind-3.2.0.
 
   11 Jun 2006; Maurice van der Pot <griffon26@gentoo.org>
   valgrind-3.2.0.ebuild:
diff --git a/dev-util/valgrind/valgrind-3.1.1.ebuild b/dev-util/valgrind/valgrind-3.1.1.ebuild
index 36d3fb657ade..ee90493cb71b 100644
--- a/dev-util/valgrind/valgrind-3.1.1.ebuild
+++ b/dev-util/valgrind/valgrind-3.1.1.ebuild
@@ -1,8 +1,8 @@
 # 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.1.1.ebuild,v 1.3 2006/06/09 20:01:40 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.1.1.ebuild,v 1.4 2006/06/14 17:07:34 griffon26 Exp $
 
-inherit autotools eutils flag-o-matic
+inherit autotools eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="An open-source memory debugger for GNU/Linux"
 HOMEPAGE="http://www.valgrind.org"
@@ -53,6 +53,12 @@ src_compile() {
 	filter-flags -fstack-protector
 	replace-flags -ggdb3 -ggdb2
 
+	# gcc 3.3.x fails to compile valgrind with -O3 (bug #129776)
+	if [ "$(gcc-version)" == "3.3" ] && is-flagq -O3; then
+		ewarn "GCC 3.3 cannot compile valgrind with -O3 in CFLAGS, using -O2 instead."
+		replace-flags -O3 -O2
+	fi
+
 	# Optionally build in X suppression files
 	use X && myconf="--with-x" || myconf="--with-x=no"
 
diff --git a/dev-util/valgrind/valgrind-3.2.0.ebuild b/dev-util/valgrind/valgrind-3.2.0.ebuild
index e0cce9629f2e..2887037c0427 100644
--- a/dev-util/valgrind/valgrind-3.2.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.2.0.ebuild
@@ -1,8 +1,8 @@
 # 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.2 2006/06/11 12:12:37 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.2.0.ebuild,v 1.3 2006/06/14 17:07:34 griffon26 Exp $
 
-inherit eutils flag-o-matic
+inherit autotools eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="An open-source memory debugger for GNU/Linux"
 HOMEPAGE="http://www.valgrind.org"
@@ -31,11 +31,10 @@ src_unpack() {
 	sed -i -e 's:^AM_CFLAGS_BASE = :AM_CFLAGS_BASE = -fno-stack-protector :' Makefile.flags.am
 
 	# Correct hard coded doc location
-	sed -i -e "s:doc/valgrind/:doc/${P}/:" docs/Makefile.am
+	sed -i -e "s:doc/valgrind:doc/${P}:" docs/Makefile.am
 
-	einfo "Regenerating autotools files..."
-	autoconf || die "autoconf failed"
-	automake || die "automake failed"
+	# Regenerate autotools files
+	eautoreconf
 }
 
 src_compile() {
@@ -53,6 +52,12 @@ src_compile() {
 	filter-flags -fstack-protector
 	replace-flags -ggdb3 -ggdb2
 
+	# gcc 3.3.x fails to compile valgrind with -O3 (bug #129776)
+	if [ "$(gcc-version)" == "3.3" ] && is-flagq -O3; then
+		ewarn "GCC 3.3 cannot compile valgrind with -O3 in CFLAGS, using -O2 instead."
+		replace-flags -O3 -O2
+	fi
+
 	# Optionally build in X suppression files
 	use X && myconf="--with-x" || myconf="--with-x=no"
 
@@ -65,7 +70,6 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/share/doc/valgrind-3.2.0
 	make DESTDIR="${D}" install || die "Install failed!"
 	dodoc ACKNOWLEDGEMENTS AUTHORS FAQ.txt NEWS README*
 }