gentoo resync : 25.04.2020

2 files changed, 17 insertions, 24 deletions

diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 52c2969f05d9..016aea9c524e 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -4,14 +4,14 @@ AUX perf-5.4.6-fix-clang9.patch 558 BLAKE2B 001bde226595891626dc7b46ece6de240696
 AUX perf-5.4.7-propagate-cflags.patch 1502 BLAKE2B d35f94d10ecc2d384cae9084a7f843581553682bd1ec66e7dd33d0fe110e03c01761b9b2472aa637a71f5c694f4c4eb10691afefb08351e06ea607ca4a460248 SHA512 a5506e118f75439386b3c7699197b20017ef819669b06d89ed79886146e7a79d52d1397680cc94e10137bd6665d3dc2812cb1556498de2739f4d967582522a80
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0842dbf353a5b269720dcb902db407bb55dd95a77b212dcb4a488c15363d561f3649d6bd16885561f2466d90b1 SHA512 e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4
-DIST linux-5.3.tar.xz 108558876 BLAKE2B 0d08eed879d05734e4542f0c93823d43f8dc042a54ba5268064c4bbebd7a9d59c03abf3ad5dee8280e784ae148a3b0c56181eaf2d5b3c079b6fe9f5191544df6 SHA512 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
+DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257e65173fed43fcc45480e4ab790df8cd39bbbb4e2a21dc9a00385bc9bbe98215a31e7f7e1d9c8f21cd8ace69e SHA512 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9
 DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfcc6fa837f795e481943ead3e2d5005ee72e40fc247df01c50877d9da3848a05aba3c999c3cfb7678cbdbc9 SHA512 5c76be5171709c2df7df7d5a8e8f3d0f7ede47b433da3b0f1710f262c8fcf5cf6c744a96d4336ea397c2c88a5f0a7507a5ab08c7c82f08deeb7a6f887ad77cfd
 DIST patch-4.20.3.xz 91732 BLAKE2B bf99271bcb35508df239343fd6c9d57c246f88320b586e44e2d97771d08b249a24db230214d4957015a5ed35261e201f0680101b99d0e92f0f1f69bc53e21458 SHA512 47178b8e3bfe4ba09cb82bb1ce8b0742e6749d4be3412fb57518918f7109e74eac1d3d8eb32a43e21b3837a14f37d5eefd8cab819defd10cc2db61fb0ceddeaf
-DIST patch-5.3.7.xz 255616 BLAKE2B 18ec40508fdb2cc17dd927f3ddef07b2b744ff993de75bb7adebe3a3f97c9383ea1845085899aa939ca8a15515420c18a1ac0ae832f9ae52f18cc8ed59a1e75f SHA512 bf2717b721b3acfd423537a6a520388e6a596ae65605ed8c029a67c117a002e9a21c324de0dd41407bfdc8ef95263687764f4f46aa59cbb50f68ab21b96c29d6
 DIST patch-5.4.20.xz 776552 BLAKE2B bad2a95ed8521ac5c379fe91e16d60b2a38de19b9239755084621e5230677b232ec4cf9e2e8161c0022daff43fdbb37d5b5b5bfdc9e932ef3a860bcd17f640f8 SHA512 65fbcdbd41e35c17601ff15bbe33933be2ab7a694aa181a0b802cc11c1c653c9b688dbb382076cbad05983a0c07467955c035ae25f5175f7ce5bc24339303d77
