Version bump. Removed old.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 26 insertions, 4 deletions

diff --git a/app-emulation/virtualbox-ose/ChangeLog b/app-emulation/virtualbox-ose/ChangeLog
index d289f6e086e4..55d9060006e4 100644
--- a/app-emulation/virtualbox-ose/ChangeLog
+++ b/app-emulation/virtualbox-ose/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox-ose
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.56 2010/05/21 17:41:26 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.57 2010/06/03 10:56:29 polynomial-c Exp $
+
+*virtualbox-ose-3.2.2 (03 Jun 2010)
+
+  03 Jun 2010; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-ose-3.1.6.ebuild, +virtualbox-ose-3.2.2.ebuild, metadata.xml:
+  Version bump. Removed old.
 
   21 May 2010; Lars Wendler <polynomial-c@gentoo.org>
   virtualbox-ose-3.2.0-r1.ebuild:
diff --git a/app-emulation/virtualbox-ose/metadata.xml b/app-emulation/virtualbox-ose/metadata.xml
index c3b07417e4cc..0d3bf67277e5 100644
--- a/app-emulation/virtualbox-ose/metadata.xml
+++ b/app-emulation/virtualbox-ose/metadata.xml
@@ -10,6 +10,10 @@
   <email>swapon@gmail.com</email>
   <name>Alessio Cassibba</name>
 </maintainer>
+  <maintainer>
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
 <use>
 	<flag name='additions'>Install Guest System Tools ISO</flag>
 	<flag name='headless'>Build without any graphic frontend</flag>
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-3.1.6.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-3.2.2.ebuild
index 5cceca0f0f1c..2b52a33767e8 100644
--- a/app-emulation/virtualbox-ose/virtualbox-ose-3.1.6.ebuild
+++ b/app-emulation/virtualbox-ose/virtualbox-ose-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-3.1.6.ebuild,v 1.1 2010/03/28 13:44:08 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-3.2.2.ebuild,v 1.1 2010/06/03 10:56:29 polynomial-c Exp $
 
 EAPI=2
 
@@ -47,6 +47,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	hal? ( sys-apps/hal )
+	!headless? ( x11-libs/libXinerama )
 	pulseaudio? ( media-sound/pulseaudio )
 	python? ( >=dev-lang/python-2.3 )
 	vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )"
@@ -110,7 +111,10 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-3-localconfig > LocalConfig.kmk || die
 
 	# unset useless/problematic mesa checks in configure
-	epatch "${FILESDIR}/${PN}-3.0.0-mesa-check.patch"
+	epatch "${FILESDIR}/${PN}-3.2.0-mesa-check.patch"
+
+	# fix with newer iasl (bug #319127)
+	epatch "${FILESDIR}/${PN}-3.1.8-iasl-length-calculation-fix.patch"
 }
 
 src_configure() {
@@ -207,7 +211,7 @@ src_install() {
 			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
 		done
 
-		if use opengl ; then
+		if use opengl && use qt4 ; then
 			doins VBoxTestOGL || die
 			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
 			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
@@ -233,6 +237,14 @@ src_install() {
 		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
 	fi
 
+	# Install EFI Firmware files (bug #320757)
+	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
+	for fwfile in VBoxEFI{32,64}.fd ; do
+		doins ${fwfile} || die
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile} || die
+	done
+	popd &>/dev/null || die
+
 	insinto /usr/share/${PN}
 	if ! use headless && use qt4 ; then
 		doins -r nls