4 files changed, 56 insertions, 24 deletions
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index 30da87a87..a4b2f8eff 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,21 +1,18 @@
-# $Id: PKGBUILD 96546 2013-08-31 16:05:06Z foutrelis $
+# $Id: PKGBUILD 96877 2013-09-07 00:14:09Z seblu $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
-pkgver=4.2.16
-pkgrel=9
+pkgver=4.2.18
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
 makedepends=('linux>=3.10' 'linux<3.11'
              'linux-headers>=3.10' 'linux-headers<3.11'
              "virtualbox-host-dkms>=$pkgver"
-             "virtualbox-guest-dkms>=$pkgver"
-             'expac'
-             'sed'
-             'bc')
+             "virtualbox-guest-dkms>=$pkgver")
 
 # remember to also adjust the .install files and the package deps below
 _extramodules=extramodules-3.10-ARCH
diff --git a/community/virtualbox-modules/build.sh b/community/virtualbox-modules/build.sh
index 744f18330..b5c163db9 100755
--- a/community/virtualbox-modules/build.sh
+++ b/community/virtualbox-modules/build.sh
@@ -1,25 +1,60 @@
 #!/bin/bash
+# lazyness can be enhanced everyday
 
-set -e
-
-if (( $# != 1 )); then
+usage() {
   echo "usage: $0 extra"
   echo "       $0 testing"
   exit 1
-fi
+}
+
+# $1: reference package
+update() {
+  url="https://www.archlinux.org/packages/$1/x86_64/$2/"
+  curkernel=$(wget -qO- "$url"|sed -nr "s/.*<h2>$2 ([0-9]+)\.([0-9]+).*<\/h2>.*/\1.\2/p")
+  nextkernel=${curkernel%.*}.$(( ${curkernel#*.}+1))
+
+  echo "** Current kernel: $curkernel"
+  echo "** Next kernel: $nextkernel"
+
+  sed -ri \
+    -e "s/(_?extramodules=).*-(ARCH|lts).*/\1extramodules-$curkernel-\2/i" \
+    -e "s/(linux.*>=)[0-9]+.[0-9]+/\1$curkernel/" \
+    -e "s/(linux.*<)[0-9]+.[0-9]+/\1$nextkernel/" \
+    PKGBUILD *.install
+}
+
+# $1: repo
+# $2: arch
+build() {
+  _pwd=$PWD
+  cd /var/empty
+  makechrootpkg -cu -I "$_pwd"/../../virtualbox/trunk/virtualbox-host-dkms-*-$arch.pkg.tar.xz -r "$1"
+  makechrootpkg -I "$_pwd"/../../virtualbox/trunk/virtualbox-guest-dkms-*-$arch.pkg.tar.xz  -r "$1"
+  cd "$_pwd"
+  makechrootpkg -n -r "$1"
+}
 
-here=$PWD
-cd /var/empty
-linux32 makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
-linux32 makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-guest-dkms-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
-cd "$here"
-linux32 makechrootpkg -n -r /var/lib/archbuild/$1-i686
+(( $# == 1 )) || usage
 
-cd /var/empty
-makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
-makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-guest-dkms-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
-cd "$here"
-makechrootpkg -n -r /var/lib/archbuild/$1-x86_64
+# detect lts case
+grep -q linux-lts PKGBUILD && suf=-lts
 
+case $1 in
+  extra)
+    update core linux$suf-headers
+    for arch in i686 x86_64; do
+      build /var/lib/archbuild/extra-$arch $arch
+    done
+  ;;
+  testing)
+    update testing linux$suf-headers
+    for arch in i686 x86_64; do
+      build /var/lib/archbuild/testing-$arch $arch
+    done
+  ;;
+  *)
+    usage
+  ;;
+esac
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install
index ed1762c21..d87c4cf64 100644
--- a/community/virtualbox-modules/virtualbox-guest-modules.install
+++ b/community/virtualbox-modules/virtualbox-guest-modules.install
@@ -1,5 +1,5 @@
 _depmod() {
-  EXTRAMODULES='extramodules-3.10-ARCH'
+  EXTRAMODULES=extramodules-3.10-ARCH
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install
index 2f7f00d9e..cc590b37c 100644
--- a/community/virtualbox-modules/virtualbox-host-modules.install
+++ b/community/virtualbox-modules/virtualbox-host-modules.install
@@ -1,5 +1,5 @@
 _depmod() {
-  EXTRAMODULES='extramodules-3.10-ARCH'
+  EXTRAMODULES=extramodules-3.10-ARCH
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }