Added valgrind-3.4.0, which has a fix for CVE-2008-4865 (bug #245317).

Removed some of the old versions.
(Portage version: 2.1.6/cvs/Linux 2.6.26.2 x86_64)

10 files changed, 20 insertions, 913 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 604b5fd776a0..978b6cb55935 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-util/valgrind
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.94 2008/12/13 10:57:06 griffon26 Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.95 2009/01/05 19:08:16 griffon26 Exp $
+
+*valgrind-3.4.0 (05 Jan 2009)
+
+  05 Jan 2009; Maurice van der Pot <griffon26@gentoo.org>
+  -files/valgrind-3.2.1-only64bit.patch,
+  -files/valgrind-3.2.3-glibc-2.6.patch,
+  -files/valgrind-3.2.3-glibc-2.7.patch,
+  -files/valgrind-3.2.3-unhandled-instr-amd64.patch,
+  -files/valgrind-3.3.0-massif-cplusplus.patch, -valgrind-3.2.3.ebuild,
+  -valgrind-3.2.3-r1.ebuild, -valgrind-3.3.0.ebuild,
+  -valgrind-3.3.0-r1.ebuild, +valgrind-3.4.0.ebuild:
+  Added valgrind-3.4.0, which has a fix for CVE-2008-4865 (bug #245317).
+  Removed old ebuilds.
 
 *valgrind-3.3.1-r1 (13 Dec 2008)
 
diff --git a/dev-util/valgrind/files/valgrind-3.2.1-only64bit.patch b/dev-util/valgrind/files/valgrind-3.2.1-only64bit.patch
deleted file mode 100644
index e3610eca3928..000000000000
--- a/dev-util/valgrind/files/valgrind-3.2.1-only64bit.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN valgrind-3.2.1/coregrind/launcher.c valgrind-3.2.1-patched/coregrind/launcher.c
---- valgrind-3.2.1/coregrind/launcher.c	2006-08-28 15:39:04.000000000 +0200
-+++ valgrind-3.2.1-patched/coregrind/launcher.c	2006-09-17 18:22:41.458977000 +0200
-@@ -244,7 +244,7 @@
-    else if (0==strcmp(VG_PLATFORM,"ppc32-linux"))
-       default_platform = "ppc32-linux";
-    else if (0==strcmp(VG_PLATFORM,"ppc64-linux"))
--      default_platform = "ppc32-linux";
-+      default_platform = "ppc64-linux";
-    else
-       barf("Unknown VG_PLATFORM '%s'", VG_PLATFORM);
- 
diff --git a/dev-util/valgrind/files/valgrind-3.2.3-glibc-2.6.patch b/dev-util/valgrind/files/valgrind-3.2.3-glibc-2.6.patch
deleted file mode 100644
index 867ad0e0db07..000000000000
--- a/dev-util/valgrind/files/valgrind-3.2.3-glibc-2.6.patch
+++ /dev/null
@@ -1,269 +0,0 @@
-diff -ruN valgrind-3.2.3/configure.in valgrind-3.2.3-fixed/configure.in
---- valgrind-3.2.3/configure.in	2007-07-17 19:32:42.956775000 +0200
-+++ valgrind-3.2.3-fixed/configure.in	2007-07-17 19:34:18.042194471 +0200
-@@ -359,6 +359,16 @@
- ],
- glibc="2.5")
- 
-+AC_EGREP_CPP([GLIBC_26], [
-+#include <features.h>
-+#ifdef __GNU_LIBRARY__
-+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 6)
-+  GLIBC_26
-+ #endif
-+#endif
-+],
-+glibc="2.6")
-+
- AC_MSG_CHECKING([the glibc version])
- 
- case "${glibc}" in
-@@ -386,9 +396,15 @@
- 	DEFAULT_SUPP="glibc-2.5.supp ${DEFAULT_SUPP}"
- 	;;
- 
-+     2.6)
-+	AC_MSG_RESULT(2.6 family)
-+	AC_DEFINE([GLIBC_2_6], 1, [Define to 1 if you're using glibc 2.6.x])
-+	DEFAULT_SUPP="glibc-2.6.supp ${DEFAULT_SUPP}"
-+	;;
-+
-      *)
- 	AC_MSG_RESULT(unsupported version)
--	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.5])
-+	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.6])
- 	;;
- esac
- 
-diff -ruN valgrind-3.2.3/glibc-2.6.supp valgrind-3.2.3-fixed/glibc-2.6.supp
---- valgrind-3.2.3/glibc-2.6.supp	1970-01-01 01:00:00.000000000 +0100
-+++ valgrind-3.2.3-fixed/glibc-2.6.supp	2007-07-17 19:34:18.042194471 +0200
-@@ -0,0 +1,216 @@
-+
-+##----------------------------------------------------------------------##
-+
-+# Errors to suppress by default with glibc 2.4.x
-+
-+# Format of this file is:
-+# {
-+#     name_of_suppression
-+#     tool_name:supp_kind
-+#     (optional extra info for some suppression types)
-+#     caller0 name, or /name/of/so/file.so
-+#     caller1 name, or ditto
-+#     (optionally: caller2 name)
-+#     (optionally: caller3 name)
-+#  }
-+#
-+# For Memcheck, the supp_kinds are:
-+#
-+#     Param Value1 Value2 Value4 Value8 Value16
-+#     Free Addr1 Addr2 Addr4 Addr8 Addr16
-+#     Cond (previously known as Value0)
-+#
-+# and the optional extra info is:
-+#     if Param: name of system call param
-+#     if Free: name of free-ing fn)
-+
-+{
-+   dl-hack1
-+   Memcheck:Cond
-+   fun:_dl_start
-+   fun:_start
-+}
-+
-+{
-+   dl-hack2
-+   Memcheck:Cond
-+   obj:/lib*/ld-2.6*.so
-+   obj:/lib*/ld-2.6*.so
-+   obj:/lib*/ld-2.6*.so
-+   obj:/lib*/ld-2.6*.so
-+}
-+
-+{
-+   dl-hack3
-+   Memcheck:Cond
-+   obj:/lib*/ld-2.6*so*
-+   obj:/lib*/ld-2.6*so*
-+   obj:/lib*/ld-2.6*so*
-+}
-+
-+##----------------------------------------------------------------------##
-+{
-+   glibc-2.5.x-on-SUSE-10.2-(PPC)-1
-+   Memcheck:Cond
-+   fun:_dl_start_final
-+   fun:_dl_start
-+   fun:_start
-+}
-+{
-+   glibc-2.5.x-on-SUSE-10.2-(PPC)-2a
-+   Memcheck:Cond
-+   fun:index
-+   obj:*ld-2.6.*.so
-+}
-+{
-+   glibc-2.5.x-on-SuSE-10.2-(PPC)-2b
-+   Memcheck:Addr4
-+   fun:index
-+   fun:expand_dynamic_string_token
-+}
-+{
-+   glibc-2.5.5-on-SuSE-10.2-(PPC)-2c
-+   Memcheck:Addr4
-+   fun:index
-+   obj:*ld-2.6.*.so
-+}
-+{
-+   glibc-2.3.5-on-SuSE-10.1-(PPC)-3
-+   Memcheck:Addr4
-+   fun:*wordcopy_fwd_dest_aligned*
-+   fun:mem*cpy
-+   obj:*lib*2.6.*.so
-+}
-+
-+##----------------------------------------------------------------------##
-+## Various structure padding things on SUSE 10.2
-+##
-+{
-+   X11-64bit-padding-1a
-+   Memcheck:Param
-+   write(buf)
-+   fun:__write_nocancel
-+   obj:/usr/lib*/libX11.so*
-+   obj:/usr/lib*/libX11.so*
-+   fun:X*
-+}
-+{
-+   X11-64bit-padding-1b
-+   Memcheck:Param
-+   write(buf)
-+   fun:__write_nocancel
-+   obj:/usr/lib*/libX11.so*
-+   obj:/usr/lib*/libX11.so*
-+   fun:_X*
-+}
-+{
-+   X11-64bit-padding-1c
-+   Memcheck:Param
-+   write(buf)
-+   fun:__write_nocancel
-+   obj:/usr/lib*/libX11.so*
-+   obj:/usr/lib*/libX11.so*
-+   obj:/usr/lib*/libX11.so*
-+}
-+{
-+   X11-64bit-padding-1d
-+   Memcheck:Param
-+   write(buf)
-+   fun:__write_nocancel
-+   obj:/usr/lib*/libICE.so*
-+   obj:/usr/lib*/libICE.so*
-+   obj:/usr/lib*/libICE.so*
-+}
-+{
-+   X11-64bit-padding-2a
-+   Memcheck:Param
-+   writev(vector[...])
-+   fun:do_writev
-+   obj:/usr/lib*/libX11.so*
-+   obj:/usr/lib*/libX11.so*
-+   obj:/usr/lib*/libX11.so*
-+}
-+{
-+   X11-64bit-padding-2b
-+   Memcheck:Param
-+   writev(vector[...])
-+   fun:do_writev
-+   fun:writev
-+   obj:/usr/lib*/libX11.so*
-+   obj:/usr/lib*/libX11.so*
-+}
-+
-+{
-+   glibc24-64bit-padding-1a
-+   Memcheck:Param
-+   socketcall.sendto(msg)
-+   fun:send
-+   fun:get_mapping
-+   fun:__nscd_get_map_ref
-+   fun:nscd*
-+}
-+{
-+   glibc24-64bit-padding-1b
-+   Memcheck:Param
-+   socketcall.sendto(msg)
-+   fun:__sendto_nocancel
-+   obj:/*libc-2.6.so
-+   obj:/*libc-2.6.so
-+   obj:/*libc-2.6.so
-+}
-+{
-+   glibc24-64bit-padding-1c
-+   Memcheck:Param
-+   socketcall.send(msg)
-+   fun:send
-+   fun:__nscd_get_map_ref
-+   fun:nscd_get*_r
-+   fun:*nscd*
-+   obj:/*libc-2.6.so
-+}
-+
-+
-+{
-+   X11-64bit-padding-3a
-+   Memcheck:Param
-+   write(buf)
-+   obj:/*libpthread-2.4.so*
-+   obj:/usr/lib*/libX11.so*
-+   obj:/usr/lib*/libX11.so*
-+   obj:/usr/lib*/libX11.so*
-+}
-+
-+{
-+   X11-64bit-padding-4a
-+   Memcheck:Param
-+   socketcall.sendto(msg)
-+   fun:send
-+   obj:/*libc-2.6.so
-+   obj:/*libc-2.6.so
-+   obj:/*libc-2.6.so
-+}
-+{
-+   X11-64bit-padding-4b
-+   Memcheck:Param
-+   socketcall.send(msg)
-+   fun:send
-+   obj:/*libc-2.6.so
-+   obj:/*libc-2.6.so
-+   obj:/*libc-2.6.so
-+}
-+
-+##----------------------------------------------------------------------##
-+# MontaVista Linux 4.0.1 on ppc32
-+{
-+    MVL-401-linuxthreads-pthread_create
-+    Memcheck:Param
-+    write(buf)
-+    fun:pthread_create
-+}
-+{
-+   MVL-401-linuxthreads-pthread_create
-+   Memcheck:Param
-+   write(buf)
-+   obj:/lib/libpthread-0.10.so
-+   fun:pthread_create
-+}
-diff -ruN valgrind-3.2.3/Makefile.am valgrind-3.2.3-fixed/Makefile.am
---- valgrind-3.2.3/Makefile.am	2007-01-02 15:52:30.000000000 +0100
-+++ valgrind-3.2.3-fixed/Makefile.am	2007-07-17 19:35:03.672794808 +0200
-@@ -17,7 +17,7 @@
- DIST_SUBDIRS  = $(SUBDIRS)
- 
- SUPP_FILES = \
--	glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp glibc-2.5.supp \
-+	glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp glibc-2.5.supp glibc-2.6.supp \
- 	xfree-3.supp xfree-4.supp
- 
- dist_val_DATA = $(SUPP_FILES) default.supp
diff --git a/dev-util/valgrind/files/valgrind-3.2.3-glibc-2.7.patch b/dev-util/valgrind/files/valgrind-3.2.3-glibc-2.7.patch
deleted file mode 100644
index e6b98fe8d674..000000000000
--- a/dev-util/valgrind/files/valgrind-3.2.3-glibc-2.7.patch
+++ /dev/null
@@ -1,266 +0,0 @@
---- configure.in	2007-11-14 21:18:56.000000000 +0100
-+++ configure.in.fixed	2007-11-14 21:21:16.000000000 +0100
-@@ -369,6 +369,16 @@
- ],
- glibc="2.6")
- 
-+AC_EGREP_CPP([GLIBC_27], [
-+#include <features.h>
-+#ifdef __GNU_LIBRARY__
-+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 7)
-+  GLIBC_27
-+ #endif
-+#endif
-+],
-+glibc="2.7")
-+
- AC_MSG_CHECKING([the glibc version])
- 
- case "${glibc}" in
-@@ -402,9 +412,15 @@
- 	DEFAULT_SUPP="glibc-2.6.supp ${DEFAULT_SUPP}"
- 	;;
- 
-+     2.7)
-+	AC_MSG_RESULT(2.7 family)
-+	AC_DEFINE([GLIBC_2_7], 1, [Define to 1 if you're using glibc 2.7.x])
-+	DEFAULT_SUPP="glibc-2.7.supp ${DEFAULT_SUPP}"
-+	;;
-+
-      *)
- 	AC_MSG_RESULT(unsupported version)
--	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.6])
-+	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.7])
- 	;;
- esac
- 
---- glibc-2.7.supp	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.7.supp.fixed	2007-11-14 21:24:55.000000000 +0100
-@@ -0,0 +1,216 @@
-+
-+##----------------------------------------------------------------------##
-+
-+# Errors to suppress by default with glibc 2.7.x
-+
-+# Format of this file is:
-+# {
-+#     name_of_suppression
-+#     tool_name:supp_kind
-+#     (optional extra info for some suppression types)
-+#     caller0 name, or /name/of/so/file.so
-+#     caller1 name, or ditto
-+#     (optionally: caller2 name)
-+#     (optionally: caller3 name)
-+#  }
-+#
-+# For Memcheck, the supp_kinds are:
-+#
-+#     Param Value1 Value2 Value4 Value8 Value16
-+#     Free Addr1 Addr2 Addr4 Addr8 Addr16
-+#     Cond (previously known as Value0)
-+#
-+# and the optional extra info is:
-+#     if Param: name of system call param
-+#     if Free: name of free-ing fn)
-+
-+{
-+   dl-hack1
-+   Memcheck:Cond
-+   fun:_dl_start
-+   fun:_start
-+}
-+
-+{
-+   dl-hack2
-+   Memcheck:Cond
-+   obj:/lib*/ld-2.7*.so
-+   obj:/lib*/ld-2.7*.so
-+   obj:/lib*/ld-2.7*.so
-+   obj:/lib*/ld-2.7*.so
-+}
-+
-+{
-+   dl-hack3
-+   Memcheck:Cond
-+   obj:/lib*/ld-2.7*.so
-+   obj:/lib*/ld-2.7*.so
-+   obj:/lib*/ld-2.7*.so
-+}
-+
-+##----------------------------------------------------------------------##
-+{
-+   glibc-2.5.x-on-SUSE-10.2-(PPC)-1
-+   Memcheck:Cond
-+   fun:_dl_start_final
-+   fun:_dl_start
-+   fun:_start
-+}
-+{
-+   glibc-2.5.x-on-SUSE-10.2-(PPC)-2a
-+   Memcheck:Cond
-+   fun:index
-+   obj:*ld-2.7*.so
-+}
-+{
-+   glibc-2.5.x-on-SuSE-10.2-(PPC)-2b
-+   Memcheck:Addr4
-+   fun:index
-+   fun:expand_dynamic_string_token
-+}
-+{
-+   glibc-2.5.5-on-SuSE-10.2-(PPC)-2c
-+   Memcheck:Addr4
-+   fun:index
-+   obj:*ld-2.7*.so
-+}
-+{
-+   glibc-2.3.5-on-SuSE-10.1-(PPC)-3
-+   Memcheck:Addr4
-+   fun:*wordcopy_fwd_dest_aligned*
-+   fun:mem*cpy
-+   obj:*lib*2.7*.so
-+}
-+
-+##----------------------------------------------------------------------##
-+## Various structure padding things on SUSE 10.2
-+##
-+{
-+   X11-64bit-padding-1a
-+   Memcheck:Param
-+   write(buf)
-+   fun:__write_nocancel
-+   obj:/usr/lib*/libX11.so*
-+   obj:/usr/lib*/libX11.so*
-+   fun:X*
-+}
-+{
-+   X11-64bit-padding-1b
-+   Memcheck:Param
-+   write(buf)
-+   fun:__write_nocancel
-+   obj:/usr/lib*/libX11.so*
-+   obj:/usr/lib*/libX11.so*
-+   fun:_X*
-+}
-+{
-+   X11-64bit-padding-1c
-+   Memcheck:Param
-+   write(buf)
-+   fun:__write_nocancel
-+   obj:/usr/lib*/libX11.so*
-+   obj:/usr/lib*/libX11.so*
-+   obj:/usr/lib*/libX11.so*
-+}
-+{
-+   X11-64bit-padding-1d
-+   Memcheck:Param
-+   write(buf)
-+   fun:__write_nocancel
-+   obj:/usr/lib*/libICE.so*
-+   obj:/usr/lib*/libICE.so*
-+   obj:/usr/lib*/libICE.so*
-+}
-+{
-+   X11-64bit-padding-2a
-+   Memcheck:Param
-+   writev(vector[...])
-+   fun:do_writev
-+   obj:/usr/lib*/libX11.so*
-+   obj:/usr/lib*/libX11.so*
-+   obj:/usr/lib*/libX11.so*
-+}
-+{
-+   X11-64bit-padding-2b
-+   Memcheck:Param
-+   writev(vector[...])
-+   fun:do_writev
-+   fun:writev
-+   obj:/usr/lib*/libX11.so*
-+   obj:/usr/lib*/libX11.so*
-+}
-+
-+{
-+   glibc24-64bit-padding-1a
-+   Memcheck:Param
-+   socketcall.sendto(msg)
-+   fun:send
-+   fun:get_mapping
-+   fun:__nscd_get_map_ref
-+   fun:nscd*
-+}
-+{
-+   glibc24-64bit-padding-1b
-+   Memcheck:Param
-+   socketcall.sendto(msg)
-+   fun:__sendto_nocancel
-+   obj:/*libc-2.7*.so
-+   obj:/*libc-2.7*.so
-+   obj:/*libc-2.7*.so
-+}
-+{
-+   glibc24-64bit-padding-1c
-+   Memcheck:Param
-+   socketcall.send(msg)
-+   fun:send
-+   fun:__nscd_get_map_ref
-+   fun:nscd_get*_r
-+   fun:*nscd*
-+   obj:/*libc-2.7*.so
-+}
-+
-+
-+{
-+   X11-64bit-padding-3a
-+   Memcheck:Param
-+   write(buf)
-+   obj:/*libpthread-2.7*.so*
-+   obj:/usr/lib*/libX11.so*
-+   obj:/usr/lib*/libX11.so*
-+   obj:/usr/lib*/libX11.so*
-+}
-+
-+{
-+   X11-64bit-padding-4a
-+   Memcheck:Param
-+   socketcall.sendto(msg)
-+   fun:send
-+   obj:/*libc-2.7*.so
-+   obj:/*libc-2.7*.so
-+   obj:/*libc-2.7*.so
-+}
-+{
-+   X11-64bit-padding-4b
-+   Memcheck:Param
-+   socketcall.send(msg)
-+   fun:send
-+   obj:/*libc-2.7*.so
-+   obj:/*libc-2.7*.so
-+   obj:/*libc-2.7*.so
-+}
-+
-+##----------------------------------------------------------------------##
-+# MontaVista Linux 4.0.1 on ppc32
-+{
-+    MVL-401-linuxthreads-pthread_create
-+    Memcheck:Param
-+    write(buf)
-+    fun:pthread_create
-+}
-+{
-+   MVL-401-linuxthreads-pthread_create
-+   Memcheck:Param
-+   write(buf)
-+   obj:/lib/libpthread-0.10.so
-+   fun:pthread_create
-+}
---- Makefile.am	2007-11-14 21:18:56.000000000 +0100
-+++ Makefile.am.fixed	2007-11-14 21:26:34.000000000 +0100
-@@ -17,7 +17,7 @@
- DIST_SUBDIRS  = $(SUBDIRS)
- 
- SUPP_FILES = \
--	glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp glibc-2.5.supp glibc-2.6.supp \
-+	glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp glibc-2.5.supp glibc-2.6.supp glibc-2.7.supp \
- 	xfree-3.supp xfree-4.supp
- 
- dist_val_DATA = $(SUPP_FILES) default.supp
diff --git a/dev-util/valgrind/files/valgrind-3.2.3-unhandled-instr-amd64.patch b/dev-util/valgrind/files/valgrind-3.2.3-unhandled-instr-amd64.patch
deleted file mode 100644
index ef87883ac7bf..000000000000
--- a/dev-util/valgrind/files/valgrind-3.2.3-unhandled-instr-amd64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: VEX/priv/guest-amd64/toIR.c
-===================================================================
---- VEX/priv/guest-amd64/toIR.c	(revision 1775)
-+++ VEX/priv/guest-amd64/toIR.c	(revision 1776)
-@@ -8387,7 +8387,7 @@
-       as many invalid combinations as possible. */
-    n_prefixes = 0;
-    while (True) {
--      if (n_prefixes > 5) goto decode_failure;
-+      if (n_prefixes > 7) goto decode_failure;
-       pre = getUChar(delta);
-       switch (pre) {
-          case 0x66: pfx |= PFX_66; break;
diff --git a/dev-util/valgrind/files/valgrind-3.3.0-massif-cplusplus.patch b/dev-util/valgrind/files/valgrind-3.3.0-massif-cplusplus.patch
deleted file mode 100644
index 3d4dd47f3d6d..000000000000
--- a/dev-util/valgrind/files/valgrind-3.3.0-massif-cplusplus.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Index: massif/ms_main.c
-===================================================================
---- massif/ms_main.c	(revision 7353)
-+++ massif/ms_main.c	(working copy)
-@@ -774,6 +774,11 @@
- #define MAX_OVERESTIMATE   50
- #define MAX_IPS            (MAX_DEPTH + MAX_OVERESTIMATE)
- 
-+// This is used for various buffers which can hold function names/IP
-+// description.  Some C++ names can get really long so 1024 isn't big
-+// enough.
-+#define BUF_LEN   2048
-+
- // Get the stack trace for an XCon, filtering out uninteresting entries:
- // alloc-fns and entries above alloc-fns, and entries below main-or-below-main.
- //   Eg:       alloc-fn1 / alloc-fn2 / a / b / main / (below main) / c
-@@ -783,7 +788,6 @@
- static
- Int get_IPs( ThreadId tid, Bool is_custom_alloc, Addr ips[])
- {
--   #define BUF_LEN   1024
-    Char buf[BUF_LEN];
-    Int n_ips, i, n_alloc_fns_removed;
-    Int overestimate;
-@@ -1863,16 +1867,27 @@
- // The output file name.  Controlled by --massif-out-file.
- static Char* massif_out_file = NULL;
- 
--#define FP_BUF_SIZE     1024
--Char FP_buf[FP_BUF_SIZE];
-+Char FP_buf[BUF_LEN];
- 
- // XXX: implement f{,n}printf in m_libcprint.c eventually, and use it here.
- // Then change Cachegrind to use it too.
- #define FP(format, args...) ({ \
--   VG_(snprintf)(FP_buf, FP_BUF_SIZE, format, ##args); \
-+   VG_(snprintf)(FP_buf, BUF_LEN, format, ##args); \
-+   FP_buf[BUF_LEN-1] = '\0';  /* Make sure the string is terminated. */ \
-    VG_(write)(fd, (void*)FP_buf, VG_(strlen)(FP_buf)); \
- })
- 
-+// Same as FP, but guarantees a '\n' at the end.
-+#define FPn(format, args...) ({ \
-+   VG_(snprintf)(FP_buf, BUF_LEN, format, ##args); \
-+   FP_buf[BUF_LEN-5] = '.';   /* "..." at the end make the truncation */ \
-+   FP_buf[BUF_LEN-4] = '.';   /*  more obvious */ \
-+   FP_buf[BUF_LEN-3] = '.'; \
-+   FP_buf[BUF_LEN-2] = '\n';  /* Make sure the last char is a newline. */ \
-+   FP_buf[BUF_LEN-1] = '\0';  /* Make sure the string is terminated. */ \
-+   VG_(write)(fd, (void*)FP_buf, VG_(strlen)(FP_buf)); \
-+})
-+
- // Nb: uses a static buffer, each call trashes the last string returned.
- static Char* make_perc(ULong x, ULong y)
- {
-@@ -1892,7 +1907,6 @@
-                             Int depth_str_len,
-                             SizeT snapshot_heap_szB, SizeT snapshot_total_szB)
- {
--   #define BUF_LEN   1024
-    Int   i, n_insig_children_sxpts;
-    Char* perc;
-    Char  ip_desc_array[BUF_LEN];
-@@ -1925,7 +1939,10 @@
-          ip_desc = VG_(describe_IP)(sxpt->Sig.ip-1, ip_desc, BUF_LEN);
-       }
-       perc = make_perc(sxpt->szB, snapshot_total_szB);
--      FP("%sn%d: %lu %s\n",
-+      // Nb: we deliberately use 'FPn', not 'FP'.  So if the ip_desc is
-+      // too long (eg. due to a long C++ function name), it'll get
-+      // truncated, but the '\n' is still there so its a valid file.
-+      FPn("%sn%d: %lu %s\n",     
-          depth_str, sxpt->Sig.n_children, sxpt->szB, ip_desc);
- 
-       // Indent.
diff --git a/dev-util/valgrind/valgrind-3.2.3-r1.ebuild b/dev-util/valgrind/valgrind-3.2.3-r1.ebuild
deleted file mode 100644
index 48e419c41bd6..000000000000
--- a/dev-util/valgrind/valgrind-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.2.3-r1.ebuild,v 1.5 2008/01/14 20:22:39 dertobi123 Exp $
-
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-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"
-IUSE="X"
-
-# bug #49147 (bogus stacktrace in gdb with --db-attach=yes) does not seem to be applicable anymore
-#RESTRICT="strip"
-
-RDEPEND="!dev-util/callgrind"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# 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
-
-	# 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
-
-	# Correct hard coded doc location
-	sed -i -e "s:doc/valgrind:doc/${P}:" docs/Makefile.am
-
-	# Fix incorrect --libs output in valgrind.pc (bug #147904)
-	epatch "${FILESDIR}/${P}-pkg-config.patch"
-
-	# 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.2.1-only64bit.patch"
-	fi
-
-	epatch "${FILESDIR}/${P}-glibc-2.6.patch"
-	epatch "${FILESDIR}/${P}-glibc-2.7.patch"
-
-	# Prevent "unhandled instruction bytes: 0x66 0x66 0x66 0x66" (bug #189396)
-	epatch "${FILESDIR}/${P}-unhandled-instr-amd64.patch"
-
-	# Regenerate autotools files
-	eautoreconf
-}
-
-src_compile() {
-	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
-
-	# 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} || die "Configure failed!"
-	emake || die "Make failed!"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed!"
-	dodoc ACKNOWLEDGEMENTS AUTHORS FAQ.txt NEWS README*
-}
diff --git a/dev-util/valgrind/valgrind-3.2.3.ebuild b/dev-util/valgrind/valgrind-3.2.3.ebuild
deleted file mode 100644
index 78852099d72b..000000000000
--- a/dev-util/valgrind/valgrind-3.2.3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.2.3.ebuild,v 1.9 2007/08/26 09:32:34 griffon26 Exp $
-
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-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"
-IUSE="X"
-
-# bug #49147 (bogus stacktrace in gdb with --db-attach=yes) does not seem to be applicable anymore
-#RESTRICT="strip"
-
-RDEPEND="!dev-util/callgrind"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# 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
-
-	# 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
-
-	# Correct hard coded doc location
-	sed -i -e "s:doc/valgrind:doc/${P}:" docs/Makefile.am
-
-	# Fix incorrect --libs output in valgrind.pc (bug #147904)
-	epatch "${FILESDIR}/${P}-pkg-config.patch"
-
-	# 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.2.1-only64bit.patch"
-	fi
-
-	epatch "${FILESDIR}/${P}-glibc-2.6.patch"
-
-	# Prevent "unhandled instruction bytes: 0x66 0x66 0x66 0x66" (bug #189396)
-	epatch "${FILESDIR}/${P}-unhandled-instr-amd64.patch"
-
-	# Regenerate autotools files
-	eautoreconf
-}
-
-src_compile() {
-	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
-
-	# 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} || die "Configure failed!"
-	emake || die "Make failed!"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed!"
-	dodoc ACKNOWLEDGEMENTS AUTHORS FAQ.txt NEWS README*
-}
diff --git a/dev-util/valgrind/valgrind-3.3.0.ebuild b/dev-util/valgrind/valgrind-3.3.0.ebuild
deleted file mode 100644
index 98c9d9101c67..000000000000
--- a/dev-util/valgrind/valgrind-3.3.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.3.0.ebuild,v 1.3 2008/07/27 17:55:23 tester Exp $
-
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-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"
-IUSE="X"
-
-RDEPEND="!dev-util/callgrind"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# 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
-
-	# 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
-
-	# Correct hard coded doc location
-	sed -i -e "s:doc/valgrind:doc/${P}:" docs/Makefile.am
-
-	# Fix incorrect --libs output in valgrind.pc (bug #147904)
-	epatch "${FILESDIR}/${PN}-3.2.3-pkg-config.patch"
-
-	# 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
-
-	# Regenerate autotools files
-	eautoreconf
-}
-
-src_compile() {
-	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
-
-	# 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!"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed!"
-	dodoc ACKNOWLEDGEMENTS AUTHORS FAQ.txt NEWS README*
-}
-
-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)"
-		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-3.3.0-r1.ebuild b/dev-util/valgrind/valgrind-3.4.0.ebuild
index 8ec49371f8ac..a2deb48952c0 100644
--- a/dev-util/valgrind/valgrind-3.3.0-r1.ebuild
+++ b/dev-util/valgrind/valgrind-3.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.3.0-r1.ebuild,v 1.2 2008/07/27 17:55:23 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.4.0.ebuild,v 1.1 2009/01/05 19:08:16 griffon26 Exp $
 
 inherit autotools eutils flag-o-matic toolchain-funcs
 
@@ -40,8 +40,9 @@ src_unpack() {
 		epatch "${FILESDIR}/valgrind-3.3.0-only64bit.patch"
 	fi
 
-	# Have massif provide useful output with large symbols (bug #221067)
-	epatch "${FILESDIR}/valgrind-3.3.0-massif-cplusplus.patch"
+	# Use local labels in inline asm to prevent 'symbol already defined' errors
+	# when optimisation is on (bug #234644).
+	epatch "${FILESDIR}/valgrind-3.3.1-local-labels.patch"
 
 	# Regenerate autotools files
 	eautoreconf