gentoo auto-resync : 29:04:2023 - 05:14:04

12 files changed, 144 insertions, 15 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index de2fee3a248c..0d14fa364a9a 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 45a88971a92f..cf0cd569c635 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,3 +1,3 @@
-DIST idea-community-2023.1.tar.gz 936649014 BLAKE2B 396f669f9fb382214db9ac8a6668cb72f163895351a188a654fb23e88c460af4655026f1e78806eb277592e4c473eeb1fadd594dacc4c66cfa61d157ab39e10a SHA512 fa7c202f279f85480a7245b90d1b4aae0cfc6c8e8b08a127ebdaf8c55d3bd4bba590a0017b8980d0c3b6d3bc1b79450ad8798fc69e2938b6c308ab5ef48b5e0d
-EBUILD idea-community-2023.1.ebuild 3766 BLAKE2B d4a43b83baf191a3f0af1c4243f4e1bf5622f70a29a3b5067fe72cb96951ace41c51a663990a83dbe0e24c81ea80dfd4391e3f02147bee7e28bc7b8ea4fa5c95 SHA512 c0b580893d06ee5063851845f16e43ea1d862fb835058602142d581100dda3a70e58acac00c523489f200df40b75ed1ab0cf68bbc1fa207582b817556d6acc59
+DIST idea-community-2023.1.1.tar.gz 937975661 BLAKE2B ca902c719e98b7c3b7777ca236ca1737f02ac9f856f02fe27f94600e7a2f40ca62bf7a9bb2788ec1a9558b9034a8a86771cad7eb55137e1fce18c5b1a690d719 SHA512 489f0d70a8f96a2c943a61c456a7ca47ae111c82696e4ac0144ca78fcea302c682b2ca4a2d0fa2d0f679c8aae5365984b699f9614e74728a37ba60068f6cd241
+EBUILD idea-community-2023.1.1.ebuild 3766 BLAKE2B d4a43b83baf191a3f0af1c4243f4e1bf5622f70a29a3b5067fe72cb96951ace41c51a663990a83dbe0e24c81ea80dfd4391e3f02147bee7e28bc7b8ea4fa5c95 SHA512 c0b580893d06ee5063851845f16e43ea1d862fb835058602142d581100dda3a70e58acac00c523489f200df40b75ed1ab0cf68bbc1fa207582b817556d6acc59
 MISC metadata.xml 454 BLAKE2B 297cfd8c543bf216cd45b66b5284f310659422e91f12af3d0bbe2ff689d94c96988d4c125c75a95526135b2c0f54a004ee43e1c1c4dfe4d1d68e86af5f75ab0d SHA512 5ca382bcbc51ea5400cbaeb067bccfcb4a245e208a2769d800cbd80fc7151310f895d410e5828c9a32223ab93345716ba4a2ebce521092631a4b7c0858519ef2
diff --git a/dev-util/idea-community/idea-community-2023.1.ebuild b/dev-util/idea-community/idea-community-2023.1.1.ebuild
index 0a1132b3b38a..0a1132b3b38a 100644
--- a/dev-util/idea-community/idea-community-2023.1.ebuild
+++ b/dev-util/idea-community/idea-community-2023.1.1.ebuild
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 8cbda2cdc668..e7468b40b1a7 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,5 @@
 DIST kdev-php-22.12.3.tar.xz 1086004 BLAKE2B 30a4a1f96943d93b405def16863d11ae46eb74c2c6a42aedbe76afa6c8b7e5c35ac3a335835cc10f495614486907d2e2fbc88b61dfd8809e7959758d6c1ab2d0 SHA512 a8fb926627df83fbb9b292a805636cf0ab237ef6b13be25d2dfe751e4c18e3730a36ed22a23fd7d9d8a5d8d6763c61e8535a088ec845b100d09c77388a7bce1e
 DIST kdev-php-23.04.0.tar.xz 1086172 BLAKE2B 1ffe30d1eb12564f22cebe332e4d94af96b6729282a76c46b4c8a32ffa1393be7007a90a90fe9fe9f066a2bb8b89cee1e0ad455223ab65627143a8c28f557141 SHA512 fe49be01a9813fc2a1fb263fd460255cc821ee24e59724a59f534786f92c3c2b1b4413331eadfa9ad5685fe0f453b97cba082cf6451cbf3637d00cebf15051cd
 EBUILD kdevelop-php-22.12.3.ebuild 1228 BLAKE2B c6391b442a7c8024f923a46913440bc9cdef4fa69dce3200b504bca5de8eeb883223500d34f050728f46df0de735351f0f4a95f925d802424791ed2ed5ba2035 SHA512 f6692b5d4d616aab505c12684ccd86f69c5eb2e0df4dcbc1b82d161c6074cb1aa8897adf2d1419b36e0bbe0434bcb85fbc0aaf7fff198f69d7af0e5536c75a9c
