[gentoo-commits] dev/flameeyes:master commit in: dev-util/valgrind/, dev-util/valgrind/files/

[Diego Elio Pettenò]

commit:     b1411749d775d0e5a64a4db88e41623283fcbc4d
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Tue Nov 15 14:15:11 2011 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 14:15:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/flameeyes.git;a=commit;h=b1411749

Add versions of valgrind that wroks with the current systems.

---
 dev-util/valgrind/Manifest                         |   11 +-
 .../files/valgrind-3.4.1-glibc-2.10.1.patch        |   49 +++++++
 .../files/valgrind-3.6.0-local-labels.patch        |   24 ++++
 .../files/valgrind-3.6.0-non-exec-stack.patch      |  137 ++++++++++++++++++++
 .../files/valgrind-9999-fix-as-needed.patch        |   29 ++++
 dev-util/valgrind/valgrind-3.6.0.ebuild            |   90 +++++++++++++
 dev-util/valgrind/valgrind-9999.ebuild             |   87 +++++++------
 7 files changed, 381 insertions(+), 46 deletions(-)

diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 3f9f2ec..361b725 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,4 +1,7 @@
-AUX valgrind-3.2.3-pkg-config.patch 670 RMD160 26d8f37182da50110e4c40c5be0ec9d06185d7fd SHA1 83bda9ceebc7c13586c5bcd49c809c72e2e7511d SHA256 ffd44e653b95326ef1915f406e35cca9a0898ba3e101965d0f6e4229c72c38d5
-AUX valgrind-3.3.0-only64bit.patch 580 RMD160 f4304ad005586541400e6c1466dabf8cdaac2b72 SHA1 7c890914ec0fd53b8de662783b230ec78e57e345 SHA256 23485d4b03c66db3c58f3a7e9d0aca439a50b87ea60f2edaaf94229b54a80ee9
-AUX valgrind-3.3.1-local-labels.patch 1186 RMD160 3eeb3a847f85b2b68e32ce5966539067103b12c1 SHA1 07c6afbc4eb2565404ffe12aa8cd0357fd736ab4 SHA256 79a0e65903ce1b7ec0c0759c4face9a23bd9724831bf0b8c201dced2dc7dbb71
-EBUILD valgrind-9999.ebuild 3043 RMD160 fe682d9f9874919645feb3242131895d9d67679c SHA1 7abcfb8b48ea8cbb307aba37fac312e95ef33153 SHA256 9212d78a07510a3af0040f19720fcd96440db21c91f6f3fdaaf5928aa7330436
+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-9999-fix-as-needed.patch 1972 RMD160 c36b4681ceea6b081fbb8276e2bbfcb9499dc41c SHA1 5879f114e83e967cfe2b4e1851bb550a425cf1cf SHA256 56884cec2c5ab2414013ba0ff11e8330d11ba896776e8beb628e75759d2d48b7
+DIST valgrind-3.6.0.tar.bz2 5962204 RMD160 d7adc13bdafb1e5057d2e2a7a41076c1acabc368 SHA1 6f7ae88d36dfb45c337175a873aada7bed01c8c3 SHA256 bc0f0153b5a47b986f1d8efa2c488e0aea85a1cf2c4b11c52be127903080285f
+EBUILD valgrind-3.6.0.ebuild 2921 RMD160 e579ed554ae4e1c3467bc8604cd025315d2e58ad SHA1 04ad6ee87efd0b8206c2a3b9e871f8989140ef87 SHA256 3284fd2e68767d09cf45e0162a2911a67954afaf39edb1f6c15302060c49d57c
+EBUILD valgrind-9999.ebuild 2993 RMD160 c6b8042527b43ec86cb644e987444ebecb827b0a SHA1 3fa4c51399886bcc73fe38392190a77c489fd311 SHA256 25e09d961a888beff6fc5b54c2680cb21436f4fb005d2ad70c48f1cb42c9c22e

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
new file mode 100644
index 0000000..393dc7c
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.4.1-glibc-2.10.1.patch
@@ -0,0 +1,49 @@
+--- 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-local-labels.patch b/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch
new file mode 100644
index 0000000..68e6822
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch
@@ -0,0 +1,24 @@
+--- 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.6.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.6.0-non-exec-stack.patch
new file mode 100644
index 0000000..dc99694
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.6.0-non-exec-stack.patch
@@ -0,0 +1,137 @@
+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-9999-fix-as-needed.patch b/dev-util/valgrind/files/valgrind-9999-fix-as-needed.patch
new file mode 100644
index 0000000..8ca0393
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-9999-fix-as-needed.patch
@@ -0,0 +1,29 @@
+Fix library link order.
+
+x86_64-pc-linux-gnu-gcc -m64 -fomit-frame-pointer -fno-stack-protector -O2 -g -Wall -Wmissing-prototypes -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Wno-format-zero-length -fno-strict-aliasing -Wno-long-long -O2 -pipe -ggdb -nopie -fno-stack-protector -Wno-pointer-sign -fno-stack-protector -m64 -fomit-frame-pointer -fno-stack-protector -O2 -g -Wall -Wmissing-prototypes -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Wno-format-zero-length -fno-strict-aliasing -lpthread  -Wl,--hash-style=gnu -Wl,-O1 -Wl,--as-needed -o vgdb vgdb-vgdb.o  
+vgdb-vgdb.o: In function `received_signal':
+valgrind-9999/work/valgrind-9999/coregrind/vgdb.c:1547: undefined reference to `pthread_cancel'
+vgdb-vgdb.o: In function `close_connection':
+valgrind-9999/work/valgrind-9999/coregrind/vgdb.c:1650: undefined reference to `pthread_join'
+vgdb-vgdb.o: In function `standalone_send_commands':
+valgrind-9999/work/valgrind-9999/coregrind/vgdb.c:1796: undefined reference to `pthread_create'
+vgdb-vgdb.o: In function `gdb_relay':
+/var/tmp/paludis/dev-util-valgrind-9999/work/valgrind-9999/coregrind/vgdb.c:1673: undefined reference to `pthread_create'
+vgdb-vgdb.o: In function `invoke_gdbserver_in_valgrind':
+valgrind-9999/work/valgrind-9999/coregrind/vgdb.c:1131: undefined reference to `__pthread_register_cancel'
+valgrind-9999/work/valgrind-9999/coregrind/vgdb.c:1221: undefined reference to `__pthread_unregister_cancel'
+
+Breakage found by Diego Pettenò.
+diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
+index 6d57695..29fa297 100644
+--- a/coregrind/Makefile.am
++++ b/coregrind/Makefile.am
+@@ -58,7 +58,7 @@ vgdb_CFLAGS    = $(AM_CFLAGS_PRI)
+ vgdb_CCASFLAGS = $(AM_CCASFLAGS_PRI)
+ vgdb_LDFLAGS   = $(AM_CFLAGS_PRI)
+ if !VGCONF_PLATVARIANT_IS_ANDROID
+-vgdb_LDFLAGS   += -lpthread
++vgdb_LDADD     = -lpthread
+ endif
+ if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN
+ vgdb_LDFLAGS   += -Wl,-read_only_relocs -Wl,suppress

diff --git a/dev-util/valgrind/valgrind-3.6.0.ebuild b/dev-util/valgrind/valgrind-3.6.0.ebuild
new file mode 100644
index 0000000..b2be0c0
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.6.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.6.0.ebuild,v 1.1 2010/11/10 01:40:41 blueness Exp $
+
+EAPI=2
+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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="mpi"
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Respect CFLAGS, LDFLAGS
+	sed -i -e '/^CPPFLAGS =/d' -e '/^CFLAGS =/d' -e '/^LDFLAGS =/d' \
+		mpi/Makefile.am || die
+
+	# 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
+
+	# Yet more local labels, this time for ppc32 & ppc64
+	epatch "${FILESDIR}/valgrind-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}/valgrind-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}/valgrind-3.4.1-glibc-2.10.1.patch"
+
+	# Regenerate autotools files
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# -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)
+	# -ggdb3                segmentation fault on startup
+	filter-flags -fomit-frame-pointer
+	filter-flags -fpie
+	filter-flags -fstack-protector
+	replace-flags -ggdb3 -ggdb2
+
+	if use amd64 || use ppc64; then
+		! has_multilib_profile && myconf="${myconf} --enable-only64bit"
+	fi
+
+	# 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 || die
+	dodoc AUTHORS FAQ.txt NEWS README*
+
+	pax-mark m "${D}"/usr/$(get_libdir)/valgrind/*-*-linux
+}
+
+pkg_postinst() {
+	if use ppc || use ppc64 || use amd64 ; then
+		ewarn "Valgrind will not work on ppc, ppc64 or amd64 if glibc does not have"
+		ewarn "debug symbols (see https://bugs.gentoo.org/show_bug.cgi?id=214065"
+		ewarn "and http://bugs.gentoo.org/show_bug.cgi?id=274771)."
+		ewarn "To fix this you can add splitdebug to FEATURES in make.conf and"
+		ewarn "remerge glibc."
+	fi
+}

diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
index 6904201..1891a59 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.ebuild
@@ -1,50 +1,55 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.3.1.ebuild,v 1.6 2008/08/24 11:41:59 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.6.0.ebuild,v 1.1 2010/11/10 01:40:41 blueness Exp $
 
-ESVN_REPO_URI="svn://svn.valgrind.org/valgrind/trunk"
-
-inherit autotools eutils flag-o-matic toolchain-funcs subversion
+EAPI=2
+inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils subversion
 
 DESCRIPTION="An open-source memory debugger for GNU/Linux"
 HOMEPAGE="http://www.valgrind.org"
+ESVN_REPO_URI="svn://svn.valgrind.org/valgrind/trunk"
+ESVN_PROJECT="valgrind"
+SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="X"
-
-RDEPEND="!dev-util/callgrind"
+IUSE="mpi"
 
-src_unpack() {
-	subversion_src_unpack
-	cd "${S}"
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
 
-	# make sure our CFLAGS are respected
-	einfo "Changing configure.in to respect CFLAGS"
-	sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.in
+src_prepare() {
+	# Respect CFLAGS, LDFLAGS
+	sed -i -e '/^CPPFLAGS =/d' -e '/^CFLAGS =/d' -e '/^LDFLAGS =/d' \
+		mpi/Makefile.am || die
 
-	# undefined references to __guard and __stack_smash_handler in VEX (bug #114347)
-	einfo "Changing Makefile.flags.am to disable SSP"
-	sed -i -e 's:^AM_CFLAGS_BASE = :AM_CFLAGS_BASE = -fno-stack-protector :' Makefile.flags.am
+	# 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/${P}:" docs/Makefile.am
+	sed -i -e "s:doc/valgrind:doc/${PF}:" \
+		docs/Makefile.am || die
 
-	# Remove defaulting to ppc32-linux on ppc64 without multilib
-	# "valgrind: failed to start tool 'memcheck' for platform 'ppc32-linux':
-	#  No such file or directory"
-	if use ppc64 && ! has_multilib_profile; then
-		epatch "${FILESDIR}/valgrind-3.3.0-only64bit.patch"
-	fi
+	# Yet more local labels, this time for ppc32 & ppc64
+	epatch "${FILESDIR}/valgrind-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}/valgrind-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}/valgrind-3.4.1-glibc-2.10.1.patch"
 
-	sed -i -e 's:@GLIBC_VERSION@\.so:@GLIBC_VERSION@*.so:' glibc-2.X.supp.in || die
+	epatch "${FILESDIR}/valgrind-9999-fix-as-needed.patch"
 
 	# Regenerate autotools files
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 
 	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
@@ -59,32 +64,30 @@ 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"
-
 	if use amd64 || use ppc64; then
 		! has_multilib_profile && myconf="${myconf} --enable-only64bit"
 	fi
 
-	econf ${myconf} --without-mpicc || die "Configure failed!"
-	emake || die "Make failed!"
+	# 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() {
-	make DESTDIR="${D}" install || die "Install failed!"
-	dodoc ACKNOWLEDGEMENTS AUTHORS FAQ.txt NEWS README*
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS FAQ.txt NEWS README*
+
+	pax-mark m "${D}"/usr/$(get_libdir)/valgrind/*-*-linux
 }
 
 pkg_postinst() {
-	if use ppc || use ppc64 ; then
-		ewarn "Valgrind will not work on ppc or ppc64 if glibc does not have"
-		ewarn "debug symbols (see https://bugs.gentoo.org/show_bug.cgi?id=214065)"
+	if use ppc || use ppc64 || use amd64 ; then
+		ewarn "Valgrind will not work on ppc, ppc64 or amd64 if glibc does not have"
+		ewarn "debug symbols (see https://bugs.gentoo.org/show_bug.cgi?id=214065"
+		ewarn "and http://bugs.gentoo.org/show_bug.cgi?id=274771)."
 		ewarn "To fix this you can add splitdebug to FEATURES in make.conf and"
 		ewarn "remerge glibc."
 	fi