Bumped version of valgrind to 3.3.0 and removed old ebuilds

Package-Manager: portage-2.1.3.19

10 files changed, 58 insertions, 382 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 32ff4a5bf2fd..b2ef9abe4508 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.83 2007/12/01 17:23:39 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.84 2007/12/13 20:50:50 griffon26 Exp $
+
+*valgrind-3.3.0 (13 Dec 2007)
+
+  13 Dec 2007; Maurice van der Pot <griffon26@gentoo.org>
+  -files/valgrind-3.2.1-glibc-2.5.patch,
+  -files/valgrind-3.2.1-pkg-config.patch,
+  +files/valgrind-3.3.0-only64bit.patch, -valgrind-3.2.0.ebuild,
+  -valgrind-3.2.1.ebuild, +valgrind-3.3.0.ebuild:
+  Added valgrind-3.3.0 as requested by Giacomo Graziosi <g.graziosi@gmail.com>
+  in bug #202131. This release reintroduces helgrind, contains a revamped massif
+  and much more. Also removed old ebuilds.
 
   01 Dec 2007; Markus Rothe <corsair@gentoo.org> valgrind-3.2.3-r1.ebuild:
   Stable on ppc64
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 0ac10b6e4fb5..8dca73ac9cba 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,15 +1,10 @@
-AUX valgrind-3.2.1-glibc-2.5.patch 4985 RMD160 24600456338aa280809b9377ea03d055b2b9fd51 SHA1 3ad5e74bdbca2826a8f9e7d91ccc703a56837fe6 SHA256 26d1a8fe0630c3408db782616965cfd2dc14b480c90c51c0ddad4dd85db29836
-MD5 66cac40654067aff726b9e2c401c4dfd files/valgrind-3.2.1-glibc-2.5.patch 4985
-RMD160 24600456338aa280809b9377ea03d055b2b9fd51 files/valgrind-3.2.1-glibc-2.5.patch 4985
-SHA256 26d1a8fe0630c3408db782616965cfd2dc14b480c90c51c0ddad4dd85db29836 files/valgrind-3.2.1-glibc-2.5.patch 4985
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX valgrind-3.2.1-only64bit.patch 560 RMD160 d7203e51c4bc6be4003f0715c779e9b384beff06 SHA1 e5f27e95f1608c611b599140f2e175769a47bb80 SHA256 f4100efb266b49503ab198f5540ad05e4a9defe19d579348e5c7edcad0ffae63
 MD5 d36522c62616d6677a1b82fcf103de50 files/valgrind-3.2.1-only64bit.patch 560
 RMD160 d7203e51c4bc6be4003f0715c779e9b384beff06 files/valgrind-3.2.1-only64bit.patch 560
 SHA256 f4100efb266b49503ab198f5540ad05e4a9defe19d579348e5c7edcad0ffae63 files/valgrind-3.2.1-only64bit.patch 560
-AUX valgrind-3.2.1-pkg-config.patch 599 RMD160 29c25e514438ae24c4e83be97bf27073788b2cdd SHA1 8e17e34fae92cfcc8b98a3dbdc0fb5add16abe05 SHA256 a5175ee4cf32fef8ef521a7eeed346c4cf9761906147a4ad23076e30e02dd4ae
-MD5 b6bffc35d2312ad25f95a208de6647b1 files/valgrind-3.2.1-pkg-config.patch 599
-RMD160 29c25e514438ae24c4e83be97bf27073788b2cdd files/valgrind-3.2.1-pkg-config.patch 599
-SHA256 a5175ee4cf32fef8ef521a7eeed346c4cf9761906147a4ad23076e30e02dd4ae files/valgrind-3.2.1-pkg-config.patch 599
 AUX valgrind-3.2.3-glibc-2.6.patch 5825 RMD160 52e5c472eeeb418ea77ef1f3f3e4489d4d4f5031 SHA1 46d07bb66518a43795d0cee06ae5a5e58331b4ee SHA256 23bd0d40098d6a16f09152e77ba61bd97332be499b1a106e9bae9000ab200c29
 MD5 5e15d974cd371bd97ad5b957f54970a2 files/valgrind-3.2.3-glibc-2.6.patch 5825
 RMD160 52e5c472eeeb418ea77ef1f3f3e4489d4d4f5031 files/valgrind-3.2.3-glibc-2.6.patch 5825
