linux-libre-tools-meta-4.1_gnu-4: drop linux-libre-tools-acpidump and add linux-libre-tools-turbostat

* implement FS#45623 -> https://bugs.archlinux.org/task/45623
* fix FS#45786 -> https://bugs.archlinux.org/task/45786

1 files changed, 18 insertions, 22 deletions

diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 874a3e354..c09ff1dce 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -6,12 +6,12 @@
 _pkgdesc='Linux-libre kernel'
 pkgbase=linux-libre-tools
 _pkgname=(
-  'acpidump'
   'cgroup_event_listener'
   'cpupower'
   'libtraceevent'
   'perf'
   'tmon'
+  'turbostat'
   'usbip'
   'x86_energy_perf_policy'
 )
@@ -23,9 +23,9 @@ _pkgver=${_pkgbasever}
 _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/_}
-pkgrel=1
+pkgrel=4
 license=('GPL2')
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url='http://linux-libre.fsfla.org/'
 options=('!strip')
 
@@ -88,7 +88,6 @@ build() {
     perfexecdir='lib/perf' \
     PYTHON=python2 \
     PYTHON_CONFIG=python2-config \
-    NO_GTK2=1 \
     PERF_VERSION=$pkgver-$pkgrel \
     all man
   popd
@@ -117,13 +116,13 @@ build() {
   make
   popd
 
-  msg2 'acpidump'
-  pushd $_srcname/tools/power/acpi
+  msg2 'cgroup_event_listener'
+  pushd $_srcname/tools/cgroup
   make
   popd
 
-  msg2 'cgroup_event_listener'
-  pushd $_srcname/tools/cgroup
+  msg2 'turbostat'
+  pushd $_srcname/tools/power/x86/turbostat
   make
   popd
 }
@@ -133,7 +132,7 @@ _package_meta() {
   groups=()
   depends=("${_pkgname[@]/#/${pkgbase}-}")
   replaces=(linux-tools-meta)
-  conflicts=(linux-tools-meta)
+  conflicts=(linux-tools-meta acpidump)
   provides=(linux-tools-meta=$_archpkgver)
 }
 
@@ -149,6 +148,7 @@ _package_libtraceevent() {
 _package_perf() {
   pkgdesc="${_pkgdesc} performance auditing tool"
   depends=('binutils')
+  optdepends=('gtk2: support GTK2 browser for perf report')
 
   cd $_srcname/tools/perf
   make \
@@ -157,12 +157,11 @@ _package_perf() {
     perfexecdir='lib/perf' \
     PYTHON=python2 \
     PYTHON_CONFIG=python2-config \
-    NO_GTK2=1 \
     PERF_VERSION=$pkgver-$pkgrel \
     install install-man
   # move completion in new directory
   cd "$pkgdir"
-  install -Dm644 usr/etc/bash_completion.d/perf usr/share/bash-completion/perf
+  install -Dm644 usr/etc/bash_completion.d/perf usr/share/bash-completion/completions/perf
   rm -r usr/etc
 }
 
@@ -218,17 +217,6 @@ _package_tmon() {
   make install INSTALL_ROOT="$pkgdir"
 }
 
-_package_acpidump() {
-  pkgdesc='Dump system ACPI tables to an ASCII file'
-  depends=('glibc')
-  conflicts=('iasl')
-
-  cd $_srcname/tools/power/acpi
-  make install sbindir=/usr/bin mandir=/usr/share/man DESTDIR="$pkgdir"
-  #install -Dm755 acpidump "$pkgdir/usr/bin/acpidump"
-  #install -Dm644 acpidump.8 "$pkgdir/usr/share/man/man8/acpidump.8"
-}
-
 _package_cgroup_event_listener() {
   pkgdesc='Simple listener of cgroup events'
   depends=('glibc')
@@ -237,6 +225,14 @@ _package_cgroup_event_listener() {
   install -Dm755 cgroup_event_listener "$pkgdir/usr/bin/cgroup_event_listener"
 }
 
+_package_turbostat() {
+  pkgdesc='Report processor frequency and idle statistics'
+  depends=('glibc')
+
+  cd $_srcname/tools/power/x86/turbostat
+  make install DESTDIR="$pkgdir"
+}
+
 eval "package_${pkgbase}-meta() { _package_meta; }"
 for _p in "${_pkgname[@]}"; do
   eval "