+DIST patch-5.6.4.xz 34744 BLAKE2B 856148010fefa7e45903da23a054429f924920f1fd331b725d00906baaf6a05fee769c5c780ae6548b4f02846f945b12012c1216411c8d92aef7499babc42528 SHA512 05607a47ee72af4a7b4d8424a3995d92d0cf358902459993908df0e95643cbfa9eec7ed56779d254b7b75ec1c8dbec5eea5e2e845f40f5511533d53b90b1c02e
 EBUILD perf-4.14.33-r1.ebuild 5059 BLAKE2B 3bae91131eb7c24b152dbeac414057d1e5ba08d174a51417aeecb4a049c9fec362b4b67e34c367198d2b9729ffedfc82556e3a13c92b5a9129571b44d31b894b SHA512 bcb9c57a583a930aa026988eac0f14c9b13283565189c7251118e4a2037f4094b2999093aec63ebcfc1c6e6325681edd26fe35480b90a90721f92c6405afca7f
 EBUILD perf-4.20.3.ebuild 6042 BLAKE2B e1498b914f8b135927f5e97211d5246dab4bfd5bafbcf9ba431c2f8d95cf1568a162d2704f6cf851951178287efdcc6d75391ede09ea101b18d88463a4586912 SHA512 3f45b1edfefd658eaa48b4e4ae02c09e39cd6f2f7235bbb8eb9d90d69028df6d53709dac1790f932c7a20e7e77fad8327867ccdec80f302c0d72958d3c1bb138
-EBUILD perf-5.3.7.ebuild 6360 BLAKE2B f3f17e3ba1375c7a2e1e4ae33053318b58344c43fad7c8fdde8b867f4a2d326b201c74260df4438eb2314013d110f6e72488601ffe3f40c0473c8a3de4f080b4 SHA512 87f79ea8c9cd3c5709f6592b7f7ba979cfafe6479809aa3f59ca45d35fc4b2f4b2532fdc4e4c49b903a9a647dfabb93899a7c8c7a7a0a01aafcac54fe3293af3
 EBUILD perf-5.4.20.ebuild 6661 BLAKE2B 57b7ef2a784b80469fe6f8f0f4ccfe8024634e75c8db9af16da6914bf0ff353ca9846211f3fc8417f4f553e05ea2a5cf5c679259e639f498387fe5c36936b450 SHA512 f8763d20eac9b809335f65dfa13f6bfb1b7d0787e4f0bdb33d8755c773cc30740f5ebaad21de31ade431a818d29119d3ee7d13c8eb4f0cf53fa32217a5faadc7
+EBUILD perf-5.6.4.ebuild 6232 BLAKE2B 31434728fb030b44cb2b41a850760dff22b9c8176e29ccc1f8c19ff263013de17f606676fac0e3942926c2b364f5318995686c481bc0c1de96f15a639fe4b8f9 SHA512 b247174dfe336b1411a02cddc451ac9fe1c76ee48303ede76b97e2000b76e4b2428c031ef2451d20c2a665a2e613a770d5d69c38252015e49004f53c42e9d3c7
 MISC metadata.xml 1245 BLAKE2B 78921a70a2d435eac57471863f5f8f50eaae16049c6085326cc91a82437b42ada7c3a5fa97124a01f5477b02e37fa03212eb65d9652a71b8c8886f99e2986d22 SHA512 99fcebf78438dd22f2ff35846fadd1280e25154dab4a4ab8bf9bc13d911c7450f92234ed2c39d9905d6b138a783af1e20896e0b09e9dd07813baf5da48234ea2
diff --git a/dev-util/perf/perf-5.3.7.ebuild b/dev-util/perf/perf-5.6.4.ebuild
index dbfe8de5c4ba..3f1d4e665d10 100644
--- a/dev-util/perf/perf-5.3.7.ebuild
+++ b/dev-util/perf/perf-5.6.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-inherit bash-completion-r1 estack eutils toolchain-funcs python-single-r1 linux-info
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+inherit bash-completion-r1 estack eutils llvm toolchain-funcs python-r1 linux-info
 
 MY_PV="${PV/_/-}"
 MY_PV="${MY_PV/-pre/-git}"
@@ -42,8 +42,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 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 )
@@ -76,14 +76,13 @@ S="${S_K}/tools/perf"
 CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
 
 pkg_setup() {
-	linux-info_pkg_setup
-	use python && python-single-r1_pkg_setup
+	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
@@ -107,19 +106,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"
-			popd || die
-		fi
-		CC=${old_CC}
-	fi
 }
 
 src_prepare() {
@@ -210,7 +196,14 @@ src_test() {
 }
 
 src_install() {
+	_install_python_ext() {
+		perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+	}
+
 	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