version bump; remove nowrapper,vboxbfe USE flags; add sys-apps/usermode-utilities,net-misc/bridge-utils to RDEPEND; add new wrapper VBox.sh from InnoTek; add new wrapper VBoxAddIF.sh from InnoTek; add virtualbox configuration files in /etc/vbox; remove deprecated/old frontends,utilities

svn path=/trunk/; revision=284

10 files changed, 376 insertions, 107 deletions

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index e06ed65..235b65f 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,11 +1,9 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.25 2007/09/17 09:41:37 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.26 2007/10/07 21:58:17 jokey Exp $
 
-  01 Oct 2007; Alessio Cassibba (X-Drum) <swapon@gmail.com>
-  +virtualbox-9999.ebuild, +files/virtualbox.desktop,
-  +files/virtualbox-wrapper, +metadata.xml:
-  add blockers for virtualbox-{additions,modules}
+  07 Oct 2007; Markus Ullmann <jokey@gentoo.org> virtualbox-9999.ebuild:
+  add blockers for virtualbox-additions bug #194183, thanks to Alessio
 
 *virtualbox-1.5.0-r1 (17 Sep 2007)
 
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 36db696..a7861bc 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,23 +1,47 @@
-AUX virtualbox-wrapper 1606 RMD160 21a75925d364c61c1040b3d217b3e05dfbbfc175 SHA1 d0e885ead0dd5626a70ace3e9185940d27715743 SHA256 28a6305a7162c1864fee241568c1dd25e758c129069790512a0b1d7767656168
-MD5 424b5ca7e892bbb82a7c3e38661d1a43 files/virtualbox-wrapper 1606
-RMD160 21a75925d364c61c1040b3d217b3e05dfbbfc175 files/virtualbox-wrapper 1606
-SHA256 28a6305a7162c1864fee241568c1dd25e758c129069790512a0b1d7767656168 files/virtualbox-wrapper 1606
+AUX virtualbox-1.5.2-remove-alsa.patch 642 RMD160 5ad32b11b58ad3ba2ff9f83dbe6a21b4f1b30024 SHA1 baaf964c226afb6fb01996ee18f0a2b70afd32c9 SHA256 2ff14afe501eb5744f6fcfaba20b77fd90c628ac93be419901b313789219f4b0
+MD5 30003727484c8f54853309c3a0bac74d files/virtualbox-1.5.2-remove-alsa.patch 642
+RMD160 5ad32b11b58ad3ba2ff9f83dbe6a21b4f1b30024 files/virtualbox-1.5.2-remove-alsa.patch 642
+SHA256 2ff14afe501eb5744f6fcfaba20b77fd90c628ac93be419901b313789219f4b0 files/virtualbox-1.5.2-remove-alsa.patch 642
+AUX virtualbox-1.5.2-remove-splitted-stuff.patch 1812 RMD160 8a731fe8e4c7250b1df41f92df07b53a987f82e7 SHA1 3d5816eac316aacc4ec7b4465c05ca99c7fb70c6 SHA256 d9895be337467539b8d3d5ed3bb82849b6449bb7d1402a9c74332f88589f23dc
+MD5 262c0400f0f8f3e73d8ed880f66a6068 files/virtualbox-1.5.2-remove-splitted-stuff.patch 1812
+RMD160 8a731fe8e4c7250b1df41f92df07b53a987f82e7 files/virtualbox-1.5.2-remove-splitted-stuff.patch 1812
+SHA256 d9895be337467539b8d3d5ed3bb82849b6449bb7d1402a9c74332f88589f23dc files/virtualbox-1.5.2-remove-splitted-stuff.patch 1812
+AUX virtualbox-config 28 RMD160 c03986f0a6ecc77c2d15382d965952bb209ae534 SHA1 43b5fd213ae08bb390ec1962ee2776d4f7fe45fd SHA256 5326f7abdd1a7c8a8a44fd4ab269977ec115286059fc8a4c2fde6805c381236f
+MD5 2acc73f48e3181faca3b799c6ea011f5 files/virtualbox-config 28
+RMD160 c03986f0a6ecc77c2d15382d965952bb209ae534 files/virtualbox-config 28
+SHA256 5326f7abdd1a7c8a8a44fd4ab269977ec115286059fc8a4c2fde6805c381236f files/virtualbox-config 28
+AUX virtualbox-interfaces 218 RMD160 4639b9848cf44ac59cd12585a3c56ef53d72a6d9 SHA1 3268e5759286bdff1c5242598266e6c2a5b17e5d SHA256 50ddbfedce3afd41aad45163eb799fce0956d815948ad9da842f09163aaafd52
+MD5 fd2d685f86a8c205d512940be94307ef files/virtualbox-interfaces 218
+RMD160 4639b9848cf44ac59cd12585a3c56ef53d72a6d9 files/virtualbox-interfaces 218
+SHA256 50ddbfedce3afd41aad45163eb799fce0956d815948ad9da842f09163aaafd52 files/virtualbox-interfaces 218
+AUX virtualbox-wrapper 3253 RMD160 8dae363f420828df8df9f91ca1e4eeb0dacf3545 SHA1 e9920a114301837d8e518a98b522a21f9784f6b2 SHA256 afc3c87cdd8f99b99295472054d10ef3a224b518f0ac58ac09b2e438bf2b091c
+MD5 5599b0f44e119af54ddf9591429718bd files/virtualbox-wrapper 3253
+RMD160 8dae363f420828df8df9f91ca1e4eeb0dacf3545 files/virtualbox-wrapper 3253
+SHA256 afc3c87cdd8f99b99295472054d10ef3a224b518f0ac58ac09b2e438bf2b091c files/virtualbox-wrapper 3253
 AUX virtualbox.desktop 244 RMD160 19cfc0639dfff1c4a0d61914776ff9b3ce9f4c6a SHA1 0a1d0d934ceabefde69e20d0fb913811e0b71fcb SHA256 b9d75d466f400258d99d8e165f9a90dae872f4b69252f41b61064f0235c1acfd
 MD5 51d18d34fc1d53bee67b9c124265b599 files/virtualbox.desktop 244
 RMD160 19cfc0639dfff1c4a0d61914776ff9b3ce9f4c6a files/virtualbox.desktop 244
 SHA256 b9d75d466f400258d99d8e165f9a90dae872f4b69252f41b61064f0235c1acfd files/virtualbox.desktop 244
