Fri Feb 8 00:08:16 PST 2013

6 files changed, 44 insertions, 18 deletions

diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index 8eada2132..12e461519 100644
--- a/libre/cdfs-libre/PKGBUILD
+++ b/libre/cdfs-libre/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgname=cdfs
 pkgname=cdfs-libre
 pkgver=2.6.27
-pkgrel=35
+pkgrel=36
 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)"
 arch=(i686 x86_64 mips64el)
 url="http://www.elis.UGent.be/~ronsse/cdfs/"
@@ -25,16 +25,21 @@ md5sums=('ac64c014a90e3c488394832ea29605b3'
          'e934407b3460257a301822ffc4ab3933'
          '9215e7bdac728bd2f889fb525e543454')
 
+_kernver=`pacman -Q linux-libre | cut -d . -f 2 | cut -f 1 -d -`
+_kernverfull=`cat /usr/lib/modules/extramodules-3.${_kernver}-LIBRE/version`
+
 build() {
-  _kernver=`pacman -Q linux-libre | cut -d . -f 2 | cut -f 1 -d -`
   depends=("linux-libre>=3.${_kernver}" "linux-libre<3.`expr ${_kernver} + 1`")
-  _kernverfull=`cat /usr/lib/modules/extramodules-3.${_kernver}-LIBRE/version`
 
   cd $srcdir/$_pkgname-$pkgver
   patch -p1 <$srcdir/cdfs-3.0.patch
   patch -p1 <$srcdir/cdfs-3.2.patch
   patch -p1 <$srcdir/cdfs-3.4.patch
   make KDIR=/usr/lib/modules/${_kernverfull}/build
-  install -Dm0644 cdfs.ko $pkgdir/usr/lib/modules/extramodules-3.${_kernver}-LIBRE/cdfs.ko
   sed -i "s|extramodules-.*-LIBRE|extramodules-3.${_kernver}-LIBRE|" $startdir/cdfs.install
 }
+
+package() {
+  cd $srcdir/$_pkgname-$pkgver
+  install -Dm0644 cdfs.ko $pkgdir/usr/lib/modules/extramodules-3.${_kernver}-LIBRE/cdfs.ko
+}
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index d3c01f28c..74216fe4c 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -3,12 +3,17 @@
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=linux-libre-tools
-pkgname=('libtraceevent-libre' 'perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre' 'usbip-libre')
+pkgname=('linux-libre-tools-meta'
+         'libtraceevent-libre'
+         'perf-libre'
+         'cpupower-libre'
+         'x86_energy_perf_policy-libre'
+         'usbip-libre')
 _basekernel=3.7
-#_sublevel=1
-#pkgver=${_basekernel}.${_sublevel}
-pkgver=${_basekernel}
-pkgrel=5
+_sublevel=6
+_pkgver=$_basekernel.$_sublevel
+pkgver=$_basekernel
+pkgrel=7
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -23,13 +28,14 @@ makedepends+=('pciutils')
 # usbip-libre deps
 makedepends+=('glib2' 'sysfsutils')
 groups=("$pkgbase")
-source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
-        #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$_basekernel-gnu/linux-libre-$_basekernel-gnu.tar.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/$_pkgver-gnu/patch-$_basekernel-gnu-$_pkgver-gnu.xz"
         'cpupower.default'
         'cpupower.systemd'
         'cpupower.service'
         'usbipd.service')
 md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
+         '90b2c4b9a05b108219bd44ac4804db84'
          '56883c159381ba89e50ab8ea65efec77'
          '7e0710c2f31c1eb1e1417a7972e676b1'
          '2450e8ff41b30eb58d43b5fffbfde1f4'
@@ -37,9 +43,11 @@ md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
 
 build() {
   # apply stable patching set
-  if [ "${_basekernel}" != "${pkgver}" ]; then
+  if (( NOEXTRACT == 0 )) && [[ -e "$srcdir"/patch-$_basekernel-gnu-$_pkgver-gnu ]]; then
     msg2 'Applying stable patch set'
-    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
+    cd linux-$pkgver
+    patch -Np1 -i "$srcdir"/patch-$_basekernel-gnu-$_pkgver-gnu
+    cd ..
   fi
 
   msg2 'Build libtraceevent-libre'
@@ -81,6 +89,15 @@ build() {
   popd
 }
 
+package_linux-libre-tools-meta() {
+  pkgdesc='Linux kernel tools meta package'
+  groups=()
+  depends=('libtraceevent-libre' 'perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre' 'usbip-libre')
+  replaces=('linux-tools-meta')
+  conflicts=('linux-tools-meta')
+  provides=("linux-tools-meta=$pkgver") 
+}
+
 package_libtraceevent-libre() {
   pkgdesc='Linux kernel trace event library'
   depends=('glibc')
@@ -109,6 +126,10 @@ package_perf-libre() {
     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
+  rm -r usr/etc
 }
 
 package_cpupower-libre() {
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 3210fad9f..63097f460 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -6,7 +6,7 @@ _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-utils-libre')
 pkgver=0.9.0
-pkgrel=36
+pkgrel=37
 epoch=1
 _extramodules=extramodules-3.7-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 594e6e98b..86e933e40 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -11,7 +11,7 @@
 _pkgname=tp_smapi
 pkgname=tp_smapi-libre
 pkgver=0.41
-pkgrel=13
+pkgrel=14
 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index cfbe70292..a9e23cc0a 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -8,7 +8,7 @@ _pkgname=vhba-module
 pkgname=vhba-module-libre
 pkgver=20120422
 _extramodules=extramodules-3.7-LIBRE
-pkgrel=16
+pkgrel=17
 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 828e9e6aa..329ee26c4 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -1,13 +1,13 @@
 # $Id$
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
 # Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
 pkgver=4.2.6
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')