Remove cddb use flag, force rdep of cd-discid

(Portage version: 2.1.2.12)

3 files changed, 11 insertions, 7 deletions

diff --git a/media-sound/abcde/ChangeLog b/media-sound/abcde/ChangeLog
index e9b2b1fffa7b..5534ca474b24 100644
--- a/media-sound/abcde/ChangeLog
+++ b/media-sound/abcde/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/abcde
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/ChangeLog,v 1.32 2007/07/24 15:05:41 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/ChangeLog,v 1.33 2007/08/30 01:44:49 beandog Exp $
+
+  29 Aug 2007; Steve Dibb <beandog@gentoo.org> abcde-2.3.3-r1.ebuild,
+  abcde-2.3.99.7_p235.ebuild:
+  Remove cddb use flag, force rdep of cd-discid
 
 *abcde-2.3.99.7_p235 (24 Jul 2007)
 
diff --git a/media-sound/abcde/abcde-2.3.3-r1.ebuild b/media-sound/abcde/abcde-2.3.3-r1.ebuild
index 8c6d41f8e133..7197a3367547 100644
--- a/media-sound/abcde/abcde-2.3.3-r1.ebuild
+++ b/media-sound/abcde/abcde-2.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.3.3-r1.ebuild,v 1.1 2007/07/13 01:34:46 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.3.3-r1.ebuild,v 1.2 2007/08/30 01:44:49 beandog Exp $
 
 DESCRIPTION="A Better CD Encoder"
 HOMEPAGE="http://www.hispalinux.es/~data/abcde.php"
@@ -9,7 +9,7 @@ SRC_URI="http://www.hispalinux.es/~data/files/${PN}_${PV}.orig.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cdparanoia id3 vorbis flac cddb speex lame musepack replaygain"
+IUSE="cdparanoia id3 vorbis flac speex lame musepack replaygain"
 
 RDEPEND="
 	>=media-sound/normalize-0.7.4
@@ -17,10 +17,10 @@ RDEPEND="
 		>=media-sound/id3-0.12
 		media-sound/id3v2
 	)
+	media-sound/cd-discid
 	cdparanoia? ( media-sound/cdparanoia )
 	vorbis? ( media-sound/vorbis-tools )
 	flac? ( media-libs/flac )
-	cddb? ( media-sound/cd-discid )
 	speex? ( media-libs/speex )
 	lame? ( media-sound/lame )
 	musepack? ( media-sound/mppenc )
diff --git a/media-sound/abcde/abcde-2.3.99.7_p235.ebuild b/media-sound/abcde/abcde-2.3.99.7_p235.ebuild
index 41e4d198344e..d0d8e666fd30 100644
--- a/media-sound/abcde/abcde-2.3.99.7_p235.ebuild
+++ b/media-sound/abcde/abcde-2.3.99.7_p235.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.3.99.7_p235.ebuild,v 1.1 2007/07/24 15:05:41 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.3.99.7_p235.ebuild,v 1.2 2007/08/30 01:44:49 beandog Exp $
 
 DESCRIPTION="A Better CD Encoder"
 HOMEPAGE="http://www.hispalinux.es/~data/abcde.php"
@@ -12,7 +12,7 @@ S=${WORKDIR}/${MY_PV}
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="aac cdparanoia id3 vorbis flac cddb speex lame musepack replaygain"
+IUSE="aac cdparanoia id3 vorbis flac speex lame musepack replaygain"
 
 RDEPEND="
 	>=media-sound/normalize-0.7.4
@@ -20,12 +20,12 @@ RDEPEND="
 		>=media-sound/id3-0.12
 		media-sound/id3v2
 	)
+	media-sound/cd-discid
 	virtual/eject
 	aac? ( media-libs/faac )
 	cdparanoia? ( media-sound/cdparanoia )
 	vorbis? ( media-sound/vorbis-tools )
 	flac? ( media-libs/flac )
-	cddb? ( media-sound/cd-discid )
 	speex? ( media-libs/speex )
 	lame? ( media-sound/lame )
 	musepack? ( media-sound/mppenc )