-EBUILD kdevelop-php-23.04.0.ebuild 1230 BLAKE2B 8e233e0d896f123d92c55676e9870b1dfbb76d5314d83495b9998dc4eb68b6677e948ab03029fb833a2f56dc406495f0cffb8ed0b18d65e6cb38fbeca8128630 SHA512 907ab3dae590f10d6982646bac4957ead106fa74aeac67840be8caea9ba11fdb7ff8006fc8b6bdddb855f7c1243a6fb60002c358f9228fdaff32c8b3f1db5cf6
+EBUILD kdevelop-php-23.04.0.ebuild 1229 BLAKE2B 7f348b106b4c6566b82be012deda7bdca219640ce2cfb3c9af1fe1b36bf8fac3a3ab68bb75cc944dbba3f868ba86db3dff151a3ad83abdfe66147af8c5af7d18 SHA512 b38bb867f8fd88f41bf05b6716b77ac12ed4ef63c24ebcb940b1ec10850439f63e8b86ca971db416ce76975192e1387671c5cc28e0449c7266b3d1bc82478864
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-php/kdevelop-php-23.04.0.ebuild b/dev-util/kdevelop-php/kdevelop-php-23.04.0.ebuild
index 33d90507f1b8..6ecd788af5d0 100644
--- a/dev-util/kdevelop-php/kdevelop-php-23.04.0.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-23.04.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://www.kdevelop.org/"
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
 IUSE=""
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 arm64 ~x86"
 
 # remaining tests fail for some, bug 668530
 RESTRICT="test"
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 00fcb434a389..34ef8d04855a 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,5 @@
 DIST kdev-python-22.12.3.tar.xz 1095932 BLAKE2B d83d908928ad79f1bb2fd2ce7ff4f61b0fe12aa9a1345a486290ca15a9d8fae83680de3139874c12561e4bf90404ce640869d17e22efe11d31a531803d47ef36 SHA512 443618b9cd0ac1fcefecec1420a8a4a4de7c4e337031e6da3b258a286bb195e1bd548828155b0847b491b6310939080cd858987c44c0d4c5a87d6cf02ca10c6e
 DIST kdev-python-23.04.0.tar.xz 1096352 BLAKE2B dc6d9c8247e1805d127fb7031bf216fe4b787746b96ab99b31e03ce74fbacba6c0ce13692057dfb5cace9582462ec3d2019449d670755d240af2da69235c81bc SHA512 56997fc93c993bbbd584ca7a3c531a9f49198a412b628c975aa3d392128e8df3904e0b182d8bf4fd452701b59b9485e8cd9e628cb5523d2a31cc34b9d8cf307c
 EBUILD kdevelop-python-22.12.3.ebuild 1232 BLAKE2B 4cbd8dff5d839b6ec16a250fd954d2b25d7958808b6163b14435ac387e8a5d02c4bedf046ab23af89c17c12e33fc117902f54b3815cc9898f6759df291e0859a SHA512 c1f4b72b8149e70f498cca34747d503d48dfca14da9ec9a42689c7c7a66ddecdfd1fe53faa81993f82cc2b83b6807e0bc1c422e5d4fe26c380296e99e2bb9dca
