gentoo resync : 17.02.2021

3 files changed, 112 insertions, 95 deletions

diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index e2470d472c8f..b83f8d8e13e2 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -2,14 +2,14 @@ AUX perf-5.1.15-fix-clang8.patch 659 BLAKE2B 5f68efedb5dfe092116db7cb1a0586dbefb
 AUX perf-5.4.20-binutil-libs-2.34.patch 1845 BLAKE2B 573a1d620ec5ee45b8baa09527062733f699e667be83f0fc17af469295778453b0ad0a6af892321423b1189a2d19b7b4c8e26533c1f23e48ed8b1baae7b2ed60 SHA512 d83549c67b97c0039764bea381a00bdda1b883352306dfa47ff326f9290d6cbcf3f830b29bc4a44cfccefdedb5e92974c8dfa28f6e6007ab289ee07546ddfa59
 AUX perf-5.4.6-fix-clang9.patch 558 BLAKE2B 001bde226595891626dc7b46ece6de240696bbfb7e5071e4f071653f90e3b98a032ed375b0ec4a3f88795c20b8066954e8934fc4c38f8814c0349c6037d60a1a SHA512 af1c82863b2e7e9d87199896765646622d8431fac7a80b7579fb88ca83df182493996b61033618632a9b11ca6c87e4400cf14506ade9b00d327ed2cf644e1945
 AUX perf-5.4.7-propagate-cflags.patch 1502 BLAKE2B d35f94d10ecc2d384cae9084a7f843581553682bd1ec66e7dd33d0fe110e03c01761b9b2472aa637a71f5c694f4c4eb10691afefb08351e06ea607ca4a460248 SHA512 a5506e118f75439386b3c7699197b20017ef819669b06d89ed79886146e7a79d52d1397680cc94e10137bd6665d3dc2812cb1556498de2739f4d967582522a80
-DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
+DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
+DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
 DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
-DIST patch-5.4.20.xz 776552 BLAKE2B bad2a95ed8521ac5c379fe91e16d60b2a38de19b9239755084621e5230677b232ec4cf9e2e8161c0022daff43fdbb37d5b5b5bfdc9e932ef3a860bcd17f640f8 SHA512 65fbcdbd41e35c17601ff15bbe33933be2ab7a694aa181a0b802cc11c1c653c9b688dbb382076cbad05983a0c07467955c035ae25f5175f7ce5bc24339303d77
+DIST patch-5.10.16.xz 498880 BLAKE2B 14061b505285f24938fb955ccc7f9fbd78ccc0b1026bffb17a89fdad08ea54bfee7bbb841123d9af4d0720a960a27c649c39852af7e2be8a286af926c7bce9c0 SHA512 be9cfe1ae6697956ca7476cedc212a8cbd9da2c3c72096a89afaaf73c5b6655fd04d458f96c472f680c5513c0ea3e4449c4092a958425b6040f0c7774453cd2f
 DIST patch-5.9.9.xz 502816 BLAKE2B 104fa2ecaac3c543662b891de22cb881a917320317d58dcaeb6b6826e3f0296126ab5177cc7a44a438c15d3ae9cab116ff6926cce9d5e4d310df99fca0d9b909 SHA512 87852bc4d08cd5e82c7de9a8c8d50c1b4c67eed7157bfe1034d279370ff21a194f082f126d49812f84ec726100c5d97b3d908994e92c2cbfd231a4ac851babe3
