[gentoo-commits] repo/gentoo:master commit in: dev-util/kernelshark/files/, dev-util/kernelshark/

[Yixun Lan]

commit:     f05d76ea718839add7482c8307932b5e1932f709
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 10 20:06:08 2023 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri Mar  3 20:04:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f05d76ea

dev-util/kernelshark: drop 1.2, 2.1.0, 2.1.1

cleanup EPAI=7 cmake rdeps

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 dev-util/kernelshark/Manifest                      |  3 --
 .../kernelshark/files/kernelshark-1.2-build.patch  | 39 --------------
 .../files/kernelshark-1.2-desktop-version.patch    |  9 ----
 .../kernelshark-2.1.0-fix-desktop-version.patch    | 11 ----
 dev-util/kernelshark/kernelshark-1.2.ebuild        | 56 --------------------
 dev-util/kernelshark/kernelshark-2.1.0.ebuild      | 60 ----------------------
 dev-util/kernelshark/kernelshark-2.1.1.ebuild      | 59 ---------------------
 7 files changed, 237 deletions(-)

diff --git a/dev-util/kernelshark/Manifest b/dev-util/kernelshark/Manifest
index e6b3d2362196..9984f4dea6e4 100644
--- a/dev-util/kernelshark/Manifest
+++ b/dev-util/kernelshark/Manifest
@@ -1,4 +1 @@
-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

diff --git a/dev-util/kernelshark/files/kernelshark-1.2-build.patch b/dev-util/kernelshark/files/kernelshark-1.2-build.patch
deleted file mode 100644
index c7fcd0d8d33f..000000000000
--- a/dev-util/kernelshark/files/kernelshark-1.2-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -67,11 +67,11 @@ set(KS_LOGO_LABEL  KS_logo_horizontal.svg)
- 
- set(CMAKE_INSTALL_RPATH "${_LIBDIR}/${KS_APP_NAME}/")
- 
--if (CMAKE_BUILD_TYPE MATCHES Package)
-+if (NOT CMAKE_BUILD_TYPE MATCHES Package)
- 
-     set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
- 
--else (CMAKE_BUILD_TYPE MATCHES Package)
-+else (CMAKE_BUILD_TYPE MATCHES Gentoo)
- 
-     set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
- 
---- a/build/FindTraceCmd.cmake
-+++ b/build/FindTraceCmd.cmake
-@@ -38,17 +38,17 @@ find_path(TRACEFS_INCLUDE_DIR   NAMES  tracefs/tracefs.h
-                                        ${CMAKE_SOURCE_DIR}/../include/
-                                 NO_DEFAULT_PATH)
- 
--find_library(TRACECMD_LIBRARY   NAMES  trace-cmd/libtracecmd.a
-+find_library(TRACECMD_LIBRARY   NAMES  trace-cmd/libtracecmd.so
-                                 PATHS  $ENV{TRACE_CMD}/lib/
-                                        ${CMAKE_SOURCE_DIR}/../lib/
-                                 NO_DEFAULT_PATH)
- 
--find_library(TRACEFS_LIBRARY    NAMES  tracefs/libtracefs.a
-+find_library(TRACEFS_LIBRARY    NAMES  tracefs/libtracefs.so
-                                 PATHS  $ENV{TRACE_CMD}/lib/
-                                        ${CMAKE_SOURCE_DIR}/../lib/
-                                 NO_DEFAULT_PATH)
- 
--find_library(TRACEEVENT_LIBRARY NAMES  traceevent/libtraceevent.a
-+find_library(TRACEEVENT_LIBRARY NAMES  traceevent/libtraceevent.so
-                                 PATHS  $ENV{TRACE_CMD}/lib/
-                                        ${CMAKE_SOURCE_DIR}/../lib/
-                                 NO_DEFAULT_PATH)

diff --git a/dev-util/kernelshark/files/kernelshark-1.2-desktop-version.patch b/dev-util/kernelshark/files/kernelshark-1.2-desktop-version.patch
deleted file mode 100644
index 5f469b199547..000000000000
--- a/dev-util/kernelshark/files/kernelshark-1.2-desktop-version.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/build/ks.desktop.cmake
-+++ b/build/ks.desktop.cmake
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Version=@KS_VERSION_STRING@
-+Version=1.2
- Type=Application
- Name=Kernel Shark
- GenericName=Kernel Shark

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
deleted file mode 100644
index a6a93be0ea0d..000000000000
--- a/dev-util/kernelshark/files/kernelshark-2.1.0-fix-desktop-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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/kernelshark-1.2.ebuild b/dev-util/kernelshark/kernelshark-1.2.ebuild
deleted file mode 100644
index f3406107a78a..000000000000
--- a/dev-util/kernelshark/kernelshark-1.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2019-2021 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://github.com/rostedt/trace-cmd.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}/kernel-shark"
-
-else
-	MY_P="${PN}-v${PV}"
-	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-${MY_P}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/trace-cmd-${MY_P}/kernel-shark"
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="custom-optimization doc"
-
-DEPEND="
-	>=dev-util/trace-cmd-2.8.3:=
-	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:="
-RDEPEND="${DEPEND}"
-BDEPEND="
-	doc? (
-		media-gfx/graphviz
-		app-doc/doxygen
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-	"${FILESDIR}"/${P}-desktop-version.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-D_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DTRACECMD_INCLUDE_DIR="${EPREFIX}/usr/include/trace-cmd"
-		-D_DOXYGEN_DOC=$(usex doc)
-	)
-	use custom-optimization || replace-flags -O? -O3
-	cmake_src_configure
-}

diff --git a/dev-util/kernelshark/kernelshark-2.1.0.ebuild b/dev-util/kernelshark/kernelshark-2.1.0.ebuild
deleted file mode 100644
index ddf6b441a088..000000000000
--- a/dev-util/kernelshark/kernelshark-2.1.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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
-}

diff --git a/dev-util/kernelshark/kernelshark-2.1.1.ebuild b/dev-util/kernelshark/kernelshark-2.1.1.ebuild
deleted file mode 100644
index 3c8e34a184d4..000000000000
--- a/dev-util/kernelshark/kernelshark-2.1.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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}"/${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
-}