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

2024-07-08 Thread Yixun Lan 
commit: 8a71fd78771dea52d0ea3de12bc773dfe014d82c
Author: Yixun Lan  gentoo  org>
AuthorDate: Mon Jul  8 18:54:43 2024 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Mon Jul  8 18:54:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a71fd78

dev-util/kernelshark: fix Qt6OpenGLWidgets issue

add USE=opengql to dev-qt/qtbase:6

Closes: https://bugs.gentoo.org/933175
Signed-off-by: Yixun Lan  gentoo.org>

 .../{kernelshark-2.3.1.ebuild => kernelshark-2.3.1-r1.ebuild}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/kernelshark/kernelshark-2.3.1.ebuild 
b/dev-util/kernelshark/kernelshark-2.3.1-r1.ebuild
similarity index 96%
rename from dev-util/kernelshark/kernelshark-2.3.1.ebuild
rename to dev-util/kernelshark/kernelshark-2.3.1-r1.ebuild
index dccf255b4d8c..d07fbe9685e5 100644
--- a/dev-util/kernelshark/kernelshark-2.3.1.ebuild
+++ b/dev-util/kernelshark/kernelshark-2.3.1-r1.ebuild
@@ -27,7 +27,7 @@ IUSE="custom-optimization doc"
 DEPEND="
|| ( dev-libs/libtracecmd =media-libs/freeglut-3.0.0:=
x11-libs/libXmu:=

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

2024-05-29 Thread Yixun Lan 
commit: 9219b2f0c7714280769956b831dc7807b279e6cc
Author: Yixun Lan  gentoo  org>
AuthorDate: Wed Jan 24 09:29:45 2024 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Thu May 30 01:35:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9219b2f0

dev-util/kernelshark: add 2.3.1

Signed-off-by: Yixun Lan  gentoo.org>

 dev-util/kernelshark/Manifest  |  1 +
 .../files/kernelshark-2.3.1-algorithm.patch| 12 +
 dev-util/kernelshark/kernelshark-2.3.1.ebuild  | 59 ++
 3 files changed, 72 insertions(+)

diff --git a/dev-util/kernelshark/Manifest b/dev-util/kernelshark/Manifest
index f3b6bab4411a..5db8967c1806 100644
--- a/dev-util/kernelshark/Manifest
+++ b/dev-util/kernelshark/Manifest
@@ -1,2 +1,3 @@
 DIST kernelshark-2.2.0.tar.gz 4100601 BLAKE2B 
e68275b91a5a629a868e95c9b5f807c46e445e9d6e131093eb38b5a350af47dec5da9d4ec24a4b60a90ac6b3c70438236f6cd7d80fabccf420bae1603fc13338
 SHA512 
a2d2d2c9494189322ddb45eabe3aded8db9c72eca3d5afefc8d97b4b5011e9f93a3324aeabe19bc1917c3dbf67c75dcefbda831a2e82722bde5599f01e88c047
 DIST kernelshark-2.2.1.tar.gz 4100400 BLAKE2B 
a11e61660cbf987c5060014b4de8e05f6957f2eb5519c3a109d91e5297a4532af3c958471ab181ddc8cbb061d1a493b3f40b71efb3abe3d47640a4ab87cc
 SHA512 
1e0b17de02b82a20f6f78ebbfe61c63550947c3275e1262ae6edfd4675f7d1f976955ed37b14f2a214675a83e43135e605c244b4a5f920ebcdeaabcda7510d10
+DIST kernelshark-2.3.1.tar.gz 4100178 BLAKE2B 
818448c3d2e01412e12fc3406b13ffd4d6ab7d442aef7867048913996edbc7f64b2c2c9e88810d6c0bd9e8a6ee9726369ab097d2164ec990f098e123c702
 SHA512 
ba5e7ebc713d296bef211174869445ccb3dffb8a96d0634776bd28c183487225e7c8082c8be5957795973833d6ac67851fb46f75cf68aae66eb3e5e06c081f5f

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 ..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 
+ 
+ // C++
++#include 
+ #include 
+ #include 
+ 

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 ..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 =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
+}

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

