12 files changed, 141 insertions, 79 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index ad16e5582043..b8fab9c9536b 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index d8581ed354d2..827dc378e407 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -1,6 +1,7 @@
 AUX edb-debugger-1.3.0-capstone-5.patch 1135 BLAKE2B 835105b255338811747521ca9b76c88eb5b88cebb050c536657b110fcf20fa81b5e0a33fae1c81fe9c890daba9021f4782df7440a1197ae5da7b325a1076d504 SHA512 7b6edec1d8fa7f350883eb0e1184c5051096dec3a4ea9519dbaacd036a0c893ed452f11906ae2c1844c94f3df5f215ba43a21cc70c5da74412b1e905deb9c06a
 AUX edb-debugger-1.3.0-gcc12.patch 3374 BLAKE2B 6e75e6d940da2d54d20bfdd62dd26c7955ffcc00d00d84a1029b583b00bee69106e43a64ad5b9ab96a269b84f7a69e48c12d6acbfd0f4404b8d490660620c35f SHA512 9b0fb244ce7e80ca4810323d6198e273019b3255c40e198563da109e228f1329bf0b36560024607b6015bc1ba992e396151858cb1bed1fecc39d2dd688232e62
+AUX edb-debugger-1.3.0-gcc13.patch 795 BLAKE2B eed779fd71962ec451606d54793e7ce9628a5ced1f05fc82ebeb3ae807be175060f9a7e881252d78143ee29c5bd1cedadaebdfc229bdf641aa4e46fbbb3b533b SHA512 836516212cc893dde4774854fe76856b6cc40dafa58bebf8a7757d7d758b9d8d2885f6690018be49f233d3208639ab84393a381f2660c86b184f07c3094144f7
 DIST edb-debugger-1.3.0.tgz 618227 BLAKE2B 1650e727851b629d7778c8488a464b6439f2ac4e5a72c0738cfe1ee302538b0d97dcbf9587a1108a82f8f8f4a6bec273e31ad454063f70704ffb48ca8ba5b73f SHA512 9d813bb61cdc7b61b594e63834ffb3999d3e1bb0c7a435095efea9b3b6726369a06c553ba6633df160d9456758ff54d5eee8cfbee6a1304f3a01d09fe2c7a65d
-EBUILD edb-debugger-1.3.0-r1.ebuild 1336 BLAKE2B 41f403885d80cda118d40e99da7b0f814f2fef59f050a1e3c2a02f87496d14cd2ce0a2cfda87069eeb9feeffe73925ef7c2329df2d9872a0564a90e9f09b369e SHA512 f63b41bbc3f219457eb4e66c64ba197bc242b0d33894f0868616a4b764c89b981f6ae34280f4c336706025195adc05295d99d0134827c9e18fed55c88548abf4
+EBUILD edb-debugger-1.3.0-r1.ebuild 1375 BLAKE2B 25f7091c0fa381012646549cbb277ea495dde4b36857f136c39fe56ecb932fc919388ec10f2bee701d8dd3fe7ab2b40f792c4e2f8b8b458e66c1d97929ba0600 SHA512 93f5c031ae3c96ba8b3a8cdf6e1ba1f54cb2a5a3d33ba4e3aa1963129855fc88d67bb42dbb2bdff92b5ac95b556a6c38617b61f36ac38d17c1e5bbdcca657db1
 EBUILD edb-debugger-9999.ebuild 1247 BLAKE2B 227bada04e32d2ddd645338e6572b68d8b70b920f2925e02c78d3e57c9922f30e18849920a3fff9f1a7ede030e77f2df83bef2f01ed2cd26be1c4f34b2ee879f SHA512 53ebf7ff9a2ab643b45610e3ab5b99d1cc8976a60d7ac08e23f068de850201523f25d8fd8879ffc9f6367f43040e287018665f730a8f379e81c4b049304b3e07
 MISC metadata.xml 252 BLAKE2B fb12cf596eb089cfb2077cf0726394d90785dbea303035ffbb140513dbb5e0fc69ddcdab039f0d159a41cedd601084eab5f93d017c8eed995112ced496a1ebf2 SHA512 23a9f942e083e04792112e33470839ef3906e11035ef61a24b4f5aa2bf0a5b4fc322ed9f48e09905132c9a8a5f7abe02b2711bd3396da9f6d4ec95fea50ccadb
