Version bump, thanks to x-drum for the hard work

Package-Manager: portage-2.1.2-r12

10 files changed, 419 insertions, 44 deletions

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index b5b6aeb47f23..2db86790d532 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,15 @@
 # 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.10 2007/02/25 09:30:56 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.11 2007/02/28 20:04:57 jokey Exp $
+
+*virtualbox-1.3.6 (28 Feb 2007)
+*virtualbox-1.3.4-r2 (28 Feb 2007)
+
+  28 Feb 2007; Markus Ullmann <jokey@gentoo.org>
+  +files/virtualbox-1.3.6-remove-alsa.patch,
+  +files/virtualbox-1.3.6-wrapper, +virtualbox-1.3.4-r2.ebuild,
+  +virtualbox-1.3.6.ebuild, virtualbox-9999.ebuild:
+  Version bump, thanks to x-drum for the hard work
 
   25 Feb 2007; <genstef@gentoo.org> virtualbox-1.3.4-r1.ebuild,
   virtualbox-9999.ebuild:
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index fff59142c7a2..ce0ea7faed91 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,20 +1,40 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX virtualbox-1.3.6-remove-alsa.patch 725 RMD160 b5dfffc180755c6693983440a8fd6b38474af604 SHA1 27d57412c345c9c266dadc2636af28d11ac865bc SHA256 069276c9fc6f82e6149280db1510e69ffdb2daa018c4ec3f07c51b8a4e4ec8c1
+MD5 a729c1726b803e62e7b1609425ece2ec files/virtualbox-1.3.6-remove-alsa.patch 725
+RMD160 b5dfffc180755c6693983440a8fd6b38474af604 files/virtualbox-1.3.6-remove-alsa.patch 725
+SHA256 069276c9fc6f82e6149280db1510e69ffdb2daa018c4ec3f07c51b8a4e4ec8c1 files/virtualbox-1.3.6-remove-alsa.patch 725
+AUX virtualbox-1.3.6-wrapper 1463 RMD160 ab9ca6fc1bb9166d9aaeaca54febebf7df4a79c5 SHA1 1b20354e1f30367ea1e140e9bc7e0f14672679df SHA256 fb5567559f3345d671b4780bea3ef33cee0a73acb822680ca53e44bfde1ef9e1
+MD5 278382b3d521c6d655fd1b657086515d files/virtualbox-1.3.6-wrapper 1463
+RMD160 ab9ca6fc1bb9166d9aaeaca54febebf7df4a79c5 files/virtualbox-1.3.6-wrapper 1463
+SHA256 fb5567559f3345d671b4780bea3ef33cee0a73acb822680ca53e44bfde1ef9e1 files/virtualbox-1.3.6-wrapper 1463
 AUX virtualbox.desktop 249 RMD160 9fa141cf63f4a7e387dc281d0a8794a17235051c SHA1 e58fb63f70ed041bd15f6a8a2487be44687477d6 SHA256 3c0174cd67eba7925c72dcddf834d78ad8d28a2afc516854adb80f8a65c15efc
 MD5 c5bc3c92fce4aa813b6c6ce05bc91704 files/virtualbox.desktop 249
 RMD160 9fa141cf63f4a7e387dc281d0a8794a17235051c files/virtualbox.desktop 249
 SHA256 3c0174cd67eba7925c72dcddf834d78ad8d28a2afc516854adb80f8a65c15efc files/virtualbox.desktop 249
 DIST VirtualBox-OSE-1.3.4.tar.bz2 17491150 RMD160 32bd5f5e9bbf19bf59ffa93ccf6013496b40e318 SHA1 080330ef237ab89c0c00c32aa195c9341c434cf5 SHA256 c7d756645c96d202b8e88924f2b4da414c6d02775d3224739b21cdda064bbeee
