10 files changed, 463 insertions, 6 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 8623fb73c793..16f6a16fc5db 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/global/Manifest b/dev-util/global/Manifest
index 62cc23f10b5a..01242bfca85b 100644
--- a/dev-util/global/Manifest
+++ b/dev-util/global/Manifest
@@ -4,6 +4,6 @@ AUX global-6.6.4-Fix-build-with-Clang-16.patch 765 BLAKE2B f12caf24c4c1ee74ee70b
 AUX global-6.6.4-fno-common.patch 946 BLAKE2B 8063d13db0942c0face6fde1411b96f352d706a85a4cf9f4b5c1eac43f6855e4c914166df2da8d01521a73f2d05b20df65aa25f6a3b965379346d2b523c8ca88 SHA512 f2579cbe22a4c97be0e7ccbf945b9d509bf22cdfa064e6e9fb6182204edf6085e97166ef3f771fe65942505259aa9b42b6c164c644ae95bba8d1e11f1319e0f4
 DIST global-6.6.10.tar.gz 2999863 BLAKE2B 496bac144c935893b29e23bbb1fa4583a5d6d0ab1b8cd818ff592d7259bb6fa832d79666703f2ac179b5fd39095fd922b8861ad73879c5bac299f9b785797c0b SHA512 babbba6a8dc701b401a12d9961cb7510983e44c7f80836d6d0da165fd0d8cc695e20b7c241526839aef2a70c8bbf97727d910ff17c37751ba3438267139b45d1
 DIST global-6.6.4.tar.gz 2988969 BLAKE2B 784087537094d27c10d1f2bc992e799c35ab6ce3b86e041c31279e6954b203e80676b3158ba95e7957456b75a213d70998aae9047836cd4d388212236f05a081 SHA512 cb4ed451d3aaf47c4c59cdc3f74c97d3171108177d4846b5dac843589710e66d87c9d7bbe080c3770329e8e40105ac52dcafb4609257347593cca4d94711f483
-EBUILD global-6.6.10.ebuild 1853 BLAKE2B 1981bac77cca61b5ae085985d13d8c192fc46bbc03a3f01be63bee04b5bb8cd680707d7954de692454a7f3c8beca85edd36e0cfe6b7f4680ac101f3d0625790a SHA512 ab92b545a6acd1404fe672949d89bd8aad8ca563b0c515c0a442c56de1eb0dbc68dedf632c0f35a8054c7394bf403b8cf43060198ecb83bde1bec03a35a521d5
-EBUILD global-6.6.4.ebuild 1754 BLAKE2B 6d8418ee6ff003ed998a6322fc9d279878c41b64b319f51746230520d4a2ca1c7bb447752b78f2c292c3e663d238fe9590ce14e1ae24dfb720b8c05708f772be SHA512 d4f5df9ca59748b7fe5cdbd73611153c5ab41f0dd4c1badaad751cc6e3df74c12297a6dea427a7db20e23653d2d4aff24b85a4198fd2380e5ca3685c210aadf6
+EBUILD global-6.6.10.ebuild 1878 BLAKE2B 040ef58fc9297bc3a26b243ec4019723aed753732e7a821eec833ca7f39a27b963959f24ee055177cdfddf542d7d0710425bf541f84e07cd007a2e1ce9a30363 SHA512 614e0b31a26cb51ade41dd10948a001a3d7dae5dc6306c7e94699b202052f26e654188f5efb42b0b86a6739d3c455c10ff92ce625684103878a7b6f027ea1479
+EBUILD global-6.6.4.ebuild 1755 BLAKE2B 1bf15f63f626ec480ebbd856707b944a45b98710a917aa8e8b25ccd37238d07d82c5b70b93cdde1b7b76ff6cf4b767c1df30cbc63250da0254414081b5b60195 SHA512 0ad8ccf8d0e7cb7e3bd27d05cde09eb6e39ca127696264353eabffbb9441b666710383e7161e4858628c5713930d3347f2bdc150735cefcca3a6846b10af7e9a
 MISC metadata.xml 531 BLAKE2B e924bbdcadc141f5887406f1d454e4ec6c0eca649b5b4bce6bf0c014c636ae10c2a1a95c85c1e772a4172ff678405c545971c5326342dcc57e602184482e65d3 SHA512 121675702866a2c22cdf2d8677aba864bf86f9ac403ab0e95034af8c7dfda981d06316853f1fec8dc0e3600ecb8d07edddd698bd39fba9fac05d3ccdc18e06e4