-EBUILD virtualbox-9999.ebuild 4836 RMD160 81ef0adbfd8b8e0e7a09c0911d9a3aacc0e1770c SHA1 be677e08ee9df644582f6b533ebc12b396b9aa49 SHA256 03a1f245d68a9771c1643947ade99ceb5eebbba09c09023e8270635578226bf8
-MD5 ff95e6a4b2c94287f5adfc836b4f607e virtualbox-9999.ebuild 4836
-RMD160 81ef0adbfd8b8e0e7a09c0911d9a3aacc0e1770c virtualbox-9999.ebuild 4836
-SHA256 03a1f245d68a9771c1643947ade99ceb5eebbba09c09023e8270635578226bf8 virtualbox-9999.ebuild 4836
-MISC ChangeLog 5355 RMD160 5f657f63dbee950a5b1393e579d1e13b75accad3 SHA1 db6a809494378ce05cf4c4ab3f99cfee913ab5fb SHA256 2d8321a515d443fd39d508714fd9ca00f0bed6f32b826ce8c58317c460b03497
-MD5 226c9cd14b1758b1d4a466f54c6c4961 ChangeLog 5355
-RMD160 5f657f63dbee950a5b1393e579d1e13b75accad3 ChangeLog 5355
-SHA256 2d8321a515d443fd39d508714fd9ca00f0bed6f32b826ce8c58317c460b03497 ChangeLog 5355
+DIST VirtualBox-1.5.2_OSE.tar.bz2 24227070 RMD160 ca9ae0ad715109835800a2258124101ada679ede SHA1 1b34ec0bd838f2b6e0c5b91b944a7b2c977f0875 SHA256 a34c3ef9d3c07bbf8fd5c1b62a7a1f05185a1760299ac99f19dd6926f1dc39bd
+EBUILD virtualbox-1.5.2.ebuild 4085 RMD160 876faaf645ff4f684c056252840b5fbb89b5af46 SHA1 d958e1c7520994da6f499d7b9ab962b1d60b19d5 SHA256 f2aa2859d5b772cd6d63d8c5202509cebaacdcbec1cd381b60ce1fac70fdab0e
+MD5 9d91ef30a89835efbbb5a1eac4fe459a virtualbox-1.5.2.ebuild 4085
+RMD160 876faaf645ff4f684c056252840b5fbb89b5af46 virtualbox-1.5.2.ebuild 4085
+SHA256 f2aa2859d5b772cd6d63d8c5202509cebaacdcbec1cd381b60ce1fac70fdab0e virtualbox-1.5.2.ebuild 4085
+EBUILD virtualbox-9999.ebuild 4148 RMD160 63e65417012c9ad4cfde40ba15c16a3dad1590fd SHA1 ff6bbdab27c02ce867e5c446e628303c7c38c43f SHA256 d31c7033df4dba68191a44587849e7b506dea1350901d0c23f0293e188ea6ee4
+MD5 3106f69d51e084134d7cfd625cd72c03 virtualbox-9999.ebuild 4148
+RMD160 63e65417012c9ad4cfde40ba15c16a3dad1590fd virtualbox-9999.ebuild 4148
+SHA256 d31c7033df4dba68191a44587849e7b506dea1350901d0c23f0293e188ea6ee4 virtualbox-9999.ebuild 4148
+MISC ChangeLog 5291 RMD160 759a58e6271242cb2a17bd7026bdcc9ffe3aa1fc SHA1 d3732fc1ad35cc2e9b2fc27ddb4e4c7485c1e888 SHA256 87f6f5e5b5e0a178b7bdac68b07048b7bf4b93bd538079327157bd4adbaa2c0c
+MD5 6f40627f021f6d69403f72d8d9426a73 ChangeLog 5291
+RMD160 759a58e6271242cb2a17bd7026bdcc9ffe3aa1fc ChangeLog 5291
+SHA256 87f6f5e5b5e0a178b7bdac68b07048b7bf4b93bd538079327157bd4adbaa2c0c ChangeLog 5291
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
 MD5 688de6c9943189afc4fa3ab510813dbd metadata.xml 344
 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e metadata.xml 344
 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9 metadata.xml 344