@@ -26,17 +21,12 @@ AUX valgrind-3.2.3-unhandled-instr-amd64.patch 503 RMD160 e132a92f4f36b4019e8601
 MD5 395c6c0a72ebf4fba6631e13f090a051 files/valgrind-3.2.3-unhandled-instr-amd64.patch 503
 RMD160 e132a92f4f36b4019e86018e665d97eef2c1af00 files/valgrind-3.2.3-unhandled-instr-amd64.patch 503
 SHA256 a5666ee374f5c0c4d57e6aed73a6765036c659dc4eeeebbd969ea1c1f1cbd2cd files/valgrind-3.2.3-unhandled-instr-amd64.patch 503
-DIST valgrind-3.2.0.tar.bz2 4059114 RMD160 06cebcfacece9f6bac8fd72c13022d3440d243e9 SHA1 086d138368d2d4361ef1bcfe624ff879d71e6447 SHA256 e13b81b733697736b5d220c04fb853c1113d11867c7fb96028bee9d2584b638e
-DIST valgrind-3.2.1.tar.bz2 4052885 RMD160 eecd339f962b1657c377569650d435795638cc86 SHA1 76ab86ffdbccd97d6333eb6286761970cdf23120 SHA256 7f9a15d7be16ca03a0912191e8d55a486bf69690e11bb76ccece3eaff3730a33
+AUX valgrind-3.3.0-only64bit.patch 580 RMD160 f4304ad005586541400e6c1466dabf8cdaac2b72 SHA1 7c890914ec0fd53b8de662783b230ec78e57e345 SHA256 23485d4b03c66db3c58f3a7e9d0aca439a50b87ea60f2edaaf94229b54a80ee9
+MD5 d23b925f004adf9076bb7cff27646692 files/valgrind-3.3.0-only64bit.patch 580
+RMD160 f4304ad005586541400e6c1466dabf8cdaac2b72 files/valgrind-3.3.0-only64bit.patch 580
+SHA256 23485d4b03c66db3c58f3a7e9d0aca439a50b87ea60f2edaaf94229b54a80ee9 files/valgrind-3.3.0-only64bit.patch 580
 DIST valgrind-3.2.3.tar.bz2 4016265 RMD160 62579fc7f1f3c39038b32467b2d098eeb8f77c79 SHA1 550195a913997ff15f12eea484bd3fe636b25472 SHA256 1bca920527f43fd0c68e8f8eb16a7996b34f415e73af54de0f2cd43a8247c441
-EBUILD valgrind-3.2.0.ebuild 2474 RMD160 316c15e422596cd6e4c24ba687938083f97b2c10 SHA1 fd933bee09043a6f5f5cf817cc09fb491610cb1f SHA256 848fec7074c05dbbf97c62feffa897ed071980822d74d60d40b44af39e80617c
-MD5 76fd76fb71b1163adb0016dc48e5e606 valgrind-3.2.0.ebuild 2474
-RMD160 316c15e422596cd6e4c24ba687938083f97b2c10 valgrind-3.2.0.ebuild 2474
-SHA256 848fec7074c05dbbf97c62feffa897ed071980822d74d60d40b44af39e80617c valgrind-3.2.0.ebuild 2474
-EBUILD valgrind-3.2.1.ebuild 2927 RMD160 5531757b597e68afccafea01ba3a63eea839013c SHA1 9c3df44d1435ecd3481f5df586979ea02c0f05a7 SHA256 be06feb84c605791424db4305da8e702d3b5a2d2255a833e182cee535a4a6d08
-MD5 9bf9dfe0665fb086deb19375baafe475 valgrind-3.2.1.ebuild 2927
-RMD160 5531757b597e68afccafea01ba3a63eea839013c valgrind-3.2.1.ebuild 2927
-SHA256 be06feb84c605791424db4305da8e702d3b5a2d2255a833e182cee535a4a6d08 valgrind-3.2.1.ebuild 2927
+DIST valgrind-3.3.0.tar.bz2 4519551 RMD160 ea969a421163010c263a67fb0a2797d3f6cca62c SHA1 e2d0f3bcb4e6dd4638ceeddc9da8603b32efdf11 SHA256 5af08229d77fe55437a6c558aee9babcff23f28c8a9c8f1f0a7d152754e9947a
 EBUILD valgrind-3.2.3-r1.ebuild 3091 RMD160 d14b87cf7035164fe4d984b3b5a160e3dfbb19d4 SHA1 681d6bc7151e9b17a87fd1e6f7c0ec0e0de23189 SHA256 c720c0233a25956c8706aa4bbcfa4402ad76d906ebd30a985169acde62a52043
 MD5 fa6a4aeb1be3bc95269efe76cdf4404d valgrind-3.2.3-r1.ebuild 3091
 RMD160 d14b87cf7035164fe4d984b3b5a160e3dfbb19d4 valgrind-3.2.3-r1.ebuild 3091
