From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Tue, 11 Oct 2005 19:20:40 +0000 (+0000)
Subject: Cleanup configure parameters, make sure musicbrainz is disabled when required, and... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2f7fcda69ed8f55d268fb5cc6892479306ca222f;p=gentoo.git

Cleanup configure parameters, make sure musicbrainz is disabled when required, and forcefully disable extra engines.
Package-Manager: portage-2.0.53_rc5
---

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 55cb96b586d6..b761a3e3b2d8 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.76 2005/10/09 19:28:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.77 2005/10/11 19:20:40 flameeyes Exp $
+
+  11 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> amarok-1.3.3.ebuild:
+  Cleanup configure parameters, make sure musicbrainz is disabled when
+  required, and forcefully disable extra engines.
 
 *amarok-1.3.3 (09 Oct 2005)
 
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index a7e8946c1a80..77a8afc34c5c 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,8 +1,11 @@
-MD5 b1d36cf9949c417d1caf137c44f0e873 ChangeLog 12329
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 063df4d1a77e79308e58f915657d6cc8 ChangeLog 12525
 MD5 a62708867dd0a86debc654ed4ab63800 amarok-1.2.3.ebuild 2331
 MD5 25af04c1ed653efd29b66d9a0f2fc564 amarok-1.2.4.ebuild 2400
 MD5 8240bf9b40bf80592500ff6cad53eb2f amarok-1.3.2-r1.ebuild 2986
-MD5 e6833554d080a85465f5357d5aabf1a6 amarok-1.3.3.ebuild 2940
+MD5 170fd40b4fb60f900d2bd29d97382281 amarok-1.3.3.ebuild 3087
 MD5 bef07b91d43dae9962ad11eafc579922 files/amarok-1.3.2-playlist.patch 1111
 MD5 32030194ea3f2079d1db17aa160f63a2 files/amarok-gcc4.gz 522
 MD5 55c15fa0003bd71db5f7e23d750c0b16 files/digest-amarok-1.2.3 66
@@ -10,3 +13,10 @@ MD5 9966964d087dd7c05b7fa2efeff9b1ac files/digest-amarok-1.2.4 66
 MD5 60980fa0862b2fc7960d57c1cd290769 files/digest-amarok-1.3.2-r1 66
 MD5 a4cca185adb8c61a54fe5f239f11ad7f files/digest-amarok-1.3.3 66
 MD5 b23600108f12c98a4fd574d3487ee598 metadata.xml 175
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDTBCxj5H05b2HAEkRAohCAKCLTnh+9YvwUOpMjuczjI7sIDLTwACfZ8UM
+AQNvegVrFqa3JPAQd15db4Q=
+=b9x4
+-----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.3.3.ebuild b/media-sound/amarok/amarok-1.3.3.ebuild
index 05c74ab64857..3d7ba39e2ea5 100644
--- a/media-sound/amarok/amarok-1.3.3.ebuild
+++ b/media-sound/amarok/amarok-1.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.3.3.ebuild,v 1.1 2005/10/09 19:28:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.3.3.ebuild,v 1.2 2005/10/11 19:20:40 flameeyes Exp $
 
 inherit kde eutils
 
@@ -70,11 +70,16 @@ src_compile() {
 	# it must be installed in the KDE install directory.
 	PREFIX="${KDEDIR}"
 
+	# 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_enable !noamazon amazon)
+				  $(use_with musicbrainz)
+				  --without-helix
+				  --without-mas
+				  --without-nmm"
 
 	kde_src_compile
 }