Remove musicbrainz support as per bug #140184.

(Portage version: 2.1.1_pre3-r3)

5 files changed, 37 insertions, 37 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index ed15989f0024..333ab2afefd5 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.152 2006/07/20 17:59:01 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.153 2006/07/25 08:12:36 flameeyes Exp $
+
+  25 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.3.8.ebuild,
+  amarok-1.4.0a-r1.ebuild, amarok-1.4.1-r1.ebuild, amarok-1.4.1-r2.ebuild:
+  Remove musicbrainz support as per bug #140184.
 
   20 Jul 2006; Markus Rothe <corsair@gentoo.org> amarok-1.4.1-r2.ebuild:
   Added ~ppc64; bug #140243
diff --git a/media-sound/amarok/amarok-1.3.8.ebuild b/media-sound/amarok/amarok-1.3.8.ebuild
index 3854c2dfe44f..5f72800529f7 100644
--- a/media-sound/amarok/amarok-1.3.8.ebuild
+++ b/media-sound/amarok/amarok-1.3.8.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/media-sound/amarok/amarok-1.3.8.ebuild,v 1.10 2006/05/28 16:16:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.3.8.ebuild,v 1.11 2006/07/25 08:12:36 flameeyes Exp $
 
 LANGS="az be bg br ca cs cy da de el en_GB eo es et fi fr ga gl he hi hr hu id is it ja ko ku lo lt nb nds nl nn pa pl pt pt_BR ro ru se sl sq sr sr@Latn ss sv ta tg th tr uk uz zh_CN zh_TW"
 LANGS_DOC="da de et fr it nl pt pt_BR ru sv"
@@ -20,31 +20,30 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="arts flac gstreamer kde mp3 mysql noamazon opengl postgres xine xmms
-visualization vorbis musicbrainz"
+visualization vorbis"
 # kde: enables compilation of the konqueror sidebar plugin and brings in
 # kioslaves for audiocd support
 
 DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase )
 		|| ( kde-base/kdemultimedia-kioslaves kde-base/kdemultimedia ) )
 	arts? ( kde-base/arts
-	        || ( kde-base/kdemultimedia-arts kde-base/kdemultimedia ) )
+			|| ( kde-base/kdemultimedia-arts kde-base/kdemultimedia ) )
 	xine? ( >=media-libs/xine-lib-1_rc4 )
 	gstreamer? ( =media-libs/gstreamer-0.8*
-	             =media-libs/gst-plugins-0.8* )
-	musicbrainz? ( =media-libs/tunepimp-0.3* )
+				 =media-libs/gst-plugins-0.8* )
 	>=media-libs/taglib-1.4
 	mysql? ( >=dev-db/mysql-4.0.16 )
 	postgres? ( dev-db/postgresql )
 	opengl? ( virtual/opengl )
 	xmms? ( >=media-sound/xmms-1.2 )
 	visualization? ( media-libs/libsdl
-	                 =media-plugins/libvisual-plugins-0.2* )"
+					 =media-plugins/libvisual-plugins-0.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-0.9.0"
@@ -79,14 +78,14 @@ src_compile() {
 
 	# Extra, unsupported engines are forcefully disabled.
 	local myconf="$(use_with arts) $(use_with xine) $(use_with gstreamer)
-	              $(use_enable mysql) $(use_enable postgres postgresql)
-	              $(use_with opengl) $(use_with xmms)
-	              $(use_with visualization libvisual)
-	              $(use_enable !noamazon amazon)
-	              $(use_with musicbrainz)
-	              --without-helix
-	              --without-mas
-	              --without-nmm"
+				  $(use_enable mysql) $(use_enable postgres postgresql)
+				  $(use_with opengl) $(use_with xmms)
+				  $(use_with visualization libvisual)
+				  $(use_enable !noamazon amazon)
+				  --without-musicbrainz
+				  --without-helix
+				  --without-mas
+				  --without-nmm"
 
 	kde_src_compile
 }
diff --git a/media-sound/amarok/amarok-1.4.0a-r1.ebuild b/media-sound/amarok/amarok-1.4.0a-r1.ebuild
index ec0150c1036e..76bb65028bae 100644
--- a/media-sound/amarok/amarok-1.4.0a-r1.ebuild
+++ b/media-sound/amarok/amarok-1.4.0a-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/media-sound/amarok/amarok-1.4.0a-r1.ebuild,v 1.5 2006/07/18 17:53:33 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.0a-r1.ebuild,v 1.6 2006/07/25 08:12:36 flameeyes Exp $
 
 LANGS="az bg br ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it ja km
 ko lt nb nl nn pa pl pt pt_BR ro ru rw sl sr sr@Latn sv ta tg th tr uk uz
@@ -32,19 +32,18 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="aac exscalibar flac kde mysql noamazon opengl postgres
-xmms visualization musicbrainz ipod ifp real"
+xmms visualization ipod ifp real"
 # kde: enables compilation of the konqueror sidebar plugin
 
 DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
 	>=media-libs/xine-lib-1_rc4
-	musicbrainz? ( >=media-libs/tunepimp-0.3 )
 	>=media-libs/taglib-1.4
 	mysql? ( >=dev-db/mysql-4.0.16 )
 	postgres? ( dev-db/postgresql )
 	opengl? ( virtual/opengl )
 	xmms? ( >=media-sound/xmms-1.2 )
 	visualization? ( media-libs/libsdl
-	                 =media-plugins/libvisual-plugins-0.2* )
+					 =media-plugins/libvisual-plugins-0.2* )
 	ipod? ( media-libs/libgpod )
 	aac? ( media-libs/libmp4v2 )
 	exscalibar? ( media-libs/exscalibar )
@@ -66,18 +65,18 @@ src_compile() {
 
 	# Extra, unsupported engines are forcefully disabled.
 	local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
-	              $(use_with opengl) $(use_with xmms)
-	              $(use_with visualization libvisual)
-	              $(use_enable !noamazon amazon)
-	              $(use_with musicbrainz)
-	              $(use_with exscalibar)
+				  $(use_with opengl) $(use_with xmms)
+				  $(use_with visualization libvisual)
+				  $(use_enable !noamazon amazon)
+				  $(use_with exscalibar)
 				  $(use_with ipod libgpod)
 				  $(use_with aac mp4v2)
 				  $(use_with ifp)
 				  $(use_with real helix)
+				  --without-musicbrainz
 				  --with-xine
-	              --without-mas
-	              --without-nmm"
+				  --without-mas
+				  --without-nmm"
 
 	kde_src_compile
 }
diff --git a/media-sound/amarok/amarok-1.4.1-r1.ebuild b/media-sound/amarok/amarok-1.4.1-r1.ebuild
index 3382858371b2..515f6d5050ae 100644
--- a/media-sound/amarok/amarok-1.4.1-r1.ebuild
+++ b/media-sound/amarok/amarok-1.4.1-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/media-sound/amarok/amarok-1.4.1-r1.ebuild,v 1.2 2006/07/03 19:37:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.1-r1.ebuild,v 1.3 2006/07/25 08:12:36 flameeyes Exp $
 
 LANGS="az bg br ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it ja ka
 km ko lt ms nb nl nn pa pl pt pt_BR ro ru rw sl sr sr@Latn sv ta tg th tr uk uz
@@ -28,12 +28,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="aac kde mysql noamazon opengl postgres
-xmms visualization musicbrainz ipod ifp real"
+xmms visualization ipod ifp real"
 # kde: enables compilation of the konqueror sidebar plugin
 
 DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
 	>=media-libs/xine-lib-1.1.2_pre20060328-r8
-	musicbrainz? ( >=media-libs/tunepimp-0.3 )
 	>=media-libs/taglib-1.4
 	mysql? ( >=dev-db/mysql-4.0.16 )
 	postgres? ( dev-db/postgresql )
@@ -62,11 +61,11 @@ src_compile() {
 				  $(use_with opengl) $(use_with xmms)
 				  $(use_with visualization libvisual)
 				  $(use_enable !noamazon amazon)
-				  $(use_with musicbrainz)
 				  $(use_with ipod libgpod)
 				  $(use_with aac mp4v2)
 				  $(use_with ifp)
 				  $(use_with real helix)
+				  --without-musicbrainz
 				  --with-xine
 				  --without-mas
 				  --without-nmm"
diff --git a/media-sound/amarok/amarok-1.4.1-r2.ebuild b/media-sound/amarok/amarok-1.4.1-r2.ebuild
index c9fd7e7256a5..a43ca700fa3f 100644
--- a/media-sound/amarok/amarok-1.4.1-r2.ebuild
+++ b/media-sound/amarok/amarok-1.4.1-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/media-sound/amarok/amarok-1.4.1-r2.ebuild,v 1.2 2006/07/20 17:59:01 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.1-r2.ebuild,v 1.3 2006/07/25 08:12:36 flameeyes Exp $
 
 LANGS="az bg br ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it ja ka
 km ko lt ms nb nl nn pa pl pt pt_BR ro ru rw sl sr sr@Latn sv ta tg th tr uk uz
@@ -28,12 +28,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="aac kde mysql noamazon opengl postgres
-xmms visualization musicbrainz ipod ifp real njb"
+xmms visualization ipod ifp real njb"
 # kde: enables compilation of the konqueror sidebar plugin
 
 DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
 	>=media-libs/xine-lib-1.1.2_pre20060328-r8
-	musicbrainz? ( >=media-libs/tunepimp-0.3 )
 	>=media-libs/taglib-1.4
 	mysql? ( >=dev-db/mysql-4.0.16 )
 	postgres? ( dev-db/postgresql )
@@ -64,12 +63,12 @@ src_compile() {
 				  $(use_with opengl) $(use_with xmms)
 				  $(use_with visualization libvisual)
 				  $(use_enable !noamazon amazon)
-				  $(use_with musicbrainz)
 				  $(use_with ipod libgpod)
 				  $(use_with aac mp4v2)
 				  $(use_with ifp)
 				  $(use_with real helix)
 				  $(use_with njb libnjb)
+				  --without-musicbrainz
 				  --with-xine
 				  --without-mas
 				  --without-nmm"