Version bump; add the new environment variable VBOX_APP_HOME bug #291292

svn path=/trunk/; revision=768

3 files changed, 33 insertions, 16 deletions

diff --git a/app-emulation/virtualbox-ose/ChangeLog b/app-emulation/virtualbox-ose/ChangeLog
index 56013e9..86db99f 100644
--- a/app-emulation/virtualbox-ose/ChangeLog
+++ b/app-emulation/virtualbox-ose/ChangeLog
@@ -1,10 +1,26 @@
 # ChangeLog for app-emulation/virtualbox-ose
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.42 2009/11/30 11:19:21 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.45 2009/12/02 23:33:02 patrick Exp $
 
-  30 Nov 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
-  -virtualbox-ose-3.0.12.ebuild, +virtualbox-ose-3.1.0.ebuild:
-  Version bump
+  23 Dec 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  -virtualbox-ose-3.1.0.ebuild, +virtualbox-ose-3.1.2.ebuild:
+  Version bump; add the new environment variable VBOX_APP_HOME
+  bug #291292;
+
+  02 Dec 2009; Patrick Lauer <patrick@gentoo.org>
+  virtualbox-ose-3.1.0.ebuild:
+  Removing bad patch
+
+*virtualbox-ose-3.1.0 (02 Dec 2009)
+
+  02 Dec 2009; Patrick Lauer <patrick@gentoo.org>
+  +virtualbox-ose-3.1.0.ebuild:
+  Bump
+
+  30 Nov 2009; Patrick Lauer <patrick@gentoo.org>
+  -virtualbox-ose-3.0.8.ebuild, -virtualbox-ose-3.0.8-r1.ebuild,
+  -virtualbox-ose-3.0.10.ebuild:
+  Remove old
 
   30 Nov 2009; Markus Meier <maekke@gentoo.org>
   virtualbox-ose-3.0.12.ebuild:
@@ -183,7 +199,7 @@
 *virtualbox-ose-2.0.4-r1 (18 Dec 2008)
 *virtualbox-ose-1.6.6-r1 (18 Dec 2008)
 
-  18 Dec 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+  18 Dec 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   +files/virtualbox-ose-fix-insecure-lockfiles.patch,
   +virtualbox-ose-1.6.6-r1.ebuild, +virtualbox-ose-2.0.4-r1.ebuild,
   +virtualbox-ose-2.0.6.ebuild, virtualbox-ose-9999.ebuild:
@@ -354,13 +370,13 @@
   04 Mar 2008; Markus Ullmann <jokey@gentoo.org> virtualbox-1.5.4-r1.ebuild:
   Stable on x86 wrt bug #208905
 
-  26 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
+  26 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
   virtualbox-1.5.6.ebuild:
   Fix patch naming.
 
 *virtualbox-1.5.6 (25 Feb 2008)
 
-  25 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
+  25 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
   +virtualbox-1.5.6.ebuild:
   Version bump, as requested by the proxy-maintainer Alessio Cassibba.
 
@@ -409,7 +425,7 @@
   Fix desktop entry for bug #196832, typo in wrapper and HAL warning. Thanks
   to Alessio for providing needed modifications
 
-  29 Oct 2007; Dawid Węgliński <cla@gentoo.org> virtualbox-1.5.2.ebuild:
+  29 Oct 2007; Dawid Węgliński <cla@gentoo.org> virtualbox-1.5.2.ebuild:
   Stable on x86
 
 *virtualbox-1.5.2 (22 Oct 2007)
@@ -486,7 +502,7 @@
   virtualbox-1.3.8.ebuild, virtualbox-9999.ebuild:
   Fix for sdl useflag bug #177335
 
-  21 Apr 2007; Raúl Porcel <armin76@gentoo.org> virtualbox-1.3.8.ebuild:
+  21 Apr 2007; Raúl Porcel <armin76@gentoo.org> virtualbox-1.3.8.ebuild:
   x86 stable
 
 *virtualbox-1.3.8 (16 Mar 2007)