diff --git a/dev-util/edb-debugger/edb-debugger-1.3.0-r1.ebuild b/dev-util/edb-debugger/edb-debugger-1.3.0-r1.ebuild
index 01f72a1e8911..1e01b9496797 100644
--- a/dev-util/edb-debugger/edb-debugger-1.3.0-r1.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,6 +40,7 @@ BDEPEND="virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc12.patch
 	"${FILESDIR}"/${PN}-1.3.0-capstone-5.patch
+	"${FILESDIR}"/${PN}-1.3.0-gcc13.patch
 )
 
 src_prepare() {
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.3.0-gcc13.patch b/dev-util/edb-debugger/files/edb-debugger-1.3.0-gcc13.patch
new file mode 100644
index 000000000000..f30eacc97436
--- /dev/null
+++ b/dev-util/edb-debugger/files/edb-debugger-1.3.0-gcc13.patch
@@ -0,0 +1,26 @@
+https://github.com/eteran/edb-debugger/pull/837
+
+From 934de81a7799f3e1d210366e0eb5ea86d172ead4 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 15 Apr 2023 10:05:11 +0100
+Subject: [PATCH] Fix build with GCC 13
+
+GCC 13 (as usual for new compiler releases) shuffles around some internal includes so some
+are no longer transitively included.
+
+See https://gnu.org/software/gcc/gcc-13/porting_to.html.
+
+Bug: https://bugs.gentoo.org/897890
+--- a/plugins/DebuggerCore/unix/linux/FeatureDetect.cpp
++++ b/plugins/DebuggerCore/unix/linux/FeatureDetect.cpp
+@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #include "FeatureDetect.h"
+ #include "edb.h"
+ 
++#include <cstdint>
+ #include <fcntl.h>
+ #include <iomanip>
+ #include <iostream>
+-- 
+2.40.0
+
diff --git a/dev-util/librnp/Manifest b/dev-util/librnp/Manifest
index 770b837203d2..f2fc398dccd9 100644
--- a/dev-util/librnp/Manifest
+++ b/dev-util/librnp/Manifest
@@ -1,5 +1,3 @@
-DIST librnp-0.16.2.tar.gz 2897137 BLAKE2B 5f756047506531e0ed3d431cebd3977f3492b464445f6dc54850badc795478f5d04ff036147e8212b4a3e2d4fd939f4bcf668e9a260c2e7fc616ef51dea02117 SHA512 5fd5fceb39429e130adafd4869d9a01149d9c08271770da4eedbe75910788f8256c8bf19e6bb0886a902b22dd5564eb93baddaf84689cbf5e6617674f4f0efac
 DIST librnp-0.16.3.tar.gz 2897854 BLAKE2B 71e39e810bdbee351c8136df1d11621daccb1738db691b99244ffe5bd2ea372c3ef520ade7cd63c38510fae0f252d5a1c2ceb44db3fbffbd64dfc10612341e29 SHA512 b133fb1f9aab6e9b5caecdcf0bd9f2c67a62a98543ca1ac6a7cf4a35b7a571d53e4fa99cefc98f8253117cf0de16194db309efa03bc40fd3556f9b84cf51a942
-EBUILD librnp-0.16.2.ebuild 1621 BLAKE2B 36d97936371e4c8c4f4c6abf21c2f34eb39b113731a89a4d595a191eaaa745940c05818eef87cfd653615b17b3fdba776c7c61d658c07cf2a26cf5efb299304b SHA512 802d1f54b978f8940abc18fb09af1964288aaef944c5b6f09c506e071cea19bf68a9669df894f0427430a354057e1457e56642abe38a1d70ecaed86cd22805a7
 EBUILD librnp-0.16.3.ebuild 1666 BLAKE2B 2858d566a6efbedca19f28d50abaaa59a80d4d480a105d9f5ae2ae58f87d4c0d784675109d15639f0bed4ad772e2521dbe384244af987d518f76e5823436a88a SHA512 b150cc2fe6a6e75dd415b733b47b45b7004540a0cbdfb0684535753d932c3bf622e7fd173ae128a7d6229dedbf710c80c7695dea138d5a1ec2741e42566818fc
 MISC metadata.xml 430 BLAKE2B 739d6cddc56f385ad2b1679f6b3d9ba567ce77ec536894ca3861ad7ad127fd60c395db49b31d89963df12c03d8cf69fc6f083f5d3361b790079952c1e76ccf03 SHA512 ad7b3e6332741e1f2eae9e158d5ca767f5985a8f5c86eb5f21b7ee0214b9c7fdd2e90beddf1a9287218edf35aff39bd7ff1a4f1d15eb10552ab664738f8d1959
diff --git a/dev-util/librnp/librnp-0.16.2.ebuild b/dev-util/librnp/librnp-0.16.2.ebuild
deleted file mode 100644
index f4aad9db34fd..000000000000
--- a/dev-util/librnp/librnp-0.16.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="High performance C++ OpenPGP library"
-HOMEPAGE="https://www.rnpgp.org/ https://github.com/rnpgp/rnp"
-SRC_URI="https://github.com/rnpgp/rnp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2"
-SLOT="0/0.16.1"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="+botan man test"
-
-RDEPEND="app-arch/bzip2
-	dev-libs/json-c:=
-	sys-libs/zlib
-	botan? ( dev-libs/botan:2= )
-	!botan? ( >=dev-libs/openssl-1.1.1:= )"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-BDEPEND="man? ( dev-ruby/asciidoctor )"
-
-RESTRICT="!test? ( test )"
-S="${WORKDIR}/${P/*lib/}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test on off)
-
-		-DCRYPTO_BACKEND=$(usex botan botan openssl)
-
-		-DDOWNLOAD_GTEST=off
-		-DDOWNLOAD_RUBYRNP=off
-
-		-DENABLE_COVERAGE=off
-		-DENABLE_DOC=$(usex man on off)
-		-DENABLE_FUZZERS=off
-		-DENABLE_SANITIZERS=off
-	)
-
-	if use botan; then
-		local mycmakeargs+=(
-			-DENABLE_AEAD=on
-			-DENABLE_BRAINPOOL=on
-			-DENABLE_IDEA=on
-			-DENABLE_SM2=on
-			-DENABLE_TWOFISH=on
-		)
-
-	# OpenSSL support is still not as complete as botan.
-	# https://github.com/rnpgp/rnp/issues/1642 AEAD,
-	# https://github.com/rnpgp/rnp/issues/1877 SM2,
-	# https://github.com/openssl/openssl/issues/2046 TWOFISH.
-	else
-		local mycmakeargs+=(
-			-DENABLE_AEAD=off
-			-DENABLE_BRAINPOOL=on
-			-DENABLE_IDEA=on
-			-DENABLE_SM2=off
-			-DENABLE_TWOFISH=off
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	ctest -j"${MAKEOPTS}" -R .* --output-on-failure || die
-}
diff --git a/dev-util/pahole/Manifest b/dev-util/pahole/Manifest
index 3df9c739bd21..cbc565f051b5 100644
--- a/dev-util/pahole/Manifest
+++ b/dev-util/pahole/Manifest
@@ -1,6 +1,8 @@
 AUX pahole-1.10-python-import.patch 399 BLAKE2B 7abd98ec5711ec4ce9230a2d0bb06328174a4a67b62ba14b2413b83b6d44676d372930d4796b9ece230c4de9185d35cb31a086ca340871e50e29d584ab9a7487 SHA512 c2f5c1e99ef2ffeaf0e7962cbdf28817f6896b27ff6894571823c81ba08b9e9440af1a5b6ad82770b8e8d6ec99ec2ef8f46a98b67fea7cd4ed7e8c22e716e314
 DIST dwarves-1.24.tar.xz 875744 BLAKE2B 6766b5a5ecbf64013227e7cd459af662fc213f230b5b1279354fcaaccebfa3d74f9a2254542dc4f3f1bb4a5def1d4c77e2445fa8b531fa8b9e331cdfc23155fe SHA512 3cdca183cf68ec46fd9a0301ae4a8a30b23a8139c65ffba64ae11f85f9e942f7341dca6f88a4a3b49f32bfd880927193a80fa011726e4a33d3e5a1a146326c06
