Fixed building with gcc-4.5 (bug #320741) and install EFI firmware images (bug #320757).

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 22 insertions, 5 deletions

diff --git a/app-emulation/virtualbox-ose/ChangeLog b/app-emulation/virtualbox-ose/ChangeLog
index 26c0b122ddc8..2eee31f96251 100644
--- a/app-emulation/virtualbox-ose/ChangeLog
+++ b/app-emulation/virtualbox-ose/ChangeLog
@@ -1,6 +1,14 @@
 # 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.53 2010/05/20 13:03:16 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.54 2010/05/20 20:33:20 polynomial-c Exp $
+
+*virtualbox-ose-3.2.0-r1 (20 May 2010)
+
+  20 May 2010; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-ose-3.2.0.ebuild, +virtualbox-ose-3.2.0-r1.ebuild,
+  files/virtualbox-ose-3-localconfig:
+  Fixed building with gcc-4.5 (bug #320741) and install EFI firmware images
+  (bug #320757). Thanks to Evan Teran who reported both bugs.
 
 *virtualbox-ose-3.2.0 (20 May 2010)
 
diff --git a/app-emulation/virtualbox-ose/Manifest b/app-emulation/virtualbox-ose/Manifest
index 66437188f2fb..b1d7043dc786 100644
--- a/app-emulation/virtualbox-ose/Manifest
+++ b/app-emulation/virtualbox-ose/Manifest
@@ -1,7 +1,7 @@
 AUX vboxwebsrv-confd 622 RMD160 98e7ad0a2ce1cca42308f30ae755cc36f08674df SHA1 16978cce1c11b941d5bcce8c143e4026de9daf01 SHA256 245fd8fa217142c4a43e1f0d6b7f25fd72c538d85abc88585450324bbcf6fbb7
 AUX vboxwebsrv-initd 748 RMD160 3750514cea6441b7f6a68057a030bb4f7977e960 SHA1 8682afdab16f3504d5566ef34039124a743eb945 SHA256 3760f1d1737dfc5fef02151dcc6cd5d8359086a81b06905df1dea4b77adfdebd
 AUX virtualbox-ose-3-config 42 RMD160 7102b584e67b964dfd3c06e06b29eb91d33d7604 SHA1 1fe2ac29550c4b3ab4a82399ece3d08c8851c207 SHA256 fb619bc28ba651135730601240e192f9d02b9bef9954eb8026a716865db01b4d
-AUX virtualbox-ose-3-localconfig 1382 RMD160 1e484d1d7b3955ae425caa6d20ceba629b5f0150 SHA1 f1c7f076c2dfb8011708852391ae35cfe4d82994 SHA256 ebd65235b78f68f3c6f2b2185230f6271e077c04ad35a8c00b072fe563109fc6
+AUX virtualbox-ose-3-localconfig 1442 RMD160 a40962b6ce3b5b4dd4cec47f32d3a2e935bd8aa5 SHA1 317eaee6d3b22cb561180a84f179dfdfcef2acc7 SHA256 27e169d386b1ca865f47fe64c43eb8ce157c9fa028d6d2d026e5f1cc4e61fac1
 AUX virtualbox-ose-3-wrapper 2931 RMD160 c73f7fca4531dc8023484b860c81c0a5805f022c SHA1 1d51680f1dc67394b0bf2c0533305e54c68ef177 SHA256 7ed4834ece201cb6a9da57e36a1a9b47bd054057d2ac4a46343a9966ff460644
 AUX virtualbox-ose-3.0.0-mesa-check.patch 692 RMD160 c1b62d987fa941f5455a8fb0c0d6b07377756d0f SHA1 18c987a024fc45778cc2dc55515100150996408d SHA256 88e981ed765b26c11ea9c606a009a9a1b03c67a1de5cb42b18e0088e027fe0c8
 AUX virtualbox-ose-3.1.8-iasl-length-calculation-fix.patch 1190 RMD160 4c1950bf59457edb4e18c6670b49e2096c153bda SHA1 aa93ed7c058c78a1479e2e2c965c64e74031d699 SHA256 6ab56908bdc65f0c81a4f8f8150a83724abe6b31358a6a3550959ff42e9879dc
@@ -15,7 +15,7 @@ DIST VirtualBox-3.2.0-OSE.tar.bz2 57837589 RMD160 aca3a820c952c4f90f08350a4438e5
 EBUILD virtualbox-ose-3.0.12.ebuild 8142 RMD160 0845d0f746885330d91df63639ab1de87734a80e SHA1 0f6c90a519c87b324215d1e30c68e7b0997ee429 SHA256 8e19d88a143b4928dfa400bc334fa3cde11d92aaa71fd83eb77dc3b95cda8a20
 EBUILD virtualbox-ose-3.1.6.ebuild 8361 RMD160 f887014607958de1572c4db01faf78e289f510c7 SHA1 e3bb7ee9a5c816bd4e5c52b7cbbb449e54e26cc2 SHA256 e374700bf4f0007b99f245ecaead8e9083c3aa9ae09b19378cbc0db061b71b2d
 EBUILD virtualbox-ose-3.1.8.ebuild 8465 RMD160 802143fb54fe59a6c45dc95259080abf50dd917f SHA1 767b9196d9863be33cc1087927691de295554230 SHA256 9db543c99eb64247067828378aceee68ac85b0ad6acd647618c56e41fc65f944
-EBUILD virtualbox-ose-3.2.0.ebuild 8483 RMD160 9313ae4306e8bf618e230add4953b0fd10f4b0b6 SHA1 c09c500f62795c4d72fd5aa2cb1cfd79c37c288e SHA256 5b9284415b05f08bf46261944d91613bbbbfa5f6952c457aa219ab8b5bf69bc1
+EBUILD virtualbox-ose-3.2.0-r1.ebuild 8718 RMD160 5f0ab2a06ee790cf23a4677cbc0dd0c064ebed31 SHA1 a901dc38c4b0720945f64eba505360d369d85208 SHA256 c3f4bd982a44eeff230c39bfa3d00188af8c20ceebec92431dc95ea046767107
 EBUILD virtualbox-ose-9999.ebuild 5456 RMD160 4b1a6587e4764ff573af1e86c2a9a0449483f3d8 SHA1 b908704bd4517b89322049ce788db0f7885fd053 SHA256 f2b90a209afdece4891fa34dc9306b07e592ccf211c241099389f316380e7a54
-MISC ChangeLog 23162 RMD160 5de19e2e1f45484a1ff30653b0145753074d8d7c SHA1 38e2d932baa9546e0dc0aac06d7d52723414b09a SHA256 f6f954e491987f415f031019e675cb5fffa4753ef906eb4572d13d3627089fe7
+MISC ChangeLog 23498 RMD160 eca333f3ce8fc16ca671840c6e07c7f79cc23963 SHA1 54a398bd2a7e307c1e555ef7b40bf3b2e700ea39 SHA256 6022236e3468b03c4f7d42b19bccaac6e75b62a2774e869e8f92427c124dc985
 MISC metadata.xml 617 RMD160 630aa214018e978197a47495e4229ae23d311304 SHA1 20b9810155334d19e07d5937a8cea2a32b5b9928 SHA256 59d974f6e80cfc51352047d1e2ce5781107b201aa61df2c19d24ff40075dae9f
diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-3-localconfig b/app-emulation/virtualbox-ose/files/virtualbox-ose-3-localconfig
index 0c9978856489..fb3440daba6b 100644
--- a/app-emulation/virtualbox-ose/files/virtualbox-ose-3-localconfig
+++ b/app-emulation/virtualbox-ose/files/virtualbox-ose-3-localconfig
@@ -40,4 +40,6 @@ VBOX_WITH_VBOXDRV :=
 VBOX_WITH_VBOXBFE :=
 VBOX_WITH_KCHMVIEWER :=
 
+## don't build with -Werror
+VBOX_WITH_WARNINGS_AS_ERRORS :=
 
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-3.2.0.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-3.2.0-r1.ebuild
index 0a3ac19e4d5f..d3f7e701af6f 100644
--- a/app-emulation/virtualbox-ose/virtualbox-ose-3.2.0.ebuild
+++ b/app-emulation/virtualbox-ose/virtualbox-ose-3.2.0-r1.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.2.0.ebuild,v 1.1 2010/05/20 13:03:16 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-3.2.0-r1.ebuild,v 1.1 2010/05/20 20:33:20 polynomial-c Exp $
 
 EAPI=2
 
@@ -236,6 +236,13 @@ src_install() {
 		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
 	fi
 
+	# Install EFI Firmware files (bug #320757)
+	cd "${S}"/src/VBox/Devices/EFI/FirmwareBin || die
+	for fwfile in VBoxEFI{32,64}.fd ; do
+		doins ${fwfile} || die
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile} || die
+	done
+
 	insinto /usr/share/${PN}
 	if ! use headless && use qt4 ; then
 		doins -r nls