--- cmus-2.5.0.ebuild	2013-01-16 10:01:04.826237214 +0200
+++ /tmp/cmus-2.5.0.ebuild	2013-01-16 10:00:34.692239629 +0200
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.5.0.ebuild,v 1.1 2012/11/18 10:55:07 fauli Exp $
 
-EAPI=4
+EAPI=5
 inherit eutils multilib
 
 MY_P=${PN}-v${PV}
@@ -14,15 +14,15 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="aac alsa ao cue cddb cdda discid debug examples flac mad mikmod modplug mp4 musepack oss pidgin pulseaudio unicode vorbis wavpack wma zsh-completion"
+IUSE="aac alsa ao cue cddb cdio discid debug examples flac mad mikmod modplug mp4 musepack oss pidgin pulseaudio unicode vorbis wavpack wma zsh-completion"
 
 CDEPEND="sys-libs/ncurses[unicode?]
 	aac? ( media-libs/faad2 )
 	alsa? ( >=media-libs/alsa-lib-1.0.11 )
-	ao? (  media-libs/libao )
-	cue? (  media-libs/libcue )
-	cddb? (  media-libs/libcddb )
-	cdda? (  dev-libs/libcdio )
+	ao? ( media-libs/libao )
+	cue? ( media-libs/libcue )
+	cddb? ( media-libs/libcddb )
+	cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
 	discid? (  media-libs/libdiscid )
 	flac? ( media-libs/flac )
 	mad? ( >=media-libs/libmad-0.14 )
@@ -43,6 +43,12 @@
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' cdio.c || die
+	fi
+}
+
 my_config() {
 	local value
 	use ${1} && value=a || value=n