+MD5 3e3cb9ac29b3639e6d7deba5bbfd1eb4 files/digest-virtualbox-1.5.2 271
+RMD160 749d0bcecddd379476e7191305545c1ea3316c47 files/digest-virtualbox-1.5.2 271
+SHA256 27bca3f02f95660fb308a430ff516249561a82f721fe8feb8f32eb655bc738b4 files/digest-virtualbox-1.5.2 271
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-virtualbox-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-virtualbox-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-virtualbox-9999 0
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 0000000..c7b9e2c
--- /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.2-remove-alsa.patch b/app-emulation/virtualbox/files/virtualbox-1.5.2-remove-alsa.patch
new file mode 100644
index 0000000..71a239a
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-1.5.2-remove-alsa.patch
@@ -0,0 +1,22 @@
+--- 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
+ # Enable ALSA support for Linux
+-VBOX_WITH_ALSA = 1
++#VBOX_WITH_ALSA = 1
+ # Disable WINMM support for Windows (not implemented)
+ VBOX_WITH_WINMM =
+ # Enable the kchmviewer
+--- 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
+-  check_alsa
++#  check_alsa
+   check_compiler_h
+   [ "$BUILD_MACHINE" = "amd64" ] && check_32bit
+ fi
diff --git a/app-emulation/virtualbox/files/virtualbox-1.5.2-remove-splitted-stuff.patch b/app-emulation/virtualbox/files/virtualbox-1.5.2-remove-splitted-stuff.patch
new file mode 100644
index 0000000..7f8b562
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-1.5.2-remove-splitted-stuff.patch
@@ -0,0 +1,58 @@
+--- 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.
+ ifeq ($(BUILD_TARGET),linux)
+-  VBOX_WITH_LINUX_ADDITIONS = 1
++#  VBOX_WITH_LINUX_ADDITIONS = 1
+   VBOX_WITH_WIN32_ADDITIONS = 1
+ endif
+ ifeq ($(BUILD_TARGET),l4)
+@@ -173,7 +173,7 @@
+ VBOX_WITHOUT_IDT_PATCHING = 1
+ endif
+ # The kernel driver/module and related runtime libraries.
+-VBOX_WITH_VBOXDRV = 1
++#VBOX_WITH_VBOXDRV = 1
+ # build with secure label support
+ ifeq ($(filter win.amd64,$(BUILD_TARGET).$(BUILD_TARGET_ARCH)),) # too much work with freetype and all that.
+ VBOX_WITH_SECURELABEL = 1
+@@ -206,11 +206,11 @@
+ # Disable WINMM support for Windows (not implemented)
+ VBOX_WITH_WINMM =
+ # Enable the kchmviewer
+-VBOX_WITH_KCHMVIEWER = 1
++#VBOX_WITH_KCHMVIEWER = 1
+ # Build the testsuite.
+-VBOX_WITH_TESTSUITE = 1
++#VBOX_WITH_TESTSUITE = 1
+ # Build the testcases.
+-VBOX_WITH_TESTCASES = 1
++#VBOX_WITH_TESTCASES = 1
+ # 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-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"
+-  cnf_append "VBOX_WITH_TESTSUITE" ""
++#  cnf_append "VBOX_WITH_TESTSUITE" ""
+   cnf_append "VBOX_WITH_WIN32_ADDITIONS" ""
+ 
+-  if [ "$OS" = "linux" ]; then
+-    cnf_append "VBOX_WITH_LINUX_ADDITIONS" "1"
+-  else
+-    cnf_append "VBOX_WITH_LINUX_ADDITIONS" ""
+-  fi
++#  if [ "$OS" = "linux" ]; then
++#    cnf_append "VBOX_WITH_LINUX_ADDITIONS" "1"
++#  else
++#    cnf_append "VBOX_WITH_LINUX_ADDITIONS" ""
++#  fi
+   echo >> $CNF
+ fi
+ 
diff --git a/app-emulation/virtualbox/files/virtualbox-config b/app-emulation/virtualbox/files/virtualbox-config
new file mode 100644
index 0000000..f69e73e
--- /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 0000000..ce2606b
--- /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 059a788..4e39565 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
diff --git a/app-emulation/virtualbox/virtualbox-1.5.2.ebuild b/app-emulation/virtualbox/virtualbox-1.5.2.ebuild
new file mode 100644
index 0000000..7275f17
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-1.5.2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-1.5.0-r1.ebuild,v 1.1 2007/09/17 09:41:37 jokey Exp $
+
+inherit eutils flag-o-matic qt3 toolchain-funcs
+
+MY_P=VirtualBox-${PV}_OSE
+DESCRIPTION="Softwarefamily of powerful x86 virtualization"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://www.virtualbox.org/download/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="additions alsa sdk"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	dev-libs/xalan-c
+	dev-libs/xerces-c
+	media-libs/libsdl
+	x11-libs/libXcursor
+	$(qt_min_version 3.3.5)
+	sys-apps/hal"
+DEPEND="${RDEPEND}
+	sys-devel/bin86
+	sys-devel/dev86
+	sys-power/iasl
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )"
+RDEPEND="${RDEPEND}
+	additions? ( ~app-emulation/virtualbox-additions-${PV} )
+	sys-apps/usermode-utilities
+	net-misc/bridge-utils"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	# The VBoxSDL frontend needs media-libs/libsdl compiled
+	# with USE flag X enabled (bug #177335)
+	if ! built_with_use media-libs/libsdl X; then
+		eerror "media-libs/libsdl was compiled without the \"X\" USE flag enabled."
+		eerror "Please re-emerge media-libs/libsdl with USE=\"X\"."
+		die "media-libs/libsdl should be compiled with the \"X\" USE flag."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Don't build vboxdrv and additions: splitted into separate ebuilds
+	epatch "${FILESDIR}/${P}-remove-splitted-stuff.patch"
+	# Don't build the Alsa audio driver and remove Alsa checks in configure
+	# when Alsa is not selected (bug #167739)
+	use alsa || epatch "${FILESDIR}/${P}-remove-alsa.patch"
+}
+
+src_compile() {
+	cd "${S}"
+
+	./configure || die "configure failed"
+	source ./env.sh
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	# and strip all flags
+	strip-flags
+
+	MAKE="kmk" emake TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		all || die "kmk failed"
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/release/bin
+
+	# create virtualbox configurations files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-config" vbox.cfg
+	newins "${FILESDIR}/${PN}-interfaces" interfaces
+
+	insinto /opt/VirtualBox
+	if use sdk; then
+		doins -r sdk
+		fowners root:vboxusers /opt/VirtualBox/sdk/bin/xpidl
+		fperms 0750 /opt/VirtualBox/sdk/bin/xpidl
+	fi
+
+	rm -rf sdk tst* testcase xpidl SUPInstall SUPUninstall VBox.png VBoxBFE \
+	vditool
+
+	doins -r *
+	for each in VBox{Manage,SDL,SVC,XPCOMIPCD,Tunctl} VirtualBox ; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 0750 /opt/VirtualBox/${each}
+	done
+
+	exeinto /opt/VirtualBox
+	newexe "${FILESDIR}/${PN}-wrapper" "VBox.sh" || die
+	fowners root:vboxusers /opt/VirtualBox/VBox.sh
+	fperms 0750 /opt/VirtualBox/VBox.sh
+	newexe "${S}"/src/VBox/Installer/linux/VBoxAddIF.sh "VBoxAddIF.sh" || die
+	fowners root:vboxusers /opt/VirtualBox/VBoxAddIF.sh
+	fperms 0750 /opt/VirtualBox/VBoxAddIF.sh
+
+	dosym /opt/VirtualBox/VBox.sh /usr/bin/VirtualBox
+	dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxManage
+	dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxSDL
+	dosym /opt/VirtualBox/VBoxTunctl /usr/bin/VBoxTunctl
+	dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxAddIF
+	dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxDeleteIF
+
+	# desktop entry
+	insinto /usr/share/pixmaps
+	newins "${S}"/src/VBox/Frontends/VirtualBox/images/ico32x01.png ${PN}.png
+	insinto /usr/share/applications
+	doins "${FILESDIR}"/${PN}.desktop
+	dosed -e "s/Version=/Version=${PV}/" /usr/share/applications/${PN}.desktop
+}
+
+pkg_postinst() {
+	elog ""
+	elog "To launch VirtualBox just type: \"VirtualBox\""
+	elog "You must be in the vboxusers group to use VirtualBox,"
+	elog ""
+	elog "The last user manual is available for download at:"
+	elog "http://www.virtualbox.org/download/UserManual.pdf"
+	elog ""
+}
diff --git a/app-emulation/virtualbox/virtualbox-9999.ebuild b/app-emulation/virtualbox/virtualbox-9999.ebuild
index 6f6fcf4..ed68fe6 100644
--- a/app-emulation/virtualbox/virtualbox-9999.ebuild
+++ b/app-emulation/virtualbox/virtualbox-9999.ebuild
@@ -11,7 +11,7 @@ ESVN_REPO_URI="http://virtualbox.org/svn/vbox/trunk"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="nowrapper sdk vboxbfe vditool"
+IUSE="sdk"
 
 RDEPEND="!app-emulation/virtualbox-bin
 	!app-emulation/virtualbox-additions
