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

Conflicts:
	community/fotoxx/PKGBUILD
	community/gtkdialog/PKGBUILD
	community/hubbub/PKGBUILD
	community/libgdamm/PKGBUILD
	community/libparserutils/PKGBUILD
	community/mingw32-binutils/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/mtpaint/PKGBUILD
	community/netsurf/PKGBUILD
	community/patchage/PKGBUILD
	community/qgo/PKGBUILD
	community/tomoyo-tools/PKGBUILD
	community/tre/PKGBUILD
	community/virtualbox/PKGBUILD
	core/net-tools/PKGBUILD
	core/openldap/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evince/PKGBUILD
	extra/evolution-data-server/PKGBUILD
	extra/evolution/PKGBUILD
	extra/exiv2/PKGBUILD
	extra/folks/PKGBUILD
	extra/gimp-ufraw/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnome-python-extras/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/jack/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/koffice/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/mutter/PKGBUILD
	extra/nautilus/PKGBUILD
	extra/openmpi/PKGBUILD
	extra/pavucontrol/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/swt/PKGBUILD
	extra/tomcat/PKGBUILD
	extra/totem/PKGBUILD
	extra/vigra/PKGBUILD
	extra/vte/PKGBUILD
	extra/xulrunner/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib/lib32-atk/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-glew/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-jack/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/wine/PKGBUILD
	social/miniupnpc/PKGBUILD
	testing/icedtea-web-java7/PKGBUILD
	testing/sqlite3/PKGBUILD
	~xihh/abiword/PKGBUILD

1 files changed, 17 insertions, 16 deletions

diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
index d501e1e05..6ab863216 100644
--- a/community/virtualbox/PKGBUILD
+++ b/community/virtualbox/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 54264 2011-08-15 19:54:32Z ibiru $
+# $Id: PKGBUILD 56277 2011-10-04 15:42:56Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox
 pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-archlinux-modules' 'virtualbox-sdk')
-pkgver=4.1.2
+pkgver=4.1.4
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://virtualbox.org'
@@ -14,8 +14,8 @@ makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor
 source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
         UserManual-$pkgver.pdf::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
-        change_default_driver_dir.patch)
+        10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxbuild
+        change_default_driver_dir.patch vbox-service.conf vbox-service.rc)
 _kernver=3.0-LIBRE
 
 build() {
@@ -113,7 +113,7 @@ package_virtualbox() {
     #sources for modules
     cp -r src ${pkgdir}/usr/lib/virtualbox
     #install compilation script
-    install -D -m 755 "${srcdir}/vboxdrv.sh" "${pkgdir}/etc/rc.d/vboxdrv"
+    install -D -m 755 "${srcdir}/vboxbuild" "${pkgdir}/usr/bin/vboxbuild"
 }
 
 package_virtualbox-sdk() {
@@ -148,16 +148,10 @@ package_virtualbox-archlinux-additions(){
     install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin"
     install -m755 mount.vboxsf "$pkgdir/sbin"
 
-    install -m644 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/50-vboxmouse.conf \
-        "$pkgdir"/etc/X11/xorg.conf.d/50-vboxmouse.conf
-    install -m644 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules \
-        "$pkgdir"/lib/udev/rules.d/70-xorg-vboxmouse.rules
     install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
         "$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 vboxmouse_drv_110.so \
-        "$pkgdir/usr/lib/xorg/modules/input/vboxmouse.so"
     install -D vboxvideo_drv_110.so \
         "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so"
     install -d "$pkgdir/usr/lib/xorg/modules/dri"
@@ -165,6 +159,11 @@ package_virtualbox-archlinux-additions(){
     ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so"
     install -m755 -D pam_vbox.so "$pkgdir/lib/security/pam_vbox.so"
 
+    # install rc.d script
+    install -D -m755 "${srcdir}/vbox-service.rc" "${pkgdir}/etc/rc.d/vbox-service"
+
+    # install sample config
+    install -D -m644 "${srcdir}/vbox-service.conf" "${pkgdir}/etc/conf.d/vbox-service"
 }
 
 package_virtualbox-archlinux-modules(){
@@ -193,13 +192,15 @@ package_virtualbox-archlinux-modules(){
 
     sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-archlinux-modules.install"
 }
-md5sums=('945d2c94c15a4f47280be4b01b67e244'
-         'cc75a674add48f8b25af2b5e69530a6f'
+md5sums=('dc6e6801b3823332b6ca2e9915221aae'
+         'bc048d1e58d84ece4a186199ee48d4c8'
          '44efb3c4be214daa453a317d527f1f30'
          '32a232b43852b9a08cb11a7bcd64b347'
          '5f85710e0b8606de967716ded7b2d351'
          'ed1341881437455d9735875ddf455fbe'
-         '4cf75d9c091199a47a7a1bc2f4e347d9'
+         'cc3f278bc273011aa95277500a76f677'
          '78ffa67ff131680f1d2b6f06d4325c5b'
-         '790a1456345fe74b6b714d71f90a1c6d'
-         '97e193f050574dd272a38e5ee5ebe62b')
+         'dda3811f7d94ac55f12b4de707a7c2c2'
+         '97e193f050574dd272a38e5ee5ebe62b'
+         '3c08ad30b89add47d3f45121200a5360'
+         '778d865e56e31cc592fbfa257fdcfce7')