Removed old valgrind ebuilds and fixed bug #131987

(Portage version: 2.1_rc4)
 (Signed Manifest commit)

23 files changed, 18 insertions, 974 deletions

diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 86248b877fc4..212fc28b283e 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,117 +1,38 @@
-AUX valgrind-2.2.0-current-macro-clash.patch 1871 RMD160 2d484e70e054c46d17a36d6051bf1d4cb515f5e4 SHA1 04692e79c8c14f027c976ab2a7eaa7e9fc660259 SHA256 1274f5a8c06f762d0c252363bfd6498e30319427bd767b78fd2e966ad58551e6
-MD5 d10a593e8cb1c5074c438adc226d1c81 files/valgrind-2.2.0-current-macro-clash.patch 1871
-RMD160 2d484e70e054c46d17a36d6051bf1d4cb515f5e4 files/valgrind-2.2.0-current-macro-clash.patch 1871
-SHA256 1274f5a8c06f762d0c252363bfd6498e30319427bd767b78fd2e966ad58551e6 files/valgrind-2.2.0-current-macro-clash.patch 1871
-AUX valgrind-2.2.0-no-exec-stack.patch 1711 RMD160 0f4e81a4ee2ebd8b25026eda2d47b8122d90aec7 SHA1 5d2d2b0d5dd71235a02ea0da5082a10fc9d371cb SHA256 daaab5eba58d399671ca1847d8d48436fff5abcdd3b9964717333ce5f94a9825
-MD5 fc1dda2b6f2603a4244ad25f555f2034 files/valgrind-2.2.0-no-exec-stack.patch 1711
-RMD160 0f4e81a4ee2ebd8b25026eda2d47b8122d90aec7 files/valgrind-2.2.0-no-exec-stack.patch 1711
-SHA256 daaab5eba58d399671ca1847d8d48436fff5abcdd3b9964717333ce5f94a9825 files/valgrind-2.2.0-no-exec-stack.patch 1711
-AUX valgrind-2.4.0-pie-fix.patch 2335 RMD160 742118ee6835dde0d231eec787936441c61a426d SHA1 ce39778e34a83fe5c1748c292209074193ca83e6 SHA256 c89c1c803b9875cd01b560ec27686119b1cb98bea0c2bcfb95e2fdd34ebded4d
-MD5 e878f97b4c6308515baf5abaee045ce7 files/valgrind-2.4.0-pie-fix.patch 2335
-RMD160 742118ee6835dde0d231eec787936441c61a426d files/valgrind-2.4.0-pie-fix.patch 2335
-SHA256 c89c1c803b9875cd01b560ec27686119b1cb98bea0c2bcfb95e2fdd34ebded4d files/valgrind-2.4.0-pie-fix.patch 2335
-AUX valgrind-2.4.1-dont-trample-cflags.patch 442 RMD160 2c0e629a8dd8ee8b1d360182bde4e5fb6f620338 SHA1 3932ddf761bb3cb2406df8cade77016681e1dbbd SHA256 05ff6b41aebf903978934ac35aa56c737b50a1e7c98f10c4136060782f562907
-MD5 c67ef295757f9c8b4e9be146f6c4f873 files/valgrind-2.4.1-dont-trample-cflags.patch 442
-RMD160 2c0e629a8dd8ee8b1d360182bde4e5fb6f620338 files/valgrind-2.4.1-dont-trample-cflags.patch 442
-SHA256 05ff6b41aebf903978934ac35aa56c737b50a1e7c98f10c4136060782f562907 files/valgrind-2.4.1-dont-trample-cflags.patch 442
-AUX valgrind-2.4.1-static-const.patch 4397 RMD160 01e3d311208aaba08c2c68517917ee20351dbb4a SHA1 b6cb4461e35af3be0fe3b97af14856e24c4ed937 SHA256 8c07119eae91fbd4d718df56987b23ba3465318c97dc7e1b8417b29bde611644
-MD5 d177de2c2f79d24d4ad74644ee49f667 files/valgrind-2.4.1-static-const.patch 4397
-RMD160 01e3d311208aaba08c2c68517917ee20351dbb4a files/valgrind-2.4.1-static-const.patch 4397
-SHA256 8c07119eae91fbd4d718df56987b23ba3465318c97dc7e1b8417b29bde611644 files/valgrind-2.4.1-static-const.patch 4397
-AUX valgrind-3.0.0-pie-fix.patch 864 RMD160 48248f353a2bb147a56414241db640d3d7509bfb SHA1 274c836b278928c9fd0413cf6d720015ad845eca SHA256 406c9b7e866fa6e4b0f2f793fa455ee05f643f3e77483a91cebb81547dc58bf8
-MD5 24971d28d91da6c61168fa217d10b47b files/valgrind-3.0.0-pie-fix.patch 864
-RMD160 48248f353a2bb147a56414241db640d3d7509bfb files/valgrind-3.0.0-pie-fix.patch 864
-SHA256 406c9b7e866fa6e4b0f2f793fa455ee05f643f3e77483a91cebb81547dc58bf8 files/valgrind-3.0.0-pie-fix.patch 864
-AUX valgrind-3.0.1-mfence.patch 600 RMD160 7acfbe3addb18d5a95b19e15333e351e3cb84a3c SHA1 e2b3a5ecfa61ac6d5528775bf09977a81462724f SHA256 17cd814a2518a5f6e54f837751cbfbdddaf0e37c1e70fc246b043dfbefff4de0
-MD5 9af0c7aae878323f117ea148ee2930d4 files/valgrind-3.0.1-mfence.patch 600
-RMD160 7acfbe3addb18d5a95b19e15333e351e3cb84a3c files/valgrind-3.0.1-mfence.patch 600
-SHA256 17cd814a2518a5f6e54f837751cbfbdddaf0e37c1e70fc246b043dfbefff4de0 files/valgrind-3.0.1-mfence.patch 600
-AUX valgrind-3.0.1-pic-fix.patch 3565 RMD160 81491fe07dc9bd38f8a50fb13655d5409d905398 SHA1 528a0bb76073c8e3d5908c1c1f182acad107ea2f SHA256 5ab69e6366833ab0805ec318dfd0756d4d01b9e105973e668d502d63f284823e
-MD5 fc133b72d5c0341cc194c9cee839c058 files/valgrind-3.0.1-pic-fix.patch 3565
-RMD160 81491fe07dc9bd38f8a50fb13655d5409d905398 files/valgrind-3.0.1-pic-fix.patch 3565
-SHA256 5ab69e6366833ab0805ec318dfd0756d4d01b9e105973e668d502d63f284823e files/valgrind-3.0.1-pic-fix.patch 3565
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX valgrind-3.1.0-amd64-nomultilib-fix.patch 302 RMD160 50340968e8eb5aa261c8b65c3d69ed9c9405f2e7 SHA1 c524440507a8a0cae20ff5b3d1e8ad42868cbdeb SHA256 61ad946583bf37742271adcec9731d092cd78917312ebc00248364af7620795b
 MD5 2622d413602e236208128310f4736453 files/valgrind-3.1.0-amd64-nomultilib-fix.patch 302
 RMD160 50340968e8eb5aa261c8b65c3d69ed9c9405f2e7 files/valgrind-3.1.0-amd64-nomultilib-fix.patch 302
 SHA256 61ad946583bf37742271adcec9731d092cd78917312ebc00248364af7620795b files/valgrind-3.1.0-amd64-nomultilib-fix.patch 302
