Remove musicbrainz support as per bug #140184.

(Portage version: 2.1.1_pre3-r3)

5 files changed, 65 insertions, 67 deletions

diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index a9ee4192c519..16cabbf2f93a 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.216 2006/07/25 10:32:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.217 2006/07/25 10:41:34 flameeyes Exp $
+
+  25 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  kdemultimedia-3.4.3.ebuild, kdemultimedia-3.5.2-r2.ebuild,
+  kdemultimedia-3.5.3.ebuild, kdemultimedia-3.5.3-r1.ebuild:
+  Remove musicbrainz support as per bug #140184.
 
   25 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   -kdemultimedia-3.3.2.ebuild:
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.4.3.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.4.3.ebuild
index 683caab61db8..023a86f83d29 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.4.3.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.4.3.ebuild,v 1.11 2006/04/03 21:08:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.4.3.ebuild,v 1.12 2006/07/25 10:41:34 flameeyes Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE multimedia apps: noatun, kscd, juk..."
 
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="alsa audiofile encode flac gstreamer jack mp3 musicbrainz speex theora vorbis xine"
+IUSE="alsa audiofile encode flac gstreamer jack mp3 speex theora vorbis xine"
 
 DEPEND="~kde-base/kdebase-${PV}
 	media-sound/cdparanoia
@@ -23,15 +23,14 @@ DEPEND="~kde-base/kdebase-${PV}
 	speex? ( media-libs/speex )
 	theora? ( media-libs/libtheora )
 	gstreamer? ( =media-libs/gstreamer-0.8*
-	             =media-libs/gst-plugins-0.8* )
-	>=media-libs/taglib-1.2
-	musicbrainz? ( media-libs/tunepimp media-libs/musicbrainz )"
+				 =media-libs/gst-plugins-0.8* )
+	>=media-libs/taglib-1.2"
 
 RDEPEND="${DEPEND}
 	gstreamer? ( mp3? ( =media-plugins/gst-plugins-mad-0.8* )
-		     vorbis? ( =media-plugins/gst-plugins-ogg-0.8*
-		               =media-plugins/gst-plugins-vorbis-0.8* )
-		     flac? ( =media-plugins/gst-plugins-flac-0.8* ) )"
+			 vorbis? ( =media-plugins/gst-plugins-ogg-0.8*
+					   =media-plugins/gst-plugins-vorbis-0.8* )
+			 flac? ( =media-plugins/gst-plugins-flac-0.8* ) )"
 
 DEPEND="${DEPEND}
 	dev-util/pkgconfig"
@@ -57,7 +56,7 @@ src_compile() {
 		$(use_with vorbis) $(use_with encode lame)
 		$(use_with flac) $(use_with speex)
 		$(use_with mp3 libmad) $(use_with jack)
-		$(use_with xine) $(use_with musicbrainz)"
+		$(use_with xine) --without-musicbrainz"
 
 	kde_src_compile
 }
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.5.2-r2.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.5.2-r2.ebuild
index acd27660903a..cd38612478e8 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.5.2-r2.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.5.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.2-r2.ebuild,v 1.14 2006/07/20 04:20:57 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.2-r2.ebuild,v 1.15 2006/07/25 10:41:34 flameeyes Exp $
 
 inherit kde-dist flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="${SRC_URI}
 DESCRIPTION="KDE multimedia apps: Noatun, KsCD, Juk..."
 
 KEYWORDS="alpha amd64 hppa ~ia64 mips ppc ppc64 sparc x86"
-IUSE="alsa akode audiofile encode flac gstreamer mp3 musicbrainz theora vorbis xine"
+IUSE="alsa akode audiofile encode flac gstreamer mp3 theora vorbis xine"
 
 DEPEND="~kde-base/kdebase-${PV}
 	media-sound/cdparanoia
@@ -21,19 +21,17 @@ DEPEND="~kde-base/kdebase-${PV}
 	alsa? ( media-libs/alsa-lib )
 	theora? ( media-libs/libtheora )
 	gstreamer? ( =media-libs/gstreamer-0.8*
-	             =media-libs/gst-plugins-0.8* )
-	musicbrainz? ( media-libs/tunepimp
-	               media-libs/musicbrainz )
+				 =media-libs/gst-plugins-0.8* )
 	encode? ( mp3? ( media-sound/lame )
-	          vorbis? ( media-sound/vorbis-tools )
-	          flac? ( media-libs/flac ) )
+			  vorbis? ( media-sound/vorbis-tools )
+			  flac? ( media-libs/flac ) )
 	!arts? ( !gstreamer? ( media-libs/akode ) )"
 
 RDEPEND="${DEPEND}
 	gstreamer? ( mp3? ( =media-plugins/gst-plugins-mad-0.8* )
-		     vorbis? ( =media-plugins/gst-plugins-ogg-0.8*
-		               =media-plugins/gst-plugins-vorbis-0.8* )
-		     flac? ( =media-plugins/gst-plugins-flac-0.8* ) )"
+			 vorbis? ( =media-plugins/gst-plugins-ogg-0.8*
+					   =media-plugins/gst-plugins-vorbis-0.8* )
+			 flac? ( =media-plugins/gst-plugins-flac-0.8* ) )"
 
 pkg_setup() {
 	kde_pkg_setup
@@ -44,24 +42,24 @@ pkg_setup() {
 
 src_compile() {
 	local myconf="--with-cdparanoia --with-taglib
-	              --with-akode $(use_with alsa)
-	              $(use_with audiofile) $(use_with gstreamer)
-	              $(use_with xine) $(use_with theora)
-	              $(use_with musicbrainz)"
+				  --with-akode $(use_with alsa)
+				  $(use_with audiofile) $(use_with gstreamer)
+				  $(use_with xine) $(use_with theora)
+				  --without-musicbrainz"
 
 	# encoding can happen through:
 	# - kio_audiocd (based on libflac for flac,
-	#   on libvorbis for vorbis, on the lame binary for mp3)
+	#	on libvorbis for vorbis, on the lame binary for mp3)
 	# - kaudiocreator (based on the flac binary for flac,
-	#   on the lame binary for mp3, on the oggenc binary for vorbis)
+	#	on the lame binary for mp3, on the oggenc binary for vorbis)
 	# - krec (based on libvorbis for vorbis,
-	#   on libmp3lame for mp3)
+	#	on libmp3lame for mp3)
 	if use encode; then
 		myconf="${myconf} $(use_with mp3 lame)
-	                $(use_with vorbis) $(use_with flac)"
+					$(use_with vorbis) $(use_with flac)"
 	else
 		myconf="${myconf} --without-lame
-	                --without-vorbis --without-flac"
+					--without-vorbis --without-flac"
 	fi
 
 	if ! use arts && ! use gstreamer ; then
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.5.3-r1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.5.3-r1.ebuild
index 36bd618e8c6b..52165ac272e2 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.5.3-r1.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.3-r1.ebuild,v 1.1 2006/06/15 00:41:43 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.3-r1.ebuild,v 1.2 2006/07/25 10:41:34 flameeyes Exp $
 
 inherit kde-dist flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="${SRC_URI}
 DESCRIPTION="KDE multimedia apps: Noatun, KsCD, Juk..."
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="akode alsa audiofile encode flac gstreamer mp3 musicbrainz theora vorbis xine"
+IUSE="akode alsa audiofile encode flac gstreamer mp3 theora vorbis xine"
 
 DEPEND="~kde-base/kdebase-${PV}
 	media-sound/cdparanoia
@@ -21,19 +21,17 @@ DEPEND="~kde-base/kdebase-${PV}
 	alsa? ( media-libs/alsa-lib )
 	theora? ( media-libs/libtheora )
 	gstreamer? ( =media-libs/gstreamer-0.8*
-	             =media-libs/gst-plugins-0.8* )
-	musicbrainz? ( media-libs/tunepimp
-	               media-libs/musicbrainz )
+				 =media-libs/gst-plugins-0.8* )
 	encode? ( mp3? ( media-sound/lame )
-	          vorbis? ( media-sound/vorbis-tools )
-	          flac? ( media-libs/flac ) )
+			  vorbis? ( media-sound/vorbis-tools )
+			  flac? ( media-libs/flac ) )
 	!arts? ( !gstreamer? ( media-libs/akode ) )"
 
 RDEPEND="${DEPEND}
 	gstreamer? ( mp3? ( =media-plugins/gst-plugins-mad-0.8* )
-		     vorbis? ( =media-plugins/gst-plugins-ogg-0.8*
-		               =media-plugins/gst-plugins-vorbis-0.8* )
-		     flac? ( =media-plugins/gst-plugins-flac-0.8* ) )"
+			 vorbis? ( =media-plugins/gst-plugins-ogg-0.8*
+					   =media-plugins/gst-plugins-vorbis-0.8* )
+			 flac? ( =media-plugins/gst-plugins-flac-0.8* ) )"
 
 pkg_setup() {
 	kde_pkg_setup
@@ -44,24 +42,24 @@ pkg_setup() {
 
 src_compile() {
 	local myconf="--with-cdparanoia --with-taglib
-	              --with-akode $(use_with alsa)
-	              $(use_with audiofile) $(use_with gstreamer)
-	              $(use_with xine) $(use_with theora)
-	              $(use_with musicbrainz)"
+				  --with-akode $(use_with alsa)
+				  $(use_with audiofile) $(use_with gstreamer)
+				  $(use_with xine) $(use_with theora)
+				  --without-musicbrainz"
 
 	# encoding can happen through:
 	# - kio_audiocd (based on libflac for flac,
-	#   on libvorbis for vorbis, on the lame binary for mp3)
+	#	on libvorbis for vorbis, on the lame binary for mp3)
 	# - kaudiocreator (based on the flac binary for flac,
-	#   on the lame binary for mp3, on the oggenc binary for vorbis)
+	#	on the lame binary for mp3, on the oggenc binary for vorbis)
 	# - krec (based on libvorbis for vorbis,
-	#   on libmp3lame for mp3)
+	#	on libmp3lame for mp3)
 	if use encode; then
 		myconf="${myconf} $(use_with mp3 lame)
-	                $(use_with vorbis) $(use_with flac)"
+					$(use_with vorbis) $(use_with flac)"
 	else
 		myconf="${myconf} --without-lame
-	                --without-vorbis --without-flac"
+					--without-vorbis --without-flac"
 	fi
 
 	if ! use arts && ! use gstreamer ; then
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.5.3.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.5.3.ebuild
index 75d6c62fc809..d42c94755729 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.5.3.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.5.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.3.ebuild,v 1.1 2006/06/02 20:07:29 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.3.ebuild,v 1.2 2006/07/25 10:41:34 flameeyes Exp $
 
 inherit kde-dist flag-o-matic
 
 DESCRIPTION="KDE multimedia apps: Noatun, KsCD, Juk..."
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="akode alsa audiofile encode flac gstreamer mp3 musicbrainz theora vorbis xine"
+IUSE="akode alsa audiofile encode flac gstreamer mp3 theora vorbis xine"
 
 DEPEND="~kde-base/kdebase-${PV}
 	media-sound/cdparanoia
@@ -18,19 +18,17 @@ DEPEND="~kde-base/kdebase-${PV}
 	alsa? ( media-libs/alsa-lib )
 	theora? ( media-libs/libtheora )
 	gstreamer? ( =media-libs/gstreamer-0.8*
-	             =media-libs/gst-plugins-0.8* )
-	musicbrainz? ( media-libs/tunepimp
-	               media-libs/musicbrainz )
+				 =media-libs/gst-plugins-0.8* )
 	encode? ( mp3? ( media-sound/lame )
-	          vorbis? ( media-sound/vorbis-tools )
-	          flac? ( media-libs/flac ) )
+			  vorbis? ( media-sound/vorbis-tools )
+			  flac? ( media-libs/flac ) )
 	!arts? ( !gstreamer? ( media-libs/akode ) )"
 
 RDEPEND="${DEPEND}
 	gstreamer? ( mp3? ( =media-plugins/gst-plugins-mad-0.8* )
-		     vorbis? ( =media-plugins/gst-plugins-ogg-0.8*
-		               =media-plugins/gst-plugins-vorbis-0.8* )
-		     flac? ( =media-plugins/gst-plugins-flac-0.8* ) )"
+			 vorbis? ( =media-plugins/gst-plugins-ogg-0.8*
+					   =media-plugins/gst-plugins-vorbis-0.8* )
+			 flac? ( =media-plugins/gst-plugins-flac-0.8* ) )"
 
 DEPEND="${DEPEND}
 	dev-util/pkgconfig"
