Rename USE cdaudio to cdda and cddb.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 19 insertions, 17 deletions

diff --git a/media-sound/decibel-audio-player/ChangeLog b/media-sound/decibel-audio-player/ChangeLog
index 84f24715a6d0..8ab29e5992a0 100644
--- a/media-sound/decibel-audio-player/ChangeLog
+++ b/media-sound/decibel-audio-player/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/decibel-audio-player
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/decibel-audio-player/ChangeLog,v 1.14 2009/07/19 15:19:51 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/decibel-audio-player/ChangeLog,v 1.15 2009/07/22 15:52:29 ssuominen Exp $
+
+  22 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  decibel-audio-player-1.00.ebuild, metadata.xml:
+  Rename USE cdaudio to cdda and cddb.
 
   19 Jul 2009; nixnut <nixnut@gentoo.org> decibel-audio-player-1.00.ebuild:
   ppc stable #273113
diff --git a/media-sound/decibel-audio-player/decibel-audio-player-1.00.ebuild b/media-sound/decibel-audio-player/decibel-audio-player-1.00.ebuild
index b75916439d57..aa83ff15468c 100644
--- a/media-sound/decibel-audio-player/decibel-audio-player-1.00.ebuild
+++ b/media-sound/decibel-audio-player/decibel-audio-player-1.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/decibel-audio-player/decibel-audio-player-1.00.ebuild,v 1.6 2009/07/19 15:19:51 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/decibel-audio-player/decibel-audio-player-1.00.ebuild,v 1.7 2009/07/22 15:52:29 ssuominen Exp $
 
 DESCRIPTION="A GTK+ audio player which aims at being very straightforward to use."
 HOMEPAGE="http://decibel.silent-blade.org"
@@ -9,26 +9,25 @@ SRC_URI="http://decibel.silent-blade.org/uploads/Main/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE="aac cdaudio gnome-keyring libnotify musepack"
+IUSE="aac cdda cddb gnome-keyring libnotify musepack"
 
 RDEPEND="media-libs/mutagen
-		dev-python/dbus-python
-		dev-python/gnome-python
-		dev-python/gst-python
-		>=media-plugins/gst-plugins-meta-0.10-r2
-		aac? ( media-plugins/gst-plugins-faad )
-		cdaudio? ( || ( media-plugins/gst-plugins-cdio
-				media-plugins/gst-plugins-cdparanoia )
-					dev-python/cddb-py )
-		gnome-keyring? ( dev-python/gnome-keyring-python )
-		libnotify? ( dev-python/notify-python )
-		musepack? ( media-plugins/gst-plugins-musepack )"
-
+	dev-python/dbus-python
+	dev-python/gnome-python
+	dev-python/gst-python
+	>=media-plugins/gst-plugins-meta-0.10-r2
+	aac? ( media-plugins/gst-plugins-faad )
+	cdda? ( || ( media-plugins/gst-plugins-cdio
+		media-plugins/gst-plugins-cdparanoia ) )
+	cddb? ( dev-python/cddb-py )
+	gnome-keyring? ( dev-python/gnome-keyring-python )
+	libnotify? ( dev-python/notify-python )
+	musepack? ( media-plugins/gst-plugins-musepack )"
 DEPEND="sys-devel/gettext"
 
 src_install() {
 	emake DESTDIR="${D}" prefix=/usr \
-	install || die "emake install failed"
+		install || die "emake install failed"
 	dodoc doc/ChangeLog || die "dodoc failed"
 }
 
diff --git a/media-sound/decibel-audio-player/metadata.xml b/media-sound/decibel-audio-player/metadata.xml
index d64a2d14962f..96d62e65afb6 100644
--- a/media-sound/decibel-audio-player/metadata.xml
+++ b/media-sound/decibel-audio-player/metadata.xml
@@ -15,7 +15,6 @@
 		by means of a very clean and user friendly interface.
 	</longdescription>
   <use>
-    <flag name="cdaudio">Adds support for CD audio playback and lookups via CDDB.</flag>
     <flag name="gnome-keyring">Adds support for storing your Last.fm password using gnome-keyring.</flag>
   </use>
 </pkgmetadata>