+DIST dwarves-1.25.tar.xz 2244876 BLAKE2B 1926fa1fa123fc3ad0f7f063406260b1e1e2611c563fedebee4c837e491164571fdb40408421c0c4ea2fd24e89c54a7a1ea669313b6dd6d7dcfa4934e2c1336e SHA512 104bfb8712d863e04d0c827c008b23ebc49543b17bfb5b44ce276a5b3d39f12cf71f721055ae2e5f430aa77a3c70f85f6eeaf72fd8c1cdf547260488bc5b5070
 DIST pahole-1.24_p20221024-patches.tar.xz 22088 BLAKE2B b39458400411dd7da0f568257f42164952e170b952e4893a92d769e17ce4cf0de88b727808a38195438fe10e5537f245bf101f647f383b6df7642c5446fa5d45 SHA512 93f160f01023c5402535a34d59005f0a3e056662a2764722480d71b6e522f3bfef0d642084467d1fbea96e23386b4cbb708243713d59eb84f4f767c1ac5ab3f5
 EBUILD pahole-1.24_p20221024.ebuild 1693 BLAKE2B d7e4545a961c61fc928e4e553ef79c335f8fc7948dddc51610a30d9cc423617ceb84006b34f9401010ddf0e50cc3754188cde6f1026eab0f93aa4f8d6746791a SHA512 a81a323b7061aeb227e48ad1eb33dd0f8417cc2921a8cdd48ad70d6d2bf56018ddf31e2695b0771fb6af4c9c8c8a1605c9bd9858f73418810bf6c8962d5cebd5
