Do not force arts plugins, avoiding complications due to the fact that kde-base/artsp...

Package-Manager: portage-2.0.51.22-r3

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index b761a3e3b2d86722b2a3ccd6d0057ea55853070b..1c60eb289b5373a1a0a0cd928a51a77f9999ddb6 100644 (file)
--- 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.77 2005/10/11 19:20:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.78 2005/10/19 13:00:58 greg_g Exp $
+
+  19 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> amarok-1.3.3.ebuild:
+  Do not force arts plugins, avoiding complications due to the fact that
+  kde-base/artsplugins-akode will be providing them in KDE 3.5.
 
   11 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> amarok-1.3.3.ebuild:
   Cleanup configure parameters, make sure musicbrainz is disabled when

diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 6bde048565d87d24868df3aca355cec4448fcf2e..52886acd786806d165902cea5468f37aaf5e2691 100644 (file)
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,8 +1,8 @@
 MD5 b23600108f12c98a4fd574d3487ee598 metadata.xml 175
 MD5 a62708867dd0a86debc654ed4ab63800 amarok-1.2.3.ebuild 2331
-MD5 782e1ea07d2a998ed750d5d8ff400c46 amarok-1.3.3.ebuild 3079
+MD5 b23560914be96128d05c899cd6835902 amarok-1.3.3.ebuild 3065
 MD5 25af04c1ed653efd29b66d9a0f2fc564 amarok-1.2.4.ebuild 2400
-MD5 063df4d1a77e79308e58f915657d6cc8 ChangeLog 12525
+MD5 2635b5a72477243b24f41f1fe4989f3e ChangeLog 12731
 MD5 8240bf9b40bf80592500ff6cad53eb2f amarok-1.3.2-r1.ebuild 2986
 MD5 a4cca185adb8c61a54fe5f239f11ad7f files/digest-amarok-1.3.3 66
 MD5 32030194ea3f2079d1db17aa160f63a2 files/amarok-gcc4.gz 522

diff --git a/media-sound/amarok/amarok-1.3.3.ebuild b/media-sound/amarok/amarok-1.3.3.ebuild
index 7d4fc555087ea112045f425b1d7e9614d64ef084..f205e49fbfe0c3774e8569a61d228bcd4f5ce2d9 100644 (file)
--- 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.3 2005/10/19 12:48:49 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.3.3.ebuild,v 1.4 2005/10/19 13:00:58 greg_g Exp $
 
 inherit kde eutils
 
@@ -17,8 +17,7 @@ visualization vorbis musicbrainz"
 
 DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
        arts? ( kde-base/arts
-               || ( ( kde-base/kdemultimedia-arts kde-base/akode )
-               kde-base/kdemultimedia ) )
+               || ( kde-base/kdemultimedia-arts kde-base/kdemultimedia ) )
        xine? ( >=media-libs/xine-lib-1_rc4 )
        gstreamer? ( >=media-libs/gstreamer-0.8.8
                     >=media-libs/gst-plugins-0.8.6 )