Remove older 3.4 branch

(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

9 files changed, 10 insertions, 372 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index da0c8653c810..545d071f46ba 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.161 2013/02/19 18:06:53 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.162 2013/04/19 12:00:27 blueness Exp $
+
+  19 Apr 2013; Anthony G. Basile <blueness@gentoo.org>
+  -files/valgrind-3.2.3-pkg-config.patch, -files/valgrind-3.3.0-only64bit.patch,
+  -files/valgrind-3.3.1-local-labels.patch,
+  -files/valgrind-3.4.1-local-labels.patch,
+  -files/valgrind-3.4.1-respect-LDFLAGS.patch,
+  -files/valgrind-3.4.1-x86_64-ldso-strlen.patch, -valgrind-3.4.0.ebuild,
+  -valgrind-3.4.1.ebuild:
+  Remove older 3.4 branch
 
   19 Feb 2013; Anthony G. Basile <blueness@gentoo.org>
   +files/valgrind-3.8.1-glibc-2.17.patch, valgrind-3.8.1.ebuild:
diff --git a/dev-util/valgrind/files/valgrind-3.2.3-pkg-config.patch b/dev-util/valgrind/files/valgrind-3.2.3-pkg-config.patch
deleted file mode 100644
index b6df4ab2b35a..000000000000
--- a/dev-util/valgrind/files/valgrind-3.2.3-pkg-config.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ruN valgrind-3.2.2/valgrind.pc.in valgrind-3.2.2-fixed/valgrind.pc.in
---- valgrind-3.2.2/valgrind.pc.in	2007-01-02 15:52:30.000000000 +0100
-+++ valgrind-3.2.2-fixed/valgrind.pc.in	2007-01-25 18:54:13.478053000 +0100
-@@ -4,13 +4,13 @@
- includedir=@includedir@/valgrind
- arch=@VG_ARCH@
- os=@VG_OS@
--platform=@VG_PLATFORM_PRI@
-+platform=@VG_ARCH@-@VG_OS@
- valt_load_address=@VALT_LOAD_ADDRESS@
- 
- Name: Valgrind
- Description: A dynamic binary instrumentation framework
- Version: @VERSION@
- Requires:
--Libs: -L${libdir}/valgrind/@VG_PLATFORM_PRI@ -lcoregrind -lvex -lgcc
-+Libs: -L${libdir}/valgrind/@VG_ARCH@-@VG_OS@ -lcoregrind -lvex -lgcc
- Cflags: -I${includedir}
- 
diff --git a/dev-util/valgrind/files/valgrind-3.3.0-only64bit.patch b/dev-util/valgrind/files/valgrind-3.3.0-only64bit.patch
deleted file mode 100644
index 666c66ca4fa7..000000000000
--- a/dev-util/valgrind/files/valgrind-3.3.0-only64bit.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN valgrind-3.3.0/coregrind/launcher-linux.c valgrind-3.3.0-fixed/coregrind/launcher-linux.c
---- valgrind-3.3.0/coregrind/launcher-linux.c	2007-12-11 00:18:46.000000000 +0100
-+++ valgrind-3.3.0-fixed/coregrind/launcher-linux.c	2007-12-13 21:07:21.388704395 +0100
-@@ -246,7 +246,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.3.1-local-labels.patch b/dev-util/valgrind/files/valgrind-3.3.1-local-labels.patch
deleted file mode 100644
index 82b86b731b38..000000000000
--- a/dev-util/valgrind/files/valgrind-3.3.1-local-labels.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ruN valgrind-3.3.1/none/tests/x86/jcxz.c valgrind-3.3.1-fixed/none/tests/x86/jcxz.c
---- valgrind-3.3.1/none/tests/x86/jcxz.c	2008-06-01 03:38:58.000000000 +0200
-+++ valgrind-3.3.1-fixed/none/tests/x86/jcxz.c	2008-08-13 22:18:42.000000000 +0200
-@@ -11,12 +11,12 @@
-    __asm__ __volatile__(
-       "movl %0,%%ecx\n\t"
-       "movl $0,%%eax\n"
--      ".Lxyzzy1:\n\t"
--      "jcxz .Lfoobar1\n\t"
-+      "0:\n\t"
-+      "jcxz 1f\n\t"
-       "addl $1, %%eax\n\t"
-       "subl $1, %%ecx\n\t"
--      "jmp .Lxyzzy1\n"
--      ".Lfoobar1:\n\t"
-+      "jmp 0b\n"
-+      "1:\n\t"
-       "movl %%eax, %1"
-       : /*out*/ : /*in*/ "m"(block[0]),
-                          "m"(block[1]) : /*trash*/ "eax","ecx","cc","memory"
-@@ -32,12 +32,12 @@
-    __asm__ __volatile__(
-       "movl %0,%%ecx\n\t"
-       "movl $0,%%eax\n"
--      ".Lxyzzy2:\n\t"
--      "jecxz .Lfoobar2\n\t"
-+      "0:\n\t"
-+      "jecxz 1f\n\t"
-       "addl $1, %%eax\n\t"
-       "subl $1, %%ecx\n\t"
--      "jmp .Lxyzzy2\n"
--      ".Lfoobar2:\n\t"
-+      "jmp 0b\n"
-+      "1:\n\t"
-       "movl %%eax, %1"
-       : /*out*/ : /*in*/ "m"(block[0]),
-                          "m"(block[1]) : /*trash*/ "eax","ecx","cc","memory"
diff --git a/dev-util/valgrind/files/valgrind-3.4.1-local-labels.patch b/dev-util/valgrind/files/valgrind-3.4.1-local-labels.patch
deleted file mode 100644
index 0d92d699646c..000000000000
--- a/dev-util/valgrind/files/valgrind-3.4.1-local-labels.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: coregrind/m_libcassert.c
-===================================================================
---- coregrind/m_libcassert.c	(revision 9538)
-+++ coregrind/m_libcassert.c	(revision 9539)
-@@ -47,8 +47,8 @@
- 
- #if defined(VGP_x86_linux)
- #  define GET_REAL_PC_SP_AND_FP(pc, sp, fp)      \
--      asm("call m_libcassert_get_ip;" \
--          "m_libcassert_get_ip: popl %0;" \
-+      asm("call 0f;" \
-+          "0: popl %0;" \
-           "movl %%esp, %1;" \
-           "movl %%ebp, %2;" \
-           : "=r" (pc),\
diff --git a/dev-util/valgrind/files/valgrind-3.4.1-respect-LDFLAGS.patch b/dev-util/valgrind/files/valgrind-3.4.1-respect-LDFLAGS.patch
deleted file mode 100644
index 37ff26cb4511..000000000000
--- a/dev-util/valgrind/files/valgrind-3.4.1-respect-LDFLAGS.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ruN valgrind-3.4.1/auxprogs/Makefile.am valgrind-3.4.1-fixed/auxprogs/Makefile.am
---- valgrind-3.4.1/auxprogs/Makefile.am	2009-03-01 22:55:53.000000000 +0100
-+++ valgrind-3.4.1-fixed/auxprogs/Makefile.am	2009-08-08 19:56:32.000000000 +0200
-@@ -64,14 +64,14 @@
- if BUILD_MPIWRAP_PRI
- noinst_PROGRAMS       += libmpiwrap-@VG_PLATFORM_PRI@.so
- libmpiwrap-@VG_PLATFORM_PRI@.so: libmpiwrap.c
--	$(MPI_CC) $(HACKY_FLAGS_PRI) \
-+	$(MPI_CC) $(HACKY_FLAGS_PRI) $(LDFLAGS) \
- 		-I../include \
- 		-o libmpiwrap-@VG_PLATFORM_PRI@.so libmpiwrap.c
- endif
- if BUILD_MPIWRAP_SEC
- noinst_PROGRAMS       += libmpiwrap-@VG_PLATFORM_SEC@.so
- libmpiwrap-@VG_PLATFORM_SEC@.so: libmpiwrap.c
--	$(MPI_CC) $(HACKY_FLAGS_SEC) \
-+	$(MPI_CC) $(HACKY_FLAGS_SEC) $(LDFLAGS) \
- 		-I../include \
- 		-o libmpiwrap-@VG_PLATFORM_SEC@.so libmpiwrap.c
- endif
diff --git a/dev-util/valgrind/files/valgrind-3.4.1-x86_64-ldso-strlen.patch b/dev-util/valgrind/files/valgrind-3.4.1-x86_64-ldso-strlen.patch
deleted file mode 100644
index a6ddfec33446..000000000000
--- a/dev-util/valgrind/files/valgrind-3.4.1-x86_64-ldso-strlen.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- valgrind/coregrind/pub_core_trampoline.h.jj	2009-04-22 12:10:54.000000000 +0200
-+++ valgrind/coregrind/pub_core_trampoline.h	2009-04-22 14:50:39.000000000 +0200
-@@ -66,6 +66,7 @@ extern Char* VG_(x86_linux_REDIR_FOR_ind
- extern void VG_(amd64_linux_SUBST_FOR_rt_sigreturn);
- extern void VG_(amd64_linux_REDIR_FOR_vgettimeofday);
- extern void VG_(amd64_linux_REDIR_FOR_vtime);
-+extern UInt VG_(amd64_linux_REDIR_FOR_strlen)( void* );
- #endif
- 
- #if defined(VGP_ppc32_linux)
---- valgrind/coregrind/m_redir.c.jj	2009-04-22 12:10:54.000000000 +0200
-+++ valgrind/coregrind/m_redir.c	2009-04-22 15:32:19.000000000 +0200
-@@ -879,6 +879,20 @@ void VG_(redir_initialise) ( void )
-       (Addr)&VG_(amd64_linux_REDIR_FOR_vtime) 
-    );
- 
-+   /* If we're using memcheck, use these intercepts right from
-+      the start, otherwise ld.so makes a lot of noise. */
-+   if (0==VG_(strcmp)("Memcheck", VG_(details).name)) {
-+
-+      static const HChar croakage[]
-+        = "Possible fix: add splitdebug to FEATURES in make.conf and remerge glibc.";
-+
-+      /* this is mandatory - can't sanely continue without it */
-+      add_hardwired_spec(
-+         "ld-linux-x86-64.so.2", "strlen",
-+         (Addr)&VG_(amd64_linux_REDIR_FOR_strlen),
-+         croakage
-+      );   
-+   }
- #  elif defined(VGP_ppc32_linux)
-    {
-    static const HChar croakage[]
---- valgrind/coregrind/m_trampoline.S.jj	2009-04-22 12:10:54.000000000 +0200
-+++ valgrind/coregrind/m_trampoline.S	2009-04-22 15:18:37.000000000 +0200
-@@ -174,7 +174,29 @@ VG_(amd64_linux_REDIR_FOR_vtime):
- .LfnE3:
- .size VG_(amd64_linux_REDIR_FOR_vtime), .-.LfnB3
- 
--/* A CIE for the above two functions, followed by their FDEs */
-+/* There's no particular reason that this needs to be handwritten
-+   assembly, but since that's what this file contains, here's a
-+   simple strlen implementation (written in C and compiled by gcc.)
-+*/
-+.global VG_(amd64_linux_REDIR_FOR_strlen)
-+.type   VG_(amd64_linux_REDIR_FOR_strlen), @function
-+VG_(amd64_linux_REDIR_FOR_strlen):
-+.LfnB4:
-+	xorl	%eax, %eax
-+	cmpb	$0, (%rdi)
-+	movq	%rdi, %rdx
-+	je	.L41
-+.L40:	addq	$1, %rdx
-+	cmpb	$0, (%rdx)
-+	jne	.L40
-+	movq	%rdx, %rax
-+	subq	%rdi, %rax
-+.L41:	ret
-+.LfnE4:
-+.size VG_(amd64_linux_REDIR_FOR_strlen), .-VG_(amd64_linux_REDIR_FOR_strlen)
-+
-+
-+/* A CIE for the above three functions, followed by their FDEs */
- 	.section .eh_frame,"a",@progbits
- .Lframe1:
-         .long   .LEcie1-.LScie1
-@@ -212,6 +234,15 @@ VG_(amd64_linux_REDIR_FOR_vtime):
-         .uleb128 0x0
-         .align 8
- .LEfde3:
-+.LSfde4:
-+        .long   .LEfde4-.LASfde4
-+.LASfde4:
-+        .long   .LASfde4-.Lframe1
-+        .long   .LfnB4
-+        .long   .LfnE4-.LfnB4
-+        .uleb128 0x0
-+        .align 8
-+.LEfde4:
- 	.previous
- 
- .global VG_(trampoline_stuff_end)
diff --git a/dev-util/valgrind/valgrind-3.4.0.ebuild b/dev-util/valgrind/valgrind-3.4.0.ebuild
deleted file mode 100644
index 4d323932b2c4..000000000000
--- a/dev-util/valgrind/valgrind-3.4.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.4.0.ebuild,v 1.5 2012/04/28 16:50:42 blueness 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"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-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
-
-	# 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
-}
-
-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.4.1.ebuild b/dev-util/valgrind/valgrind-3.4.1.ebuild
deleted file mode 100644
index fe02661089f1..000000000000
--- a/dev-util/valgrind/valgrind-3.4.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.4.1.ebuild,v 1.7 2012/04/28 16:50:42 blueness 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=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-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
-
-	# 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
-
-	# 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
-}
-
-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
-
-	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
-}