Version bump and minor bugfixes

(Portage version: 2.1.2.2)

13 files changed, 330 insertions, 260 deletions

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index fbf0e6c49351..2a6ea584d88f 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,17 @@
 # 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.12 2007/03/11 19:00:16 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.13 2007/03/16 22:15:52 jokey Exp $
+
+*virtualbox-1.3.8 (16 Mar 2007)
+*virtualbox-1.3.6-r1 (16 Mar 2007)
+
+  16 Mar 2007; Markus Ullmann <jokey@gentoo.org>
+  +files/virtualbox-1.3.8-remove-alsa.patch,
+  +files/virtualbox-1.3.8-remove-splitted-stuff.patch,
+  +files/virtualbox-wrapper, -virtualbox-1.3.4-r1.ebuild,
+  -virtualbox-1.3.4-r2.ebuild, -virtualbox-1.3.6.ebuild,
+  +virtualbox-1.3.6-r1.ebuild, +virtualbox-1.3.8.ebuild:
+  Version bump and minor bugfixes
 
   11 Mar 2007; Markus Ullmann <jokey@gentoo.org> virtualbox-9999.ebuild:
   Missing IUSE, thanks jakub
diff --git a/app-emulation/virtualbox/files/digest-virtualbox-1.3.4-r1 b/app-emulation/virtualbox/files/digest-virtualbox-1.3.4-r1
deleted file mode 100644
index d3662f648fa4..000000000000
--- a/app-emulation/virtualbox/files/digest-virtualbox-1.3.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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.4-r2 b/app-emulation/virtualbox/files/digest-virtualbox-1.3.4-r2
deleted file mode 100644
index d3662f648fa4..000000000000
--- a/app-emulation/virtualbox/files/digest-virtualbox-1.3.4-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-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-r1
index ec272bc5bd57..ec272bc5bd57 100644
--- a/app-emulation/virtualbox/files/digest-virtualbox-1.3.6
+++ b/app-emulation/virtualbox/files/digest-virtualbox-1.3.6-r1
diff --git a/app-emulation/virtualbox/files/digest-virtualbox-1.3.8 b/app-emulation/virtualbox/files/digest-virtualbox-1.3.8
new file mode 100644
index 000000000000..aaef4a5a6a5b
--- /dev/null
+++ b/app-emulation/virtualbox/files/digest-virtualbox-1.3.8
@@ -0,0 +1,3 @@
+MD5 c012923a084a44ed91966f8df887927f VirtualBox-OSE-1.3.8.tar.bz2 17458132
+RMD160 e832fc31773c4d2dc1ecfa7a24a68cfd190818a7 VirtualBox-OSE-1.3.8.tar.bz2 17458132
+SHA256 14d84c38932f783bfa0bfbf1a91347cc2bba6fd3d4ba60744e7a0ace4bd5cce4 VirtualBox-OSE-1.3.8.tar.bz2 17458132
diff --git a/app-emulation/virtualbox/files/virtualbox-1.3.8-remove-alsa.patch b/app-emulation/virtualbox/files/virtualbox-1.3.8-remove-alsa.patch
new file mode 100644
index 000000000000..41da11680006
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-1.3.8-remove-alsa.patch
@@ -0,0 +1,22 @@
+--- Config.kmk.orig	2007-03-14 13:10:41.000000000 +0100
++++ Config.kmk	2007-03-14 13:11:07.000000000 +0100
+@@ -163,7 +163,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-03-14 13:10:49.000000000 +0100
++++ configure	2007-03-14 13:11:01.000000000 +0100
+@@ -1200,7 +1200,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
+ (($WITH_QT==1)) && check_qt
diff --git a/app-emulation/virtualbox/files/virtualbox-1.3.8-remove-splitted-stuff.patch b/app-emulation/virtualbox/files/virtualbox-1.3.8-remove-splitted-stuff.patch
new file mode 100644
index 000000000000..5de2a32dd4d4
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-1.3.8-remove-splitted-stuff.patch
@@ -0,0 +1,58 @@
+--- Config.kmk.orig	2007-03-14 12:54:24.000000000 +0100
++++ Config.kmk	2007-03-14 12:56:24.000000000 +0100
+@@ -102,7 +102,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)
+@@ -134,7 +134,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
+@@ -167,11 +167,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-03-14 12:56:30.000000000 +0100
++++ configure	2007-03-14 13:00:47.000000000 +0100
+@@ -1161,14 +1161,14 @@
+ # some things are not available in for OSE
+ if (($OSE)); 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-wrapper b/app-emulation/virtualbox/files/virtualbox-wrapper
new file mode 100644
index 000000000000..059a7887241f
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-wrapper
@@ -0,0 +1,66 @@
+#!/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)
+		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
+		;;
+esac
diff --git a/app-emulation/virtualbox/virtualbox-1.3.4-r1.ebuild b/app-emulation/virtualbox/virtualbox-1.3.4-r1.ebuild
deleted file mode 100644
index 1b3d576a6544..000000000000
--- a/app-emulation/virtualbox/virtualbox-1.3.4-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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"
-
-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
-
-	rm -rf sdk src tst* testcase additions vboxdrv.ko SUPInstall SUPUninstall
-
-	doins -r *
-	for each in VBox{BFE,Manage,SDL,SVC,XPCOMIPCD} VirtualBox vditool xpidl ; 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.4-r2.ebuild b/app-emulation/virtualbox/virtualbox-1.3.4-r2.ebuild
deleted file mode 100644
index 6fa326d53a91..000000000000
--- a/app-emulation/virtualbox/virtualbox-1.3.4-r2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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-r1.ebuild
index 93fe9e27278e..038f1efab0df 100644
--- a/app-emulation/virtualbox/virtualbox-1.3.6.ebuild
+++ b/app-emulation/virtualbox/virtualbox-1.3.6-r1.ebuild
@@ -12,10 +12,10 @@ 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"
+IUSE="additions alsa nowrapper sdk vboxbfe vditool"
 
 RDEPEND="!app-emulation/virtualbox-bin