diff --git a/app-emulation/virtualbox-ose/Manifest b/app-emulation/virtualbox-ose/Manifest
index ac52e96..263942c 100644
--- a/app-emulation/virtualbox-ose/Manifest
+++ b/app-emulation/virtualbox-ose/Manifest
@@ -6,7 +6,7 @@ AUX virtualbox-ose-3-wrapper 2931 RMD160 c73f7fca4531dc8023484b860c81c0a5805f022
 AUX virtualbox-ose-3.0.0-mesa-check.patch 692 RMD160 c1b62d987fa941f5455a8fb0c0d6b07377756d0f SHA1 18c987a024fc45778cc2dc55515100150996408d SHA256 88e981ed765b26c11ea9c606a009a9a1b03c67a1de5cb42b18e0088e027fe0c8
 AUX virtualbox-ose-3.0.8-without-hal-fix.patch 1318 RMD160 9fbefc7f4a783dc2f2c84773cf52b30b9e16777c SHA1 0e2e06c38de7023920cbd819be24e1dbc9ff8408 SHA256 125bbf9f926ad19a5dac6a0c68cc7b2abbd2c246c071917b1f9b447b38addbe5
 AUX virtualbox-ose.desktop 202 RMD160 8b4b5c05743978d71edd4eaba71ae25f1d9d0d82 SHA1 3c10d2f12ea58ef35e785b8727a51fd3a0d66472 SHA256 9bbd26661317b106593d74b84cec3781b24c41bc40a2f98776e23d6b422ee4bb
-DIST VirtualBox-3.1.0-OSE.tar.bz2 55491869 RMD160 7e3600ca1320af601d01d24f0a4e78ef04c89aac SHA1 fb7c97d692fc8e9973578ef44a848a5988694606 SHA256 da8affc44342d3988c96ad2d98c248b99f481ecd001af1557aeb31cd15e10639
-EBUILD virtualbox-ose-3.1.0.ebuild 8281 RMD160 3897ac9e8b76b5d6347f72e98ec9e4c446d139fe SHA1 8f79b28f3dde1080c5e1aa614f73c99730f0b4b4 SHA256 6399c442081de7ba7f8eb43ffe758e9b4246ee8b3c959ae395355e1d847eebb2
-MISC ChangeLog 21747 RMD160 7900adaafcbb9e4e95a1a675bb1d2fcf83b3a06f SHA1 d1ae92986f88c7a9cc44b787dfd7242081711a8c SHA256 9614fecec1f69347a20f92ef35ed6ad754551eb1665a0c8242dac54aab216c00
+DIST VirtualBox-3.1.2-OSE.tar.bz2 55553394 RMD160 be66ad7198f04c71471eeffd5b95ff9d5078eab7 SHA1 ac85e5d098684080ce0571406d741f3db03064b8 SHA256 293f582e37eda29efdb53c6468481b446e1964592f5728656b74664f4d32f2b1
+EBUILD virtualbox-ose-3.1.2.ebuild 8358 RMD160 c4eefe87e7beb9da4d37f136daf2d4279094fe23 SHA1 6074a8acb84b6d7698cf0758183891de3a24998f SHA256 511ab3209c6c2db5f45526a74edc956b2126c9e2ff4bf0191b05ab47be347b2b
+MISC ChangeLog 22214 RMD160 17d59e086fcae2bf0e86657194dd890b70a6d4a7 SHA1 7ebe2d0bb7446eb0d5ac7c7afb5c4be2172c94e8 SHA256 2e9990b494ced6420c479f2e78f51aed2e04c69cb27b54ce2b76d2543858ea8f
 MISC metadata.xml 608 RMD160 05b2e56d330d28aed13d4a7035369e04dc1e989e SHA1 ea332f57fa454cc6f8489f6debcd991003886fc0 SHA256 ab349ab6727625054f24bbf733a3f6fabb34ba1e1f0fd845c51c70595b05b6aa
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-3.1.0.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-3.1.2.ebuild
index 92b9fe1..8057a78 100644
--- a/app-emulation/virtualbox-ose/virtualbox-ose-3.1.0.ebuild
+++ b/app-emulation/virtualbox-ose/virtualbox-ose-3.1.2.ebuild
@@ -30,7 +30,7 @@ RDEPEND="!app-emulation/virtualbox-bin
 	>=dev-libs/libxslt-1.1.19
 	net-misc/curl
 	!headless? (
-		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
+		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl?	( x11-libs/qt-opengl:4 ) )
 		opengl? ( virtual/opengl virtual/glut )
 		x11-libs/libXcursor
 		media-libs/libsdl[X,video]
@@ -111,9 +111,6 @@ src_prepare() {
 
 	# unset useless/problematic mesa checks in configure
 	epatch "${FILESDIR}/${PN}-3.0.0-mesa-check.patch"
-
-	# stupid hal being stupid code
-	use hal || epatch "${FILESDIR}/${PN}-3.0.8-without-hal-fix.patch"
 }
 
 src_configure() {
@@ -240,6 +237,10 @@ src_install() {
 	if ! use headless && use qt4 ; then
 		doins -r nls
 	fi
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
 }
 
 pkg_postinst() {