ls

5 files changed, 25 insertions, 36 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 01b72611408c..1ef0c58f9969 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,10 @@
 # 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.33 2004/11/07 10:25:18 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.34 2004/11/12 11:22:36 eradicator Exp $
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> -amarok-0.9.ebuild,
+  amarok-1.1.1.ebuild:
+  Cleanup.
 
   07 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
   amarok-1.1.1.ebuild:
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 4a256ab528b6..6efafaf0607d 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,10 +1,18 @@
-MD5 dbc0c3bf5731663d2d1cb2dfebb39ad6 ChangeLog 4779
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b124246751e800c02842f5e4ea830032 ChangeLog 4891
+MD5 d076dbfb72bba63f96fea7a7b0380e4a amarok-1.1.1.ebuild 1482
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 47d2ab89b3b7a65797d3ffeda256db29 amarok-1.1.1.ebuild 1357
-MD5 6140844712d069ed2f3c3a13b94441d7 amarok-0.9.ebuild 662
 MD5 abbaf6509841c49f6394928d1faea57f amarok-1.0.2.ebuild 1166
-MD5 23390f7810deeaf8ffd367ff06c8d075 files/amarok-1.0-cjk.diff 1455
-MD5 df341b2112081d185e977ecd8c3c1f3a files/digest-amarok-0.9 63
 MD5 33697f318e63c60a1ec8082330eece7f files/digest-amarok-1.1.1 66
+MD5 23390f7810deeaf8ffd367ff06c8d075 files/amarok-1.0-cjk.diff 1455
 MD5 8af9e3314d69ebb6341e75b5a1ead176 files/amarok-1.0-cjk-a.diff 1532
 MD5 167a3a9a42477903579be25096b8eaab files/digest-amarok-1.0.2 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBlJ1SArHZZzCEUG0RAq7JAJ94LJtcbh6I+UX6vWJPMjQsIyxzWACfVwKR
+aPK0vOXDWyaWjy+QbxVNnWU=
+=Ci9S
+-----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-0.9.ebuild b/media-sound/amarok/amarok-0.9.ebuild
deleted file mode 100644
index 04139c6ceb7a..000000000000
--- a/media-sound/amarok/amarok-0.9.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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-0.9.ebuild,v 1.7 2004/06/24 23:50:00 agriffis Exp $
-
-inherit kde
-
-DESCRIPTION="amaroK is a media player for KDE"
-HOMEPAGE="http://amarok.sourceforge.net/"
-SRC_URI="mirror://sourceforge/amarok/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
-IUSE="gstreamer"
-
-DEPEND=">=kde-base/kdemultimedia-3.2
-	gstreamer? (
-		media-libs/gstreamer
-		media-libs/gst-plugins
-	)"
-
-need-kde 3
-
-src_compile() {
-	PREFIX=`kde-config --prefix`
-	kde_src_compile myconf configure || die
-	make || die
-}
diff --git a/media-sound/amarok/amarok-1.1.1.ebuild b/media-sound/amarok/amarok-1.1.1.ebuild
index 26269cd737b9..64675a0e6aaf 100644
--- a/media-sound/amarok/amarok-1.1.1.ebuild
+++ b/media-sound/amarok/amarok-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2004/11/08 08:18:16 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.1.1.ebuild,v 1.7 2004/11/12 11:22:36 eradicator Exp $
 
 IUSE="noamazon cjk xmms opengl xine arts gstreamer"
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/amarok/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 DEPEND="=media-libs/libvisual-0.1.6
 	arts? ( >=kde-base/kdemultimedia-3.2 )
@@ -53,3 +53,8 @@ src_compile() {
 	kde_src_compile myconf configure make || die
 }
 
+pkg_postinst() {
+	if use gstreamer; then
+		ewarn "Gstreamer support in ${P} is known to be unstable (see bug #66902)"
+	fi
+}
diff --git a/media-sound/amarok/files/digest-amarok-0.9 b/media-sound/amarok/files/digest-amarok-0.9
deleted file mode 100644
index 31a6cef0713e..000000000000
--- a/media-sound/amarok/files/digest-amarok-0.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e1c2726330df56b8cf9e1ee58d50d975 amarok-0.9.tar.bz2 780381