Merge branch 'master' of vparabola:~/abslibre-pre-mips64el into pre

Conflicts:
	core/heimdal/PKGBUILD
	extra/apache-ant/PKGBUILD
	extra/aria2/PKGBUILD
	extra/bs/PKGBUILD
	extra/dosbox/PKGBUILD
	extra/ettercap-gtk/PKGBUILD
	extra/gqmpeg/PKGBUILD
	extra/gtk-theme-switch2/PKGBUILD
	extra/icecast/PKGBUILD
	extra/kmldonkey/PKGBUILD
	extra/kmplayer/PKGBUILD
	extra/libbtctl/PKGBUILD
	extra/libx86/PKGBUILD
	extra/mc/PKGBUILD
	extra/monotone/PKGBUILD
	extra/nbsmtp/PKGBUILD
	extra/nickle/PKGBUILD
	extra/nppangband/PKGBUILD
	extra/numlockx/PKGBUILD
	extra/python-gtkglext/PKGBUILD
	extra/speedcrunch/PKGBUILD
	extra/vbetool/PKGBUILD
	libre/xchat-gnome-libre/PKGBUILD
	libre/xchat-gnome-libre/gtk2-2.20.patch
	libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch
	libre/xchat-gnome-libre/xchat-gnome.install

2 files changed, 9 insertions, 25 deletions

diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
index 1d7a68e1d..ceb932b9e 100644
--- a/community/virtualbox/PKGBUILD
+++ b/community/virtualbox/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 45439 2011-04-21 19:40:11Z ibiru $
+# $Id: PKGBUILD 47152 2011-05-17 18:01:10Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox
 pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk')
-pkgver=4.0.6
+pkgver=4.0.8
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
 makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst'
-'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'kernel26-headers>=2.6.38' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk' 'gsoap' 'vde2' 
+'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'kernel26-headers>=2.6.38' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk' 'gsoap' 'vde2'
 'xorg-server-devel' 'xf86driproto' 'libxcomposite')
 [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
 source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
         http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf
         virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch
         10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh
-        18-system-xorg.patch gcc46.patch)
-_kernver=2.6.38-LIBRE
+        18-system-xorg.patch)
+_kernver=2.6.38-ARCH
 
 build() {
     cd "$srcdir/VirtualBox-${pkgver}_OSE"
@@ -25,7 +25,6 @@ build() {
     patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch"
     patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
     patch -Np1 -i "$srcdir/18-system-xorg.patch"
-    patch -Np1 -i "$srcdir/gcc46.patch"
 
     cp "$srcdir/LocalConfig.kmk" .
 
@@ -171,6 +170,7 @@ package_virtualbox-guest-additions(){
     install -d "$pkgdir/usr/lib/xorg/modules/dri"
     install -m755 VBoxOGL*.so "$pkgdir/usr/lib"
     ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so"
+    ln -s /usr/lib/xorg/modules/dri "$pkgdir/usr/lib/dri"
     install -m755 -D pam_vbox.so "$pkgdir/lib/security/pam_vbox.so"
 
 }
@@ -203,8 +203,8 @@ package_virtualbox-guest-modules(){
 
     sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-guest-modules.install"
 }
-md5sums=('cf274f0585c35c5c137e2bd9b48b462a'
-         '7d3ee86e998fa24b07a157add9fb7766'
+md5sums=('a3e81289f2357fcf4bbe3e77805f38b6'
+         '39712ccbc16b04c1cda209ae16446bf2'
          '44efb3c4be214daa453a317d527f1f30'
          '32a232b43852b9a08cb11a7bcd64b347'
          '5f85710e0b8606de967716ded7b2d351'
@@ -212,5 +212,4 @@ md5sums=('cf274f0585c35c5c137e2bd9b48b462a'
          '9bde5b7dfba5abcd49768052c5409800'
          'c1a07f044c476a190af8486fe78bee0f'
          '47da2e88de582bb2bab14580a3aa47b1'
-         '8a22b33c9dfaf8fb79bb2d26304e650b'
-         'a28b48ff01149acbca4bbe6a676a06da')
+         '8a22b33c9dfaf8fb79bb2d26304e650b')
diff --git a/community/virtualbox/gcc46.patch b/community/virtualbox/gcc46.patch
deleted file mode 100644
index 9786a7287..000000000
--- a/community/virtualbox/gcc46.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nur VirtualBox-4.0.6_OSE.orig//configure VirtualBox-4.0.6_OSE/configure
---- VirtualBox-4.0.6_OSE.orig//configure	2011-04-21 03:29:30.000000000 -0700
-+++ VirtualBox-4.0.6_OSE/configure	2011-04-21 11:42:57.517216676 -0700
-@@ -412,9 +412,9 @@
-       elif [ $cc_maj -lt 3 \
-              -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
-              -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \
--             -o \( $cc_maj -eq 4 -a $cc_min -gt 5 \) \
-+             -o \( $cc_maj -eq 4 -a $cc_min -gt 6 \) \
-              -o $cc_maj -gt 4 ]; then
--        log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<5"
-+        log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<=6"
-         fail really
-       else
-         log_success "found version $cc_ver"