Version bump; update VBox.sh wrapper

svn path=/trunk/; revision=740

4 files changed, 130 insertions, 15 deletions

diff --git a/app-emulation/virtualbox-ose/ChangeLog b/app-emulation/virtualbox-ose/ChangeLog
index c9bd906..334e584 100644
--- a/app-emulation/virtualbox-ose/ChangeLog
+++ b/app-emulation/virtualbox-ose/ChangeLog
@@ -1,12 +1,22 @@
 # ChangeLog for app-emulation/virtualbox-ose
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.31 2009/10/09 17:41:14 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.33 2009/10/19 01:46:15 fauli Exp $
 
-  17 Oct 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
-  -virtualbox-ose-3.0.8.ebuild, +virtualbox-ose-3.0.8-r1.ebuild,
-  +files/virtualbox-ose-3.0.8-without-hal-fix.patch:
-  add dev-util/pkgconfig to DEPEND #288281; fix pkg_postinst message #288489;
-  fix vboxwebsrv build/DEPEND #288836; fix nls doins in headless mode
+  03 Nov 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  -virtualbox-ose-3.0.8-r1.ebuild, +virtualbox-ose-3.0.10.ebuild,
+  +files/virtualbox-ose-3-wrapper:
+  Version bump; update VBox.sh wrapper
+
+  19 Oct 2009; Christian Faulhammer <fauli@gentoo.org>
+  virtualbox-ose-3.0.8-r1.ebuild:
+  stable x86, bug 288836
+
+*virtualbox-ose-3.0.8-r1 (18 Oct 2009)
+
+  18 Oct 2009; Christian Faulhammer <fauli@gentoo.org>
+  +virtualbox-ose-3.0.8-r1.ebuild:
+  fix some issues with USE=headless, taken from jokey's overlay, as proxy
+  for Alessio Cassibba
 
   09 Oct 2009; Patrick Lauer <patrick@gentoo.org>
   virtualbox-ose-3.0.8.ebuild,
@@ -133,7 +143,7 @@
 *virtualbox-ose-2.0.4-r1 (18 Dec 2008)
 *virtualbox-ose-1.6.6-r1 (18 Dec 2008)
 
-  18 Dec 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+  18 Dec 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   +files/virtualbox-ose-fix-insecure-lockfiles.patch,
   +virtualbox-ose-1.6.6-r1.ebuild, +virtualbox-ose-2.0.4-r1.ebuild,
   +virtualbox-ose-2.0.6.ebuild, virtualbox-ose-9999.ebuild:
@@ -304,13 +314,13 @@
   04 Mar 2008; Markus Ullmann <jokey@gentoo.org> virtualbox-1.5.4-r1.ebuild:
   Stable on x86 wrt bug #208905
 
-  26 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
+  26 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
   virtualbox-1.5.6.ebuild:
   Fix patch naming.
 
 *virtualbox-1.5.6 (25 Feb 2008)
 
-  25 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
+  25 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
   +virtualbox-1.5.6.ebuild:
   Version bump, as requested by the proxy-maintainer Alessio Cassibba.
 
@@ -359,7 +369,7 @@
   Fix desktop entry for bug #196832, typo in wrapper and HAL warning. Thanks
   to Alessio for providing needed modifications
 
-  29 Oct 2007; Dawid Węgliński <cla@gentoo.org> virtualbox-1.5.2.ebuild:
+  29 Oct 2007; Dawid Węgliński <cla@gentoo.org> virtualbox-1.5.2.ebuild:
   Stable on x86
 
 *virtualbox-1.5.2 (22 Oct 2007)
@@ -436,7 +446,7 @@
   virtualbox-1.3.8.ebuild, virtualbox-9999.ebuild:
   Fix for sdl useflag bug #177335
 
-  21 Apr 2007; Raúl Porcel <armin76@gentoo.org> virtualbox-1.3.8.ebuild:
+  21 Apr 2007; Raúl Porcel <armin76@gentoo.org> virtualbox-1.3.8.ebuild:
   x86 stable
 
 *virtualbox-1.3.8 (16 Mar 2007)
diff --git a/app-emulation/virtualbox-ose/Manifest b/app-emulation/virtualbox-ose/Manifest
index a3ee36e..9ab967c 100644
--- a/app-emulation/virtualbox-ose/Manifest
+++ b/app-emulation/virtualbox-ose/Manifest
@@ -6,13 +6,14 @@ AUX virtualbox-ose-1.6.6-remove-unused.patch 3379 RMD160 d0a346f5ce9d236a5de2b05
 AUX virtualbox-ose-2-config 42 RMD160 7102b584e67b964dfd3c06e06b29eb91d33d7604 SHA1 1fe2ac29550c4b3ab4a82399ece3d08c8851c207 SHA256 fb619bc28ba651135730601240e192f9d02b9bef9954eb8026a716865db01b4d
 AUX virtualbox-ose-2-localconfig 1382 RMD160 1e484d1d7b3955ae425caa6d20ceba629b5f0150 SHA1 f1c7f076c2dfb8011708852391ae35cfe4d82994 SHA256 ebd65235b78f68f3c6f2b2185230f6271e077c04ad35a8c00b072fe563109fc6
 AUX virtualbox-ose-2-wrapper 2813 RMD160 2d05512fa94abfb034f1f6eec6bb207af020df45 SHA1 c2dbe19e5ab603378d6b1c72dc4b02fe4368a3e1 SHA256 ad91be6fc1753dc686e9f9774fd91101e7fd15e064af5419d5fd0769f3434e8b
