Marked valgrind 2.4.0 stable and removed old ebuilds.

Package-Manager: portage-2.0.51.22-r1

20 files changed, 18 insertions, 638 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 4a9f7c7e20d4..ffb5751b02a4 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.48 2005/05/25 21:41:44 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.49 2005/06/28 20:34:57 griffon26 Exp $
+
+  28 Jun 2005; Maurice van der Pot <griffon26@gentoo.org>
+  -files/valgrind-2.1.1-pic.patch,
+  -files/valgrind-2.1.2-kernel-headers.patch,
+  -files/valgrind-configure.in-2.6.diff, -valgrind-2.0.0.ebuild,
+  -valgrind-2.1.0.ebuild, -valgrind-2.1.1.ebuild, -valgrind-2.1.1-r1.ebuild,
+  -valgrind-2.1.2.ebuild, -valgrind-2.2.0.ebuild, -valgrind-2.2.0-r1.ebuild,
+  valgrind-2.4.0.ebuild:
+  Marked valgrind 2.4.0 stable on x86.
+  Removed old valgrind ebuilds.
 
   25 May 2005; Maurice van der Pot <griffon26@gentoo.org>
   valgrind-2.4.0.ebuild:
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index f6841c051035..f120d6c93992 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -2,26 +2,9 @@
 Hash: SHA1
 
 MD5 799f0b61a3a686b4074bd61acc572c5c metadata.xml 1003
-MD5 4871b943d694b8d009f993c244356257 valgrind-2.2.0-r1.ebuild 1428
-MD5 e920d91d83cf170faffeac69565e181f ChangeLog 4041
-MD5 be4e2e968179239e51aafd78be4d95af valgrind-2.0.0.ebuild 1172
-MD5 e6dc16df8e136f735bc577092f7b6383 valgrind-2.1.0.ebuild 1017
-MD5 7e4a680daca3ed212226f6364c958420 valgrind-2.1.1-r1.ebuild 1143
-MD5 07f48be25380e77aa5a44fec2b408998 valgrind-2.1.1.ebuild 925
-MD5 b99a507d5351da63d87c61f3fe0072ad valgrind-2.1.2.ebuild 1101
-MD5 2371f70b5ed5e88767cade219fd7cc65 valgrind-2.2.0.ebuild 1388
+MD5 0ab719f9f994394bbf150f4c8837fe73 ChangeLog 4496
 MD5 9c6171e63f2c500b26cd6c2dd98d42e8 valgrind-2.2.0-r2.ebuild 1716
-MD5 1d87d291777280cc5d7d7bb33dbecf3f valgrind-2.4.0.ebuild 1503
-MD5 286d10f4514e8a85360ce6ba5654ae93 files/digest-valgrind-2.0.0 67
-MD5 a69fe5652a8ca5fb1d04521fe0c56850 files/digest-valgrind-2.1.0 138
-MD5 f50184c09d0376e66b1b79d0b45e94c2 files/digest-valgrind-2.1.1 67
-MD5 f50184c09d0376e66b1b79d0b45e94c2 files/digest-valgrind-2.1.1-r1 67
-MD5 dd98566219aee764f036fae263b1ce61 files/digest-valgrind-2.1.2 67
-MD5 1ba26123d6543d9b4faa808595fbb5b8 files/valgrind-2.1.1-pic.patch 8338
-MD5 96f4ea73f94e4b969cd764574aeef978 files/valgrind-2.1.2-kernel-headers.patch 826
-MD5 95845f5c26fd00027163547288c17e54 files/valgrind-configure.in-2.6.diff 336
-MD5 26192577445b467e528408118f7ee6ec files/digest-valgrind-2.2.0 139
-MD5 26192577445b467e528408118f7ee6ec files/digest-valgrind-2.2.0-r1 139
+MD5 f42acfa473aaf04eac429e3ac5467979 valgrind-2.4.0.ebuild 1502
 MD5 fc1dda2b6f2603a4244ad25f555f2034 files/valgrind-2.2.0-no-exec-stack.patch 1711
 MD5 26192577445b467e528408118f7ee6ec files/digest-valgrind-2.2.0-r2 139
 MD5 d10a593e8cb1c5074c438adc226d1c81 files/valgrind-2.2.0-current-macro-clash.patch 1871
