Version bump, bug #342189

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

5 files changed, 264 insertions, 2 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index c65d09830e6d..22c4bb90946e 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.117 2010/10/28 17:39:53 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.118 2010/11/10 01:40:41 blueness Exp $
+
+*valgrind-3.6.0 (10 Nov 2010)
+
+  10 Nov 2010; Anthony G. Basile <blueness@gentoo.org>
+  +valgrind-3.6.0.ebuild, +files/valgrind-3.6.0-local-labels.patch,
+  +files/valgrind-3.6.0-non-exec-stack.patch:
+  Version bump, bug #342189
 
 *valgrind-3.5.0-r1 (28 Oct 2010)
 
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 235ad8b3fb52..bf52c2bafd90 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -12,10 +12,13 @@ AUX valgrind-3.5.0-local-labels.patch 1410 RMD160 d026881b5d38b0a009825801ce996e
 AUX valgrind-3.5.0-non-exec-stack.patch 5568 RMD160 540b2bac578b8ee4ef2c9af90865f5034a9baac6 SHA1 ef6ab49b1d803ca0713feb99ec53d30af0cc3160 SHA256 9becbb1e78fd0799124820208f069ecc1de9dc7eb5ee15a76b94869ca8250d2d
 AUX valgrind-3.5.0-respect-LDFLAGS.patch 368 RMD160 e4d633cabe33af12bf9a2a434ee3a76a379423a3 SHA1 31086a72e6cea2f0144ba449c60fc98c454ebd93 SHA256 2d1cff754119681e1923e7a3f06b58535c9e44a0046ced2d67dd0d354c3e606a
 AUX valgrind-3.5.0-stat_h.patch 1402 RMD160 48afbf277b0fec07dcc3e8bf790df4f890b4524b SHA1 9ef0a9c40fa2c46fb2237af0d9a405b8e6e41cab SHA256 d3ddedf021d1952627b0111d149223cbc7f57bf0ab06f097b43e494910719378
+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
 DIST valgrind-3.3.1.tar.bz2 4544805 RMD160 32fb26de2ffd0d62e66a1f29cfa6785b7ffa8c36 SHA1 3a64ee5f6439815fa6c5200dcfd0399f9dc83348 SHA256 95b7b4d815bd479332637c93e69ec24167cd28d4f9d9f9b718e1b091bb88aafa
 DIST valgrind-3.4.0.tar.bz2 5175209 RMD160 3db249843f0845ca0892e557bede7d21d3112e3f SHA1 ae68418a4c283d14ae6454aca4a720ac936422df SHA256 d5ea4ae5b1ef9fca677a38959060a9acb70b38540721c8bf5c73d09a265f9f74
 DIST valgrind-3.4.1.tar.bz2 5183739 RMD160 425127a02b3707d8d8f2e1ff37e9609a2d0dccbd SHA1 935ea4642b6d9b33a6686c5b0ce70f2f0929fe0d SHA256 669ee7aab8a3a905520159b6d7be35d3911e1a4d7a67d90dc1c12c00693184a9
 DIST valgrind-3.5.0.tar.bz2 5482423 RMD160 dd0ca80d73daac774b9352fe7a07ab72aae767c9 SHA1 76678c2617278cc9fbda1232e4e56fb2a96b0eb8 SHA256 743a5132bbebc247169aefae6e17657677fdf0961aba1668dd4ee7028d27ba80
+DIST valgrind-3.6.0.tar.bz2 5962204 RMD160 d7adc13bdafb1e5057d2e2a7a41076c1acabc368 SHA1 6f7ae88d36dfb45c337175a873aada7bed01c8c3 SHA256 bc0f0153b5a47b986f1d8efa2c488e0aea85a1cf2c4b11c52be127903080285f
 EBUILD valgrind-3.3.1-r1.ebuild 3385 RMD160 d1c102300788ba35b15a565817c44a053ecc65a9 SHA1 7f48f883bbbdc7f083fa3429c3522906829ecd38 SHA256 8eb9036a730fa488a92e207551b2443d6dd5846e96b8d76febb3c6abcbf6c793
 EBUILD valgrind-3.3.1.ebuild 3252 RMD160 43b41c41747035258ae2d745823e48658426ed90 SHA1 5c085791efd179327ab0f317ec8f09a08e36cef1 SHA256 399f4bd21c1cce2c3c4bab5b96cd0886f74481bce8c6f6750e6bee78242d850b
 EBUILD valgrind-3.4.0.ebuild 3255 RMD160 feb78ead8a3f3ed9bf69dda9f533875779b6d18f SHA1 88a2ffdfc83c260050fe3ed03462f03d19c920b7 SHA256 16243a1b3895c284835ef9b16cdbe19673f3896e1209960647b23c3853325369
@@ -23,5 +26,6 @@ EBUILD valgrind-3.4.1-r1.ebuild 3976 RMD160 6347e2eb6e3d236078ea052d0669b095b227
 EBUILD valgrind-3.4.1.ebuild 3046 RMD160 655d9e0fbecaf08e720d74f5f684c85871cd0174 SHA1 86a4a553cc16007e0ee309e2a59d753d8acf9f35 SHA256 21d4972c1cf48e3a12bc6a4ad65a72d5576bc45ef4166c8a16186b410ba93a6e
 EBUILD valgrind-3.5.0-r1.ebuild 3730 RMD160 b485ad3121c741099c5fb3711f52194ebdf464a6 SHA1 e1b3e9748fb9a8fcd5a0a95dc0902321fb4bdbb4 SHA256 5e5e34f33a60efbdd79f129bf28ceccd7ad2b2e069b5987ec762f60187da94f6
 EBUILD valgrind-3.5.0.ebuild 3648 RMD160 d3569e0802939fd698787e234db83f17847e2b03 SHA1 af5bbe18d9ca1cb6be77c495de1fb5429c81aa17 SHA256 9092956486a250b85479e3723138848e6192239e79aca06637dfa0811f21487d
-MISC ChangeLog 19422 RMD160 47785e1dec55a00791f34c1a23d37d62536be6bf SHA1 1504ec27ed46e765a80b2a4212d799131ea38805 SHA256 0db6b5962b594d0d4973c775bbd039e142f09ddccfa1dbde179d3330a2b57c4e
+EBUILD valgrind-3.6.0.ebuild 2921 RMD160 e579ed554ae4e1c3467bc8604cd025315d2e58ad SHA1 04ad6ee87efd0b8206c2a3b9e871f8989140ef87 SHA256 3284fd2e68767d09cf45e0162a2911a67954afaf39edb1f6c15302060c49d57c
+MISC ChangeLog 19651 RMD160 0ea228beebc5bfff3707375e26e4860138944c93 SHA1 0f02a99243ef77a72514a60d219c0c732c4d2c42 SHA256 9bb5c0ca1c6c836b8923e9aaa5075b3266afc523e7bc4b82d71a98e6f592b551
 MISC metadata.xml 1002 RMD160 cac070ef7b7c44166aa21cda6063c597f66d0303 SHA1 adb9b3de0413a58f79b522f06f542854c3aaaca0 SHA256 ad67a48bab8386d59f5481471eb6a474e68a08a7f1d8f8c7a41b1134ac464f68
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 000000000000..68e682255611
--- /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 000000000000..dc9969484a12
--- /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/valgrind-3.6.0.ebuild b/dev-util/valgrind/valgrind-3.6.0.ebuild
new file mode 100644
index 000000000000..b2be0c0fa61b
--- /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
+}