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

Conflicts:
	community/chmsee/PKGBUILD
	community/flumotion/PKGBUILD
	community/gnash/PKGBUILD
	community/kadu/PKGBUILD
	community/mythplugins/PKGBUILD
	community/performous/PKGBUILD
	community/sleuthkit/PKGBUILD
	community/virtualbox/PKGBUILD
	community/wbar/PKGBUILD
	core/attr/PKGBUILD
	core/binutils/PKGBUILD
	core/heimdal/PKGBUILD
	core/sqlite3/PKGBUILD
	extra/acpid/PKGBUILD
	extra/apache-ant/PKGBUILD
	extra/aria2/PKGBUILD
	extra/boost/PKGBUILD
	extra/bs/PKGBUILD
	extra/bzr/PKGBUILD
	extra/cvsps/PKGBUILD
	extra/dosbox/PKGBUILD
	extra/ettercap-gtk/PKGBUILD
	extra/fetchmail/PKGBUILD
	extra/gnome-desktop-sharp/PKGBUILD
	extra/gnome-panel/PKGBUILD
	extra/gptfdisk/PKGBUILD
	extra/gqmpeg/PKGBUILD
	extra/gstreamer0.10-base/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk-theme-switch2/PKGBUILD
	extra/icecast/PKGBUILD
	extra/kdeedu/PKGBUILD
	extra/kmldonkey/PKGBUILD
	extra/kmplayer/PKGBUILD
	extra/libbtctl/PKGBUILD
	extra/libftdi/PKGBUILD
	extra/liborigin2/PKGBUILD
	extra/libpst/PKGBUILD
	extra/libx86/PKGBUILD
	extra/lsdvd/PKGBUILD
	extra/mc/PKGBUILD
	extra/monotone/PKGBUILD
	extra/multitail/PKGBUILD
	extra/nbsmtp/PKGBUILD
	extra/nickle/PKGBUILD
	extra/nppangband/PKGBUILD
	extra/numlockx/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/poppler/PKGBUILD
	extra/python-gtkglext/PKGBUILD
	extra/scim/PKGBUILD
	extra/socat/PKGBUILD
	extra/speedcrunch/PKGBUILD
	extra/transmission/PKGBUILD
	extra/vbetool/PKGBUILD
	extra/vlc/PKGBUILD
	extra/xchat-gnome/xchat-gnome.install
	libre/kernel26-libre/PKGBUILD
	libre/pacman/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
	multilib/nspluginwrapper/PKGBUILD
	testing/libgweather/libgweather.install
	testing/mesa/PKGBUILD

3 files changed, 33 insertions, 24 deletions

diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
index 1d7a68e1d..0e267725f 100644
--- a/community/virtualbox/PKGBUILD
+++ b/community/virtualbox/PKGBUILD
@@ -1,22 +1,28 @@
-# $Id: PKGBUILD 45439 2011-04-21 19:40:11Z ibiru $
+# $Id: PKGBUILD 47286 2011-05-20 18:13:22Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox
 pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk')
-pkgver=4.0.6
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
+pkgver=4.0.8
+pkgrel=2
+arch=('i686' 'x86_64')
 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
+<<<<<<< HEAD
         18-system-xorg.patch gcc46.patch)
 _kernver=2.6.38-LIBRE
+=======
+        18-system-xorg.patch
+        change_default_driver_dir.patch)
+_kernver=2.6.38-ARCH
+>>>>>>> 33feb015eb09eee76827f359e685fce981d88111
 
 build() {
     cd "$srcdir/VirtualBox-${pkgver}_OSE"
@@ -25,7 +31,7 @@ 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"
+    patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
 
     cp "$srcdir/LocalConfig.kmk" .
 
@@ -203,8 +209,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'
@@ -213,4 +219,4 @@ md5sums=('cf274f0585c35c5c137e2bd9b48b462a'
          'c1a07f044c476a190af8486fe78bee0f'
          '47da2e88de582bb2bab14580a3aa47b1'
          '8a22b33c9dfaf8fb79bb2d26304e650b'
-         'a28b48ff01149acbca4bbe6a676a06da')
+         'ac43f7cf44b934d8dbdbc3bb6f7879ad')
diff --git a/community/virtualbox/change_default_driver_dir.patch b/community/virtualbox/change_default_driver_dir.patch
new file mode 100644
index 000000000..71930f062
--- /dev/null
+++ b/community/virtualbox/change_default_driver_dir.patch
@@ -0,0 +1,18 @@
+diff -Nur VirtualBox-4.0.8_OSE.orig//src/VBox/Additions/common/crOpenGL/fakedri_drv.c VirtualBox-4.0.8_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
+--- VirtualBox-4.0.8_OSE.orig//src/VBox/Additions/common/crOpenGL/fakedri_drv.c	2011-05-18 04:28:14.545495222 -0700
++++ VirtualBox-4.0.8_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	2011-05-18 04:29:57.945499707 -0700
+@@ -36,13 +36,8 @@
+ //#define DEBUG_DRI_CALLS
+ 
+ //@todo this could be different...
+-#ifdef RT_ARCH_AMD64
+-# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri"
++# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri"
+ # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
+-#else
+-# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri"
+-# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
+-#endif
+ 
+ #ifdef DEBUG_DRI_CALLS
+  #define SWDRI_SHOWNAME(pext, func) \
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"