-	=app-emulation/virtualbox-modules-${PV}
+	~app-emulation/virtualbox-modules-${PV}
 	dev-libs/libIDL
 	>=dev-libs/libxslt-1.1.19
 	dev-libs/xalan-c
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 	sys-power/iasl
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )"
 RDEPEND="${RDEPEND}
-	additions? ( =app-emulation/virtualbox-additions-${PV} )"
+	additions? ( ~app-emulation/virtualbox-additions-${PV} )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -38,7 +38,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# Remove Alsa checks in configure and don't build the Alsa audio driver, when Alsa is not selected
+	# Remove Alsa checks in configure and don't build the Alsa audio driver
+	# when Alsa is not selected (bug #167739)
 	use alsa || epatch "${FILESDIR}/${P}-remove-alsa.patch"
 }
 
@@ -67,10 +68,10 @@ src_install() {
 		doins VBoxBFE
 		fperms 0755 /opt/VirtualBox/VBoxBFE
 
-		if use wrapper ; then
-			dosym /opt/VirtualBox/wrapper.sh /usr/bin/VBoxBFE
-		else
+		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
 
@@ -81,17 +82,17 @@ src_install() {
 		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
+	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"
+		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
 
 	# desktop entry
@@ -103,10 +104,13 @@ src_install() {
 
 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."
+	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 ""
diff --git a/app-emulation/virtualbox/virtualbox-1.3.8.ebuild b/app-emulation/virtualbox/virtualbox-1.3.8.ebuild
new file mode 100644
index 000000000000..c29908f16cfc
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-1.3.8.ebuild
@@ -0,0 +1,122 @@
+# 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 nowrapper sdk vboxbfe vditool"
+
+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}/vbox-ose-${PV}
+
+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
+	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 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 VBoxBFE vditool xpidl SUPInstall SUPUninstall
+
+	doins -r *
+	for each in VBox{Manage,SDL,SVC,XPCOMIPCD} VirtualBox ; do
+		fperms 0755 /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"
+		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
+
+	# 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 ""
+	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 ""
+	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 ff39a060387c..2670318bfc8d 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 alsa sdk vboxbfe vditool wrapper"
+IUSE="additions alsa nowrapper sdk vboxbfe vditool"
 
 RDEPEND="!app-emulation/virtualbox-bin
 	dev-libs/libIDL
@@ -30,10 +30,14 @@ DEPEND="${RDEPEND}
 RDEPEND="${RDEPEND}
 	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"
@@ -61,10 +65,11 @@ src_install() {
 	if use vboxbfe; then
 		doins VBoxBFE
 		fperms 0755 /opt/VirtualBox/VBoxBFE
-		if use wrapper ; then
-			dosym /opt/VirtualBox/wrapper.sh /usr/bin/VBoxBFE
-		else
+
+		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
 
@@ -75,17 +80,17 @@ src_install() {
 		fperms 0755 /opt/VirtualBox/${each}
 	done
 
-	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
+	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"
+		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
 
 	# udev rule for vboxdrv
@@ -104,6 +109,7 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	linux-mod_pkg_postinst
 	if use amd64; then
 		elog ""
 		elog "To avoid the nmi_watchdog bug and load the vboxdrv module"
@@ -111,10 +117,13 @@ pkg_postinst() {
 		elog "nmi_watchdog=0"
 	fi
 	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."
+	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 ""