Got rid of sys-apps/hal stuff.

(Portage version: 2.2.0_alpha9/cvs/Linux x86_64)

5 files changed, 17 insertions, 17 deletions

diff --git a/app-emulation/virtualbox-ose/ChangeLog b/app-emulation/virtualbox-ose/ChangeLog
index cdbbc3ac9b1f..08bdb5b9413d 100644
--- a/app-emulation/virtualbox-ose/ChangeLog
+++ b/app-emulation/virtualbox-ose/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/virtualbox-ose
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.76 2010/12/08 23:19:41 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.77 2010/12/19 11:18:07 polynomial-c Exp $
+
+  19 Dec 2010; Lars Wendler <polynomial-c@gentoo.org>
+  virtualbox-ose-3.1.8.ebuild, virtualbox-ose-3.2.10.ebuild,
+  virtualbox-ose-3.2.12.ebuild, virtualbox-ose-9999.ebuild:
+  Punted sys-apps/hal dependency as requested in bug #349048.
 
   08 Dec 2010; Lars Wendler <polynomial-c@gentoo.org>
   virtualbox-ose-3.2.12.ebuild, +files/virtualbox-ose-vnc.patch:
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-3.1.8.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-3.1.8.ebuild
index e21c538d1454..be1a9f4557b5 100644
--- a/app-emulation/virtualbox-ose/virtualbox-ose-3.1.8.ebuild
+++ b/app-emulation/virtualbox-ose/virtualbox-ose-3.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-3.1.8.ebuild,v 1.12 2010/10/12 14:00:54 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-3.1.8.ebuild,v 1.13 2010/12/19 11:18:07 polynomial-c Exp $
 
 EAPI=2
 
@@ -22,7 +22,7 @@ HOMEPAGE="http://www.virtualbox.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="+additions alsa +hal headless pulseaudio python +qt4 sdk vboxwebsrv"
+IUSE="+additions alsa headless pulseaudio python +qt4 sdk vboxwebsrv"
 
 RDEPEND="!app-emulation/virtualbox-bin
 	~app-emulation/virtualbox-modules-${PV}
@@ -48,7 +48,6 @@ DEPEND="${RDEPEND}
 	sys-libs/libcap
 	dev-util/pkgconfig
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	hal? ( sys-apps/hal )
 	pulseaudio? ( media-sound/pulseaudio )
 	python? ( >=dev-lang/python-2.3[threads] )
 	vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )"
