commit: 4175029b23c735769cb490583befe77d091608e5 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat May 22 18:45:34 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun May 23 17:45:54 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4175029b
dev-util/kernelshark: Drop unmaintained and broken 9999 ebuild Closes: https://bugs.gentoo.org/726682 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../kernelshark/files/kernelshark-1.0-build.patch | 33 ------------ .../files/kernelshark-1.0-desktop-version.patch | 11 ---- dev-util/kernelshark/kernelshark-9999.ebuild | 58 ---------------------- 3 files changed, 102 deletions(-) diff --git a/dev-util/kernelshark/files/kernelshark-1.0-build.patch b/dev-util/kernelshark/files/kernelshark-1.0-build.patch deleted file mode 100644 index 411d4235a21..00000000000 --- a/dev-util/kernelshark/files/kernelshark-1.0-build.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/CMakeLists.txt b/kernel-shark/CMakeLists.txt -index 45c6f23..e2394d9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -63,11 +63,11 @@ set(KS_LOGO_LABEL KS_logo_horizontal.svg) - - set(CMAKE_INSTALL_RPATH "${_INSTALL_PREFIX}/lib/${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) - -diff --git a/build/FindTraceCmd.cmake b/kernel-shark/build/FindTraceCmd.cmake -index 2da4eee..c454ce6 100644 ---- a/build/FindTraceCmd.cmake -+++ b/build/FindTraceCmd.cmake -@@ -40,8 +40,8 @@ find_library(TRACEEVENT_LIBRARY NAMES traceevent/libtraceevent.a - # search was successful "find_path" will do nothing this time. - find_program(TRACECMD_EXECUTABLE NAMES trace-cmd) - find_path(TRACECMD_INCLUDE_DIR NAMES trace-cmd/trace-cmd.h) --find_library(TRACECMD_LIBRARY NAMES trace-cmd/libtracecmd.so) --find_library(TRACEEVENT_LIBRARY NAMES traceevent/libtraceevent.so) -+find_library(TRACECMD_LIBRARY NAMES libtracecmd.so) -+find_library(TRACEEVENT_LIBRARY NAMES libtraceevent.so) - - IF (TRACECMD_INCLUDE_DIR AND TRACECMD_LIBRARY AND TRACECMD_EXECUTABLE) - diff --git a/dev-util/kernelshark/files/kernelshark-1.0-desktop-version.patch b/dev-util/kernelshark/files/kernelshark-1.0-desktop-version.patch deleted file mode 100644 index 2b9b444958d..00000000000 --- a/dev-util/kernelshark/files/kernelshark-1.0-desktop-version.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/kernel-shark/build/ks.desktop.cmake b/kernel-shark/build/ks.desktop.cmake -index 2b02c0d..34c02ea 100644 ---- a/build/ks.desktop.cmake -+++ b/build/ks.desktop.cmake -@@ -1,5 +1,5 @@ - [Desktop Entry] --Version=@KS_VERSION_STRING@ -+Version=1.1 - Type=Application - Name=Kernel Shark - GenericName=Kernel Shark diff --git a/dev-util/kernelshark/kernelshark-9999.ebuild b/dev-util/kernelshark/kernelshark-9999.ebuild deleted file mode 100644 index 969302e6c70..00000000000 --- a/dev-util/kernelshark/kernelshark-9999.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic cmake-utils - -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:= - >=media-libs/freeglut-3.0.0:= - x11-libs/libXmu:= - x11-libs/libXi:= - dev-qt/qtcore:5= - dev-qt/qtwidgets:5= - dev-qt/qtnetwork:5= -" -RDEPEND="${DEPEND}" -BDEPEND=">=dev-util/cmake-2.8.11 - doc? ( - media-gfx/graphviz - app-doc/doxygen - ) -" - -PATCHES=( - "${FILESDIR}/kernelshark-1.0-build.patch" - "${FILESDIR}/kernelshark-1.0-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-utils_src_configure -}
