Drop old and add new-style wrapper

Package-Manager: portage-2.1.3.15

9 files changed, 130 insertions, 374 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index aebb38254c05..37631214ce3c 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox-bin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.16 2007/10/22 22:17:24 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.17 2007/10/22 22:21:53 jokey Exp $
+
+  22 Oct 2007; Markus Ullmann <jokey@gentoo.org>
+  +files/virtualbox-bin-config, +files/virtualbox-bin-interfaces,
+  files/virtualbox-bin-wrapper, -virtualbox-bin-1.4.0-r1.ebuild,
+  -virtualbox-bin-1.5.0-r1.ebuild:
+  Drop old and add new-style wrapper
 
 *virtualbox-bin-1.5.2 (22 Oct 2007)
 
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index b3a2b4fc0c0c..6fc6f9521985 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -1,36 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX virtualbox-bin-wrapper 1609 RMD160 8deb3202b8801d393bee24d7a9b17fbb205dc468 SHA1 b0cce7e0020571fea4bf8a75cd7ff45390d537d9 SHA256 5fdd76c791256c41b8fbdca8b5fbdc7a4a3c9af678a1e55134b2937e7354b20c
-MD5 1c350abb04320009fde27837281554d5 files/virtualbox-bin-wrapper 1609
-RMD160 8deb3202b8801d393bee24d7a9b17fbb205dc468 files/virtualbox-bin-wrapper 1609
-SHA256 5fdd76c791256c41b8fbdca8b5fbdc7a4a3c9af678a1e55134b2937e7354b20c files/virtualbox-bin-wrapper 1609
+AUX virtualbox-bin-config 28 RMD160 c03986f0a6ecc77c2d15382d965952bb209ae534 SHA1 43b5fd213ae08bb390ec1962ee2776d4f7fe45fd SHA256 5326f7abdd1a7c8a8a44fd4ab269977ec115286059fc8a4c2fde6805c381236f
+MD5 2acc73f48e3181faca3b799c6ea011f5 files/virtualbox-bin-config 28
+RMD160 c03986f0a6ecc77c2d15382d965952bb209ae534 files/virtualbox-bin-config 28
+SHA256 5326f7abdd1a7c8a8a44fd4ab269977ec115286059fc8a4c2fde6805c381236f files/virtualbox-bin-config 28
+AUX virtualbox-bin-interfaces 218 RMD160 4639b9848cf44ac59cd12585a3c56ef53d72a6d9 SHA1 3268e5759286bdff1c5242598266e6c2a5b17e5d SHA256 50ddbfedce3afd41aad45163eb799fce0956d815948ad9da842f09163aaafd52
+MD5 fd2d685f86a8c205d512940be94307ef files/virtualbox-bin-interfaces 218
+RMD160 4639b9848cf44ac59cd12585a3c56ef53d72a6d9 files/virtualbox-bin-interfaces 218
+SHA256 50ddbfedce3afd41aad45163eb799fce0956d815948ad9da842f09163aaafd52 files/virtualbox-bin-interfaces 218
+AUX virtualbox-bin-wrapper 3308 RMD160 782f2a62d189579afef89612df34800177b5ab8d SHA1 e09d66d8b8f4638158ad27761049aca1366453c5 SHA256 2a9df2cf8774a0889092e493a9ee44da729f4fcb60510209262d8e78cb47aad4
+MD5 5bdd49e27edcbcfb77450d5d1287cf44 files/virtualbox-bin-wrapper 3308
+RMD160 782f2a62d189579afef89612df34800177b5ab8d files/virtualbox-bin-wrapper 3308
+SHA256 2a9df2cf8774a0889092e493a9ee44da729f4fcb60510209262d8e78cb47aad4 files/virtualbox-bin-wrapper 3308
 DIST VirtualBox_1.4.0_Linux_amd64.run 11766998 RMD160 973378f363f251065044d5e6244fff84eef0ae69 SHA1 8e72562248bd1638e1c3883d81c2e0206e8eed2d SHA256 5fa13a82fe1cb333668e6dfa84005e78e9ac08a0bb4b68d8e053bde630345ff7
 DIST VirtualBox_1.4.0_Linux_x86.run 13631688 RMD160 2738fe9a74edac51c884ff0dba4c6d8704488dd5 SHA1 8961951d15619873a9977b296f5fb472fdf1f836 SHA256 b9e9d18e2f070fdbb769292f90171cf9e91e53f800e22683a106ad185edb774c
