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

Package-Manager: portage-2.1_rc4

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 9325d03a0fa93fbf7e2ce3b94b309d50f1934d8c..fde5ae5ecd5324d74162b5aea9747c953eaeb7cb 100644 (file)
--- 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/Manifest b/dev-util/valgrind/Manifest
index 1a163a56f3dafad8d3e52327f753640a59793083..4d8d04629ce7f45f837f25930d0ee8b70cd311af 100644 (file)
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -7,18 +7,18 @@ RMD160 50340968e8eb5aa261c8b65c3d69ed9c9405f2e7 files/valgrind-3.1.0-amd64-nomul
 SHA256 61ad946583bf37742271adcec9731d092cd78917312ebc00248364af7620795b files/valgrind-3.1.0-amd64-nomultilib-fix.patch 302
 DIST valgrind-3.1.1.tar.bz2 3074066 RMD160 023df2a78fc24662605cd28fbbaa0d6cf86552c6 SHA1 2a54baf4ae2feb0498df88faf0a6976384b439ff SHA256 6df142297a093bb970a018eaa26d2a6fde32ff3e1171cdf2ffad25ec06f371b9
 DIST valgrind-3.2.0.tar.bz2 4059114 RMD160 06cebcfacece9f6bac8fd72c13022d3440d243e9 SHA1 086d138368d2d4361ef1bcfe624ff879d71e6447 SHA256 e13b81b733697736b5d220c04fb853c1113d11867c7fb96028bee9d2584b638e
-EBUILD valgrind-3.1.1.ebuild 2295 RMD160 1705e387c08805525bc5940b9f2125939bde68d7 SHA1 4714fd6c19b6f17ba1f2c94d4748ffc45b3e1a6c SHA256 ea1c69a5fd78410b1d96aaf330cc123d7cafa70cfdb37cba6769c674c0ed63d6
-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 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
+EBUILD valgrind-3.1.1.ebuild 2539 RMD160 0f382985e8e75766c864bec4b88a4218f84dd393 SHA1 b08cb7868f4d971a43d6bd7ec0c22131305463a5 SHA256 ea360d63417586274c449fe8602a81176752bb7419a3debc306c2c103e7535de
+MD5 4def5b683304c3192b0b88b536d9f596 valgrind-3.1.1.ebuild 2539
+RMD160 0f382985e8e75766c864bec4b88a4218f84dd393 valgrind-3.1.1.ebuild 2539
+SHA256 ea360d63417586274c449fe8602a81176752bb7419a3debc306c2c103e7535de valgrind-3.1.1.ebuild 2539
+EBUILD valgrind-3.2.0.ebuild 2478 RMD160 bf73a4e21d0389a04b7f63fb1c15382d0c4b8588 SHA1 d593f93eab87d9d4d0bbb6bc13ea26efda432994 SHA256 5ac0ca95ccb7490aad7579186c4fabaa2614b540afb5ea80c1741200a6f60f6e
+MD5 e64225f5d503413bae871480af13e8e1 valgrind-3.2.0.ebuild 2478
+RMD160 bf73a4e21d0389a04b7f63fb1c15382d0c4b8588 valgrind-3.2.0.ebuild 2478
+SHA256 5ac0ca95ccb7490aad7579186c4fabaa2614b540afb5ea80c1741200a6f60f6e valgrind-3.2.0.ebuild 2478
+MISC ChangeLog 8844 RMD160 3adc9237446ee6d8421576d9e9e96a62fffd5338 SHA1 a07fa3a32ac918473a3679dd1b853596147c7666 SHA256 1b94fdcfc3b955aa931cd4fdbb2e3290bccab916034832d93a05f351f53111a3
+MD5 3f4b31a3fb812112395171674e2c396b ChangeLog 8844
+RMD160 3adc9237446ee6d8421576d9e9e96a62fffd5338 ChangeLog 8844
+SHA256 1b94fdcfc3b955aa931cd4fdbb2e3290bccab916034832d93a05f351f53111a3 ChangeLog 8844
 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)
 
-iD8DBQFEjAi+MGnpIbeahxwRApwIAKCqjs7ec4ML3IJ09h/8D8qF3L8LqACgoTk2
-19Q0HQCYj3tL1aSq8mtWayE=
-=QGmc
+iD8DBQFEkEJgMGnpIbeahxwRApR2AJwN34bAGKi5yhf/QYlu0u46/wBFiwCgmBI7
+8birhFlK1pQgQ0dlj94Wv8A=
+=ayQy
 -----END PGP SIGNATURE-----

diff --git a/dev-util/valgrind/valgrind-3.1.1.ebuild b/dev-util/valgrind/valgrind-3.1.1.ebuild
index 36d3fb657ade6c6ad3dc8f2c21e24c667bb1f70d..ee90493cb71bc76f274910fc0c30548ff6c06761 100644 (file)
--- 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 e0cce9629f2ef48883d8fa9873b7b27216481469..2887037c04279445d7903fd8ab4cc606e180462e 100644 (file)
--- 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*
 }