-EBUILD virtualbox-1.3.4-r1.ebuild 3048 RMD160 a85e15d25cd842ba5c870ebc7f4c295dc806a0f3 SHA1 7acc13f69fcaa937b7140a79caf89bc969b69e9d SHA256 f52912805733d423304b7629146d64501e23650557b68c1a16633eaeda78759b
-MD5 33ec8ebbb8afc7dbefb4a54110bfcc2b virtualbox-1.3.4-r1.ebuild 3048
-RMD160 a85e15d25cd842ba5c870ebc7f4c295dc806a0f3 virtualbox-1.3.4-r1.ebuild 3048
-SHA256 f52912805733d423304b7629146d64501e23650557b68c1a16633eaeda78759b virtualbox-1.3.4-r1.ebuild 3048
-EBUILD virtualbox-9999.ebuild 2997 RMD160 e25eb07c33cdece824e3cb5c71c308d0dca39cc4 SHA1 37ff6ff3563a67eaecbf775467b43ff77dc1915a SHA256 8f7a3d24ccd9282befd8a8177129e9fe5fb5d69c61ed5f75644640c54b1e7468
-MD5 22ee0f97c1d7bc2d225cbf4b37d7d708 virtualbox-9999.ebuild 2997
-RMD160 e25eb07c33cdece824e3cb5c71c308d0dca39cc4 virtualbox-9999.ebuild 2997
-SHA256 8f7a3d24ccd9282befd8a8177129e9fe5fb5d69c61ed5f75644640c54b1e7468 virtualbox-9999.ebuild 2997
-MISC ChangeLog 1853 RMD160 86d389b3bd055322bca3807a8c9b16e4d54b41b0 SHA1 3a95e4c4993a728dd4ae3cbe2012bfd9dbdf4ac3 SHA256 dbd9896de6553642e85bab82ab3c59b0d50f78b1e8377edf142b8983f571d177
-MD5 4d4b2e55bea485e79a2717cea377504b ChangeLog 1853
-RMD160 86d389b3bd055322bca3807a8c9b16e4d54b41b0 ChangeLog 1853
-SHA256 dbd9896de6553642e85bab82ab3c59b0d50f78b1e8377edf142b8983f571d177 ChangeLog 1853
+DIST VirtualBox-OSE-1.3.6.tar.bz2 17458095 RMD160 f082f6397ceec0d0d543b155821592e6032affc3 SHA1 4aa6a375488d3d3dac500e401346661116ac6cf4 SHA256 e249c6f4792291e56e026cf9d807d355809283538cfa296b4e72f9ec1c71cdae
+EBUILD virtualbox-1.3.4-r1.ebuild 3039 RMD160 aa491b934dad08948e3c709f39113be57788f79e SHA1 a4565a2569f4c31ad0f147df52c681d488fe0a7b SHA256 78aab8163925cb11cd4b9a9043fcb28ba724775e425a8ef671ff890887453c05
+MD5 d2384fef7745cbae3aa05de6c2654134 virtualbox-1.3.4-r1.ebuild 3039
+RMD160 aa491b934dad08948e3c709f39113be57788f79e virtualbox-1.3.4-r1.ebuild 3039
+SHA256 78aab8163925cb11cd4b9a9043fcb28ba724775e425a8ef671ff890887453c05 virtualbox-1.3.4-r1.ebuild 3039
+EBUILD virtualbox-1.3.4-r2.ebuild 3227 RMD160 57b4ab8ac419fd831e0d7d0ee136a44ec37057ba SHA1 42870958fd969a36b668762de309fbfe23a5b709 SHA256 698bf42c0c6a1658b8abcaf0167e34aafd24d87d0ec5aff83ed4990c16b87dc2
+MD5 6040a1b3095777bd6bfb1ee3e4396327 virtualbox-1.3.4-r2.ebuild 3227
+RMD160 57b4ab8ac419fd831e0d7d0ee136a44ec37057ba virtualbox-1.3.4-r2.ebuild 3227
+SHA256 698bf42c0c6a1658b8abcaf0167e34aafd24d87d0ec5aff83ed4990c16b87dc2 virtualbox-1.3.4-r2.ebuild 3227
+EBUILD virtualbox-1.3.6.ebuild 3334 RMD160 eb1849c9623c0f6cbc45d88af567fc2f97839a46 SHA1 9fe0b7d9ce37618b64e58ccd94ebabc0c28d6981 SHA256 422e97828310ae5518546d086bf6240ac2b8f3a64c141c547a19c9f86468487d
+MD5 5f4d581d6fe131c8db7e6b7c64c17b48 virtualbox-1.3.6.ebuild 3334
+RMD160 eb1849c9623c0f6cbc45d88af567fc2f97839a46 virtualbox-1.3.6.ebuild 3334
+SHA256 422e97828310ae5518546d086bf6240ac2b8f3a64c141c547a19c9f86468487d virtualbox-1.3.6.ebuild 3334
+EBUILD virtualbox-9999.ebuild 3677 RMD160 f87126dfe42365f9a217d9684c2657e6a64ed770 SHA1 729806dbcb911126858e85dc23cc423ac0161d27 SHA256 954b7afbb91626f225e2f042589aebdd56fce62fd15e1d63aadf2d8e00482b99
+MD5 fa82b9d43d07af3bad4d1119327bbe48 virtualbox-9999.ebuild 3677
+RMD160 f87126dfe42365f9a217d9684c2657e6a64ed770 virtualbox-9999.ebuild 3677
+SHA256 954b7afbb91626f225e2f042589aebdd56fce62fd15e1d63aadf2d8e00482b99 virtualbox-9999.ebuild 3677
+MISC ChangeLog 2181 RMD160 5f2079f4d81be0bd9e6dbc91592eb7e326831a32 SHA1 30a94b44406675f6fba9d8c20712ac43f2d904fe SHA256 f78a51a8d9d7cafc065e258bf43bc6ee82575932b2c2a1b6bcfab054b96a04d4
+MD5 fd0be59a1b288c44363adba3abd3147b ChangeLog 2181
+RMD160 5f2079f4d81be0bd9e6dbc91592eb7e326831a32 ChangeLog 2181
+SHA256 f78a51a8d9d7cafc065e258bf43bc6ee82575932b2c2a1b6bcfab054b96a04d4 ChangeLog 2181
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
 MD5 688de6c9943189afc4fa3ab510813dbd metadata.xml 344
 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e metadata.xml 344
