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

Conflicts:
	community/arm-elf-binutils/PKGBUILD
	community/bird/PKGBUILD
	community/cantata/PKGBUILD
	community/dbmail/PKGBUILD
	community/ekg2/PKGBUILD
	community/ffmpeg-compat/PKGBUILD
	community/gigedit/PKGBUILD
	community/gimp-refocus/PKGBUILD
	community/gmime24/PKGBUILD
	community/gmpc/PKGBUILD
	community/gnash/PKGBUILD
	community/id3lib-rcc/PKGBUILD
	community/linuxsampler/PKGBUILD
	community/lwm/PKGBUILD
	community/midori/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mtpaint/PKGBUILD
	community/nestopia/PKGBUILD
	community/preload/PKGBUILD
	community/projectm/PKGBUILD
	community/rusxmms/PKGBUILD
	community/taglib-rcc/PKGBUILD
	community/the_silver_searcher/PKGBUILD
	community/xnee/PKGBUILD
	core/libgcrypt/PKGBUILD
	core/libusbx/PKGBUILD
	core/mkinitcpio-busybox/PKGBUILD
	extra/a2ps/PKGBUILD
	extra/a52dec/PKGBUILD
	extra/abook/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/cln/PKGBUILD
	extra/exempi/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/fluxter/PKGBUILD
	extra/fontforge/PKGBUILD
	extra/glib/PKGBUILD
	extra/gnet/PKGBUILD
	extra/gnome-vfs/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk/PKGBUILD
	extra/idnkit/PKGBUILD
	extra/ilmbase/PKGBUILD
	extra/imake/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/libdatrie/PKGBUILD
	extra/libmbim/PKGBUILD
	extra/libmp3splt/PKGBUILD
	extra/libqmi/PKGBUILD
	extra/libtxc_dxtn/PKGBUILD
	extra/libxfont/PKGBUILD
	extra/mesa/PKGBUILD
	extra/modemmanager/PKGBUILD
	extra/nedit/PKGBUILD
	extra/nmap/PKGBUILD
	extra/openexr/PKGBUILD
	extra/purple-plugin-pack/PKGBUILD
	extra/qemu/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/subversion/PKGBUILD
	extra/transmission/PKGBUILD
	extra/truecrypt/PKGBUILD
	extra/vigra/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/wxmaxima/PKGBUILD
	extra/x264/PKGBUILD
	extra/xorg-iceauth/PKGBUILD
	extra/xorg-mkfontscale/PKGBUILD
	extra/xorg-xfd/PKGBUILD
	libre/abuse-libre/PKGBUILD
	libre/clementine-libre/PKGBUILD
	libre/linux-libre/PKGBUILD

1 files changed, 7 insertions, 7 deletions

diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index 4d220f40b..51b0f410c 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 93524 2013-07-05 00:43:46Z seblu $
+# $Id: PKGBUILD 94462 2013-07-25 11:22:57Z tpowa $
 # 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=1
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
-makedepends=('linux>=3.9' 'linux<3.10'
-             'linux-headers>=3.9' 'linux-headers<3.10'
+makedepends=('linux>=3.10' 'linux<3.11'
+             'linux-headers>=3.10' 'linux-headers<3.11'
              "virtualbox-host-dkms>=$pkgver"
              "virtualbox-guest-dkms>=$pkgver"
              'expac'
@@ -18,7 +18,7 @@ makedepends=('linux>=3.9' 'linux<3.10'
              'bc')
 
 # remember to also adjust the .install files and the package deps below
-_extramodules=extramodules-3.9-ARCH
+_extramodules=extramodules-3.10-ARCH
 
 build() {
   _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
@@ -36,7 +36,7 @@ build() {
 package_virtualbox-host-modules(){
   _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
   pkgdesc='Host kernel modules for VirtualBox'
-  depends=('linux>=3.9' 'linux<3.10')
+  depends=('linux>=3.10' 'linux<3.11')
   replaces=('virtualbox-modules')
   conflicts=('virtualbox-modules')
   install=virtualbox-host-modules.install
@@ -51,7 +51,7 @@ package_virtualbox-guest-modules(){
   _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
   pkgdesc='Guest kernel modules for VirtualBox'
   license=('GPL')
-  depends=('linux>=3.9' 'linux<3.10')
+  depends=('linux>=3.10' 'linux<3.11')
   replaces=('virtualbox-archlinux-modules')
   conflicts=('virtualbox-archlinux-modules')
   install=virtualbox-guest-modules.install