@@ -45,23 +35,31 @@ EBUILD valgrind-3.2.3.ebuild 3045 RMD160 f6477fea15734de984994306e19c6222a64ad0b
 MD5 d6dbe804b83abcaf0e03a0b01a0709af valgrind-3.2.3.ebuild 3045
 RMD160 f6477fea15734de984994306e19c6222a64ad0b3 valgrind-3.2.3.ebuild 3045
 SHA256 8a6b3c69d44c6b56f8fbe987a78782ef1165c347aa4be2b623de0f088556d11f valgrind-3.2.3.ebuild 3045
-MISC ChangeLog 12230 RMD160 9debd02330dce0b49e528ad3c39dc46e872836a0 SHA1 60feb164617fb34a8b7f14d704fbe3f4f6712f60 SHA256 bb8140f664045b755779b6bece6cf9cedaa1c93d4ee0c7dd1295ab70bbcf6616
-MD5 778fb56c11e9cc94d6030f2e4d7dacc5 ChangeLog 12230
-RMD160 9debd02330dce0b49e528ad3c39dc46e872836a0 ChangeLog 12230
-SHA256 bb8140f664045b755779b6bece6cf9cedaa1c93d4ee0c7dd1295ab70bbcf6616 ChangeLog 12230
+EBUILD valgrind-3.3.0.ebuild 2762 RMD160 773753856324d7ec4b4e8d211f20d275048d311c SHA1 b9f4ae93caa7f4ce0061bdb02809682cdf501df5 SHA256 f358b6b8a36db89d28003968b7f9bef2d8d8941c6d829911303c12b3f4bffdf9
+MD5 5c75caf6294828de2e26f1a7aeedd9a7 valgrind-3.3.0.ebuild 2762
+RMD160 773753856324d7ec4b4e8d211f20d275048d311c valgrind-3.3.0.ebuild 2762
+SHA256 f358b6b8a36db89d28003968b7f9bef2d8d8941c6d829911303c12b3f4bffdf9 valgrind-3.3.0.ebuild 2762
+MISC ChangeLog 12723 RMD160 fd34ed0dfd7f6f94badb446bf17c4b2aa9a36255 SHA1 928b8af6807f45ad19ac145021b3a2f1314df13a SHA256 7c7577da5cddc85d89b4e608f779daf3353fb62a974adc9ef700c42b35ee90d4
+MD5 eef5b37638770f8ec2f32336eba882c8 ChangeLog 12723
+RMD160 fd34ed0dfd7f6f94badb446bf17c4b2aa9a36255 ChangeLog 12723
+SHA256 7c7577da5cddc85d89b4e608f779daf3353fb62a974adc9ef700c42b35ee90d4 ChangeLog 12723
 MISC metadata.xml 1003 RMD160 e8ef4473e3545a4b98d46101edb49923112ac9e0 SHA1 f76bd7adb86b156832175f968d60c6372fcf8968 SHA256 2bf62ba94d772ac968485392127cf4f4303cccf5a1e6d0733d80507005ca7847
 MD5 799f0b61a3a686b4074bd61acc572c5c metadata.xml 1003
 RMD160 e8ef4473e3545a4b98d46101edb49923112ac9e0 metadata.xml 1003
 SHA256 2bf62ba94d772ac968485392127cf4f4303cccf5a1e6d0733d80507005ca7847 metadata.xml 1003
-MD5 88a14f93a9dcb29db25bafa399ea5679 files/digest-valgrind-3.2.0 250
-RMD160 3784900215e5b26faaf128fb7c177720af77e651 files/digest-valgrind-3.2.0 250
-SHA256 1ba63845b7f8fb25dc46455242f49a78dd7ef8a8e4515be2939712d7184f2b74 files/digest-valgrind-3.2.0 250
-MD5 d1f8d4d834e9c06cdd463e5cfee7109f files/digest-valgrind-3.2.1 250
-RMD160 2cee048df21be4b40b0b470ce77b022871b78e31 files/digest-valgrind-3.2.1 250
-SHA256 4ce1d531330a2a0af6e45dc2758c22e9053b93a53f740a97ce6a2f3c9e7ac4f2 files/digest-valgrind-3.2.1 250
 MD5 ded6e2e906dd6407d3c38a1f207baba8 files/digest-valgrind-3.2.3 250
 RMD160 ef9bb48abce2a7d73e29e5809b37df230fdf397e files/digest-valgrind-3.2.3 250
 SHA256 c8597bd67dd8460be263e80557d2accb57b4a820c93aa802de76f2c8bd649352 files/digest-valgrind-3.2.3 250
 MD5 ded6e2e906dd6407d3c38a1f207baba8 files/digest-valgrind-3.2.3-r1 250
 RMD160 ef9bb48abce2a7d73e29e5809b37df230fdf397e files/digest-valgrind-3.2.3-r1 250
 SHA256 c8597bd67dd8460be263e80557d2accb57b4a820c93aa802de76f2c8bd649352 files/digest-valgrind-3.2.3-r1 250
