Version bump

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

4 files changed, 256 insertions, 5 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 04d4e33105a3..fb52c4b43e98 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.150 2012/07/25 16:33:18 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.151 2012/08/18 08:47:52 blueness Exp $
+
+*valgrind-3.8.0 (18 Aug 2012)
+
+  18 Aug 2012; Anthony G. Basile <blueness@gentoo.org> +valgrind-3.8.0.ebuild,
+  +files/valgrind-3.8.0-non-exec-stack.patch:
+  Version bump
 
   25 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
   -valgrind-3.7.0-r1.ebuild, -valgrind-3.7.0-r2.ebuild:
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 6ea9fc6a1c92..f42547e6992e 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -31,11 +31,13 @@ AUX valgrind-3.7.0-glibc-2.15.patch 1003 SHA256 84606d7cdb475ba3ad46da4d26094e20
 AUX valgrind-3.7.0-non-exec-stack-v2.patch 5831 SHA256 fa9962c02a5b1396c30631b053920606f6628916569ac696bdf8c1f9bef78deb SHA512 b0e7f6a97403eed5cf5206b562ddd31a898558d2011618cedcfd8c5c9171f479ce44ea389caa0e94d707fbba1078f53d53259fcb6c080ea226677892223e2afc WHIRLPOOL 95e1f55770a05671ab452203f02315f792affcddc797c65562b302b90bb7e3168df62dc7748769158eff655e32a958b7964eeed15c44e5626f98ae98ed74c590
 AUX valgrind-3.7.0-non-exec-stack.patch 5644 SHA256 4de10480b6e27379083203df3cfedccdace68d0aad611440478ca2f1b2f89751 SHA512 6c910a6816f35d72100ab5913750cc14a02013c29d4a5f7c90040329510622697fbf5e99f311aad7269745ac0713da0c29cc6e4b840a729c86d1d7bd80e49216 WHIRLPOOL edbf395de5505ca1cb364a595975ab642f59ffd52ae7a5fa0652b52e74176e7578ddf53e20c84f78433af792f7be7247d9bdd82694eb7bf0f06328614d1f2d61
 AUX valgrind-3.7.0-respect-flags.patch 360 SHA256 6b1e5938ecafc29428a698296423c71924848b1e746d6ee8a0f1dd91141f1019 SHA512 efdb017283b6a5829d1a5acc31b42ddd177a3ab468eb062b8c4fd90b2dbd06679e8d8bc2d6f813e3001efdda831d4410cc8da3a3e42ee2e49efea0423e4b3ca3 WHIRLPOOL 5bff165cf8f6042905a4d682b0114ee41301de173d43412b16208a08a351fe8ca74a527e4d09f9649dca28cbb61dd8ea2392e10e2b8d7b8ea0e51318915f9565
