new verison 2.8.3, kernelshark is now a unique package

2 files changed, 23 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6b5b21431628..e25e7e0dfaf4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,19 @@
 pkgbase = trace-cmd
-	pkgdesc = user-space front-end command-line tool for Ftrace, inclduing the GUI interface application kernelshark as well as trace-graph and trace-view.
-	pkgver = 2.7
-	pkgrel = 2
-	url = http://git.kernel.org/?p=linux/kernel/git/rostedt/trace-cmd.git
+	pkgdesc = Userspace tooling for the Linux kernel Ftrace internal tracer
+	pkgver = 2.8.3
+	pkgrel = 1
+	url = https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git
 	arch = x86_64
 	arch = aarch64
 	license = GPL2
-	makedepends = pygtk
+	makedepends = python
 	makedepends = swig
-	makedepends = docbook-xsl
 	makedepends = asciidoc
-	depends = python2
-	depends = gtk2
+	optdepends = python: for the Python plugins
 	provides = trace-cmd
 	conflicts = trace-cmd-git
-	source = http://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git/snapshot/trace-cmd-v2.7.tar.gz
-	sha256sums = 5c3b03c701d124c36b127fd73909725e673105df0d39048a7b78ddf209ea15fb
+	source = https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v2.8.3.tar.gz
+	sha256sums = 706564b147bd966957431c4ca70032947d59c5d977c1ac2942b1b5a8668e7a6f
 
 pkgname = trace-cmd
 
diff --git a/PKGBUILD b/PKGBUILD
index 150b871de79b..501c9e2594f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,32 @@
 # Current Maintainer: Troy Engel <troyengel+arch@gmail.com>
 
 pkgname=trace-cmd
-pkgver=2.7
-pkgrel=2
-pkgdesc="user-space front-end command-line tool for Ftrace, inclduing the GUI interface application kernelshark as well as trace-graph and trace-view."
+pkgver=2.8.3
+pkgrel=1
+pkgdesc="Userspace tooling for the Linux kernel Ftrace internal tracer"
 arch=('x86_64' 'aarch64')
-url="http://git.kernel.org/?p=linux/kernel/git/rostedt/trace-cmd.git"
+url="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git"
 license=('GPL2')
-depends=('python2' 'gtk2')
-makedepends=('pygtk' 'swig' 'docbook-xsl' 'asciidoc')
+makedepends=('python' 'swig' 'asciidoc')
+optdepends=('python: for the Python plugins')
 provides=('trace-cmd')
 conflicts=('trace-cmd-git')
-source=("http://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git/snapshot/trace-cmd-v${pkgver}.tar.gz")
-sha256sums=('5c3b03c701d124c36b127fd73909725e673105df0d39048a7b78ddf209ea15fb')
+source=("https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v${pkgver}.tar.gz")
+sha256sums=('706564b147bd966957431c4ca70032947d59c5d977c1ac2942b1b5a8668e7a6f')
 
 build() {
   cd "${srcdir}/${pkgname}-v${pkgver}"
   
-  make PYTHON_VERS=python2 all gui doc
+  make PYTHON_VERS=python3 all doc
 }
 
 package() {
   cd "${srcdir}/${pkgname}-v${pkgver}"
 
-  make PYTHON_VERS=python2 prefix="/usr" DESTDIR="$pkgdir" install install_gui install_doc
+  make PYTHON_VERS=python3 prefix="/usr" DESTDIR="$pkgdir" \
+    install install_doc
+
+  # Remove the KernelShark docs from this package
+  rm -rf "${pkgdir}/usr/share/kernelshark"
+  rm -f "${pkgdir}/usr/share/man/man1/kernelshark.1"
 }