5 files changed, 64 insertions, 3 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index dafa040528f3..d62a55ece320 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/gperf/Manifest b/dev-util/gperf/Manifest
index 98bf82bb1444..fca838dcdaec 100644
--- a/dev-util/gperf/Manifest
+++ b/dev-util/gperf/Manifest
@@ -1,6 +1,6 @@
 AUX gperf-3.1-clang-16-wregister.patch 766 BLAKE2B 52117a973bf01ed6c8c43d383f128924936ef4b1c6dcb0155753924b2826659d9ca67cf85503aeaf82d5e9367925505f908a4273146352242be8023aa98ce1fc SHA512 44567048ca49cd6fc9325baa2c83d3c608e8930cf23b7ddb10950ff1f8db71bdb9b3dc040a4a2d4fbaf330877edcfa485a4469785610ceb12342a843a46a2c2d
 AUX gperf-3.1-strncmp-decl-mismatch.patch 819 BLAKE2B 627af81f91b5fdfd1bd3978adeed9a0d00a5d6b3f8aae54fe0ce21cfaf9384734a61a5986723f72f4c55efdccbed90ec651008d6df651a10322c04b4099431bf SHA512 167823f5908951c79e9ec5b77106a1acbc011bc34636a845d50f55689cf9a7a1f4652a628dc786a29d1dd764e94d1055e32eea1f8c3852d9622e14816969c7f4
 DIST gperf-3.1.tar.gz 1215925 BLAKE2B bc4c54ade3f7dce484714d77cb5759dcc02b7a607d7b1aff6bdbcd06ee4c83e9449038a7217d5f25bcbef058ba56e1fce9383b9599de005154e5a9b566ac9c69 SHA512 855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4
-EBUILD gperf-3.1-r1.ebuild 705 BLAKE2B b42bdc34aa2bc51f6e6ac1d7bc2b8a6e44a588863e5a8b0777bdd79de481560bb34e69a4f6244e114e279ae349d9040af62f5130c82e83ed7aec3ca9c7ad9443 SHA512 c70514b376b0a38e534d6fad39bf507fe9df883108a86a396b1656b2296bcf3f9079e0da5e3a601f48f6735d879a6849d80c46bba1e49785e23026c7179c3339
+EBUILD gperf-3.1-r1.ebuild 704 BLAKE2B 2a1467dfa5e789ec27355bb576ac230f266d1f02ac81a791f53b24447e4e7d23d74310cef2253bebfde1bf7f3b5956ead2ef7bd241eacc91a667b94bc8a6c27f SHA512 d620c6d5632fc10b1481d6a103478f90984a64ffe779cd742fc187f2a88c0ccc84ea831bf823053f460eaae099b8abcebf3d2ed5d8a845a7ee99b0ff483eaa46
 EBUILD gperf-3.1.ebuild 598 BLAKE2B bc597678be8b568a5a249b9c3e49b40ad99beb65d3fe207d08179499cfac69cd41139322fefc4c76e0ccded8fe8e6614d2e09b77395e8502acc512d2811a296e SHA512 0524b8e6cb782ea9c839991192163d55eaff8d1b10bd4b9045dd7311e1ac2acac684a6d92e1be0c0d0b56af1d2c7d30ee5847cc580387b05eb7aa9d79d227463
 MISC metadata.xml 300 BLAKE2B 08411b1e2990305e2459a483ee439bd127e2f6e556b621ca68376c3b22373123e5382d5445321451c502237046c5b7c806af389c3115729e0c96c6df3ae45d05 SHA512 094bde403ea70f64268a627bc5d9342f8e86d727c7c10b74214a1aa65d23baef8fc189a4771a4c838ee098b979af8e27614fc2480ce258394276df5b5f18d13b
diff --git a/dev-util/gperf/gperf-3.1-r1.ebuild b/dev-util/gperf/gperf-3.1-r1.ebuild
index 0341b9fc6b56..ab2b4430c847 100644
--- a/dev-util/gperf/gperf-3.1-r1.ebuild
+++ b/dev-util/gperf/gperf-3.1-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=8
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/gperf/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-strncmp-decl-mismatch.patch
diff --git a/dev-util/kernelshark/Manifest b/dev-util/kernelshark/Manifest
index 8e25fa962cd2..a0917072ad95 100644
--- a/dev-util/kernelshark/Manifest
+++ b/dev-util/kernelshark/Manifest
@@ -5,7 +5,9 @@ AUX kernelshark-2.1.0-no-ldconfig.patch 583 BLAKE2B 38cebadb90970f34644915a074cc
 DIST kernelshark-1.2.tar.gz 4298175 BLAKE2B 2ebe70c2b7c0691b65b0251027f1c558fc2fc5ef9bf61512d3ddd554fbb6ec349e36fca4dd0060c6b7db49eca0ec81a2f1296d635459b91883e54e77146ea3ae SHA512 059ac0ced71fa00de34c30ece433430f1e2fc36acb1b3a3f15cb84ce74d7a4f115e4ee8fbf9a256d5a731050aee02823a90a024dca4b4f6a17061652b871b935
 DIST kernelshark-2.1.0.tar.gz 4098666 BLAKE2B 2798626c598ec2464f018b5808a6da460a552920c373dbf1eaba5d243e2f150da2a9a25668f8cb27e2ddc7dc286d4d5215d942893456de9339a63bde0e4d7381 SHA512 4b463cf06a919d67fa38ada8221e4702e2fac725d917e7abd12e1d69880ba964881ac549caf90bd7cb22edea4f28d7937494a05f75218f16fe2edcdff7161c3e
 DIST kernelshark-2.1.1.tar.gz 4099851 BLAKE2B d686a0c19b9daeb355fa3c57104b9147cd0b4e492a3b0b57e5fdbd450d265f963bb35c99b896039007ea47c983d86649381fd81ec9402e4482a39e962322de3a SHA512 8fd9d117401961bf892a46890a7fd97c17a2d9839704b43730a5bf90f5e2cf73c68da2453a2e208b1732055abfaf5ddd7532efe8de9256b4232abd172a04f89c