+AUX virtualbox-ose-3-wrapper 2928 RMD160 99ce30d35ec3cea75e7e55097d49354d87d955be SHA1 63a4caecd9cbf326e9f189268ff1eb6c39e172b5 SHA256 cbbd44e20becbcbcb34a9d17d0968b8e48f7e190f14214728187d7098c812e06
 AUX virtualbox-ose-3.0.0-mesa-check.patch 692 RMD160 c1b62d987fa941f5455a8fb0c0d6b07377756d0f SHA1 18c987a024fc45778cc2dc55515100150996408d SHA256 88e981ed765b26c11ea9c606a009a9a1b03c67a1de5cb42b18e0088e027fe0c8
 AUX virtualbox-ose-3.0.8-without-hal-fix.patch 1318 RMD160 9fbefc7f4a783dc2f2c84773cf52b30b9e16777c SHA1 0e2e06c38de7023920cbd819be24e1dbc9ff8408 SHA256 125bbf9f926ad19a5dac6a0c68cc7b2abbd2c246c071917b1f9b447b38addbe5
 AUX virtualbox-ose-fix-insecure-lockfiles.patch 2579 RMD160 4b460669369a4da395a335c4357346d932275916 SHA1 0a692a1b6de3e643ca8e60de6da8b9a7613cd352 SHA256 32f253b9c212a66181f7bdab9c6d509dbf5f3220849d0aeb47d840aa9465fcdf
 AUX virtualbox-ose-fix-nodbus-build.patch 461 RMD160 f9e731a1d68947823d23bdfd4bc85ae182e6302c SHA1 f39bcd3bf704d64d45a97b1e1b77b6c47e9a61fc SHA256 cecc8685203f715f446fad31a597a2bf7397967200b1ab90b0c02785b151445b
 AUX virtualbox-ose-interfaces 218 RMD160 4639b9848cf44ac59cd12585a3c56ef53d72a6d9 SHA1 3268e5759286bdff1c5242598266e6c2a5b17e5d SHA256 50ddbfedce3afd41aad45163eb799fce0956d815948ad9da842f09163aaafd52
 AUX virtualbox-ose.desktop 202 RMD160 8b4b5c05743978d71edd4eaba71ae25f1d9d0d82 SHA1 3c10d2f12ea58ef35e785b8727a51fd3a0d66472 SHA256 9bbd26661317b106593d74b84cec3781b24c41bc40a2f98776e23d6b422ee4bb
-DIST VirtualBox-3.0.8-OSE.tar.bz2 52058158 RMD160 0565592f81e787ceb18a3eea1271d95bfed804cc SHA1 07c16657046f1b5a5562ad2b9041f982ad9dded7 SHA256 6472df6ec77cbc3c742f56db6b7e3f49323620f688ac7c52227aebe4f4a18be1
-EBUILD virtualbox-ose-3.0.8-r1.ebuild 8233 RMD160 328345f04250c6c7151056b123a84a18b354a504 SHA1 f74c5cc6391ffa387e78f95acdb8914723770b20 SHA256 0aec451fd9dcb88ca18e2903baac66af7f7ea2f5c57b3e57f6ba662560e0c17f
-MISC ChangeLog 20270 RMD160 cc8f327eb4a9c1d49da9d20934f3ad672c827348 SHA1 0f1917bccc2e9aafad5ed43a38e9d3235e689f5a SHA256 25363b95c425d94d4347ff0de43bbe2997a544745f41ba39511eeb9ac0afef18
+DIST VirtualBox-3.0.10-OSE.tar.bz2 52099416 RMD160 4bf389cdd9500571ff665fa959c6cda22db9b5d2 SHA1 90217b54233a4161b45c393ca1301bfd13d3766e SHA256 01c724e70a05d71bfd53ee35f045c044e2b9a2c5010e828f32bebb4bad1d142d
+EBUILD virtualbox-ose-3.0.10.ebuild 8233 RMD160 94dffc52ace03c461d4e860622f8af8d5b87bed7 SHA1 06603c0a6ea31facf3760e212532793e79a5e0fa SHA256 e7e84312e79b13dedb77f218970fb43128efd4a65d112966b788f02905982095
+MISC ChangeLog 20473 RMD160 6064ae6d9555579dd6c6173df47b23eb3c2d339a SHA1 cc5b3d39f2d88c9b9830f593fe250b59c9fbbd2f SHA256 b2ea1f442322be8f5f1f4ab4e7f19a4a836b164074f3a1ecd3940c07c0a211c8
 MISC metadata.xml 608 RMD160 05b2e56d330d28aed13d4a7035369e04dc1e989e SHA1 ea332f57fa454cc6f8489f6debcd991003886fc0 SHA256 ab349ab6727625054f24bbf733a3f6fabb34ba1e1f0fd845c51c70595b05b6aa
diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-3-wrapper b/app-emulation/virtualbox-ose/files/virtualbox-ose-3-wrapper
new file mode 100755
index 0000000..0cf0597
--- /dev/null
+++ b/app-emulation/virtualbox-ose/files/virtualbox-ose-3-wrapper
@@ -0,0 +1,104 @@
+#!/bin/sh
+#
+# Sun VirtualBox
+#
+# Copyright (C) 2006-2009 Sun Microsystems, Inc.
+#
+# This file is part of VirtualBox Open Source Edition (OSE), as
+# available from http://www.virtualbox.org. This file is free software;
+# you can redistribute it and/or modify it under the terms of the GNU
+# General Public License (GPL) as published by the Free Software
+# Foundation, in version 2 as it comes in the "COPYING" file of the
+# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
+# Clara, CA 95054 USA or visit http://www.sun.com if you need
+# additional information or have any questions.
+#
+
+PATH="/usr/bin:/bin:/usr/sbin:/sbin"
+CONFIG="/etc/vbox/vbox.cfg"
+
+if [ ! -r "$CONFIG" ]; then
+    echo "Could not find VirtualBox installation. Please reinstall."
+    exit 1
+fi
+
+. "$CONFIG"
+
+# Note: This script must not fail if the module was not successfully installed
+#       because the user might not want to run a VM but only change VM params!
+
+if [ "$1" = "shutdown" ]; then
+    SHUTDOWN="true"
+elif ! lsmod|grep -q vboxdrv; then
+    cat << EOF
+WARNING: The VirtualBox kernel modules are not loaded.
+         Please load all the needed kernel modules by:
+
+           for m in vbox{drv,netadp,netflt}; do modprobe $m; done
+
+         You will not be able to start VMs until this problem is fixed.
+EOF
+elif [ ! -c /dev/vboxdrv ]; then
+    cat << EOF
+WARNING: The character device /dev/vboxdrv does not exist.
+         Please try to reload all the needed kernel modules by:
+
+           for m in vbox{netflt,netadp,drv}; do rmmod $m; done
+           for m in vbox{drv,netadp,netflt}; do modprobe $m; done
+
+         and if that is not successful, try to re-install the package by:
+
+           emerge -1av app-emulation/virtualbox-modules
+
+	 You will not be able to start VMs until this problem is fixed.
+EOF
+fi
+
+SERVER_PID=`ps -U \`whoami\` | grep VBoxSVC | awk '{ print $1 }'`
+if [ -z "$SERVER_PID" ]; then
+    # Server not running yet/anymore, cleanup socket path.
+    # See IPC_GetDefaultSocketPath()!
+    if [ -n "$LOGNAME" ]; then
+        rm -rf /tmp/.vbox-$LOGNAME-ipc > /dev/null 2>&1
+    else
+        rm -rf /tmp/.vbox-$USER-ipc > /dev/null 2>&1
+    fi
+fi
+
+if [ "$SHUTDOWN" = "true" ]; then
+    if [ -n "$SERVER_PID" ]; then
+        kill -TERM $SERVER_PID
+        sleep 2
+    fi
+    exit 0
+fi
+
+APP=`which $0`
+APP=`basename $APP`
+APP=${APP##/*/}
+case "$APP" in
+  VirtualBox)
+    exec "$INSTALL_DIR/VirtualBox" "$@"
+    ;;
+  VBoxManage)
+    exec "$INSTALL_DIR/VBoxManage" "$@"
+    ;;
+  VBoxSDL)
+    exec "$INSTALL_DIR/VBoxSDL" "$@"
+    ;;
+  VBoxVRDP)
+    exec "$INSTALL_DIR/VBoxHeadless" "$@"
+    ;;
+  VBoxHeadless)
+    exec "$INSTALL_DIR/VBoxHeadless" "$@"
+    ;;
+  vboxwebsrv)
+    exec "$INSTALL_DIR/vboxwebsrv" "$@"
+    ;;
+  *)
+    echo "Unknown application - $APP"
+    ;;
+esac
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-3.0.8-r1.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-3.0.10.ebuild
index 9bdb41e..908ae79 100644
--- a/app-emulation/virtualbox-ose/virtualbox-ose-3.0.8-r1.ebuild
+++ b/app-emulation/virtualbox-ose/virtualbox-ose-3.0.10.ebuild
@@ -167,7 +167,7 @@ src_install() {
 
 	# Symlink binaries to the shipped wrapper
 	exeinto /usr/$(get_libdir)/${PN}
-	newexe "${FILESDIR}/${PN}-2-wrapper" "VBox" || die
+	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox" || die
 	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
 	fperms 0750 /usr/$(get_libdir)/${PN}/VBox