@@ -46,24 +44,24 @@ pkg_setup() {
 
 src_compile() {
 	local myconf="--with-cdparanoia --with-taglib
-	              --with-akode $(use_with alsa)
-	              $(use_with audiofile) $(use_with gstreamer)
-	              $(use_with xine) $(use_with theora)
-	              $(use_with musicbrainz)"
+				  --with-akode $(use_with alsa)
+				  $(use_with audiofile) $(use_with gstreamer)
+				  $(use_with xine) $(use_with theora)
+				  --without-musicbrainz"
 
 	# encoding can happen through:
 	# - kio_audiocd (based on libflac for flac,
-	#   on libvorbis for vorbis, on the lame binary for mp3)
+	#	on libvorbis for vorbis, on the lame binary for mp3)
 	# - kaudiocreator (based on the flac binary for flac,
-	#   on the lame binary for mp3, on the oggenc binary for vorbis)
+	#	on the lame binary for mp3, on the oggenc binary for vorbis)
 	# - krec (based on libvorbis for vorbis,
-	#   on libmp3lame for mp3)
+	#	on libmp3lame for mp3)
 	if use encode; then
 		myconf="${myconf} $(use_with mp3 lame)
-	                $(use_with vorbis) $(use_with flac)"
+					$(use_with vorbis) $(use_with flac)"
 	else
 		myconf="${myconf} --without-lame
-	                --without-vorbis --without-flac"
+					--without-vorbis --without-flac"
 	fi
 
 	if ! use arts && ! use gstreamer ; then