Rename USE cdaudio to USE cdda.

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

5 files changed, 18 insertions, 14 deletions

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index d20973607f3c..6af6acf208a7 100644
--- a/media-plugins/audacious-plugins/ChangeLog
+++ b/media-plugins/audacious-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/audacious-plugins
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.125 2009/07/06 22:50:52 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.126 2009/07/22 16:04:13 ssuominen Exp $
+
+  22 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  audacious-plugins-2.0.1.ebuild, audacious-plugins-2.1_beta1.ebuild,
+  audacious-plugins-2.1.ebuild:
+  Rename USE cdaudio to USE cdda.
 
 *audacious-plugins-2.1 (06 Jul 2009)
 
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.0.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.0.1.ebuild
index c04db91edc26..ceb23c79d734 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-2.0.1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-2.0.1.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-plugins/audacious-plugins/audacious-plugins-2.0.1.ebuild,v 1.5 2009/06/22 21:04:59 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.0.1.ebuild,v 1.6 2009/07/22 16:04:13 ssuominen Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,7 +13,7 @@ SRC_URI="http://distfiles.atheme.org/${MY_P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="adplug alsa cdaudio esd flac gnome icecast ipv6 jack lirc mp3 mtp musepack
+IUSE="adplug alsa cdda esd flac gnome icecast ipv6 jack lirc mp3 mtp musepack
 nls oss projectm pulseaudio scrobbler sdl sid sndfile sse2 timidity tta vorbis wavpack wma"
 
 RDEPEND="app-arch/unzip
@@ -24,7 +24,7 @@ RDEPEND="app-arch/unzip
 	>=x11-libs/gtk+-2.14
 	adplug? ( >=dev-cpp/libbinio-1.4 )
 	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	cdaudio? ( >=media-libs/libcddb-1.2.1
+	cdda? ( >=media-libs/libcddb-1.2.1
 		>=dev-libs/libcdio-0.79-r1 )
 	esd? ( >=media-sound/esound-0.2.38-r1 )
 	flac? ( >=media-libs/libvorbis-1.0
@@ -82,7 +82,7 @@ src_compile() {
 		$(use_enable adplug) \
 		$(use_enable alsa) \
 		$(use_enable alsa bluetooth) \
-		$(use_enable cdaudio) \
+		$(use_enable cdda cdaudio) \
 		$(use_enable esd) \
 		$(use_enable flac flacng) \
 		$(use_enable flac filewriter_flac) \
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.1.ebuild
index 863ad3dbe110..f1c07bbe2a3b 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-2.1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-2.1.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-plugins/audacious-plugins/audacious-plugins-2.1.ebuild,v 1.1 2009/07/06 22:50:52 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.1.ebuild,v 1.2 2009/07/22 16:04:13 ssuominen Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,7 +13,7 @@ SRC_URI="http://distfiles.atheme.org/${MY_P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="adplug alsa bs2b cdaudio esd flac gnome icecast ipv6 jack lirc mp3 mtp musepack
+IUSE="adplug alsa bs2b cdda esd flac gnome icecast ipv6 jack lirc mp3 mtp musepack
 nls oss projectm pulseaudio scrobbler sdl sid sndfile sse2 timidity tta vorbis wavpack wma"
 
 RDEPEND="app-arch/unzip
@@ -25,7 +25,7 @@ RDEPEND="app-arch/unzip
 	adplug? ( >=dev-cpp/libbinio-1.4 )
 	alsa? ( >=media-libs/alsa-lib-1.0.16 )
 	bs2b? ( media-libs/libbs2b )
-	cdaudio? ( >=media-libs/libcddb-1.2.1
+	cdda? ( >=media-libs/libcddb-1.2.1
 		>=dev-libs/libcdio-0.79-r1 )
 	esd? ( >=media-sound/esound-0.2.38-r1 )
 	flac? ( >=media-libs/libvorbis-1.0
@@ -78,7 +78,7 @@ src_compile() {
 		$(use_enable alsa) \
 		$(use_enable alsa bluetooth) \
 		$(use_enable bs2b) \
-		$(use_enable cdaudio) \
+		$(use_enable cdda cdaudio) \
 		$(use_enable esd) \
 		$(use_enable flac flacng) \
 		$(use_enable flac filewriter_flac) \
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.1_beta1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.1_beta1.ebuild
index cd67d6c11838..a50c1d63677e 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-2.1_beta1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-2.1_beta1.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-plugins/audacious-plugins/audacious-plugins-2.1_beta1.ebuild,v 1.2 2009/07/03 08:22:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.1_beta1.ebuild,v 1.3 2009/07/22 16:04:13 ssuominen Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,7 +13,7 @@ SRC_URI="http://distfiles.atheme.org/${MY_P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="adplug alsa bs2b cdaudio esd flac gnome icecast ipv6 jack lirc mp3 mtp musepack
+IUSE="adplug alsa bs2b cdda esd flac gnome icecast ipv6 jack lirc mp3 mtp musepack
 nls oss projectm pulseaudio scrobbler sdl sid sndfile sse2 timidity tta vorbis wavpack wma"
 
 RDEPEND="app-arch/unzip
@@ -25,7 +25,7 @@ RDEPEND="app-arch/unzip
 	adplug? ( >=dev-cpp/libbinio-1.4 )
 	alsa? ( >=media-libs/alsa-lib-1.0.16 )
 	bs2b? ( media-libs/libbs2b )
-	cdaudio? ( >=media-libs/libcddb-1.2.1
+	cdda? ( >=media-libs/libcddb-1.2.1
 		>=dev-libs/libcdio-0.79-r1 )
 	esd? ( >=media-sound/esound-0.2.38-r1 )
 	flac? ( >=media-libs/libvorbis-1.0
@@ -78,7 +78,7 @@ src_compile() {
 		$(use_enable alsa) \
 		$(use_enable alsa bluetooth) \
 		$(use_enable bs2b) \
-		$(use_enable cdaudio) \
+		$(use_enable cdda cdaudio) \
 		$(use_enable esd) \
 		$(use_enable flac flacng) \
 		$(use_enable flac filewriter_flac) \
diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index badbdcdc18dd..df7ad2cb4878 100644
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/metadata.xml
@@ -11,7 +11,6 @@
 		support</flag>
 	<flag name='bs2b'>Enable Bauer Bauer stereophonic-to-binaural
 		headphone filter</flag>
-	<flag name='cdaudio'>Enable cd audio playback support</flag>
 	<flag name='chardet'>Try to handle non-UTF8 chinese/japanese/korean ID3
 		tags</flag>
 	<flag name='icecast'>Support for Icecast2 streaming</flag>