From 7ca04257d8da73c3b7dae06d2b9e3eb17193b6fa Mon Sep 17 00:00:00 2001
From: Yixun Lan <dlan@gentoo.org>
Date: Sun, 4 Feb 2024 01:05:34 +0000
Subject: dev-util/kernelshark: fix trace-cmd dep

add dev-util/trace-cmd as build/run-time dep

Closes: https://bugs.gentoo.org/923734
Signed-off-by: Yixun Lan <dlan@gentoo.org>
---
 dev-util/kernelshark/kernelshark-2.2.1-r1.ebuild | 59 -----------------------
 dev-util/kernelshark/kernelshark-2.2.1-r2.ebuild | 60 ++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 59 deletions(-)
 delete mode 100644 dev-util/kernelshark/kernelshark-2.2.1-r1.ebuild
 create mode 100644 dev-util/kernelshark/kernelshark-2.2.1-r2.ebuild

(limited to 'dev-util/kernelshark')

diff --git a/dev-util/kernelshark/kernelshark-2.2.1-r1.ebuild b/dev-util/kernelshark/kernelshark-2.2.1-r1.ebuild
deleted file mode 100644
index 79925ca48471..000000000000
--- a/dev-util/kernelshark/kernelshark-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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-1.1.2 <dev-util/trace-cmd-3.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-text/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
-}
diff --git a/dev-util/kernelshark/kernelshark-2.2.1-r2.ebuild b/dev-util/kernelshark/kernelshark-2.2.1-r2.ebuild
new file mode 100644
index 000000000000..130c9a4d430f
--- /dev/null
+++ b/dev-util/kernelshark/kernelshark-2.2.1-r2.ebuild
@@ -0,0 +1,60 @@
+# 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-1.1.2 <dev-util/trace-cmd-3.2 )
+	dev-libs/json-c:=
+	dev-qt/qtcore:5=
+	dev-qt/qtnetwork:5=
+	dev-qt/qtwidgets:5=
+	dev-util/trace-cmd
+	>=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
+)
+
+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
+}
-- 
cgit v1.2.3-65-gdbad