-DIST valgrind-2.2.0-ppc.tar.bz2 1000093
-DIST valgrind-2.2.0.tar.bz2 964987
-DIST valgrind-2.4.0-ppc.tar.bz2 1119623
-DIST valgrind-2.4.0.tar.bz2 1072044
-DIST valgrind-2.4.1.tar.bz2 1078229
-DIST valgrind-3.0.0.tar.bz2 2679021
-DIST valgrind-3.0.1.tar.bz2 2688531
-DIST valgrind-3.1.0.tar.bz2 3054546 RMD160 265f6fc41378207b0608d17360bd5fd1916e6ac0 SHA1 557235c42e202c3619f9834842c3c71f8242e884 SHA256 63fda6d9fa241f389780264b5b6b0c7397bdc2a20b883106c4bbaf829cacc90c
 DIST valgrind-3.1.1.tar.bz2 3074066 RMD160 023df2a78fc24662605cd28fbbaa0d6cf86552c6 SHA1 2a54baf4ae2feb0498df88faf0a6976384b439ff SHA256 6df142297a093bb970a018eaa26d2a6fde32ff3e1171cdf2ffad25ec06f371b9
 DIST valgrind-3.2.0.tar.bz2 4059114 RMD160 06cebcfacece9f6bac8fd72c13022d3440d243e9 SHA1 086d138368d2d4361ef1bcfe624ff879d71e6447 SHA256 e13b81b733697736b5d220c04fb853c1113d11867c7fb96028bee9d2584b638e
-EBUILD valgrind-2.2.0-r2.ebuild 1716 RMD160 5fca00eac1ea175aada2b8eff15e7f8ba142628d SHA1 eb6065187ec4d23c7ad67f512c429ad5a7ec2a4b SHA256 aa0dd7255e4d0d7b48a7d54d5724e95ad3cc346c8559757fab85531412c6f7ae
-MD5 9c6171e63f2c500b26cd6c2dd98d42e8 valgrind-2.2.0-r2.ebuild 1716
-RMD160 5fca00eac1ea175aada2b8eff15e7f8ba142628d valgrind-2.2.0-r2.ebuild 1716
-SHA256 aa0dd7255e4d0d7b48a7d54d5724e95ad3cc346c8559757fab85531412c6f7ae valgrind-2.2.0-r2.ebuild 1716
-EBUILD valgrind-2.4.0.ebuild 1407 RMD160 d3d67b8119232ca102969cfad151b81d93bdcc0c SHA1 75827406f0151f96c2eb4eee4b984d5e47bf4738 SHA256 162add90c1de50c1539bb41b3cc793d2c16be12a24441852bb88bce386153319
-MD5 98fd3a4e78d2c75a2de9d2f7595a649c valgrind-2.4.0.ebuild 1407
-RMD160 d3d67b8119232ca102969cfad151b81d93bdcc0c valgrind-2.4.0.ebuild 1407
-SHA256 162add90c1de50c1539bb41b3cc793d2c16be12a24441852bb88bce386153319 valgrind-2.4.0.ebuild 1407
-EBUILD valgrind-2.4.1.ebuild 1881 RMD160 75276b7b29e6d0ee8a076d4ac2649a09719a065e SHA1 a3376a5a8f893c2430aa2f4602647a4862aa30e2 SHA256 ebc0538abf9031aae05955c214b5ce4843f9329d7e9986bfff65899ff08574f0
-MD5 cb18085a00f509803e6e539543cb20f9 valgrind-2.4.1.ebuild 1881
-RMD160 75276b7b29e6d0ee8a076d4ac2649a09719a065e valgrind-2.4.1.ebuild 1881
-SHA256 ebc0538abf9031aae05955c214b5ce4843f9329d7e9986bfff65899ff08574f0 valgrind-2.4.1.ebuild 1881
-EBUILD valgrind-3.0.0.ebuild 1799 RMD160 8b2df2daf4ce24bffa1c5d04375945df3e518733 SHA1 e5d6cc86ed52b3983dcdac59ab314ce176da5d5f SHA256 74298e11501d343539e679692012bb16f23c06487f2f118d5acd54f46b9f0d54
-MD5 16efe20081a8edc14768a1ea1e4664be valgrind-3.0.0.ebuild 1799
-RMD160 8b2df2daf4ce24bffa1c5d04375945df3e518733 valgrind-3.0.0.ebuild 1799
-SHA256 74298e11501d343539e679692012bb16f23c06487f2f118d5acd54f46b9f0d54 valgrind-3.0.0.ebuild 1799
-EBUILD valgrind-3.0.1-r1.ebuild 1887 RMD160 04b887cae6481f028d2e144ee235b3ea0cd0994a SHA1 f0148d28de455d60416caa11574c79ca6edf55ba SHA256 7a29eb1d82e83daf384fe0c8a8654f8cc80f1a37b6221b121ac6a7090f2aa226
-MD5 c824aeed84391f896caea42dc444afc6 valgrind-3.0.1-r1.ebuild 1887
-RMD160 04b887cae6481f028d2e144ee235b3ea0cd0994a valgrind-3.0.1-r1.ebuild 1887
-SHA256 7a29eb1d82e83daf384fe0c8a8654f8cc80f1a37b6221b121ac6a7090f2aa226 valgrind-3.0.1-r1.ebuild 1887
-EBUILD valgrind-3.0.1.ebuild 1690 RMD160 2489815f61b0573bc688d9182e65be0a2cd41045 SHA1 2948d5e599ee31dcb82bb5f0a0a66ddade26825c SHA256 f5477fa65f3193042f7cb5fc726d243f6decc5602dfa06575649f7606d8f7534
-MD5 fc311d6ac7b19d831f6e18e9588c2053 valgrind-3.0.1.ebuild 1690
-RMD160 2489815f61b0573bc688d9182e65be0a2cd41045 valgrind-3.0.1.ebuild 1690
-SHA256 f5477fa65f3193042f7cb5fc726d243f6decc5602dfa06575649f7606d8f7534 valgrind-3.0.1.ebuild 1690
-EBUILD valgrind-3.1.0.ebuild 2354 RMD160 0c6c87ff6600df311908838b369d499b50f6c4d9 SHA1 76853e45d7c06c70b6de4d18a076b4403edd909b SHA256 446743e9b3b448fada2278eb052452b40cc844a96161d9269159694d2483bc17
-MD5 35c90975bda820631eb617e6b33038af valgrind-3.1.0.ebuild 2354
-RMD160 0c6c87ff6600df311908838b369d499b50f6c4d9 valgrind-3.1.0.ebuild 2354
-SHA256 446743e9b3b448fada2278eb052452b40cc844a96161d9269159694d2483bc17 valgrind-3.1.0.ebuild 2354
-EBUILD valgrind-3.1.1.ebuild 2350 RMD160 abf1b906a90fcaf6d3f2361f080d88615dcce957 SHA1 51e9c4e5ee233e5f9f687939ac5cafe479f36ec2 SHA256 acafb5367c3d9c1b954e9d3fde7623804db6fa66d0b3cf3e3ce245f8c20029e0
-MD5 39f29e81d8b3a3671397ea7b8d7bb859 valgrind-3.1.1.ebuild 2350
-RMD160 abf1b906a90fcaf6d3f2361f080d88615dcce957 valgrind-3.1.1.ebuild 2350
-SHA256 acafb5367c3d9c1b954e9d3fde7623804db6fa66d0b3cf3e3ce245f8c20029e0 valgrind-3.1.1.ebuild 2350
+EBUILD valgrind-3.1.1.ebuild 2295 RMD160 1705e387c08805525bc5940b9f2125939bde68d7 SHA1 4714fd6c19b6f17ba1f2c94d4748ffc45b3e1a6c SHA256 ea1c69a5fd78410b1d96aaf330cc123d7cafa70cfdb37cba6769c674c0ed63d6
+MD5 f9024a1595460a5e2e9f0cc4e17e2ac3 valgrind-3.1.1.ebuild 2295
+RMD160 1705e387c08805525bc5940b9f2125939bde68d7 valgrind-3.1.1.ebuild 2295
+SHA256 ea1c69a5fd78410b1d96aaf330cc123d7cafa70cfdb37cba6769c674c0ed63d6 valgrind-3.1.1.ebuild 2295
 EBUILD valgrind-3.2.0.ebuild 2389 RMD160 1545a74c577b12288521c3b8d8b297a3c2e30f9c SHA1 7fa8144c8292788933eb9ee7e8477a90f135a5f1 SHA256 07eb7e6d7c692e1e3122195ba38dae1d7a8ae68f6660e1951d26a6326e19fe0d
 MD5 7fb0ca8f315909ee5c91add35f706e0f valgrind-3.2.0.ebuild 2389
 RMD160 1545a74c577b12288521c3b8d8b297a3c2e30f9c valgrind-3.2.0.ebuild 2389
 SHA256 07eb7e6d7c692e1e3122195ba38dae1d7a8ae68f6660e1951d26a6326e19fe0d valgrind-3.2.0.ebuild 2389
