Add epatch_user and remove older unstable versions

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

5 files changed, 26 insertions, 237 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 42b2cba0a149..6173e68f1ee6 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/valgrind
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.179 2014/11/26 18:48:03 blueness Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.180 2015/02/24 18:06:33 blueness Exp $
+
+  24 Feb 2015; Anthony G. Basile <blueness@gentoo.org> -valgrind-3.10.0.ebuild,
+  -valgrind-3.8.1-r1.ebuild, valgrind-3.10.1.ebuild:
+  Add epatch_user and remove older unstable versions
 
   26 Nov 2014; Anthony G. Basile <blueness@gentoo.org> ChangeLog:
   Fix gpg signature
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 74faba91c531..fb4bb8220679 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -16,33 +16,30 @@ AUX valgrind-3.8.1-gcc-4.8-memmove.patch 1004 SHA256 38a2a3954dba93748d3e5877e90
 AUX valgrind-3.8.1-glibc-2.17.patch 1001 SHA256 7d7c770691de9a732bfa62bb64a348bd2429464e7ca22e8726bac6746ffd8dc3 SHA512 d5486fff61846744ea4986bcda409ffca66a3514c1e62eac8e32080990bf19694129c3e6005028dfdcd6c966b6732e861dd859974d3a73c1f04e375b68124f84 WHIRLPOOL 72e48daaae834bd0c78451ec857b51c13385db952dc9a356e5af4c7c3b0a9de5ebf1967b032aa918c73a2bb74799b788fda8a78173e9104f1533d4559812d676
 AUX valgrind-3.9.0-glibc-2.19.patch 1530 SHA256 5cb0b62569d6acf3bc30e168570effecfcccd8cd6d9d9f1ee201c99d74a960f6 SHA512 8f059c9cf61cab427538164fd11bc14d3be17d5f93a77b8ca33426c0bf2fee3b2d0797cd246ec50266cc5f6ebb602d877ab7eded0618836752fd14408a2d5a63 WHIRLPOOL 8556c35adb05b20f466ec6acc1ce4b8a4940cf29b576dc72623278a5eb35f269aa84edb1202bcf059daee1e0c2ff9f7a0828b8f1a0e31b12f6d30d24bf07da37
 AUX valgrind-3.9.0-non-exec-stack.patch 5843 SHA256 a47fb06d20270670e88c562662e16f0b1824c18fc3baa34aa739351044d294ce SHA512 1c052362bb35f66f904bffb851f342ef9313125fc0b43949b14baedeea41cc33bd96595508de7cb0ea6960abeb699233d7780e27753c80757f27f2ca979bf127 WHIRLPOOL fa0849ccc0a82c79b7ca50dc78dbba21d84873d5c29b895ecf0b8ab5afd93a4bb674e9416af98361af9185d869e79b31d9dfbcd3b41f3ea72d2bea367670dbbe
-DIST valgrind-3.10.0.tar.bz2 10898253 SHA256 03047f82dfc6985a4c7d9d2700e17bc05f5e1a0ca6ad902e5d6c81aeb720edc9 SHA512 c2d4b74ae6d1930a5c57e250229c5290212fbbc9cd8a624befe19d42766c1be9bb9a1597baf520587c489c0fdd50edca7480af670c6d5fbcf88d07fba0396f46 WHIRLPOOL 093ea60d739b357e3bf720bace349862a6d767d80e03a50e0f11b6ff4cc161de8edafbb1ba3824ee963cd3f0ea1e8ddcb7aa9d0a7c2bb66862cec90d7290e346
 DIST valgrind-3.10.1.tar.bz2 10967905 SHA256 fa253dc26ddb661b6269df58144eff607ea3f76a9bcfe574b0c7726e1dfcb997 SHA512 8f3d27637c13b06381b3dd44088244e0cf2f7008f40e46f34322f2a5bfa6373d29ce68ff49f19c48f1a5f139d8be5838b9606206e0ce2599c5f74c0db8ce2642 WHIRLPOOL 3d55f35b02195d9859d9192726ea708277f1d3339005d959baa224822c5b71f5347cdd28c7fd8153c10d1e3282855e853caf9c7192751bebdbbc3444c33d885a
 DIST valgrind-3.7.0.tar.bz2 6624216 SHA256 5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6 SHA512 0ccf6607fe6d26f0dc0f3d6e45f84645925d0a90ce4ecf6acfc6b4d374d3e909b2a628b03c0a964a45d2462cca6877f818a5f72b3e4a5bbf3a2d9b8a9a343d5f WHIRLPOOL 44bf8c423d6f3222f5e777333acc21e94dfa680509b2152289129961296d8afc090466b6407248b6e172b3c42da5448206f257bd63f8e44aba01007f92a6fde1
 DIST valgrind-3.8.1.tar.bz2 7962963 SHA256 473be00576bed311a662b277a2bfbe97d9cca4058e68619a0e420c9fc19958db SHA512 ba31f5d43bd2d9533846bed6456a0eae40ac071ff8732201dd75c9e2cd7e9ce3224cb5928b9c8fc859a75ce6867a9b6a1fb2ba8ab62cd3944893d6d4156ab25c WHIRLPOOL 81e63bb649455ed29fcd60fc7f3cebde456a610118b9b24530d3b2e8aa4a7561369e992af86ffb158e1f7fc0db7b91738564402931a947a79bb789bd26a8e065
 DIST valgrind-3.9.0.tar.bz2 10003156 SHA256 e6af71a06bc2534541b07743e1d58dc3caf744f38205ca3e5b5a0bdf372ed6f0 SHA512 4b748f9f9a647df50db75fb56f83ee2f25bad9f1f4e4f05c4ac1d1e919e6cd954975c1f325dbedb509c44be1a8516ac2a5f269090946a0d728166ab183016c7b WHIRLPOOL e73c4dcdff829a34889f5654c5ec314f32d2c33f9e64bde3f811359a252749a6c677db80bf2aa2647f935cd38a0ccc19c0358a7b13198032c5d636f97e9e71de
