dev-util/valgrind: sync with upstream

drop 3.10.1
3.13.0 supports musl!

10 files changed, 2 insertions, 447 deletions

diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 17191813..9e301330 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,15 +1,6 @@
-AUX valgrind-3.10.1-glibc-2.21.patch 754 SHA256 a26812fc17bad388e3a30e74cec313ffc8c13bb61f8bb2667008af3d5e4d8984 SHA512 e5fa252633629d0688cbc97d60c91b51796c142c4336f0775266cedc14e53530397290dcdb4d6a4170b0579051fa8a33766d7c43980d6785e56880409ae39218 WHIRLPOOL e106fe74225329e05c89b5e69471c88fe65f7044e357c66509ff4731cf5f2f410e79fed0885af015e7c49d4b9b37e4e491fc870f900da18ef9cab146a37c9050
-AUX valgrind-3.10.1-glibc-2.22.patch 754 SHA256 c1fb0353065c03abc3867e0c0ffd030abbe9050bd6c0df1622633eac0156f5bc SHA512 c9d6511097b4270474011ee5dd7e87b20ca946c8fc227766db017948d0fcff7b5f8031ce2827b90917c2c9fb059fa65173cc2243c3d57b7e9edfcab740b7250e WHIRLPOOL 5a45da79add0334989ba85697a958416e762593e1b60d604002dea081191ad1aba45c4502191b212db64e208a7b2e7f8a80e5955157487782b31b09e9626e2e4
-AUX valgrind-3.10.1-linux-4.patch 972 SHA256 08956afc6390188a6c8bc0cebb81e806d4006e635076878e21043a57e5df4816 SHA512 22fda4cb41ee38e5b871217abf7c697ac6d1f088e9d6f5c035c6c54b0d008f2f23fe900fc036f0990fbad6284d357838e344ec43c156a5d8ec60d7b377abceaf WHIRLPOOL 99528549388b189328de8fe40715cdeac86f22726c62f9ae5aa677ac1a33aeb610230c421738342c4ed8b3b55e43372ecda943d5c2a4e74a26484ff1c1ef8c50
-AUX valgrind-3.10.1-musl.patch 1884 SHA256 9f94b5a8674f5f3c1dead32cff036ae5a513158e14c89cf230cd6f3d47e77feb SHA512 5a8ce93abd83a66983f0b47acce4e375dd6b8c57d6772d42f51aea0ec0f0c233cef88230d10e54c06446a84c772810d382fd1861019ad9b28578b0e0bd8ff57c WHIRLPOOL d62e7ddf61e9fd8a810c358051448cf742dd145738e7fbea8bf1f56ea8ceadf9683da6e6e596807dc810ba5e2c8688b45e1ccccc06451742c8598e712227d5a2
-AUX valgrind-3.10.1-non-exec-stack.patch 6019 SHA256 812560566e56c32db2ad3a97a2e52327d84648698987079ccf3843203c1e6ddc SHA512 015da8132bb72b81bd017b3e3faefb408a8f053676ff605bec411e40d9b7de21b197f660139df7e540756462406442325305d52ae0da04ac44ec66612fb1b0b3 WHIRLPOOL ddaf89092c4915662e6ba048668715f13e8634edc7cf490099870edda3b23799a76e3c677a430bf966295f84010829217aa0c0f887e48762969b805a365ef101
 AUX valgrind-3.11.0-musl.patch 2031 SHA256 c3c036b5976320f5c4f949a5c10c1b361b6328e5ca766658975305892c46efd0 SHA512 29bb3f4719b6ec6e921220135f6d11eb4fa130edf3c94b9b63ddd68fba1426aaa6b1bb7629b25c853a1b2a902f4fd0d8e74a3d641f395d43f0553209e6c5f5d5 WHIRLPOOL 8f06d02c36a52f753ad8103b13b11cc07dcaf531769ca99f142244d737d75d25cb5290eefebd0e7b9b18f40d5a855cee72cef89efae100961566df0b48e63977
