Version bump and minor bugfixes

(Portage version: 2.1.2.2)

1 files changed, 25 insertions, 16 deletions

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 ""