-EBUILD perf-5.4.20.ebuild 6647 BLAKE2B bd49393856869a9211a533d736210e2cb69d53fa47cc4a766c091384ce1d71a0812ca8225733edb3fd395304087eaf85f3663b82357b66f360d7a06d8d8d7582 SHA512 887881de705a28c0b8cdd1ea46586b0d0c8a7323acd460eec7dc8a93fc6d10da7280412d117feb4debd2d4a05843c975ae576e3d6252d30b7abdf793a9cb5cfe
-EBUILD perf-5.7-r1.ebuild 6479 BLAKE2B aacf8002ddaa40ebb9aabca97bf241dd07673d219629e3e3f088e392a1b4e1b378393fad2c889c0b137a3624a56317645492d8f9dce9a62832cb8f9a10aadf05 SHA512 1d4c98b296bfc1c2b64487f5094afacfc941e13709955342501a11af5f3938cf335f9aa82e971835d6bdafa5679e64636692f3350cc17c9ba08de00827b90aff
+EBUILD perf-5.10.16.ebuild 6865 BLAKE2B 120563893c8f98e43abca27a96a3a4d3884308924a78a94134c407cc2cd2363b404dc37736db13ba7ba1c5a254c852f305ef8e4937a9e53cce097a75bb0fa8b1 SHA512 367f1f16a1dc471df6c636ad45547615b67100fda93a5f4acbfa7f78122129fb3dc696695a4f143cab450baf838258fba492328d3fd3c5f8833c94bd330b4a89
+EBUILD perf-5.11.ebuild 6865 BLAKE2B 120563893c8f98e43abca27a96a3a4d3884308924a78a94134c407cc2cd2363b404dc37736db13ba7ba1c5a254c852f305ef8e4937a9e53cce097a75bb0fa8b1 SHA512 367f1f16a1dc471df6c636ad45547615b67100fda93a5f4acbfa7f78122129fb3dc696695a4f143cab450baf838258fba492328d3fd3c5f8833c94bd330b4a89
 EBUILD perf-5.8.ebuild 6645 BLAKE2B be18e759056f79629689d00cfe599c4102a6e041ac5d9657f854773681437040a1ed19c634db594be4779da799b163c514f11f2bea479705f9489f4f81fbb736 SHA512 b77d0aafd23dec90cf050d6a810f2a7807b0b8301d3619a80d790c2d7c2472c94e386174224d7aecfaf210ca8fcfe61147e8bed3ea2282c595433f9ebd549399
 EBUILD perf-5.9.9.ebuild 6863 BLAKE2B a72ab5d45815e2311d1a88a1bf8971171cd13ab476d3a3a8fa45b769f64bbf4b537860318b6ae601ec9104f729af5b057ec90b90e981df2672551336a7b2d171 SHA512 766cd1f2e0e10c46c05ac3dacd585a1acc027edaccd89b38cbc5db8ac535c66c5aac65ccc4ed666dfdd5b2faff6adf54b5ff4d61b9c8b9948a3fde71b5cc7a28
 MISC metadata.xml 1506 BLAKE2B 3f82b3824ed6e126239ccedc332b79b450a695df6149b094b05674e6bf99c1300919fd7046bc47b62a39f879cfaa72d1f496f46c2f6b76aded8ef154b3ae5a2d SHA512 ba7560b91456c4930c44427865859512166e747002fb4e5331530a2fd2b40f0828870ec59f21abb2836b6c51c70ddf77a820d475f7f8f97a03737c7178b5d8d6
diff --git a/dev-util/perf/perf-5.7-r1.ebuild b/dev-util/perf/perf-5.10.16.ebuild
index a954d845b707..57147178746e 100644
--- a/dev-util/perf/perf-5.7-r1.ebuild
+++ b/dev-util/perf/perf-5.10.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,9 +6,6 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8} )
 inherit bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info
 
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
 DESCRIPTION="Userland tools for Linux Performance Counters"
 HOMEPAGE="https://perf.wiki.kernel.org/"
 
