Fixing deps of the 9999 ebuild so that it might maybe build

Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64

3 files changed, 16 insertions, 27 deletions

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index be30570100d1..d5e6f45653d7 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.86 2011/10/05 09:40:17 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.87 2011/10/23 13:14:01 patrick Exp $
+
+  23 Oct 2011; Patrick Lauer <patrick@gentoo.org> virtualbox-9999.ebuild:
+  Fixing deps of the 9999 ebuild so that it might maybe build
 
   05 Oct 2011; Lars Wendler <polynomial-c@gentoo.org>
   files/virtualbox-4.1.4-asneeded.patch:
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index f2c3c3319bee..ef611e7ab4ac 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX 10-virtualbox.rules 576 RMD160 3dddd2ffa03bc214fea9d2e8b3363399ffd898e5 SHA1 6840d9e79790d01621ba79e00228071eda98355d SHA256 9fe8aaa16b42e6730a2ebd6cf0fbc9ad0db0f45e06e554cc4ae06b4dfc0045e1
 AUX vboxwebsrv-confd 623 RMD160 ad4a86aa317d466e556d613e57a7fa6a195db986 SHA1 f6f0f568a10093f082b3f8e09c9dfa515a560adc SHA256 8a6773013072e3049fa3ede7b5117e59dde9b35bc3402fc31e9985361b5f9147
 AUX vboxwebsrv-initd 749 RMD160 3cfe8484be4fe67d7be25044a4ab79c44ad42492 SHA1 5dddd297edd74a2e12a731e19f663128d6289b4b SHA256 279addc442d19f982c6b209c8900fe9bd65d73e2dcf98b96cd08b168eb8bf54d
@@ -23,23 +20,6 @@ DIST VirtualBox-4.1.4.tar.bz2 73837275 RMD160 475a68dc6beebdb588688743b3652bbb9a
 EBUILD virtualbox-4.0.12.ebuild 11911 RMD160 2687ae805daf246f41ba5b356f7a5b60490d1d10 SHA1 99155d99ce346a42ad51351d092219f4d7532cf4 SHA256 4039df52823799fc21798a58c95a69b00efb1a51740599ee58845a0646b411ca
 EBUILD virtualbox-4.1.2.ebuild 12003 RMD160 e628640dd88309798715cdb19b431f73773f6c41 SHA1 b95510f7f34fdbdb1cb8fb771a1d82685b97b4d3 SHA256 768ff2fd26cea39ddf196864103c7614fea8aeba06350702155bb6a4b94c7a0d
 EBUILD virtualbox-4.1.4.ebuild 12014 RMD160 5d8d7a0c3385c5583d6d5694e7a4536b84588824 SHA1 20a66e4038df19ce338e569624faead65590d9c7 SHA256 dcc00f85b34fe93c82a42995f0dcc1e7844d038d3319c159149a845ed3e9aa93
-EBUILD virtualbox-9999.ebuild 5623 RMD160 3e3eeabc7dfcddc0583974335494f51b23c8327b SHA1 fcc07a44770a14802e337c9ff2a87f19b2d149f3 SHA256 301e900d619a1fd9c9e38793671fb0ab843c2d973bda2612e64e34c1fdbf3c8d
-MISC ChangeLog 8607 RMD160 df183447d3bd9f590afd2d039fca81d457622342 SHA1 ed1212429ca448409a754cfa70232f24fe202b5f SHA256 dcdb9af75fd1bfdf78c9630b317a08f550c5b8bf1822a8d22b76f3baeccb41b5
+EBUILD virtualbox-9999.ebuild 5702 RMD160 5910c24c277af2bac4f50c57ca97253994a16734 SHA1 782323a9c9a40ed52f350836f379a958b72a490b SHA256 1b2ab1d308157fa4adfb7827cdf8e4f6b643200876f02f96bd0b7bd9a6e45fb4
+MISC ChangeLog 8739 RMD160 316c1f0d7d16d68629cb163bbda3c04250b1390c SHA1 0be121424916be1e317ed6536ef27048c25270b9 SHA256 49f748996c4615d7ca8e7013846ce263c154fe1f08a6c353b7cd1e140e0761e8
 MISC metadata.xml 766 RMD160 1c69e37183d073f82b9fd2c8761b758cc33ccce8 SHA1 31295f3715624ada590d13fdc80c076380415ba0 SHA256 54cc5df43fbe674f4f04674566dfec523c0c912f8c94db26f4215727ab6850e5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBCgAGBQJOjCYGAAoJEPiazRVxLXTFEloP/30RA5j5BFqUv0XbnR3y/SZW
