dev-util/valgrind: removed patches already applied upstream

11 files changed, 139 insertions, 343 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 139597f..e69de29 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,2 +0,0 @@
-
-
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index e6daef9..ef43c5a 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,10 +1,8 @@
-AUX valgrind-3.4.1-glibc-2.10.1.patch 1305 RMD160 27586a6140bc0c96589f7077a3c9ee266010ac9c SHA1 dc5df31911c93c98d7876fc6ad9157ab62b38de2 SHA256 b250a3f7e8654cbc835570b0647d035f25a866a51312a8c0d82119db474eddd6
 AUX valgrind-3.6.0-local-labels.patch 1388 RMD160 e9c0064d1e857f1e616c5d9ca7a03e78eae3d5ab SHA1 173820d5671f56c864850c2d8df9d6d301dfda38 SHA256 34ae13eda378677f1e662e0813f138de9b897d6592d20872c58ed8ac1bcf7def
-AUX valgrind-3.6.0-non-exec-stack.patch 5613 RMD160 641cd94fd5254ea902bd66eb0437e9af0e21fdb4 SHA1 eeb788f208303ef8768d4713c2c01bfd3f2edec4 SHA256 9a5a92506a10af32eba7a28401f061d4a84eac26a4dbb94fc6a19471c4bdb257
-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-fno-stack-protector.patch 554 RMD160 df9a699ff35cf867e17b04a200c5e68015955167 SHA1 ed6368061d47448a597f6a2a9635f66e244b5a13 SHA256 83ed90a0e8a8b06dca8aad4e7f1a12e3c84621d502427c0913b72740b310f479
+AUX valgrind-3.7.0-non-exec-stack.patch 3969 RMD160 2b25537e134d7342e9631c77e465ff14cc89428f SHA1 6fee355a7167ec205cb8d128129a1d40e42adba2 SHA256 8a2895e39d2640ab96744ccefe987ddc06dbac8325545c174d9a658e8d631b77
+AUX valgrind-3.7.0-respect-flags.patch 360 RMD160 b3ca9a393a68d312fa12cd272720e67c8661cfc4 SHA1 2ca0d9474bd4a81d45981bc8433359832d1ce8b9 SHA256 6b1e5938ecafc29428a698296423c71924848b1e746d6ee8a0f1dd91141f1019
 DIST valgrind-3.7.0.tar.bz2 6624216 RMD160 6ffbf04a8ff4eb2555d1a6bd87c0656828830761 SHA1 b412f49895bb8a78fc314047119760b5d36e5b5e SHA256 5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6
-EBUILD valgrind-3.7.0.ebuild 3274 RMD160 73bb4329831338e42ed89da3bce708734200e37e SHA1 2e88d94fe6bb219147e560d9a7110eac168e0fbd SHA256 76c3a09da89fee55a1d2fc4de723013183ffa6dca020eb91bc508e7348cb9858
-MISC ChangeLog 2 RMD160 e5043315c7d228fbf17daf82b8e725f54b1ac2f6 SHA1 71853c6197a6a7f222db0f1978c7cb232b87c5ee SHA256 75a11da44c802486bc6f65640aa48a730f0f684c5c07a42ba3cd1735eb3fb070
+EBUILD valgrind-3.7.0.ebuild 2701 RMD160 8eb4003298b22ecc72897249ca7975dcfe9406e5 SHA1 2450b2c6c6ca9880dae7e73fff70f70f1435880a SHA256 4f538af9cd1db8f978f61c1898781187240aba463755e2e8187d9dd9af1e5ae9
+MISC ChangeLog 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
 MISC metadata.xml 980 RMD160 7441340fd2659400fb15d857446dac8f7b3f1176 SHA1 07af40cb309fcd80ca639dea5110b1109ce72427 SHA256 513a0d653dfae858a7f426745bd0abe5dcbc8748d468310fdce156e0e21e2cd0
