10 files changed, 36 insertions, 363 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index e9ed5402eb64..e77b33bb3b39 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index f3ba0a7797f1..05dde31bb3c1 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -6,5 +6,5 @@ DIST patch-6.6.8.xz 587540 BLAKE2B 4794b1b4415b8369b856a4b04d23931903a84d7f660e5
 DIST patch-6.7.6.xz 583872 BLAKE2B 123dfd4170680917ebf16c3c7f3ab31754637c962dca5e5f5d52dd702a46bb68b01ca3a5b3c2482db34841f139871126576d30703825f8ca2dda2d8bfc4ed7e2 SHA512 ab5bef028a6c61e3c6432d49e95d88aec97140d7f8b295a71ba96b08254199343f93f11da4b34ab2482015adb0d1816b6719a21f8a0f2b1dd1bd96fcd3a72d2e
 EBUILD bpftool-6.5.7.ebuild 2903 BLAKE2B 87f95b114db4f37815ef0f9d35a3b32e9a1f89fa7f0210ec2520a1b9b5bea948197159ffff8871f755bd127fb1041c3e7b0942f0148f406a937d1706c4acb677 SHA512 67b56ea325d71a5f27c2004ad2743e35cd14ceddfb72ecc631e172422953f5af04b428ad804f41666d1bd3a2f33c20b32b217fc339af51aaec4c03187dde4e17
 EBUILD bpftool-6.6.8.ebuild 2993 BLAKE2B 33efe3ddf3f948573c41b37d50187833f06b419141b2ebedf5ca341d903fb2b3d2761518c10db5100c0378f3032cc97e1ef5284c033f9f8b0de65376b7803fc2 SHA512 22bcd2f98e7fc08c9eb9807646e9c0ab9573431b11a03a0227c38072d6a94be50f5d1f98c8f98146a983bd46da36ca0af28cab8513f427405c560f42c238bddb
-EBUILD bpftool-6.7.6-r1.ebuild 3064 BLAKE2B 53f90c918ff3847e48595d2eb142eaa62275862abcf935fdde64eb621cd6d1c86fa3a3e4bc128ebbaf5d9a9c2987c2ecc5d95347b19ee811b3dc26c48b59d2ba SHA512 7d8b8a82458a0e9ed860fe19dfc903c59bb2547e9f61f3846e731baa0142143b33bb58d90adcf1646c4cd546fa3d4a119f4d40188be9476c70df280b32599a2b
+EBUILD bpftool-6.7.6-r1.ebuild 3059 BLAKE2B 92f89539f56a0183d77968040fcd04103df496e6b3ae0ec15600295dfd6b3571ae0b7aebd7ff8336d8c5e6ce4dcf974353cd54542556706f13a26ae2a2809b12 SHA512 52798e40dae006cab963311918bf5395e74ceb804752d62ad8a66d9ff4701eceba1dbf37a1910977da9699367306534fb8e086e42440c91dd36dbba1c7bda6ab
 MISC metadata.xml 413 BLAKE2B a5ec0a493a8362f9ba27b636aa1cacfe55c7c9e3dfaa0f789174be4bf0742bd70fd84991d22e99382cbbd3b07c8ed9873e4ebe4b8642b3925111cdf92a09b96e SHA512 130622d6ec59149edf404fa09c51e532c47ff549eb843b7dd3dc71a1bc59b0e80bca54e741f78e21521f940f39c71684e85c433e2923ce3470a9cd55cae99087
diff --git a/dev-util/bpftool/bpftool-6.7.6-r1.ebuild b/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
index acd42e33726c..79776fea6019 100644
--- a/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
+++ b/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="caps +llvm"
 
 RDEPEND="