-IEyUbhz0tBNPw7AQY8SPynx7izqjCrNSmEuktKOtcN0sym+NGOUAy3jzjsfqF5JR
-WRmcUx/yfY8S5klz76RXtaqR3Bb1qQN86usYEAA0cyI2xGZXI33qrpA6ZywY8EhE
-ge8Yro0eAVWVha5NvbvOTU4R2aHXFyDL/JHUZVaLKrBtqOpP3PCqiqzosWbPiAEl
-/oTY9PjTNWgK4U/0kQeOxnDQ2V+ZrfkDZujo8PgffTA3DIgk2FZ5rqsLzB6Mv3gT
-nEFlEmUc36vOZCdIuuk5pPxU7LZkdThRHCRsfkW3MilG2J6ys74bLrGDJy2QuiFk
-0VuuOuSgRdBVRCd6oQhamtujTiM4HkMB6MlVBUKEMP70HH6IV9dG+uiywRJSDD9F
-tjLsRAONvCIoRByG97Bqtt8kvoYMcZex0O+xvRw8c5uOWYbjwXwPiupml+h6KcVr
-RI6r4iGzcUsYLyr/11rIbW3oZC/X9cJT0uaghTGoVdBNIkQ7kilxAT6B2SNehAVV
-akVhTNc8ivGk9cbdQ10J/BAo0XV92JyqZZmxA/cLA/LNMayA9ZcXOjC085c/w2zw
-Fgwu8lMeEV4rtcK9Ln0QbVfUmRlE5c8daq3BZOWsVayjFn7CLZnidIyaKzfdwAVC
-3Rbngsk0TPbm6TGBvm1v
-=oZxv
------END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox/virtualbox-9999.ebuild b/app-emulation/virtualbox/virtualbox-9999.ebuild
index 96a01d2c130a..57bc0e4f4277 100644
--- a/app-emulation/virtualbox/virtualbox-9999.ebuild
+++ b/app-emulation/virtualbox/virtualbox-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-9999.ebuild,v 1.27 2011/01/07 15:11:45 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-9999.ebuild,v 1.28 2011/10/23 13:14:01 patrick Exp $
 
-EAPI=1
+EAPI=2
 
-inherit eutils fdo-mime flag-o-matic linux-mod pax-utils qt4 subversion toolchain-funcs
+inherit eutils fdo-mime flag-o-matic linux-mod pax-utils qt4-r2 subversion toolchain-funcs
 
 DESCRIPTION="Softwarefamily of powerful x86 virtualization"
 HOMEPAGE="http://www.virtualbox.org/"
@@ -18,6 +18,8 @@ IUSE="alsa headless pulseaudio python +qt4 sdk"
 RDEPEND="!app-emulation/virtualbox-bin
 	!app-emulation/virtualbox-additions
 	!app-emulation/virtualbox-modules
+	app-arch/makeself
+	app-cdr/cdrtools
 	dev-libs/libIDL
 	>=dev-libs/libxslt-1.1.19
 	dev-libs/xalan-c
@@ -31,6 +33,7 @@ RDEPEND="!app-emulation/virtualbox-bin
 			x11-libs/qt-opengl:4
 		)
 		x11-libs/libXcursor
+		x11-libs/libXinerama
 		media-libs/libsdl
 		x11-libs/libXt
 		media-libs/mesa )
@@ -72,7 +75,7 @@ pkg_setup() {
 	enewgroup vboxusers
 }
 
-src_compile() {
+src_configure() {
 
 	local myconf
 	# Don't build vboxdrv kernel module
@@ -96,6 +99,9 @@ src_compile() {
 
 	./configure --with-gcc="$(tc-getCC)" --with-g++="$(tc-getCXX)" \
 	${myconf} || die "configure failed"
+}
+
+src_compile() {
 	source ./env.sh
 
 	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)