+EBUILD pahole-1.25.ebuild 1698 BLAKE2B ae7281d783be25d0d5cf060986e75cd7d1df973ddea10be0173306f36e258edb79e5d441f5b9262b51bd758a20217294411d3b7b3f67f8d039f9f2eb8d134439 SHA512 0afbe223fa78b2c40e8cc253582768338fa23ce76cf307157696e7cf0239cf305755f8e525c051e15ac117ea04fdd279948d6dbf9f0b9163173bcf2ab895fb5e
 EBUILD pahole-9999.ebuild 1698 BLAKE2B ae7281d783be25d0d5cf060986e75cd7d1df973ddea10be0173306f36e258edb79e5d441f5b9262b51bd758a20217294411d3b7b3f67f8d039f9f2eb8d134439 SHA512 0afbe223fa78b2c40e8cc253582768338fa23ce76cf307157696e7cf0239cf305755f8e525c051e15ac117ea04fdd279948d6dbf9f0b9163173bcf2ab895fb5e
 MISC metadata.xml 672 BLAKE2B 2178381434a5293df5a6a07a8c84c20a4f98d011c90ed2db911085639689224509445e16197ff88e0ab6fb7e6357bc96291feff21a44f350f51b1031e1882477 SHA512 2cd1f865e42bd845bb3831a1f6c8060e469e0afb3acbaaec2989018481a6f93e0fdae9afb74413c00db6967069cc6d0447548c3b4c238a70db07ee8786fe1e99