diff --git a/dev-util/valgrind/files/valgrind-3.4.1-glibc-2.10.1.patch b/dev-util/valgrind/files/valgrind-3.4.1-glibc-2.10.1.patch
deleted file mode 100644
index 393dc7c..0000000
--- a/dev-util/valgrind/files/valgrind-3.4.1-glibc-2.10.1.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- valgrind-3.4.1/glibc-2.X.supp.in.jj	2009-03-01 17:04:51.000000000 -0500
-+++ valgrind-3.4.1/glibc-2.X.supp.in	2009-05-11 11:17:35.605396000 -0400
-@@ -168,9 +168,9 @@
-    Memcheck:Param
-    socketcall.sendto(msg)
-    fun:__sendto_nocancel
--   obj:/*libc-@GLIBC_VERSION@.so
--   obj:/*libc-@GLIBC_VERSION@.so
--   obj:/*libc-@GLIBC_VERSION@.so
-+   obj:/*libc-@GLIBC_VERSION@*.so
-+   obj:/*libc-@GLIBC_VERSION@*.so
-+   obj:/*libc-@GLIBC_VERSION@*.so
- }
- {
-    glibc24-64bit-padding-1c
-@@ -180,7 +180,7 @@
-    fun:__nscd_get_map_ref
-    fun:nscd_get*_r
-    fun:*nscd*
--   obj:/*libc-@GLIBC_VERSION@.so
-+   obj:/*libc-@GLIBC_VERSION@*.so
- }
- 
- 
-@@ -199,18 +199,18 @@
-    Memcheck:Param
-    socketcall.sendto(msg)
-    fun:send
--   obj:/*libc-@GLIBC_VERSION@.so
--   obj:/*libc-@GLIBC_VERSION@.so
--   obj:/*libc-@GLIBC_VERSION@.so
-+   obj:/*libc-@GLIBC_VERSION@*.so
-+   obj:/*libc-@GLIBC_VERSION@*.so
-+   obj:/*libc-@GLIBC_VERSION@*.so
- }
- {
-    X11-64bit-padding-4b
-    Memcheck:Param
-    socketcall.send(msg)
-    fun:send
--   obj:/*libc-@GLIBC_VERSION@.so
--   obj:/*libc-@GLIBC_VERSION@.so
--   obj:/*libc-@GLIBC_VERSION@.so
-+   obj:/*libc-@GLIBC_VERSION@*.so
-+   obj:/*libc-@GLIBC_VERSION@*.so
-+   obj:/*libc-@GLIBC_VERSION@*.so
- }
- 
- ##----------------------------------------------------------------------##
diff --git a/dev-util/valgrind/files/valgrind-3.6.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.6.0-non-exec-stack.patch
deleted file mode 100644
index dc99694..0000000
--- a/dev-util/valgrind/files/valgrind-3.6.0-non-exec-stack.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -ruN valgrind-3.6.0.orig/coregrind/Makefile.am valgrind-3.6.0/coregrind/Makefile.am
---- valgrind-3.6.0.orig/coregrind/Makefile.am	2010-10-21 04:19:45.000000000 +0800
-+++ valgrind-3.6.0/coregrind/Makefile.am	2010-10-24 20:39:42.655001876 +0800
-@@ -285,23 +285,12 @@
- 	m_demangle/demangle.c \
- 	m_demangle/dyn-string.c \
- 	m_demangle/safe-ctype.c \
--	m_dispatch/dispatch-x86-linux.S \
--	m_dispatch/dispatch-amd64-linux.S \
--	m_dispatch/dispatch-ppc32-linux.S \
--	m_dispatch/dispatch-ppc64-linux.S \
--	m_dispatch/dispatch-arm-linux.S \
--	m_dispatch/dispatch-ppc32-aix5.S \
--	m_dispatch/dispatch-ppc64-aix5.S \
--	m_dispatch/dispatch-x86-darwin.S \
--	m_dispatch/dispatch-amd64-darwin.S \
- 	m_initimg/initimg-linux.c \
- 	m_initimg/initimg-aix5.c \
- 	m_initimg/initimg-darwin.c \
- 	m_initimg/initimg-pathscan.c \
- 	m_mach/mach_basics.c \
- 	m_mach/mach_msg.c \
--	m_mach/mach_traps-x86-darwin.S \
--	m_mach/mach_traps-amd64-darwin.S \
- 	m_replacemalloc/replacemalloc_core.c \
- 	m_scheduler/scheduler.c \
- 	m_scheduler/sema.c \
-@@ -314,15 +303,6 @@
- 	m_sigframe/sigframe-ppc64-aix5.c \
- 	m_sigframe/sigframe-x86-darwin.c \
- 	m_sigframe/sigframe-amd64-darwin.c \
--	m_syswrap/syscall-x86-linux.S \
--	m_syswrap/syscall-amd64-linux.S \
--	m_syswrap/syscall-ppc32-linux.S \
--	m_syswrap/syscall-ppc64-linux.S \
--	m_syswrap/syscall-arm-linux.S \
--	m_syswrap/syscall-ppc32-aix5.S \
--	m_syswrap/syscall-ppc64-aix5.S \
--	m_syswrap/syscall-x86-darwin.S \
--	m_syswrap/syscall-amd64-darwin.S \
- 	m_syswrap/syswrap-main.c \
- 	m_syswrap/syswrap-generic.c \
- 	m_syswrap/syswrap-linux.c \
-@@ -343,6 +323,24 @@
- 	m_ume/main.c \
- 	m_ume/script.c
- 
-+COREGRIND_SOURCES_COMMON += \
-+	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \
-+	m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S
-+
-+if VGCONF_HAVE_PLATFORM_SEC
-+COREGRIND_SOURCES_COMMON += \
-+	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \
-+	m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S
-+endif
-+
-+if VGCONF_OS_IS_DARWIN
-+COREGRIND_SOURCES_COMMON += \
-+	m_start-@VGCONF_ARCH_PRI@-darwin.S \
-+	m_start-@VGCONF_ARCH_SEC@-darwin.S \
-+	m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S \
-+	m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
-+endif
-+
- libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
-     $(COREGRIND_SOURCES_COMMON)
- nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
-diff -ruN valgrind-3.6.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.6.0/coregrind/m_dispatch/dispatch-amd64-linux.S
---- valgrind-3.6.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S	2010-10-21 04:19:39.000000000 +0800
-+++ valgrind-3.6.0/coregrind/m_dispatch/dispatch-amd64-linux.S	2010-10-24 20:39:41.462001899 +0800
-@@ -338,11 +338,11 @@
- 	ret
- .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
- 
-+#endif // defined(VGP_amd64_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
- 
--#endif // defined(VGP_amd64_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/
-diff -ruN valgrind-3.6.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.6.0/coregrind/m_dispatch/dispatch-x86-linux.S
---- valgrind-3.6.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S	2010-10-21 04:19:39.000000000 +0800
-+++ valgrind-3.6.0/coregrind/m_dispatch/dispatch-x86-linux.S	2010-10-24 20:39:41.022001883 +0800
-@@ -304,12 +304,11 @@
- 	ret
- .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
- 
-+#endif // defined(VGP_x86_linux)
- 			
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
- 
--#endif // defined(VGP_x86_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/
-diff -ruN valgrind-3.6.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.6.0/coregrind/m_syswrap/syscall-amd64-linux.S
---- valgrind-3.6.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S	2010-10-21 04:19:41.000000000 +0800
-+++ valgrind-3.6.0/coregrind/m_syswrap/syscall-amd64-linux.S	2010-10-24 20:39:40.576001879 +0800
-@@ -205,11 +205,11 @@
- ML_(blksys_finished):	.quad 5b
- .previous
- 
-+#endif // defined(VGP_amd64_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
- 
--#endif // defined(VGP_amd64_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/
-diff -ruN valgrind-3.6.0.orig/coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.6.0/coregrind/m_syswrap/syscall-x86-linux.S
---- valgrind-3.6.0.orig/coregrind/m_syswrap/syscall-x86-linux.S	2010-10-21 04:19:41.000000000 +0800
-+++ valgrind-3.6.0/coregrind/m_syswrap/syscall-x86-linux.S	2010-10-24 20:39:40.152001876 +0800
-@@ -164,12 +164,12 @@
- ML_(blksys_committed):	.long 4b
- ML_(blksys_finished):	.long 5b
- .previous
-+
-+#endif // defined(VGP_x86_linux)
- 	
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
- 
--#endif // defined(VGP_x86_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/
diff --git a/dev-util/valgrind/files/valgrind-3.6.1-glibc-2.14.patch b/dev-util/valgrind/files/valgrind-3.6.1-glibc-2.14.patch
deleted file mode 100644
index 446efac..0000000
--- a/dev-util/valgrind/files/valgrind-3.6.1-glibc-2.14.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur valgrind-3.6.1.orig/configure.in valgrind-3.6.1/configure.in
---- valgrind-3.6.1.orig/configure.in	2011-08-09 09:06:50.000000000 -0400
-+++ valgrind-3.6.1/configure.in	2011-08-09 09:21:42.000000000 -0400
-@@ -756,6 +756,13 @@
- 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- 	;;
-+     2.14)
-+	AC_MSG_RESULT(2.14 family)
-+	AC_DEFINE([GLIBC_2_14], 1, [Define to 1 if you're using glibc 2.14.x])
-+	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+	;;
-      aix5)
- 	AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
- 	AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3])
-@@ -769,7 +776,7 @@
- 
-      *)
- 	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
--	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.13])
-+	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14])
- 	AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION])
- 	AC_MSG_ERROR([or Darwin libc])
- 	;;
diff --git a/dev-util/valgrind/files/valgrind-3.6.1-linux-3.patch b/dev-util/valgrind/files/valgrind-3.6.1-linux-3.patch
deleted file mode 100644
index 143cfb9..0000000
--- a/dev-util/valgrind/files/valgrind-3.6.1-linux-3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in	2011-06-09 16:33:14.000000000 -0400
-+++ configure.in.orig	2011-06-09 16:33:08.000000000 -0400
-@@ -220,7 +220,7 @@
-         kernel=`uname -r`
- 
-         case "${kernel}" in
--             2.6.*) 
-+             2.6.*|3.*) 
-         	    AC_MSG_RESULT([2.6 family (${kernel})])
-         	    AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x])
-         	    ;;
diff --git a/dev-util/valgrind/files/valgrind-3.6.1-user-enable-qt4.patch b/dev-util/valgrind/files/valgrind-3.6.1-user-enable-qt4.patch
deleted file mode 100644
index 8f7c394..0000000
--- a/dev-util/valgrind/files/valgrind-3.6.1-user-enable-qt4.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- configure.in.orig	2011-02-17 14:29:14.000000000 -0500
-+++ configure.in	2011-02-17 15:05:46.000000000 -0500
-@@ -1692,7 +1692,8 @@
- # NEEDED BY THE REGRESSION TEST PROGRAMS.
- 
- 
--# The test below verifies whether the QtCore package been installed.
-+# The test below first checks if the user has manaually disabled
-+# QtCore.  It then verifies whether the QtCore package been installed.
- # This test works as follows:
- # - If pkg-config was not installed at the time autogen.sh was run,
- #   the definition of the PKG_CHECK_EXISTS() macro will not be found by
-@@ -1709,37 +1710,49 @@
- #   the pkg-config executable is not present on the system on which the
- #   configure script is run.
- 
--ifdef(
--  [PKG_CHECK_EXISTS],
--  [PKG_CHECK_EXISTS(
--    [QtCore],
-+AC_ARG_ENABLE(qtcore,
-+  AS_HELP_STRING(--enable-qtcore, compile with qtcore support),
-     [
--      PKG_CHECK_MODULES([QTCORE], [QtCore])
--      # Paranoia: don't trust the result reported by pkg-config, but when
--      # pkg-config reports that QtCore has been found, verify whether linking
--      # programs with QtCore succeeds.
--      AC_LANG(C++)
--      safe_CXXFLAGS="${CXXFLAGS}"
--      CXXFLAGS="${QTCORE_CFLAGS} ${QTCORE_LIBS} $mflag_primary"
--      AC_TRY_LINK(
--        [#include <QMutex>],
--        [QMutex Mutex;],
--        [ac_have_qtcore=yes],
--        [
--          AC_MSG_WARN([Although pkg-config detected Qt4, linking Qt4 programs fails. Skipping Qt4.])
--          ac_have_qtcore=no
--        ]
--        )
--      CXXFLAGS="${safe_CXXFLAGS}"
-+      if test x$enableval = xno ; then
-+        AC_MSG_CHECKING([for QTCORE ])
-+        AC_MSG_RESULT([QTCORE is manually distabled.])
-+        [ac_have_qtcore=no]
-+      fi
-     ],
-     [
--      ac_have_qtcore=no
-+      ifdef(
-+        [PKG_CHECK_EXISTS],
-+        [PKG_CHECK_EXISTS(
-+          [QtCore],
-+          [
-+            PKG_CHECK_MODULES([QTCORE], [QtCore])
-+            # Paranoia: don't trust the result reported by pkg-config, but when
-+            # pkg-config reports that QtCore has been found, verify whether linking
-+            # programs with QtCore succeeds.
-+            AC_LANG(C++)
-+            safe_CXXFLAGS="${CXXFLAGS}"
-+            CXXFLAGS="${QTCORE_CFLAGS} ${QTCORE_LIBS} $mflag_primary"
-+            AC_TRY_LINK(
-+              [#include <QMutex>],
-+              [QMutex Mutex;],
-+              [ac_have_qtcore=yes],
-+              [
-+                AC_MSG_WARN([Although pkg-config detected Qt4, linking Qt4 programs fails. Skipping Qt4.])
-+                ac_have_qtcore=no
-+              ]
-+              )
-+            CXXFLAGS="${safe_CXXFLAGS}"
-+          ],
-+          [
-+            ac_have_qtcore=no
-+          ]
-+          )
-+        ],
-+        AC_MSG_WARN([pkg-config has not been installed or is too old.])
-+        AC_MSG_WARN([Detection of Qt4 will be skipped.])
-+        [ac_have_qtcore=no]
-+      )
-     ]
--    )
--  ],
--  AC_MSG_WARN([pkg-config has not been installed or is too old.])
--  AC_MSG_WARN([Detection of Qt4 will be skipped.])
--  [ac_have_qtcore=no]
- )
- 
- AM_CONDITIONAL([HAVE_QTCORE], [test x$ac_have_qtcore = xyes])
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch b/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch
new file mode 100644
index 0000000..6af4553
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch
@@ -0,0 +1,12 @@
+diff -Naur valgrind-3.7.0.orig//Makefile.all.am valgrind-3.7.0/Makefile.all.am
+--- valgrind-3.7.0.orig//Makefile.all.am	2011-10-26 17:24:45.000000000 -0400
++++ valgrind-3.7.0/Makefile.all.am	2011-11-10 16:18:18.000000000 -0500
+@@ -82,7 +82,7 @@
+ # performance and get whatever useful warnings we can out of gcc.
+ # -fno-builtin is important for defeating LLVM's idiom recognition
+ # that somehow causes VG_(memset) to get into infinite recursion.
+-AM_CFLAGS_BASE = \
++AM_CFLAGS_BASE = -fno-stack-protector \
+ 	-O2 -g \
+ 	-Wall \
+ 	-Wmissing-prototypes \
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch
new file mode 100644
index 0000000..a2d1c0c
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch
@@ -0,0 +1,103 @@
+diff -Naur valgrind-3.7.0.orig//coregrind/Makefile.am valgrind-3.7.0/coregrind/Makefile.am
+--- valgrind-3.7.0.orig//coregrind/Makefile.am	2011-10-27 06:55:06.000000000 -0400
++++ valgrind-3.7.0/coregrind/Makefile.am	2011-11-10 16:43:33.000000000 -0500
+@@ -292,14 +292,6 @@
+ 	m_demangle/demangle.c \
+ 	m_demangle/dyn-string.c \
+ 	m_demangle/safe-ctype.c \
+-	m_dispatch/dispatch-x86-linux.S \
+-	m_dispatch/dispatch-amd64-linux.S \
+-	m_dispatch/dispatch-ppc32-linux.S \
+-	m_dispatch/dispatch-ppc64-linux.S \
+-	m_dispatch/dispatch-arm-linux.S \
+-	m_dispatch/dispatch-s390x-linux.S \
+-	m_dispatch/dispatch-x86-darwin.S \
+-	m_dispatch/dispatch-amd64-darwin.S \
+ 	m_gdbserver/m_gdbserver.c \
+ 	m_gdbserver/inferiors.c \
+ 	m_gdbserver/m_gdbserver.c \
+@@ -322,8 +314,6 @@
+ 	m_initimg/initimg-pathscan.c \
+ 	m_mach/mach_basics.c \
+ 	m_mach/mach_msg.c \
+-	m_mach/mach_traps-x86-darwin.S \
+-	m_mach/mach_traps-amd64-darwin.S \
+ 	m_replacemalloc/replacemalloc_core.c \
+ 	m_scheduler/scheduler.c \
+ 	m_scheduler/sema.c \
+@@ -335,14 +325,6 @@
+ 	m_sigframe/sigframe-s390x-linux.c \
+ 	m_sigframe/sigframe-x86-darwin.c \
+ 	m_sigframe/sigframe-amd64-darwin.c \
+-	m_syswrap/syscall-x86-linux.S \
+-	m_syswrap/syscall-amd64-linux.S \
+-	m_syswrap/syscall-ppc32-linux.S \
+-	m_syswrap/syscall-ppc64-linux.S \
+-	m_syswrap/syscall-arm-linux.S \
+-	m_syswrap/syscall-s390x-linux.S \
+-	m_syswrap/syscall-x86-darwin.S \
+-	m_syswrap/syscall-amd64-darwin.S \
+ 	m_syswrap/syswrap-main.c \
+ 	m_syswrap/syswrap-generic.c \
+ 	m_syswrap/syswrap-linux.c \
+@@ -361,6 +343,24 @@
+ 	m_ume/main.c \
+ 	m_ume/script.c
+ 
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \
++	m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S
++
++if VGCONF_HAVE_PLATFORM_SEC
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \
++	m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S
++endif
++
++if VGCONF_OS_IS_DARWIN
++COREGRIND_SOURCES_COMMON += \
++	m_start-@VGCONF_ARCH_PRI@-darwin.S \
++	m_start-@VGCONF_ARCH_SEC@-darwin.S \
++	m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S \
++	m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
++endif
++
+ libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+     $(COREGRIND_SOURCES_COMMON)
+ nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+diff -Naur valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.7.0/coregrind/m_syswrap/syscall-amd64-linux.S
+--- valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S	2011-10-26 17:24:42.000000000 -0400
++++ valgrind-3.7.0/coregrind/m_syswrap/syscall-amd64-linux.S	2011-11-10 16:46:00.000000000 -0500
+@@ -205,11 +205,11 @@
+ ML_(blksys_finished):	.quad 5b
+ .previous
+ 
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.7.0/coregrind/m_syswrap/syscall-x86-linux.S
+--- valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-x86-linux.S	2011-10-26 17:24:42.000000000 -0400
++++ valgrind-3.7.0/coregrind/m_syswrap/syscall-x86-linux.S	2011-11-10 16:46:20.000000000 -0500
+@@ -164,12 +164,12 @@
+ ML_(blksys_committed):	.long 4b
+ ML_(blksys_finished):	.long 5b
+ .previous
+-	
+-/* Let the linker know we don't need an executable stack */
+-.section .note.GNU-stack,"",@progbits
+ 
+ #endif // defined(VGP_x86_linux)
+ 
++/* Let the linker know we don't need an executable stack */
++.section .note.GNU-stack,"",@progbits
++
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch b/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch
new file mode 100644
index 0000000..860e09c
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch
@@ -0,0 +1,13 @@
+diff -Naur valgrind-3.7.0.orig//mpi/Makefile.am valgrind-3.7.0/mpi/Makefile.am
+--- valgrind-3.7.0.orig//mpi/Makefile.am	2011-10-26 17:24:23.000000000 -0400
++++ valgrind-3.7.0/mpi/Makefile.am	2011-11-10 16:03:14.000000000 -0500
+@@ -7,9 +7,6 @@
+ CC = $(MPI_CC)
+ DEFS =
+ DEFAULT_INCLUDES =
+-CPPFLAGS =
+-CFLAGS =
+-LDFLAGS =
+ 
+ EXTRA_DIST = \
+ 	mpiwrap_type_test.c
diff --git a/dev-util/valgrind/valgrind-3.7.0.ebuild b/dev-util/valgrind/valgrind-3.7.0.ebuild
index b67b98a..9c5a52a 100644
--- a/dev-util/valgrind/valgrind-3.7.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.7.0.ebuild
@@ -18,37 +18,21 @@ DEPEND="mpi? ( virtual/mpi )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	# Correct hard coded doc location
+	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
+
 	# Respect CFLAGS, LDFLAGS