2024-02-03 Thread Yixun Lan 
commit: 7ca04257d8da73c3b7dae06d2b9e3eb17193b6fa
Author: Yixun Lan  gentoo  org>
AuthorDate: Sun Feb  4 01:05:34 2024 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sun Feb  4 04:18:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ca04257

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  gentoo.org>

 .../{kernelshark-2.2.1-r1.ebuild => kernelshark-2.2.1-r2.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-util/kernelshark/kernelshark-2.2.1-r1.ebuild 
b/dev-util/kernelshark/kernelshark-2.2.1-r2.ebuild
similarity index 98%
rename from dev-util/kernelshark/kernelshark-2.2.1-r1.ebuild
rename to dev-util/kernelshark/kernelshark-2.2.1-r2.ebuild
index 79925ca48471..130c9a4d430f 100644
--- a/dev-util/kernelshark/kernelshark-2.2.1-r1.ebuild
+++ b/dev-util/kernelshark/kernelshark-2.2.1-r2.ebuild
@@ -30,6 +30,7 @@ DEPEND="
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:=

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

2024-02-03 Thread Yixun Lan 
commit: 6b25d63c7a8e9c40de54de64ced904daa5f7674b
Author: Yixun Lan  gentoo  org>
AuthorDate: Thu Feb  1 01:09:59 2024 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sat Feb  3 13:30:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b25d63c

dev-util/kernelshark: fix libtracecmd dep

Closes: https://bugs.gentoo.org/909439
Signed-off-by: Yixun Lan  gentoo.org>

 .../{kernelshark-2.2.1.ebuild => kernelshark-2.2.1-r1.ebuild}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/kernelshark/kernelshark-2.2.1.ebuild 
b/dev-util/kernelshark/kernelshark-2.2.1-r1.ebuild
similarity index 95%
rename from dev-util/kernelshark/kernelshark-2.2.1.ebuild
rename to dev-util/kernelshark/kernelshark-2.2.1-r1.ebuild
index b90ab79d56d5..79925ca48471 100644
--- a/dev-util/kernelshark/kernelshark-2.2.1.ebuild
+++ b/dev-util/kernelshark/kernelshark-2.2.1-r1.ebuild
@@ -25,7 +25,7 @@ SLOT="0"
 IUSE="custom-optimization doc"
 
 DEPEND="
-   >=dev-util/trace-cmd-3.0.2
+   || ( >=dev-libs/libtracecmd-1.1.2

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

2023-07-01 Thread Yixun Lan 
commit: 762d15391ff0aeeda1d38c94951152daf973aa01
Author: Yixun Lan  gentoo  org>
AuthorDate: Sat Jul  1 10:25:03 2023 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sat Jul  1 13:27:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=762d1539

dev-util/kernelshark: add 2.2.1

Signed-off-by: Yixun Lan  gentoo.org>

 dev-util/kernelshark/Manifest |  1 +
 dev-util/kernelshark/kernelshark-2.2.1.ebuild | 59 +++
 2 files changed, 60 insertions(+)

diff --git a/dev-util/kernelshark/Manifest b/dev-util/kernelshark/Manifest
index 9984f4dea6e4..f3b6bab4411a 100644
--- a/dev-util/kernelshark/Manifest
+++ b/dev-util/kernelshark/Manifest
@@ -1 +1,2 @@
 DIST kernelshark-2.2.0.tar.gz 4100601 BLAKE2B 
e68275b91a5a629a868e95c9b5f807c46e445e9d6e131093eb38b5a350af47dec5da9d4ec24a4b60a90ac6b3c70438236f6cd7d80fabccf420bae1603fc13338
 SHA512 
a2d2d2c9494189322ddb45eabe3aded8db9c72eca3d5afefc8d97b4b5011e9f93a3324aeabe19bc1917c3dbf67c75dcefbda831a2e82722bde5599f01e88c047
+DIST kernelshark-2.2.1.tar.gz 4100400 BLAKE2B 
a11e61660cbf987c5060014b4de8e05f6957f2eb5519c3a109d91e5297a4532af3c958471ab181ddc8cbb061d1a493b3f40b71efb3abe3d47640a4ab87cc
 SHA512 
1e0b17de02b82a20f6f78ebbfe61c63550947c3275e1262ae6edfd4675f7d1f976955ed37b14f2a214675a83e43135e605c244b4a5f920ebcdeaabcda7510d10

diff --git a/dev-util/kernelshark/kernelshark-2.2.1.ebuild 
b/dev-util/kernelshark/kernelshark-2.2.1.ebuild
new file mode 100644
index ..660f4388e049
--- /dev/null
+++ b/dev-util/kernelshark/kernelshark-2.2.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2019-2023 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-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
+}

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

2023-03-03 Thread Yixun Lan 
commit: f05d76ea718839add7482c8307932b5e1932f709
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Feb 10 20:06:08 2023 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Fri Mar  3 20:04:22 2023 +
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  gentoo.org>
Signed-off-by: Yixun Lan  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..
--- 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_LIBRARYNAMES  tracefs/libtracefs.a
-+find_library(TRACEFS_LIBRARYNAMES  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..
--- 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

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

2023-01-28 Thread Yixun Lan 
commit: 8c9da448f257c0a168bb44bc801b5006025fa823
Author: Yixun Lan  gentoo  org>
AuthorDate: Sat Jan 28 13:19:35 2023 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sat Jan 28 15:23:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c9da448

dev-util/kernelshark: add 2.2.0

Signed-off-by: Yixun Lan  gentoo.org>

 dev-util/kernelshark/Manifest |  1 +
 dev-util/kernelshark/kernelshark-2.2.0.ebuild | 59 +++
 2 files changed, 60 insertions(+)

diff --git a/dev-util/kernelshark/Manifest b/dev-util/kernelshark/Manifest
index e7d6e1d5bdba..e6b3d2362196 100644
--- a/dev-util/kernelshark/Manifest
+++ b/dev-util/kernelshark/Manifest
@@ -1,3 +1,4 @@
 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/kernelshark-2.2.0.ebuild 
b/dev-util/kernelshark/kernelshark-2.2.0.ebuild
new file mode 100644
index ..660f4388e049
--- /dev/null
+++ b/dev-util/kernelshark/kernelshark-2.2.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2019-2023 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-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
+}

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

2022-09-23 Thread Yixun Lan 
commit: d6a664f4bdb68eeac0eac1234a26063f72097a3f
Author: Yixun Lan  gentoo  org>
AuthorDate: Fri Sep 23 13:11:36 2022 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Fri Sep 23 13:13:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6a664f4

dev-util/kernelshark: add 2.1.1

Signed-off-by: Yixun Lan  gentoo.org>

 dev-util/kernelshark/Manifest |  1 +
 dev-util/kernelshark/kernelshark-2.1.1.ebuild | 59 +++
 2 files changed, 60 insertions(+)

diff --git a/dev-util/kernelshark/Manifest b/dev-util/kernelshark/Manifest
index 86ed6e3b7693..e7d6e1d5bdba 100644
--- a/dev-util/kernelshark/Manifest
+++ b/dev-util/kernelshark/Manifest
@@ -1,2 +1,3 @@
 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

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

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

2022-09-23 Thread Yixun Lan 
commit: 2539616c92d8e06e2f05eba1b38b933044b5bf99
Author: Yixun Lan  gentoo  org>
AuthorDate: Fri Sep 23 13:12:42 2022 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Fri Sep 23 13:13:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2539616c

dev-util/kernelshark: add myself as a maintainer

Signed-off-by: Yixun Lan  gentoo.org>

 dev-util/kernelshark/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/dev-util/kernelshark/metadata.xml 
b/dev-util/kernelshark/metadata.xml
index f80ada075e51..ccfdd585f7b6 100644
--- a/dev-util/kernelshark/metadata.xml
+++ b/dev-util/kernelshark/metadata.xml
@@ -5,6 +5,10 @@
 chutz...@gentoo.org
 Patrick McLean
   
+  
+d...@gentoo.org
+Yixun Lan
+  
   
 Build with user-specified compiler 
optimizations
   (-Os, -O0, -O1, -O2, -O3) from CFLAGS

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

2022-06-16 Thread Patrick McLean 
commit: 8e4742a4aaf16615a8cb633c4b027b80fb1da81e
Author: Christian Schmidt  digadd  de>
AuthorDate: Sat Mar 19 19:47:34 2022 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Thu Jun 16 16:57:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e4742a4

dev-util/kernelshark: bump to 2.1.0

Signed-off-by: Christian Schmidt  digadd.de>
Bug: https://bugs.gentoo.org/824982
Closes: https://github.com/gentoo/gentoo/pull/24667
Signed-off-by: Patrick McLean  gentoo.org>

 dev-util/kernelshark/Manifest  |  1 +
 .../kernelshark-2.1.0-fix-desktop-version.patch| 11 
 .../files/kernelshark-2.1.0-no-ldconfig.patch  | 16 ++
 dev-util/kernelshark/kernelshark-2.1.0.ebuild  | 60 ++
 4 files changed, 88 insertions(+)

diff --git a/dev-util/kernelshark/Manifest b/dev-util/kernelshark/Manifest
index 9bc0767aebc1..86ed6e3b7693 100644
--- a/dev-util/kernelshark/Manifest
+++ b/dev-util/kernelshark/Manifest
@@ -1 +1,2 @@
 DIST kernelshark-1.2.tar.gz 4298175 BLAKE2B 
2ebe70c2b7c0691b65b0251027f1c558fc2fc5ef9bf61512d3ddd554fbb6ec349e36fca4dd0060c6b7db49eca0ec81a2f1296d635459b91883e54e77146ea3ae
 SHA512 
059ac0ced71fa00de34c30ece433430f1e2fc36acb1b3a3f15cb84ce74d7a4f115e4ee8fbf9a256d5a731050aee02823a90a024dca4b4f6a17061652b871b935
+DIST kernelshark-2.1.0.tar.gz 4098666 BLAKE2B 
2798626c598ec2464f018b5808a6da460a552920c373dbf1eaba5d243e2f150da2a9a25668f8cb27e2ddc7dc286d4d5215d942893456de9339a63bde0e4d7381
 SHA512 
4b463cf06a919d67fa38ada8221e4702e2fac725d917e7abd12e1d69880ba964881ac549caf90bd7cb22edea4f28d7937494a05f75218f16fe2edcdff7161c3e

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 ..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 ..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 ..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
+

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

2021-05-23 Thread Andreas Sturmlechner 
commit: 4175029b23c735769cb490583befe77d091608e5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May 22 18:45:34 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 23 17:45:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4175029b

dev-util/kernelshark: Drop unmaintained and broken  ebuild

Closes: https://bugs.gentoo.org/726682
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../kernelshark/files/kernelshark-1.0-build.patch  | 33 
 .../files/kernelshark-1.0-desktop-version.patch| 11 
 dev-util/kernelshark/kernelshark-.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..000
--- 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..000
--- 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-.ebuild 
b/dev-util/kernelshark/kernelshark-.ebuild
deleted file mode 100644
index 969302e6c70..000
--- a/dev-util/kernelshark/kernelshark-.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
-}

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

