dev-util/google-perftools: Wrap headers for x32 correctly

diff --git a/dev-util/google-perftools/google-perftools-2.5.ebuild b/dev-util/google-perftools/google-perftools-2.5.ebuild
index bb3355a61db75ef772645fc3a453c9165f2a7445..3229577d2389e4f125ba12e541dce26fc8ebfeeb 100644 (file)
--- a/dev-util/google-perftools/google-perftools-2.5.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.5.ebuild
@@ -72,8 +72,15 @@ src_test() {
        autotools-multilib_src_test
 }
 
-# abi_x86_x32 forces minimal, which installs fewer headers
-# so override the header check with a no-op
-multilib_check_headers() {
-       :
+src_install() {
+       if ! use minimal && has x32 ${MULTILIB_ABIS}; then
+               MULTILIB_WRAPPED_HEADERS=(
+                       /usr/include/gperftools/heap-checker.h
+                       /usr/include/gperftools/heap-profiler.h
+                       /usr/include/gperftools/stacktrace.h
+                       /usr/include/gperftools/profiler.h
+               )
+       fi
+
+       autotools-multilib_src_install
 }