Version bump and cleanup.

9 files changed, 13 insertions, 97 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 00f4eef92115..69d3141ca32d 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,12 @@
 # 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.26 2004/09/22 17:54:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.27 2004/09/27 20:29:20 eradicator Exp $
+
+*amarok-1.0.1 (27 Sep 2004)
+
+  27 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> -amarok-1.0.1.ebuild,
+  -amarok-1.0.ebuild, -amarok-1.1_beta2.ebuild:
+  Version bump and cleanup.
 
   22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
   amarok-1.1_beta2.ebuild:
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 8dae883f4c1b..e1bc32b1ae6d 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,14 +1,10 @@
-MD5 bb35172e1e0a9f91e77d5209655d5f92 ChangeLog 3527
+MD5 c5f708114cfa1c75969bfc4195bda4c9 ChangeLog 3712
 MD5 6140844712d069ed2f3c3a13b94441d7 amarok-0.9.ebuild 662
+MD5 19d073c00ba88672e0f585ccedd7ffe7 amarok-1.1.ebuild 1362
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 b4119ead2ce7f538e489d9a2b239e56c amarok-1.1_beta2.ebuild 1362
-MD5 9454366e8fbe2b054ce1907ffa214258 amarok-1.0.ebuild 1069
-MD5 3f80d3680b6b3e9e31cff181fc36157f amarok-1.0.1.ebuild 1072
 MD5 abbaf6509841c49f6394928d1faea57f amarok-1.0.2.ebuild 1166
 MD5 df341b2112081d185e977ecd8c3c1f3a files/digest-amarok-0.9 63
-MD5 61560de215e8841321654f183de58880 files/digest-amarok-1.1_beta2 70
+MD5 f6f757b9cd58dbec46e1bf9dc778d920 files/digest-amarok-1.1 64
 MD5 23390f7810deeaf8ffd367ff06c8d075 files/amarok-1.0-cjk.diff 1455
 MD5 8af9e3314d69ebb6341e75b5a1ead176 files/amarok-1.0-cjk-a.diff 1532
-MD5 17b5755e4e9f300ea1bb96af9e32832d files/digest-amarok-1.0 64
-MD5 02ee4005c9d6e67d1959a748b55fa3d4 files/digest-amarok-1.0.1 66
 MD5 167a3a9a42477903579be25096b8eaab files/digest-amarok-1.0.2 66
diff --git a/media-sound/amarok/amarok-1.0.1.ebuild b/media-sound/amarok/amarok-1.0.1.ebuild
deleted file mode 100644
index fb4638f85629..000000000000
--- a/media-sound/amarok/amarok-1.0.1.ebuild
+++ /dev/null
@@ -1,42 +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-1.0.1.ebuild,v 1.1 2004/07/05 23:11:47 fvdpol Exp $
-
-inherit kde eutils
-
-DESCRIPTION="amaroK is a media player for KDE"
-HOMEPAGE="http://amarok.sourceforge.net/"
-SRC_URI="mirror://sourceforge/amarok/${P}.tar.bz2"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="cjk gstreamer xmms arts opengl"
-
-DEPEND=">=kde-base/kdemultimedia-3.2
-	gstreamer? ( >=media-libs/gst-plugins-0.8.1 )
-	opengl? ( virtual/opengl )
-	xmms? ( >=media-sound/xmms-1.2 )
-	>=dev-util/pkgconfig-0.9.0
-	>=media-libs/taglib-0.95"
-need-kde 3.2
-
-src_unpack() {
-	if  ! use arts && ! use gstreamer
-	then
-		die "You must enable either Arts or Gstreamer"
-	fi
-
-	kde_src_unpack
-	#CJK mp3 tag fix
-	use cjk && epatch ${FILESDIR}/amarok-1.0-cjk-a.diff
-}
-
-src_compile() {
-	PREFIX="`kde-config --prefix`"
-	myconf="`use_with arts` `use_with gstreamer` `use_with opengl`"
-
-	kde_src_compile myconf configure make || die
-}
-
diff --git a/media-sound/amarok/amarok-1.0.ebuild b/media-sound/amarok/amarok-1.0.ebuild
deleted file mode 100644
index a8d85f92e955..000000000000
--- a/media-sound/amarok/amarok-1.0.ebuild
+++ /dev/null
@@ -1,42 +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-1.0.ebuild,v 1.4 2004/07/03 21:45:28 carlo Exp $
-
-inherit kde eutils
-
-DESCRIPTION="amaroK is a media player for KDE"
-HOMEPAGE="http://amarok.sourceforge.net/"
-SRC_URI="mirror://sourceforge/amarok/${P}.tar.bz2"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="cjk gstreamer xmms arts opengl"
-
-DEPEND=">=kde-base/kdemultimedia-3.2
-	gstreamer? ( >=media-libs/gst-plugins-0.8.1 )
-	opengl? ( virtual/opengl )
-	xmms? ( >=media-sound/xmms-1.2 )
-	>=dev-util/pkgconfig-0.9.0
-	>=media-libs/taglib-0.95"
-need-kde 3.2
-
-src_unpack() {
-	if  ! use arts && ! use gstreamer
-	then
-		die "You must enable either Arts or Gstreamer"
-	fi
-
-	kde_src_unpack
-	#CJK mp3 tag fix
-	use cjk && epatch ${FILESDIR}/amarok-1.0-cjk-a.diff
-}
-
-src_compile() {
-	PREFIX="`kde-config --prefix`"
-	myconf="`use_with arts` `use_with gstreamer` `use_with opengl`"
-
-	kde_src_compile myconf configure make || die
-}
-
diff --git a/media-sound/amarok/amarok-1.1_beta2.ebuild b/media-sound/amarok/amarok-1.1.ebuild
index e41447c3886a..ce5f6efb6fc6 100644
--- a/media-sound/amarok/amarok-1.1_beta2.ebuild
+++ b/media-sound/amarok/amarok-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_beta2.ebuild,v 1.2 2004/09/22 17:54:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.1.ebuild,v 1.1 2004/09/27 20:29:20 eradicator Exp $
 
 IUSE="cjk gstreamer xmms opengl xine arts"
 
@@ -27,7 +27,7 @@ DEPEND="!ppc? ( >=media-libs/libvisual-0.1.6 )
 	xine? ( >=media-libs/xine-lib-1_rc4 )
 	>=media-libs/tunepimp-0.3.0
 	>=dev-util/pkgconfig-0.9.0
-	>=media-libs/taglib-1.1
+	>=media-libs/taglib-1.3
 	>=kde-base/kdelibs-3.2
 	>=x11-libs/qt-3.3"
 
diff --git a/media-sound/amarok/files/digest-amarok-1.0 b/media-sound/amarok/files/digest-amarok-1.0
deleted file mode 100644
index 418f8db7ccc5..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c52d89bde4c51b17ca7cce767b4515f3 amarok-1.0.tar.bz2 1838323
diff --git a/media-sound/amarok/files/digest-amarok-1.0.1 b/media-sound/amarok/files/digest-amarok-1.0.1
deleted file mode 100644
index 6b4222784494..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3572e1bbbc76d3985af9a982f22a5da8 amarok-1.0.1.tar.bz2 1834336
diff --git a/media-sound/amarok/files/digest-amarok-1.1 b/media-sound/amarok/files/digest-amarok-1.1
new file mode 100644
index 000000000000..118c8333f5af
--- /dev/null
+++ b/media-sound/amarok/files/digest-amarok-1.1
@@ -0,0 +1 @@
+MD5 d898293eecd2a64bea92f50777e5131d amarok-1.1.tar.bz2 2807510
diff --git a/media-sound/amarok/files/digest-amarok-1.1_beta2 b/media-sound/amarok/files/digest-amarok-1.1_beta2
deleted file mode 100644
index 51c619b0053b..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.1_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 11631363c514ab9d4a7a09326bbe1d44 amarok-1.1-beta2.tar.bz2 2394617