-EBUILD valgrind-3.10.0.ebuild 3407 SHA256 49e0bcf9ea3faeaf058e1a11442121d480e6a8436e3f1a6987671afa3a756c3d SHA512 b3e1a485807ee221ce36ce9998827d82a0d924358e44b2ab3c533a7795bd61c311823a5878aeb47f7ec83f190be6928541114ca76c7f9f1bc3d1731f18a8a189 WHIRLPOOL 083e025e203c2b8690981ad2996cf55de0fc695e70e12a92097ad79686d870dd5239b894cd27c8524e748bd52f8a0f5a3749511d37864b06ef9622bb5c366c02
-EBUILD valgrind-3.10.1.ebuild 3407 SHA256 eae87551f737f6a5caa6a6d2f311bc2c0af4ec16d7919bfc80a678227cae0067 SHA512 60d2b3e9affbe31101e432c1ff2f2d1a8c8782ed135cfb3f054735440b59ed77a9d991749cde3699b0e046a1502163f25f4846d2278c646fd36cd41cfe8a6bf3 WHIRLPOOL 69f1bd6088db684ac7a697e66f0e1dca1e10b6a6f522e138b99b2d8f2358459c037a018467c5def88c58436380b69d3c32496ced84c8c7efeacba195a3320ec8
+EBUILD valgrind-3.10.1.ebuild 3462 SHA256 f68cc3a7408cc4502f8aebdb9e0bd4f694b8b6c9c3e9d86ad1556694285461c4 SHA512 26ccfef0773d2732012faeebca0f202b03b61b40dccc65235de9a1f526be4ea473e8ded1d323fb8518803e797e241a3ef96cf19eb1f36041fdea480ebdb98a51 WHIRLPOOL ae1bd8a6f5aec1b10a754b8df9149feb57012709a1565231c7339beb8736e777bd07b7fba2d5d131aa78f5408f97dee22fe7016ff7318e515b4df3f76e685d6f
 EBUILD valgrind-3.7.0-r4.ebuild 3577 SHA256 f95fa83714c79d8c05f5c6f43b93ab91eb47c0a50e37faed055eab2cf5fd30ed SHA512 a4e2586606ab100d16cf3bad564aae5012796826a016c18fb85def0d8b72177ad8a4fa11bde322a8f8e9543f16ae874dc237d83c7efbb88db4a5676fb00d1364 WHIRLPOOL 16885e75e7383ee040ec825fa22bd68bf99fe8062d81e5ea008f84e573b0552d3514182c3c570b75cfa19313147de49e7557ba8d78687d875756b1c9c1251777