-DIST VirtualBox_1.5.0_Linux_amd64.run 13939184 RMD160 9e8e9e3b5fa4dbefa1c65001c08c06b51e4aaafa SHA1 01fc52e8aa84d8d6fae6e7e38076938df8756909 SHA256 7b5c1774a3f2536a00805f6a8baf53b41eb9a5917090618b52c7942eec655d3d
-DIST VirtualBox_1.5.0_Linux_x86.run 15491060 RMD160 33ede7cd5e3f7697ccc2f2b1f11053af5bf95a74 SHA1 fab4722e2add0a8492624f4f08685dfd1d378a1a SHA256 74a5f34772f826761bf5ca24f3b20a5b0ceb8bdf9602bb4bfba91c05fce0c232
 DIST VirtualBox_1.5.2_Linux_amd64.run 16563190 RMD160 0e97a0f3175b57140743fb961215ccec651edc33 SHA1 1f3aadadbc47b427fce447f32b71cdc3cdbdf9ab SHA256 b7290b1df17d9011901b64ed3bf697bc8bdc71a762bdd0c12ef18dd7685ec5b8
 DIST VirtualBox_1.5.2_Linux_x86.run 15946150 RMD160 c8373044892a1b4b036ae3bb0460c03d0c5c9078 SHA1 4b79800d41da5c6bac109a617ce0da1a89c9cb22 SHA256 f1e0b3de29e39f0bdfd8697ee3409b5274fe8afd61b3c93c668c835409aaa6a7
-EBUILD virtualbox-bin-1.4.0-r1.ebuild 4481 RMD160 0efcc9245a59cfe85697085418fdf32bc8f91d12 SHA1 40e09831cdc406ba55b31ff1883bb9fba4940169 SHA256 d161247c7b118f19f589bd1c4811c939fd3e7fb444e34d42615f645a543c9976
-MD5 9600f3db4028d6561263567dac45acd0 virtualbox-bin-1.4.0-r1.ebuild 4481
-RMD160 0efcc9245a59cfe85697085418fdf32bc8f91d12 virtualbox-bin-1.4.0-r1.ebuild 4481
-SHA256 d161247c7b118f19f589bd1c4811c939fd3e7fb444e34d42615f645a543c9976 virtualbox-bin-1.4.0-r1.ebuild 4481
 EBUILD virtualbox-bin-1.4.0.ebuild 4063 RMD160 83ca6d627ae8325f165e61a71b7c7069752fc579 SHA1 f729bf4efdda572dff4b1b27b48bc87dbe1a70cd SHA256 ea5176b8c8e76cdb15bfe6b336082908a462f705696f7e048cf5f5c3438661a2
 MD5 52f840faf2f81eed9f55ba9c5b6ff5ce virtualbox-bin-1.4.0.ebuild 4063
 RMD160 83ca6d627ae8325f165e61a71b7c7069752fc579 virtualbox-bin-1.4.0.ebuild 4063
 SHA256 ea5176b8c8e76cdb15bfe6b336082908a462f705696f7e048cf5f5c3438661a2 virtualbox-bin-1.4.0.ebuild 4063
-EBUILD virtualbox-bin-1.5.0-r1.ebuild 4606 RMD160 07409709c30439da769406f34b4f3d79fd97c82b SHA1 bdaa9193ff45dd2b764ace6cff1372b121792488 SHA256 afddee694b85b5e0d07d3d9ec79d8c82b0715c6e004b754d25eee6d721bac746
-MD5 fc504c2721e0edf707e4a7af8bd583ca virtualbox-bin-1.5.0-r1.ebuild 4606
-RMD160 07409709c30439da769406f34b4f3d79fd97c82b virtualbox-bin-1.5.0-r1.ebuild 4606
-SHA256 afddee694b85b5e0d07d3d9ec79d8c82b0715c6e004b754d25eee6d721bac746 virtualbox-bin-1.5.0-r1.ebuild 4606
 EBUILD virtualbox-bin-1.5.2.ebuild 4126 RMD160 352b6d0a9b6d218634d73555938e18a7ad7e5c53 SHA1 d38bbd9da97998f3bf1668d76e0196b6ce61c8d5 SHA256 68d9b717fa3dd3b37561b61d56cc91cd1b54c41e3125b3923b6f5a339c15937c
 MD5 b8207c958a14cf3f0b0c3d6ee1c4262b virtualbox-bin-1.5.2.ebuild 4126
 RMD160 352b6d0a9b6d218634d73555938e18a7ad7e5c53 virtualbox-bin-1.5.2.ebuild 4126
 SHA256 68d9b717fa3dd3b37561b61d56cc91cd1b54c41e3125b3923b6f5a339c15937c virtualbox-bin-1.5.2.ebuild 4126