@@ -118,7 +117,6 @@ src_configure() {
 	use alsa       || myconf="${myconf} --disable-alsa"
 	use pulseaudio || myconf="${myconf} --disable-pulse"
 	use python     || myconf="${myconf} --disable-python"
-	use hal        || myconf="${myconf} --disable-dbus"
 	use vboxwebsrv && myconf="${myconf} --enable-webservice"
 	if ! use headless ; then
 		use qt4 || myconf="${myconf} --disable-qt4"
@@ -130,6 +128,7 @@ src_configure() {
 		--with-gcc="$(tc-getCC)" \
 		--with-g++="$(tc-getCXX)" \
 		--disable-kmods \
+		--disable-dbus \
 		${myconf} \
 		|| die "configure failed"
 }
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-3.2.10.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-3.2.10.ebuild
index 579f61309819..eab84090656a 100644
--- a/app-emulation/virtualbox-ose/virtualbox-ose-3.2.10.ebuild
+++ b/app-emulation/virtualbox-ose/virtualbox-ose-3.2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-3.2.10.ebuild,v 1.1 2010/10/12 14:00:54 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-3.2.10.ebuild,v 1.2 2010/12/19 11:18:07 polynomial-c Exp $
 
 EAPI=2
 
@@ -22,7 +22,7 @@ HOMEPAGE="http://www.virtualbox.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+additions alsa +hal headless pulseaudio +opengl python +qt4 sdk vboxwebsrv"
+IUSE="+additions alsa headless pulseaudio +opengl python +qt4 sdk vboxwebsrv"
 
 RDEPEND="!app-emulation/virtualbox-bin
 	~app-emulation/virtualbox-modules-${PV}
@@ -47,7 +47,6 @@ DEPEND="${RDEPEND}
 	sys-libs/libcap
 	dev-util/pkgconfig
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	hal? ( sys-apps/hal )
 	!headless? ( x11-libs/libXinerama )
 	pulseaudio? ( media-sound/pulseaudio )
 	python? ( >=dev-lang/python-2.3[threads] )
@@ -125,7 +124,6 @@ src_configure() {
 	use opengl     || myconf="${myconf} --disable-opengl"
 	use pulseaudio || myconf="${myconf} --disable-pulse"
 	use python     || myconf="${myconf} --disable-python"
-	use hal        || myconf="${myconf} --disable-dbus"
 	use vboxwebsrv && myconf="${myconf} --enable-webservice"
 	if ! use headless ; then
 		use qt4 || myconf="${myconf} --disable-qt4"
@@ -137,6 +135,7 @@ src_configure() {
 		--with-gcc="$(tc-getCC)" \
 		--with-g++="$(tc-getCXX)" \
 		--disable-kmods \
+		--disable-dbus \
 		${myconf} \
 		|| die "configure failed"
 }
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-3.2.12.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-3.2.12.ebuild
index 27d287efbfb1..2c9dda552b88 100644
--- a/app-emulation/virtualbox-ose/virtualbox-ose-3.2.12.ebuild
+++ b/app-emulation/virtualbox-ose/virtualbox-ose-3.2.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-3.2.12.ebuild,v 1.2 2010/12/08 23:19:41 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-3.2.12.ebuild,v 1.3 2010/12/19 11:18:07 polynomial-c Exp $
 
 EAPI=2
 
@@ -22,7 +22,7 @@ HOMEPAGE="http://www.virtualbox.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+additions alsa +hal headless pulseaudio +opengl python +qt4 sdk vboxwebsrv vnc"
+IUSE="+additions alsa headless pulseaudio +opengl python +qt4 sdk vboxwebsrv vnc"
 
 RDEPEND="!app-emulation/virtualbox-bin
 	~app-emulation/virtualbox-modules-${PV}
@@ -49,7 +49,6 @@ DEPEND="${RDEPEND}
 	sys-libs/libcap
 	dev-util/pkgconfig
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	hal? ( sys-apps/hal )
 	!headless? ( x11-libs/libXinerama )
 	pulseaudio? ( media-sound/pulseaudio )
 	python? ( >=dev-lang/python-2.3[threads] )
@@ -130,7 +129,6 @@ src_configure() {
 	use opengl     || myconf+=" --disable-opengl"
 	use pulseaudio || myconf+=" --disable-pulse"
 	use python     || myconf+=" --disable-python"
-	use hal        || myconf+=" --disable-dbus"
 	use vboxwebsrv && myconf+=" --enable-webservice"
 	use vnc        && myconf+=" --enable-vnc"
 	if ! use headless ; then
@@ -143,6 +141,7 @@ src_configure() {
 		--with-gcc="$(tc-getCC)" \
 		--with-g++="$(tc-getCXX)" \
 		--disable-kmods \
+		--disable-dbus \
 		${myconf} \
 		|| die "configure failed"
 }
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild
index 6590eb1a936e..ce762e5f6c08 100644
--- a/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild
+++ b/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild,v 1.11 2010/08/01 10:37:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild,v 1.12 2010/12/19 11:18:07 polynomial-c Exp $
 
 EAPI=1
 
@@ -40,11 +40,9 @@ DEPEND="${RDEPEND}
 	>=media-libs/alsa-lib-1.0.13
 	pulseaudio? ( media-sound/pulseaudio )
 	python? ( >=dev-lang/python-2.3 )"
-# sys-apps/hal is required at runtime (bug #197541)
 RDEPEND="${RDEPEND}
 	sys-apps/usermode-utilities
-	net-misc/bridge-utils
-	sys-apps/hal"
+	net-misc/bridge-utils"
 
 BUILD_TARGETS="all"
 MODULE_NAMES="vboxdrv(misc:${S}/out/linux.${ARCH}/release/bin/src:${S}/out/linux.${ARCH}/release/bin/src)"