diff --git a/dev-util/pahole/Manifest b/dev-util/pahole/Manifest
index 4919408fe182..cb64e44b2e03 100644
--- a/dev-util/pahole/Manifest
+++ b/dev-util/pahole/Manifest
@@ -5,6 +5,6 @@ DIST dwarves-1.26.tar.xz 2250036 BLAKE2B cb86bf964f22633432e80d335937379c2096877
 DIST pahole-1.24_p20221024-patches.tar.xz 22088 BLAKE2B b39458400411dd7da0f568257f42164952e170b952e4893a92d769e17ce4cf0de88b727808a38195438fe10e5537f245bf101f647f383b6df7642c5446fa5d45 SHA512 93f160f01023c5402535a34d59005f0a3e056662a2764722480d71b6e522f3bfef0d642084467d1fbea96e23386b4cbb708243713d59eb84f4f767c1ac5ab3f5
 EBUILD pahole-1.24_p20221024.ebuild 1693 BLAKE2B 3bafb0ab2e9278c0ff0f1af9f571311983d6545eae411b271e5bde9d5416d4f2c4dd5b671b291fccd0b03f6fbe5c99c92d620b6b91c1ae6edfb6f0b05e3f7b0e SHA512 0f9de7b39b1747e780322cf56e8a646e9980ee2dfcc4eecd2ea1d37dca369dae05c643a7be39898f0ef0264dd5a98890a600b282a7e1d759d0fc7c72fd8c4870
 EBUILD pahole-1.25.ebuild 1700 BLAKE2B 12734f1ae26bed113c61cb05386a0c9e57b3fae8aeeb9c54b117ca8f15456a529e1d2cd5656000662917c4c07e46e32da0f8332c1577ff0c5ebf6bcc98c19b83 SHA512 1c3fc2ef434ee988ad79fca27163fc3fd645faabe45d2229e6bee4d23c38f0ec59ad4255b4604db1b321b871fef83573d70e889af859e58422fd8be8bfe8411c
-EBUILD pahole-1.26.ebuild 1705 BLAKE2B 899776c2009a57de1e300fb0c24ee58036fb8bf3dd24ff78046aed7a5031c9d479be3e04fdc15f97a549e3a891997add3470b6090db050ba06689838c78b13b7 SHA512 62a5de1ed13ea5a2154ea9adfd01e36920d07d6b5df8ab35cf90f688a781d6a351b5b7bcaadc4a7789867485ce1bc2e96dba06718b3bd6ba1b323558481c4277
+EBUILD pahole-1.26.ebuild 1700 BLAKE2B 4659c07656ad327868766669b4cb5513616a2b92aafdd42a5904f7e984e0bcca7af60a2f5698921c27b1381c26d7ffc5157fc3bc2890b631da2b65979a99e8fa SHA512 e333c80cf2724b0a789ff54b7a5671db17fd657a724a9f820162be3449fd023580f0e3092bba0f0ac5a76a6c748d903de5c4d0a4ba9af32bd5e037a613d35104
 EBUILD pahole-9999.ebuild 1698 BLAKE2B 3f7a4d42fc08dd230544f946296cceded7e30ceb82bc2829b9bde7a24f87719812510c1d9d9292a03980442feb423c222ad3fa2c3f6713f146d1c9f466562701 SHA512 98e1827d57611960bf6d1e888d69c6f786c1d5280aa4fc683d6cf850f1a7c56254ace4de0118f73ef80f2caadbecf3f36392de91f4b92acdc318fef21af051ab
 MISC metadata.xml 672 BLAKE2B 2178381434a5293df5a6a07a8c84c20a4f98d011c90ed2db911085639689224509445e16197ff88e0ab6fb7e6357bc96291feff21a44f350f51b1031e1882477 SHA512 2cd1f865e42bd845bb3831a1f6c8060e469e0afb3acbaaec2989018481a6f93e0fdae9afb74413c00db6967069cc6d0447548c3b4c238a70db07ee8786fe1e99
