Rename USE cdaudio to USE cdda.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

6 files changed, 23 insertions, 29 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/Manifest b/media-plugins/audacious-plugins/Manifest
index 7c07156e6530..a0da12f0fec5 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.5.1-libmtp-0.3.0-API.patch 1936 RMD160 5a02b522df61e0dc32db13ab18d825ad1289b03f SHA1 1bfe2256f7f30703b39c98e9a3d815d89f22e9f2 SHA256 9e4154cfd8ae19a9525e7c5429ade2f5f049cc263fcb421ebc1ed208baf8d619
 AUX 1.5.1-missing-include.patch 376 RMD160 ae09acafa32c52696d4d8cec79636cfa17eee87e SHA1 fee2cdfeecac269c5ae6c32bf1eaff14de281c13 SHA256 fc91c4cf6b8d70d8a81e5744abdd3c19b6eaf6f76332a6b782e2ecb62389ea59
 AUX 2.0.1-icecast-flawed-vorbis-enum.patch 578 RMD160 297eefc31bb4435a8d19136233aeaeb78d25343a SHA1 b928760a5d9edc56e77a65935cf5bca524b816b9 SHA256 7b9164e054c7e284930ae1ae7bd9a9c1e7d6254af9d35a58fbe8a0965b4d203a
@@ -10,15 +7,8 @@ DIST audacious-plugins-2.0.1.tgz 3505273 RMD160 61c8528f6a2440dbc433aff5ae6849d7
 DIST audacious-plugins-2.1-beta1.tgz 3616603 RMD160 fd47e1016f4590c84f12aa204771aef86f6019f8 SHA1 281c73573faae75c215c23abef7e8adad06402ca SHA256 58d83885b49ee627eb75eb90e1e5cb36d7e9daf07d25a03f63b51b0b55ff9dc3
 DIST audacious-plugins-2.1.tgz 3610509 RMD160 fb73e37b5c05baf376dfbcf9744d96ae85de0d02 SHA1 735c773688e65ee57ce72005a72a53bb7cacc78b SHA256 fe7441e9ee6ab903fa71d21e6ee6b1b2d398567a6618d519cbeb5fa0a6e3a013
 EBUILD audacious-plugins-1.5.1-r3.ebuild 3345 RMD160 5f966da48fdba4bc70ce1feb1dea5836c4969773 SHA1 1c23f90575ac5737893dfe873fd706dbd6b9000b SHA256 031b9a34c94295d868b4165ab6cb788d137aad1d349bf2172478557b77ac7587
-EBUILD audacious-plugins-2.0.1.ebuild 3316 RMD160 0ed8d6aed2bdbb736a7733c334301af712fd2bd2 SHA1 0125f7bdb9211b5e0187921a3eccbf638c814f47 SHA256 701cb5bd842a841a7831540078b8e70b6d44ebb55a0d64595895168349c055aa
-EBUILD audacious-plugins-2.1.ebuild 3322 RMD160 5d646bf6eb2a5730dd78bc49e04c628e73ce7a07 SHA1 f6ad966a2248f332e043a8920be1362bb04feb52 SHA256 bdf79d1ed244bbae4ddcac3d56fdad7868440ebc6a7599486ad60cfd48ea64fd
-EBUILD audacious-plugins-2.1_beta1.ebuild 3327 RMD160 714a68d8542f4b45ea624bedf955ec020e46a915 SHA1 377aabab04b8c9a40bb1d8b8b76f4025e0c25543 SHA256 cf1769fd9a52ce100a8ba9e38fc51c624cc197071d51b46b5a73618b7f7aa702
-MISC ChangeLog 26575 RMD160 060118463be99753e1f4224b84834d58d4e3389a SHA1 38660cfbdc40a71380677fe8dba247feabe860f3 SHA256 4412c574274b5826604561d5e0e892da503bd26644101c3525e6702833742e18
-MISC metadata.xml 995 RMD160 4f335ce5ec797fde2d14288575e8ebe8359c15aa SHA1 2037d8e8601216cf05ff8218ec13ac90d39bd5cb SHA256 5d24a7ec85edfd9a1156b2b3d6745fe125dbef85a26a8f7e7989de862513b0fa
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpSf9cACgkQp5vW4rUFj5r9mQCeMWXmL+ZMcgJ4XkpBIUbd9TGO
-Ln4AoIGuf0ag3vpPtvvuJwGe8zuUBqxC
-=uyt7
------END PGP SIGNATURE-----
+EBUILD audacious-plugins-2.0.1.ebuild 3316 RMD160 1dd8bf74abfec6f9e549bffac681a16d73b2968d SHA1 c5f580ca288082645a6f9106825c3b1cf2c35130 SHA256 424dc69b431395712f61a77a3f44fb1d71f23e65c1261a81674e228d8522a78e
+EBUILD audacious-plugins-2.1.ebuild 3322 RMD160 8042f1475f0054f5e8e44d608deec383f770b27e SHA1 2b90db94c86590906b323bdca9dcf56f9ffd7423 SHA256 52d23a42a74c38742f02af5143f71b549cd57298fad016a97a684003858c02b4
+EBUILD audacious-plugins-2.1_beta1.ebuild 3328 RMD160 b547f68885eeeef55ca30fe278ae3f8a9a980acb SHA1 f7f1e3fcea14016bd638e5432efb8fccf4793b2e SHA256 37038e33677b906886e0266dc1f765efb0e24e7be3195b729a0a2ed437341846
+MISC ChangeLog 26767 RMD160 beb275c6f6e6f74ebcbc1f2fc07a2d7ec8606d9e SHA1 dc893dbb95819999760e2e6310d8c9388689b335 SHA256 abc89c30dfe4c3d48f6003455b900d391e462877248ae9586cac2f257e6e3c03
+MISC metadata.xml 933 RMD160 a101abab026c1c2640b33a6e34d7e462a2e8a77b SHA1 30fc4bbee1c3b44aa8b3d292832932a47d4ce84c SHA256 b71897abce5726f445e94145fa1379b901715c72b8f151615d55296011f2a0fe
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>