Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bitcoin/PKGBUILD
	community/calc/PKGBUILD
	community/fcitx/PKGBUILD
	community/gloobus-preview/PKGBUILD
	community/linux-tools/PKGBUILD
	community/smc/PKGBUILD
	extra/elfutils/PKGBUILD
	extra/freenx/PKGBUILD
	extra/gnome-alsamixer/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/kdesdk-kate/PKGBUILD
	extra/lcms2/PKGBUILD
	extra/libmspack/PKGBUILD
	extra/libtheora/PKGBUILD
	extra/mesa/PKGBUILD
	extra/nx-common/PKGBUILD
	extra/opennx/PKGBUILD
	extra/perl-tk/PKGBUILD
	extra/qt4/PKGBUILD
	extra/soprano/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xmlsec/PKGBUILD
	extra/xorg-server/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD
	libre/ipsec-tools-libre/PKGBUILD
	libre/tomoyo-tools-libre/PKGBUILD
	pcr/amsynth/PKGBUILD

1 files changed, 16 insertions, 18 deletions

diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index e3862c973..cc9ce02bf 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,25 +1,27 @@
-# $Id: PKGBUILD 93064 2013-06-23 17:40:06Z seblu $
+# $Id: PKGBUILD 93232 2013-06-29 10:08:01Z foutrelis $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
 pkgver=4.2.14
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
-makedepends=('linux'
-             'linux-headers'
+makedepends=('linux>=3.9' 'linux<3.10'
+             'linux-headers>=3.9' 'linux-headers<3.10'
              "virtualbox-host-dkms>=$pkgver"
              "virtualbox-guest-dkms>=$pkgver"
              'expac'
              'sed'
              'bc')
 
+# remember to also adjust the .install files and the package deps below
+_extramodules=extramodules-3.9-ARCH
+
 build() {
-  _kernmaj=$(expac -Q '%v' linux|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
-  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-ARCH/version)
+  _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
   # dkms need modification to be run as user
   cp -r /var/lib/dkms .
   echo "dkms_tree='$srcdir/dkms'" > dkms.conf
@@ -32,36 +34,32 @@ build() {
 }
 
 package_virtualbox-host-modules(){
-  _kernmaj=$(expac -Q '%v' linux|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
-  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-ARCH/version)
+  _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
   pkgdesc='Host kernel modules for VirtualBox'
-  depends=("linux>=$_kernmaj" "linux<$(echo "$_kernmaj+0.1"|bc)")
+  depends=('linux>=3.9' 'linux<3.10')
   replaces=('virtualbox-modules')
   conflicts=('virtualbox-modules')
   install=virtualbox-host-modules.install
 
   cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
-  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-ARCH/"
-  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-ARCH/"
+  install -dm755 "$pkgdir/usr/lib/modules/$_extramodules/"
+  install -m644 * "$pkgdir/usr/lib/modules/$_extramodules/"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-host-modules.install"
 }
 
 package_virtualbox-guest-modules(){
-  _kernmaj=$(expac -Q '%v' linux|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
-  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-ARCH/version)
+  _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
   pkgdesc='Guest kernel modules for VirtualBox'
   license=('GPL')
-  depends=("linux>=$_kernmaj" "linux<$(echo "$_kernmaj+0.1"|bc)")
+  depends=('linux>=3.9' 'linux<3.10')
   replaces=('virtualbox-archlinux-modules')
   conflicts=('virtualbox-archlinux-modules')
   install=virtualbox-guest-modules.install
 
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
-  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-ARCH/"
-  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-ARCH/"
+  install -dm755 "$pkgdir/usr/lib/modules/$_extramodules/"
+  install -m644 * "$pkgdir/usr/lib/modules/$_extramodules/"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-guest-modules.install"
 }
 
 # vim:set ts=2 sw=2 et: