Replace original patch with the version accepted upstream

(Portage version: 2.1.10.11/cvs/Linux x86_64)

3 files changed, 40 insertions, 10 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 3f455db9bef8..1f29e062cda7 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.130 2011/11/11 01:40:06 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.131 2011/11/23 19:19:48 blueness Exp $
+
+*valgrind-3.7.0-r1 (23 Nov 2011)
+
+  23 Nov 2011; Anthony G. Basile <blueness@gentoo.org> -valgrind-3.7.0.ebuild,
+  +valgrind-3.7.0-r1.ebuild, files/valgrind-3.7.0-fix-gcc-regex.patch:
+  Replace original patch with the version accepted upstream
+  https://bugs.kde.org/show_bug.cgi?id=286384
 
 *valgrind-3.7.0 (11 Nov 2011)
 
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch b/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch
index 3233333ce1b9..feabf069354a 100644
--- a/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch
+++ b/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch
@@ -1,12 +1,35 @@
-diff -Naur valgrind-3.7.0.orig//configure.in valgrind-3.7.0/configure.in
---- valgrind-3.7.0.orig//configure.in	2011-11-05 07:13:30.000000000 -0400
-+++ valgrind-3.7.0/configure.in	2011-11-10 18:13:39.000000000 -0500
-@@ -109,7 +109,7 @@
-              | head -n 1 \
-              | $SED 's/i686-apple-darwin10//' \
-              | $SED 's/i686-apple-darwin11//' \
+Index: configure.in
+===================================================================
+--- configure.in	(revision 12273)
++++ configure.in	(revision 12274)
+@@ -98,18 +98,21 @@
+ # We don't want gcc < 3.0
+ AC_MSG_CHECKING([for a supported version of gcc])
+ 
+-# Try to get the gcc version, sed-ing out some unexpected stuff
+-# that appears with the default gcc on OSX 10.6 and 10.7 respectively.
+-# Without this, the version number comes out as 686, 10 or 11 :-(
++# Obtain the compiler version.
+ # 
+-# i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
+-# i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
++# A few examples of how the ${CC} --version output looks like:
+ #
++# Arch Linux: i686-pc-linux-gnu-gcc (GCC) 4.6.2
++# Debian Linux: gcc (Debian 4.3.2-1.1) 4.3.2
++# openSUSE: gcc (SUSE Linux) 4.5.1 20101208 [gcc-4_5-branch revision 167585]
++# Exherbo Linux: x86_64-pc-linux-gnu-gcc (Exherbo gcc-4.6.2) 4.6.2
++# OS/X 10.6: i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
++# OS/X 10.7: i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
++# Clang: clang version 2.9 (tags/RELEASE_29/final)
++#
+ [gcc_version=`${CC} --version \
+-             | head -n 1 \
+-             | $SED 's/i686-apple-darwin10//' \
+-             | $SED 's/i686-apple-darwin11//' \
 -             | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`]
-+             | $SED 's/.*\s\([.0-9]*\)$/\1/'`]
++             | $SED -n -e 's/[^ ]*gcc[^ ]* ([^)]*) \([0-9.]*\).*$/\1/p' \
++                       -e 's/[^ ]*clang version \([0-9.]*\).*$/\1/p'`]
  
  is_clang="notclang"
  if test "x`${CC} --version | head -n 1 | $SED 's/\(clang\) version.*/\1/'`" = "xclang" ; then
diff --git a/dev-util/valgrind/valgrind-3.7.0.ebuild b/dev-util/valgrind/valgrind-3.7.0-r1.ebuild
index 5f5f18241da3..dad752a9c226 100644
--- a/dev-util/valgrind/valgrind-3.7.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.7.0.ebuild,v 1.1 2011/11/11 01:40:06 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.7.0-r1.ebuild,v 1.1 2011/11/23 19:19:48 blueness Exp $
 
 EAPI=4
 inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils