Remove musicbrainz support as per bug #140184.

Package-Manager: portage-2.1.1_pre3-r3

6 files changed, 67 insertions, 57 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/Manifest b/media-sound/amarok/Manifest
index 6ab6e962b719..c7729e6481e6 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX amarok-1.4.0a-strict-aliasing.patch 435 RMD160 6c3ee58300525889b786b2220a2457d02ac665dd SHA1 5bf970810d683e84e18c8808c2b648e69e4030ab SHA256 72069f37be46abf539b10ab937abe5e3eaf77d5ee973dfdbf203bdb031506cf5
 MD5 6a938d8f94e5b0faeb25349df3416c2f files/amarok-1.4.0a-strict-aliasing.patch 435
 RMD160 6c3ee58300525889b786b2220a2457d02ac665dd files/amarok-1.4.0a-strict-aliasing.patch 435
@@ -5,26 +8,26 @@ SHA256 72069f37be46abf539b10ab937abe5e3eaf77d5ee973dfdbf203bdb031506cf5 files/am
 DIST amarok-1.3.8.tar.bz2 8728423 RMD160 14c5e38a515b4ebb11dd93f74511fa2f6247809b SHA1 08fbf6637593c41bf33f580633f75e343d4053e4 SHA256 6159837fd52c56bd00855cdd8ae8ba85f803572571ebb86efb01bf36e898a0a1
 DIST amarok-1.4.0a.tar.bz2 13045009 RMD160 47ae8f9e23aec02f825fe3791eae63520f56394e SHA1 0274e7d7b780ab10c0d1357fe852d895d86dd409 SHA256 46d298226ff855c68b1d179d900441fd3c2329f42a938c3fc842a218ab762344
 DIST amarok-1.4.1.tar.bz2 13509939 RMD160 d9df29c2a2a7b81aabb73c66b83190f0bc109094 SHA1 ecabf7fd15ac45d29ccd1b9309f093ecda8acfab SHA256 dbe4397d041a77f7ded063f50d5cfd2faf0e9efce9b4483589f751c20ff89ccd