-MISC ChangeLog 3130 RMD160 9c6e70b02cb291581a1e5122a0c39131eb309214 SHA1 fbd7adcf5c79e1bdff390228689bb80a14b3988a SHA256 74fb86fb8b37e14f4318cb82a79e28e6fcdbef33737bef15c8477d80bdd76955
-MD5 9a73f65493491b18dba28d73153be620 ChangeLog 3130
-RMD160 9c6e70b02cb291581a1e5122a0c39131eb309214 ChangeLog 3130
-SHA256 74fb86fb8b37e14f4318cb82a79e28e6fcdbef33737bef15c8477d80bdd76955 ChangeLog 3130
+MISC ChangeLog 3383 RMD160 cb1d38e564f4851655cf7c7cf313908ade383e0a SHA1 b5dc176f6a5f8d73c32cb6bf04622a67bb4c5ce9 SHA256 1699e8cebe7fcc4afbac3272ed9ee415524fc68b1cd1c2654d5ab9d5f53485e9
+MD5 c01053d0c92a1f442becbd04c466d2fe ChangeLog 3383
+RMD160 cb1d38e564f4851655cf7c7cf313908ade383e0a ChangeLog 3383
+SHA256 1699e8cebe7fcc4afbac3272ed9ee415524fc68b1cd1c2654d5ab9d5f53485e9 ChangeLog 3383
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
 MD5 688de6c9943189afc4fa3ab510813dbd metadata.xml 344
 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e metadata.xml 344
@@ -38,19 +36,13 @@ SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9 metadata
 MD5 d9df0fe0b1c0514407ba6ad67f34104a files/digest-virtualbox-bin-1.4.0 560
 RMD160 ec32e5ae8e937b5d0b7a8739ab0175190cbf3383 files/digest-virtualbox-bin-1.4.0 560
 SHA256 9136fe4f089052c70277b270ce9b97970512330aacd6ddc18cc06676a7b7762e files/digest-virtualbox-bin-1.4.0 560