+MD5 a140492aeb2e77063ae26d6549741bb5 files/digest-valgrind-3.3.0 250
+RMD160 3b3c01480dbb469cdfd4f9943c7f85b19281dc46 files/digest-valgrind-3.3.0 250
+SHA256 1b911e8098eedd4812bfd699f93e5ecd671c804813a7f91d88215e177a010f9d files/digest-valgrind-3.3.0 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHYZs0MGnpIbeahxwRAk6LAJ4uXHbu4NL2yZIDBH6Fl73PTTX8HgCgobCS
+w6m7mm8fnWPs+rrdI6B5N6k=
+=DQVe
+-----END PGP SIGNATURE-----
diff --git a/dev-util/valgrind/files/digest-valgrind-3.2.0 b/dev-util/valgrind/files/digest-valgrind-3.2.0
deleted file mode 100644
index 968ccfcf3511..000000000000
--- a/dev-util/valgrind/files/digest-valgrind-3.2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c418026ce7c38a740ef17efe59509fcf valgrind-3.2.0.tar.bz2 4059114
-RMD160 06cebcfacece9f6bac8fd72c13022d3440d243e9 valgrind-3.2.0.tar.bz2 4059114
-SHA256 e13b81b733697736b5d220c04fb853c1113d11867c7fb96028bee9d2584b638e valgrind-3.2.0.tar.bz2 4059114
diff --git a/dev-util/valgrind/files/digest-valgrind-3.2.1 b/dev-util/valgrind/files/digest-valgrind-3.2.1
deleted file mode 100644
index b657d4583de1..000000000000
--- a/dev-util/valgrind/files/digest-valgrind-3.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9407d33961186814cef0e6ecedfd6318 valgrind-3.2.1.tar.bz2 4052885
-RMD160 eecd339f962b1657c377569650d435795638cc86 valgrind-3.2.1.tar.bz2 4052885
-SHA256 7f9a15d7be16ca03a0912191e8d55a486bf69690e11bb76ccece3eaff3730a33 valgrind-3.2.1.tar.bz2 4052885
diff --git a/dev-util/valgrind/files/digest-valgrind-3.3.0 b/dev-util/valgrind/files/digest-valgrind-3.3.0
new file mode 100644
index 000000000000..f83b4acb200e
--- /dev/null
+++ b/dev-util/valgrind/files/digest-valgrind-3.3.0
@@ -0,0 +1,3 @@
+MD5 e5fc39755a714f36b7e5014c1c6d4748 valgrind-3.3.0.tar.bz2 4519551
+RMD160 ea969a421163010c263a67fb0a2797d3f6cca62c valgrind-3.3.0.tar.bz2 4519551
+SHA256 5af08229d77fe55437a6c558aee9babcff23f28c8a9c8f1f0a7d152754e9947a valgrind-3.3.0.tar.bz2 4519551
diff --git a/dev-util/valgrind/files/valgrind-3.2.1-glibc-2.5.patch b/dev-util/valgrind/files/valgrind-3.2.1-glibc-2.5.patch
deleted file mode 100644
index f0e0387e32c7..000000000000
--- a/dev-util/valgrind/files/valgrind-3.2.1-glibc-2.5.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-diff -ruN valgrind-3.2.1/configure.in valgrind-3.2.1-fixed/configure.in
---- valgrind-3.2.1/configure.in	2006-10-24 17:51:14.339715000 +0200
-+++ valgrind-3.2.1-fixed/configure.in	2006-10-24 17:52:24.220082250 +0200
-@@ -349,6 +349,16 @@
- ],
- glibc="2.4")
- 
-+AC_EGREP_CPP([GLIBC_25], [
-+#include <features.h>
-+#ifdef __GNU_LIBRARY__
-+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 5)
-+  GLIBC_25
-+ #endif
-+#endif
-+],
-+glibc="2.5")
-+
- AC_MSG_CHECKING([the glibc version])
- 
- case "${glibc}" in
-@@ -370,9 +380,15 @@
- 	DEFAULT_SUPP="glibc-2.4.supp ${DEFAULT_SUPP}"
- 	;;
- 
-+     2.5)
-+	AC_MSG_RESULT(2.5 family)
-+	AC_DEFINE([GLIBC_2_5], 1, [Define to 1 if you're using glibc 2.5.x])
-+	DEFAULT_SUPP="glibc-2.5.supp ${DEFAULT_SUPP}"
-+	;;
-+
-      *)
- 	AC_MSG_RESULT(unsupported version)
--	AC_MSG_ERROR([Valgrind requires glibc version 2.2, 2.3 or 2.4])
-+	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.5])
- 	;;
- esac
- 
-diff -ruN valgrind-3.2.1/glibc-2.5.supp valgrind-3.2.1-fixed/glibc-2.5.supp
---- valgrind-3.2.1/glibc-2.5.supp	1970-01-01 01:00:00.000000000 +0100
-+++ valgrind-3.2.1-fixed/glibc-2.5.supp	2006-10-24 17:52:31.800556000 +0200
-@@ -0,0 +1,200 @@
-+
-+##----------------------------------------------------------------------##
-+
-+# 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.5*.so
-+   obj:/lib*/ld-2.5*.so
-+   obj:/lib*/ld-2.5*.so
-+   obj:/lib*/ld-2.5*.so
-+}
-+
-+{
-+   dl-hack3
-+   Memcheck:Cond
-+   obj:/lib*/ld-2.5*so*
-+   obj:/lib*/ld-2.5*so*
-+   obj:/lib*/ld-2.5*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.5.*.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.5.*.so
-+}
-+{
-+   glibc-2.3.5-on-SuSE-10.1-(PPC)-3
-+   Memcheck:Addr4
-+   fun:*wordcopy_fwd_dest_aligned*
-+   fun:mem*cpy
-+   obj:*lib*2.5.*.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.5.so
-+   obj:/*libc-2.5.so
-+   obj:/*libc-2.5.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.5.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.5.so
-+   obj:/*libc-2.5.so
-+   obj:/*libc-2.5.so
-+}
-+{
-+   X11-64bit-padding-4b
-+   Memcheck:Param
-+   socketcall.send(msg)
-+   fun:send
-+   obj:/*libc-2.5.so
-+   obj:/*libc-2.5.so
-+   obj:/*libc-2.5.so
-+}
diff --git a/dev-util/valgrind/files/valgrind-3.2.1-pkg-config.patch b/dev-util/valgrind/files/valgrind-3.2.1-pkg-config.patch
deleted file mode 100644
index 25fb8a8fd915..000000000000
--- a/dev-util/valgrind/files/valgrind-3.2.1-pkg-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: valgrind.pc.in
-===================================================================
---- valgrind.pc.in	(revision 6077)
-+++ valgrind.pc.in	(working copy)
-@@ -4,13 +4,13 @@
- includedir=@includedir@/valgrind
- arch=@VG_ARCH@
- os=@VG_OS@
--platform=@VG_PLATFORM@
-+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@ -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
new file mode 100644
index 000000000000..666c66ca4fa7
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.3.0-only64bit.patch
@@ -0,0 +1,12 @@
+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/valgrind-3.2.0.ebuild b/dev-util/valgrind/valgrind-3.2.0.ebuild
deleted file mode 100644
index 67169503e8b2..000000000000
--- a/dev-util/valgrind/valgrind-3.2.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.2.0.ebuild,v 1.6 2007/06/25 21:59:52 mr_bones_ 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 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
-
-	# 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 && ! has_multilib_profile; then
-		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.1.ebuild b/dev-util/valgrind/valgrind-3.3.0.ebuild
index c87572d35ec3..a8ad36063f22 100644
--- a/dev-util/valgrind/valgrind-3.2.1.ebuild
+++ b/dev-util/valgrind/valgrind-3.3.0.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.6 2007/06/25 21:59:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.3.0.ebuild,v 1.1 2007/12/13 20:50:50 griffon26 Exp $
 
 inherit autotools eutils flag-o-matic toolchain-funcs
 
@@ -10,12 +10,9 @@ SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 ppc ppc64 x86"
+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() {
@@ -33,17 +30,14 @@ src_unpack() {
 	# Correct hard coded doc location
 	sed -i -e "s:doc/valgrind:doc/${P}:" docs/Makefile.am
 
-	# Fix undefined reference to @VG_PLATFORM@ (bug #147904)
-	epatch "${FILESDIR}/${P}-pkg-config.patch"
-
-	# Don't reject glibc-2.5
-	epatch "${FILESDIR}/${P}-glibc-2.5.patch"
+	# 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}/${P}-only64bit.patch"
+		epatch "${FILESDIR}/valgrind-3.3.0-only64bit.patch"
 	fi
 
 	# Regenerate autotools files