-EBUILD valgrind-3.8.1-r1.ebuild 3533 SHA256 6bc0e374e2e226a0767e2da9fff2f6563403642c7e293bd3f7ca59f1335cc951 SHA512 d70c3cfb871b628a5ade6f6e401f0a07fec4856a80ab42fe9367f55cc3754b4efb36273a339c96f44db3eae82be4b26c4a88392bebb257349465e2f2a424aff7 WHIRLPOOL 06e384fab7bc29959c887bdc241148531e3d465fd26985b0f438c39e6e4f28b8bd396e2f309e2e87c8c06e048ca7ca454f2ae050443510b5ff3b8d5be5e59080
 EBUILD valgrind-3.8.1.ebuild 3418 SHA256 9244f56a4e98ab7cc6738f98012aa30192535e4a0011e8b75eeadb6515da94e9 SHA512 5edfb5cd3fc18b6afe2476b753762ac806cb1968cac8ceb4d1a3552e046bd078aa9974f38bad61c24104b1997fb69197244d4404982f1cfbd815a284a82cf085 WHIRLPOOL d66919af12d551d1102a43ac1c9d5643304791a876e1f1bdb81bf4784640b0c7dffa2b6867e59aa6873a0736581ccc96bf7a962348cdd9358c23a615338a641b
 EBUILD valgrind-3.9.0.ebuild 3402 SHA256 27e1d9fbdfe4e1c29665f314fc370e55aec9973d8961bf7ac46b11c8ed7b4b36 SHA512 8dec3dcbaf96f48d1ab9720637de33ebaad944e6424e94c1215cb4470beacb7f62c909a6debc1f5c245d359a701a5e7597e5c1eb7b6e9a2dd38ba255a4d58b84 WHIRLPOOL 1414c2e457ceb831e6146c0477e70930ab5621564f79803a2a1236e8f7c19e0d8a358d3ddfc8d05eedd15f462c4fcbd78cb109d94183e57084e15eaec93f62f0
-MISC ChangeLog 30141 SHA256 6d5d06a9f843c6b502e162f2b435dc4ee52edfd5b2015a239306ed4bc5264fdb SHA512 832f363e4316cf14778b395b9736f10976456d17e7d43e5d982cb7567d651b54ddd0e66f153478c293113f1c923a19c6ea5e643e0f9832e6eb95519a2a7e2c44 WHIRLPOOL 751dbd147d8af2eec7d02029fa2b5ef8e6c32feccef898a18e6876f2d40b3da44390f2fc0e3243aa6fb43617dcbe0c069121b2655aecbe719cb3183671899cfc
+MISC ChangeLog 30328 SHA256 2da9f7abeeebf2386ee6252217c3d9bf53af8d42d2c92fedefc3b281aabc4574 SHA512 c483382f96b19bbaa46860966bf15190699ef40e8c94acc0b6d2a18550e9c108a6e4b548705beab06e25f6cb64cd88c796cd2cf972d841e9492ed73f8c2abd30 WHIRLPOOL 3b88b8cf5e6d22a69a29c20a8002d159fe9a8f26184b12e37a78c9ecf3375e1ed31374ca6b7131323fcac95bbf4c197ccf1a224f802688c3f80f0be1558ac8ad
 MISC metadata.xml 1013 SHA256 69a104cb454bfa145365c6eb7740c8331851c1b1cf9c507a3a787995e5a47aa6 SHA512 8ed29082b4adbdde40d277f465d7e2faa404b537c5bd7d7812ef9632648750763f66506596d392d090286f5681047a60541c483195e3756d8ec7725f66de3457 WHIRLPOOL 93c2f17dfeb55910707e3789e028dc75b5efe7786dd8c785432c8cf50044d4b3b97975ed57f6cc26e8a6a259b462a0ad2784707e0969f02ff9b3614b78fc0536
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUdiEQAAoJEJOE+m71LUu6lRMP/iHWsVk7uW6NhtdzPXjj1z2b
-8SHBvic7Z6ALg4TDEYeis/Z08SE+Hd0bXvw7UZPiNnV38vrjtK4L5aK7o+xJIiht
-NJ7eJADJG/WBjytcHKbKDFasHpYaPUuR2qJiEzTwBZZQFIiVeWTuW5BvJuyhirRe
-Bx1oqg1xdlorhBPZGLWdJOUlDmbP7HNtsRPKyWROT8FjEI2PL1LdGSNmjG1CB3dO
-kDCuo0ATBNlpUN58uvrvfRmtHyV7fCp//EGAuUSf6eynNx2SaO5LSemfvhOuGMyx
-lF4LSw16wdrDWqVnUqTLi8FDGefKQdsK13/SBHPzB2jPv9BByI9pr72cLpfzLMQ9
-Z+cRzwNTTm9tC16S1T2usdZOiWlgn+Jx0Tore7egeV2uC8jTIrHRQQkN2hOd16AS
-Q/d0gSyyPxslq+boGFRz/MZzAyhq3Lj2GpXn7Kig76LIWamPRp2vfwgzbL8aGnVn
-bThcpq1OxCQgY0TpA04QZM7Ua3d7EkXAG9x9vRbk+ceT7p0TBdi7ZnLnavhi9BQz
-7L3IwRzCUYzP4A40RzozlpLloDEWyYBl4eHxGAIRpjRKoDFClBaP5GzHzxUndGZq
-5K3zybPC87uN2F6ltPZIVIieZJ3m84YxsCd586qzhZNbnwnsGVIxKMtbRmSFAI9F
-NCq+kUWrkuxGb5N9qHI/
-=46NK
+iQIcBAEBCAAGBQJU7L4ZAAoJEJOE+m71LUu6gKMP+gImTDqQyJkG/IsEX9DFr6IN
+xC+awhatX+XzXSdo1Y4FHW+m81cr/c3Ig0EhblcMI9Gogc3RlhiKInnxOBWv+Aho
+0D74a5wGY/LVIfd0UEyZCkLEIj5i2xT1EtRvjRtUli9Si0zcFU+quXvZkfviG1bM
+sHtbxM5dM8beI/wNSFdyLt+JcQzzhG0zjC2kzXQM5iPFfsiJsrNdWWF03Pvz0EBm
+a7IL5/6ESCwD3Oizt7bjQMVpYRiIFtlE+vWcqzo7DVQGC0OYvoYVySVkdeK5eEJo
+BzCpnNaO4uq+ne63MhZplM10UpdhZsHTrGFJH5Ze52uQ62aSeGDuYJ2axmAXo3Pw
+Biz4/hTOuii6q9girG+0d5nXx/ns8cGAVDdtyufIe13czkUopty8D2rFwOntYv5p
+F4tt3BhTQn2gFuGcO3XEqibMxVV7zsKMaFgba5aG+yxbOFzMjMZY5BJow/Yrvc4T
+m2sot+uIg6yXXi1qxT/M2rMOK+Asim43wCRf65BluIFfkRWUqZpyhOax8WCqlaNa
+0Tt2t41gGQjGxXno/0Ee59QRS4kaSlageYNxv0pDeEAZjYJ4jDRpd0kMR3PPPGMv
+r9m4bvn4gbfYCi4Uq2NzKI/otJ4aR09sPY4+QDf+TSIvxdPsTJyGKcgMe3Vu7x+U
+kwVIWzUFbxXm6o0OERR7
+=CAMo
 -----END PGP SIGNATURE-----