-MD5 d9df0fe0b1c0514407ba6ad67f34104a files/digest-virtualbox-bin-1.4.0-r1 560
-RMD160 ec32e5ae8e937b5d0b7a8739ab0175190cbf3383 files/digest-virtualbox-bin-1.4.0-r1 560
-SHA256 9136fe4f089052c70277b270ce9b97970512330aacd6ddc18cc06676a7b7762e files/digest-virtualbox-bin-1.4.0-r1 560
-MD5 def19e19853354f448471adb70ffa337 files/digest-virtualbox-bin-1.5.0-r1 481
-RMD160 7d838496d4eb71e429c0a8f1ec27b1a9be5f07e4 files/digest-virtualbox-bin-1.5.0-r1 481
-SHA256 e2c2c7ccb2f007bf5c040f3e291fc4759a3aacaa96ccda60dd4936b92c40a823 files/digest-virtualbox-bin-1.5.0-r1 481
 MD5 78029607fad2eec9e97e143df9418ab7 files/digest-virtualbox-bin-1.5.2 560
 RMD160 1325cc991acf5d578059f102985d3f686d3ad445 files/digest-virtualbox-bin-1.5.2 560
 SHA256 5b65ee084241d9ddb6918f252e11778234b874067d1c68bd9158433f898a9682 files/digest-virtualbox-bin-1.5.2 560
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHHSF8z974XjDVpbkRArspAJ95DzYwjuioy6xBtwuyymMOzBHHcgCgsl+y
-PjZB34sOiSjz1X2EzyPuOTk=
-=fg3H
+iD8DBQFHHSKIz974XjDVpbkRAmMZAJ4jZa1dvww4xXd4b/ZaAzAToFTtHQCeN0uV
+pF5XjBPESMwoGeKxxkuOhnw=
+=Nzcz
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.4.0-r1 b/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.4.0-r1
deleted file mode 100644
index 957ad7b6602e..000000000000
--- a/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.4.0-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 17003e95329ea1ee4c8b7c0ff0e2bc04 VirtualBox_1.4.0_Linux_amd64.run 11766998
-RMD160 973378f363f251065044d5e6244fff84eef0ae69 VirtualBox_1.4.0_Linux_amd64.run 11766998
-SHA256 5fa13a82fe1cb333668e6dfa84005e78e9ac08a0bb4b68d8e053bde630345ff7 VirtualBox_1.4.0_Linux_amd64.run 11766998
-MD5 d796ef14caa3e3b3be10c959a14f1634 VirtualBox_1.4.0_Linux_x86.run 13631688
-RMD160 2738fe9a74edac51c884ff0dba4c6d8704488dd5 VirtualBox_1.4.0_Linux_x86.run 13631688
-SHA256 b9e9d18e2f070fdbb769292f90171cf9e91e53f800e22683a106ad185edb774c VirtualBox_1.4.0_Linux_x86.run 13631688
diff --git a/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.5.0-r1 b/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.5.0-r1
deleted file mode 100644
index e5991abc6b2f..000000000000
--- a/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.5.0-r1
+++ /dev/null
@@ -1,5 +0,0 @@
-RMD160 9e8e9e3b5fa4dbefa1c65001c08c06b51e4aaafa VirtualBox_1.5.0_Linux_amd64.run 13939184
-SHA256 7b5c1774a3f2536a00805f6a8baf53b41eb9a5917090618b52c7942eec655d3d VirtualBox_1.5.0_Linux_amd64.run 13939184
-MD5 1107980b50b473406cee12ada89ab4f8 VirtualBox_1.5.0_Linux_x86.run 15491060
-RMD160 33ede7cd5e3f7697ccc2f2b1f11053af5bf95a74 VirtualBox_1.5.0_Linux_x86.run 15491060
-SHA256 74a5f34772f826761bf5ca24f3b20a5b0ceb8bdf9602bb4bfba91c05fce0c232 VirtualBox_1.5.0_Linux_x86.run 15491060
diff --git a/app-emulation/virtualbox-bin/files/virtualbox-bin-config b/app-emulation/virtualbox-bin/files/virtualbox-bin-config
new file mode 100644
index 000000000000..f69e73e2fcb6
--- /dev/null
+++ b/app-emulation/virtualbox-bin/files/virtualbox-bin-config
@@ -0,0 +1 @@
+INSTALL_DIR=/opt/VirtualBox
diff --git a/app-emulation/virtualbox-bin/files/virtualbox-bin-interfaces b/app-emulation/virtualbox-bin/files/virtualbox-bin-interfaces
new file mode 100644
index 000000000000..ce2606b9d173
--- /dev/null
+++ b/app-emulation/virtualbox-bin/files/virtualbox-bin-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-bin/files/virtualbox-bin-wrapper b/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper
index f92b67f639cd..7ea5eca943b2 100644
--- a/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper
+++ b/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper
@@ -1,66 +1,116 @@
 #!/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
 