@@ -22,6 +42,19 @@ SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9 metadata
 MD5 daecacb946f29436b7fb3f41361328c2 files/digest-virtualbox-1.3.4-r1 271
 RMD160 8720f55536766b10c41f6e6438f31f1a6b9b2310 files/digest-virtualbox-1.3.4-r1 271
 SHA256 4a2a60b8eaa2d3cf0837947806e841464309d4c58ed73e78e08ef3ad6b0256a2 files/digest-virtualbox-1.3.4-r1 271
+MD5 daecacb946f29436b7fb3f41361328c2 files/digest-virtualbox-1.3.4-r2 271
+RMD160 8720f55536766b10c41f6e6438f31f1a6b9b2310 files/digest-virtualbox-1.3.4-r2 271
+SHA256 4a2a60b8eaa2d3cf0837947806e841464309d4c58ed73e78e08ef3ad6b0256a2 files/digest-virtualbox-1.3.4-r2 271
+MD5 aa67bc776af134860cfe42c3f12b4a0a files/digest-virtualbox-1.3.6 271
+RMD160 85814f7b06a15fdf5d1d94ca3e41bff2807cef4e files/digest-virtualbox-1.3.6 271
+SHA256 8d8ee07093a07044aad30ecda87c8aa21772a5b3f7add5a24dff79ed813ab3ab files/digest-virtualbox-1.3.6 271
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-virtualbox-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-virtualbox-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-virtualbox-9999 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFF5eBbz974XjDVpbkRAkizAKDKOjQG+glTSRe+1Gs8h9+xYeWQMwCfWiik
+A42zU3Cghe6en6dxWa+Qc8Q=
+=MJ67
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox/files/digest-virtualbox-1.3.4-r2 b/app-emulation/virtualbox/files/digest-virtualbox-1.3.4-r2
new file mode 100644
index 000000000000..d3662f648fa4
--- /dev/null
+++ b/app-emulation/virtualbox/files/digest-virtualbox-1.3.4-r2
@@ -0,0 +1,3 @@
+MD5 67853add4afc2eace5d8f45cfe9a32c5 VirtualBox-OSE-1.3.4.tar.bz2 17491150
+RMD160 32bd5f5e9bbf19bf59ffa93ccf6013496b40e318 VirtualBox-OSE-1.3.4.tar.bz2 17491150
+SHA256 c7d756645c96d202b8e88924f2b4da414c6d02775d3224739b21cdda064bbeee VirtualBox-OSE-1.3.4.tar.bz2 17491150
diff --git a/app-emulation/virtualbox/files/digest-virtualbox-1.3.6 b/app-emulation/virtualbox/files/digest-virtualbox-1.3.6
new file mode 100644
index 000000000000..ec272bc5bd57
--- /dev/null
+++ b/app-emulation/virtualbox/files/digest-virtualbox-1.3.6
@@ -0,0 +1,3 @@
+MD5 70c24ccee8b5778efd8d22f9996fbec9 VirtualBox-OSE-1.3.6.tar.bz2 17458095
+RMD160 f082f6397ceec0d0d543b155821592e6032affc3 VirtualBox-OSE-1.3.6.tar.bz2 17458095
+SHA256 e249c6f4792291e56e026cf9d807d355809283538cfa296b4e72f9ec1c71cdae VirtualBox-OSE-1.3.6.tar.bz2 17458095
diff --git a/app-emulation/virtualbox/files/virtualbox-1.3.6-remove-alsa.patch b/app-emulation/virtualbox/files/virtualbox-1.3.6-remove-alsa.patch
new file mode 100644
index 000000000000..6327af12343d
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-1.3.6-remove-alsa.patch
@@ -0,0 +1,22 @@
+--- Config.kmk.orig	2007-02-26 23:37:44.000000000 +0100
++++ Config.kmk	2007-02-26 23:38:56.000000000 +0100
+@@ -160,8 +160,6 @@
+ VBOX_WITH_USB = 1
+ # Enable the ISCSI feature.
+ VBOX_WITH_ISCSI = 1
+-# Disable ALSA support for Linux (currently broken).
+-VBOX_WITH_ALSA = 1
+ # Enable the kchmviewer
+ VBOX_WITH_KCHMVIEWER = 1
+ # Build the testsuite.
+--- configure.orig	2007-02-26 23:37:49.000000000 +0100
++++ configure	2007-02-26 23:38:40.000000000 +0100
+@@ -1196,7 +1196,7 @@
+ (($OSE==0)) && check_pam
+ [ "$OS" != "darwin" ] && check_sdl
+ (($OSE==0)) && check_sdl_ttf
+-[ "$OS" != "darwin" ] && check_alsa
++[ "$OS" != "darwin" ]
+ [ "$OS" != "darwin" ] && check_x
+ [ "$OS" != "darwin" ] && check_xcursor
+ (($XPCOM==1)) && check_qt
diff --git a/app-emulation/virtualbox/files/virtualbox-1.3.6-wrapper b/app-emulation/virtualbox/files/virtualbox-1.3.6-wrapper
new file mode 100644
index 000000000000..a1cea843f9fb
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-1.3.6-wrapper
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+INSTALL_DIR=/opt/VirtualBox
+USER=$( whoami )
+
+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
+fi
+
+[ "$VBOX_USER_HOME" = "" ] && VBOX_USER_HOME="$HOME/.VirtualBox"
+
+mkdir -p "$VBOX_USER_HOME"
+LOG="$VBOX_USER_HOME/VBoxSVC.log"
+
+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
+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
+fi
+
+export LD_LIBRARY_PATH="$INSTALL_DIR"
+
+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
+fi
+
+APP=$( which $0 )
+APP=${APP##/*/}
+case "$APP" in
+	VirtualBox|VBoxManage|VBoxSDL)
+		exec "$INSTALL_DIR/$APP" "$@"
+		;;
+	*)
+		echo "Error: Unknown application - $APP"
+		exit 1
+		;;
+esac
diff --git a/app-emulation/virtualbox/virtualbox-1.3.4-r1.ebuild b/app-emulation/virtualbox/virtualbox-1.3.4-r1.ebuild
index 6261f5a13e9a..1b3d576a6544 100644
--- a/app-emulation/virtualbox/virtualbox-1.3.4-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-1.3.4-r1.ebuild
@@ -55,9 +55,9 @@ src_install() {
 
 	insinto /opt/VirtualBox
 	if use sdk; then
-	    doins -r sdk
-	    make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-	    fperms 0755 /opt/VirtualBox/sdk/bin/xpidl
+		doins -r sdk
+		make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+		fperms 0755 /opt/VirtualBox/sdk/bin/xpidl
 	fi
 
 	rm -rf sdk src tst* testcase additions vboxdrv.ko SUPInstall SUPUninstall
@@ -89,10 +89,10 @@ pkg_preinst() {
 
 pkg_postinst() {
 	if use amd64; then
-	    elog ""
-	    elog "To avoid the nmi_watchdog bug and load the vboxdrv module"
-	    elog "you may need to update your bootloader configuration and pass the option:"
-	    elog "nmi_watchdog=0"
+					elog ""
+					elog "To avoid the nmi_watchdog bug and load the vboxdrv module"
+					elog "you may need to update your bootloader configuration and pass the option:"
+					elog "nmi_watchdog=0"
 	fi
 	elog ""
 	elog "In order to launch VirtualBox you need to start VBoxSVC first,"
diff --git a/app-emulation/virtualbox/virtualbox-1.3.4-r2.ebuild b/app-emulation/virtualbox/virtualbox-1.3.4-r2.ebuild
new file mode 100644
index 000000000000..6fa326d53a91
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-1.3.4-r2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header $
+
+inherit eutils linux-mod qt3
+
+MY_P=VirtualBox-OSE-${PV}
+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 sdk vditool"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	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)
+	=virtual/libstdc++-3.3"
+DEPEND="${RDEPEND}
+	sys-devel/bin86
+	sys-devel/dev86
+	sys-power/iasl"
+RDEPEND="${RDEPEND}
+	additions? ( =app-emulation/virtualbox-additions-${PV} )"
+
+S=${WORKDIR}/${MY_P}
+
+BUILD_TARGETS="all"
+MODULE_NAMES="vboxdrv(misc:${S}/out/linux.${ARCH}/release/bin/src:${S}/out/linux.${ARCH}/release/bin/src)"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+}
+
+src_compile() {
+	cd "${S}"
+	./configure || die "configure failed"
+	source ./env.sh
+	kmk all || die "kmk failed"
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	cd "${S}"/out/linux.${ARCH}/release/bin
+
+	insinto /opt/VirtualBox
+	if use sdk; then
+					doins -r sdk
+					make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+					fperms 0755 /opt/VirtualBox/sdk/bin/xpidl
+	fi
+	if use vditool; then
+					doins vditool
+					make_wrapper vditool "./vditool" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+					fperms 0755 /opt/VirtualBox/vditool
+	fi
+
+	rm -rf sdk src tst* testcase additions vditool vboxdrv.ko xpidl SUPInstall SUPUninstall
+
+	doins -r *
+	for each in VBox{BFE,Manage,SDL,SVC,XPCOMIPCD} VirtualBox ; do
+		fperms 0755 /opt/VirtualBox/${each}
+	done
+	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"
+
+	# udev rule for vboxdrv
+	dodir /etc/udev/rules.d
+	echo 'KERNEL=="vboxdrv", GROUP="vboxusers" MODE=660' >> "${D}/etc/udev/rules.d/60-virtualbox.rules"
+
+	# 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
+}
+
+pkg_preinst() {
+	enewgroup vboxusers
+}
+
+pkg_postinst() {
+	if use amd64; then
+					elog ""
+					elog "To avoid the nmi_watchdog bug and load the vboxdrv module"
+					elog "you may need to update your bootloader configuration and pass the option:"
+					elog "nmi_watchdog=0"
+	fi
+	elog ""
+	elog "In order to launch VirtualBox you need to start VBoxSVC first,"
+	elog "this can be done with:"
+	elog "vboxsvc --daemonize && virtualbox"
+	elog ""
+	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-1.3.6.ebuild b/app-emulation/virtualbox/virtualbox-1.3.6.ebuild
new file mode 100644
index 000000000000..93fe9e27278e
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-1.3.6.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header $
+
+inherit eutils qt3
+
+MY_P=VirtualBox-OSE-${PV}
+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 vboxbfe vditool wrapper"
+
+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)
+	=virtual/libstdc++-3.3"
+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} )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Remove Alsa checks in configure and don't build the Alsa audio driver, when Alsa is not selected
+	use alsa || epatch "${FILESDIR}/${P}-remove-alsa.patch"
+}
+
+src_compile() {
+	cd "${S}"
+	./configure || die "configure failed"
+	source ./env.sh
+	kmk all || die "kmk failed"
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/release/bin
+
+	insinto /opt/VirtualBox
+	if use sdk; then
+		doins -r sdk
+		make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+		fperms 0755 /opt/VirtualBox/sdk/bin/xpidl
+	fi
+	if use vditool; then
+		doins vditool
+		make_wrapper vditool "./vditool" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+		fperms 0755 /opt/VirtualBox/vditool
+	fi
+	if use vboxbfe; then
+		doins VBoxBFE
+		fperms 0755 /opt/VirtualBox/VBoxBFE
+
+		if use wrapper ; then
+			dosym /opt/VirtualBox/wrapper.sh /usr/bin/VBoxBFE
+		else
+			make_wrapper vboxbfe "./VBoxBFE" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+		fi
+	fi
+
+	rm -rf sdk src tst* testcase additions VBoxBFE vditool vboxdrv.ko xpidl SUPInstall SUPUninstall
+
+	doins -r *
+	for each in VBox{Manage,SDL,SVC,XPCOMIPCD} VirtualBox ; do
+		fperms 0755 /opt/VirtualBox/${each}
+	done
+
+	if use wrapper ; then
+		exeinto /opt/VirtualBox
+		newexe "${FILESDIR}/${P}-wrapper" "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
+	else
+		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"
+	fi
+
+	# 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
+}
+
+pkg_postinst() {
+	elog ""
+	elog "In order to launch VirtualBox you need to start VBoxSVC first, with:"
+	elog "vboxsvc --daemonize && virtualbox"
+	elog ""
+	elog "If you selected the useflag \"wrapper\" just type \"VirtualBox\" instead."
+	elog ""
+	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 9d66566b6033..cf93f7a0c70b 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="additions sdk"
+IUSE="additions sdk vboxbfe vditool wrapper"
 
 RDEPEND="!app-emulation/virtualbox-bin
 	dev-libs/libIDL
@@ -25,18 +25,15 @@ RDEPEND="!app-emulation/virtualbox-bin
 DEPEND="${RDEPEND}
 	sys-devel/bin86
 	sys-devel/dev86
-	sys-power/iasl"
+	sys-power/iasl
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )"
 RDEPEND="${RDEPEND}