diff --git a/dev-util/pahole/pahole-1.25.ebuild b/dev-util/pahole/pahole-1.25.ebuild
new file mode 100644
index 000000000000..5d98a672167d
--- /dev/null
+++ b/dev-util/pahole/pahole-1.25.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake python-single-r1
+
+MY_PN=dwarves
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
+HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/pahole/pahole.git"
+	inherit git-r3
+elif [[ ${PV} == *_p* ]] ; then
+	# Snapshots
+	#SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
+
+	# Patch rollups from git format-patch. Sometimes there are important
+	# fixes in git which haven't been released (and no release in sight).
+	# Patch rollups are a bit better for understanding where changes have
+	# come from for users.
+	SRC_URI="
+		http://fedorapeople.org/~acme/${MY_PN}/${MY_P%%_p*}.tar.xz
+		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz
+	"
+	S="${WORKDIR}"/${MY_P%%_p*}
+else
+	SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz"
+	S="${WORKDIR}"/${MY_P}
+fi
+
+LICENSE="GPL-2" # only
+SLOT="0"
+IUSE="debug"
+if [[ ${PV} != 9999 ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/elfutils-0.178
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+DOCS=( README README.ctracer NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10-python-import.patch
+)
+
+src_prepare() {
+	[[ -d "${WORKDIR}"/${P}-patches ]] && PATCHES+=( "${WORKDIR}"/${P}-patches )
+
+	cmake_src_prepare
+	python_fix_shebang ostra/ostra-cg ostra/python/ostra.py
+}
+
+src_configure() {
+	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
+	cmake_src_configure
+}
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index ba32f287a3f8..d05eb3d1dad8 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,10 +1,11 @@
 AUX perf-5.18-clang.patch 1858 BLAKE2B 04c8306f29f2fbb273f622ff046162a2e41eac9e588744b72bb2e5e8953063d2b620eec4779cdf96cf82d0198986586c1006491f3a58aa763f6234db84500a02 SHA512 1700bf25766dbe850683797279ebc4ab5b9c5bf6268de100377a473893e250e556a20f150db3e94a9d157007cb00380a0a9e209b1c5fad132dff7ce9584a76da
+AUX perf-6.0-c++17.patch 1127 BLAKE2B 923390f761b588a01935e2b36ff25f916f91e752f76fc6e02999ddc51e297a13798b38a9d3523deab327c8fd6ee2ea02e93f454a4b799f61552c11c1cad574aa SHA512 add3956108a83fd58ca949f6f6a611c44a0f29a4b4eef28c4883a1ba6058b66203064837878becbd64d8afebef57beb1cefcfcedb2a95c221f6792dffcaf38cb
 AUX perf-6.0-clang.patch 1862 BLAKE2B e88655e51cb785b80cd44fefb73bb7668bf6d57205e478b106a0d0fbbee4e7089850c2328e796530347c354eb8e7e46e947c18e03ded488bede41de5f74f0b8e SHA512 0e92ba2e878b2b20f6d7c30ba5fde43388378c7f8e752a7c07dd65abc66e576be8f74cf9c06abb79713cc8c1cab37c9cd678f4e5bba8bb99ed1020317f278eb2
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
 DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
 DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b
 EBUILD perf-5.19-r1.ebuild 8078 BLAKE2B 675f034ee75f7f396ccba6767389c8c3451b1ad65d3d2a6bd60f7a51542f1aa3ee294752c860a908c1ebd691241ca43932b357251d4d9a2f5df8746f3c29081f SHA512 57f560689fd821c7138c3e00299fa97340bc591cd4e135b5a7ea4d14f4719a8716246dd9202d966e913fb2da761255d0f1af4a8fd16cbd06c4875e6557702a49
-EBUILD perf-6.0-r1.ebuild 7493 BLAKE2B e7a19bbd5aa31adec47dfc6a232badc0affaaaa6d5ee579f94d17a253ad30dd24fc3f0027554282b56436e015ebc179816c4054859f52d740ff709e96c39f2e6 SHA512 41361e5cb9ed7ecee8a5b6ab80545aa00b0529c7a58448b035b33514fe70579d3daf24272d793ccca7d40e2eedfd4a3d50ffe25ca2a5285105882a6d875bbb0a
-EBUILD perf-6.2-r1.ebuild 7497 BLAKE2B dc8694258adb55c79864084ae15bdc04a4f5bc75d0c57e6db77ab636a2fb28acb3c69d039022b6694eb42dc652876a83253c5a4fee9c6d5fabb2ae27e597763c SHA512 b1661320ed9cff48c2c68f500ff02f5c472b025c1e90fe50320910dabfeb837fc688e7c7c311a96eaacae799add63fdb87c4bbd20c06e94e9868515c56bf5bfb
+EBUILD perf-6.0-r1.ebuild 7536 BLAKE2B 251899b477331f4dd497b719dac3e48de878c291fc99182ba9c7a33119be2ffc7b5e43887a337c2f4bbea47e0b78ee38f3d48752d76e66809528153b88248780 SHA512 4da4de060dfba27d8db0871b21b19181eea6755cd76d15c91d511d2b486b2b70a3db68382811992511545fa9ed0e78ca032b28793e24069b84f04fca16d6d04f
+EBUILD perf-6.2-r1.ebuild 7540 BLAKE2B 3ff6c2d34a8703a43e4aae7085dd3f6442f282d7d1da4ef0014085f23c11f8c72dbef87e3073b1d12401e0ae9dbebd2976656d4e34e61faf3cacc9ddaa21fcbc SHA512 19155d0113bff382d4c0c4df712734562b53e52087c0a7d3e16adaaed1ca7e1d384b7527973de31363a87e596b902ef422b4f9b9bd718a6cd9d0557d2a4dfe69
 MISC metadata.xml 1381 BLAKE2B 99d6c9db46b79ad7abd993c123f826dbe3f5e7c33fea98139a7fc694fe4d81e67887873e9edb390d63e65ca351033a8bd62d799fac946e2334188c2a4b776328 SHA512 a952ee2f4173bd2957038614c6ebaa44ff20bcf57f83f8fc5eabbaced667a7254a3e326e0fca541f1ce10bcc4e1d0df0b46600268bf38baf39bb2dda2bb3e41d
diff --git a/dev-util/perf/files/perf-6.0-c++17.patch b/dev-util/perf/files/perf-6.0-c++17.patch
new file mode 100644
index 000000000000..08c34bc552ca
--- /dev/null
+++ b/dev-util/perf/files/perf-6.0-c++17.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/904169
+--- a/tools/perf/Makefile.config
++++ b/tools/perf/Makefile.config
+@@ -309,7 +309,7 @@
+ CORE_CFLAGS += -Wextra
+ CORE_CFLAGS += -std=gnu11
+ 
+-CXXFLAGS += -std=gnu++14 -fno-exceptions -fno-rtti
++CXXFLAGS += -std=gnu++17 -fno-exceptions -fno-rtti
+ CXXFLAGS += -Wall
+ CXXFLAGS += -fno-omit-frame-pointer
+ CXXFLAGS += -ggdb3
+--- a/tools/build/feature/Makefile
++++ b/tools/build/feature/Makefile
+@@ -339,7 +339,7 @@
+ 	$(BUILD)
+ 
+ $(OUTPUT)test-llvm.bin:
+-	$(BUILDXX) -std=gnu++14 				\
++	$(BUILDXX) -std=gnu++17 				\
+ 		-I$(shell $(LLVM_CONFIG) --includedir) 		\
+ 		-L$(shell $(LLVM_CONFIG) --libdir)		\
+ 		$(shell $(LLVM_CONFIG) --libs)			\
+@@ -347,12 +347,12 @@
+ 		> $(@:.bin=.make.output) 2>&1
+ 
+ $(OUTPUT)test-llvm-version.bin:
+-	$(BUILDXX) -std=gnu++14					\
++	$(BUILDXX) -std=gnu++17					\
+ 		-I$(shell $(LLVM_CONFIG) --includedir)		\
+ 		> $(@:.bin=.make.output) 2>&1
+ 
+ $(OUTPUT)test-clang.bin:
+-	$(BUILDXX) -std=gnu++14					\
++	$(BUILDXX) -std=gnu++17					\
+ 		-I$(shell $(LLVM_CONFIG) --includedir) 		\
+ 		-L$(shell $(LLVM_CONFIG) --libdir)		\
+ 		-lclang-cpp $(shell $(LLVM_CONFIG) --libs)	\
+
diff --git a/dev-util/perf/perf-6.0-r1.ebuild b/dev-util/perf/perf-6.0-r1.ebuild
index be9dbc82a5f9..04184b462006 100644
--- a/dev-util/perf/perf-6.0-r1.ebuild
+++ b/dev-util/perf/perf-6.0-r1.ebuild
@@ -145,6 +145,7 @@ src_prepare() {
 
 	pushd "${S_K}" >/dev/null || die
 	eapply "${FILESDIR}"/${P}-clang.patch
+	eapply "${FILESDIR}"/perf-6.0-c++17.patch
 	popd || die
 
 	# Drop some upstream too-developer-oriented flags and fix the
diff --git a/dev-util/perf/perf-6.2-r1.ebuild b/dev-util/perf/perf-6.2-r1.ebuild
index 8dc6385d598e..8a46cf67337d 100644
--- a/dev-util/perf/perf-6.2-r1.ebuild
+++ b/dev-util/perf/perf-6.2-r1.ebuild
@@ -145,6 +145,7 @@ src_prepare() {
 
 	pushd "${S_K}" >/dev/null || die
 	eapply "${FILESDIR}"/perf-6.0-clang.patch
+	eapply "${FILESDIR}"/perf-6.0-c++17.patch
 	popd || die
 
 	# Drop some upstream too-developer-oriented flags and fix the