-EBUILD kdevelop-python-23.04.0.ebuild 1234 BLAKE2B f5aad6bf1ac9a20e60ee80a50da7d7650776e9d53f5be861f4f7e70f64445599691d399dae408daa3f4e71c1f40240cb121a4cc390f9c67236f12976f1dd7974 SHA512 7d60b4cf5873355f30c6023b67f2f98f5f168da268254a123be6699415164a8551b4484c97b80d9aa791a7eed1faafabb02971969f7f4096d01d38ba993adb79
+EBUILD kdevelop-python-23.04.0.ebuild 1233 BLAKE2B 5b43d50321a8458646cc25045ce11bf6348fa080fa590a0851b7ebd457555f39d572cadd5515fb6235dc84060c6bea8d03319187461def01b7b4d82d9fd77355 SHA512 171bee3c2f42d6e1bad43f006c8e1b405d22c513bf25cde1baf5b4902dea65c1d91dc4342d7bc914817ca456aebc8b6786ee349e3d005e0c55b41b51c49f2a1b
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-python/kdevelop-python-23.04.0.ebuild b/dev-util/kdevelop-python/kdevelop-python-23.04.0.ebuild
index e1aa5ff44b8f..1fd0a31e533a 100644
--- a/dev-util/kdevelop-python/kdevelop-python-23.04.0.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-23.04.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.kdevelop.org/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 IUSE=""
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 arm64 ~x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="test"
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index b193c5a9ebc5..d2a68283e90e 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -3,5 +3,5 @@ DIST kdevelop-22.12.3.tar.xz 8652864 BLAKE2B a60de8549ccc949811c6c755c729b51711b
 DIST kdevelop-23.04.0.tar.xz 8656872 BLAKE2B 10127854f56fc6d07e8ed974d5d9aacd33c74f6bc21c3ef77541ed446ae33562551708b8b46796bbd3cdc423642d3a6a07f719e81d56c7fd108fa30b671eae5c SHA512 1660f5e819302e3783358556c36d09197f5de4fc4acf25c597e86982ea0ff419f6fdabb718ed74e4a56d3cf9623758c32978f7a12afe0a619a97b626c8c04173
 EBUILD kdevelop-22.12.3-r1.ebuild 4197 BLAKE2B becc1b76ab207ddff1952f5f54fb9e184c669c8045fc366e440974bce225bb8f20358878ad7381e135eab6609e0b13eb976de9afc72b174fbd4f9a5399143728 SHA512 41a25c12385fe30fc78fc1192139167f0364e32f6529a6379cfef3984435174376bcb9127f62463e57b8b2ede50c374c5ba64b436118bad543663126fed08f78
 EBUILD kdevelop-22.12.3.ebuild 4140 BLAKE2B 9404a7cc0a09a366ab3cabfd55dbb37da08a825e402e0a129bb82916aa6378e3888a5167bace7ebda6eff0ae81a63d5d6e821fd8429d483f391cae5a3725d090 SHA512 6346a83f99e30412fc8a3afc2be9a36df15d9e678ef30b185a68e44708588325c73da28930d5398929686f6cc809c1d8057277c33626cc1790c0a75d3ac544c8
-EBUILD kdevelop-23.04.0.ebuild 4102 BLAKE2B 6d006e655f21b6bb3c75fb3f806967ced91a2b341d579a42b05256ce588f80437d4f66d0c03090b48f6df0a2035e8a3ccf4150bb74ab0872a5f86a7dad07482e SHA512 71081eb62d893d5fe81cbd0b7da4074e8a676f77b0c5f56bc797182a6852d754a6d03d71187fb8f543ad06ca480dc3a37c1cf28592afb5d30f309c6ae78ec422
+EBUILD kdevelop-23.04.0.ebuild 4101 BLAKE2B 270eb41d25d852626c9b9f3bed55c7e82ddd28b8b26e2a312eb63f7b1fccfc1221cf7aeaf3a0fafed76b94c211e7694d494973ee3308db38e371a3ce2829c1dc SHA512 ee18234c9c162f0da7239689c6b6c4b8aa1b9cb2119fc6d80a99917b2bf53d39f7ef015ac9594862bab4e5907e05d93a285ef95477587fe15e3bbde223d265ef
 MISC metadata.xml 623 BLAKE2B defbd6a6a992f04fe71d13ca0e6da0b6c7015992f148f1fdd0d844430c44268e5c765c46afabee4af650992556e81acfb1024c94e6e274aefbbf46b65b9762af SHA512 4b022d64a261251c01eb9c8d8ee8aafeac6309272274fa8493f5bb8480cc93be482b145a70fd1a36bc30feaf8649ae17addfe8d7bcf57f78173e0f198805985c