-	additions? ( =app-emulation/virtualbox-additions-1.3.4 )"
+	additions? ( app-emulation/virtualbox-additions )"
 
+BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
 BUILD_TARGETS="all"
 MODULE_NAMES="vboxdrv(misc:${S}/out/linux.${ARCH}/release/bin/src:${S}/out/linux.${ARCH}/release/bin/src)"
 
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-}
-
 src_compile() {
 	cd "${S}"
 	./configure || die "configure failed"
@@ -52,22 +49,44 @@ src_install() {
 
 	insinto /opt/VirtualBox
 	if use sdk; then
-	    doins -r sdk
-	    make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-	    fperms 0755 /opt/VirtualBox/sdk/bin/xpidl
+		doins -r sdk
+		make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+		fperms 0755 /opt/VirtualBox/sdk/bin/xpidl
+	fi
+	if use vditool; then
+		doins vditool
+		make_wrapper vditool "./vditool" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+		fperms 0755 /opt/VirtualBox/vditool
+	fi
+	if use vboxbfe; then
+		doins VBoxBFE
+		fperms 0755 /opt/VirtualBox/VBoxBFE
+		if use wrapper ; then
+			dosym /opt/VirtualBox/wrapper.sh /usr/bin/VBoxBFE
+		else
+			make_wrapper vboxbfe "./VBoxBFE" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+		fi
 	fi
 
-	rm -rf sdk src tst* testcase additions vboxdrv.ko SUPInstall SUPUninstall
+	rm -rf sdk src tst* testcase additions VBoxBFE vditool vboxdrv.ko xpidl SUPInstall SUPUninstall
 
 	doins -r *
-	for each in VBox{BFE,Manage,SDL,SVC,XPCOMIPCD} VirtualBox vditool xpidl ; do
+	for each in VBox{Manage,SDL,SVC,XPCOMIPCD} VirtualBox ; do
 		fperms 0755 /opt/VirtualBox/${each}
 	done
-	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"
+
+	if use wrapper ; then
+		exeinto /opt/VirtualBox
+		newexe "${FILESDIR}/${PN}-1.3.6-wrapper" "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
+	else
+		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"
+	fi
 
 	# udev rule for vboxdrv
 	dodir /etc/udev/rules.d
@@ -86,16 +105,17 @@ pkg_preinst() {
 
 pkg_postinst() {
 	if use amd64; then
-	    elog ""
-	    elog "To avoid the nmi_watchdog bug and load the vboxdrv module"
-	    elog "you may need to update your bootloader configuration and pass the option:"
-	    elog "nmi_watchdog=0"
+		elog ""
+		elog "To avoid the nmi_watchdog bug and load the vboxdrv module"
+		elog "you may need to update your bootloader configuration and pass the option:"
+		elog "nmi_watchdog=0"
 	fi
 	elog ""
-	elog "In order to launch VirtualBox you need to start VBoxSVC first,"
-	elog "this can be done with:"
+	elog "In order to launch VirtualBox you need to start VBoxSVC first, with:"
 	elog "vboxsvc --daemonize && virtualbox"
 	elog ""
+	elog "If you selected the useflag \"wrapper\" just type \"VirtualBox\" instead."
+	elog ""
 	elog "You must be in the vboxusers group to use VirtualBox."
 	elog ""
 	elog "The last user manual is available for download at:"