diff --git a/dev-util/global/global-6.6.10.ebuild b/dev-util/global/global-6.6.10.ebuild
index 41abd9d57503..a26d05c4474f 100644
--- a/dev-util/global/global-6.6.10.ebuild
+++ b/dev-util/global/global-6.6.10.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Tag system to find an object location in various sources"
 HOMEPAGE="https://www.gnu.org/software/global/global.html"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc emacs"
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	doc? (
 		app-text/texi2html
+		app-text/texlive-core
 		sys-apps/texinfo
 	)
 "
diff --git a/dev-util/global/global-6.6.4.ebuild b/dev-util/global/global-6.6.4.ebuild
index 1343cfa448b5..661f50f612f1 100644
--- a/dev-util/global/global-6.6.4.ebuild
+++ b/dev-util/global/global-6.6.4.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
@@ -9,7 +9,7 @@ DESCRIPTION="tag system to find an object location in various sources"
 HOMEPAGE="https://www.gnu.org/software/global/global.html"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="doc emacs vim"
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 693a9e63045b..fc6bdca43ad3 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,7 +1,9 @@
 AUX meson-0.63-xtools-support.patch 1136 BLAKE2B 7600b29f1c4accbf33ca587b848566d4f9d30e26695b125aa895ec8a48ee0f7355c7692845c0d9bbb59eb452fc0cd8b634bd2a90d8918efa0b65ef4759b56d8e SHA512 725b193afe229690b6ef0d7a2a832695b7c09ca3376512097baec597a84df6e8e18791e9f29221e8a4a3537ad2371672e74041aa05ec6a218ed9b6218ea2ab61
 DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a SHA512 c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb
 DIST meson-1.2.0rc1.tar.gz 2176016 BLAKE2B c7c19b5fe8e25964dbdacaf7b2aa8e348e81e387f79b9576c6d8541064cd499008d70b527299eb02280828b7c1f91b194f2c6d2e54f702295b52b5d7a24c5d3f SHA512 2511b40a8cc55093758599e3e51926a5ccac16c92a5bd33239c743fa6926af9ba0f7508dd2f04adbb2c4599ebad5d34f1a2e112d7ac10dd211e9511522d23962
+DIST meson-1.2.0rc2.tar.gz 2173996 BLAKE2B 99707e8d57a95ed9ee381f05e5c22a5f73433a472c5dcad25999af8cb4c7a52d4604eee260e22a84cc2fff402fed0a57d0263f7e43e4986482c49b73f06920e0 SHA512 3090d33e0b4b695f407ebc196ad5508c1f617cdb04d97f265e7e13d12baa568273b04c4c0dbd8cb9a6a19fe1fec2047698bd3a4ea62929637887d835edcc6eac
 EBUILD meson-1.1.1.ebuild 2938 BLAKE2B 1896e10e1d442716eaf50b776bdb52c6d438c9a3a6f2e3b5125f4de2f5bd01932dbd12a6e69016032defafd7a62068f810090342b766a8b14928bc38f3e72946 SHA512 3038284a26a397055050c8236b6c13f7a7b01ce94faa5f299dbf180366aed166bc3a22443febb5c9c32e966f789dec63b8e5ea293a976c871d86647afe529249
 EBUILD meson-1.2.0_rc1.ebuild 2886 BLAKE2B 3cc344e676d5c260f20942469e01da9bd6be5578cde92be8c91d55b80d3b18c018e16497b6f1015427fc65d712d5520db598d35f53e2035911718cc8ed27c588 SHA512 22ccf7c0a146e90e69eea1a821fdeeed0f240b6b6e071782a877ffad04038dae09cfa1370fb438036cd3cb04dd0889a477c1cdfe94f9e578cdec81a85a6036c2