diff --git a/dev-util/kdevelop/kdevelop-23.04.0.ebuild b/dev-util/kdevelop/kdevelop-23.04.0.ebuild
index d2848b6c73aa..c3daad3655ce 100644
--- a/dev-util/kdevelop/kdevelop-23.04.0.ebuild
+++ b/dev-util/kdevelop/kdevelop-23.04.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.kdevelop.org/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="5/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm64 ~ppc64 ~x86"
 IUSE="+gdbui hex +plasma +qmake reviewboard subversion"
 
 # see bug 366471
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index f14c312eac69..10a9d845a8ae 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -6,6 +6,9 @@ AUX valgrind-3.20.0-tests-clang16.patch 715 BLAKE2B d81ca99227e8175d9ab4ad5e6c70
 AUX valgrind-3.7.0-respect-flags.patch 360 BLAKE2B 020b9e3af2c6393193edd8be99ff2309f4b138915bd0315090cebd902747678a5b655a8178a8ec8e88782286470922aed505d2a69d6da4d295fd2053d640b035 SHA512 efdb017283b6a5829d1a5acc31b42ddd177a3ab468eb062b8c4fd90b2dbd06679e8d8bc2d6f813e3001efdda831d4410cc8da3a3e42ee2e49efea0423e4b3ca3
 DIST valgrind-3.20.0.tar.bz2 16469274 BLAKE2B 8217dcfc185c7f6601fedd8d53bb35d260b985b8049c8c73a26151db6650b1607e8e53b614652c40962ea7382b9301c4b234a933c8d81f57e649ebf3f703e630 SHA512 d6bfb9284d0410134ee7e2a5975b13c01508dd5587b562947d8197b3c113b76fdfac88c4072948be68bbf0dbeb17b4d1acb1412ce898adaa83c30ae2c6a1c12b
 DIST valgrind-3.20.0.tar.bz2.asc 488 BLAKE2B 12642e4f85c7b17bdb892221f74d80ce919554ffde3cdfa79ca27f4c5f8b48dac699084b8296b5cea285b5af660a0bc51c42b108a725be60002b14f0fda7eac7 SHA512 70dd20f15b159ffbf016c118046ee42160dd867415f1c565a92995952b1720ec36fc48557f6b523d28e6f675d62df10a4022e900fa4a104626b9e6ed6fe9ad6d
+DIST valgrind-3.21.0.tar.bz2 17449484 BLAKE2B 1f7306d288eb5ecfb2b2f0b2dc68960ecd4a7213b96a2e4ecb9990a755e8c233b0e9d190c0f807019bde669f44a631c8dafe9eb521d739561e6f889f7bdaca5c SHA512 3e86cda2f2d6cd30807fac7933ba2c46a97a2b4a868db989e6b0cceeadf029af7ee34ba900466a346948289aacb30f4399799bb83b97cc49a4d2d810441e5cfd
+DIST valgrind-3.21.0.tar.bz2.asc 488 BLAKE2B 6297bc925c16526a51de4f589232a8d5bcb8d54bdc885c145d329deeba45b42d3a5a8a3f59d3fb240d3bd78be7fd30d95ceb33c7624afd3c99c51833d0fd16f2 SHA512 114e5cd2f7352e56099efa3b2c42d39ed24e42419bbaac1af5e2b5c4fa72a2ba38ac6b0c60b93460a0cce8819ca0c7fae6618599b2af809ac0ab4fa30fdb25ba
 EBUILD valgrind-3.20.0-r2.ebuild 4348 BLAKE2B b69609c8be736593c8e82e7e267d68a3708a686b1ac56d7a556e6263626858cb14e1caa185fbe00f31fc6649124fa70f1a0ebdb8793e62f6f7bd6285c1dd11ab SHA512 53e95ff5d1f971667cb747d7f745f5f9e3ca9960d0f4791de84af2f3784bc3614673843c4165a5d43ddb5ae01f05258cc6abdc3c2b1465c78d68fbd3ff35ab8e