@@ -30,7 +13,7 @@ MD5 e878f97b4c6308515baf5abaee045ce7 files/valgrind-2.4.0-pie-fix.patch 2335
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFClPEhMGnpIbeahxwRAhTjAJsF9vW5x7LZfegwvJWziIeVFirFuACgk8kp
-/SbPtYwt34X+7UDKsos1w+g=
-=e8kk
+iD8DBQFCwbSPMGnpIbeahxwRAoKKAJ9lgXqSyJXAVYvEx3Hl1MtpXMmdJgCgs0Ht
+aoqPfotfEU6YUXmpUBjKeMs=
+=0N0z
 -----END PGP SIGNATURE-----
diff --git a/dev-util/valgrind/files/digest-valgrind-2.0.0 b/dev-util/valgrind/files/digest-valgrind-2.0.0
deleted file mode 100644
index 13f0f9a8b35c..000000000000
--- a/dev-util/valgrind/files/digest-valgrind-2.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1f6a90d0ca494fb75eaeef498e8252b5 valgrind-2.0.0.tar.bz2 710902
diff --git a/dev-util/valgrind/files/digest-valgrind-2.1.0 b/dev-util/valgrind/files/digest-valgrind-2.1.0
deleted file mode 100644
index e20e48cbf876..000000000000
--- a/dev-util/valgrind/files/digest-valgrind-2.1.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3e4056dd45163a5f555a23ced2f95191 valgrind-2.1.0.tar.bz2 762386
-MD5 1a25bcadc9a702a23be8dbf99daa8c01 valgrind-2.1.0-ppc.tar.bz2 784734
diff --git a/dev-util/valgrind/files/digest-valgrind-2.1.1 b/dev-util/valgrind/files/digest-valgrind-2.1.1
deleted file mode 100644
index 97e55a36aa84..000000000000
--- a/dev-util/valgrind/files/digest-valgrind-2.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0010c3e8f054ecc633151c62044b646d valgrind-2.1.1.tar.bz2 923532
diff --git a/dev-util/valgrind/files/digest-valgrind-2.1.1-r1 b/dev-util/valgrind/files/digest-valgrind-2.1.1-r1
deleted file mode 100644
index 97e55a36aa84..000000000000
--- a/dev-util/valgrind/files/digest-valgrind-2.1.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0010c3e8f054ecc633151c62044b646d valgrind-2.1.1.tar.bz2 923532
diff --git a/dev-util/valgrind/files/digest-valgrind-2.1.2 b/dev-util/valgrind/files/digest-valgrind-2.1.2
deleted file mode 100644
index d39fcf1d45f4..000000000000
--- a/dev-util/valgrind/files/digest-valgrind-2.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 585e3ac5f7b86d6cd3e2bed07af732de valgrind-2.1.2.tar.bz2 962025
diff --git a/dev-util/valgrind/files/digest-valgrind-2.2.0 b/dev-util/valgrind/files/digest-valgrind-2.2.0
deleted file mode 100644
index b7acbc96ccc1..000000000000
--- a/dev-util/valgrind/files/digest-valgrind-2.2.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 30dc51f6fc94751b90b04af9c2e2c656 valgrind-2.2.0.tar.bz2 964987
-MD5 a9f5bf8d548ceed56343f8298887bb43 valgrind-2.2.0-ppc.tar.bz2 1000093
diff --git a/dev-util/valgrind/files/digest-valgrind-2.2.0-r1 b/dev-util/valgrind/files/digest-valgrind-2.2.0-r1
deleted file mode 100644
index b7acbc96ccc1..000000000000
--- a/dev-util/valgrind/files/digest-valgrind-2.2.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 30dc51f6fc94751b90b04af9c2e2c656 valgrind-2.2.0.tar.bz2 964987
-MD5 a9f5bf8d548ceed56343f8298887bb43 valgrind-2.2.0-ppc.tar.bz2 1000093
diff --git a/dev-util/valgrind/files/valgrind-2.1.1-pic.patch b/dev-util/valgrind/files/valgrind-2.1.1-pic.patch
deleted file mode 100644
index d598f5523103..000000000000
--- a/dev-util/valgrind/files/valgrind-2.1.1-pic.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-Index: cachegrind/cg_main.c
-===================================================================
-RCS file: /home/kde/valgrind/cachegrind/cg_main.c,v
-retrieving revision 1.65
-diff -u -u -w -r1.65 cg_main.c
---- cachegrind/cg_main.c	15 Mar 2004 16:43:57 -0000	1.65
-+++ cachegrind/cg_main.c	16 Jun 2004 18:20:54 -0000
-@@ -1177,15 +1177,6 @@
-  * them. 
-  */
- 
--static __inline__ void cpuid(Int n, UInt *a, UInt *b, UInt *c, UInt *d)
--{
--   __asm__ __volatile__ (
--    "cpuid"
--    : "=a" (*a), "=b" (*b), "=c" (*c), "=d" (*d)      /* output */
--    : "0" (n)         /* input */
--    );
--}
--
- static void micro_ops_warn(Int actual_size, Int used_size, Int line_size)
- {
-     VG_(message)(Vg_DebugMsg, 
-@@ -1214,7 +1205,7 @@
-       return -1;
-    }
- 
--   cpuid(2, (Int*)&info[0], (Int*)&info[4], 
-+   VG_(cpuid)(2, (Int*)&info[0], (Int*)&info[4], 
-             (Int*)&info[8], (Int*)&info[12]);
-    trials  = info[0] - 1;   /* AL register - bits 0..7 of %eax */
-    info[0] = 0x0;           /* reset AL */
-@@ -1358,10 +1349,10 @@
- Int AMD_cache_info(cache_t* I1c, cache_t* D1c, cache_t* L2c)
- {
-    UInt ext_level;
--   Int dummy, model;
--   Int I1i, D1i, L2i;
-+   UInt dummy, model;
-+   UInt I1i, D1i, L2i;
-    
--   cpuid(0x80000000, &ext_level, &dummy, &dummy, &dummy);
-+   VG_(cpuid)(0x80000000, &ext_level, &dummy, &dummy, &dummy);
- 
-    if (0 == (ext_level & 0x80000000) || ext_level < 0x80000006) {
-       VG_(message)(Vg_UserMsg, 
-@@ -1370,10 +1361,10 @@
-       return -1;
-    }
- 
--   cpuid(0x80000005, &dummy, &dummy, &D1i, &I1i);
--   cpuid(0x80000006, &dummy, &dummy, &L2i, &dummy);
-+   VG_(cpuid)(0x80000005, &dummy, &dummy, &D1i, &I1i);
-+   VG_(cpuid)(0x80000006, &dummy, &dummy, &L2i, &dummy);
- 
--   cpuid(0x1, &model, &dummy, &dummy, &dummy);
-+   VG_(cpuid)(0x1, &model, &dummy, &dummy, &dummy);
-    /*VG_(message)(Vg_UserMsg,"CPU model %04x",model);*/
- 
-    /* Check for Duron bug */
-@@ -1426,7 +1417,7 @@
-    /* Trap for illegal instruction, in case it's a really old processor that
-     * doesn't support CPUID. */
-    if (__builtin_setjmp(cpuid_jmpbuf) == 0) {
--      cpuid(0, &level, (int*)&vendor_id[0], 
-+      VG_(cpuid)(0, &level, (int*)&vendor_id[0], 
-                        (int*)&vendor_id[8], (int*)&vendor_id[4]);    
-       vendor_id[12] = '\0';
- 
-Index: coregrind/Makefile.am
-===================================================================
-RCS file: /home/kde/valgrind/coregrind/Makefile.am,v
-retrieving revision 1.71
-diff -u -u -w -r1.71 Makefile.am
---- coregrind/Makefile.am	16 Apr 2004 23:02:28 -0000	1.71
-+++ coregrind/Makefile.am	16 Jun 2004 18:20:55 -0000
-@@ -75,7 +75,8 @@
- 	vg_toolint.c \
- 	vg_translate.c \
- 	vg_transtab.c \
--	vg_ldt.c
-+	vg_ldt.c \
-+	vg_cpuid.S
- stage2_DEPENDENCIES = $(srcdir)/valgrind.vs x86/stage2.lds
- stage2_LDFLAGS=-Wl,--export-dynamic -Wl,-e,_ume_entry  -g \
- 	-Wl,-defsym,kickstart_base=0xb8000000 \
-Index: coregrind/vg_cpuid.S
-===================================================================
-RCS file: coregrind/vg_cpuid.S
-diff -N coregrind/vg_cpuid.S
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ coregrind/vg_cpuid.S	16 Jun 2004 18:20:55 -0000
-@@ -0,0 +1,77 @@
-+
-+##--------------------------------------------------------------------##
-+##--- Support for determining CPU characteristics.                 ---##
-+##---                                                   vg_cpuid.S ---##
-+##--------------------------------------------------------------------##
-+
-+/*
-+  This file is part of Valgrind, an extensible x86 protected-mode
-+  emulator for monitoring program execution on x86-Unixes.
-+
-+  Copyright (C) 2000-2004 Julian Seward 
-+     jseward@acm.org
-+
-+  This program is free software; you can redistribute it and/or
-+  modify it under the terms of the GNU General Public License as
-+  published by the Free Software Foundation; either version 2 of the
-+  License, or (at your option) any later version.
-+
-+  This program is distributed in the hope that it will be useful, but
-+  WITHOUT ANY WARRANTY; without even the implied warranty of
-+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+  General Public License for more details.
-+
-+  You should have received a copy of the GNU General Public License
-+  along with this program; if not, write to the Free Software
-+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+  02111-1307, USA.
-+
-+  The GNU General Public License is contained in the file COPYING.
-+*/
-+
-+#include "vg_constants.h"
-+#include "vg_unistd.h"
-+
-+/*
-+    int VG_(cpuid)(UInt eax,
-+                   UInt *eax_ret, UInt *ebx_ret, UInt *ecx_ret, UInt *edx_ret)
-+ */
-+.globl VG_(cpuid)
-+VG_(cpuid):
-+        pushl   %ebp
-+        movl    %esp, %ebp
-+        pushl   %eax
-+        pushl   %ebx
-+        pushl   %ecx
-+        pushl   %edx
-+        pushl   %esi
-+        movl    8(%ebp), %eax
-+        cpuid
-+        movl    12(%ebp), %esi
-+        testl   %esi, %esi
-+        jz      1f
-+        movl    %eax, (%esi)
-+1:
-+        movl    16(%ebp), %esi
-+        testl   %esi, %esi
-+        jz      2f
-+        movl    %ebx, (%esi)
-+2:
-+        movl    20(%ebp), %esi
-+        testl   %esi, %esi
-+        jz      3f
-+        movl    %ecx, (%esi)
-+3:
-+        movl    24(%ebp), %esi
-+        testl   %esi, %esi
-+        jz      4f
-+        movl    %edx, (%esi)
-+4:
-+        popl    %esi
-+        popl    %edx
-+        popl    %ecx
-+        popl    %ebx
-+        popl    %eax
-+        movl    %ebp, %esp
-+        popl    %ebp
-+        ret
-Index: coregrind/vg_to_ucode.c
-===================================================================
-RCS file: /home/kde/valgrind/coregrind/vg_to_ucode.c,v
-retrieving revision 1.138
-diff -u -u -w -r1.138 vg_to_ucode.c
---- coregrind/vg_to_ucode.c	2 Jun 2004 14:48:16 -0000	1.138
-+++ coregrind/vg_to_ucode.c	16 Jun 2004 18:20:57 -0000
-@@ -95,29 +95,6 @@
-    return flag_is_changeable(EFlagID);
- }
- 
--static inline UInt cpuid_eax(UInt eax)
--{
--   asm("cpuid" : "=a" (eax) : "0" (eax) : "bx", "cx", "dx");
--   return eax;
--}
--
--static inline void cpuid(UInt eax, 
--			 UInt *eax_ret, UInt *ebx_ret, UInt *ecx_ret, UInt *edx_ret)
--{
--   UInt ebx, ecx, edx;
--
--   asm("cpuid" : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) : "0" (eax));
--
--   if (eax_ret)
--      *eax_ret = eax;
--   if (ebx_ret)
--      *ebx_ret = ebx;
--   if (ecx_ret)
--      *ecx_ret = ecx;
--   if (edx_ret)
--      *edx_ret = edx;
--}
--
- static void get_cpu_features(void)
- {
-    Char vendorstr[13];
-@@ -130,7 +107,7 @@
- 
-    cpu_features[VG_INT_FEAT] |= (1 << (VG_X86_FEAT_CPUID%32));
- 
--   cpuid(0, &cpuid_level, (UInt *)&vendorstr[0], (UInt *)&vendorstr[8], (UInt *)&vendorstr[4]);
-+   VG_(cpuid)(0, &cpuid_level, (UInt *)&vendorstr[0], (UInt *)&vendorstr[8], (UInt *)&vendorstr[4]);
-    vendorstr[12] = '\0';
- 
-    for(i = 0; i < sizeof(cpu_vendors)/sizeof(*cpu_vendors); i++)
-@@ -140,12 +117,12 @@
-       }
- 
-    if (cpuid_level >= 1)
--      cpuid(1, NULL, NULL, &cpu_features[VG_EXT_FEAT], &cpu_features[VG_X86_FEAT]);
-+      VG_(cpuid)(1, NULL, NULL, &cpu_features[VG_EXT_FEAT], &cpu_features[VG_X86_FEAT]);
- 
-    switch(cpu_vendor) {
-    case VG_CPU_VENDOR_AMD:
-       /* get AMD-specific flags */
--      cpuid(0x80000001, NULL, NULL, NULL, &cpu_features[VG_AMD_FEAT]);
-+      VG_(cpuid)(0x80000001, NULL, NULL, NULL, &cpu_features[VG_AMD_FEAT]);
-       break;
- 
-    default:
-@@ -259,7 +236,7 @@
-    if (cpuid_level == -2)
-       get_cpu_features();	/* for cpu_vendor */
- 
--   cpuid(op, &eax, &ebx, &ecx, &edx);
-+   VG_(cpuid)(op, &eax, &ebx, &ecx, &edx);
- 
-    /* Common mangling */
-    switch(op) {
-Index: include/vg_skin.h.base
-===================================================================
-RCS file: /home/kde/valgrind/include/vg_skin.h.base,v
-retrieving revision 1.18
-diff -u -u -w -r1.18 vg_skin.h.base
---- include/vg_skin.h.base	13 Jun 2004 09:55:21 -0000	1.18
-+++ include/vg_skin.h.base	16 Jun 2004 18:20:57 -0000
-@@ -585,6 +585,10 @@
- /* other, randomly useful functions */
- extern UInt VG_(read_millisecond_timer) ( void );
- 
-+extern void VG_(cpuid) ( UInt eax,
-+                         UInt *eax_ret, UInt *ebx_ret,
-+                         UInt *ecx_ret, UInt *edx_ret );
-+
- /*====================================================================*/
- /*=== UCode definition                                             ===*/
- /*====================================================================*/
-
diff --git a/dev-util/valgrind/files/valgrind-2.1.2-kernel-headers.patch b/dev-util/valgrind/files/valgrind-2.1.2-kernel-headers.patch
deleted file mode 100644
index 4fe8c3ff99ce..000000000000
--- a/dev-util/valgrind/files/valgrind-2.1.2-kernel-headers.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ruN valgrind-2.1.2.orig/coregrind/vg_unsafe.h valgrind-2.1.2/coregrind/vg_unsafe.h
---- valgrind-2.1.2.orig/coregrind/vg_unsafe.h	2004-07-21 23:44:53.146503216 +0200
-+++ valgrind-2.1.2/coregrind/vg_unsafe.h	2004-07-21 23:48:04.156465288 +0200
-@@ -47,11 +47,12 @@
- #include <sys/socket.h>   /* for struct msghdr */
- #include <linux/sockios.h>/* for SIOCOUTQ */
- #include <sys/un.h>       /* for sockaddr_un */
--#include <net/if.h>       /* for struct ifreq et al */
- #include <net/if_arp.h>   /* for struct arpreq */
- #include <net/route.h>    /* for struct rtentry */
- #ifdef KERNEL_2_6
- #include <linux/compiler.h> /* for __user definition */
-+#else
-+#include <net/if.h>       /* for struct ifreq et al */
- #endif
- #include <asm/ipc.h>      /* for struct ipc_kludge */
- #include <linux/msg.h>    /* for struct msgbuf */
diff --git a/dev-util/valgrind/files/valgrind-configure.in-2.6.diff b/dev-util/valgrind/files/valgrind-configure.in-2.6.diff
deleted file mode 100644
index 8af4f022b7d6..000000000000
--- a/dev-util/valgrind/files/valgrind-configure.in-2.6.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	2003-08-15 11:11:58.083530432 -0500
-+++ configure.in	2003-08-15 11:11:24.500635808 -0500
-@@ -97,7 +97,7 @@
- kernel=`uname -r`
- 
- case "${kernel}" in
--     2.5.*) 
-+     2.5.*|2.6.*) 
- 	    AC_MSG_RESULT([2.5 family (${kernel})])
- 	    AC_DEFINE([KERNEL_2_5], 1, [Define to 1 if you're using Linux 2.5.x])
- 	    ;;
diff --git a/dev-util/valgrind/valgrind-2.0.0.ebuild b/dev-util/valgrind/valgrind-2.0.0.ebuild
deleted file mode 100644
index 9952d6b88064..000000000000
--- a/dev-util/valgrind/valgrind-2.0.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-2.0.0.ebuild,v 1.8 2005/02/13 15:55:25 griffon26 Exp $
-
-inherit flag-o-matic eutils
-RESTRICT="nostrip"
-IUSE="X"
-
-MY_P=${P/2.0_pre/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="An open-source memory debugger for x86-GNU/Linux"
-HOMEPAGE="http://valgrind.kde.org"
-SRC_URI="http://developer.kde.org/~sewardj/${MY_P}.tar.bz2"
-DEPEND="virtual/libc
-	sys-devel/autoconf
-	X? ( virtual/x11 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 -sparc -ppc -alpha"
-
-#src_unpack() {
-#	unpack ${A}
-#	cd ${S}
-#	if [ `uname -r | awk -F . '{print $2}'` == 6 ]; then
-#		epatch ${FILESDIR}/${PN}-configure.in-2.6.diff
-#		autoconf || die "error while running autoconf"
-#	fi
-#}
-
-src_compile() {
-	local myconf
-
-	filter-flags -fPIC
-
-	use X && myconf="--with-x" || myconf="--with-x=no"
-	# note: it does not appear safe to play with CFLAGS
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall docdir="${D}/usr/share/doc/${PF}" || die
-	dodoc ACKNOWLEDGEMENTS AUTHORS INSTALL NEWS \
-		PATCHES_APPLIED README* TODO ChangeLog FAQ.txt
-}
-
diff --git a/dev-util/valgrind/valgrind-2.1.0.ebuild b/dev-util/valgrind/valgrind-2.1.0.ebuild
deleted file mode 100644
index 11a65669ca3c..000000000000
--- a/dev-util/valgrind/valgrind-2.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-2.1.0.ebuild,v 1.9 2005/02/13 15:55:25 griffon26 Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="An open-source memory debugger for x86-GNU/Linux"
-HOMEPAGE="http://valgrind.kde.org"
-SRC_URI="x86? ( http://developer.kde.org/~sewardj/${P}.tar.bz2 )
-	ppc? ( http://ozlabs.org/~paulus/${P}-ppc.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc -sparc -alpha"
-IUSE="X"
-
-DEPEND="virtual/libc
-	sys-devel/autoconf
-	X? ( virtual/x11 )"
-
-case ${ARCH} in
-ppc)
-	S="${WORKDIR}/${P}-ppc"
-	;;
-esac
-
-src_compile() {
-	local myconf
-
-	filter-flags -fPIC
-
-	use X && myconf="--with-x" || myconf="--with-x=no"
-	# note: it does not appear safe to play with CFLAGS
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall docdir="${D}/usr/share/doc/${PF}" || die
-	dodoc ACKNOWLEDGEMENTS AUTHORS INSTALL NEWS \
-		PATCHES_APPLIED README* TODO ChangeLog FAQ.txt
-}
diff --git a/dev-util/valgrind/valgrind-2.1.1-r1.ebuild b/dev-util/valgrind/valgrind-2.1.1-r1.ebuild
deleted file mode 100644
index 9165ec05e9b1..000000000000
--- a/dev-util/valgrind/valgrind-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-2.1.1-r1.ebuild,v 1.5 2005/02/13 15:55:25 griffon26 Exp $
-
-inherit flag-o-matic eutils
-RESTRICT="nostrip"
-
-DESCRIPTION="An open-source memory debugger for x86-GNU/Linux"
-HOMEPAGE="http://valgrind.kde.org"
-SRC_URI="http://developer.kde.org/~sewardj/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 -sparc -ppc -alpha -amd64"
-IUSE="X"
-
-DEPEND="virtual/libc
-	sys-devel/autoconf
-	sys-devel/automake
-	X? ( virtual/x11 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# add pic aware cpuid patch from cvs. Bug #54068
-	epatch ${FILESDIR}/${PN}-2.1.1-pic.patch
-	einfo "Running aclocal/automake"
-	aclocal && automake
-}
-
-src_compile() {
-	local myconf
-
-	#filter-flags -fPIC
-
-	use X && myconf="--with-x" || myconf="--with-x=no"
-	# note: it does not appear safe to play with CFLAGS
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall docdir="${D}/usr/share/doc/${PF}" || die
-	dodoc ACKNOWLEDGEMENTS AUTHORS INSTALL NEWS \
-		PATCHES_APPLIED README* TODO ChangeLog FAQ.txt
-}
diff --git a/dev-util/valgrind/valgrind-2.1.1.ebuild b/dev-util/valgrind/valgrind-2.1.1.ebuild
deleted file mode 100644
index 1e18d10e5190..000000000000
--- a/dev-util/valgrind/valgrind-2.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-2.1.1.ebuild,v 1.5 2005/02/13 15:55:25 griffon26 Exp $
-
-inherit flag-o-matic eutils
-RESTRICT="nostrip"
-
-DESCRIPTION="An open-source memory debugger for x86-GNU/Linux"
-HOMEPAGE="http://valgrind.kde.org"
-SRC_URI="http://developer.kde.org/~sewardj/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 -sparc -ppc -alpha"
-IUSE="X"
-
-DEPEND="virtual/libc
-	sys-devel/autoconf
-	X? ( virtual/x11 )"
-
-src_compile() {
-	local myconf
-
-	filter-flags -fPIC
-
-	use X && myconf="--with-x" || myconf="--with-x=no"
-	# note: it does not appear safe to play with CFLAGS
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall docdir="${D}/usr/share/doc/${PF}" || die
-	dodoc ACKNOWLEDGEMENTS AUTHORS INSTALL NEWS \
-		PATCHES_APPLIED README* TODO ChangeLog FAQ.txt
-}
diff --git a/dev-util/valgrind/valgrind-2.1.2.ebuild b/dev-util/valgrind/valgrind-2.1.2.ebuild
deleted file mode 100644
index 5bd6380e903c..000000000000
--- a/dev-util/valgrind/valgrind-2.1.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-2.1.2.ebuild,v 1.4 2005/02/13 15:55:25 griffon26 Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="An open-source memory debugger for x86-GNU/Linux"
-HOMEPAGE="http://valgrind.kde.org"
-SRC_URI="http://developer.kde.org/~sewardj/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 -sparc -ppc -alpha"
-IUSE="X"
-RESTRICT="nostrip"
-
-RDEPEND="virtual/libc
-	X? ( virtual/x11 )"
-DEPEND="${RDEPEND}
-	sys-devel/autoconf"
-
-src_unpack() {
-	unpack ${A}
-	#ugly but working workaround
-	if has_version '>=sys-kernel/linux26-headers-2.6.7' ; then
-		epatch "${FILESDIR}/${P}-kernel-headers.patch"
-	fi
-}
-src_compile() {
-	local myconf
-
-	filter-flags -fPIC
-
-	use X && myconf="--with-x" || myconf="--with-x=no"
-	# note: it does not appear safe to play with CFLAGS
-	econf ${myconf} || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall docdir="${D}/usr/share/doc/${PF}/html" || die
-	dodoc ACKNOWLEDGEMENTS AUTHORS FAQ.txt NEWS README* TODO
-}
diff --git a/dev-util/valgrind/valgrind-2.2.0-r1.ebuild b/dev-util/valgrind/valgrind-2.2.0-r1.ebuild
deleted file mode 100644
index af8151999893..000000000000
--- a/dev-util/valgrind/valgrind-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-2.2.0-r1.ebuild,v 1.3 2005/02/13 15:55:25 griffon26 Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="An open-source memory debugger for x86-GNU/Linux and ppc-GNU/Linux"
-HOMEPAGE="http://valgrind.kde.org"
-SRC_URI="x86? ( http://developer.kde.org/~sewardj/${P}.tar.bz2 )
-		 ppc? ( http://ozlabs.org/~paulus/${P}-ppc.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~x86 ~ppc"
-IUSE="X"
-RESTRICT="nostrip"
-
-RDEPEND="virtual/libc
-	X? ( virtual/x11 )"
-DEPEND="${RDEPEND}
-	sys-devel/autoconf"
-
-src_unpack() {
-	unpack ${A}
-	use ppc && cd "${WORKDIR}/${P}-ppc" || cd ${S}
-	#ugly but working workaround
-	if has_version '>=sys-kernel/linux26-headers-2.6.7' ; then
-		einfo "Removing net/if.h from the includes in vg_unsafe.h"
-		sed -i -e "s:#include <net/if.h>::" \
-			coregrind/vg_unsafe.h ||die
-	fi
-	epatch "${FILESDIR}/${P}-no-exec-stack.patch"
-}
-src_compile() {
-	use ppc && cd "${WORKDIR}/${P}-ppc"
-
-	local myconf
-
-	filter-flags -fPIC
-
-	use X && myconf="--with-x" || myconf="--with-x=no"
-	# note: it does not appear safe to play with CFLAGS
-	econf ${myconf} || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	use ppc && cd "${WORKDIR}/${P}-ppc"
-	einstall docdir="${D}/usr/share/doc/${PF}/html" || die
-	dodoc ACKNOWLEDGEMENTS AUTHORS FAQ.txt NEWS README* TODO
-}
diff --git a/dev-util/valgrind/valgrind-2.2.0.ebuild b/dev-util/valgrind/valgrind-2.2.0.ebuild
deleted file mode 100644
index f5bfd0944fe5..000000000000
--- a/dev-util/valgrind/valgrind-2.2.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-2.2.0.ebuild,v 1.5 2005/02/13 15:55:25 griffon26 Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="An open-source memory debugger for x86-GNU/Linux and ppc-GNU/Linux"
-HOMEPAGE="http://valgrind.kde.org"
-SRC_URI="x86? ( http://developer.kde.org/~sewardj/${P}.tar.bz2 )
-		 ppc? ( http://ozlabs.org/~paulus/${P}-ppc.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 -sparc ~ppc -alpha"
-IUSE="X"
-RESTRICT="nostrip"
-
-RDEPEND="virtual/libc
-	X? ( virtual/x11 )"
-DEPEND="${RDEPEND}
-	sys-devel/autoconf"
-
-src_unpack() {
-	unpack ${A}
-	use ppc && cd "${WORKDIR}/${P}-ppc" || cd ${S}
-	#ugly but working workaround
-	if has_version '>=sys-kernel/linux26-headers-2.6.7' ; then
-		einfo "Removing net/if.h from the includes in vg_unsafe.h"
-		sed -i -e "s:#include <net/if.h>::" \
-			coregrind/vg_unsafe.h ||die
-	fi
-}
-src_compile() {
-	use ppc && cd "${WORKDIR}/${P}-ppc"
-
-	local myconf
-
-	filter-flags -fPIC
-
-	use X && myconf="--with-x" || myconf="--with-x=no"
-	# note: it does not appear safe to play with CFLAGS
-	econf ${myconf} || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	use ppc && cd "${WORKDIR}/${P}-ppc"
-	einstall docdir="${D}/usr/share/doc/${PF}/html" || die
-	dodoc ACKNOWLEDGEMENTS AUTHORS FAQ.txt NEWS README* TODO
-}
diff --git a/dev-util/valgrind/valgrind-2.4.0.ebuild b/dev-util/valgrind/valgrind-2.4.0.ebuild
index 37757b5bb269..aa3a20da2f43 100644
--- a/dev-util/valgrind/valgrind-2.4.0.ebuild
+++ b/dev-util/valgrind/valgrind-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-2.4.0.ebuild,v 1.5 2005/05/25 21:41:44 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-2.4.0.ebuild,v 1.6 2005/06/28 20:34:57 griffon26 Exp $
 
 inherit flag-o-matic eutils
 
@@ -11,7 +11,7 @@ SRC_URI="x86? ( http://www.valgrind.org/downloads/${P}.tar.bz2 )
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~x86 ~ppc"
+KEYWORDS="-* ~ppc x86"
 IUSE="X"
 RESTRICT="nostrip"