linux-libre-tools: fix split packages to parabola suffix and fix provides

1 files changed, 30 insertions, 30 deletions

diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 79a67a94d..2c62de56a 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -5,23 +5,24 @@
 
 pkgbase=linux-libre-tools
 _pkgname=(
-  'acpidump'
-  'cgroup_event_listener'
-  'cpupower'
-  'libtraceevent'
-  'perf'
-  'tmon'
-  'usbip'
-  'x86_energy_perf_policy'
+  'acpidump-parabola'
+  'cgroup_event_listener-parabola'
+  'cpupower-parabola'
+  'libtraceevent-parabola'
+  'perf-parabola'
+  'tmon-parabola'
+  'usbip-parabola'
+  'x86_energy_perf_policy-parabola'
 )
-pkgname=("$pkgbase" "${_pkgname[@]/#/${pkgbase}-}")
+pkgname=("${pkgbase}-meta" "${_pkgname[@]}")
 
 _pkgbasever=3.16-gnu
 _pkgver=3.16-gnu
+_archver=3.16
 
 _srcname=linux-${_pkgbasever%-*}
 pkgver=${_pkgver//-/.}
-pkgrel=1
+pkgrel=1.1
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -125,16 +126,16 @@ build() {
   popd
 }
 
-_package_meta() {
+package_linux-libre-tools-meta() {
   pkgdesc='Linux-libre kernel tools meta package'
   groups=()
-  depends=("${_pkgname[@]/#/${pkgbase}-}")
-  replaces=( linux{,-libre}-tools-meta)
-  conflicts=(linux{,-libre}-tools-meta)
-  provides=( linux{,-libre}-tools-meta=$pkgver)
+  depends=("${_pkgname[@]}")
+  replaces=(linux-tools-meta)
+  conflicts=(linux-tools-meta)
+  provides=(linux-tools-meta=$_archver)
 }
 
-_package_libtraceevent() {
+_package_libtraceevent-parabola() {
   pkgdesc='Linux-libre kernel trace event library'
   depends=('glibc')
 
@@ -143,7 +144,7 @@ _package_libtraceevent() {
   install -m 644 libtraceevent.a libtraceevent.so "$pkgdir/usr/lib"
 }
 
-_package_perf() {
+_package_perf-parabola() {
   pkgdesc='Linux-libre kernel performance auditing tool'
   depends=('binutils')
 
@@ -163,7 +164,7 @@ _package_perf() {
   rm -r usr/etc
 }
 
-_package_cpupower() {
+_package_cpupower-parabola() {
   pkgdesc='Linux-libre kernel tool to examine and tune power saving related features of your processor'
   backup=('etc/default/cpupower')
   depends=('bash')
@@ -185,7 +186,7 @@ _package_cpupower() {
   install -Dm 755 cpupower.systemd "$pkgdir/usr/lib/systemd/scripts/cpupower"
 }
 
-_package_x86_energy_perf_policy() {
+_package_x86_energy_perf_policy-parabola() {
   pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS'
   depends=('glibc')
 
@@ -194,8 +195,8 @@ _package_x86_energy_perf_policy() {
   install -Dm 644 x86_energy_perf_policy.8 "$pkgdir/usr/share/man/man8/x86_energy_perf_policy.8"
 }
 
-_package_usbip() {
-  pkgdesc='A USB device sharing system over IP network'
+_package_usbip-parabola() {
+  pkgdesc='An USB device sharing system over IP network'
 
   pushd $_srcname/drivers/staging/usbip/userspace
   make install DESTDIR="$pkgdir"
@@ -207,7 +208,7 @@ _package_usbip() {
   install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service"
 }
 
-_package_tmon() {
+_package_tmon-parabola() {
   pkgdesc='Monitoring and Testing Tool for Linux-libre kernel thermal subsystem'
   depends=('glibc')
 
@@ -215,7 +216,7 @@ _package_tmon() {
   make install INSTALL_ROOT="$pkgdir"
 }
 
-_package_acpidump() {
+_package_acpidump-parabola() {
   pkgdesc='Dump system ACPI tables to an ASCII file'
   depends=('glibc')
   conflicts=('iasl')
@@ -226,7 +227,7 @@ _package_acpidump() {
   #install -Dm644 acpidump.8 "$pkgdir/usr/share/man/man8/acpidump.8"
 }
 
-_package_cgroup_event_listener() {
+_package_cgroup_event_listener-parabola() {
   pkgdesc='Simple listener of cgroup events'
   depends=('glibc')
 
@@ -234,15 +235,14 @@ _package_cgroup_event_listener() {
   install -Dm755 cgroup_event_listener "$pkgdir/usr/bin/cgroup_event_listener"
 }
 
-eval "package_${pkgbase}() { _package_meta; }"
 for _p in "${_pkgname[@]}"; do
   eval "
-    package_${pkgbase}-${_p}() {
+    package_${_p}() {
       _package_${_p}
-      depends+=(${_depends[${_p}]})
-      replaces+=( ${_p}{,-libre})
-      conflicts+=(${_p}{,-libre})
-      provides+=( ${_p}{,-libre}=${pkgver})
+      depends+=(${_depends[${_p%-parabola}]})
+      replaces+=(${_p%-parabola})
+      conflicts+=(${_p%-parabola})
+      provides+=(${_p%-parabola}=${_archver})
     }"
 done