gentoo auto-resync : 01:06:2024 - 00:07:06

3 files changed, 74 insertions, 0 deletions

diff --git a/dev-util/kernelshark/Manifest b/dev-util/kernelshark/Manifest
index 228159f774fd..9609d2c4d040 100644
--- a/dev-util/kernelshark/Manifest
+++ b/dev-util/kernelshark/Manifest
@@ -1,6 +1,9 @@
 AUX kernelshark-2.1.0-no-ldconfig.patch 583 BLAKE2B 38cebadb90970f34644915a074cc14867e495e44df35714131d7bd302029dc80b79645f443b5d1f0b6228860535848de60a8930ed94b0c54aeb09f0a606a2539 SHA512 60031ff80c80c7f533c59dd997128ef23091bb693473d2177d2731705e3bd5e516027c424020dfe9f8aa8613d62e8477745f27f187eb5a3b84ccf7d31947cc4c
+AUX kernelshark-2.3.1-algorithm.patch 287 BLAKE2B f1c146e2a78c95ed99cb96f0859fcbda0ed5e895e9b98dfbfecd6059662bd3e7b82e1e6cca287b0df6fa5c87aa6d0039897b01f89cc55c5ea45db0640b6a562b SHA512 b85e0dcf42e2c449db324d3a57baf534192dc826b1fe35eff464d887b6e42dc641ec6c2dd0b325efd423cfc8a9ba3960355734cea27af2cb5ffdc497893f39be
 DIST kernelshark-2.2.0.tar.gz 4100601 BLAKE2B e68275b91a5a629a868e95c9b5f807c46e445e9d6e131093eb38b5a350af47dec5da9d4ec24a4b60a90ac6b3c70438236f6cd7d80fabccf420bae1603fc13338 SHA512 a2d2d2c9494189322ddb45eabe3aded8db9c72eca3d5afefc8d97b4b5011e9f93a3324aeabe19bc1917c3dbf67c75dcefbda831a2e82722bde5599f01e88c047
 DIST kernelshark-2.2.1.tar.gz 4100400 BLAKE2B a11e61660cbf98bbbb7c5060014b4de8e05f6957f2eb5519c3a109d91e5297a4532af3c958471ab181ddc8cbb061d1a493b3f40b71efb3abe3d47640a4ab87cc SHA512 1e0b17de02b82a20f6f78ebbfe61c63550947c3275e1262ae6edfd4675f7d1f976955ed37b14f2a214675a83e43135e605c244b4a5f920ebcdeaabcda7510d10
+DIST kernelshark-2.3.1.tar.gz 4100178 BLAKE2B 818448c3d2e01412e12fc3406b13ffd4d6ab7d442aef7867048913996edbc7f64b2c2c9e88810d6c0bd9e8a6ee9726369ab097d2164ec9966660f098e123c702 SHA512 ba5e7ebc713d296bef211174869445ccb3dffb8a96d0634776bd28c183487225e7c8082c8be5957795973833d6ac67851fb46f75cf68aae66eb3e5e06c081f5f
 EBUILD kernelshark-2.2.0.ebuild 1296 BLAKE2B 423966a086421a4ac7e6ac2092e30bb52d8bcf7f54fd56e6fa63d7d54180b87dd753c67107bbf5b12f3b382f2f4e0898fdd7857fde1b8b74e450ffe281dbaea2 SHA512 448ae1fd076d9922b709639c3c2d31b1ac562fca1f595ee09259e8d98d2677d7a44df50bf8894f225458207cc5e0b6ef90da919d9dc22e804c554f1be61af10f
 EBUILD kernelshark-2.2.1-r2.ebuild 1349 BLAKE2B 3e8b4e7aedf165e0d5b8196af6f27bd5a884965c5021b10fa76e413398dbf99677ece90872345105589525c708df6a39f9a4f5c2369748c1574f2ff75ee220ed SHA512 46d012eb7e92f1f35560e723edd39484751473437e52c18b8ff3278cfeafd37e575261bb8c9b21875806112758e2c2fe052321d76ab088ba4669af448feebb28
+EBUILD kernelshark-2.3.1.ebuild 1358 BLAKE2B 48393e27c9db83487bc63b956453759cfa48f7547d11787e0aaa8a90137e5f8444985beedc14a81dcb2a9034e93a740a5f922348560da49e2b176f15b9578da7 SHA512 9b9d9af4cb5d68e05d111e646c351c4df58b0e3f5e2a97f2965e570aaa94f478485efcbaf7ce130ae8bf2b49d38b878bff301c78645465ac13b020bb6cbebbee
 MISC metadata.xml 517 BLAKE2B aed46aea75417362e25b9c062134ed09fa831548e146224aa6632415e2250251f609e9db4b4d57027b867254dcc1f010f39efff1537305f09e0ff9fd91d345ec SHA512 37ae8b0aff222d6b52830578f6560514d1da51826df18b383ae7b58da7b7e8c34c2bc1fa4810de3f1dc9e33cf17fba9c2dbe51fefeeeafa3d3e345593e1ef378
diff --git a/dev-util/kernelshark/files/kernelshark-2.3.1-algorithm.patch b/dev-util/kernelshark/files/kernelshark-2.3.1-algorithm.patch
new file mode 100644
index 000000000000..8a007bb02bc2
--- /dev/null
+++ b/dev-util/kernelshark/files/kernelshark-2.3.1-algorithm.patch
@@ -0,0 +1,12 @@
+diff --git a/src/plugins/LatencyPlot.cpp b/src/plugins/LatencyPlot.cpp
+index d412917..3597f5d 100644
+--- a/src/plugins/LatencyPlot.cpp
++++ b/src/plugins/LatencyPlot.cpp
+@@ -13,6 +13,7 @@
+ #include <math.h>
+ 
+ // C++
++#include <algorithm>
+ #include <unordered_map>
+ #include <iostream>
+ 
diff --git a/dev-util/kernelshark/kernelshark-2.3.1.ebuild b/dev-util/kernelshark/kernelshark-2.3.1.ebuild
new file mode 100644
index 000000000000..dccf255b4d8c
--- /dev/null
+++ b/dev-util/kernelshark/kernelshark-2.3.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2019-2024 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-libs/libtracecmd <dev-util/trace-cmd-3.2 )
+	dev-libs/json-c:=
+	dev-qt/qtbase:6=[network,widgets]
+	dev-qt/qtscxml:6=
+	>=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-text/doxygen
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-no-ldconfig.patch
+	"${FILESDIR}"/${PN}-2.3.1-algorithm.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
+}