Version bump wrt bug #196424 thanks to Alessio for the ebuilds

Package-Manager: portage-2.1.3.15

7 files changed, 115 insertions, 63 deletions

diff --git a/app-emulation/virtualbox/files/digest-virtualbox-1.5.0-r1 b/app-emulation/virtualbox/files/digest-virtualbox-1.5.0-r1
deleted file mode 100644
index e6ddffe5c6d1..000000000000
--- a/app-emulation/virtualbox/files/digest-virtualbox-1.5.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 56c074900260c109ed735c08e726fe81 VirtualBox-1.5.0_OSE.tar.bz2 23951481
-RMD160 fe9f52d2b944535c6a6f2fb499d88f61ef67cbd4 VirtualBox-1.5.0_OSE.tar.bz2 23951481
-SHA256 1eb1d7e49324303b47c584cb150f0f676873a93bc1d426afe77fbeca05991cba VirtualBox-1.5.0_OSE.tar.bz2 23951481
diff --git a/app-emulation/virtualbox/files/digest-virtualbox-1.5.2 b/app-emulation/virtualbox/files/digest-virtualbox-1.5.2
new file mode 100644
index 000000000000..c7b9e2c0583e
--- /dev/null
+++ b/app-emulation/virtualbox/files/digest-virtualbox-1.5.2
@@ -0,0 +1,3 @@
+MD5 2940f92160c88e241606f0fa91428b2c VirtualBox-1.5.2_OSE.tar.bz2 24227070
+RMD160 ca9ae0ad715109835800a2258124101ada679ede VirtualBox-1.5.2_OSE.tar.bz2 24227070
+SHA256 a34c3ef9d3c07bbf8fd5c1b62a7a1f05185a1760299ac99f19dd6926f1dc39bd VirtualBox-1.5.2_OSE.tar.bz2 24227070
diff --git a/app-emulation/virtualbox/files/virtualbox-1.5.0-remove-alsa.patch b/app-emulation/virtualbox/files/virtualbox-1.5.2-remove-alsa.patch
index 4e6560f6e3d8..71a239abf258 100644
--- a/app-emulation/virtualbox/files/virtualbox-1.5.0-remove-alsa.patch
+++ b/app-emulation/virtualbox/files/virtualbox-1.5.2-remove-alsa.patch
@@ -1,5 +1,5 @@
---- Config.kmk.orig	2007-09-05 10:29:18.000000000 +0200
-+++ Config.kmk	2007-09-05 10:29:58.000000000 +0200
+--- Config.kmk.orig	2007-10-19 14:44:53.000000000 +0200
++++ Config.kmk	2007-10-19 14:45:11.000000000 +0200
 @@ -202,7 +202,7 @@
  # Enable the ISCSI feature.
  VBOX_WITH_ISCSI = 1
@@ -9,9 +9,9 @@
  # Disable WINMM support for Windows (not implemented)
  VBOX_WITH_WINMM =
  # Enable the kchmviewer
---- configure.orig	2007-09-05 10:29:24.000000000 +0200
-+++ configure	2007-09-05 10:34:34.000000000 +0200
-@@ -1336,7 +1336,7 @@
+--- configure.orig	2007-10-19 14:44:59.000000000 +0200
++++ configure	2007-10-19 14:45:31.000000000 +0200
+@@ -1451,7 +1451,7 @@
  # Linux-specific
  if [ "$OS" = "linux" ]; then
    check_linux
diff --git a/app-emulation/virtualbox/files/virtualbox-1.5.0-remove-splitted-stuff.patch b/app-emulation/virtualbox/files/virtualbox-1.5.2-remove-splitted-stuff.patch
index 8b28893a0602..7f8b562ca680 100644
--- a/app-emulation/virtualbox/files/virtualbox-1.5.0-remove-splitted-stuff.patch
+++ b/app-emulation/virtualbox/files/virtualbox-1.5.2-remove-splitted-stuff.patch
@@ -1,5 +1,5 @@
---- Config.kmk.orig	2007-09-05 10:17:41.000000000 +0200
-+++ Config.kmk	2007-09-05 10:20:27.000000000 +0200
+--- Config.kmk.orig	2007-10-19 14:38:41.000000000 +0200
++++ Config.kmk	2007-10-19 14:40:51.000000000 +0200
 @@ -134,7 +134,7 @@
  
  # Build linux / win32 additions.
@@ -33,9 +33,9 @@
  # Set this to not use COM or XPCOM in places where it can be avoided.
  #VBOX_WITHOUT_COM = 1
  # Set this to skip installing the redistributable compiler runtime.
---- configure.orig	2007-09-05 10:20:35.000000000 +0200
-+++ configure	2007-09-05 10:23:44.000000000 +0200
-@@ -1281,14 +1281,14 @@
+--- configure.orig	2007-10-19 14:41:28.000000000 +0200
++++ configure	2007-10-19 14:42:29.000000000 +0200
+@@ -1402,14 +1402,14 @@
  # some things are not available in for OSE
  if [ $OSE -ge 1 ]; then
    cnf_append "VBOX_OSE" "1"
