Remove musicbrainz support as per bug #140184.

(Portage version: 2.1.1_pre3-r3)

5 files changed, 29 insertions, 33 deletions

diff --git a/kde-base/juk/ChangeLog b/kde-base/juk/ChangeLog
index 1ccd87a278a1..d10808ef4e95 100644
--- a/kde-base/juk/ChangeLog
+++ b/kde-base/juk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/juk
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/ChangeLog,v 1.61 2006/07/25 02:54:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/ChangeLog,v 1.62 2006/07/25 10:46:10 flameeyes Exp $
+
+  25 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> juk-3.4.3.ebuild,
+  juk-3.5.2-r1.ebuild, juk-3.5.3.ebuild, juk-3.5.4.ebuild:
+  Remove musicbrainz support as per bug #140184.
 
 *juk-3.5.4 (25 Jul 2006)
 
diff --git a/kde-base/juk/juk-3.4.3.ebuild b/kde-base/juk/juk-3.4.3.ebuild
index 44501f293553..9364c553c052 100644
--- a/kde-base/juk/juk-3.4.3.ebuild
+++ b/kde-base/juk/juk-3.4.3.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/juk/juk-3.4.3.ebuild,v 1.10 2006/06/22 12:52:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-3.4.3.ebuild,v 1.11 2006/07/25 10:46:11 flameeyes Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -9,20 +9,18 @@ inherit kde-meta eutils
 
 DESCRIPTION="Jukebox and music manager for KDE"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="flac gstreamer mp3 vorbis musicbrainz"
+IUSE="flac gstreamer mp3 vorbis"
 
 DEPEND="media-libs/taglib
-	musicbrainz? ( 	media-libs/tunepimp
-			media-libs/musicbrainz )
 	gstreamer? ( =media-libs/gstreamer-0.8*
-	             =media-libs/gst-plugins-0.8* )
+				 =media-libs/gst-plugins-0.8* )
 	$(deprange $PV $MAXKDEVER kde-base/akode)"
 
 RDEPEND="${DEPEND}
 	gstreamer? ( mp3? ( =media-plugins/gst-plugins-mad-0.8* )
-		     vorbis? ( =media-plugins/gst-plugins-ogg-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* ) )"
+			 flac? ( =media-plugins/gst-plugins-flac-0.8* ) )"
 
 PATCHES="$FILESDIR/configure-fix-kdemultimedia-juk.patch"
 
@@ -39,6 +37,6 @@ pkg_setup() {
 }
 
 src_compile() {
-	myconf="$myconf $(use_with gstreamer) $(use_with musicbrainz)"
+	myconf="$myconf $(use_with gstreamer) --without-musicbrainz"
 	kde-meta_src_compile
 }
diff --git a/kde-base/juk/juk-3.5.2-r1.ebuild b/kde-base/juk/juk-3.5.2-r1.ebuild
index 1f1f7e9eeb5b..8be7bf0734ee 100644
--- a/kde-base/juk/juk-3.5.2-r1.ebuild
+++ b/kde-base/juk/juk-3.5.2-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/juk/juk-3.5.2-r1.ebuild,v 1.11 2006/06/15 00:29:12 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-3.5.2-r1.ebuild,v 1.12 2006/07/25 10:46:11 flameeyes Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -12,21 +12,19 @@ SRC_URI="${SRC_URI}
 
 DESCRIPTION="Jukebox and music manager for KDE"
 KEYWORDS="alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="akode flac gstreamer mp3 vorbis musicbrainz"
+IUSE="akode flac gstreamer mp3 vorbis"
 
 DEPEND="media-libs/taglib
-	musicbrainz? ( 	media-libs/tunepimp
-			media-libs/musicbrainz )
 	gstreamer? ( =media-libs/gstreamer-0.8*
-	             =media-libs/gst-plugins-0.8* )
+				 =media-libs/gst-plugins-0.8* )
 	akode? ( media-libs/akode )
 	!arts? ( !gstreamer? ( media-libs/akode ) )"
 
 RDEPEND="${DEPEND}
 	gstreamer? ( mp3? ( =media-plugins/gst-plugins-mad-0.8* )
-		     vorbis? ( =media-plugins/gst-plugins-ogg-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* ) )"
+			 flac? ( =media-plugins/gst-plugins-flac-0.8* ) )"
 
 KMEXTRACTONLY="arts/configure.in.in"
 
