Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/comix/PKGBUILD
	community/geany/PKGBUILD
	community/gnome-do-docklets/PKGBUILD
	community/gnome-do-plugins/PKGBUILD
	community/gnome-system-tools/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gtweakui/PKGBUILD
	community/hwinfo/PKGBUILD
	community/kungfu/PKGBUILD
	community/liboauth/PKGBUILD
	community/liboobs/PKGBUILD
	community/lua-lzlib/PKGBUILD
	community/mcdp/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-runtime/PKGBUILD
	community/mplayer2/PKGBUILD
	community/pdf2svg/PKGBUILD
	community/perl-data-dumper/PKGBUILD
	community/perl-digest-md5/PKGBUILD
	community/perl-perlio-eol/PKGBUILD
	community/perl-xml-libxslt/PKGBUILD
	community/python-cherrypy/PKGBUILD
	community/python-pexpect/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python2-cherrypy/PKGBUILD
	community/rexima/PKGBUILD
	community/shp2svg/PKGBUILD
	community/system-tools-backends/PKGBUILD
	community/tracker/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bridge-utils/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/beagle/PKGBUILD
	extra/bug-buddy/PKGBUILD
	extra/dssi/PKGBUILD
	extra/evolution-sharp/PKGBUILD
	extra/evolution-webcal/PKGBUILD
	extra/feh/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gnome-mag/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gok/PKGBUILD
	extra/gpsd/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/hyphen/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/keytouch-editor/PKGBUILD
	extra/keytouch/PKGBUILD
	extra/koffice/PKGBUILD
	extra/krusader/PKGBUILD
	extra/libbeagle/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libgnomeuimm/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/m17n-lib/PKGBUILD
	extra/mtr/PKGBUILD
	extra/openbabel/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/rox/PKGBUILD
	extra/transmission/PKGBUILD
	extra/xf86-input-synaptics/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-xinit/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	libre/icecat/PKGBUILD
	libre/linux-libre/PKGBUILD
	multilib/lib32-ncurses/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	multilib/lib32-talloc/PKGBUILD
	multilib/wine/PKGBUILD

2 files changed, 3 insertions, 95 deletions

diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
index 6ab863216..57ceb8c7f 100644
--- a/community/virtualbox/PKGBUILD
+++ b/community/virtualbox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 56277 2011-10-04 15:42:56Z ibiru $
+# $Id: PKGBUILD 56770 2011-10-12 05:24:02Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox
 pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-archlinux-modules' 'virtualbox-sdk')
 pkgver=4.1.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -152,7 +152,7 @@ package_virtualbox-archlinux-additions(){
         "$pkgdir"/usr/bin/VBoxClient-all
     install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/vboxclient.desktop \
         "$pkgdir"/etc/xdg/autostart/vboxclient.desktop
-    install -D vboxvideo_drv_110.so \
+    install -D vboxvideo_drv_111.so \
         "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so"
     install -d "$pkgdir/usr/lib/xorg/modules/dri"
     install -m755 VBoxOGL*.so "$pkgdir/usr/lib"
diff --git a/community/virtualbox/vboxdrv.sh b/community/virtualbox/vboxdrv.sh
deleted file mode 100755
index aace25edf..000000000
--- a/community/virtualbox/vboxdrv.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/vbox/vbox.cfg
-
-MODLIST=()
-LOG="/var/log/vbox-install.log"
-
-if [ -n "$INSTALL_DIR" ]; then
-  VBOXMANAGE="$INSTALL_DIR/VBoxManage"
-  BUILDVBOXDRV="$INSTALL_DIR/src/vboxdrv/build_in_tmp"
-  BUILDVBOXNETFLT="$INSTALL_DIR/src/vboxnetflt/build_in_tmp"
-  BUILDVBOXNETADP="$INSTALL_DIR/src/vboxnetadp/build_in_tmp"
-  BUILDVBOXPCI="$INSTALL_DIR/src/vboxpci/build_in_tmp"
-else
-  echo "missing vbox.cfg"
-  exit 0
-fi
-
-case "$1" in
-  setup)
-    stat_busy "Unloading VirtualBox kernel modules"
-    for module in vbox{pci,netflt,netadp,drv}; do
-      if grep -q "^${module}" /proc/modules; then
-        MODLIST+=($module)
-        modprobe -r $module
-      fi
-    done
-    stat_done
-    for p in /lib/modules/*; do
-      if [ ! -d "$p/kernel" ]; then
-        if [ -e "$p/misc/vboxdrv.ko" ]; then
-          stat_busy "Removing old VirtualBox kernel modules from $p"
-          rm -f "$p/misc/vbox"{drv,netadp,netflt,pci}.ko 2>/dev/null
-          rmdir -p --ignore-fail-on-non-empty "$p/misc/" 2>/dev/null
-          stat_done
-        fi
-      fi
-    done
-    if find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|grep -q vboxnetadp; then
-      stat_busy "Removing old VirtualBox netadp kernel module"
-      find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2>/dev/null
-      stat_done
-    fi
-    if find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|grep -q vboxnetflt; then
-      stat_busy "Removing old VirtualBox netflt kernel module"
-      find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|xargs rm -f 2>/dev/null
-      stat_done
-    fi
-    if find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then
-      stat_busy "Removing old VirtualBox kernel module"
-      find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null
-      stat_done
-    fi
-    if find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|grep -q vboxpci; then
-      stat_busy "Removing old VirtualBox pci kernel module"
-      find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|xargs rm -f 2>/dev/null
-      stat_done
-    fi
-
-    stat_busy "Recompiling VirtualBox kernel modules"
-    if ! $BUILDVBOXDRV \
-      --save-module-symvers /tmp/vboxdrv-Module.symvers \
-      --no-print-directory install > $LOG 2>&1; then
-      echo  "Look at $LOG to find out what went wrong"
-    fi
-    if ! $BUILDVBOXNETFLT \
-      --use-module-symvers /tmp/vboxdrv-Module.symvers \
-      --no-print-directory install >> $LOG 2>&1; then
-      echo "Look at $LOG to find out what went wrong"
-    fi
-    if ! $BUILDVBOXNETADP \
-      --use-module-symvers /tmp/vboxdrv-Module.symvers \
-      --no-print-directory install >> $LOG 2>&1; then
-      echo "Look at $LOG to find out what went wrong"
-    fi
-    if ! $BUILDVBOXPCI \
-      --use-module-symvers /tmp/vboxdrv-Module.symvers \
-      --no-print-directory install >> $LOG 2>&1; then
-      echo "Look at $LOG to find out what went wrong"
-    fi
-    stat_done
-    stat_busy "Reloading VirtualBox kernel modules"
-    for module in "${MODLIST[@]}"; do
-      modprobe $module
-    done
-    stat_done
-    ;;
-  *)
-    echo "usage: $0 {setup}"
-esac