-AUX valgrind-3.6.0-local-labels.patch 1388 SHA256 34ae13eda378677f1e662e0813f138de9b897d6592d20872c58ed8ac1bcf7def SHA512 079abe5bd99e2acf0e33a46db3772e264a2051d048c1cd34a4ee350395ea38b815f7909008ed1123324857ed25ab0159da4c5da37701570be012a0664481bbc6 WHIRLPOOL ba737636a547154947073478048f693bb28a9e353b8a1ac195d701bb8be69e182aa5d043b1c6085639c80752c68e5c8b26e3ec54bdcff7ac53ca71bc62768f58
 AUX valgrind-3.7.0-fno-stack-protector.patch 554 SHA256 83ed90a0e8a8b06dca8aad4e7f1a12e3c84621d502427c0913b72740b310f479 SHA512 4f9573fd68a0e1e209518fb4100c27b697ccd28e7a39abaa921f1949cd87ffb79a6784d2d1f6e006d68a08c7217cee77cba378c18aab48b87a3824eedb53ed5e WHIRLPOOL 097a9658c0b83cec2b49fc0011bc63512d1a1b2e12048203ac963ad1fd526f932d8fee4052e6b8daacec3fa0bc9a0ea25e69f88bbb5df588e9b668252c0dc517
 AUX valgrind-3.7.0-respect-flags.patch 360 SHA256 6b1e5938ecafc29428a698296423c71924848b1e746d6ee8a0f1dd91141f1019 SHA512 efdb017283b6a5829d1a5acc31b42ddd177a3ab468eb062b8c4fd90b2dbd06679e8d8bc2d6f813e3001efdda831d4410cc8da3a3e42ee2e49efea0423e4b3ca3 WHIRLPOOL 5bff165cf8f6042905a4d682b0114ee41301de173d43412b16208a08a351fe8ca74a527e4d09f9649dca28cbb61dd8ea2392e10e2b8d7b8ea0e51318915f9565
-AUX valgrind-3.9.0-glibc-2.19.patch 1530 SHA256 5cb0b62569d6acf3bc30e168570effecfcccd8cd6d9d9f1ee201c99d74a960f6 SHA512 8f059c9cf61cab427538164fd11bc14d3be17d5f93a77b8ca33426c0bf2fee3b2d0797cd246ec50266cc5f6ebb602d877ab7eded0618836752fd14408a2d5a63 WHIRLPOOL 8556c35adb05b20f466ec6acc1ce4b8a4940cf29b576dc72623278a5eb35f269aa84edb1202bcf059daee1e0c2ff9f7a0828b8f1a0e31b12f6d30d24bf07da37
-DIST valgrind-3.10.1.tar.bz2 10967905 SHA256 fa253dc26ddb661b6269df58144eff607ea3f76a9bcfe574b0c7726e1dfcb997 SHA512 8f3d27637c13b06381b3dd44088244e0cf2f7008f40e46f34322f2a5bfa6373d29ce68ff49f19c48f1a5f139d8be5838b9606206e0ce2599c5f74c0db8ce2642 WHIRLPOOL 3d55f35b02195d9859d9192726ea708277f1d3339005d959baa224822c5b71f5347cdd28c7fd8153c10d1e3282855e853caf9c7192751bebdbbc3444c33d885a
 DIST valgrind-3.12.0.tar.bz2 12788556 SHA256 67ca4395b2527247780f36148b084f5743a68ab0c850cb43e4a5b4b012cf76a1 SHA512 2c083f7c2e74dc58600397726d9d3af7a2cea40fe3d8733149886d1d77867e6c09996e5be1c58dd932f3662acf7363e04eeadbc0f9c8f0dac089e605024229be WHIRLPOOL 136dd4f358bd18165a5801083cc73fc269a84bf491880af9842e789feea62181e16ca4c099db06fb4ffacf0cb0189b1b29d64790cc4202442f6f6b71ce4c6eea
-EBUILD valgrind-3.10.1.ebuild 3681 SHA256 78cfaa8c3e1adad961e77e47486a2e1ed6271beb312f7f803323939979de64ed SHA512 c76f9ef2fe60f903b226f3a4aa8844aa7c9b5ade7631247f2a3b19ed134117c0605ec23e061dc5c79034972c9dced2128ec7226d7787a8d8f898bbe10d3c6d54 WHIRLPOOL 117b0c6b6634b0ac8e522e1490a16e7b815205af5a538065ec1e3bd77dba64b055abafe930ec56dcd0fa306da9053e5332df33053074d037853a22e8a186d94e
-EBUILD valgrind-3.12.0.ebuild 2920 SHA256 7981adb8c07f329b286193ff8694981d58bcda866cf662cdc5cb29c852648768 SHA512 62ae5f357c14f3db94286b3a9bda0842b063972a39a34de8f22e166ae59c8f2aca7e44387ae4ff0f6608dd1149263c9392cd87287af2c452c47220c1f6f4b1aa WHIRLPOOL 690d72599e332e5b5054eab3e61ab7a48f5edb4749672adbb2a6454e651d89eac46bc762339e4a39cc9e6fb5efc9d95460b30502ba9310e737965d8c887bc61f
+EBUILD valgrind-3.12.0.ebuild 2918 SHA256 5c5f6198daddad80c93788e8ece51ea084252c602725f2854875422a76472aaf SHA512 84d14a822c2bd3623436db04dce3d056698ad3c65cbecea00be5461f1dc6a3211d29159023a28a96eecf81dfc2dad2df3e621114749030a7186d2d68d6bcb452 WHIRLPOOL b8583413f0f775af55cd7b784c2b0ea2bb130b378d2f2d3eea9e1313a443c326c52bbfd5c37555a396b41f708d810bace88251030e343342388f9de5349a196e
 MISC metadata.xml 1139 SHA256 5d601e1ea0a4b8a1ba906b88621b2f814e26d24d21c994dee39cd47494402982 SHA512 f3ee37b8e5f408c01d5f6308644305fcb945df008e5f708dbde95f73a1e7988f53799e28bd72f75bd5e01765414a0e11b8045f671e723beb46d90a50f5dd1846 WHIRLPOOL fc7cf7dd758d8f9baf538fce53a95019225af8a6b0049662b174ef67d287a92396ddafdd37b33ec7f72b94a4f093bf4afac8b47f8d9f75529e15b3ece1957414
diff --git a/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.21.patch b/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.21.patch
deleted file mode 100644
index 286e431b..00000000
--- a/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.21.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur valgrind-3.10.1.orig/configure.ac valgrind-3.10.1/configure.ac
---- valgrind-3.10.1.orig/configure.ac	2014-11-25 14:41:13.000000000 -0500
-+++ valgrind-3.10.1/configure.ac	2015-07-28 22:35:22.315604804 -0400
-@@ -1018,6 +1018,13 @@
- 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- 	;;
-+     2.21)
-+	AC_MSG_RESULT(2.21 family)
-+	AC_DEFINE([GLIBC_2_21], 1, [Define to 1 if you're using glibc 2.21.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}"
-+	;;
-      darwin)
- 	AC_MSG_RESULT(Darwin)
- 	AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
diff --git a/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.22.patch b/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.22.patch
deleted file mode 100644
index aa44aec4..00000000
--- a/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.22.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur valgrind-3.10.1.orig/configure.ac valgrind-3.10.1/configure.ac
---- valgrind-3.10.1.orig/configure.ac	2016-04-16 04:24:22.285314910 -0400
-+++ valgrind-3.10.1/configure.ac	2016-04-16 04:39:03.437329726 -0400
-@@ -1032,6 +1032,13 @@
- 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- 	;;
-+     2.22)
-+	AC_MSG_RESULT(2.22 family)
-+	AC_DEFINE([GLIBC_2_22], 1, [Define to 1 if you're using glibc 2.22.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}"
-+	;;
-      darwin)
- 	AC_MSG_RESULT(Darwin)
- 	AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
diff --git a/dev-util/valgrind/files/valgrind-3.10.1-linux-4.patch b/dev-util/valgrind/files/valgrind-3.10.1-linux-4.patch
deleted file mode 100644
index 63918c2c..00000000
--- a/dev-util/valgrind/files/valgrind-3.10.1-linux-4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ecb3746d69820905c076b89e1be7042f52ceaa5f Mon Sep 17 00:00:00 2001
-From: Janne Grunau <j@jannau.net>
-Date: Thu, 19 Mar 2015 22:44:51 +0100
-Subject: [PATCH 1/1] configure: support linux 4.*
-
-There is nothing special in linux 4.0. Handle it as another 3.* (or
-another 2.6.*) release. Compare changeset 14955 in valgrind's
-subversion repository. Valgrind trunk also drops support for linux 2.4
-but there is no need to do that for realeased software.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0fd2a41..33c7954 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -303,7 +303,7 @@ case "${host_os}" in
-         kernel=`uname -r`
- 
-         case "${kernel}" in
--             2.6.*|3.*) 
-+             2.6.*|3.*|4.*)
-         	    AC_MSG_RESULT([2.6.x/3.x family (${kernel})])
-         	    AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x or Linux 3.x])
-         	    ;;
--- 
-2.3.3
-
diff --git a/dev-util/valgrind/files/valgrind-3.10.1-musl.patch b/dev-util/valgrind/files/valgrind-3.10.1-musl.patch
deleted file mode 100644
index 573c75de..00000000
--- a/dev-util/valgrind/files/valgrind-3.10.1-musl.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ru valgrind-3.10.0.orig/configure.ac valgrind-3.10.0/configure.ac
---- valgrind-3.10.0.orig/configure.ac	2014-09-11 12:12:44.000000000 -0300
-+++ valgrind-3.10.0/configure.ac	2014-09-19 13:11:10.338289149 -0300
-@@ -1031,8 +1031,6 @@
- 
-      *)
- 	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
--	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.19])
--	AC_MSG_ERROR([or Darwin or Bionic libc])
- 	;;
- esac
- 
-diff -ru valgrind-3.10.0.orig/coregrind/vg_preloaded.c valgrind-3.10.0/coregrind/vg_preloaded.c
---- valgrind-3.10.0.orig/coregrind/vg_preloaded.c	2014-09-19 13:08:26.000000000 -0300
-+++ valgrind-3.10.0/coregrind/vg_preloaded.c	2014-09-19 13:12:31.301626639 -0300
-@@ -57,7 +57,7 @@
- void VG_NOTIFY_ON_LOAD(freeres)( void );
- void VG_NOTIFY_ON_LOAD(freeres)( void )
- {
--#  if !defined(__UCLIBC__) \
-+#  if defined(__GLIBC__) \
-    && !defined(VGPV_arm_linux_android) && !defined(VGPV_x86_linux_android) \
-    && !defined(VGPV_mips32_linux_android)
-    extern void __libc_freeres(void);
---- valgrind-3.10.0.orig/include/pub_tool_redir.h	2014-09-08 15:28:23.000000000 -0300
-+++ valgrind-3.10.0/include/pub_tool_redir.h	2014-09-19 14:12:48.195145620 -0300
-@@ -241,7 +241,7 @@
- /* --- Soname of the standard C library. --- */
- 
- #if defined(VGO_linux)
--#  define  VG_Z_LIBC_SONAME  libcZdsoZa              // libc.so*
-+#  define  VG_Z_LIBC_SONAME  libcZdZa                // libc.*
- 
- #elif defined(VGO_darwin) && (DARWIN_VERS <= DARWIN_10_6)
- #  define  VG_Z_LIBC_SONAME  libSystemZdZaZddylib    // libSystem.*.dylib
-@@ -273,7 +273,7 @@
- /* --- Soname of the pthreads library. --- */
- 
- #if defined(VGO_linux)
--#  define  VG_Z_LIBPTHREAD_SONAME  libpthreadZdsoZd0     // libpthread.so.0
-+#  define  VG_Z_LIBPTHREAD_SONAME  libcZdZa              // libc.*
- #elif defined(VGO_darwin)
- #  define  VG_Z_LIBPTHREAD_SONAME  libSystemZdZaZddylib  // libSystem.*.dylib
- #else
diff --git a/dev-util/valgrind/files/valgrind-3.10.1-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.10.1-non-exec-stack.patch
deleted file mode 100644
index e25de99e..00000000
--- a/dev-util/valgrind/files/valgrind-3.10.1-non-exec-stack.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-diff -Naur valgrind-3.10.1.orig/coregrind/Makefile.am valgrind-3.10.1/coregrind/Makefile.am
---- valgrind-3.10.1.orig/coregrind/Makefile.am	2014-11-25 14:41:19.000000000 -0500
-+++ valgrind-3.10.1/coregrind/Makefile.am	2014-11-26 13:36:44.113678744 -0500
-@@ -333,18 +333,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-ppc64be-linux.S \
--	m_dispatch/dispatch-ppc64le-linux.S \
--	m_dispatch/dispatch-arm-linux.S \
--	m_dispatch/dispatch-arm64-linux.S \
--	m_dispatch/dispatch-s390x-linux.S \
--	m_dispatch/dispatch-mips32-linux.S \
--	m_dispatch/dispatch-mips64-linux.S \
--	m_dispatch/dispatch-x86-darwin.S \
--	m_dispatch/dispatch-amd64-darwin.S \
- 	m_gdbserver/inferiors.c \
- 	m_gdbserver/m_gdbserver.c \
- 	m_gdbserver/regcache.c \
-@@ -368,8 +356,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 \
-@@ -386,18 +372,6 @@
- 	m_sigframe/sigframe-mips64-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-ppc64be-linux.S \
--	m_syswrap/syscall-ppc64le-linux.S \
--	m_syswrap/syscall-arm-linux.S \
--	m_syswrap/syscall-arm64-linux.S \
--	m_syswrap/syscall-s390x-linux.S \
--	m_syswrap/syscall-mips32-linux.S \
--	m_syswrap/syscall-mips64-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 \
-@@ -420,6 +394,29 @@
- 	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_dispatch/dispatch-@VGCONF_ARCH_PRI@-darwin.S \
-+	m_syswrap/syscall-@VGCONF_ARCH_PRI@-darwin.S \
-+	m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S
-+if VGCONF_HAVE_PLATFORM_SEC
-+COREGRIND_SOURCES_COMMON += \
-+	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-darwin.S \
-+	m_syswrap/syscall-@VGCONF_ARCH_SEC@-darwin.S \
-+	m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
-+endif
-+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.10.1.orig/coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.10.1/coregrind/m_dispatch/dispatch-amd64-linux.S
---- valgrind-3.10.1.orig/coregrind/m_dispatch/dispatch-amd64-linux.S	2014-11-25 14:41:20.000000000 -0500
-+++ valgrind-3.10.1/coregrind/m_dispatch/dispatch-amd64-linux.S	2014-11-26 13:30:11.840660890 -0500
-@@ -249,11 +249,11 @@
- 
- .size VG_(disp_run_translations), .-VG_(disp_run_translations)
- 
-+#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.10.1.orig/coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.10.1/coregrind/m_dispatch/dispatch-x86-linux.S
---- valgrind-3.10.1.orig/coregrind/m_dispatch/dispatch-x86-linux.S	2014-11-25 14:41:20.000000000 -0500
-+++ valgrind-3.10.1/coregrind/m_dispatch/dispatch-x86-linux.S	2014-11-26 13:30:11.840660890 -0500
-@@ -240,11 +240,11 @@
- 
- .size VG_(disp_run_translations), .-VG_(disp_run_translations)
- 
-+#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 -Naur valgrind-3.10.1.orig/coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.10.1/coregrind/m_syswrap/syscall-amd64-linux.S
---- valgrind-3.10.1.orig/coregrind/m_syswrap/syscall-amd64-linux.S	2014-11-25 14:41:20.000000000 -0500
-+++ valgrind-3.10.1/coregrind/m_syswrap/syscall-amd64-linux.S	2014-11-26 13:30:11.840660890 -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.10.1.orig/coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.10.1/coregrind/m_syswrap/syscall-x86-linux.S
---- valgrind-3.10.1.orig/coregrind/m_syswrap/syscall-x86-linux.S	2014-11-25 14:41:20.000000000 -0500
-+++ valgrind-3.10.1/coregrind/m_syswrap/syscall-x86-linux.S	2014-11-26 13:30:11.840660890 -0500
-@@ -165,11 +165,11 @@
- 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.0-local-labels.patch b/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch
deleted file mode 100644
index 68e68225..00000000
--- a/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- coregrind/m_libcassert.c	2010-10-21 04:19:45.000000000 +0800
-+++ coregrind/m_libcassert.c	2010-10-24 20:23:17.800001876 +0800
-@@ -81,8 +81,8 @@
-       { UInt cia, r1, lr;                                 \
-         __asm__ __volatile__(                             \
-            "mflr 0;"                   /* r0 = lr */      \
--           "bl m_libcassert_get_ip;"   /* lr = pc */      \
--           "m_libcassert_get_ip:\n"                       \
-+           "bl 0f;"                    /* lr = pc */      \
-+           "0:\n"                                         \
-            "mflr %0;"                  /* %0 = pc */      \
-            "mtlr 0;"                   /* restore lr */   \
-            "mr %1,1;"                  /* %1 = r1 */      \
-@@ -100,8 +100,8 @@
-       { ULong cia, r1, lr;                                \
-         __asm__ __volatile__(                             \
-            "mflr 0;"                   /* r0 = lr */      \
--           "bl .m_libcassert_get_ip;"  /* lr = pc */      \
--           ".m_libcassert_get_ip:\n"                      \
-+           "bl 0f;"                    /* lr = pc */      \
-+           "0:\n"                                         \
-            "mflr %0;"                  /* %0 = pc */      \
-            "mtlr 0;"                   /* restore lr */   \
-            "mr %1,1;"                  /* %1 = r1 */      \
diff --git a/dev-util/valgrind/files/valgrind-3.9.0-glibc-2.19.patch b/dev-util/valgrind/files/valgrind-3.9.0-glibc-2.19.patch
deleted file mode 100644
index 79a3283c..00000000
--- a/dev-util/valgrind/files/valgrind-3.9.0-glibc-2.19.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur valgrind-3.9.0-orig/configure valgrind-3.9.0/configure
---- valgrind-3.9.0-orig/configure	2013-11-01 09:33:32.000000000 +1000
-+++ valgrind-3.9.0/configure	2014-02-08 09:28:06.063248544 +1000
-@@ -6689,6 +6689,16 @@
- 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- 	;;
-+     2.19)
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.19 family" >&5
-+$as_echo "2.19 family" >&6; }
-+
-+$as_echo "#define GLIBC_2_19 1" >>confdefs.h
-+
-+	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}"
-+	;;
-      darwin)
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
- $as_echo "Darwin" >&6; }
-diff -Naur valgrind-3.9.0-orig/configure.ac valgrind-3.9.0/configure.ac
---- valgrind-3.9.0-orig/configure.ac	2013-11-01 09:28:16.000000000 +1000
-+++ valgrind-3.9.0/configure.ac	2014-02-08 09:27:38.870385366 +1000
-@@ -918,6 +918,13 @@
- 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- 	;;
-+     2.19)
-+	AC_MSG_RESULT(2.19 family)
-+	AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.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}"
-+	;;
-      darwin)
- 	AC_MSG_RESULT(Darwin)
- 	AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
diff --git a/dev-util/valgrind/valgrind-3.10.1.ebuild b/dev-util/valgrind/valgrind-3.10.1.ebuild
deleted file mode 100644
index 45f3db5d..00000000
--- a/dev-util/valgrind/valgrind-3.10.1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
-
-DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="http://www.valgrind.org"
-SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="mpi"
-
-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
-
-	# Don't force multiarch stuff on OSX, bug #306467
-	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
-
-	# Respect CFLAGS, LDFLAGS
-	epatch "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
-
-	# Changing Makefile.all.am to disable SSP
-	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.10.1-non-exec-stack.patch
-
-	# glibc 2.19 fix
-	epatch "${FILESDIR}"/${PN}-3.9.0-glibc-2.19.patch
-
-	# valgrind works fine on linux-4, bug #543648
-	epatch "${FILESDIR}"/${PN}-3.10.1-linux-4.patch
-
-	# glibc 2.21 fix.  Bug #554808.
-	epatch "${FILESDIR}"/${PN}-3.10.1-glibc-2.21.patch
-
-	# glibc 2.22 fix.  Bug #580092
-	epatch "${FILESDIR}"/${PN}-3.10.1-glibc-2.22.patch
-
-	# Fix building with musl
-	epatch "${FILESDIR}"/${PN}-3.10.1-musl.patch
-
-	# Allow users to test their own patches
-	epatch_user
-
-	# Regenerate autotools files
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# Respect ar, bug #468114
-	tc-export AR
-
-	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
-	#                       while compiling insn_sse.c in none/tests/x86
-	# -fpie                 valgrind seemingly hangs when built with pie on
-	#                       amd64 (bug #102157)
-	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
-	#                       because valgrind doesn't link to glibc (bug #114347)
-	# -m64 -mx32			for multilib-portage, bug #398825
-	# -ggdb3                segmentation fault on startup
-	filter-flags -fomit-frame-pointer
-	filter-flags -fpie
-	filter-flags -fstack-protector
-	filter-flags -m64 -mx32
-	replace-flags -ggdb3 -ggdb2
-
-	if use amd64 || use ppc64; then
-		! has_multilib_profile && myconf="${myconf} --enable-only64bit"
-	fi
-
-	# Force bitness on darwin, bug #306467
-	use x86-macos && myconf="${myconf} --enable-only32bit"
-	use x64-macos && myconf="${myconf} --enable-only64bit"
-
-	# Don't use mpicc unless the user asked for it (bug #258832)
-	if ! use mpi; then
-		myconf="${myconf} --without-mpicc"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS FAQ.txt NEWS README*
-
-	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_names on shared libraries, can't turn them into bundles,
-		# as dyld won't load them any more then, bug #306467
-		local l
-		for l in "${ED}"/usr/lib/valgrind/*.so ; do
-			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Valgrind will not work if glibc does not have debug symbols."
-	elog "To fix this you can add splitdebug to FEATURES in make.conf"
-	elog "and remerge glibc.  See:"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
-}
diff --git a/dev-util/valgrind/valgrind-3.12.0.ebuild b/dev-util/valgrind/valgrind-3.12.0.ebuild
index 8c29e993..35e2b2e7 100644
--- a/dev-util/valgrind/valgrind-3.12.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.12.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="-* amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="mpi"
 
 DEPEND="mpi? ( virtual/mpi )"