+AUX valgrind-3.8.0-non-exec-stack.patch 5777 SHA256 05e91425416ca9faaf322bb11fd5ed3ff5e57410db17d0da01aa1c922161d670 SHA512 b9dee7a6fa38ac7f9d21489b2ff46b6d3602ac8b2e1f0504ee4adc5ae3184933098deb039725c891471ea33a44659814266f2e840dc948106a9deee79a403927 WHIRLPOOL 64a62ea23a7017d358c73625f276cc59c5eb51cb96367254f64dcdc65a351551f8bd8f8f1c75bb4896b47e401d7163df5fc3af7e6b75b8cdd450795b99b9a3ae
 DIST valgrind-3.4.0.tar.bz2 5175209 SHA256 d5ea4ae5b1ef9fca677a38959060a9acb70b38540721c8bf5c73d09a265f9f74 SHA512 738ebd6a119857a3fa4f8fd52f8dd933f92b9675af686ded08e91c327f5785b51cb1d3038a041ff36b7a896d02b889b2f50f3257c14e82e350a394b93dee1122 WHIRLPOOL 613dbfd53e1a03f5ce668c99c1035de778958e847bc0c38162e030e022f2b1a7131fff0757322f9bcc2d66144536e1828bf472c2bab01a654798ca3d8bdb4466
 DIST valgrind-3.4.1.tar.bz2 5183739 SHA256 669ee7aab8a3a905520159b6d7be35d3911e1a4d7a67d90dc1c12c00693184a9 SHA512 0ae002aca7e4ca829d067d48d2e6b8b5b69517c3636feea5ef30abf6324d077af137b1eba99f58bdfdf33986d372f9e99093070c755bee013c9885ed74b69538 WHIRLPOOL fca7da8050f1ba6c2cb33e25526e8d9b3f2b7359348f25ad9fb5725eda6709a222afc648592ebd3093511c5277c04a795a4b509ac336cb0b12b1bae2049e5d5a
 DIST valgrind-3.5.0.tar.bz2 5482423 SHA256 743a5132bbebc247169aefae6e17657677fdf0961aba1668dd4ee7028d27ba80 SHA512 fd2db7f422e3f52da0a672d895c5f3f2afd84b73d644b54ab67e6e96dcf024997ef6afec67f633dbd897e04b6b28b83f12d60fcea0ca999721e09a7dc88cc59b WHIRLPOOL 45fcac739b4f7678e37d2c5cebbd22a90ceed667fd7814fe895e68a3b8aa30bc7699c0858194dfaee9029f132f3d4973b0f243a20d6cc635ce36a8947f4f3cb2
 DIST valgrind-3.6.1.tar.bz2 5974836 SHA256 49bdcc4fbcf060049b5f0dcfd8a187a6e90e0b0e57309f633b64e44430726a0e SHA512 fef0d379b525ffef10783c0de6b37a4923f9627991dbf75973e88e9810b68cba095a25bf842c2f70b1e734c1b221418a2f3d4937e0c12b6fa6b4f7984a0dc2d9 WHIRLPOOL d19cd265b438a4b66fa7a313d13983f0c935c3e67733a2fcb3d9582a15efcdbd22c88a11da6443a005f8c5da3b68e05f991e287ae54f0961b28708b2cad0244c
 DIST valgrind-3.7.0.tar.bz2 6624216 SHA256 5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6 SHA512 0ccf6607fe6d26f0dc0f3d6e45f84645925d0a90ce4ecf6acfc6b4d374d3e909b2a628b03c0a964a45d2462cca6877f818a5f72b3e4a5bbf3a2d9b8a9a343d5f WHIRLPOOL 44bf8c423d6f3222f5e777333acc21e94dfa680509b2152289129961296d8afc090466b6407248b6e172b3c42da5448206f257bd63f8e44aba01007f92a6fde1
+DIST valgrind-3.8.0.tar.bz2 7961355 SHA256 fd16585f209712642ab6baa2b5c57ec1b879ab2ac4653828d82bb7f86ba7208c SHA512 83a293f1cd71305ab94b2b7dd4929b813b419dab0c0c701c0bb65ae9c7b2571c5fabebbf399365cbb9aaf7e527fb0d68dafcf054c4085324c1c059c85454ce28 WHIRLPOOL ad8a5c1d3d9b8b26233d40d94089e3a3b8ecd5e847475462f6493b96c889b26cb3faff41109b166c5c58373fad11bc2087035c1895863384ef39cfdd25e6a17b
 EBUILD valgrind-3.4.0.ebuild 3253 SHA256 01a050bd1e70effd60917a160699cdbb13fbb12fbd9de615dc15f66eb30eeedb SHA512 8eeb83e905ab8fb026b9812927cddd355924ab2a31ea1bd7b12771e243cb5352c47dedfb48647771804028a7f1d1cac408f0f64ee8f7b8062052fb60c51b5f12 WHIRLPOOL f96746ff807dade9f87024d4ae7d8118710fa02150d6211f8a7f7fc6ed2485cafa0365e8777fc7ca31635922b8920cac8441890e7a491e47f0232d2601b2bfd2
 EBUILD valgrind-3.4.1.ebuild 3045 SHA256 2328ac4b35638cb60fca89e69580988b01a97367afb37cd1e9e0ebd26fd187f8 SHA512 7b82554ab2f0e2d82a5fe12dc68b645bf80037664f5b097e1696fa2e8aec970f99364eda57c5c4bc10e79892f19f5a83eb274df0fff99fdd6ce95c4db11f8062 WHIRLPOOL 89cef2300e52c40f7b696dd78ec3dc33b123c72312823edeeededc9d4d4447ea725669d10f841c907e0638f8c820b5c6cdcaaab53df798a902e041eb3ac357fa
 EBUILD valgrind-3.5.0.ebuild 3627 SHA256 1db71e2cab4f9dc0b4939446ccf8bd71e666ce500b301d0cb2e1e6922cee6cbc SHA512 46d43b2269047a32ceef04737f9dbff36f5d6ab88b18918b754f2d574547688f4f65a449a8d260251d326d83df7a32c80c3dd56d2f651f745e14863c9ef75554 WHIRLPOOL d596e27a2846b8e38220051ca08ecc6a7f69210e6f59ec5410f3405c2dc15e3e0fdefd5510bdb44dcf5791cf86f42207fa87c92e3b65458f95018c322329ac11