diff --git a/app-emulation/virtualbox/files/virtualbox-config b/app-emulation/virtualbox/files/virtualbox-config
new file mode 100644
index 000000000000..f69e73e2fcb6
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-config
@@ -0,0 +1 @@
+INSTALL_DIR=/opt/VirtualBox
diff --git a/app-emulation/virtualbox/files/virtualbox-interfaces b/app-emulation/virtualbox/files/virtualbox-interfaces
new file mode 100644
index 000000000000..ce2606b9d173
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-interfaces
@@ -0,0 +1,4 @@
+# This file is for registering VirtualBox permanent host networking interfaces
+# and optionally adding them to network bridges on the host.
+# Each line should be of the format <interface name> <user name> [<bridge>].
+
diff --git a/app-emulation/virtualbox/files/virtualbox-wrapper b/app-emulation/virtualbox/files/virtualbox-wrapper
index 059a7887241f..4e39565812b1 100644
--- a/app-emulation/virtualbox/files/virtualbox-wrapper
+++ b/app-emulation/virtualbox/files/virtualbox-wrapper
@@ -1,66 +1,113 @@
 #!/bin/sh
+#
+# innotek VirtualBox
+#
+#  Copyright (C) 2006-2007 innotek GmbH
+# 
+#  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 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.
 
-INSTALL_DIR=/opt/VirtualBox
-USER=$( whoami )
+PATH="/usr/bin:/bin:/usr/sbin:/sbin"
+CONFIG="/etc/vbox/vbox.cfg"
 
-SERVER_PID=$( ps -U $USER | grep VBoxSVC | awk '{ print $1 }' )
-
-if [ "$1" = shutdown ]; then
-    if [ "$SERVER_PID" != "" ]; then
-        kill -TERM $SERVER_PID
-        sleep 2
-    fi
-    exit 0
+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 [ ! -e /lib/modules/`uname -r`/misc/vboxdrv.ko ]; then
+	cat << EOF
+WARNING: There is no module available for the currente kernel (`uname -r`).
+         Please recompile the kernel module and install it by
+	
+	 sudo emerge -1 virtualbox-modules
+
+	 You will not be able to start VMs until this problem is fixed.
+EOF
+elif ! lsmod|grep -q vboxdrv; then
+    cat << EOF
+WARNING: The vboxdrv kernel module is not loaded.
+         Please load the kernel by
+
+           sudo modprobe vboxdrv
+
+         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. Try
 
-[ "$VBOX_USER_HOME" = "" ] && VBOX_USER_HOME="$HOME/.VirtualBox"
+           sudo /etc/init.d/virtualbox restart
 
-mkdir -p "$VBOX_USER_HOME"
-LOG="$VBOX_USER_HOME/VBoxSVC.log"
+         and if that is not successful, try to re-install the package.
 
-if [[ -e /proc/modules && ! -e /dev/vboxdrv ]] ; then
-	echo "Error: vboxdrv kernel module is not loaded..."
-	echo "Please load the module before starting VirtualBox."
-	exit 1
+	 You will not be able to start VMs until this problem is fixed.
+EOF
 elif [ ! -w /dev/vboxdrv ]; then
-	if [ "`id | grep vboxusers`" = "" ]; then
-		echo "Error: You are not a member of the \"vboxusers\" group..."
-		echo "Please add yourself to this group before starting VirtualBox."
-	else
-		echo "Error: /dev/vboxdrv is not writable for some reason..." 
-		echo "If you recently added the current user to the vboxusers group,"
-		echo "then you have to logout and re-login to take the change effect."
-	fi
-	exit 1
+    if [ "`id | grep vboxusers`" = "" ]; then
+        cat << EOF
+WARNING: You are not a member of the "vboxusers" group.  Please add yourself
+         to this group before starting VirtualBox.
+
+	 You will not be able to start VMs until this problem is fixed.
+EOF
+    else
+        cat << EOF
+WARNING: /dev/vboxdrv not writable for some reason. If you recently added the
+         current user to the vboxusers group then you have to logout and
+	 re-login to take the change effect.
+
+	 You will not be able to start VMs until this problem is fixed.
+EOF
+    fi
 fi
 
-export LD_LIBRARY_PATH="$INSTALL_DIR"
+export LD_LIBRARY_PATH="$INSTALL_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+
+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 [ "$SERVER_PID" = "" ]; then
-	rm -rf /tmp/.vbox-$USER-ipc
-	[ -f "$LOG.1" ] && mv "$LOG.1" "$LOG.2"
-	[ -f "$LOG.0" ] && mv "$LOG.0" "$LOG.1"
-	[ -f "$LOG" ] && mv "$LOG" "$LOG.0"
-	/opt/VirtualBox/VBoxSVC --daemonize >"$LOG" 2>&1
+if [ "$SHUTDOWN" = "true" ]; then
+    if [ -n "$SERVER_PID" ]; then
+        kill -TERM $SERVER_PID
+        sleep 2
+    fi
+    exit 0
 fi
 
-APP=$( which $0 )
+APP=`which $0`
 APP=${APP##/*/}
 case "$APP" in
-	virtualbox)
-		exec "$INSTALL_DIR/VirtualBox" "$@"
-		;;
-	vboxmanage)
-		exec "$INSTALL_DIR/VBoxManage" "$@"
-		;;
-	vboxsdl)
-		exec "$INSTALL_DIR/VBoxSDL" "$@"
-		;;
-	vboxbfe)
-		exec "$INSTALL_DIR/VBoxBFE" "$@"
-		;;
-	*)
-		echo "Error: Unknown application - $APP"
-		exit 1
-		;;
+  VirtualBox)
+    exec "$INSTALL_DIR/VirtualBox" "$@"
+  ;;
+  VBoxManage)
+    exec "$INSTALL_DIR/VBoxManage" "$@"
+  ;;
+  VBoxSDL)
+    exec "$INSTALL_DIR/VBoxSDL" "$@"
+  ;;
+  *)
+    echo "Unknown application - $APP"
+  ;;
 esac