Replace original patch with the version accepted upstream

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

4 files changed, 46 insertions, 16 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/Manifest b/dev-util/valgrind/Manifest
index 78177affb083..a3b77b94e571 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -22,7 +22,7 @@ AUX valgrind-3.6.0-strcasecmp.patch 3786 RMD160 7887dd9e2dc9e5934a25106c6413458b
 AUX valgrind-3.6.1-glibc-2.14.patch 1078 RMD160 d0a853f9d65e821e3586fd3058db37bb2139e251 SHA1 98b0ea183b90ddf5aee4f68f31f6bf5e818ba4ac SHA256 c76f3f965ebd98d469e6431780267dfb7ad1a58da0ab397ebfc21a08e98828a5
 AUX valgrind-3.6.1-linux-3.patch 392 RMD160 1b654f96b339c15e1e89d41d8dfa01fc5be3cd60 SHA1 c191a54cf24952e103ee1a882fce4c50c119c81d SHA256 056b6fc872ed0be91a2000e599a9431e1bc78efa7ee2ac986f74f2e450f28582
 AUX valgrind-3.6.1-user-enable-qt4.patch 3100 RMD160 d5130569c986714dbd39af5354a1f5c9a039d019 SHA1 6252b9220f8ec6b3e336802101eb296b53209c97 SHA256 ffe139eabb1340a6f004e4a9858d36cf19616bb1c4156395ea2b3b6600a23217
-AUX valgrind-3.7.0-fix-gcc-regex.patch 581 RMD160 ab1bcd6f79b208f73ea6cc1f4cde1cefc07b74ca SHA1 63820c292db0b245f056629f2cf4247bcad7ecff SHA256 697049e69b5fe85211dab18e471ac4c8d18a50c1fa650466dcba2cacca322bd1
+AUX valgrind-3.7.0-fix-gcc-regex.patch 1723 RMD160 f4fdc113f58d7151315f6a65a262471d4f8a75db SHA1 7ed537bcc935a40001a3d11fbff353e9cee342d5 SHA256 3a587d7dcc1ed447cc006cfef0cfb3597f17c96ac8adc7adbdc14d313a1d6852
 AUX valgrind-3.7.0-fno-stack-protector.patch 554 RMD160 df9a699ff35cf867e17b04a200c5e68015955167 SHA1 ed6368061d47448a597f6a2a9635f66e244b5a13 SHA256 83ed90a0e8a8b06dca8aad4e7f1a12e3c84621d502427c0913b72740b310f479
 AUX valgrind-3.7.0-non-exec-stack.patch 5644 RMD160 86178ee97653b2b4074e98e2342c5104583fa759 SHA1 8074a41b2e8915fa3a63ce827a14088949057bed SHA256 4de10480b6e27379083203df3cfedccdace68d0aad611440478ca2f1b2f89751
 AUX valgrind-3.7.0-respect-flags.patch 360 RMD160 b3ca9a393a68d312fa12cd272720e67c8661cfc4 SHA1 2ca0d9474bd4a81d45981bc8433359832d1ce8b9 SHA256 6b1e5938ecafc29428a698296423c71924848b1e746d6ee8a0f1dd91141f1019
@@ -44,13 +44,13 @@ EBUILD valgrind-3.6.0.ebuild 3040 RMD160 ed2e6ba1c77077c4c171c5b0fb651779c97ca8b
 EBUILD valgrind-3.6.1-r1.ebuild 3178 RMD160 a03c893ce8f98cea7edd092ec7edda616865a705 SHA1 e69f76d0df29f2fec61f4bff952bb5eac8d1a5f1 SHA256 4e9205aa4f2d69d5b3680da1f821add903c28af49e7317570f0fa863b4896d1c
 EBUILD valgrind-3.6.1-r2.ebuild 3274 RMD160 73bb4329831338e42ed89da3bce708734200e37e SHA1 2e88d94fe6bb219147e560d9a7110eac168e0fbd SHA256 76c3a09da89fee55a1d2fc4de723013183ffa6dca020eb91bc508e7348cb9858
 EBUILD valgrind-3.6.1.ebuild 3068 RMD160 5ae01b6484705ad9c7e7bf7e888a355054e6e4c2 SHA1 bcf3c5107a61fbfabbee441d3a304a9ffad8f672 SHA256 93eea5c2c81b7b92ba250706bec21d21575a88c5d426b37096409772119f4e0f
-EBUILD valgrind-3.7.0.ebuild 2717 RMD160 91d54ff7700b5ee4e7152ca20ae1632c82ae3861 SHA1 6f6569e361abb436746dd15d33907007ac9aa33a SHA256 e69e1f2c83950236ade1490886cfe1991e116f82f45adb5a6e84f849028104c6
-MISC ChangeLog 21621 RMD160 ec66aa7d4d1d6f1d010e7f3b2671b8d52a8a70d8 SHA1 05fdb4784fad96b253cacca993ddda1b96f7d2c0 SHA256 bb8e73f626cfe693111020924bae70b81a8fe54642f7b11a1c66e439f8731d9d
+EBUILD valgrind-3.7.0-r1.ebuild 2720 RMD160 4d4a707fac4c62a68d3de02ac44e23b8f641a4e1 SHA1 6283fed760b8fcd3391639e0cc8d92d398b110f6 SHA256 93b9f2dc0f5b24f17b4ae070740641b03de1d02b38f9a1bc808e660d31deea94
+MISC ChangeLog 21912 RMD160 656a40ea76a17092667bc7ff87ca0dae36758ee3 SHA1 ae4ed1fef24d8d39be43ee53d6cc4af37d994926 SHA256 da7722a27734f11bafa77a5473749e1dc6c6da51d341a5cc5c9ada1dad0790de
 MISC metadata.xml 980 RMD160 7441340fd2659400fb15d857446dac8f7b3f1176 SHA1 07af40cb309fcd80ca639dea5110b1109ce72427 SHA256 513a0d653dfae858a7f426745bd0abe5dcbc8748d468310fdce156e0e21e2cd0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk68fQEACgkQl5yvQNBFVTVBYQCfVcoS1qlqt0H2zNo4/vVfI7ZV
-AJ0An3nbMV+tQPciRFI3Vj4p4sIcr01q
-=5WHT
+iEYEAREIAAYFAk7NR18ACgkQl5yvQNBFVTXQcgCfaJZg070dBFNHSmhSs6nQUxAf
+cM4An2xNI2FFbYra1zGHWTY1bU43dAR6
+=6dbN
 -----END PGP SIGNATURE-----
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