+EBUILD meson-1.2.0_rc2.ebuild 2886 BLAKE2B 3cc344e676d5c260f20942469e01da9bd6be5578cde92be8c91d55b80d3b18c018e16497b6f1015427fc65d712d5520db598d35f53e2035911718cc8ed27c588 SHA512 22ccf7c0a146e90e69eea1a821fdeeed0f240b6b6e071782a877ffad04038dae09cfa1370fb438036cd3cb04dd0889a477c1cdfe94f9e578cdec81a85a6036c2
 EBUILD meson-9999.ebuild 2946 BLAKE2B 0fc44fb33f5d79d53c15ab84caad219f80437530f4b3620f2c0a1f336a11710601bd2a3eb408ec6adf6204a1dafa09d97b3fe403d66a380c7017d753849aaca0 SHA512 3101b94bdb792a5bbc7b3411e5d77d7b36781d08b7746523c9e7584e65204b025ccbfba7cc924829b7f0a84309a6a90455293cc8dd0964e98de7798200a7241d
 MISC metadata.xml 480 BLAKE2B 5d3a0af4d84e497dcc2ccd5eb680e898beda896d5c37dc71fcaad2fe63f436f758d356990a5bca06baee9d265389b6e7084daec90d13c004f5523df4d0badbff SHA512 748f91fc17a18302ad0892d458e8e59650ab23dd3db5e83da85cfbca03d7932633c37b16f039faa12d87f6e4ec75a7a7fe4cc22f17328e61d57d99b073b6df3f
