--- xbmc-9999.ebuild.original	2009-07-20 23:30:37.000000000 -0400
+++ xbmc-9999.ebuild	2009-07-20 23:31:37.000000000 -0400
@@ -26,7 +26,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa debug joystick opengl profile pulseaudio vdpau"
+IUSE="alsa avahi css debug faac joystick midi opengl profile pulseaudio xrandr xscreensaver vdpau"
 
 RDEPEND="opengl? ( virtual/opengl )
 	app-arch/bzip2
@@ -42,7 +42,8 @@
 	dev-libs/lzo
 	>=dev-python/pysqlite-2
 	media-libs/alsa-lib
-	media-libs/faac
+	faac? ( media-libs/faac )
+	>=media-libs/faad2-2.7-r1
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/glew
@@ -58,7 +59,9 @@
 	media-libs/sdl-image[gif,jpeg,png]
 	media-libs/sdl-mixer
 	media-libs/sdl-sound
+	pulseaudio? ( media-sound/pulseaudio )
 	media-sound/wavpack
+	net-dns/avahi
 	net-misc/curl
 	sys-apps/dbus
 	sys-apps/hal
@@ -66,8 +69,10 @@
 	virtual/mysql
 	x11-apps/xdpyinfo
 	x11-apps/mesa-progs
+	vdpau? ( >=x11-drivers/nvidia-drivers-180.51 )
 	x11-libs/libXinerama
-	x11-libs/libXrandr
+	xscreensaver? ( x11-misc/xscreensaver )
+	xrandr? ( x11-libs/libXrandr )
 	x11-libs/libXrender"
 DEPEND="${RDEPEND}
 	x11-proto/xineramaproto
@@ -115,14 +120,17 @@
 	export HELP2MAN=$(type -P help2man || echo true)
 
 	econf \
-		--disable-ccache \
-		--disable-optimizations \
+		--enable-optimizations \
 		--enable-external-libraries \
 		$(use_enable debug) \
 		$(use_enable joystick) \
 		$(use_enable opengl gl) \
 		$(use_enable profile profiling) \
+		$(use_enable faac) \
+		$(use_enable css dvdcss) \
+		$(use_enable midi mid) \
 		$(use_enable pulseaudio pulse) \
+		$(use_enable avahi) \
 		$(use_enable vdpau)
 }