@@ -38,7 +36,7 @@ pkg_setup() {
 }
 
 src_compile() {
-	local myconf="$(use_with gstreamer) $(use_with musicbrainz)"
+	local myconf="$(use_with gstreamer) --without-musicbrainz"
 
 	if ! use arts && ! use gstreamer ; then
 		myconf="${myconf} --with-akode"
diff --git a/kde-base/juk/juk-3.5.3.ebuild b/kde-base/juk/juk-3.5.3.ebuild
index 45280037b81b..02d96507e12d 100644
--- a/kde-base/juk/juk-3.5.3.ebuild
+++ b/kde-base/juk/juk-3.5.3.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/juk/juk-3.5.3.ebuild,v 1.4 2006/06/15 00:29:12 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-3.5.3.ebuild,v 1.5 2006/07/25 10:46:10 flameeyes Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -12,21 +12,19 @@ SRC_URI="${SRC_URI}
 
 DESCRIPTION="Jukebox and music manager for KDE."
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="akode flac gstreamer mp3 vorbis musicbrainz"
+IUSE="akode flac gstreamer mp3 vorbis"
 
 DEPEND="media-libs/taglib
-	musicbrainz? ( 	media-libs/tunepimp
-			media-libs/musicbrainz )
 	gstreamer? ( =media-libs/gstreamer-0.8*
-	             =media-libs/gst-plugins-0.8* )
+				 =media-libs/gst-plugins-0.8* )
 	akode? ( media-libs/akode )
 	!arts? ( !gstreamer? ( media-libs/akode ) )"
 
 RDEPEND="${DEPEND}
 	gstreamer? ( mp3? ( =media-plugins/gst-plugins-mad-0.8* )
-		     vorbis? ( =media-plugins/gst-plugins-ogg-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* ) )"
+			 flac? ( =media-plugins/gst-plugins-flac-0.8* ) )"
 
 KMEXTRACTONLY="arts/configure.in.in"
 
@@ -38,7 +36,7 @@ pkg_setup() {
 }
 
 src_compile() {
-	local myconf="$(use_with gstreamer) $(use_with musicbrainz)"
+	local myconf="$(use_with gstreamer) --without-musicbrainz"
 
 	if ! use arts && ! use gstreamer ; then
 		myconf="${myconf} --with-akode"
diff --git a/kde-base/juk/juk-3.5.4.ebuild b/kde-base/juk/juk-3.5.4.ebuild
index 04c07458c9d4..c032c8606864 100644
--- a/kde-base/juk/juk-3.5.4.ebuild
+++ b/kde-base/juk/juk-3.5.4.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/juk/juk-3.5.4.ebuild,v 1.1 2006/07/25 02:54:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-3.5.4.ebuild,v 1.2 2006/07/25 10:46:10 flameeyes Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -12,21 +12,19 @@ SRC_URI="${SRC_URI}
 
 DESCRIPTION="Jukebox and music manager for KDE."
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="akode flac gstreamer mp3 vorbis musicbrainz"
+IUSE="akode flac gstreamer mp3 vorbis"
 
 DEPEND="media-libs/taglib
-	musicbrainz? ( 	media-libs/tunepimp
-			media-libs/musicbrainz )
 	gstreamer? ( =media-libs/gstreamer-0.8*
-	             =media-libs/gst-plugins-0.8* )
+				 =media-libs/gst-plugins-0.8* )
 	akode? ( media-libs/akode )
 	!arts? ( !gstreamer? ( media-libs/akode ) )"
 
 RDEPEND="${DEPEND}
 	gstreamer? ( mp3? ( =media-plugins/gst-plugins-mad-0.8* )
-		     vorbis? ( =media-plugins/gst-plugins-ogg-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* ) )"
+			 flac? ( =media-plugins/gst-plugins-flac-0.8* ) )"
 
 KMEXTRACTONLY="arts/configure.in.in"
 
@@ -38,7 +36,7 @@ pkg_setup() {
 }
 
 src_compile() {
-	local myconf="$(use_with gstreamer) $(use_with musicbrainz)"
+	local myconf="$(use_with gstreamer) --without-musicbrainz"
 
 	if ! use arts && ! use gstreamer ; then
 		myconf="${myconf} --with-akode"