diff --git a/dev-util/meson/meson-1.2.0_rc2.ebuild b/dev-util/meson/meson-1.2.0_rc2.ebuild
new file mode 100644
index 000000000000..fefd68d177e5
--- /dev/null
+++ b/dev-util/meson/meson-1.2.0_rc2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2016-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit git-r3
+else
+	inherit pypi
+
+	MY_P=${P/_/}
+	S=${WORKDIR}/${MY_P}
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	fi
+fi
+
+inherit bash-completion-r1 distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		dev-util/ninja
+		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
+		virtual/pkgconfig
+	)
+"
+RDEPEND="
+	virtual/pkgconfig
+"
+
+python_prepare_all() {
+	local disable_unittests=(
+		# ASAN and sandbox both want control over LD_PRELOAD
+		# https://bugs.gentoo.org/673016
+		-e 's/test_generate_gir_with_address_sanitizer/_&/'
+
+		# ASAN is unsupported on some targets
+		# https://bugs.gentoo.org/692822
+		-e 's/test_pch_with_address_sanitizer/_&/'
+
+		# https://github.com/mesonbuild/meson/issues/7203
+		-e 's/test_templates/_&/'
+
+		# Broken due to python2 wrapper
+		-e 's/test_python_module/_&/'
+	)
+
+	sed -i "${disable_unittests[@]}" unittests/*.py || die
+
+	# Broken due to python2 script created by python_wrapper_setup
+	rm -r "test cases/frameworks/1 boost" || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	(
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		# 'test cases/unit/73 summary' expects 80 columns
+		export COLUMNS=80
+
+		# If JAVA_HOME is not set, meson looks for javac in PATH.
+		# If javac is in /usr/bin, meson assumes /usr/include is a valid
+		# JDK include path. Setting JAVA_HOME works around this broken
+		# autodetection. If no JDK is installed, we should end up with an empty
+		# value in JAVA_HOME, and the tests should get skipped.
+		export JAVA_HOME=$(java-config -O 2>/dev/null)
+
+		# Call python3 instead of EPYTHON to satisfy test_meson_uninstalled.
+		python3 run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+
+	insinto /usr/share/zsh/site-functions
+	doins data/shell-completions/zsh/_meson
+
+	dobashcomp data/shell-completions/bash/meson
+}
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 0a8edac5d12a..e26ff64a281b 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,14 +1,17 @@
 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
+AUX perf-6.4-libtracefs.patch 780 BLAKE2B dc97e42f1d3ece03722441b5a2c1f87ab9871ca92b9cf9f57b2e44627fddfcedaf6d7f64ddf74fd103c23aa0db71c4d147f7841743eb5c5a466c9bbb150597ea SHA512 da1b69c190491dd926ba1e98a43965a5ffd543df4134e6a10d187ab544695617fcffede3190bce4cbef13b897d113dee743f67a98ff249a486f8de2d49e62f9f
 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 linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
+DIST linux-6.4.tar.xz 137794856 BLAKE2B b59eb04a8715af9f686978812e6d4a466172bb859f80657076de14cd0828b4fac15b688ff8959f5c65485f7f6bef26590412c66821e720de843cb8666f226c90 SHA512 11a48b25e0b513782d3b89101c2ec8dd9cefd6ce08dc63a91137903b66392aa72ca1fe32816710673af84dd47de3ab8738056a6af93dc0d5e60ef4b869b49928
 DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b
 EBUILD perf-5.19-r1.ebuild 8102 BLAKE2B 105241021a13e62d86ba42b1108b1dd1ea5fa87fd95bd18b96d3c54a4b4d0582e3cbeb4307d73f912d1c88713e46afeb6f2736e4d34a9619fab44ce6c2828b93 SHA512 762b2e1c7ff5fc89194f4c08581a9594735f744cfb8e6bd165a31468544f3f59c67224e95dad675c7047162beea6b246d5ffb7f20b052cf8485da6c28780340d
 EBUILD perf-6.0-r1.ebuild 7560 BLAKE2B 0921a84f1138896c749c45097e100ed27ec5fd70901263ac0a04fd9e8b60bd3f748ab8fb815b480c36d53929b21d9511c1718955ca81b1a24307fe8daf762aa7 SHA512 4cca761f3007eb79d9cd9211dfa29bb967447d2c8c2374260674952e0d37180289cf592f50ae39c1b09de9e3f44f3fce2d032c854b50b5318a25ad9f4609f584
 EBUILD perf-6.2-r1.ebuild 7564 BLAKE2B 3faaa7be0ee20a2f26617e6724a8db6b9a6dcec163b69f9fef640ed4727462aaf7e63231046d7d0c5988577c591d3ad1c898812d230c3b949774d4a177864af5 SHA512 f8c4ac3b7c2847a94b833b4fad898afc1e738de11b6e28e1c15136ca40217b57985143dd781ae99a0d5a938708dca2d8bcf6b66d03241a0766e9f3fbe652c189
 EBUILD perf-6.3-r1.ebuild 7568 BLAKE2B 301182f64188210ed3abf7d903557b79f5c0cc469c61f3ad407d09999afd946b0267a2a286af0f1089f77ecb388e9ed29a1caefcc2ad9a7ff6bda6ccd5b61694 SHA512 cafe7e439f1da10bd6f3ef48f1b3b9cd01d0d0e39e5b30339a22e9f9b90762f5081917bea696b0beacba49a889c21e4b331ab27b033c26333f1108395ae99722
 EBUILD perf-6.3.ebuild 7558 BLAKE2B d15f100dcfa7d1f4f567f76a2bc375ed81ea2e71ebf54d28bead8577b905233545e229d31be84ce4edccb5aa039064146c02eea307ea514bdab9b605f78f2299 SHA512 7492001c2466083504f7406face29631814c4104459a5b21acd650a6261328ed0b9132d23117438b931b2dd80c27843263d2d97c85b98ab1e84801edc8d393c0
-MISC metadata.xml 1381 BLAKE2B 99d6c9db46b79ad7abd993c123f826dbe3f5e7c33fea98139a7fc694fe4d81e67887873e9edb390d63e65ca351033a8bd62d799fac946e2334188c2a4b776328 SHA512 a952ee2f4173bd2957038614c6ebaa44ff20bcf57f83f8fc5eabbaced667a7254a3e326e0fca541f1ce10bcc4e1d0df0b46600268bf38baf39bb2dda2bb3e41d
+EBUILD perf-6.4.ebuild 8243 BLAKE2B 0dd10a6c4718e4c60069db3b05d9a8f8c0038ec3708747a360fe5fc7cc96f06b2bf8dfd822352df51046e710ba55214bc9c6033d16d324d64796737adfc09160 SHA512 9d39671e0f56f2592d9fd61a1a5462e973519b9a0304ccf3504998508c5b21851890f52cf6095c73076066c024fad5ffafc5a08545d553cf27b474f1101f0da7
+MISC metadata.xml 1642 BLAKE2B ea2963a009c27201d64787a6c67fc7c8e4f1358a5d9ceb092f8882d24b2a5353fff671bcded242350271d40b507b7700cd14b735212b1436d94b5bae1080935b SHA512 d6532ae3b0cf0e3d54d7cdc71a20414e09e6155b45b5ddb27f69e72b7efed171748e35a9cc96dfee01a8f8df480ff0f7d07eb375f108579604686aef23a47e01
diff --git a/dev-util/perf/files/perf-6.4-libtracefs.patch b/dev-util/perf/files/perf-6.4-libtracefs.patch
new file mode 100644
index 000000000000..e02e2db96677
--- /dev/null
+++ b/dev-util/perf/files/perf-6.4-libtracefs.patch
@@ -0,0 +1,23 @@
+Let perf find libtraceevent headers when detecting libtracefs
+
+--- a/tools/build/feature/test-libtracefs.c
++++ b/tools/build/feature/test-libtracefs.c
+@@ -1,5 +1,5 @@
+ // SPDX-License-Identifier: GPL-2.0
+-#include <tracefs/tracefs.h>
++#include <tracefs.h>
+ 
+ int main(void)
+ {
+--- a/tools/perf/Makefile.config
++++ b/tools/perf/Makefile.config
+@@ -185,6 +185,9 @@ endif
+ FEATURE_CHECK_CFLAGS-libbabeltrace := $(LIBBABELTRACE_CFLAGS)
+ FEATURE_CHECK_LDFLAGS-libbabeltrace := $(LIBBABELTRACE_LDFLAGS) -lbabeltrace-ctf
+ 
++FEATURE_CHECK_CFLAGS-libtracefs := $(shell $(PKG_CONFIG) --cflags libtracefs)
++FEATURE_CHECK_LDFLAGS-libtracefs := $(shell $(PKG_CONFIG) --libs libtracefs)
++
+ ifdef LIBZSTD_DIR
+   LIBZSTD_CFLAGS  := -I$(LIBZSTD_DIR)/lib
+   LIBZSTD_LDFLAGS := -L$(LIBZSTD_DIR)/lib
diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
index a363827ff153..44f52d4869a8 100644
--- a/dev-util/perf/metadata.xml
+++ b/dev-util/perf/metadata.xml
@@ -14,6 +14,7 @@
     <name>Guilherme Amadio</name>
   </maintainer>
   <use>
+    <flag name="bpf">Enable support for eBPF features with <pkg>dev-libs/libbpf</pkg></flag>
     <flag name="babeltrace">Enable <pkg>dev-util/babeltrace</pkg> support</flag>
     <flag name="clang">Enable builtin clang and LLVM support</flag>
     <flag name="doc">
@@ -24,6 +25,8 @@
       systems.
     </flag>
     <flag name="libpfm">Enable <pkg>dev-libs/libpfm</pkg> support</flag>
+    <flag name="libtraceevent">Enable <pkg>dev-libs/libtraceevent</pkg> support</flag>
+    <flag name="libtracefs">Enable <pkg>dev-libs/libtracefs</pkg> support</flag>
     <flag name="numa">Enable NUMA support</flag>
     <flag name="perl">
       Add support for Perl as a scripting language for perf tools.
diff --git a/dev-util/perf/perf-6.4.ebuild b/dev-util/perf/perf-6.4.ebuild
new file mode 100644
index 000000000000..2ef01e9f9d7b
--- /dev/null
+++ b/dev-util/perf/perf-6.4.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2023 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 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}
+	SRC_URI=""
+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 ~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="${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}]
+	sys-devel/bison
+	sys-devel/flex
+	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-util/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 "" no; }
+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"
+	# 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}"
+		LIBCLANGLLVM=$(usex clang 1 "")
+		LIBPFM4=$(usex libpfm 1 "")
+		NO_AUXTRACE=""
+		NO_BACKTRACE=""
+		CORESIGHT=
+		NO_DEMANGLE=
+		GTK2=$(usex gtk 1 "")
+		feature-gtk2-infobar=$(usex gtk 1 "")
+		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=
+		NO_LIBELF=
+		NO_LIBNUMA=$(puse numa)
+		NO_LIBPERL=$(puse perl)
+		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)
+		WERROR=0
+		LIBDIR="/usr/libexec/perf-core"
+		libdir="${EPREFIX}/usr/$(get_libdir)"
+		plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins"
+		"$@"
+	)
+	emake "${emakeargs[@]}"
+}
+
+src_compile() {
+	# 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
+}