--- /usr/portage/media-video/mplayer/mplayer-1.0.20070622-r1.ebuild	2007-07-12 05:05:54.000000000 +0200
+++ /usr/local/portage/media-video/mplayer/mplayer-1.0.20070622-r1.ebuild	2007-07-28 20:03:16.000000000 +0200
@@ -6,7 +6,7 @@
 
 RESTRICT="strip"
 IUSE="3dnow 3dnowext a52 aac aalib alsa altivec amrnb amrwb arts bidi bl bindist
-cddb cpudetection custom-cflags debug dga doc dts dvb cdparanoia directfb dvd
+cddb cpudetection custom-cflags debug dga doc dts dvb cdio cdparanoia directfb dvd
 dvdnav dv enca encode esd fbcon ftp gif ggi gtk iconv ipv6 ivtv jack joystick
 jpeg libcaca lirc live livecd lzo mad md5sum mmx mmxext mp2 mp3 musepack nas
 unicode vorbis opengl openal oss png pnm quicktime radio rar real rtc samba sdl
@@ -54,6 +54,7 @@
 	arts? ( kde-base/arts )
 	openal? ( media-libs/openal )
 	bidi? ( dev-libs/fribidi )
+	cdio? ( dev-libs/libcdio )
 	cdparanoia? ( media-sound/cdparanoia )
 	directfb? ( dev-libs/DirectFB )
 	dts? ( media-libs/libdts )
@@ -196,21 +197,29 @@
 src_compile() {
 
 	local myconf=" --disable-tv-bsdbt848 \
-		--disable-faad-external \
-		--disable-libcdio"
+		--disable-faad-external"
 
 	# MPlayer reads in the LINGUAS variable from make.conf, and sets
 	# the languages accordingly.  Some will have to be altered to match
 	# upstream's naming scheme.
 	[[ -n $LINGUAS ]] && LINGUAS=${LINGUAS/da/dk}
 
+	# libcdio support: prefer libcdio over cdparanoia
+	if use cdio; then
+		myconf="${myconf} --disable-cdparanoia"
+	else
+		myconf="${myconf} --disable-libcdio"
+		use cdparanoia || myconf="${myconf} --disable-cdparanoia"
+		
+		# always enable cddb when compiling with libcdio
+		use cddb || myconf="${myconf} --disable-cddb"
+	fi
+
 	################
 	#Optional features#
 	###############
 	use bidi || myconf="${myconf} --disable-fribidi"
 	use bl && myconf="${myconf} --enable-bl"
-	use cddb || myconf="${myconf} --disable-cddb"
-	use cdparanoia || myconf="${myconf} --disable-cdparanoia"
 	use enca || myconf="${myconf} --disable-enca"
 	use ftp || myconf="${myconf} --disable-ftp"
 	use tivo || myconf="${myconf} --disable-vstream"