Remove cddb use flag, force rdep of cd-discid

Package-Manager: portage-2.1.2.12

4 files changed, 23 insertions, 19 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/Manifest b/media-sound/abcde/Manifest
index 5e8b14d9af81..59269d65abc1 100644
--- a/media-sound/abcde/Manifest
+++ b/media-sound/abcde/Manifest
@@ -5,22 +5,22 @@ EBUILD abcde-2.3.0.ebuild 925 RMD160 28dafc8f6b97d4a28a065dab317f4dcf9c75c0f5 SH
 MD5 3d388abac62a54d38c93625b33711084 abcde-2.3.0.ebuild 925
 RMD160 28dafc8f6b97d4a28a065dab317f4dcf9c75c0f5 abcde-2.3.0.ebuild 925
 SHA256 a0c5ad396bd1a4c0b074a206d9721a350be2917c0c82ea84ef00c1fc9d9428d4 abcde-2.3.0.ebuild 925
-EBUILD abcde-2.3.3-r1.ebuild 1158 RMD160 4c648ffc880f7538d8cd9c8a5afd86122381fec3 SHA1 3184ab637bd54c95c495bdc74389aaa46b0f6088 SHA256 4f629c34d545882c8a1b5a4d4469c8ff8a0b77522537b7eff1234d01469900ab
-MD5 f81716a37e79ad8edddf465bc1c46e8e abcde-2.3.3-r1.ebuild 1158
-RMD160 4c648ffc880f7538d8cd9c8a5afd86122381fec3 abcde-2.3.3-r1.ebuild 1158
-SHA256 4f629c34d545882c8a1b5a4d4469c8ff8a0b77522537b7eff1234d01469900ab abcde-2.3.3-r1.ebuild 1158
+EBUILD abcde-2.3.3-r1.ebuild 1143 RMD160 17da824220afc0ab01d6df20cee57614da2b5a5a SHA1 a69c0c694f5d2d289ca0aaf4f166169a808f149e SHA256 835cb96fe6925c0055e66d350362889093c3440d09fd33b64f67bb27f06c0a64
+MD5 5323b2476cfa6eab3b1ab429fc11c33d abcde-2.3.3-r1.ebuild 1143
+RMD160 17da824220afc0ab01d6df20cee57614da2b5a5a abcde-2.3.3-r1.ebuild 1143
+SHA256 835cb96fe6925c0055e66d350362889093c3440d09fd33b64f67bb27f06c0a64 abcde-2.3.3-r1.ebuild 1143
 EBUILD abcde-2.3.3.ebuild 931 RMD160 6fa9563a0285f715cf54ab0c79b7be766e36de6c SHA1 47a7e31760b7d49a5106c3aac57d8723ca45dcb3 SHA256 7ba6c2af7d19b9e0c49a45f3e97b59f5ef184f08af432da2b0bc771c12704f1a
 MD5 708bcfebc126980f93c56c3cf6324525 abcde-2.3.3.ebuild 931
 RMD160 6fa9563a0285f715cf54ab0c79b7be766e36de6c abcde-2.3.3.ebuild 931
 SHA256 7ba6c2af7d19b9e0c49a45f3e97b59f5ef184f08af432da2b0bc771c12704f1a abcde-2.3.3.ebuild 931
-EBUILD abcde-2.3.99.7_p235.ebuild 1278 RMD160 2feab3dcff0c92a2309a3b064e8eb60b10265768 SHA1 7f6babc1b5d685a3cde28286552ce2f348752896 SHA256 469ab9ba43096172cbc9880de98286c5aacdca749c6286a6c5bca8d37c780f87
-MD5 1194936caf0ea954d5714601ff07b0da abcde-2.3.99.7_p235.ebuild 1278
-RMD160 2feab3dcff0c92a2309a3b064e8eb60b10265768 abcde-2.3.99.7_p235.ebuild 1278
-SHA256 469ab9ba43096172cbc9880de98286c5aacdca749c6286a6c5bca8d37c780f87 abcde-2.3.99.7_p235.ebuild 1278
-MISC ChangeLog 4993 RMD160 0ba49f73363b9934f6076e45325d182bab922e20 SHA1 35f3568dfdac57c7c6aebebbd76e91dd78313c23 SHA256 a85cc833cfdafb117f234e937ba2d9818c97067129c3a9fa20a72d99a992e047
-MD5 70db880bfe89e13c211f03735587652e ChangeLog 4993
-RMD160 0ba49f73363b9934f6076e45325d182bab922e20 ChangeLog 4993
-SHA256 a85cc833cfdafb117f234e937ba2d9818c97067129c3a9fa20a72d99a992e047 ChangeLog 4993
+EBUILD abcde-2.3.99.7_p235.ebuild 1263 RMD160 60ed4e43134c582980fb90258c35dcc406100ecc SHA1 578fe11d63ad2a370aae66ead03b46ade582d390 SHA256 6ab9e6640e6e82f82b50c45c7a648c6589c5d1558560bf943cc3b5b7a5904599
+MD5 e8ed86ac3d15c9211c019fbc07d34e88 abcde-2.3.99.7_p235.ebuild 1263
+RMD160 60ed4e43134c582980fb90258c35dcc406100ecc abcde-2.3.99.7_p235.ebuild 1263
+SHA256 6ab9e6640e6e82f82b50c45c7a648c6589c5d1558560bf943cc3b5b7a5904599 abcde-2.3.99.7_p235.ebuild 1263
+MISC ChangeLog 5142 RMD160 ff4559b33267dd84abc636507dd142bd94279241 SHA1 469e76009d473236ddfb3727e549533af26964e9 SHA256 294a0ac85195faacd7e24ad13acea68f60fcc116b0780ad0cb5ed781c9b5026f
+MD5 e021263e89b9c1a9586ec02c1b9e993a ChangeLog 5142
+RMD160 ff4559b33267dd84abc636507dd142bd94279241 ChangeLog 5142
+SHA256 294a0ac85195faacd7e24ad13acea68f60fcc116b0780ad0cb5ed781c9b5026f ChangeLog 5142
 MISC metadata.xml 243 RMD160 693f36422c8251651bd970498665405c5ff6a83e SHA1 fbdf80643026371a2c5e0a7799a0828e83dcf967 SHA256 283fea710add79d3661bc5de8979ea578278de73410f2fab7e7ab4418b669bd5
 MD5 681a4a2f3b7b654966ddd677b5f246bb metadata.xml 243
 RMD160 693f36422c8251651bd970498665405c5ff6a83e metadata.xml 243
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 )