-[ -z "$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 -a ! -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
-	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
+    # 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=$( command -v "$0" )
+APP=`which $0`
 APP=${APP##/*/}
 case "$APP" in
-	virtualbox)
-		exec "$INSTALL_DIR/VirtualBox" "$@"
-		;;
-	vboxmanage)
-		exec "$INSTALL_DIR/VBoxManage" "$@"
-		;;
-	vboxsdl)
-		exec "$INSTALL_DIR/VBoxSDL" "$@"
-		;;
-	vboxvrdp)
-		exec "$INSTALL_DIR/VBoxVRDP" "$@"
-		;;
-	*)
-		echo "Error: Unknown application - $APP"
-		exit 1
-		;;
+  VirtualBox)
+    exec "$INSTALL_DIR/VirtualBox" "$@"
+  ;;
+  VBoxManage)
+    exec "$INSTALL_DIR/VBoxManage" "$@"
+  ;;
+  VBoxSDL)
+    exec "$INSTALL_DIR/VBoxSDL" "$@"
+  ;;
+  VBoxVRDP)
+    exec "$INSTALL_DIR/VBoxVRDP" "$@"
+  ;;
+  *)
+    echo "Unknown application - $APP"
+  ;;
 esac
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.4.0-r1.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.4.0-r1.ebuild
deleted file mode 100644
index c294da150fb1..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-1.4.0-r1.ebuild,v 1.2 2007/06/23 16:10:40 masterdriverz Exp $
-
-inherit eutils qt3 pax-utils
-
-MY_P=VirtualBox_${PV}_Linux_${ARCH}.run
-
-DESCRIPTION="Softwarefamily of powerful x86 virtualization"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="amd64? ( http://www.virtualbox.org/download/${PV}/VirtualBox_${PV}_Linux_amd64.run )
-	x86? ( http://www.virtualbox.org/download/${PV}/VirtualBox_${PV}_Linux_x86.run )"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="additions nowrapper sdk"
-
-RDEPEND="!app-emulation/virtualbox
-	~app-emulation/virtualbox-modules-${PV}
-	virtual/xft
-	x11-libs/libXi
-	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/libXtst
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXrender
-	x11-libs/libXrandr
-	x11-libs/libXau
-	x11-libs/libXcursor
-	x11-libs/libXdmcp
-	x11-libs/libXfixes
-	dev-libs/libxml2
-	media-libs/libsdl
-	media-libs/libmng
-	media-libs/jpeg
-	media-libs/libpng
-	media-libs/freetype
-	media-libs/fontconfig
-	$(qt_min_version 3.3.5)
-	x86? ( =virtual/libstdc++-3.3 )
-	sdk? ( dev-libs/libIDL )"
-
-S=${WORKDIR}
-
-RESTRICT="primaryuri"
-
-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
-
-	check_license
-}
-
-src_unpack() {
-	unpack_makeself ${MY_P}
-	unpack ./VirtualBox.tar.bz2
-}
-
-src_install() {
-	cd "${S}"
-
-	# desktop entry
-	insinto /usr/share/pixmaps
-	newins VBox.png virtualbox.png
-	insinto /usr/share/applications
-	newins VirtualBox.desktop virtualbox.desktop
-	dosed -e "10d" /usr/share/applications/virtualbox.desktop
-	dosed -e "5d" /usr/share/applications/virtualbox.desktop
-	dosed -e "s/VirtualBox/virtualbox/" /usr/share/applications/virtualbox.desktop
-	dosed -e "s/VBox.png/virtualbox.png/" /usr/share/applications/virtualbox.desktop
-	dosed -e "s/innotek virtualbox/Innotek VirtualBox/" /usr/share/applications/virtualbox.desktop
-	dosed -e "s/X-MandrivaLinux-System;//" /usr/share/applications/virtualbox.desktop
-
-	insinto /opt/VirtualBox
-	doins UserManual.pdf
-
-	if use additions; then
-		doins -r additions
-	fi
-	if use sdk; then
-		doins -r sdk
-		fowners root:vboxusers /opt/VirtualBox/sdk/bin/xpidl
-		fperms 0750 /opt/VirtualBox/sdk/bin/xpidl
-		pax-mark -m "${D}"/opt/VirtualBox/sdk/bin/xpidl
-		make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-	fi
-
-	rm -rf src sdk tst* UserManual.pdf rdesktop-vrdp.tar.gz deffiles install.sh \
-	routines.sh runlevel.sh vboxdrv.sh VBox.sh VBox.png kchmviewer additions \
-	VirtualBox.desktop VirtualBox.chm VirtualBox.tar.bz2 vditool VBoxAddIF.sh \
-	vboxnet.sh LICENSE
-
-	doins -r *
-	for each in VBox{Manage,SDL,SVC,XPCOMIPCD,VRDP} VirtualBox ; do
-		fowners root:vboxusers /opt/VirtualBox/${each}
-		fperms 0750 /opt/VirtualBox/${each}
-		pax-mark -m "${D}"/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"
-		make_wrapper vboxvrdp "./VBoxVRDP" "/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
-		dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxvrdp
-	fi
-}
-
-pkg_postinst() {
-	elog ""
-	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 "You must be in the vboxusers group to use VirtualBox,"
-	elog "\"vditool\" is now deprecated, use \"VBoxManage\" instead."
-	elog ""
-}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.5.0-r1.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.5.0-r1.ebuild
deleted file mode 100644
index e2490c0f4ab5..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-1.5.0-r1.ebuild,v 1.2 2007/10/07 22:01:12 jokey Exp $
-
-inherit eutils qt3 pax-utils
-
-MY_P=VirtualBox_${PV}_Linux_${ARCH}.run
-
-DESCRIPTION="Softwarefamily of powerful x86 virtualization"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="amd64? ( http://www.virtualbox.org/download/${PV}/VirtualBox_${PV}_Linux_amd64.run )
-	x86? ( http://www.virtualbox.org/download/${PV}/VirtualBox_${PV}_Linux_x86.run )"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="additions nowrapper sdk"
-
-RDEPEND="!app-emulation/virtualbox
-	!app-emulation/virtualbox-additions
-	~app-emulation/virtualbox-modules-${PV}
-	virtual/xft
-	x11-libs/libXi
-	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/libXtst
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXrender
-	x11-libs/libXrandr
-	x11-libs/libXau
-	x11-libs/libXcursor
-	x11-libs/libXdmcp
-	x11-libs/libXfixes
-	dev-libs/libxml2
-	media-libs/libsdl
-	media-libs/libmng
-	media-libs/jpeg
-	media-libs/libpng
-	media-libs/freetype
-	media-libs/fontconfig
-	$(qt_min_version 3.3.5)
-	x86? ( =virtual/libstdc++-3.3 )
-	sdk? ( dev-libs/libIDL )"
-
-S=${WORKDIR}
-
-RESTRICT="primaryuri"
-
-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
-
-	check_license
-}
-
-src_unpack() {
-	unpack_makeself ${MY_P}
-	unpack ./VirtualBox.tar.bz2
-}
-
-src_install() {
-	cd "${S}"
-
-	# desktop entry
-	insinto /usr/share/pixmaps
-	newins VBox.png virtualbox.png
-	insinto /usr/share/applications
-	newins VirtualBox.desktop virtualbox.desktop
-	dosed -e "10d" /usr/share/applications/virtualbox.desktop
-	dosed -e "5d" /usr/share/applications/virtualbox.desktop
-	dosed -e "s/VirtualBox/virtualbox/" /usr/share/applications/virtualbox.desktop
-	dosed -e "s/VBox.png/virtualbox.png/" /usr/share/applications/virtualbox.desktop
-	dosed -e "s/innotek virtualbox/Innotek VirtualBox/" /usr/share/applications/virtualbox.desktop
-	dosed -e "s/X-MandrivaLinux-System;//" /usr/share/applications/virtualbox.desktop
-
-	insinto /opt/VirtualBox
-
-	doins UserManual.pdf
-
-	make_wrapper vboxtunctl "./VBoxTunctl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-
-	if use additions; then
-		doins -r additions
-	fi
-	if use sdk; then
-		doins -r sdk
-		fowners root:vboxusers /opt/VirtualBox/sdk/bin/xpidl
-		fperms 0750 /opt/VirtualBox/sdk/bin/xpidl
-		pax-mark -m "${D}"/opt/VirtualBox/sdk/bin/xpidl
-		make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-	fi
-
-	rm -rf src sdk tst* UserManual.pdf rdesktop-vrdp.tar.gz deffiles install.sh \
-	routines.sh runlevel.sh vboxdrv.sh VBox.sh VBox.png kchmviewer additions \
-	VirtualBox.desktop VirtualBox.chm VirtualBox.tar.bz2 vditool VBoxAddIF.sh \
-	vboxnet.sh LICENSE
-
-	doins -r *
-	for each in VBox{Manage,SDL,SVC,XPCOMIPCD,VRDP,Tunctl} VirtualBox ; do
-		fowners root:vboxusers /opt/VirtualBox/${each}
-		fperms 0750 /opt/VirtualBox/${each}
-		pax-mark -m "${D}"/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"
-		make_wrapper vboxvrdp "./VBoxVRDP" "/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
-		dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxvrdp
-	fi
-}
-
-pkg_postinst() {
-	elog ""
-	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 "You must be in the vboxusers group to use VirtualBox,"
-	elog "\"vditool\" is now deprecated, use \"VBoxManage\" instead."
-	elog ""
-}