-MISC ChangeLog 7536 RMD160 f7cac3729035a90d19bedec30431bb2864f6633a SHA1 6f9b39e7952f75d0c5716dc78345ec3d0a4e3df0 SHA256 7dde006d632677ad6b3a3fb31a09a8ab464c7a85bcbf3f2a34e249d0b941149a
-MD5 67db9e933b831cb3bbf5f4a143ea85b7 ChangeLog 7536
-RMD160 f7cac3729035a90d19bedec30431bb2864f6633a ChangeLog 7536
-SHA256 7dde006d632677ad6b3a3fb31a09a8ab464c7a85bcbf3f2a34e249d0b941149a ChangeLog 7536
+MISC ChangeLog 8266 RMD160 8cfcc7eae81a11094b607d9271fefb1a9a06ee14 SHA1 ddcf7e951dfff13ee0d70ca52bf8bcddfca93bc9 SHA256 5e9552fba7d13e7ce1cfdbe89566c4eeea1c124fc45042c7fe42d028da3ab332
+MD5 3ad8b6c9a3f07cb7fe9402418d2b7f0e ChangeLog 8266
+RMD160 8cfcc7eae81a11094b607d9271fefb1a9a06ee14 ChangeLog 8266
+SHA256 5e9552fba7d13e7ce1cfdbe89566c4eeea1c124fc45042c7fe42d028da3ab332 ChangeLog 8266
 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 26192577445b467e528408118f7ee6ec files/digest-valgrind-2.2.0-r2 139
-RMD160 4298b59bb5a09a9c5e745acd3093a662cfa0c3ae files/digest-valgrind-2.2.0-r2 139
-SHA256 0087ab32c877e5899bdeb34a1a53f472bdaf7aeb084b18e43c5ec0b0f3e39ca5 files/digest-valgrind-2.2.0-r2 139
-MD5 c6fe697b4c25fb9e5c7482496ebabf06 files/digest-valgrind-2.4.0 140
-RMD160 58c304a58440a7fbe37d9bad26bce219b3b84594 files/digest-valgrind-2.4.0 140
-SHA256 0c7db9e97d4934a2989e316a4930f4c67ef59660e0e92bb2f43c76e72299c02d files/digest-valgrind-2.4.0 140
-MD5 a5dde62cbb4bb255219643b61493b950 files/digest-valgrind-2.4.1 68
-RMD160 e8205e58dc57317a0712596e49a5222f5f72984f files/digest-valgrind-2.4.1 68
-SHA256 30584d1cc79cacc9cfde96c3e3e05277370112f607967d8a2a1cfacc954855f8 files/digest-valgrind-2.4.1 68
-MD5 af6b49666df28ad2a40f2f644fefce83 files/digest-valgrind-3.0.0 68
-RMD160 65559d9bba51a9a0b1a778fa516dc4832583f6a5 files/digest-valgrind-3.0.0 68
-SHA256 d9c2214440d0dc31bf4a4380a3ca309cf4ab98869dede549e1479c5de6e895e2 files/digest-valgrind-3.0.0 68
-MD5 bcce75140a2ec484339b6d1844e20a0a files/digest-valgrind-3.0.1 68
-RMD160 93997c527a03d86e1e3b5587f30f946279f3285b files/digest-valgrind-3.0.1 68
-SHA256 02440b8f15eb07079a4f768cae07a63eaf8d71da705852b5e616cfd00b821b2d files/digest-valgrind-3.0.1 68
-MD5 bcce75140a2ec484339b6d1844e20a0a files/digest-valgrind-3.0.1-r1 68
-RMD160 93997c527a03d86e1e3b5587f30f946279f3285b files/digest-valgrind-3.0.1-r1 68
-SHA256 02440b8f15eb07079a4f768cae07a63eaf8d71da705852b5e616cfd00b821b2d files/digest-valgrind-3.0.1-r1 68
-MD5 6b2e40398e26418194b0c7cd53ca7b79 files/digest-valgrind-3.1.0 250
-RMD160 c28770935a7bc12994487108270bf78b4462ea2b files/digest-valgrind-3.1.0 250
-SHA256 7cdabc674a03a552f867fccdd15fd243cac1a736db8900aba21f12511e2da15c files/digest-valgrind-3.1.0 250
 MD5 69ae23773205abb5385db8725ca4fee0 files/digest-valgrind-3.1.1 250
 RMD160 56ff5efe875aa7f6f47266ffb972fb78a7c161fd files/digest-valgrind-3.1.1 250
 SHA256 ee9f0cca9ce40ded0237d40aa15853d8037fb1bce9408ab68cea35d5beee5bd0 files/digest-valgrind-3.1.1 250
 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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEidOuMGnpIbeahxwRArdzAJ4w/KSZ4qqMVQ9yVltx+17kSPl1DQCgwRhJ
