rebuilding packages against linux-libre-3.9.1-1

11 files changed, 47 insertions, 46 deletions

diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD
index 9a39c7a8f..31997eb35 100644
--- a/libre/bbswitch-libre/PKGBUILD
+++ b/libre/bbswitch-libre/PKGBUILD
@@ -6,14 +6,14 @@
 _pkgname=bbswitch
 pkgname=bbswitch-libre
 pkgver=0.6
-_extramodules=extramodules-3.8-LIBRE # Don't forget to update bbswitch.install
-pkgrel=5
+_extramodules=extramodules-3.9-LIBRE # Don't forget to update bbswitch.install
+pkgrel=7
 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url=("http://github.com/Bumblebee-Project/bbswitch")
 license=('GPL')
-depends=('linux-libre>=3.8' 'linux-libre<3.9')
-makedepends=('linux-libre-headers>=3.8' 'linux-libre-headers<3.9')
+depends=('linux-libre>=3.9' 'linux-libre<3.10')
+makedepends=('linux-libre-headers>=3.9' 'linux-libre-headers<3.10')
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
diff --git a/libre/bbswitch-libre/bbswitch.install b/libre/bbswitch-libre/bbswitch.install
index ed6f7348d..e25d40b44 100644
--- a/libre/bbswitch-libre/bbswitch.install
+++ b/libre/bbswitch-libre/bbswitch.install
@@ -1,5 +1,5 @@
 post_install() {
-    EXTRAMODULES='extramodules-3.8-LIBRE'
+    EXTRAMODULES='extramodules-3.9-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index 86ff43820..f2138e86a 100644
--- a/libre/cdfs-libre/PKGBUILD
+++ b/libre/cdfs-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 90185 2013-05-08 10:46:15Z tpowa $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,13 +6,13 @@
 _pkgname=cdfs
 pkgname=cdfs-libre
 pkgver=2.6.27
-_extramodules=extramodules-3.8-LIBRE # Don't forget to update cdfs.install
-pkgrel=42
+_extramodules=extramodules-3.9-LIBRE # Don't forget to update cdfs.install
+pkgrel=44
 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/"
 license=('GPL')
-depends=('linux-libre>=3.8' 'linux-libre<3.9')
+depends=('linux-libre>=3.9' 'linux-libre<3.10')
 makedepends=('linux-libre-headers')
 replaces=$_pkgname
 conflicts=$_pkgname
diff --git a/libre/cdfs-libre/cdfs.install b/libre/cdfs-libre/cdfs.install
index 1e587cf72..14b056a11 100644
--- a/libre/cdfs-libre/cdfs.install
+++ b/libre/cdfs-libre/cdfs.install
@@ -1,14 +1,14 @@
 post_install() {
-  EXTRAMODULES='extramodules-3.8-LIBRE'
+  EXTRAMODULES='extramodules-3.9-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-  EXTRAMODULES='extramodules-3.8-LIBRE'
+  EXTRAMODULES='extramodules-3.9-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-  EXTRAMODULES='extramodules-3.8-LIBRE'
+  EXTRAMODULES='extramodules-3.9-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 07abf931b..cd55468eb 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183118 2013-04-17 16:51:39Z tpowa $
+# $Id: PKGBUILD 184774 2013-05-08 10:43:50Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
@@ -6,14 +6,14 @@ _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-utils-libre')
 pkgver=0.9.0
-pkgrel=43
+pkgrel=45
 epoch=1
-_extramodules=extramodules-3.8-LIBRE
+_extramodules=extramodules-3.9-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lirc.org/"
 license=('GPL')
 ### NOTICE don't forget to bump version in depends in package_lirc
-makedepends=('help2man' 'linux-libre-headers>=3.8' 'linux-libre-headers<3.9' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
+makedepends=('help2man' 'linux-libre-headers>=3.9' 'linux-libre-headers<3.10' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
 options=('!makeflags' '!strip')
 source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2
         lirc_wpc8769l.patch
@@ -59,7 +59,7 @@ build() {
 
 package_lirc-libre() {
   pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package)"
-  depends=('lirc-utils-libre' 'linux-libre>=3.8' 'linux-libre<3.9')
+  depends=('lirc-utils-libre' 'linux-libre>=3.9' 'linux-libre<3.10')
   replaces=('lirc' 'lirc+pctv')
   conflicts=('lirc')
   provides=("lirc=$pkgver")
diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install
index 49a9dc601..cd4a57231 100644
--- a/libre/lirc-libre/lirc.install
+++ b/libre/lirc-libre/lirc.install
@@ -1,4 +1,4 @@
-EXTRAMODULES=extramodules-3.8-LIBRE
+EXTRAMODULES=extramodules-3.9-LIBRE
 
 post_install() {
   # updating module dependencies
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 92e66fc6a..a3d48d0f3 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 90191 2013-05-08 10:50:10Z tpowa $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: xduugu
 # Contributor: nh2
@@ -12,13 +12,13 @@
 _pkgname=tp_smapi
 pkgname=tp_smapi-libre
 pkgver=0.41
-pkgrel=19
+pkgrel=21
 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'
 license=('GPL')
-depends=('linux-libre>=3.8' 'linux-libre<3.9')
-makedepends=('linux-libre-headers>=3.8' 'linux-libre-headers<3.9')
+depends=('linux-libre>=3.9' 'linux-libre<3.10')
+makedepends=('linux-libre-headers>=3.9' 'linux-libre-headers<3.10')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install
index 5474faf8e..49d1bf656 100644
--- a/libre/tp_smapi-libre/tp_smapi.install
+++ b/libre/tp_smapi-libre/tp_smapi.install
@@ -1,4 +1,4 @@
-extramodules=/usr/lib/modules/extramodules-3.8-LIBRE
+extramodules=/usr/lib/modules/extramodules-3.9-LIBRE
 
 post_install() {
   depmod -v $(< "$extramodules/version") &>/dev/null
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index 3ba9ec1aa..95f94c9b4 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 90193 2013-05-08 10:51:01Z tpowa $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
@@ -7,13 +7,13 @@
 _pkgname=vhba-module
 pkgname=vhba-module-libre
 pkgver=20120422
-_extramodules=extramodules-3.8-LIBRE
-pkgrel=22
+_extramodules=extramodules-3.9-LIBRE
+pkgrel=24
 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
 license=('GPL')
-depends=('linux-libre>=3.8' 'linux-libre<3.9')
+depends=('linux-libre>=3.9' 'linux-libre<3.10')
 makedepends=('linux-libre-headers')
 options=(!makeflags)
 install=$_pkgname.install
diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install
index 3e26e5438..88b96f7b4 100644
--- a/libre/vhba-module-libre/vhba-module.install
+++ b/libre/vhba-module-libre/vhba-module.install
@@ -1,6 +1,6 @@
 _updatemod() {
   echo "  > Updating module dependencies..."
-  EXTRAMODULES='extramodules-3.8-LIBRE'
+  EXTRAMODULES='extramodules-3.9-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 713c61158..591df4817 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 90212 2013-05-09 00:26:24Z seblu $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer <seblu@archlinux.org>
 # Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
@@ -7,20 +7,21 @@
 pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
 pkgver=4.2.12
-_extramodules=extramodules-3.8-LIBRE
-pkgrel=3
+pkgrel=5
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
-makedepends=('linux-libre-headers'
+makedepends=('linux-libre'
+             'linux-libre-headers'
              "virtualbox-libre-host-dkms>=$pkgver"
              "virtualbox-libre-guest-dkms>=$pkgver"
              'expac'
+             'sed'
              'bc')
 
 build() {
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-
+  _kernmaj=$(expac -Q '%v' linux-libre|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
+  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE/version)
   # dkms need modification to be run as user
   cp -r /var/lib/dkms .
   echo "dkms_tree='$srcdir/dkms'" > dkms.conf
@@ -33,38 +34,38 @@ build() {
 }
 
 package_virtualbox-libre-host-modules(){
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-
+  _kernmaj=$(expac -Q '%v' linux-libre|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
+  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE/version)
   pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)'
-  depends=('linux-libre>=3.8' 'linux-libre<3.9')
+  #depends=("linux-libre>=$_kernmaj" "linux-libre<$(echo "$_kernmaj+0.1"|bc)")
+  depends=("linux-libre>=3.9" "linux-libre<3.10")
   provides=("virtualbox-host-modules=${pkgver}")
   replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
   conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
   install=virtualbox-libre-host-modules.install
 
-  install -dm755 "$pkgdir/usr/lib/modules/$_extramodules"
   cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extramodules"
+  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE/"
+  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE/"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" "$startdir/virtualbox-libre-host-modules.install"
+  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-libre-host-modules.install"
 }
 
 package_virtualbox-libre-guest-modules(){
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-
+  _kernmaj=$(expac -Q '%v' linux-libre|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
+  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE/version)
   pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)'
   license=('GPL')
-  depends=('linux-libre>=3.8' 'linux-libre<3.9')
   provides=("virtualbox-guest-modules=${pkgver}")
   replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
   conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
   install=virtualbox-libre-guest-modules.install
 
-  install -dm755 "$pkgdir/usr/lib/modules/$_extramodules"
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extramodules"
+  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE/"
+  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE/"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" "$startdir/virtualbox-libre-guest-modules.install"
+  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-libre-guest-modules.install"
 }
 
 # vim:set ts=2 sw=2 et: