gentoo resync : 29.12.2022

4 files changed, 91 insertions, 0 deletions

diff --git a/dev-util/kernelshark/Manifest b/dev-util/kernelshark/Manifest
index 58cb18e99b87..ec4a9286fbe6 100644
--- a/dev-util/kernelshark/Manifest
+++ b/dev-util/kernelshark/Manifest
@@ -1,5 +1,9 @@
 AUX kernelshark-1.2-build.patch 1619 BLAKE2B 14d7d2d949c4d738470c1f0102a72617400a3bd01718d3cd580cbac88588b268ce57b06cbe7052648e27241aa5904681a01817067785d9313eecfd4747af2027 SHA512 6f7ba465cf3c449c590b684c67302d35ef8332e4fcbe77763003c40502d26ca3078613e68232314f407f5e0185c42faad6f559efead0b337a6b065cc4503cd36
 AUX kernelshark-1.2-desktop-version.patch 196 BLAKE2B 6800b889e03902caf27a73c6358180499bf7a1051fe19af38c90aa5ea38e4230eb3a4670fcb2a8fc6b54afea371c3b3f689b06ee51f1596e14450615256c7708 SHA512 58331560d558b4fb4bbd50a24fb0cfce6b50b73cfe8481449e5d4a87836d3d2be8bd1a7f5453e8b28d87f1657b426d0453ebcefa78f97b8da44e1ed7ee8fd629
+AUX kernelshark-2.1.0-fix-desktop-version.patch 287 BLAKE2B 1bc518523d6c49d642335479b28295bab333486ecf128614a98d37e64924beb5275c7804cbb8de792e12a238e392d0bf2462a39ec6a0e044497648fc2e29909f SHA512 e6edbf73b1889e7ec21c969ae1f49f82882f619b933606ee4b8c4e5f02aa98baffdbcea4bdd716aadeb4d7264f0ee5ae68d1c4f2e25808832c9b8df8a4fd2797
+AUX kernelshark-2.1.0-no-ldconfig.patch 583 BLAKE2B 38cebadb90970f34644915a074cc14867e495e44df35714131d7bd302029dc80b79645f443b5d1f0b6228860535848de60a8930ed94b0c54aeb09f0a606a2539 SHA512 60031ff80c80c7f533c59dd997128ef23091bb693473d2177d2731705e3bd5e516027c424020dfe9f8aa8613d62e8477745f27f187eb5a3b84ccf7d31947cc4c
 DIST kernelshark-1.2.tar.gz 4298175 BLAKE2B 2ebe70c2b7c0691b65b0251027f1c558fc2fc5ef9bf61512d3ddd554fbb6ec349e36fca4dd0060c6b7db49eca0ec81a2f1296d635459b91883e54e77146ea3ae SHA512 059ac0ced71fa00de34c30ece433430f1e2fc36acb1b3a3f15cb84ce74d7a4f115e4ee8fbf9a256d5a731050aee02823a90a024dca4b4f6a17061652b871b935
+DIST kernelshark-2.1.0.tar.gz 4098666 BLAKE2B 2798626c598ec2464f018b5808a6da460a552920c373dbf1eaba5d243e2f150da2a9a25668f8cb27e2ddc7dc286d4d5215d942893456de9339a63bde0e4d7381 SHA512 4b463cf06a919d67fa38ada8221e4702e2fac725d917e7abd12e1d69880ba964881ac549caf90bd7cb22edea4f28d7937494a05f75218f16fe2edcdff7161c3e
 EBUILD kernelshark-1.2.ebuild 1256 BLAKE2B b7f5ce31272a8034fea5ecd17e259112d0b0b310e221c861529b5cef6e4a87532c6eb574938534e656171bc703eb546d1a4c60c40b0269f225acd9f7d5aa1b48 SHA512 4a85706ac373a672ed577ef0960583ba9010e2ebe801616a3829344322e1c4efd8882f15efab28aab138191196b4e0564a5d0c01dcec32232c73e04cc53e67e0
+EBUILD kernelshark-2.1.0.ebuild 1334 BLAKE2B 36da94dd1146aa980b1bcf06a434e1070e8f1252b3c086d02cfb44985c7324b334510d03e147c0288dde74cb1c22616e616a417859f02b53f3b0a993fe7dcfde SHA512 d9ad05f7c7dff38233ecd71745ca0369508f8928a19690dfcfa9c00b0fd3359954d85b9c6643787d7ce68bc841375c6facc17456ee12b063bc53e92761d5e928
 MISC metadata.xml 410 BLAKE2B 48b6f70e304fd3acde7e9b2f940b0a0d7f39ae36b0779c7e9335f456fa2ff52cfc87fa095ffed6eb918f4fba2e9132d9d496a1bfe63e12a5a7b56ef008e2674e SHA512 ee0b11f53d3f11a4f64225f7a1bfd30052c768ce3512c1a810411404a4b65590b80225ecb1b9cc3627fc80cf317ca2ecfea3e071436126467314bead2675cc68
diff --git a/dev-util/kernelshark/files/kernelshark-2.1.0-fix-desktop-version.patch b/dev-util/kernelshark/files/kernelshark-2.1.0-fix-desktop-version.patch
new file mode 100644
index 000000000000..a6a93be0ea0d
--- /dev/null
+++ b/dev-util/kernelshark/files/kernelshark-2.1.0-fix-desktop-version.patch
@@ -0,0 +1,11 @@
+diff --git a/build/ks.desktop.cmake b/build/ks.desktop.cmake
+index 2b02c0d..9765e61 100644
+--- a/build/ks.desktop.cmake
++++ b/build/ks.desktop.cmake
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Version=@KS_VERSION_STRING@
++Version=1.0
+ Type=Application
+ Name=Kernel Shark
+ GenericName=Kernel Shark
diff --git a/dev-util/kernelshark/files/kernelshark-2.1.0-no-ldconfig.patch b/dev-util/kernelshark/files/kernelshark-2.1.0-no-ldconfig.patch
new file mode 100644
index 000000000000..7a7ea5bd435e
--- /dev/null
+++ b/dev-util/kernelshark/files/kernelshark-2.1.0-no-ldconfig.patch
@@ -0,0 +1,16 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9e0b4ae..732c14a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -46,11 +46,6 @@ install(FILES "${KS_DIR}/libkshark.pc"
+         DESTINATION ${PKG_CONGIG_DIR}
+             COMPONENT                 libkshark-devel)
+ 
+-install(CODE "message(\"-- Executing: ldconfig ${_LIBDIR}\")
+-              execute_process(COMMAND bash \"-c\" \"ldconfig ${_INSTALL_PREFIX}\"
+-                              ECHO_ERROR_VARIABLE)"
+-        COMPONENT libkshark-devel)
+-
+ if (OPENGL_FOUND)
+ 
+     message(STATUS "libkshark-plot")
diff --git a/dev-util/kernelshark/kernelshark-2.1.0.ebuild b/dev-util/kernelshark/kernelshark-2.1.0.ebuild
new file mode 100644
index 000000000000..ddf6b441a088
--- /dev/null
+++ b/dev-util/kernelshark/kernelshark-2.1.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}"/${P}-no-ldconfig.patch
+	"${FILESDIR}"/${P}-fix-desktop-version.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
+}