-EBUILD valgrind-9999.ebuild 4230 BLAKE2B e371ed0bfedc19162d814b3939e270405ccc68b49f59e40d92e237d692cfaa2f2fded8d3985887150da212d7f8594453eee70b861b1c057a242550d62903a2e8 SHA512 4d49d8ae018ddc0c0cfab9d30a135554eb31f59f01c4aa0b3b344fd02fae9f9b1cd5576ffdfe084ba894d2ee9c5842f8d5c7b821d093833458914b030712eb07
+EBUILD valgrind-3.21.0-r1.ebuild 4139 BLAKE2B af4ace272608693e188bf9c0be588d0c9e2288482db82373e7b009eade2060db0c45501c5a00975b26d2ad0cb95c0271ad32efe4c2cfdc38412560e58105e1f2 SHA512 4aef8ee930c05c15a8b29d8149819a5fba6cc154bdbc315c7e25d308025ef6d6b182760181c4d2256abf41d7af16545d2863383b22eda722803b9291e02a0fa6
+EBUILD valgrind-9999.ebuild 4139 BLAKE2B af4ace272608693e188bf9c0be588d0c9e2288482db82373e7b009eade2060db0c45501c5a00975b26d2ad0cb95c0271ad32efe4c2cfdc38412560e58105e1f2 SHA512 4aef8ee930c05c15a8b29d8149819a5fba6cc154bdbc315c7e25d308025ef6d6b182760181c4d2256abf41d7af16545d2863383b22eda722803b9291e02a0fa6
 MISC metadata.xml 1037 BLAKE2B b39708a006ad3ff24b100c702382ec8c45f6e300f3497ccd06199a6195abfa936c8f71ebd3223e0f7299e6644e378ef1d8d2c95a23059b66757d8a91bcbfce15 SHA512 4398f60fdacedbd92881dea016e60c5def5abe8989b56fc450b71b5c65b0d9c26a44b8ee89d0dcb71ab376d987c8e22d12031e9fb2a17b126e3223adb12e0f2f
diff --git a/dev-util/valgrind/valgrind-3.21.0-r1.ebuild b/dev-util/valgrind/valgrind-3.21.0-r1.ebuild
new file mode 100644
index 000000000000..103c949ad515
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.21.0-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
+
+DESCRIPTION="An open-source memory debugger for GNU/Linux"
+HOMEPAGE="https://valgrind.org"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/valgrind.gpg
+	inherit verify-sig
+	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
+	SRC_URI+=" verify-sig? ( https://sourceware.org/pub/valgrind/${P}.tar.bz2.asc )"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="mpi"
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+if [[ ${PV} != 9999 ]] ; then
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-valgrind )"
+fi
+
+PATCHES=(
+	# Respect CFLAGS, LDFLAGS
+	"${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
+	"${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
+)
+
+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
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# upstream doesn't support this, but we don't build with
+		# Sun/Oracle ld, we have a GNU toolchain, so get some things
+		# working the Linux/GNU way
+		find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \
+			sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die
+		cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
+	fi
+
+	default
+
+	# 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
+	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
+	#                       because valgrind doesn't link to glibc (bug #114347)
+	# -fstack-protector-all    Fails same way as -fstack-protector/-fstack-protector-strong.
+	#                          Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it
+	# -fstack-protector-strong See -fstack-protector (bug #620402)
+	# -m64 -mx32			for multilib-portage, bug #398825
+	# -ggdb3                segmentation fault on startup
+	# -flto*                fails to build, bug #858509
+	filter-flags -fomit-frame-pointer
+	filter-flags -fstack-protector
+	filter-flags -fstack-protector-all
+	filter-flags -fstack-protector-strong
+	filter-flags -m64 -mx32
+	filter-flags -fsanitize -fsanitize=*
+	replace-flags -ggdb3 -ggdb2
+	filter-lto
+
+	if use amd64 || use ppc64; then
+		! has_multilib_profile && myconf+=("--enable-only64bit")
+	fi
+
+	# Force bitness on darwin, bug #306467
+	use x64-macos && myconf+=("--enable-only64bit")
+
+	# Don't use mpicc unless the user asked for it (bug #258832)
+	if ! use mpi; then
+		myconf+=("--without-mpicc")
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	if [[ ${PV} == "9999" ]]; then
+		# Otherwise FAQ.txt won't exist:
+		emake -C docs FAQ.txt
+		mv docs/FAQ.txt . || die "Couldn't move FAQ.txt"
+	fi
+
+	dodoc FAQ.txt
+
+	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
+
+	# See README_PACKAGERS
+	dostrip -x /usr/libexec/valgrind/vgpreload* /usr/$(get_libdir)/valgrind/*
+
+	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 libc (e.g. 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-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
index 1dc6424e705b..103c949ad515 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.ebuild
@@ -41,12 +41,6 @@ src_prepare() {
 	# Don't force multiarch stuff on OSX, bug #306467
 	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
 
-	if use elibc_musl ; then
-		PATCHES+=(
-			"${FILESDIR}"/${PN}-3.13.0-malloc.patch
-		)
-	fi
-
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		# upstream doesn't support this, but we don't build with
 		# Sun/Oracle ld, we have a GNU toolchain, so get some things