+DIST kernelshark-2.2.0.tar.gz 4100601 BLAKE2B e68275b91a5a629a868e95c9b5f807c46e445e9d6e131093eb38b5a350af47dec5da9d4ec24a4b60a90ac6b3c70438236f6cd7d80fabccf420bae1603fc13338 SHA512 a2d2d2c9494189322ddb45eabe3aded8db9c72eca3d5afefc8d97b4b5011e9f93a3324aeabe19bc1917c3dbf67c75dcefbda831a2e82722bde5599f01e88c047
 EBUILD kernelshark-1.2.ebuild 1256 BLAKE2B b7f5ce31272a8034fea5ecd17e259112d0b0b310e221c861529b5cef6e4a87532c6eb574938534e656171bc703eb546d1a4c60c40b0269f225acd9f7d5aa1b48 SHA512 4a85706ac373a672ed577ef0960583ba9010e2ebe801616a3829344322e1c4efd8882f15efab28aab138191196b4e0564a5d0c01dcec32232c73e04cc53e67e0
 EBUILD kernelshark-2.1.0.ebuild 1334 BLAKE2B 36da94dd1146aa980b1bcf06a434e1070e8f1252b3c086d02cfb44985c7324b334510d03e147c0288dde74cb1c22616e616a417859f02b53f3b0a993fe7dcfde SHA512 d9ad05f7c7dff38233ecd71745ca0369508f8928a19690dfcfa9c00b0fd3359954d85b9c6643787d7ce68bc841375c6facc17456ee12b063bc53e92761d5e928
 EBUILD kernelshark-2.1.1.ebuild 1295 BLAKE2B 36fd6bfbbcfb82377b4832d7ec04c8ed05adb0eec75e4be544539e9f502944ad88558020715dc195f4d4aa184e98c03eb602729536979486106f72f93969651f SHA512 0d69df0d1b565304c638439171ee9f145f4b7dd40866da9a8312945c923a47225526791b5b80b620019994b66fcf537fb65afef032926903867f1ffc1b4476c9
+EBUILD kernelshark-2.2.0.ebuild 1295 BLAKE2B aa8bd57008ecf363844b5dc6cecc16410c8c3b4d4048b2c89ca490327ac5891d737cfabf94ac6e396d94f2abb3110f654c36d3ba068f88a37b57f541977e3a5d SHA512 6e01fab90dbfd30cbfdeb26847d2067f7ed67b8c39b083bac4f54bf4a59f065ce4737c9a2d57f17f2ea6e3189e1929d7966329d3dd4ce603431f8c8775f69241
 MISC metadata.xml 517 BLAKE2B aed46aea75417362e25b9c062134ed09fa831548e146224aa6632415e2250251f609e9db4b4d57027b867254dcc1f010f39efff1537305f09e0ff9fd91d345ec SHA512 37ae8b0aff222d6b52830578f6560514d1da51826df18b383ae7b58da7b7e8c34c2bc1fa4810de3f1dc9e33cf17fba9c2dbe51fefeeeafa3d3e345593e1ef378
diff --git a/dev-util/kernelshark/kernelshark-2.2.0.ebuild b/dev-util/kernelshark/kernelshark-2.2.0.ebuild
new file mode 100644
index 000000000000..660f4388e049
--- /dev/null
+++ b/dev-util/kernelshark/kernelshark-2.2.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic cmake
+
+DESCRIPTION="Graphical reader for trace-cmd output"
+HOMEPAGE="https://kernelshark.org/"
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/kernel-shark"
+
+else
+	MY_P="kernel-shark-${PN}-v${PV}"
+	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/snapshot/${MY_P}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="custom-optimization doc"
+
+DEPEND="
+	>=dev-util/trace-cmd-3.0.2
+	dev-libs/json-c:=
+	dev-qt/qtcore:5=
+	dev-qt/qtnetwork:5=
+	dev-qt/qtwidgets:5=
+	>=media-libs/freeglut-3.0.0:=
+	x11-libs/libXmu:=
+	x11-libs/libXi:=
+	>=dev-libs/libtracefs-1.3
+	>=dev-libs/libtraceevent-1.5
+	media-fonts/freefont
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	doc? (
+		media-gfx/graphviz
+		app-doc/doxygen
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-no-ldconfig.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-D_INSTALL_PREFIX="${EPREFIX}/usr"
+		-D_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		-D_DOXYGEN_DOC=$(usex doc)
+	)
+	use custom-optimization || replace-flags -O? -O3
+	cmake_src_configure
+}