-EBUILD amarok-1.3.8.ebuild 3850 RMD160 9d9204068051becdf48a4ba3cd376c47a09a6cb7 SHA1 2f0bf65799c3877f80c2aa4e15516da81be46897 SHA256 7ba5a17ce306f7a6382a53f0e561018c64a3199d27b82f90798517a32d97fd4f
-MD5 d0833753931e0f132fdc45289f4d2f92 amarok-1.3.8.ebuild 3850
-RMD160 9d9204068051becdf48a4ba3cd376c47a09a6cb7 amarok-1.3.8.ebuild 3850
-SHA256 7ba5a17ce306f7a6382a53f0e561018c64a3199d27b82f90798517a32d97fd4f amarok-1.3.8.ebuild 3850
-EBUILD amarok-1.4.0a-r1.ebuild 2485 RMD160 5f649b3e312a5ed3aa64e4bcd436b29c3391ee73 SHA1 55a68e6ca68fe2d1e069e6c7263f30e7d556105a SHA256 f9a390464f49d4d4045d0d84fb0cd2175ba208e2657489147c35c6513f79445a
-MD5 322db14af8361f26c1d95e3174e62a81 amarok-1.4.0a-r1.ebuild 2485
-RMD160 5f649b3e312a5ed3aa64e4bcd436b29c3391ee73 amarok-1.4.0a-r1.ebuild 2485
-SHA256 f9a390464f49d4d4045d0d84fb0cd2175ba208e2657489147c35c6513f79445a amarok-1.4.0a-r1.ebuild 2485
-EBUILD amarok-1.4.1-r1.ebuild 2307 RMD160 fd21e46347afe94a30fc9f1c078fe26e737713ee SHA1 526d041c07830304f5c21c6934b150fae041b46c SHA256 15c23e4aa8079c932fcc81c2d45cd6711aded44ce74fb559e7a05525addb54fe
-MD5 dac566dcec058717b52082be5d6adc57 amarok-1.4.1-r1.ebuild 2307
-RMD160 fd21e46347afe94a30fc9f1c078fe26e737713ee amarok-1.4.1-r1.ebuild 2307
-SHA256 15c23e4aa8079c932fcc81c2d45cd6711aded44ce74fb559e7a05525addb54fe amarok-1.4.1-r1.ebuild 2307
-EBUILD amarok-1.4.1-r2.ebuild 2436 RMD160 29cc1af79712cbdc2186ee399462ebb9c082af6f SHA1 9ec969a6ae3a415d5579f22d74b4b41eecc0e5ba SHA256 c4a1ccc0412a76eda6d377f46e556e472e45b461f222e11fbab267cd4a2dcb25
-MD5 484bebb0aa9202c6e5b3bea003f9079e amarok-1.4.1-r2.ebuild 2436
-RMD160 29cc1af79712cbdc2186ee399462ebb9c082af6f amarok-1.4.1-r2.ebuild 2436
-SHA256 c4a1ccc0412a76eda6d377f46e556e472e45b461f222e11fbab267cd4a2dcb25 amarok-1.4.1-r2.ebuild 2436
-MISC ChangeLog 24465 RMD160 1f55884c1cc25487b6d6bfed21620c5177f8046e SHA1 39d59051b37022791949cf474ff959bf0dac1788 SHA256 6e1da47bd71b12535d21868135b038d97748174ee4f25d9a2261ef8ff4c789a2
-MD5 3956e3607442d00ec650bfa9a2b568a3 ChangeLog 24465
-RMD160 1f55884c1cc25487b6d6bfed21620c5177f8046e ChangeLog 24465
-SHA256 6e1da47bd71b12535d21868135b038d97748174ee4f25d9a2261ef8ff4c789a2 ChangeLog 24465
+EBUILD amarok-1.3.8.ebuild 3660 RMD160 33a0c338ae2b00b7467cac81555a0b85217a27f9 SHA1 9420b8a1c4d5619833889d04f30b775a6f417c2b SHA256 71cdf0cc185114aeacb9b674e3a6e8c8c204ad856d908d5c646c08ed8a0d1164
+MD5 a302f3de8595bb73dd7c042de92ddcf2 amarok-1.3.8.ebuild 3660
+RMD160 33a0c338ae2b00b7467cac81555a0b85217a27f9 amarok-1.3.8.ebuild 3660
+SHA256 71cdf0cc185114aeacb9b674e3a6e8c8c204ad856d908d5c646c08ed8a0d1164 amarok-1.3.8.ebuild 3660
+EBUILD amarok-1.4.0a-r1.ebuild 2355 RMD160 6e4392cc7d81c4f354bddb297691c11b3607f8c8 SHA1 32e30428359b7094a4e57605c6b6d180abab8876 SHA256 6658bc0d9210fb26aa9fb75d49075d7720c05082e64196c3bcc666daa7a3148c
+MD5 401e8246f65366bbf21c9826c318bdda amarok-1.4.0a-r1.ebuild 2355
+RMD160 6e4392cc7d81c4f354bddb297691c11b3607f8c8 amarok-1.4.0a-r1.ebuild 2355
+SHA256 6658bc0d9210fb26aa9fb75d49075d7720c05082e64196c3bcc666daa7a3148c amarok-1.4.0a-r1.ebuild 2355
+EBUILD amarok-1.4.1-r1.ebuild 2249 RMD160 f04409e4155605b6f7add5651b5a596b00d92499 SHA1 6ad47343efae4ed524cfb243e829f9b3ba837a91 SHA256 67ce83d588536375e269db17abf5c0138ad90696a2f3bdcb13d2bd3ea8bb835e
+MD5 40d7cc0397a1c34f6ef8c8fbe20e59f6 amarok-1.4.1-r1.ebuild 2249
+RMD160 f04409e4155605b6f7add5651b5a596b00d92499 amarok-1.4.1-r1.ebuild 2249
+SHA256 67ce83d588536375e269db17abf5c0138ad90696a2f3bdcb13d2bd3ea8bb835e amarok-1.4.1-r1.ebuild 2249
+EBUILD amarok-1.4.1-r2.ebuild 2380 RMD160 f9d261ed3a2ea8ff5881ad0869f6b92ca671f5fc SHA1 36687d14be311c8faafab792df316729fb15c859 SHA256 a92a9c7e371a33f63fea23b5b09b9720a50290397dd95780f234311f876f0255
+MD5 70a180aec9aaff3911d0a9332842aca5 amarok-1.4.1-r2.ebuild 2380
+RMD160 f9d261ed3a2ea8ff5881ad0869f6b92ca671f5fc amarok-1.4.1-r2.ebuild 2380
+SHA256 a92a9c7e371a33f63fea23b5b09b9720a50290397dd95780f234311f876f0255 amarok-1.4.1-r2.ebuild 2380
+MISC ChangeLog 24666 RMD160 67f269c87456058911067898ffb1737c79635aa8 SHA1 5da39cdb573a85cb130ba9ee1a3120ee9e602c90 SHA256 7fb9d44c0c5313e249b43b31a4d3546b8b90320d9a102e428245739e4a341520
+MD5 976fe22fa7618560f0f866da1e9914c2 ChangeLog 24666
+RMD160 67f269c87456058911067898ffb1737c79635aa8 ChangeLog 24666
+SHA256 7fb9d44c0c5313e249b43b31a4d3546b8b90320d9a102e428245739e4a341520 ChangeLog 24666
 MISC metadata.xml 266 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e SHA1 d41658ffae344562e8579d219bd3f746d4cba624 SHA256 c2f316075bb660460a285a5474235615f5946bb47df6e6f0c9c4de9ed64edf26
 MD5 986cc6d7e9a21474e34336045796ffaa metadata.xml 266
 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e metadata.xml 266
@@ -41,3 +44,10 @@ SHA256 b6e939431f1b0050daecc1e9ca12099743c1598de46b020aeb6b224aebbad03f files/di
 MD5 ac4c9036a47681634edcf32f28379d66 files/digest-amarok-1.4.1-r2 247
 RMD160 ad434383ba59bf02e36b766bfce2eb5f72329012 files/digest-amarok-1.4.1-r2 247
 SHA256 b6e939431f1b0050daecc1e9ca12099743c1598de46b020aeb6b224aebbad03f files/digest-amarok-1.4.1-r2 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFExdKKAiZjviIA2XgRAm2yAJ9P7HCvbsIYColyYFwXWwRh5rqIJACgr5lh
+4PHAkWKUoXkzG/D0A0VHAgI=
+=FNy1
+-----END PGP SIGNATURE-----
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"