Don't allow to enable hal, as it anyways does not work fine and has bad behavior when hal 0.5 is being used.

(Portage version: 2.0.53_rc6)

3 files changed, 14 insertions, 11 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index f1a8a2e4f3cc..eaf0513aa837 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.110 2005/10/30 20:32:57 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.111 2005/10/30 23:04:53 flameeyes Exp $
+
+  30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.1-r1.ebuild,
+  vlc-0.8.2-r1.ebuild:
+  Don't allow to enable hal, as it anyways does not work fine and has bad
+  behavior when hal 0.5 is being used.
 
   30 Oct 2005; Mark Loeser <halcy0n@gentoo.org> vlc-0.8.2-r1.ebuild,
   vlc-0.8.2-r2.ebuild, vlc-0.8.4_beta1.ebuild:
diff --git a/media-video/vlc/vlc-0.8.1-r1.ebuild b/media-video/vlc/vlc-0.8.1-r1.ebuild
index d219f6eda6dd..9c0e042d90dc 100644
--- a/media-video/vlc/vlc-0.8.1-r1.ebuild
+++ b/media-video/vlc/vlc-0.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.1-r1.ebuild,v 1.17 2005/09/15 21:33:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.1-r1.ebuild,v 1.18 2005/10/30 23:04:53 flameeyes Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -18,10 +18,9 @@ SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~ppc sparc x86"
-IUSE="a52 3dfx nls unicode debug altivec httpd vlm gnutls live v4l cdio cddb cdda ogg matroska dvb dvd vcd ffmpeg aac dts flac mpeg vorbis theora X opengl freetype svg fbcon svga oss aalib ggi libcaca esd arts alsa wxwindows xosd lirc joystick nsplugin hal stream mad xv bidi gtk2 sdl ssl"
+IUSE="a52 3dfx nls unicode debug altivec httpd vlm gnutls live v4l cdio cddb cdda ogg matroska dvb dvd vcd ffmpeg aac dts flac mpeg vorbis theora X opengl freetype svg fbcon svga oss aalib ggi libcaca esd arts alsa wxwindows xosd lirc joystick nsplugin stream mad xv bidi gtk2 sdl ssl"
 
-DEPEND="hal? ( =sys-apps/hal-0.4* )
-		cdio? ( >=dev-libs/libcdio-0.70 )
+DEPEND="cdio? ( >=dev-libs/libcdio-0.70 )
 		cddb? ( >=media-libs/libcddb-0.9.4 )
 		live? ( >=media-plugins/live-2005.01.29 )
 		dvd? (  media-libs/libdvdread
@@ -177,7 +176,7 @@ src_compile () {
 		$(use_enable 3dfx glide) \
 		$(use_enable sdl) \
 		$(use_enable ssl gnutls) \
-		--disable-ncurses --disable-portaudio --disable-pth \
+		--disable-ncurses --disable-portaudio --disable-pth --disable-hal \
 		${myconf} || die "configuration failed"
 
 	if [[ $(gcc-major-version) == 2 ]]; then
diff --git a/media-video/vlc/vlc-0.8.2-r1.ebuild b/media-video/vlc/vlc-0.8.2-r1.ebuild
index 77851a4aad09..f1b2b195af43 100644
--- a/media-video/vlc/vlc-0.8.2-r1.ebuild
+++ b/media-video/vlc/vlc-0.8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.2-r1.ebuild,v 1.5 2005/10/30 20:32:57 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.2-r1.ebuild,v 1.6 2005/10/30 23:04:53 flameeyes Exp $
 
 # Missing USE-flags due to missing deps:
 # media-vidoe/vlc:tremor - Enables Tremor decoder support
@@ -24,11 +24,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="a52 3dfx nls unicode debug altivec httpd vlm gnutls live v4l cdda ogg matroska
 dvb dvd vcd ffmpeg aac dts flac mpeg vorbis theora X opengl freetype svg fbcon svga
-oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc joystick hal stream
+oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc joystick stream
 mp3 xv bidi gtk2 sdl png xml2 samba daap corba screen mod speex nsplugin"
 
-RDEPEND="hal? ( =sys-apps/hal-0.4* )
-		cdda? ( >=dev-libs/libcdio-0.71
+RDEPEND="cdda? ( >=dev-libs/libcdio-0.71
 			>=media-libs/libcddb-0.9.5 )
 		live? ( >=media-plugins/live-2005.01.29 )
 		dvd? (  media-libs/libdvdread
@@ -203,7 +202,6 @@ src_compile () {
 		$(use_enable ggi) \
 		$(use_enable 3dfx glide) \
 		$(use_enable sdl) \
-		$(use_enable hal) \
 		$(use_enable png) \
 		$(use_enable xml2 libxml2) \
 		$(use_enable samba smb) \
@@ -215,6 +213,7 @@ src_compile () {
 		--disable-pth \
 		--disable-portaudio \
 		--disable-slp \
+		--disable-hal \
 		${myconf} || die "configuration failed"
 
 	if [[ $(gcc-major-version) == 2 ]]; then