@@ -45,12 +47,13 @@ EBUILD valgrind-3.6.1-r4.ebuild 3659 SHA256 419f1c392fa00e671cf31da769ee1a6faaa3
 EBUILD valgrind-3.6.1.ebuild 3069 SHA256 07fe76823949dd99b65a24d927c7d9a1122bd2feff3963bac9c8d2e9b9f56a93 SHA512 ba69c69956a94f44cf190c1174582ca799001aa81a7c0c6579f0fb849c03b6a219bdf969ef9bf6cef6a67cfdf87b967db71f5c57054eb6eea71bd293b15aecba WHIRLPOOL 012febb701d15ea06afc8754cc9bec907288d2fbacee46dc1f25b7a61746f0e56c4c1d946828be60aba5bb4cff48811407a2aaa72fea625d7c80d5dbcbf5b2ac
 EBUILD valgrind-3.7.0-r3.ebuild 2989 SHA256 4c2182e3be2ed51c459c657489eb2c7d7ca55c1ab514b6b183b2d66e67de18e7 SHA512 d66a1d3395532bb800c2f2f1c613640fa3984a0ae590278ccf0a9fbd7521fd6a57993adb8cd3fb2fa2692fc96f2486dc807b923c2da3381a24423bd96f0c5de9 WHIRLPOOL dfd913610f59b18072336220adc0934684d3b558a1b9cc50cba037fb76b400613634070597e59ef3befec22d8f70383f4173caf0b5b1a58b12e889b7ed01e6dd
 EBUILD valgrind-3.7.0-r4.ebuild 3591 SHA256 7947fe0265a77601e6e964bd15208ef01fc25e0ad5a59860688b7c2e816c0343 SHA512 73c5abafbd5b3e92718f3bb0035c6d3f34f12584493b1d3dfdfafe6005e0565b09707e895427aa934af9b814341affbaa9731d2e0cc936cba9207d408ee29579 WHIRLPOOL 543247ce94d43ba5e77fdc73bd840eb7dd0fa89d7a61ddbcf6de9db08c852c1a1526c9df03cd5b83a0298f57a98a42d86b92b860cdcc6d54cda9ee091b5595f3
-MISC ChangeLog 25179 SHA256 43b93b6a1c248723b8d71a0de29ff9148ba0701ef997e44f2f41da9ec6373e25 SHA512 77c488318b41c5cad9f596f3a0fa1119e4a804341cf023fd74af73e03cdb98f3a1c10910c03b0fa303d8d8a55cee318f0885f828879416fa9a00d33a6d8eeed9 WHIRLPOOL 03d22df11db2a0b2a85e6a751d6ad5d273c09a07266358a03b65104dd8b18ba51df5b45f69e4e9b0c0a1ca6db6e56a0648d170bc248f004390adb50060ef6854
+EBUILD valgrind-3.8.0.ebuild 3299 SHA256 7b9e8c6a61690019e203443736cdbfc90664006af63a4eec44203fcab247ff26 SHA512 1df4359d57dc74983f5acf2589ea7a53fcc67946f566856b00b8fbb00c83759440a49ebcf67858a8ee6089242499b1186375cfacf83b99e0bc40073f133cf414 WHIRLPOOL 738da3f120229bbad37cbf3fdc5e11729a94f9e6986eb53b825ce1cd90737534159d5d0486c652834fbf873e316303875f93525b4f89ff29764852ff7e068757
+MISC ChangeLog 25351 SHA256 054537eeb07b65e14b90f54917bbf9be30199fd62c269deeeed58e36472433b0 SHA512 050724418bc39bd9995206bb554b998943ab3a3910d2bea1afb99e1494f4571a9c6151a86ba3fa01c41ea358c7f5955b7a8e8128710f9a18c43e3b9c0b9606df WHIRLPOOL ca2c2cb608b32783d3e0825718d34db6aa0cb134748cac2695a7b64cb17230a258d6a3ceb318c3b9bfe373e5e998d1097de262762b700a5eb4548d9671773007
 MISC metadata.xml 1013 SHA256 69a104cb454bfa145365c6eb7740c8331851c1b1cf9c507a3a787995e5a47aa6 SHA512 8ed29082b4adbdde40d277f465d7e2faa404b537c5bd7d7812ef9632648750763f66506596d392d090286f5681047a60541c483195e3756d8ec7725f66de3457 WHIRLPOOL 93c2f17dfeb55910707e3789e028dc75b5efe7786dd8c785432c8cf50044d4b3b97975ed57f6cc26e8a6a259b462a0ad2784707e0969f02ff9b3614b78fc0536
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAQH9kACgkQl5yvQNBFVTX/XACgjYD8Fh5Ogs9FQUfEicLFsgOV
-CNgAn2ProIW4E79fdC1soTqI+W77LjSU
-=EBFe
+iEYEAREIAAYFAlAvVrQACgkQl5yvQNBFVTXzwgCgkAyJ95M6P5aLEAfsYS7KSD62
+XUwAn0tOXRrNdylaGdZ0pcYXrjxdkHYP
+=xY6k
 -----END PGP SIGNATURE-----