diff --git a/dev-util/valgrind/valgrind-3.10.0.ebuild b/dev-util/valgrind/valgrind-3.10.0.ebuild
deleted file mode 100644
index c33bf1c03371..000000000000
--- a/dev-util/valgrind/valgrind-3.10.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.10.0.ebuild,v 1.1 2014/09/13 00:57:21 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 ~x64-macos ~x86-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.10.0-non-exec-stack.patch
-
-	# glibc 2.19 fix
-	epatch "${FILESDIR}"/${PN}-3.9.0-glibc-2.19.patch
-
-	# Regenerate autotools files
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# Respect ar, bug #468114
-	tc-export AR
-
-	# -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() {
-	elog "Valgrind will not work if glibc does not have debug symbols."
-	elog "To fix this you can add splitdebug to FEATURES in make.conf"
-	elog "and remerge glibc.  See:"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
-}
diff --git a/dev-util/valgrind/valgrind-3.10.1.ebuild b/dev-util/valgrind/valgrind-3.10.1.ebuild
index a133ed875bff..998a135d1720 100644
--- a/dev-util/valgrind/valgrind-3.10.1.ebuild
+++ b/dev-util/valgrind/valgrind-3.10.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.10.1.ebuild,v 1.1 2014/11/26 18:43:34 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.10.1.ebuild,v 1.2 2015/02/24 18:06:33 blueness Exp $
 
 EAPI="4"
 inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
@@ -40,6 +40,9 @@ src_prepare() {
 	# glibc 2.19 fix
 	epatch "${FILESDIR}"/${PN}-3.9.0-glibc-2.19.patch
 
+	# Allow users to test their own patches
+	epatch_user
+
 	# Regenerate autotools files
 	eautoreconf
 }
diff --git a/dev-util/valgrind/valgrind-3.8.1-r1.ebuild b/dev-util/valgrind/valgrind-3.8.1-r1.ebuild
deleted file mode 100644
index 51c75ebc0157..000000000000
--- a/dev-util/valgrind/valgrind-3.8.1-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.8.1-r1.ebuild,v 1.1 2013/06/18 20:56:20 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 ~x64-macos ~x86-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
-
-	# Fix for glibc 2.18, bug #458326
-	epatch "${FILESDIR}"/${PN}-3.8.1-glibc-2.17.patch
-
-	# Fix unwrapped memmove with gcc-4.8, bug #466488
-	epatch "${FILESDIR}"/${PN}-3.8.1-gcc-4.8-memmove.patch
-
-	# Regenerate autotools files
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# Respect ar, bug #468114
-	tc-export AR
-
-	# -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() {
-	elog "Valgrind will not work if glibc does not have debug symbols."
-	elog "To fix this you can add splitdebug to FEATURES in make.conf"
-	elog "and remerge glibc.  See:"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
-}