2021-02-13 Thread David Seifert 
commit: f6906e414a5c0486bf4237d4ebc3780fabab11e9
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Feb 13 10:27:01 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 13 10:27:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6906e41

dev-util/kernelshark: Remove old

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 dev-util/kernelshark/Manifest   |  1 -
 dev-util/kernelshark/kernelshark-1.0.ebuild | 58 -
 2 files changed, 59 deletions(-)

diff --git a/dev-util/kernelshark/Manifest b/dev-util/kernelshark/Manifest
index 7477b72b297..9bc0767aebc 100644
--- a/dev-util/kernelshark/Manifest
+++ b/dev-util/kernelshark/Manifest
@@ -1,2 +1 @@
-DIST kernelshark-1.0.tar.gz 4238163 BLAKE2B 
edae4bcaf646a8c430e64205cd5d137d8df7eb839075b4bb5da459852e1bb887eaa98de51afd1884cfd27833d3513fc26995fba6964220eb8b95a317d3e4e057
 SHA512 
ff9f0846ba7105813742bb56887870eff8af4f525864ab75d37dcb2dd6cfbd500fd08140d605c3f0021d88991c114e0ffeb7da9ada979bdd78defaa1c266
 DIST kernelshark-1.2.tar.gz 4298175 BLAKE2B 
2ebe70c2b7c0691b65b0251027f1c558fc2fc5ef9bf61512d3ddd554fbb6ec349e36fca4dd0060c6b7db49eca0ec81a2f1296d635459b91883e54e77146ea3ae
 SHA512 
059ac0ced71fa00de34c30ece433430f1e2fc36acb1b3a3f15cb84ce74d7a4f115e4ee8fbf9a256d5a731050aee02823a90a024dca4b4f6a17061652b871b935

diff --git a/dev-util/kernelshark/kernelshark-1.0.ebuild 
b/dev-util/kernelshark/kernelshark-1.0.ebuild
deleted file mode 100644
index 969302e6c70..000
--- a/dev-util/kernelshark/kernelshark-1.0.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
-}

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

2021-02-13 Thread David Seifert 
commit: a906f31cbf5bfa5fb1938a48f025c414e5f8f519
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Feb 13 10:26:58 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 13 10:26:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a906f31c

dev-util/kernelshark: Bump to 1.2

* Fix build with gcc-10
* Fix building against >dev-util/trace-cmd-2.8.3

Closes: https://bugs.gentoo.org/738828
Closes: https://bugs.gentoo.org/726402
Closes: https://bugs.gentoo.org/726686

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 dev-util/kernelshark/Manifest  |  1 +
 .../kernelshark/files/kernelshark-1.2-build.patch  | 39 +++
 .../files/kernelshark-1.2-desktop-version.patch|  9 
 dev-util/kernelshark/kernelshark-1.2.ebuild| 56 ++
 4 files changed, 105 insertions(+)

diff --git a/dev-util/kernelshark/Manifest b/dev-util/kernelshark/Manifest
index dcdebcda120..7477b72b297 100644
--- a/dev-util/kernelshark/Manifest
+++ b/dev-util/kernelshark/Manifest
@@ -1 +1,2 @@
 DIST kernelshark-1.0.tar.gz 4238163 BLAKE2B 
edae4bcaf646a8c430e64205cd5d137d8df7eb839075b4bb5da459852e1bb887eaa98de51afd1884cfd27833d3513fc26995fba6964220eb8b95a317d3e4e057
 SHA512 
ff9f0846ba7105813742bb56887870eff8af4f525864ab75d37dcb2dd6cfbd500fd08140d605c3f0021d88991c114e0ffeb7da9ada979bdd78defaa1c266
+DIST kernelshark-1.2.tar.gz 4298175 BLAKE2B 
2ebe70c2b7c0691b65b0251027f1c558fc2fc5ef9bf61512d3ddd554fbb6ec349e36fca4dd0060c6b7db49eca0ec81a2f1296d635459b91883e54e77146ea3ae
 SHA512 
059ac0ced71fa00de34c30ece433430f1e2fc36acb1b3a3f15cb84ce74d7a4f115e4ee8fbf9a256d5a731050aee02823a90a024dca4b4f6a17061652b871b935

diff --git a/dev-util/kernelshark/files/kernelshark-1.2-build.patch 
b/dev-util/kernelshark/files/kernelshark-1.2-build.patch
new file mode 100644
index 000..c7fcd0d8d33
--- /dev/null
+++ b/dev-util/kernelshark/files/kernelshark-1.2-build.patch
@@ -0,0 +1,39 @@
+--- 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_LIBRARYNAMES  tracefs/libtracefs.a
++find_library(TRACEFS_LIBRARYNAMES  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
new file mode 100644
index 000..5f469b19954
--- /dev/null
+++ b/dev-util/kernelshark/files/kernelshark-1.2-desktop-version.patch
@@ -0,0 +1,9 @@
+--- 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/kernelshark-1.2.ebuild 
b/dev-util/kernelshark/kernelshark-1.2.ebuild
new file mode 100644
index 000..f3406107a78
--- /dev/null
+++ b/dev-util/kernelshark/kernelshark-1.2.ebuild
@@ -0,0 +1,56 @@
+# 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"
+

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

2020-05-14 Thread Aaron Bauman 
commit: 6f083537fb52907bc8e7c3d6669862fdf3dbea57
Author: Alexey Sokolov  google  com>
AuthorDate: Fri May  8 00:49:15 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu May 14 22:25:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f083537

dev-util/kernelshark: update homepage

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alexey Sokolov  google.com>
Closes: https://github.com/gentoo/gentoo/pull/15699
Signed-off-by: Aaron Bauman  gentoo.org>

 dev-util/kernelshark/kernelshark-1.0.ebuild  | 4 ++--
 dev-util/kernelshark/kernelshark-.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-util/kernelshark/kernelshark-1.0.ebuild 
b/dev-util/kernelshark/kernelshark-1.0.ebuild
index 44d6447fb0e..969302e6c70 100644
--- a/dev-util/kernelshark/kernelshark-1.0.ebuild
+++ b/dev-util/kernelshark/kernelshark-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit flag-o-matic cmake-utils
 
 DESCRIPTION="Graphical reader for trace-cmd output"
-HOMEPAGE="http://kernelshark.org/;
+HOMEPAGE="https://kernelshark.org/;
 
 if [[ ${PV} =~ [9]{4,} ]]; then
EGIT_REPO_URI="https://github.com/rostedt/trace-cmd.git;

diff --git a/dev-util/kernelshark/kernelshark-.ebuild 
b/dev-util/kernelshark/kernelshark-.ebuild
index 44d6447fb0e..969302e6c70 100644
--- a/dev-util/kernelshark/kernelshark-.ebuild
+++ b/dev-util/kernelshark/kernelshark-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit flag-o-matic cmake-utils
 
 DESCRIPTION="Graphical reader for trace-cmd output"
-HOMEPAGE="http://kernelshark.org/;
+HOMEPAGE="https://kernelshark.org/;
 
 if [[ ${PV} =~ [9]{4,} ]]; then
EGIT_REPO_URI="https://github.com/rostedt/trace-cmd.git;

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

2019-07-26 Thread Patrick McLean 
commit: 87f4a1b2fba5868ef23640c36b01fc3762d0dcb2
Author: Patrick McLean  sony  com>
AuthorDate: Fri Jul 26 17:26:43 2019 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Fri Jul 26 17:26:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87f4a1b2

dev-util/kernelshark: New package

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Patrick McLean  gentoo.org>

 dev-util/kernelshark/Manifest  |  1 +
 .../kernelshark/files/kernelshark-1.0-build.patch  | 33 
 .../files/kernelshark-1.0-desktop-version.patch| 11 
 dev-util/kernelshark/kernelshark-1.0.ebuild| 58 ++
 dev-util/kernelshark/kernelshark-.ebuild   | 58 ++
 dev-util/kernelshark/metadata.xml  | 12 +
 6 files changed, 173 insertions(+)

diff --git a/dev-util/kernelshark/Manifest b/dev-util/kernelshark/Manifest
new file mode 100644
index 000..dcdebcda120
--- /dev/null
+++ b/dev-util/kernelshark/Manifest
@@ -0,0 +1 @@
+DIST kernelshark-1.0.tar.gz 4238163 BLAKE2B 
edae4bcaf646a8c430e64205cd5d137d8df7eb839075b4bb5da459852e1bb887eaa98de51afd1884cfd27833d3513fc26995fba6964220eb8b95a317d3e4e057
 SHA512 
ff9f0846ba7105813742bb56887870eff8af4f525864ab75d37dcb2dd6cfbd500fd08140d605c3f0021d88991c114e0ffeb7da9ada979bdd78defaa1c266

diff --git a/dev-util/kernelshark/files/kernelshark-1.0-build.patch 
b/dev-util/kernelshark/files/kernelshark-1.0-build.patch
new file mode 100644
index 000..411d4235a21
--- /dev/null
+++ b/dev-util/kernelshark/files/kernelshark-1.0-build.patch
@@ -0,0 +1,33 @@
+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
new file mode 100644
index 000..2b9b444958d
--- /dev/null
+++ b/dev-util/kernelshark/files/kernelshark-1.0-desktop-version.patch
@@ -0,0 +1,11 @@
+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-1.0.ebuild 
b/dev-util/kernelshark/kernelshark-1.0.ebuild
new file mode 100644
index 000..44d6447fb0e
--- /dev/null
+++ b/dev-util/kernelshark/kernelshark-1.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2019 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="http://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
+   )
+"