diff --git a/dev-util/pahole/pahole-1.26.ebuild b/dev-util/pahole/pahole-1.26.ebuild
index 2e86a3d3a4e3..50575560130c 100644
--- a/dev-util/pahole/pahole-1.26.ebuild
+++ b/dev-util/pahole/pahole-1.26.ebuild
@@ -37,7 +37,7 @@ LICENSE="GPL-2" # only
 SLOT="0"
 IUSE="debug"
 if [[ ${PV} != 9999 ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv x86"
 fi
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 8e27880f3723..52454a628966 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -4,11 +4,9 @@ AUX perf-6.4-libtracefs.patch 780 BLAKE2B dc97e42f1d3ece03722441b5a2c1f87ab9871c
 AUX perf-6.6-ia64.patch 383 BLAKE2B b591a771293efba21529489ab82f64e7b31005a4a8299fc43f89f9ee427a7be8d7b19de6be86d842c0366c0d0fc8e0be2987b1152908bf167d7d9aff9ad74208 SHA512 6e52b7f1b1f42773db7c4bee8b34e52e1ab5cde6bfadfbb028f54b70676cfbff85db3284f6a6d1963298e5959810ddac131f19538458b2d2a5b910524e779016
 AUX perf-6.7-expr.patch 1257 BLAKE2B 1ff41975d84f835a343d2b2f9f049edd817bf80ca576879c7f819608506341b5d19147cf3ecd67a731ab6ecf9a45ce494a8a665aa1bff86cc14f3967a6dd12a0 SHA512 8f1a5a8412464f7623b10da562552b2ac17ca8e70eb4507a3751493662e64066828f2b7a73f1bc7546f463d8d21919f59622b978a6bacafed6a93f232a15ff0b
 DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
-DIST linux-6.5.tar.xz 138898084 BLAKE2B 2e641b79a080e8f4ce283bcf6b74e2c6f15a374367f1c4c875c663868dbe801317340824fb3adb46b3a51d3b7e1f67cc4e8144d367621ec43ffba5c4eb8abb39 SHA512 1b59dc5e65d4922c3217a8c8f19022dfd6595ae89747861d825bfeb51a4ae6c85449d05db69635a712bef7b355b80318195665582d8933b1fed6ba582f6ff257
-DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
 DIST linux-6.7.tar.xz 141406528 BLAKE2B cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e SHA512 de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad
-EBUILD perf-6.3.ebuild 7858 BLAKE2B b0ff8805e452c55860737db1e787993872a4a8ac9f9ad2691bc7fc14201e8b171bbe360800ed6c871c8ac59f8e629406d1bd658022b96ba73a922432e7858892 SHA512 4a3ed29c04e0a0906575818077a03347d04e4136721a88d0643f1323e9f8d9a9eb80c04f757bed21669278d80d300c0ccafe4251fbdf375eaf0500f291eab968
-EBUILD perf-6.5.ebuild 8587 BLAKE2B 797967c4b917775e65a5098d15261b9737dcf02ea2ddb1db71457b917f1fe8a8eac77eb4a92a1c48f56cfca723fa4a8fbf56e504182e2ebc1a46f4b2d54fd46c SHA512 f909c034459878e5e3ef9dab0bc2c3db92c3f9442578b889225a731022c1b5c4b11f436c589d40074b096628d52f115e1e0a501fbe697ff95dd467f00dbe248a
-EBUILD perf-6.6.ebuild 9038 BLAKE2B c04a4e69c0ccb487731f343015f3781950c24ed882e155522c46880db9dd57621e14f92ece62fa630431c3836864f30b923343294240c5b3ab0c2b3c4f18a8be SHA512 3ef3bdd317f3a23edf66ca2378c771442e17d56790ec369700b77ba59aedfd3e4a7660a3fd9d2e6e9422091cc5934a78bd7fdea536f2395906310d9f3d80d40c
-EBUILD perf-6.7.ebuild 9076 BLAKE2B bc0d42ffb1a7224b80d99372b4e48c75a849e3561024d57ae073ef759cd931b6c982d12bbf674c2247065530e2b5af3386792fe0e0719cdebb66641d75cf69c4 SHA512 078e6115be9b007f686ade10667fa75363776be20ca0fb3af5efffbbcdbece432260f758070e2ead304cef880f818fe0a0141c909e89c815d0d5fd688df70abf
+DIST linux-6.8.tar.xz 142502100 BLAKE2B c6f17f816cea16e629f63e9379b98888713f57b2c5173306926471f139a9d612a0c74e119341f8075390e55e203d787d9edeb4ad5a064b18870f6f0f7ffaafb2 SHA512 5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068
+EBUILD perf-6.3.ebuild 7858 BLAKE2B c571be537787a682baea6755bfb8df0c1ca1e62be4982ca3bb440aa513189dfe7388705720531d47fe8c18f1c6d04871e96a1804e29296181c194237efaabcea SHA512 3f1aed8b58ce5f3b2b3449e8661d596d31f7991054c86d33b836bed80ba06a042f10681a16be6b67327da1797f144926a30a383c5388c694769e48785e2f5bda
+EBUILD perf-6.7.ebuild 9071 BLAKE2B 1b7bee777832958174bed0acbaba4d3438941435061d253438db600d7f2a24f06853c94e1490032b1859935a1e46dd7eb96974da91354bb82ced6748614fbd43 SHA512 ed8f49a6ca12ee58dbd6d0997dc4cb9c7f3f4eb9757e6ec2b2dab1c2ab0bc32071823155cb27543bc997b12b0b4b4ce5c3b0605ec66ac5afa8128754322a9bc7
+EBUILD perf-6.8.ebuild 9094 BLAKE2B 6d08a549e098b38ddc79fe12d1458725742570176720cc29156d01a171f5d1810e6704b215df121ad23a54aa7bc3f349f170189fb4fa58229c4ee3d66bc80226 SHA512 007b468f181524514ffd325789a07c4f4e640ff9137abdbe71f411b67b2b7394e154ad2aea0994966bab53877105608b7a08bebd0b454cf2504e068dadae1f04
 MISC metadata.xml 1642 BLAKE2B 648d70e60d8f8661c475da2be7ce7d120d1d96d505b2a9cacf92f5922c3c1266c0e0d3f8731c00a443cd7b05e317e874675038e709f0045d3e2f8e47ce4ffd6c SHA512 7da28e8493f318cd8b8a5e4f03f6f0deffc6b42ff9a4b9f304ccf684ea30dc85e0525804cd851ba1597f49d3500681d76c7fd7b6de08c1e479f1fdf4f91d0cae
diff --git a/dev-util/perf/perf-6.3.ebuild b/dev-util/perf/perf-6.3.ebuild
index a441b1091d01..80e9fe676047 100644
--- a/dev-util/perf/perf-6.3.ebuild
+++ b/dev-util/perf/perf-6.3.ebuild
@@ -28,6 +28,9 @@ fi
 LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
 SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
@@ -79,9 +82,6 @@ DEPEND="${RDEPEND}
 	java? ( virtual/jdk )
 "
 
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
 CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
 
 QA_FLAGS_IGNORED=(
diff --git a/dev-util/perf/perf-6.5.ebuild b/dev-util/perf/perf-6.5.ebuild
deleted file mode 100644
index 31d57afa8da7..000000000000
--- a/dev-util/perf/perf-6.5.ebuild
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit bash-completion-r1 estack flag-o-matic linux-info llvm toolchain-funcs python-r1
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
-	LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
-	PATCH_VERSION=$(ver_cut 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
-		https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
-	# stable-release series
-	LINUX_VER=$(ver_cut 1-2)
-	LINUX_PATCH=patch-${PV}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
-	LINUX_VER=${PV}
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit babeltrace bpf caps clang crypt debug +doc gtk java libpfm libtraceevent libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
-
-REQUIRED_USE="
-	bpf? ( clang )
-	${PYTHON_REQUIRED_USE}
-"
-
-# setuptools (and Python) are always needed even if not building Python bindings
-BDEPEND="
-	${LINUX_PATCH+dev-util/patchutils}
-	${PYTHON_DEPS}
-	>=app-arch/tar-1.34-r2
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	app-alternatives/yacc
-	app-alternatives/lex
-	virtual/pkgconfig
-	doc? (
-		app-text/asciidoc
-		app-text/sgml-common
-		app-text/xmlto
-		sys-process/time
-	)
-"
-
-RDEPEND="
-	audit? ( sys-process/audit )
-	babeltrace? ( dev-util/babeltrace )
-	bpf? (
-		dev-libs/libbpf
-		dev-util/bpftool
-		dev-util/pahole
-	)
-	caps? ( sys-libs/libcap )
-	clang? (
-		sys-devel/clang:=
-		sys-devel/llvm:=
-	)
-	crypt? ( dev-libs/openssl:= )
-	gtk? ( x11-libs/gtk+:2 )
-	java? ( virtual/jre:* )
-	libpfm? ( dev-libs/libpfm:= )
-	libtraceevent? ( dev-libs/libtraceevent )
-	libtracefs? ( dev-libs/libtracefs )
-	lzma? ( app-arch/xz-utils )
-	numa? ( sys-process/numactl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	slang? ( sys-libs/slang )
-	systemtap? ( dev-debug/systemtap )
-	tcmalloc? ( dev-util/google-perftools )
-	unwind? ( sys-libs/libunwind:= )
-	zstd? ( app-arch/zstd:= )
-	dev-libs/elfutils
-	sys-libs/binutils-libs:=
-	sys-libs/zlib
-"
-
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-5.10
-	java? ( virtual/jdk )
-"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="
-	~DEBUG_INFO
-	~FTRACE
-	~FTRACE_SYSCALLS
-	~FUNCTION_TRACER
-	~KALLSYMS
-	~KALLSYMS_ALL
-	~KPROBES
-	~KPROBE_EVENTS
-	~PERF_EVENTS
-	~UPROBES
-	~UPROBE_EVENTS
-"
-
-QA_FLAGS_IGNORED=(
-	'usr/bin/perf-read-vdso32' # not linked with anything except for libc
-	'usr/libexec/perf-core/dlfilters/.*' # plugins
-)
-
-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_pkg_setup
-	# We enable python unconditionally as libbpf always generates
-	# API headers using python script
-	python_setup
-
-	if use bpf ; then
-		CONFIG_CHECK+="~BPF ~BPF_EVENTS ~BPF_SYSCALL ~DEBUG_INFO_BTF ~HAVE_EBPF_JIT"
-	fi
-
-	linux-info_pkg_setup
-}
-
-# src_unpack and src_prepare are copied to dev-util/bpftool since
-# it's building from the same tarball, please keep it in sync with bpftool
-src_unpack() {
-	local paths=(
-		kernel/bpf tools/{arch,bpf,build,include,lib,perf,scripts}
-		scripts include lib "arch/*/lib"
-	)
-
-	# We expect the tar implementation to support the -j option (both
-	# GNU tar and libarchive's tar support that).
-	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-		"${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		eshopts_push -o noglob
-		ebegin "Filtering partial source patch"
-		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
-			> ${P}.patch
-		eend $? || die "filterdiff failed"
-		eshopts_pop
-	fi
-
-	local a
-	for a in ${A}; do
-		[[ ${a} == ${LINUX_SOURCES} ]] && continue
-		[[ ${a} == ${LINUX_PATCH} ]] && continue
-		unpack ${a}
-	done
-}
-
-src_prepare() {
-	default
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		pushd "${S_K}" >/dev/null || die
-		eapply "${WORKDIR}"/${P}.patch
-		popd || die
-	fi
-
-	pushd "${S_K}" >/dev/null || die
-	eapply "${FILESDIR}"/perf-6.0-clang.patch
-	eapply "${FILESDIR}"/perf-6.0-c++17.patch
-	eapply "${FILESDIR}"/perf-6.4-libtracefs.patch
-	popd || die
-
-	# Drop some upstream too-developer-oriented flags and fix the
-	# Makefile in general
-	sed -i \
-		-e "s@\$(sysconfdir_SQ)/bash_completion.d@$(get_bashcompdir)@" \
-		"${S}"/Makefile.perf || die
-	# A few places still use -Werror w/out $(WERROR) protection.
-	sed -i -e 's@-Werror@@' \
-		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile \
-		"${S_K}"/tools/lib/perf/Makefile || die
-
-	# Avoid the call to make kernelversion
-	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' {} +
-}
-
-puse() { usex $1 "" 1; }
-perf_make() {
-	# The arch parsing is a bit funky.  The perf tools package is integrated
-	# into the kernel, so it wants an ARCH that looks like the kernel arch,
-	# but it also wants to know about the split value -- i386/x86_64 vs just
-	# x86.  We can get that by telling the func to use an older linux version.
-	# It's kind of a hack, but not that bad ...
-
-	# LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
-	local arch=$(tc-arch-kernel)
-	local java_dir
-	use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
-
-	# sync this with the whitelist in tools/perf/Makefile.config
-	local disable_libdw
-	if ! use amd64 && ! use x86 && \
-	   ! use arm && \
-	   ! use arm64 && \
-	   ! use ppc && ! use ppc64 \
-	   ! use s390 && \
-	   ! use riscv && \
-	   ! use loong
-	then
-		disable_libdw=1
-	fi
-
-	# FIXME: NO_CORESIGHT
-	local emakeargs=(
-		V=1 VF=1
-		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}"
-		EXTRA_LDFLAGS="${LDFLAGS}"
-		ARCH="${arch}"
-		BUILD_BPF_SKEL=$(usex bpf 1 "") \
-		BUILD_NONDISTRO=1
-		JDIR="${java_dir}"
-		CORESIGHT=
-		GTK2=$(usex gtk 1 "")
-		LIBCLANGLLVM=$(usex clang 1 "")
-		feature-gtk2-infobar=$(usex gtk 1 "")
-		NO_AUXTRACE=
-		NO_BACKTRACE=
-		NO_DEMANGLE=
-		NO_JEVENTS=$(puse python)
-		NO_JVMTI=$(puse java)
-		NO_LIBAUDIT=$(puse audit)
-		NO_LIBBABELTRACE=$(puse babeltrace)
-		NO_LIBBIONIC=1
-		NO_LIBBPF=$(puse bpf)
-		NO_LIBCAP=$(puse caps)
-		NO_LIBCRYPTO=$(puse crypt)
-		NO_LIBDW_DWARF_UNWIND="${disable_libdw}"
-		NO_LIBELF=
-		NO_LIBNUMA=$(puse numa)
-		NO_LIBPERL=$(puse perl)
-		NO_LIBPFM4=$(puse libpfm)
-		NO_LIBPYTHON=$(puse python)
-		NO_LIBTRACEEVENT=$(puse libtraceevent)
-		NO_LIBUNWIND=$(puse unwind)
-		NO_LIBZSTD=$(puse zstd)
-		NO_SDT=$(puse systemtap)
-		NO_SLANG=$(puse slang)
-		NO_LZMA=$(puse lzma)
-		NO_ZLIB=
-		TCMALLOC=$(usex tcmalloc 1 "")
-		WERROR=0
-		LIBDIR="/usr/libexec/perf-core"
-		libdir="${EPREFIX}/usr/$(get_libdir)"
-		plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins"
-		"$@"
-	)
-	emake "${emakeargs[@]}"
-}
-
-src_compile() {
-	filter-lto
-
-	# test-clang.bin not build with g++
-	if use clang; then
-		make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die
-	fi
-	perf_make -f Makefile.perf
-	use doc && perf_make -C Documentation man
-}
-
-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
-
-	if use gtk; then
-		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
-		doman Documentation/*.1
-	fi
-}
diff --git a/dev-util/perf/perf-6.7.ebuild b/dev-util/perf/perf-6.7.ebuild
index cc5b677f7e20..d261f3170eca 100644
--- a/dev-util/perf/perf-6.7.ebuild
+++ b/dev-util/perf/perf-6.7.ebuild
@@ -28,9 +28,12 @@ fi
 LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
 SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
 
 REQUIRED_USE="
@@ -92,9 +95,6 @@ DEPEND="${RDEPEND}
 	java? ( virtual/jdk )
 "
 
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
 QA_FLAGS_IGNORED=(
 	'usr/bin/perf-read-vdso32' # not linked with anything except for libc
 	'usr/libexec/perf-core/dlfilters/.*' # plugins
diff --git a/dev-util/perf/perf-6.6.ebuild b/dev-util/perf/perf-6.8.ebuild
index 6436d68b9705..71d7382d4545 100644
--- a/dev-util/perf/perf-6.6.ebuild
+++ b/dev-util/perf/perf-6.8.ebuild
@@ -28,6 +28,9 @@ fi
 LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
 SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
@@ -56,7 +59,7 @@ BDEPEND="
 
 RDEPEND="
 	audit? ( sys-process/audit )
-	babeltrace? ( dev-util/babeltrace )
+	babeltrace? ( dev-util/babeltrace:0/1 )
 	bpf? (
 		dev-libs/libbpf
 		dev-util/bpftool
@@ -85,6 +88,7 @@ RDEPEND="
 	dev-libs/elfutils
 	sys-libs/binutils-libs:=
 	sys-libs/zlib
+	virtual/libcrypt
 "
 
 DEPEND="${RDEPEND}
@@ -92,23 +96,6 @@ DEPEND="${RDEPEND}
 	java? ( virtual/jdk )
 "
 
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="
-	~DEBUG_INFO
-	~FTRACE
-	~FTRACE_SYSCALLS
-	~FUNCTION_TRACER
-	~KALLSYMS
-	~KALLSYMS_ALL
-	~KPROBES
-	~KPROBE_EVENTS
-	~PERF_EVENTS
-	~UPROBES
-	~UPROBE_EVENTS
-"
-
 QA_FLAGS_IGNORED=(
 	'usr/bin/perf-read-vdso32' # not linked with anything except for libc
 	'usr/libexec/perf-core/dlfilters/.*' # plugins
@@ -123,6 +110,20 @@ pkg_pretend() {
 }
 
 pkg_setup() {
+	local CONFIG_CHECK="
+		~DEBUG_INFO
+		~FTRACE
+		~FTRACE_SYSCALLS
+		~FUNCTION_TRACER
+		~KALLSYMS
+		~KALLSYMS_ALL
+		~KPROBES
+		~KPROBE_EVENTS
+		~PERF_EVENTS
+		~UPROBES
+		~UPROBE_EVENTS
+	"
+
 	use bpf && llvm_pkg_setup
 	# We enable python unconditionally as libbpf always generates
 	# API headers using python script
@@ -140,7 +141,7 @@ pkg_setup() {
 src_unpack() {
 	local paths=(
 		kernel/bpf tools/{arch,bpf,build,include,lib,perf,scripts}
-		scripts include lib "arch/*/lib"
+		scripts include lib "arch/*/lib" "arch/*/tools"
 	)
 
 	# We expect the tar implementation to support the -j option (both
@@ -176,7 +177,7 @@ src_prepare() {
 
 	pushd "${S_K}" >/dev/null || die
 	eapply "${FILESDIR}"/perf-6.4-libtracefs.patch
-	eapply "${FILESDIR}"/perf-6.6-ia64.patch
+	eapply "${FILESDIR}"/perf-6.7-expr.patch
 	popd || die
 
 	# Drop some upstream too-developer-oriented flags and fix the