-	sed -i -e '/^CPPFLAGS =/d' -e '/^CFLAGS =/d' -e '/^LDFLAGS =/d' \
-		mpi/Makefile.am || die
+	epatch "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
 
 	# Changing Makefile.all.am to disable SSP
-	sed -i -e 's:^AM_CFLAGS_BASE = :AM_CFLAGS_BASE = -fno-stack-protector :' \
-		Makefile.all.am || die
-
-	# Correct hard coded doc location
-	sed -i -e "s:doc/valgrind:doc/${PF}:" \
-		docs/Makefile.am || die
+	epatch "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.patch
 
 	# Yet more local labels, this time for ppc32 & ppc64
 	epatch "${FILESDIR}"/${PN}-3.6.0-local-labels.patch
 
 	# Don't build in empty assembly files for other platforms or we'll get a QA
 	# warning about executable stacks.
-	epatch "${FILESDIR}"/${PN}-3.6.0-non-exec-stack.patch
-
-	# Fix up some suppressions that were not general enough for glibc versions
-	# with more than just a major and minor number.
-	epatch "${FILESDIR}"/${PN}-3.4.1-glibc-2.10.1.patch
-
-	# Remove automagic dependency on qt4
-	epatch "${FILESDIR}"/${PN}-3.6.1-user-enable-qt4.patch
-
-	# Allow valgrind to build against linux-3, bug #370857
-	epatch "${FILESDIR}"/${PN}-3.6.1-linux-3.patch
-
-	# Allow valgrind to build against glibc-2.14, bug #378157
-	epatch "${FILESDIR}"/${PN}-3.6.1-glibc-2.14.patch
+	epatch "${FILESDIR}"/${PN}-3.7.0-non-exec-stack.patch
 
 	# Regenerate autotools files
 	eautoreconf