Fixes for bug #350949

(Portage version: 2.2.0_alpha14/cvs/Linux x86_64)

2 files changed, 25 insertions, 8 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index ad61b2f1ee7b..cd99f80a6059 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.97 2011/01/06 22:16:32 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.98 2011/01/07 12:18:15 polynomial-c Exp $
+
+*virtualbox-bin-4.0.0-r1 (07 Jan 2011)
+
+  07 Jan 2011; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-bin-4.0.0.ebuild, +virtualbox-bin-4.0.0-r1.ebuild:
+  Fixed some issues reported by Francesco Lamonica in bug #350949.
 
 *virtualbox-bin-4.0.0 (06 Jan 2011)
 
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.0.0.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.0.0-r1.ebuild
index 6b1d428c528f..0928bf684490 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.0.0.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.0.0.ebuild,v 1.1 2011/01/06 22:16:32 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.0.0-r1.ebuild,v 1.1 2011/01/07 12:18:15 polynomial-c Exp $
 
 EAPI=2
 
@@ -9,12 +9,14 @@ inherit eutils fdo-mime pax-utils
 MY_PV=${PV}-69151
 SDK_PV=${MY_PV}
 MY_P=VirtualBox-${MY_PV}-Linux
+EXTP_PN=Oracle_VM_VirtualBox_Extension_Pack
 
 DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
 HOMEPAGE="http://www.virtualbox.org/"
 SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_amd64.run )
 	x86? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_x86.run )
-	sdk? ( http://download.virtualbox.org/virtualbox/${PV}/VirtualBoxSDK-${SDK_PV}.zip )"
+	sdk? ( http://download.virtualbox.org/virtualbox/${PV}/VirtualBoxSDK-${SDK_PV}.zip )
+	http://download.virtualbox.org/virtualbox/${PV}/${EXTP_PN}-${MY_PV}.vbox-extpack -> ${EXTP_PN}-${MY_PV}.tar.gz"
 
 LICENSE="PUEL"
 SLOT="0"
@@ -159,6 +161,11 @@ src_unpack() {
 	unpack_makeself ${MY_P}_${ARCH}.run
 	unpack ./VirtualBox.tar.bz2
 
+	mkdir "${S}"/${EXTP_PN} || die
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	unpack ${EXTP_PN}-${MY_PV}.tar.gz
+	popd &>/dev/null || die
+
 	if use sdk; then
 		unpack VirtualBoxSDK-${SDK_PV}.zip
 	fi
@@ -174,6 +181,13 @@ src_install() {
 		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
 	fi
 
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+	popd &>/dev/null || die
+	rm -rf "${S}"/${EXTP_PN}
+
 	insinto /opt/VirtualBox
 	dodir /opt/bin
 
@@ -200,6 +214,7 @@ src_install() {
 		doins rdesktop-vrdp || die
 		doins -r rdesktop-vrdp-keymaps || die
 		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
+		dosym /opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
 	fi
 
 	if ! use headless && use chm; then
@@ -238,7 +253,7 @@ src_install() {
 	dosym /opt/VirtualBox/VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
 
 	local each
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,TestOGL}; do
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,TestOGL,ExtPackHelperApp}; do
 		fowners root:vboxusers /opt/VirtualBox/${each}
 		fperms 0750 /opt/VirtualBox/${each}
 		pax-mark -m "${D}"/opt/VirtualBox/${each}
@@ -264,10 +279,6 @@ src_install() {
 		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
 	fi
 
-	if use rdesktop-vrdp; then
-		dosym /opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
-	fi
-
 	exeinto /opt/VirtualBox
 	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh" || die
 	fowners root:vboxusers /opt/VirtualBox/VBox.sh