Removing gstreamer support as it is horribly broken and uses 100% CPU under some circumstances... see bug #65434 comment #3.

3 files changed, 21 insertions, 15 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 2f4d5221304a..728b39f32b27 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.31 2004/10/26 09:13:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.32 2004/11/05 10:19:35 eradicator Exp $
+
+  05 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  amarok-1.1.1.ebuild:
+  Removing gstreamer support as it is horribly broken and uses 100% CPU under
+  some circumstances... see bug #65434 comment #3.
 
   26 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
   amarok-1.1.1.ebuild:
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 31e0df49ba2b..115abaf76a7c 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f7cc7b51a600153709dc3b2518e7f6af ChangeLog 4347
+MD5 6b9032e95f57378c121ce5374ecc3f10 ChangeLog 4557
 MD5 6140844712d069ed2f3c3a13b94441d7 amarok-0.9.ebuild 662
-MD5 f1488b73660ed4ab86c266d5def26ec9 amarok-1.1.1.ebuild 1372
+MD5 3b9142a913177f2e0cf2ae72ce99e8bc amarok-1.1.1.ebuild 1334
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 abbaf6509841c49f6394928d1faea57f amarok-1.0.2.ebuild 1166
 MD5 df341b2112081d185e977ecd8c3c1f3a files/digest-amarok-0.9 63
@@ -14,7 +14,7 @@ MD5 167a3a9a42477903579be25096b8eaab files/digest-amarok-1.0.2 66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBfhWfArHZZzCEUG0RAh1qAJwO/1FVfygsSZNL6JjjjzTboxNj1gCbBVdv
-2GO+7wf/4y4m/2ZlWFyihgg=
-=V4Uh
+iD8DBQFBi1PDArHZZzCEUG0RAu0tAJ9tXBj4WVCmIKh0UbWCm9eD+EIxUQCdF1TQ
+u/cXaWwPMXhZJYxuhDiyn+o=
+=XQLf
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.1.1.ebuild b/media-sound/amarok/amarok-1.1.1.ebuild
index ae2bfbc15a7c..893bf454ed69 100644
--- a/media-sound/amarok/amarok-1.1.1.ebuild
+++ b/media-sound/amarok/amarok-1.1.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.1.1.ebuild,v 1.2 2004/10/26 09:13:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.1.1.ebuild,v 1.3 2004/11/05 10:19:35 eradicator Exp $
 
-IUSE="noamazon cjk gstreamer xmms opengl xine arts"
+IUSE="noamazon cjk xmms opengl xine arts"
 
 inherit kde eutils
 
@@ -20,7 +20,6 @@ KEYWORDS="~x86 ~ppc ~amd64"
 
 DEPEND="=media-libs/libvisual-0.1.6
 	arts? ( >=kde-base/kdemultimedia-3.2 )
-	gstreamer? ( >=media-libs/gst-plugins-0.8.1 )
 	opengl? ( virtual/opengl )
 	xmms? ( >=media-sound/xmms-1.2 )
 	xine? ( >=media-libs/xine-lib-1_rc4 )
@@ -30,12 +29,16 @@ DEPEND="=media-libs/libvisual-0.1.6
 	>=kde-base/kdelibs-3.2
 	>=x11-libs/qt-3.3"
 
+# 100% CPU usage with gst... don't use it
+#	gstreamer? ( >=media-libs/gst-plugins-0.8.1 )
+
+
 need-kde 3.2
 
 src_unpack() {
-	if  ! use gstreamer && ! use xine && ! use arts
+	if  use !xine && use !arts
 	then
-		die "You must enable either Gstreamer, aRts or Xine"
+		die "You must enable either aRts or Xine"
 	fi
 
 	kde_src_unpack
@@ -46,10 +49,8 @@ src_unpack() {
 src_compile() {
 	PREFIX="`kde-config --prefix`"
 
-	myconf="`use_with arts` `use_with gstreamer`"
-	myconf="${myconf} `use_with opengl` `use_with xine` `use_enable !noamazon amazon`"
-
-	einfo "${myconf}"
+	myconf="`use_with arts` `use_with xine`"
+	myconf="${myconf} `use_with opengl` `use_enable !noamazon amazon`"
 
 	kde_src_compile myconf configure make || die
 }