summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Lauer <patrick@gentoo.org>2011-10-23 13:14:01 +0000
committerPatrick Lauer <patrick@gentoo.org>2011-10-23 13:14:01 +0000
commit905d13a08a13375b6ec6d1d46ce8e0b30bb831c8 (patch)
treed7927962ac9a481f54ae187818c724a196911459 /app-emulation
parentAdding makeself symlink to makeself.sh to make stupid build systems happy (diff)
downloadgentoo-2-905d13a08a13375b6ec6d1d46ce8e0b30bb831c8.tar.gz
gentoo-2-905d13a08a13375b6ec6d1d46ce8e0b30bb831c8.tar.bz2
gentoo-2-905d13a08a13375b6ec6d1d46ce8e0b30bb831c8.zip
Fixing deps of the 9999 ebuild so that it might maybe build
(Portage version: 2.2.0_alpha70/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/virtualbox/ChangeLog5
-rw-r--r--app-emulation/virtualbox/virtualbox-9999.ebuild14
2 files changed, 14 insertions, 5 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/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)