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
commitce69e5cc455f6db0edfd421b29d07f63a1b1d74b (patch)
tree4d02669b35969896f27f1910d6c53fed8f9a45fb /app-emulation
parentAdd missing depend. decode-edid.pl needs parse-edid from x11-misc/read-edid (diff)
downloadhistorical-ce69e5cc455f6db0edfd421b29d07f63a1b1d74b.tar.gz
historical-ce69e5cc455f6db0edfd421b29d07f63a1b1d74b.tar.bz2
historical-ce69e5cc455f6db0edfd421b29d07f63a1b1d74b.zip
Fix hal use dep bug #180565
Package-Manager: portage-2.1.2.9
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/virtualbox/ChangeLog5
-rw-r--r--app-emulation/virtualbox/Manifest22
-rw-r--r--app-emulation/virtualbox/virtualbox-9999.ebuild16
3 files changed, 27 insertions, 16 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/Manifest b/app-emulation/virtualbox/Manifest
index b2033c8ff71a..23e9012d9b9f 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -22,14 +22,14 @@ EBUILD virtualbox-1.3.8.ebuild 4268 RMD160 018660aeab1a360ebfb781a11dabc88a309c3
MD5 1dfb7036483e263df672d3dcc7e9ccb3 virtualbox-1.3.8.ebuild 4268
RMD160 018660aeab1a360ebfb781a11dabc88a309c3104 virtualbox-1.3.8.ebuild 4268
SHA256 5583a0d2b14044f0a354e5ff8e1487fd6a07a883b1be42826d3c8920df9dbd09 virtualbox-1.3.8.ebuild 4268
-EBUILD virtualbox-9999.ebuild 4517 RMD160 d54ca3ff483e8e034dbf0d352abefb15deaa692c SHA1 0931c88bbc9189860e5fbf21f2cd53acbde8cf67 SHA256 f4f6f53cfa3b789d5e633230ed258426ae01604e67dabc5c5b2304f6ba7a334e
-MD5 e1120bda429e2ccf8ca82f0108879b0c virtualbox-9999.ebuild 4517
-RMD160 d54ca3ff483e8e034dbf0d352abefb15deaa692c virtualbox-9999.ebuild 4517
-SHA256 f4f6f53cfa3b789d5e633230ed258426ae01604e67dabc5c5b2304f6ba7a334e virtualbox-9999.ebuild 4517
-MISC ChangeLog 3197 RMD160 9e0835590d71a15795d9d5f3f4af6b864edfc7aa SHA1 6aec7161ee3ecbf870d91c1cdf96c18dc10640cb SHA256 84ac85b08295357a1bd168a3489a81257ab3878fbb1195d831f0518d81d22331
-MD5 5c58517b69cc4ddd79da41232c67e73d ChangeLog 3197
-RMD160 9e0835590d71a15795d9d5f3f4af6b864edfc7aa ChangeLog 3197
-SHA256 84ac85b08295357a1bd168a3489a81257ab3878fbb1195d831f0518d81d22331 ChangeLog 3197
+EBUILD virtualbox-9999.ebuild 4632 RMD160 bc874de951e1f6daa0c97e6932e26e4ff06d5d51 SHA1 68345523d8bf71506a4c498605ef38b5de3a65de SHA256 7bde48290a35a4df032c94f26f894c64b2249a2e96f3e55099a13b40c2173684
+MD5 ee9575e9cb84ec9190faa475c929a212 virtualbox-9999.ebuild 4632
+RMD160 bc874de951e1f6daa0c97e6932e26e4ff06d5d51 virtualbox-9999.ebuild 4632
+SHA256 7bde48290a35a4df032c94f26f894c64b2249a2e96f3e55099a13b40c2173684 virtualbox-9999.ebuild 4632
+MISC ChangeLog 3301 RMD160 aeb5592f2fc1accc9f98666064b51dc79b6c9618 SHA1 8a766b99876b11820dc2433c5faea9e68803551f SHA256 029c8bf315db0c9253aace9fa2ed4b00f037cbbdf0dd6045168e6ee67044bdf3
+MD5 00309dcce4fb1191757a0410d4dd64e8 ChangeLog 3301
+RMD160 aeb5592f2fc1accc9f98666064b51dc79b6c9618 ChangeLog 3301
+SHA256 029c8bf315db0c9253aace9fa2ed4b00f037cbbdf0dd6045168e6ee67044bdf3 ChangeLog 3301
MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
MD5 688de6c9943189afc4fa3ab510813dbd metadata.xml 344
RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e metadata.xml 344
@@ -43,7 +43,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.4 (GNU/Linux)
-iD8DBQFGXp+hz974XjDVpbkRAoT4AKC+DVrWTQO153NcuRx3R+iqYTUMvACgo/xP
-4nQy4IylowCI8DTCMJoA3nE=
-=VG/9
+iD8DBQFGYm9Cz974XjDVpbkRAkU1AKCQnSWSnBXOAEK2uKfkX4l6RKaoiQCgz2zm
+Qtwp4EmW3RHsSdhLXFBchfo=
+=TBen
-----END PGP SIGNATURE-----
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)