gentoo (valentine's day) resync : 14.02.2021

4 files changed, 66 insertions, 18 deletions

diff --git a/dev-util/kernelshark/Manifest b/dev-util/kernelshark/Manifest
index e8aa23a2ab43..3a9c3adc2c27 100644
--- a/dev-util/kernelshark/Manifest
+++ b/dev-util/kernelshark/Manifest
@@ -1,6 +1,8 @@
 AUX kernelshark-1.0-build.patch 1288 BLAKE2B 4d79cb34c04186edf9a4787463eede7971177ccfa64988e931345ce66b86003482f1cdb6bb2609f3a7696a18f644204d61b85ad10988347c0db6ee23335ef873 SHA512 f257b73da9494297a44363a5126528dd03e018050464d12b414c4eb0a157da550318a430f40df17db0cf4e0b49feb904c071be42685c3cf64bf455ff9c2d0779
 AUX kernelshark-1.0-desktop-version.patch 313 BLAKE2B 64663bb60499910061328169e726f75e10f843c2dcf036f31954307ffeae863bedaca259ef8d6f1bb653f14c45ffd4a83d2687ed053263526001d8aa175ecaec SHA512 33f6c02a5c8328af71f12a452fa3e5efba1300977397a1382b1e4c04cc5e49fc6c50f95555a294b57ede4616e04bc10c7b8849010ca2a63cc8c1eb266fdb13af
-DIST kernelshark-1.0.tar.gz 4238163 BLAKE2B edae4bcaf646a8c430e64205cd5d137d8df7eb839075b4bb5da459852e1bb887eaa98de51afd1884cfd27833d3513fc26995fba6964220eb8b95a317d3e4e057 SHA512 ff9f0846ba7105813742bb56887870eff8af4f525864ab75d37dcb2dd6c2222fbd500fd08140d605c3f0021d88991c114e0ffeb7da9ada979bdd78defaa1c266
-EBUILD kernelshark-1.0.ebuild 1316 BLAKE2B 1de0e7b262e6dbcfb4378be8ce0764f30d285f1e4bd7447c0e7d12627d150a19d303f0a3d3b01d1437b668a1fc4bb151fdd264ee0d70a10c7cc4c3f28035659a SHA512 2bc6432d5bbbf12928946600a192ff981cc085662c3291b61a4bdfe6f97c1e74819e3756ac1ddb486489203440b863a12774be328dcefb7bf18df5124a049bd4
+AUX kernelshark-1.2-build.patch 1619 BLAKE2B 14d7d2d949c4d738470c1f0102a72617400a3bd01718d3cd580cbac88588b268ce57b06cbe7052648e27241aa5904681a01817067785d9313eecfd4747af2027 SHA512 6f7ba465cf3c449c590b684c67302d35ef8332e4fcbe77763003c40502d26ca3078613e68232314f407f5e0185c42faad6f559efead0b337a6b065cc4503cd36
+AUX kernelshark-1.2-desktop-version.patch 196 BLAKE2B 6800b889e03902caf27a73c6358180499bf7a1051fe19af38c90aa5ea38e4230eb3a4670fcb2a8fc6b54afea371c3b3f689b06ee51f1596e14450615256c7708 SHA512 58331560d558b4fb4bbd50a24fb0cfce6b50b73cfe8481449e5d4a87836d3d2be8bd1a7f5453e8b28d87f1657b426d0453ebcefa78f97b8da44e1ed7ee8fd629
+DIST kernelshark-1.2.tar.gz 4298175 BLAKE2B 2ebe70c2b7c0691b65b0251027f1c558fc2fc5ef9bf61512d3ddd554fbb6ec349e36fca4dd0060c6b7db49eca0ec81a2f1296d635459b91883e54e77146ea3ae SHA512 059ac0ced71fa00de34c30ece433430f1e2fc36acb1b3a3f15cb84ce74d7a4f115e4ee8fbf9a256d5a731050aee02823a90a024dca4b4f6a17061652b871b935
+EBUILD kernelshark-1.2.ebuild 1256 BLAKE2B b7f5ce31272a8034fea5ecd17e259112d0b0b310e221c861529b5cef6e4a87532c6eb574938534e656171bc703eb546d1a4c60c40b0269f225acd9f7d5aa1b48 SHA512 4a85706ac373a672ed577ef0960583ba9010e2ebe801616a3829344322e1c4efd8882f15efab28aab138191196b4e0564a5d0c01dcec32232c73e04cc53e67e0
 EBUILD kernelshark-9999.ebuild 1316 BLAKE2B 1de0e7b262e6dbcfb4378be8ce0764f30d285f1e4bd7447c0e7d12627d150a19d303f0a3d3b01d1437b668a1fc4bb151fdd264ee0d70a10c7cc4c3f28035659a SHA512 2bc6432d5bbbf12928946600a192ff981cc085662c3291b61a4bdfe6f97c1e74819e3756ac1ddb486489203440b863a12774be328dcefb7bf18df5124a049bd4
 MISC metadata.xml 409 BLAKE2B a224422be52a292645aeafbd692638a1f07b1cce88debff7f3a25b9cccd02674ac1e448cb9ac329be6b8f3ff869c0aeb2d205d0930d9d5828eef88dbd295204e SHA512 2e9b3fb0033679637107c2c317fd98c0bd06ec7f8afc3fd2b7b3feef4a7188e818f3f82c6dfa704770b5c71b823e611b3d1445f22bb27ee42c2fd41c368f1708
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 000000000000..c7fcd0d8d33f
--- /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_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
new file mode 100644
index 000000000000..5f469b199547
--- /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.0.ebuild b/dev-util/kernelshark/kernelshark-1.2.ebuild
index 969302e6c70a..f3406107a78a 100644
--- a/dev-util/kernelshark/kernelshark-1.0.ebuild
+++ b/dev-util/kernelshark/kernelshark-1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic cmake-utils
+inherit flag-o-matic cmake
 
 DESCRIPTION="Graphical reader for trace-cmd output"
 HOMEPAGE="https://kernelshark.org/"
@@ -18,41 +18,39 @@ else
 	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:=
+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=
-"
+	dev-qt/qtwidgets:5=
+	>=media-libs/freeglut-3.0.0:=
+	x11-libs/libXmu:=
+	x11-libs/libXi:="
 RDEPEND="${DEPEND}"
-BDEPEND=">=dev-util/cmake-2.8.11
+BDEPEND="
 	doc? (
 		media-gfx/graphviz
 		app-doc/doxygen
-	)
-"
+	)"
 
 PATCHES=(
-	"${FILESDIR}/kernelshark-1.0-build.patch"
-	"${FILESDIR}/kernelshark-1.0-desktop-version.patch"
+	"${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)"
+		-D_DOXYGEN_DOC=$(usex doc)
 	)
 	use custom-optimization || replace-flags -O? -O3
-	cmake-utils_src_configure
+	cmake_src_configure
 }