+U3tpqY/tBkKVRsBVlutco9k=
+=OLIJ
+-----END PGP SIGNATURE-----
diff --git a/dev-util/valgrind/files/digest-valgrind-2.2.0-r2 b/dev-util/valgrind/files/digest-valgrind-2.2.0-r2
deleted file mode 100644
index b7acbc96ccc1..000000000000
--- a/dev-util/valgrind/files/digest-valgrind-2.2.0-r2
+++ /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.4.0 b/dev-util/valgrind/files/digest-valgrind-2.4.0
deleted file mode 100644
index 8df1b8e7afb3..000000000000
--- a/dev-util/valgrind/files/digest-valgrind-2.4.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1d0bd81d368789946d32d18a468ea0cf valgrind-2.4.0.tar.bz2 1072044
-MD5 a05d46ce20972d985c89ba16db0b747b valgrind-2.4.0-ppc.tar.bz2 1119623
diff --git a/dev-util/valgrind/files/digest-valgrind-2.4.1 b/dev-util/valgrind/files/digest-valgrind-2.4.1
deleted file mode 100644
index 66fcf4f52b5e..000000000000
--- a/dev-util/valgrind/files/digest-valgrind-2.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8ada0f37ddd940032b85ea859fedb037 valgrind-2.4.1.tar.bz2 1078229
diff --git a/dev-util/valgrind/files/digest-valgrind-3.0.0 b/dev-util/valgrind/files/digest-valgrind-3.0.0
deleted file mode 100644
index 617bd30a1217..000000000000
--- a/dev-util/valgrind/files/digest-valgrind-3.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e976a343c61d9505162f595a8aeb09c1 valgrind-3.0.0.tar.bz2 2679021
diff --git a/dev-util/valgrind/files/digest-valgrind-3.0.1 b/dev-util/valgrind/files/digest-valgrind-3.0.1
deleted file mode 100644
index ded1c704ce7a..000000000000
--- a/dev-util/valgrind/files/digest-valgrind-3.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c29efdb7d1a93440f5644a6769054681 valgrind-3.0.1.tar.bz2 2688531
diff --git a/dev-util/valgrind/files/digest-valgrind-3.0.1-r1 b/dev-util/valgrind/files/digest-valgrind-3.0.1-r1
deleted file mode 100644
index ded1c704ce7a..000000000000
--- a/dev-util/valgrind/files/digest-valgrind-3.0.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c29efdb7d1a93440f5644a6769054681 valgrind-3.0.1.tar.bz2 2688531
diff --git a/dev-util/valgrind/files/digest-valgrind-3.1.0 b/dev-util/valgrind/files/digest-valgrind-3.1.0
deleted file mode 100644
index f1de712581cc..000000000000
--- a/dev-util/valgrind/files/digest-valgrind-3.1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d92156e9172dc6097e56c69ea9c88013 valgrind-3.1.0.tar.bz2 3054546
-RMD160 265f6fc41378207b0608d17360bd5fd1916e6ac0 valgrind-3.1.0.tar.bz2 3054546
-SHA256 63fda6d9fa241f389780264b5b6b0c7397bdc2a20b883106c4bbaf829cacc90c valgrind-3.1.0.tar.bz2 3054546
diff --git a/dev-util/valgrind/files/valgrind-2.2.0-current-macro-clash.patch b/dev-util/valgrind/files/valgrind-2.2.0-current-macro-clash.patch
deleted file mode 100644
index c0b817615756..000000000000
--- a/dev-util/valgrind/files/valgrind-2.2.0-current-macro-clash.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -ruN valgrind-2.2.0/coregrind/vg_syscalls.c valgrind-2.2.0-fixed/coregrind/vg_syscalls.c
---- valgrind-2.2.0/coregrind/vg_syscalls.c	2004-08-31 02:08:37.000000000 +0200
-+++ valgrind-2.2.0-fixed/coregrind/vg_syscalls.c	2005-02-22 20:20:38.904577288 +0100
-@@ -900,7 +900,7 @@
-    Addr ret = VG_(brk_limit);
-    static const Bool debug = False;
-    Segment *seg;
--   Addr current, newaddr;
-+   Addr currentaddr, newaddr;
- 
- 
-    if (debug)
-@@ -924,20 +924,20 @@
-    if (seg != NULL && newbrk > seg->addr)
-       return VG_(brk_limit);
- 
--   current = PGROUNDUP(VG_(brk_limit));
-+   currentaddr = PGROUNDUP(VG_(brk_limit));
-    newaddr = PGROUNDUP(newbrk);
--   if (newaddr != current) {
-+   if (newaddr != currentaddr) {
- 
-       /* new brk in a new page - fix the mappings */
-       if (newbrk > VG_(brk_limit)) {
- 	 
- 	 if (debug)
- 	    VG_(printf)("  extending brk: current=%p newaddr=%p delta=%d\n",
--			current, newaddr, newaddr-current);
-+			currentaddr, newaddr, newaddr-currentaddr);
- 
--	 if (newaddr == current) {
-+	 if (newaddr == currentaddr) {
- 	    ret = newbrk;
--         } else if ((void*)-1 != VG_(mmap)((void*)current, newaddr-current,
-+         } else if ((void*)-1 != VG_(mmap)((void*)currentaddr, newaddr-currentaddr,
-                VKI_PROT_READ|VKI_PROT_WRITE|VKI_PROT_EXEC,
-                VKI_MAP_PRIVATE|VKI_MAP_ANONYMOUS|VKI_MAP_FIXED|VKI_MAP_CLIENT,
-                SF_FIXED|SF_BRK, -1, 0)) 
-@@ -949,10 +949,10 @@
- 
- 	 if (debug)
- 	    VG_(printf)("  shrinking brk: current=%p newaddr=%p delta=%d\n",
--			current, newaddr, current-newaddr);
-+			currentaddr, newaddr, currentaddr-newaddr);
- 
--	 if (newaddr != current) {
--	    int res = VG_(munmap)((void *)newaddr, current - newaddr);
-+	 if (newaddr != currentaddr) {
-+	    int res = VG_(munmap)((void *)newaddr, currentaddr - newaddr);
-             vg_assert(0 == res);
- 	 }
- 	 ret = newbrk;
diff --git a/dev-util/valgrind/files/valgrind-2.2.0-no-exec-stack.patch b/dev-util/valgrind/files/valgrind-2.2.0-no-exec-stack.patch
deleted file mode 100644
index e5e87dcfd53e..000000000000
--- a/dev-util/valgrind/files/valgrind-2.2.0-no-exec-stack.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -ruN valgrind-2.2.0/coregrind/vg_libpthread.c valgrind-2.2.0-fixed/coregrind/vg_libpthread.c
---- valgrind-2.2.0/coregrind/vg_libpthread.c	2004-12-19 17:30:53.383502976 +0100
-+++ valgrind-2.2.0-fixed/coregrind/vg_libpthread.c	2004-12-19 17:31:23.680897072 +0100
-@@ -1830,12 +1830,6 @@
- /* Initialiser has completed. */
- #define P_ONCE_COMPLETED ((PTHREAD_ONCE_INIT) + 2)
- 
--int __pthread_once ( pthread_once_t *once_control, 
--                     void (*init_routine) (void) )
--{
--   int res;
--   int done;
--
- #  define TAKE_LOCK                                   \
-       res = __pthread_mutex_lock(&once_masterlock);   \
-       my_assert(res == 0);
-@@ -1844,11 +1838,19 @@
-       res = __pthread_mutex_unlock(&once_masterlock); \
-       my_assert(res == 0);
- 
--   void cleanup(void *v) {
--      TAKE_LOCK;
--      *once_control = P_ONCE_NOT_DONE;
--      RELEASE_LOCK;
--   }
-+static void cleanup(void *once_control) {
-+   int res;
-+   TAKE_LOCK;
-+   *(pthread_once_t *)once_control = P_ONCE_NOT_DONE;
-+   RELEASE_LOCK;
-+}
-+
-+int __pthread_once ( pthread_once_t *once_control, 
-+                     void (*init_routine) (void) )
-+{
-+   int res;
-+   int done;
-+
- 
-    ensure_valgrind("pthread_once");
- 
-@@ -1863,7 +1865,7 @@
-  	 /* Not started.  Change state to indicate running, drop the
- 	    lock and run.  */
-          *once_control = P_ONCE_RUNNING;
--	 _pthread_cleanup_push(NULL, cleanup, NULL);
-+	 _pthread_cleanup_push(NULL, cleanup, once_control);
- 	 RELEASE_LOCK;
-          init_routine();
-          /* re-take the lock, and set state to indicate done. */
-@@ -1904,9 +1906,10 @@
- 
-    return 0;
- 
-+}
-+
- #  undef TAKE_LOCK
- #  undef RELEASE_LOCK
--}
- 
- #undef P_ONCE_NOT_DONE
- #undef P_ONCE_RUNNING
diff --git a/dev-util/valgrind/files/valgrind-2.4.0-pie-fix.patch b/dev-util/valgrind/files/valgrind-2.4.0-pie-fix.patch
deleted file mode 100644
index 7c674a27f5ee..000000000000
--- a/dev-util/valgrind/files/valgrind-2.4.0-pie-fix.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -ruN valgrind-2.4.0/corecheck/tests/Makefile.in valgrind-2.4.0-fixed/corecheck/tests/Makefile.in
---- valgrind-2.4.0/corecheck/tests/Makefile.in	2005-03-24 03:30:27.000000000 +0100
-+++ valgrind-2.4.0-fixed/corecheck/tests/Makefile.in	2005-04-12 18:53:56.686049352 +0200
-@@ -202,7 +202,7 @@
- CCAS = @CCAS@
- CCASFLAGS = @CCASFLAGS@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -fno-pie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
-diff -ruN valgrind-2.4.0/coregrind/x86-linux/syscalls.c valgrind-2.4.0-fixed/coregrind/x86-linux/syscalls.c
---- valgrind-2.4.0/coregrind/x86-linux/syscalls.c	2005-03-23 11:22:03.000000000 +0100
-+++ valgrind-2.4.0-fixed/coregrind/x86-linux/syscalls.c	2005-04-12 18:50:01.373822248 +0200
-@@ -259,10 +259,13 @@
-       We need to make sure we don't touch the stack between marking it
-       Empty and exiting.  Hence the assembler. */
-    asm volatile (
-+      "pushl    %%ebx\n"        /* save original ebx value */
-       "movl	%1, %0\n"	/* set tst->status = VgTs_Empty */
-+      "movl     %2, %%ebx\n"    /* set ebx = tst->os_state.exitcode */
-       "int	$0x80\n"	/* exit(tst->os_state.exitcode) */
-+      "popl     %%ebx\n"        /* restore original ebx value */
-       : "=m" (tst->status)
--      : "n" (VgTs_Empty), "a" (__NR_exit), "b" (tst->os_state.exitcode));
-+      : "n" (VgTs_Empty), "a" (__NR_exit), "m" (tst->os_state.exitcode));
- 
-    VG_(core_panic)("Thread exit failed?\n");
- }
-diff -ruN valgrind-2.4.0/none/tests/Makefile.in valgrind-2.4.0-fixed/none/tests/Makefile.in
---- valgrind-2.4.0/none/tests/Makefile.in	2005-03-24 03:30:45.000000000 +0100
-+++ valgrind-2.4.0-fixed/none/tests/Makefile.in	2005-04-12 18:54:42.311113288 +0200
-@@ -322,7 +322,7 @@
- CCAS = @CCAS@
- CCASFLAGS = @CCASFLAGS@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -fno-pie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
-diff -ruN valgrind-2.4.0/none/tests/x86/Makefile.in valgrind-2.4.0-fixed/none/tests/x86/Makefile.in
---- valgrind-2.4.0/none/tests/x86/Makefile.in	2005-03-24 03:30:45.000000000 +0100
-+++ valgrind-2.4.0-fixed/none/tests/x86/Makefile.in	2005-04-12 18:55:25.859492928 +0200
-@@ -156,7 +156,7 @@
- CCAS = @CCAS@
- CCASFLAGS = @CCASFLAGS@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -fno-pie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
diff --git a/dev-util/valgrind/files/valgrind-2.4.1-dont-trample-cflags.patch b/dev-util/valgrind/files/valgrind-2.4.1-dont-trample-cflags.patch
deleted file mode 100644
index 452a45e08f4f..000000000000
--- a/dev-util/valgrind/files/valgrind-2.4.1-dont-trample-cflags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ruN valgrind-2.4.1/configure valgrind-2.4.1-fixed/configure
---- valgrind-2.4.1/configure	2005-08-03 22:12:16.789460240 +0200
-+++ valgrind-2.4.1-fixed/configure	2005-08-03 22:14:38.055984464 +0200
-@@ -4735,6 +4735,7 @@
- if test "$handles_mmmx" = "yes"; then
-   USE_MMX_REGISTER="-mmmx"
- fi
-+CFLAGS=$safe_CFLAGS
- 
- 
- 
-@@ -4804,6 +4805,7 @@
- if test "$handles_msse" = "yes"; then
-   USE_SSE_REGISTER="-msse"
- fi
-+CFLAGS=$safe_CFLAGS
- 
- 
- 
diff --git a/dev-util/valgrind/files/valgrind-2.4.1-static-const.patch b/dev-util/valgrind/files/valgrind-2.4.1-static-const.patch
deleted file mode 100644
index 8d13a4f7e8b4..000000000000
--- a/dev-util/valgrind/files/valgrind-2.4.1-static-const.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff -ruN valgrind-2.4.1/coregrind/vg_memory.c valgrind-2.4.1-fixed/coregrind/vg_memory.c
---- valgrind-2.4.1/coregrind/vg_memory.c	2005-07-19 21:13:46.000000000 +0200
-+++ valgrind-2.4.1-fixed/coregrind/vg_memory.c	2005-08-03 23:02:13.570880216 +0200
-@@ -158,7 +158,7 @@
- {
-    Segment *s;
-    Segment *next;
--   static const Bool debug = False || mem_debug;
-+   const Bool debug = False || mem_debug;
-    Addr end;
- 
-    if (len == 0)
-@@ -324,7 +324,7 @@
- 			   UInt dev, UInt ino, ULong off, const Char *filename)
- {
-    Segment *s;
--   static const Bool debug = False || mem_debug;
-+   const Bool debug = False || mem_debug;
-    Bool recycled;
- 
-    if (debug)
-@@ -479,7 +479,7 @@
- void VG_(mprotect_range)(Addr a, SizeT len, UInt prot)
- {
-    Segment *s, *next;
--   static const Bool debug = False || mem_debug;
-+   const Bool debug = False || mem_debug;
-    Segment *s1, *s2;
- 
-    if (debug)
-@@ -524,7 +524,7 @@
- 
- Addr VG_(find_map_space)(Addr addr, SizeT len, Bool for_client)
- {
--   static const Bool debug = False || mem_debug;
-+   const Bool debug = False || mem_debug;
-    Segment *s;
-    Addr ret;
-    Addr limit = (for_client ? VG_(client_end)-1   : VG_(valgrind_last));
-diff -ruN valgrind-2.4.1/coregrind/vg_stabs.c valgrind-2.4.1-fixed/coregrind/vg_stabs.c
---- valgrind-2.4.1/coregrind/vg_stabs.c	2005-07-27 14:37:52.000000000 +0200
-+++ valgrind-2.4.1-fixed/coregrind/vg_stabs.c	2005-08-03 23:03:07.065747760 +0200
-@@ -123,7 +123,7 @@
- */
- static SymType *structRef(StabTypeTab *tab, SymType *def, Bool isstruct, Char *name)
- {
--   static const Bool debug = False || stabs_debug;
-+   const Bool debug = False || stabs_debug;
-    struct structlist *sl;
-    SymType *ty;
-    static Int warnlen = 0;
-@@ -168,7 +168,7 @@
- /* Add a structural defintion for a struct/union reference */
- static SymType *structDef(StabTypeTab *tab, SymType *def, Bool isstruct, Char *name)
- {
--   static const Bool debug = False || stabs_debug;
-+   const Bool debug = False || stabs_debug;
-    SymType *ref = structRef(tab, NULL, isstruct, name);
- 
-    /* it seems that GNAT likes to declare names as both struct tags
-@@ -236,7 +236,7 @@
- /* add a new index for a file */
- static void addFileAlias(StabTypeTab *tab, Char *filename, UInt instance, Int idx)
- {
--   static const Bool debug = False || stabs_debug;
-+   const Bool debug = False || stabs_debug;
-    struct header *hp;
- 
-    for(hp = tab->headerhash[header_hash(filename, instance)]; hp != NULL; hp = hp->next) {
-@@ -255,7 +255,7 @@
- 
- static void addHeader(StabTypeTab *tab, Char *filename, UInt instance, Int idx)
- {
--   static const Bool debug = False || stabs_debug;
-+   const Bool debug = False || stabs_debug;
-    struct header *hp, **bucket;
-    
-    if (debug)
-@@ -476,7 +476,7 @@
- 
- static void stab_resolve(SymType *st, void *data)
- {
--   static const Bool debug = False || stabs_debug;
-+   const Bool debug = False || stabs_debug;
-    Char *str = (Char *)data;
-    vg_assert(!VG_(st_isresolved)(st));
- 
-@@ -493,7 +493,7 @@
-    introduced anywhere, so we need to scan it all to pick them up. */
- static SymType *stabtype_parser(SegInfo *si, SymType *def, Char **pp)
- {
--   static const Bool debug = False || stabs_debug;
-+   const Bool debug = False || stabs_debug;
-    Char *p = *pp;
-    Char t;
-    SymType *type;
-@@ -1018,7 +1018,7 @@
- /* parse a symbol reference: NAME ':' DESC TYPE */
- static Bool initSym(SegInfo *si, Sym *sym, stab_types kind, Char **namep, Int val)
- {
--   static const Bool debug = False || stabs_debug;
-+   const Bool debug = False || stabs_debug;
-    Char *name = *namep;
-    Char *ty;
-    Int len;
-@@ -1159,7 +1159,7 @@
-    definitions helps a lot. */
- static Scope *addSymsToScope(Scope *sc, struct symlist *list, Int nsyms, Scope *outer)
- {
--   static const Bool debug = False || stabs_debug;
-+   const Bool debug = False || stabs_debug;
-    Int j;
-    struct symlist *n;
-    Int base;
-@@ -1205,7 +1205,7 @@
- 				 UChar* stabC,   Int stab_sz, 
- 				 UChar* stabstr, Int stabstr_sz )
- {
--   static const Bool debug = False || stabs_debug;
-+   const Bool debug = False || stabs_debug;
-    Int    i;
-    Int    n_stab_entries;
-    struct nlist* stab = (struct nlist*)stabC;
-@@ -1283,7 +1283,7 @@
- 
-       /* handle continued string stabs */
-       {
--	 static const Bool contdebug = False || stabs_debug;
-+	 const Bool contdebug = False || stabs_debug;
- 	 Int buflen = 0;
- 	 Int idx = 0;
- 	 Char *buf = NULL;
diff --git a/dev-util/valgrind/files/valgrind-3.0.0-pie-fix.patch b/dev-util/valgrind/files/valgrind-3.0.0-pie-fix.patch
deleted file mode 100644
index 8919eeb2506a..000000000000
--- a/dev-util/valgrind/files/valgrind-3.0.0-pie-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN valgrind-3.0.0/none/tests/x86/Makefile.in valgrind-3.0.0-fixed/none/tests/x86/Makefile.in
---- valgrind-3.0.0/none/tests/x86/Makefile.in	2005-08-03 22:43:14.000000000 +0200
-+++ valgrind-3.0.0-fixed/none/tests/x86/Makefile.in	2005-08-04 22:52:05.563599512 +0200
-@@ -151,7 +151,7 @@
- CCAS = @CCAS@
- CCASFLAGS = @CCASFLAGS@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -fno-pie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
-diff -ruN valgrind-3.0.0/tests/Makefile.in valgrind-3.0.0-fixed/tests/Makefile.in
---- valgrind-3.0.0/tests/Makefile.in	2005-08-03 22:43:14.000000000 +0200
-+++ valgrind-3.0.0-fixed/tests/Makefile.in	2005-08-04 22:52:15.937022512 +0200
-@@ -93,7 +93,7 @@
- CCAS = @CCAS@
- CCASFLAGS = @CCASFLAGS@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -fno-pie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
diff --git a/dev-util/valgrind/files/valgrind-3.0.1-mfence.patch b/dev-util/valgrind/files/valgrind-3.0.1-mfence.patch
deleted file mode 100644
index abf6f9caf8fe..000000000000
--- a/dev-util/valgrind/files/valgrind-3.0.1-mfence.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN valgrind-3.0.1/VEX/priv/host-x86/hdefs.c valgrind-3.0.1-fixed/VEX/priv/host-x86/hdefs.c
---- valgrind-3.0.1/VEX/priv/host-x86/hdefs.c	2005-08-10 20:03:36.000000000 +0200
-+++ valgrind-3.0.1-fixed/VEX/priv/host-x86/hdefs.c	2005-09-15 21:28:49.638912328 +0200
-@@ -2312,7 +2312,6 @@
-       if (0) vex_printf("EMIT FENCE\n");
-       switch (i->Xin.MFence.subarch) {
-          case VexSubArchX86_sse0:
--            vassert(0); /* awaiting test case */
-             /* lock addl $0,0(%esp) */
-             *p++ = 0xF0; *p++ = 0x83; *p++ = 0x44; 
-             *p++ = 0x24; *p++ = 0x00; *p++ = 0x00;
diff --git a/dev-util/valgrind/files/valgrind-3.0.1-pic-fix.patch b/dev-util/valgrind/files/valgrind-3.0.1-pic-fix.patch
deleted file mode 100644
index 9356684ff6ac..000000000000
--- a/dev-util/valgrind/files/valgrind-3.0.1-pic-fix.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- valgrind-3.0.1-hacked/work/valgrind-3.0.1-old/addrcheck/Makefile.am	2005-08-24 21:37:08.000000000 +0200
-+++ valgrind-3.0.1/addrcheck/Makefile.am	2005-10-31 22:57:24.000000000 +0100
-@@ -6,6 +6,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/memcheck
- val_PROGRAMS = vgtool_addrcheck.so vgpreload_addrcheck.so
- 
- vgtool_addrcheck_so_SOURCES = ac_main.c
-+vgtool_addrcheck_so_CFLAGS = -fpic
- vgtool_addrcheck_so_LDFLAGS = -shared
- vgtool_addrcheck_so_LDADD = \
- 	../memcheck/mac_leakcheck.o \
-@@ -13,6 +14,7 @@ vgtool_addrcheck_so_LDADD = \
- 	../memcheck/mac_shared.o
- 
- vgpreload_addrcheck_so_SOURCES = 
-+vgpreload_addrcheck_so_CFLAGS = -fpic
- vgpreload_addrcheck_so_LDADD = \
- 	../memcheck/mac_replace_strmem.o
- vgpreload_addrcheck_so_DEPENDENCIES = \
---- valgrind-3.0.1-hacked/work/valgrind-3.0.1-old/cachegrind/Makefile.am	2005-08-10 17:28:20.000000000 +0200
-+++ valgrind-3.0.1/cachegrind/Makefile.am	2005-10-31 23:10:08.000000000 +0100
-@@ -14,5 +14,6 @@ val_PROGRAMS = vgtool_cachegrind.so
- vgtool_cachegrind_so_SOURCES = \
- 	cg_main.c \
- 	cg-@VG_ARCH@.c
-+vgtool_cachegrind_so_CFLAGS = -fpic
- vgtool_cachegrind_so_LDFLAGS = -shared
- 
---- valgrind-3.0.1-hacked/work/valgrind-3.0.1-old/helgrind/Makefile.am	2005-08-10 17:27:51.000000000 +0200
-+++ valgrind-3.0.1/helgrind/Makefile.am	2005-10-31 23:11:55.000000000 +0100
-@@ -3,11 +3,13 @@ include $(top_srcdir)/Makefile.tool.am
- val_PROGRAMS = vgtool_helgrind.so vgpreload_helgrind.so
- 
- vgtool_helgrind_so_SOURCES = hg_main.c
-+vgtool_helgrind_so_CFLAGS = -fpic
- vgtool_helgrind_so_LDFLAGS = -shared
- 
- vgpreload_helgrind_so_SOURCES = 
- vgpreload_helgrind_so_DEPENDENCIES = \
- 	$(LIBREPLACEMALLOC)
-+vgpreload_helgrind_so_CFLAGS = -fpic
- vgpreload_helgrind_so_LDFLAGS = -shared -Wl,-z,interpose,-z,initfirst \
- 	-Wl,--whole-archive \
- 	$(LIBREPLACEMALLOC) \
---- valgrind-3.0.1-hacked/work/valgrind-3.0.1-old/lackey/Makefile.am	2005-08-10 17:28:36.000000000 +0200
-+++ valgrind-3.0.1/lackey/Makefile.am	2005-10-31 23:09:49.000000000 +0100
-@@ -3,5 +3,6 @@ include $(top_srcdir)/Makefile.tool.am
- val_PROGRAMS = vgtool_lackey.so
- 
- vgtool_lackey_so_SOURCES = lk_main.c
-+vgtool_lackey_so_CFLAGS = -fpic
- vgtool_lackey_so_LDFLAGS = -shared
- 
---- valgrind-3.0.1-hacked/work/valgrind-3.0.1-old/massif/Makefile.am	2005-08-10 17:28:11.000000000 +0200
-+++ valgrind-3.0.1/massif/Makefile.am	2005-10-31 23:11:32.000000000 +0100
-@@ -5,11 +5,13 @@ SUBDIRS += hp2ps
- val_PROGRAMS = vgtool_massif.so vgpreload_massif.so
- 
- vgtool_massif_so_SOURCES = ms_main.c
-+vgtool_massif_so_CFLAGS = -fpic
- vgtool_massif_so_LDFLAGS = -shared
- 
- vgpreload_massif_so_SOURCES = 
- vgpreload_massif_so_DEPENDENCIES = \
- 	$(LIBREPLACEMALLOC)
-+vgpreload_massif_so_CFLAGS = -fpic
- vgpreload_massif_so_LDFLAGS = -shared -Wl,-z,interpose,-z,initfirst \
- 	-Wl,--whole-archive \
- 	$(LIBREPLACEMALLOC) \
---- valgrind-3.0.1-hacked/work/valgrind-3.0.1-old/memcheck/Makefile.am	2005-08-10 17:28:08.000000000 +0200
-+++ valgrind-3.0.1/memcheck/Makefile.am	2005-10-31 23:23:19.000000000 +0100
-@@ -1,7 +1,7 @@
- include $(top_srcdir)/Makefile.tool.am
- 
- ## Build Memcheck at a higher optimisation level
--AM_CFLAGS += -O2
-+AM_CFLAGS += -O2 -fpic
- 
- val_PROGRAMS = vgtool_memcheck.so vgpreload_memcheck.so
- 
---- valgrind-3.0.1-hacked/work/valgrind-3.0.1-old/none/Makefile.am	2005-08-10 17:28:34.000000000 +0200
-+++ valgrind-3.0.1/none/Makefile.am	2005-10-31 23:11:09.000000000 +0100
-@@ -3,5 +3,6 @@ include $(top_srcdir)/Makefile.tool.am
- val_PROGRAMS = vgtool_none.so
- 
- vgtool_none_so_SOURCES 	 = nl_main.c
-+vgtool_none_so_CFLAGS   = -fpic
- vgtool_none_so_LDFLAGS   = -shared
- 
diff --git a/dev-util/valgrind/valgrind-2.2.0-r2.ebuild b/dev-util/valgrind/valgrind-2.2.0-r2.ebuild
deleted file mode 100644
index 422d3158f3fb..000000000000
--- a/dev-util/valgrind/valgrind-2.2.0-r2.ebuild
+++ /dev/null
@@ -1,61 +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-r2.ebuild,v 1.3 2005/03/24 20:32:32 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 '>=virtual/os-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"
-
-	# To prevent clash with current macro in /usr/include/asm/current.h
-	epatch "${FILESDIR}/${P}-current-macro-clash.patch"
-
-	# make sure our CFLAGS are respected
-	einfo "Changing configure to respect CFLAGS"
-	sed -i -e 's:CFLAGS="":#CFLAGS="":' configure
-}
-
-src_compile() {
-	use ppc && cd "${WORKDIR}/${P}-ppc"
-
-	local myconf
-
-	filter-flags -fPIC -fstack-protector -fomit-frame-pointer
-
-	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
deleted file mode 100644
index 1c7619345252..000000000000
--- a/dev-util/valgrind/valgrind-2.4.0.ebuild
+++ /dev/null
@@ -1,54 +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.4.0.ebuild,v 1.7 2005/07/26 22:34:02 vapier 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://www.valgrind.org/downloads/${P}.tar.bz2 )
-	ppc? ( http://www.valgrind.org/downloads/pmk/${P}-ppc.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~ppc x86"
-IUSE="X"
-RESTRICT="strip"
-
-RDEPEND="X? ( virtual/x11 )"
-DEPEND="${RDEPEND}
-	sys-devel/autoconf"
-
-use ppc && \
-S=${WORKDIR}/${P}-ppc
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# make sure our CFLAGS are respected
-	einfo "Changing configure to respect CFLAGS"
-	sed -i -e 's:CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure
-
-	# Enables valgrind to build with PIE and disables PIE for 
-	# tests that fail to build with it
-	epatch "${FILESDIR}"/${P}-pie-fix.patch
-}
-
-src_compile() {
-	local myconf
-
-	filter-flags -fstack-protector -fomit-frame-pointer
-
-	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.4.1.ebuild b/dev-util/valgrind/valgrind-2.4.1.ebuild
deleted file mode 100644
index 7b768973a38a..000000000000
--- a/dev-util/valgrind/valgrind-2.4.1.ebuild
+++ /dev/null
@@ -1,61 +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.4.1.ebuild,v 1.1 2005/08/04 21:38:19 griffon26 Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="An open-source memory debugger for x86-GNU/Linux and ppc-GNU/Linux"
-HOMEPAGE="http://www.valgrind.org"
-SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~x86"
-IUSE="X"
-
-# bug #49147 (bogus stacktrace in gdb with --db-attach=yes) does not seem to be applicable anymore
-#RESTRICT="strip"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# make sure our CFLAGS are respected
-	einfo "Changing configure to respect CFLAGS"
-	sed -i -e 's:CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure
-
-	# Enables valgrind to build with PIE and disables PIE for 
-	# tests that fail to build with it
-	epatch "${FILESDIR}/valgrind-2.4.0-pie-fix.patch"
-
-	epatch "${FILESDIR}/${P}-dont-trample-cflags.patch"
-	epatch "${FILESDIR}/${P}-static-const.patch"
-}
-
-src_compile() {
-	local myconf
-
-	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression" 
-	#                       while compiling insn_sse.c in none/tests/x86
-	# -fstack-protector     ???
-	# -ggdb3                segmentation fault on startup
-	filter-flags -fomit-frame-pointer
-	#filter-flags -fstack-protector
-	replace-flags -ggdb3 -ggdb2
-
-	# Optionally build in X suppression files
-	use X && myconf="--with-x" || myconf="--with-x=no"
-
-	# Enable this, otherwise when built with PIE it exits at startup
-	# with: "executable range is outside acceptable range"
-	myconf="${myconf} --enable-pie"
-
-	econf ${myconf} || die "Configure failed!"
-	emake || die "Make 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-3.0.0.ebuild b/dev-util/valgrind/valgrind-3.0.0.ebuild
deleted file mode 100644
index e6dc92c4db8d..000000000000
--- a/dev-util/valgrind/valgrind-3.0.0.ebuild
+++ /dev/null
@@ -1,60 +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-3.0.0.ebuild,v 1.3 2005/08/04 22:31:25 herbs Exp $
-
-inherit eutils flag-o-matic
-
-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"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# make sure our CFLAGS are respected
-	einfo "Changing configure to respect CFLAGS"
-	sed -i -e 's:CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure
-
-	# Correct hard coded doc location
-	sed -i -e "s:doc/valgrind/:doc/${P}/:" docs/Makefile.in
-
-	# Disables PIE for tests that fail to build with it
-	epatch "${FILESDIR}/${P}-pie-fix.patch"
-}
-
-src_compile() {
-	local myconf
-
-	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
-	#                       while compiling insn_sse.c in none/tests/x86
-	# -fstack-protector     ???
-	# -ggdb3                segmentation fault on startup
-	filter-flags -fomit-frame-pointer
-	#filter-flags -fstack-protector
-	replace-flags -ggdb3 -ggdb2
-
-	# Optionally build in X suppression files
-	use X && myconf="--with-x" || myconf="--with-x=no"
-
-	# Enable this, otherwise when built with PIE it exits at startup
-	# with: "executable range is outside acceptable range"
-	myconf="${myconf} --enable-pie"
-
-	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.0.1-r1.ebuild b/dev-util/valgrind/valgrind-3.0.1-r1.ebuild
deleted file mode 100644
index 761afd25ce8b..000000000000
--- a/dev-util/valgrind/valgrind-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,64 +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-3.0.1-r1.ebuild,v 1.1 2005/11/06 14:55:28 griffon26 Exp $
-
-inherit eutils flag-o-matic
-
-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"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Gets rid of text relocations (bug #111233)
-	epatch "${FILESDIR}/${P}-pic-fix.patch"
-	aclocal
-	automake
-
-	# make sure our CFLAGS are respected
-	einfo "Changing configure to respect CFLAGS"
-	sed -i -e 's:CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure
-
-	# Correct hard coded doc location
-	sed -i -e "s:doc/valgrind/:doc/${P}/:" docs/Makefile.in
-
-	# http://bugs.kde.org/show_bug.cgi?id=112167
-	epatch "${FILESDIR}/${P}-mfence.patch"
-}
-
-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     ???
-	# -ggdb3                segmentation fault on startup
-	filter-flags -fomit-frame-pointer
-	filter-flags -fpie
-	#filter-flags -fstack-protector
-	replace-flags -ggdb3 -ggdb2
-
-	# Optionally build in X suppression files
-	use X && myconf="--with-x" || myconf="--with-x=no"
-
-	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.0.1.ebuild b/dev-util/valgrind/valgrind-3.0.1.ebuild
deleted file mode 100644
index 26904a9c1efc..000000000000
--- a/dev-util/valgrind/valgrind-3.0.1.ebuild
+++ /dev/null
@@ -1,56 +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-3.0.1.ebuild,v 1.1 2005/08/30 20:01:54 griffon26 Exp $
-
-inherit eutils flag-o-matic
-
-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"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# make sure our CFLAGS are respected
-	einfo "Changing configure to respect CFLAGS"
-	sed -i -e 's:CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure
-
-	# Correct hard coded doc location
-	sed -i -e "s:doc/valgrind/:doc/${P}/:" docs/Makefile.in
-}
-
-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     ???
-	# -ggdb3                segmentation fault on startup
-	filter-flags -fomit-frame-pointer
-	filter-flags -fpie
-	#filter-flags -fstack-protector
-	replace-flags -ggdb3 -ggdb2
-
-	# Optionally build in X suppression files
-	use X && myconf="--with-x" || myconf="--with-x=no"
-
-	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.1.0.ebuild b/dev-util/valgrind/valgrind-3.1.0.ebuild
deleted file mode 100644
index ea2ec2fb3469..000000000000
--- a/dev-util/valgrind/valgrind-3.1.0.ebuild
+++ /dev/null
@@ -1,68 +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.1.0.ebuild,v 1.3 2006/03/07 18:38:19 griffon26 Exp $
-
-inherit eutils flag-o-matic
-
-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"
-
-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
-
-	einfo "Regenerating autotools files..."
-	autoconf || die "autoconf failed"
-	automake || die "automake failed"
-
-	# fix for amd64 no-multilib profile till valgrind 3.2.0 is out (bug #114407)
-	use amd64 && (has_multilib_profile || epatch "${FILESDIR}/valgrind-3.1.0-amd64-nomultilib-fix.patch")
-}
-
-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
-
-	# Optionally build in X suppression files
-	use X && myconf="--with-x" || myconf="--with-x=no"
-
-	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*
-}
-