summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Ullmann <jokey@gentoo.org>2007-06-03 07:35:24 +0000
committerMarkus Ullmann <jokey@gentoo.org>2007-06-03 07:35:24 +0000
commit2f87b16c4c2f20bcc0ac4a620e32bdec906e7185 (patch)
treec21f4a084fe2f62497e11ba6dcc7da5d1aaf9364 /app-emulation/virtualbox
parentAdd missing depend. decode-edid.pl needs parse-edid from x11-misc/read-edid (diff)
downloadgentoo-2-2f87b16c4c2f20bcc0ac4a620e32bdec906e7185.tar.gz
gentoo-2-2f87b16c4c2f20bcc0ac4a620e32bdec906e7185.tar.bz2
gentoo-2-2f87b16c4c2f20bcc0ac4a620e32bdec906e7185.zip
Fix hal use dep bug #180565
(Portage version: 2.1.2.9)
Diffstat (limited to 'app-emulation/virtualbox')
-rw-r--r--app-emulation/virtualbox/ChangeLog5
-rw-r--r--app-emulation/virtualbox/virtualbox-9999.ebuild16
2 files changed, 16 insertions, 5 deletions
diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index 440b0f394e7a..490dbbcb03c5 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/virtualbox
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.16 2007/05/31 10:12:44 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.17 2007/06/03 07:35:24 jokey Exp $
+
+ 03 Jun 2007; Markus Ullmann <jokey@gentoo.org> virtualbox-9999.ebuild:
+ Fix hal use dep bug #180565
31 May 2007; Markus Ullmann <jokey@gentoo.org> virtualbox-1.3.8.ebuild,
virtualbox-9999.ebuild:
diff --git a/app-emulation/virtualbox/virtualbox-9999.ebuild b/app-emulation/virtualbox/virtualbox-9999.ebuild
index 2216e1f4f38b..aa8eaff52f1b 100644
--- a/app-emulation/virtualbox/virtualbox-9999.ebuild
+++ b/app-emulation/virtualbox/virtualbox-9999.ebuild
@@ -11,7 +11,7 @@ ESVN_REPO_URI="http://virtualbox.org/svn/vbox/trunk"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="additions nowrapper sdk vboxbfe vditool"
+IUSE="additions hal nowrapper sdk vboxbfe vditool"
RDEPEND="!app-emulation/virtualbox-bin
dev-libs/libIDL
@@ -21,12 +21,13 @@ RDEPEND="!app-emulation/virtualbox-bin
media-libs/libsdl
x11-libs/libXcursor
$(qt_min_version 3.3.5)
- =virtual/libstdc++-3.3"
+ hal? ( sys-apps/hal )"
DEPEND="${RDEPEND}
sys-devel/bin86
sys-devel/dev86
sys-power/iasl
- >=media-libs/alsa-lib-1.0.13"
+ >=media-libs/alsa-lib-1.0.13
+ =virtual/libstdc++-3.3"
RDEPEND="${RDEPEND}
additions? ( app-emulation/virtualbox-additions )"
@@ -48,7 +49,14 @@ pkg_setup() {
src_compile() {
cd "${S}"
- ./configure || die "configure failed"
+
+ local myconf
+ if ! use hal; then
+ myconf="${myconf} --without-hal"
+ fi
+
+ ./configure \
+ ${myconf} || die "configure failed"
source ./env.sh
# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)