diff --git a/dev-util/valgrind/files/valgrind-3.8.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.8.0-non-exec-stack.patch
new file mode 100644
index 000000000000..66c97764d31b
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.8.0-non-exec-stack.patch
@@ -0,0 +1,142 @@
+diff -Naur valgrind-3.8.0.orig//coregrind/Makefile.am valgrind-3.8.0/coregrind/Makefile.am
+--- valgrind-3.8.0.orig//coregrind/Makefile.am	2012-08-05 03:47:20.000000000 -0400
++++ valgrind-3.8.0/coregrind/Makefile.am	2012-08-18 04:14:35.000000000 -0400
+@@ -297,15 +297,6 @@
+ 	m_demangle/demangle.c \
+ 	m_demangle/dyn-string.c \
+ 	m_demangle/safe-ctype.c \
+-	m_dispatch/dispatch-x86-linux.S \
+-	m_dispatch/dispatch-amd64-linux.S \
+-	m_dispatch/dispatch-ppc32-linux.S \
+-	m_dispatch/dispatch-ppc64-linux.S \
+-	m_dispatch/dispatch-arm-linux.S \
+-	m_dispatch/dispatch-s390x-linux.S \
+-	m_dispatch/dispatch-mips32-linux.S \
+-	m_dispatch/dispatch-x86-darwin.S \
+-	m_dispatch/dispatch-amd64-darwin.S \
+ 	m_gdbserver/inferiors.c \
+ 	m_gdbserver/m_gdbserver.c \
+ 	m_gdbserver/regcache.c \
+@@ -327,8 +318,6 @@
+ 	m_initimg/initimg-pathscan.c \
+ 	m_mach/mach_basics.c \
+ 	m_mach/mach_msg.c \
+-	m_mach/mach_traps-x86-darwin.S \
+-	m_mach/mach_traps-amd64-darwin.S \
+ 	m_replacemalloc/replacemalloc_core.c \
+ 	m_scheduler/scheduler.c \
+ 	m_scheduler/sema.c \
+@@ -343,15 +332,6 @@
+ 	m_sigframe/sigframe-mips32-linux.c \
+ 	m_sigframe/sigframe-x86-darwin.c \
+ 	m_sigframe/sigframe-amd64-darwin.c \
+-	m_syswrap/syscall-x86-linux.S \
+-	m_syswrap/syscall-amd64-linux.S \
+-	m_syswrap/syscall-ppc32-linux.S \
+-	m_syswrap/syscall-ppc64-linux.S \
+-	m_syswrap/syscall-arm-linux.S \
+-	m_syswrap/syscall-s390x-linux.S \
+-	m_syswrap/syscall-mips32-linux.S \
+-	m_syswrap/syscall-x86-darwin.S \
+-	m_syswrap/syscall-amd64-darwin.S \
+ 	m_syswrap/syswrap-main.c \
+ 	m_syswrap/syswrap-generic.c \
+ 	m_syswrap/syswrap-linux.c \
+@@ -371,6 +351,29 @@
+ 	m_ume/main.c \
+ 	m_ume/script.c
+ 
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \
++	m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S
++
++if VGCONF_HAVE_PLATFORM_SEC
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \
++	m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S
++endif
++
++if VGCONF_OS_IS_DARWIN
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-darwin.S \
++	m_syswrap/syscall-@VGCONF_ARCH_PRI@-darwin.S \
++	m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S
++if VGCONF_HAVE_PLATFORM_SEC
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-darwin.S \
++	m_syswrap/syscall-@VGCONF_ARCH_SEC@-darwin.S \
++	m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
++endif
++endif
++
+ libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+     $(COREGRIND_SOURCES_COMMON)
+ nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+diff -Naur valgrind-3.8.0.orig//coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.8.0/coregrind/m_dispatch/dispatch-amd64-linux.S
+--- valgrind-3.8.0.orig//coregrind/m_dispatch/dispatch-amd64-linux.S	2012-08-05 12:04:11.000000000 -0400
++++ valgrind-3.8.0/coregrind/m_dispatch/dispatch-amd64-linux.S	2012-08-18 04:15:57.000000000 -0400
+@@ -249,11 +249,11 @@
+ 
+ .size VG_(disp_run_translations), .-VG_(disp_run_translations)
+ 
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.8.0.orig//coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.8.0/coregrind/m_dispatch/dispatch-x86-linux.S
+--- valgrind-3.8.0.orig//coregrind/m_dispatch/dispatch-x86-linux.S	2012-08-05 12:04:11.000000000 -0400
++++ valgrind-3.8.0/coregrind/m_dispatch/dispatch-x86-linux.S	2012-08-18 04:16:44.000000000 -0400
+@@ -240,11 +240,11 @@
+ 
+ .size VG_(disp_run_translations), .-VG_(disp_run_translations)
+ 
++#endif // defined(VGP_x86_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_x86_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.8.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.8.0/coregrind/m_syswrap/syscall-amd64-linux.S
+--- valgrind-3.8.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S	2012-08-05 12:04:11.000000000 -0400
++++ valgrind-3.8.0/coregrind/m_syswrap/syscall-amd64-linux.S	2012-08-18 04:17:21.000000000 -0400
+@@ -205,11 +205,11 @@
+ ML_(blksys_finished):	.quad 5b
+ .previous
+ 
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.8.0.orig//coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.8.0/coregrind/m_syswrap/syscall-x86-linux.S
+--- valgrind-3.8.0.orig//coregrind/m_syswrap/syscall-x86-linux.S	2012-08-05 12:04:11.000000000 -0400
++++ valgrind-3.8.0/coregrind/m_syswrap/syscall-x86-linux.S	2012-08-18 04:17:59.000000000 -0400
+@@ -165,11 +165,11 @@
+ ML_(blksys_finished):	.long 5b
+ .previous
+ 	
++#endif // defined(VGP_x86_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_x86_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
diff --git a/dev-util/valgrind/valgrind-3.8.0.ebuild b/dev-util/valgrind/valgrind-3.8.0.ebuild
new file mode 100644
index 000000000000..a65b15b40b62
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.8.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.8.0.ebuild,v 1.1 2012/08/18 08:47:52 blueness Exp $
+
+EAPI="4"
+inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
+
+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 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-macos"
+IUSE="mpi"
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Correct hard coded doc location
+	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
+
+	# Don't force multiarch stuff on OSX, bug #306467
+	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
+
+	# Respect CFLAGS, LDFLAGS
+	epatch "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
+
+	# Changing Makefile.all.am to disable SSP
+	epatch "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.patch
+
+	# Yet more local labels, this time for ppc32 & ppc64
+	epatch "${FILESDIR}"/${PN}-3.6.0-local-labels.patch
+
+	# Don't build in empty assembly files for other platforms or we'll get a QA
+	# warning about executable stacks.
+	epatch "${FILESDIR}"/${PN}-3.8.0-non-exec-stack.patch
+
+	# Regenerate autotools files
+	eautoreconf
+}
+
+src_configure() {
+	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)
+	# -m64 -mx32			for multilib-portage, bug #398825
+	# -ggdb3                segmentation fault on startup
+	filter-flags -fomit-frame-pointer
+	filter-flags -fpie
+	filter-flags -fstack-protector
+	filter-flags -m64 -mx32
+	replace-flags -ggdb3 -ggdb2
+
+	if use amd64 || use ppc64; then
+		! has_multilib_profile && myconf="${myconf} --enable-only64bit"
+	fi
+
+	# Force bitness on darwin, bug #306467
+	use x86-macos && myconf="${myconf} --enable-only32bit"
+	use x64-macos && myconf="${myconf} --enable-only64bit"
+
+	# Don't use mpicc unless the user asked for it (bug #258832)
+	if ! use mpi; then
+		myconf="${myconf} --without-mpicc"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS FAQ.txt NEWS README*
+
+	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_names on shared libraries, can't turn them into bundles,
+		# as dyld won't load them any more then, bug #306467
+		local l
+		for l in "${ED}"/usr/lib/valgrind/*.so ; do
+			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
+		done
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Valgrind will not work if glibc does not have debug symbols."
+	ewarn "To fix this you can add splitdebug to FEATURES in make.conf"
+	ewarn "and remerge glibc.  See:"
+	ewarn "https://bugs.gentoo.org/show_bug.cgi?id=214065"
+	ewarn "https://bugs.gentoo.org/show_bug.cgi?id=274771"
+	ewarn "https://bugs.gentoo.org/show_bug.cgi?id=388703"
+}