@@ -29,6 +29,9 @@ DEPEND="${RDEPEND}
 	sys-devel/dev86
 	sys-power/iasl
 	>=media-libs/alsa-lib-1.0.13"
+RDEPEND="${RDEPEND}
+	sys-apps/usermode-utilities
+	net-misc/bridge-utils"
 
 BUILD_TARGETS="all"
 MODULE_NAMES="vboxdrv(misc:${S}/out/linux.${ARCH}/release/bin/src:${S}/out/linux.${ARCH}/release/bin/src)"
@@ -73,31 +76,16 @@ src_install() {
 	linux-mod_src_install
 
 	cd "${S}"/out/linux.${ARCH}/release/bin
-
 	insinto /opt/VirtualBox
 
-	make_wrapper vboxtunctl "./VBoxTunctl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-
 	if use sdk; then
 		doins -r sdk
-		make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
 		fowners root:vboxusers /opt/VirtualBox/sdk/bin/xpidl
 		fperms 0750 /opt/VirtualBox/sdk/bin/xpidl
 	fi
-	if use vboxbfe; then
-		doins VBoxBFE
-		fowners root:vboxusers /opt/VirtualBox/VBoxBFE
-		fperms 0750 /opt/VirtualBox/VBoxBFE
-
-		if use nowrapper ; then
-			make_wrapper vboxbfe "./VBoxBFE" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-		else
-			dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxbfe
-		fi
-	fi
 
 	rm -rf sdk src tst* testcase additions VBoxBFE vditool vboxdrv.ko xpidl SUPInstall \
-	SUPUninstall VBox.sh VBox.png
+	SUPUninstall VBox.png
 
 	doins -r *
 	for each in VBox{Manage,SDL,SVC,XPCOMIPCD,Tunctl} VirtualBox ; do
@@ -105,21 +93,20 @@ src_install() {
 		fperms 0750 /opt/VirtualBox/${each}
 	done
 
-	if use nowrapper ; then
-		make_wrapper vboxsvc "./VBoxSVC" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-		make_wrapper virtualbox "./VirtualBox" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-		make_wrapper vboxmanage "./VBoxManage" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-		make_wrapper vboxsdl "./VBoxSDL" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-	else
-		exeinto /opt/VirtualBox
-		newexe "${FILESDIR}/${PN}-wrapper" "wrapper.sh"
-		fowners root:vboxusers /opt/VirtualBox/wrapper.sh
-		fperms 0750 /opt/VirtualBox/wrapper.sh
-
-		dosym /opt/VirtualBox/wrapper.sh /usr/bin/virtualbox
-		dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxmanage
-		dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxsdl
-	fi
+	exeinto /opt/VirtualBox
+	newexe "${FILESDIR}/${PN}-wrapper" "VBox.sh" || die
+	fowners root:vboxusers /opt/VirtualBox/VBox.sh
+	fperms 0750 /opt/VirtualBox/VBox.sh
+	newexe "${S}"/src/VBox/Installer/linux/VBoxAddIF.sh "VBoxAddIF.sh" || die
+	fowners root:vboxusers /opt/VirtualBox/VBoxAddIF.sh
+	fperms 0750 /opt/VirtualBox/VBoxAddIF.sh
+
+	dosym /opt/VirtualBox/VBox.sh /usr/bin/VirtualBox
+	dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxManage
+	dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxSDL
+	dosym /opt/VirtualBox/VBoxTunctl /usr/bin/VBoxTunctl
+	dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxAddIF
+	dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxDeleteIF
 
 	# udev rule for vboxdrv
 	dodir /etc/udev/rules.d
@@ -135,14 +122,7 @@ src_install() {
 
 pkg_postinst() {
 	linux-mod_pkg_postinst
-	if use nowrapper; then
-		elog "In order to launch VirtualBox you need to start the"
-		elog "VirtualBox XPCom Server first, with:"
-		elog "vboxsvc --daemonize && virtualbox"
-	else
-		elog "To launch VirtualBox just type: \"virtualbox\""
-	fi
-	elog ""
+	elog "To launch VirtualBox just type: \"VirtualBox\""
 	elog "You must be in the vboxusers group to use VirtualBox."
 	elog ""
 	elog "The last user manual is available for download at:"