--- /tmp/xbmc-9999.ebuild	2010-12-25 09:02:57.000000000 +0200
+++ xbmc-9999.ebuild	2010-12-25 09:05:09.000000000 +0200
@@ -26,9 +26,9 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa altivec avahi css debug hal joystick midi profile pulseaudio rtmp sse sse2 vaapi vdpau webserver xrandr"
+IUSE="alsa altivec avahi css debug joystick midi profile pulseaudio rtmp sse sse2 udev vaapi vdpau webserver xrandr"
 
-RDEPEND="virtual/opengl
+COMMON_DEPEND="virtual/opengl
 	app-arch/bzip2
 	app-arch/unrar
 	app-arch/unzip
@@ -77,7 +77,6 @@
 	net-misc/curl
 	|| ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.3 )
 	sys-apps/dbus
-	hal? ( sys-apps/hal )
 	sys-libs/zlib
 	virtual/mysql
 	x11-apps/xdpyinfo
@@ -91,7 +90,9 @@
 	xrandr? ( x11-libs/libXrandr )
 	x11-libs/libXrender"
 # The cpluff bundled addon uses gettext which needs CVS ...
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+	udev? (	sys-fs/udisks sys-power/upower )"
+DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
 	dev-vcs/cvs
 	x11-proto/xineramaproto
@@ -172,7 +173,7 @@
 		$(use_enable avahi) \
 		$(use_enable css dvdcss) \
 		$(use_enable debug) \
-		$(use_enable hal) \
+		--disable-hal \
 		$(use_enable joystick) \
 		$(use_enable midi mid) \
 		$(use_enable profile profiling) \