@@ -34,11 +31,22 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit clang crypt debug +demangle +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib"
 # TODO babeltrace
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+BDEPEND="
+	${LINUX_PATCH+dev-util/patchutils}
+	sys-devel/bison
+	sys-devel/flex
+	doc? (
+		app-text/asciidoc
+		app-text/sgml-common
+		app-text/xmlto
+		sys-process/time
+	)"
+
 RDEPEND="audit? ( sys-process/audit )
 	crypt? ( dev-libs/openssl:0= )
 	clang? (
@@ -48,6 +56,7 @@ RDEPEND="audit? ( sys-process/audit )
 	demangle? ( sys-libs/binutils-libs:= )
 	gtk? ( x11-libs/gtk+:2 )
 	java? ( virtual/jre:* )
+	libpfm? ( dev-libs/libpfm )
 	lzma? ( app-arch/xz-utils )
 	numa? ( sys-process/numactl )
 	perl? ( dev-lang/perl:= )
@@ -57,24 +66,25 @@ RDEPEND="audit? ( sys-process/audit )
 	unwind? ( sys-libs/libunwind )
 	zlib? ( sys-libs/zlib )
 	dev-libs/elfutils"
+
 DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-4.19
-	${LINUX_PATCH+dev-util/patchutils}
-	sys-devel/bison
-	sys-devel/flex
 	java? ( virtual/jdk )
-	doc? (
-		app-text/asciidoc
-		app-text/sgml-common
-		app-text/xmlto
-		sys-process/time
-	)"
+"
 
 S_K="${WORKDIR}/linux-${LINUX_VER}"
 S="${S_K}/tools/perf"
 
 CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
 
+pkg_pretend() {
+	if ! use doc ; then
+		ewarn "Without the doc USE flag you won't get any documentation nor man pages."
+		ewarn "And without man pages, you won't get any --help output for perf and its"
+		ewarn "sub-tools."
+	fi
+}
+
 pkg_setup() {
 	use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
 }
@@ -126,7 +136,8 @@ src_prepare() {
 		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
 
 	# Avoid the call to make kernelversion
-	echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE
+	sed -i -e '/PERF-VERSION-GEN/d' Makefile.perf || die
+	echo "#define PERF_VERSION \"${PV}\"" > PERF-VERSION-FILE
 
 	# The code likes to compile local assembly files which lack ELF markings.
 	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
@@ -149,7 +160,7 @@ perf_make() {
 
 	local arch=$(tc-arch-kernel)
 	local java_dir
-	use java && java_dir="/etc/java-config-2/current-system-vm"
+	use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
 	# FIXME: NO_CORESIGHT
 	# FIXME: NO_LIBBABELTRACE
 	emake V=1 VF=1 \
@@ -157,23 +168,26 @@ perf_make() {
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)" \
 		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
 		prefix="${EPREFIX}/usr" bindir_relative="bin" \
+		tipdir="share/doc/${PF}" \
 		EXTRA_CFLAGS="${CFLAGS}" \
 		ARCH="${arch}" \
 		JDIR="${java_dir}" \
 		LIBCLANGLLVM=$(usex clang 1 "") \
+		LIBPFM4=$(usex libpfm 1 "") \
 		NO_AUXTRACE="" \
 		NO_BACKTRACE="" \
 		NO_CORESIGHT=1 \
 		NO_DEMANGLE=$(puse demangle) \
-		NO_GTK2=$(puse gtk) \
+		GTK2=$(usex gtk 1 "") \
+		feature-gtk2-infobar=$(usex gtk 1 "") \
 		NO_JVMTI=$(puse java) \
 		NO_LIBAUDIT=$(puse audit) \
 		NO_LIBBABELTRACE=1 \
 		NO_LIBBIONIC=1 \
-		NO_LIBBPF="" \
+		NO_LIBBPF= \
 		NO_LIBCRYPTO=$(puse crypt) \
-		NO_LIBDW_DWARF_UNWIND="" \
-		NO_LIBELF="" \
+		NO_LIBDW_DWARF_UNWIND= \
+		NO_LIBELF= \
 		NO_LIBNUMA=$(puse numa) \
 		NO_LIBPERL=$(puse perl) \
 		NO_LIBPYTHON=$(puse python) \
@@ -208,30 +222,29 @@ src_install() {
 	}
 
 	perf_make -f Makefile.perf install DESTDIR="${D}"
+
 	if use python; then
 		python_foreach_impl _install_python_ext
 	fi
 
-	rm -rv "${ED}"/usr/share/doc/perf-tip || die
-
 	if use gtk; then
-		mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+		local libdir
+		libdir="$(get_libdir)"
+		# on some arches it ends up in lib even on 64bit, ppc64 for instance.
+		[[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+		mv "${ED}"/usr/${libdir}/libperf-gtk.so \
 			"${ED}"/usr/libexec/perf-core || die
 	fi
 
 	dodoc CREDITS
 
 	dodoc *txt Documentation/*.txt
+
+	# perf needs this decompressed to print out tips for users
+	docompress -x /usr/share/doc/${PF}/tips.txt
+
 	if use doc ; then
 		HTML_DOCS="Documentation/*.html" einstalldocs
 		doman Documentation/*.1
 	fi
 }
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Without the doc USE flag you won't get any documentation nor man pages."
-		elog "And without man pages, you won't get any --help output for perf and its"
-		elog "sub-tools."
-	fi
-}
diff --git a/dev-util/perf/perf-5.4.20.ebuild b/dev-util/perf/perf-5.11.ebuild
index 23fa3098706a..57147178746e 100644
--- a/dev-util/perf/perf-5.4.20.ebuild
+++ b/dev-util/perf/perf-5.11.ebuild
@@ -1,13 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
-inherit bash-completion-r1 estack eutils toolchain-funcs python-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
+PYTHON_COMPAT=( python3_{7,8} )
+inherit bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info
 
 DESCRIPTION="Userland tools for Linux Performance Counters"
 HOMEPAGE="https://perf.wiki.kernel.org/"
@@ -34,20 +31,32 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit clang crypt debug +demangle +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib"
 # TODO babeltrace
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+BDEPEND="
+	${LINUX_PATCH+dev-util/patchutils}
+	sys-devel/bison
+	sys-devel/flex
+	doc? (
+		app-text/asciidoc
+		app-text/sgml-common
+		app-text/xmlto
+		sys-process/time
+	)"
+
 RDEPEND="audit? ( sys-process/audit )
 	crypt? ( dev-libs/openssl:0= )
 	clang? (
-		sys-devel/clang:*
-		sys-devel/llvm:*
+		<sys-devel/clang-10:*
+		<sys-devel/llvm-10:*
 	)
 	demangle? ( sys-libs/binutils-libs:= )
 	gtk? ( x11-libs/gtk+:2 )
 	java? ( virtual/jre:* )
+	libpfm? ( dev-libs/libpfm )
 	lzma? ( app-arch/xz-utils )
 	numa? ( sys-process/numactl )
 	perl? ( dev-lang/perl:= )
@@ -57,28 +66,33 @@ RDEPEND="audit? ( sys-process/audit )
 	unwind? ( sys-libs/libunwind )
 	zlib? ( sys-libs/zlib )
 	dev-libs/elfutils"
+
 DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-4.19
-	${LINUX_PATCH+dev-util/patchutils}
-	sys-devel/bison
-	sys-devel/flex
 	java? ( virtual/jdk )
-	doc? (
-		app-text/asciidoc
-		app-text/sgml-common
-		app-text/xmlto
-		sys-process/time
-	)"
+"
 
 S_K="${WORKDIR}/linux-${LINUX_VER}"
 S="${S_K}/tools/perf"
 
 CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
 
+pkg_pretend() {
+	if ! use doc ; then
+		ewarn "Without the doc USE flag you won't get any documentation nor man pages."
+		ewarn "And without man pages, you won't get any --help output for perf and its"
+		ewarn "sub-tools."
+	fi
+}
+
+pkg_setup() {
+	use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
+}
+
 src_unpack() {
 	local paths=(
 		tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
-		include lib "arch/*/lib"
+		scripts include lib "arch/*/lib"
 	)
 
 	# We expect the tar implementation to support the -j option (both
@@ -102,26 +116,6 @@ src_unpack() {
 		[[ ${a} == ${LINUX_PATCH} ]] && continue
 		unpack ${a}
 	done
-
-	# support clang8
-	echo $(clang-major-version)
-	if use clang; then
-		local old_CC=${CC}
-		CC=${CHOST}-clang
-		if [[ $(clang-major-version) -ge 8 ]]; then
-			pushd "${S_K}" >/dev/null || die
-			eapply \
-				"${FILESDIR}/perf-5.1.15-fix-clang8.patch" \
-				"${FILESDIR}/perf-5.4.6-fix-clang9.patch"
-			popd || die
-		fi
-		CC=${old_CC}
-	fi
-
-	pushd "${S_K}" >/dev/null || die
-	eapply "${FILESDIR}/perf-5.4.7-propagate-cflags.patch"
-	eapply "${FILESDIR}/perf-5.4.20-binutil-libs-2.34.patch"
-	popd || die
 }
 
 src_prepare() {
@@ -142,10 +136,16 @@ src_prepare() {
 		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
 
 	# Avoid the call to make kernelversion
-	echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE
+	sed -i -e '/PERF-VERSION-GEN/d' Makefile.perf || die
+	echo "#define PERF_VERSION \"${PV}\"" > PERF-VERSION-FILE
 
 	# The code likes to compile local assembly files which lack ELF markings.
 	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
+
+	# Fix shebang to use python from prefix
+	if [[ -n "${EPREFIX}" ]]; then
+		hprefixify ${S_K}/scripts/bpf_helpers_doc.py
+	fi
 }
 
 puse() { usex $1 "" no; }
@@ -160,29 +160,34 @@ perf_make() {
 
 	local arch=$(tc-arch-kernel)
 	local java_dir
-	use java && java_dir="/etc/java-config-2/current-system-vm"
+	use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
 	# FIXME: NO_CORESIGHT
 	# FIXME: NO_LIBBABELTRACE
 	emake V=1 VF=1 \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
+		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
 		prefix="${EPREFIX}/usr" bindir_relative="bin" \
+		tipdir="share/doc/${PF}" \
 		EXTRA_CFLAGS="${CFLAGS}" \
 		ARCH="${arch}" \
 		JDIR="${java_dir}" \
 		LIBCLANGLLVM=$(usex clang 1 "") \
+		LIBPFM4=$(usex libpfm 1 "") \
 		NO_AUXTRACE="" \
 		NO_BACKTRACE="" \
 		NO_CORESIGHT=1 \
 		NO_DEMANGLE=$(puse demangle) \
-		NO_GTK2=$(puse gtk) \
+		GTK2=$(usex gtk 1 "") \
+		feature-gtk2-infobar=$(usex gtk 1 "") \
 		NO_JVMTI=$(puse java) \
 		NO_LIBAUDIT=$(puse audit) \
 		NO_LIBBABELTRACE=1 \
 		NO_LIBBIONIC=1 \
-		NO_LIBBPF="" \
+		NO_LIBBPF= \
 		NO_LIBCRYPTO=$(puse crypt) \
-		NO_LIBDW_DWARF_UNWIND="" \
-		NO_LIBELF="" \
+		NO_LIBDW_DWARF_UNWIND= \
+		NO_LIBELF= \
 		NO_LIBNUMA=$(puse numa) \
 		NO_LIBPERL=$(puse perl) \
 		NO_LIBPYTHON=$(puse python) \
@@ -217,30 +222,29 @@ src_install() {
 	}
 
 	perf_make -f Makefile.perf install DESTDIR="${D}"
+
 	if use python; then
 		python_foreach_impl _install_python_ext
 	fi
 
-	rm -rv "${ED}"/usr/share/doc/perf-tip || die
-
 	if use gtk; then
-		mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+		local libdir
+		libdir="$(get_libdir)"
+		# on some arches it ends up in lib even on 64bit, ppc64 for instance.
+		[[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+		mv "${ED}"/usr/${libdir}/libperf-gtk.so \
 			"${ED}"/usr/libexec/perf-core || die
 	fi
 
 	dodoc CREDITS
 
 	dodoc *txt Documentation/*.txt
+
+	# perf needs this decompressed to print out tips for users
+	docompress -x /usr/share/doc/${PF}/tips.txt
+
 	if use doc ; then
 		HTML_DOCS="Documentation/*.html" einstalldocs
 		doman Documentation/*.1
 	fi
 }
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Without the doc USE flag you won't get any documentation nor man pages."
-		elog "And without man pages, you won't get any --help output for perf and its"
-		elog "sub-tools."
-	fi
-}