Version bump closes bug #61723.

4 files changed, 65 insertions, 2 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 9992d493d1c7..c53ff981aab5 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.24 2004/09/03 09:19:57 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.25 2004/09/15 21:20:13 eradicator Exp $
+
+*amarok-1.1_beta2 (15 Sep 2004)
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +amarok-1.1_beta2.ebuild:
+  Version bump closes bug #61723.
 
   03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
   -amarok-1.0_beta3.ebuild, -amarok-1.0_beta4.ebuild:
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 57b369eda7a3..6fa941cf7f40 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,10 +1,12 @@
-MD5 9fbc2aaf439d51d011b10f30b557fc27 ChangeLog 3267
+MD5 807ac3c55dee343b7f3985afe0dbfacd ChangeLog 3420
 MD5 6140844712d069ed2f3c3a13b94441d7 amarok-0.9.ebuild 662
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 0769d1723cba14af4fa45232d019ca61 amarok-1.1_beta2.ebuild 1356
 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 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
diff --git a/media-sound/amarok/amarok-1.1_beta2.ebuild b/media-sound/amarok/amarok-1.1_beta2.ebuild
new file mode 100644
index 000000000000..cb9d72317be1
--- /dev/null
+++ b/media-sound/amarok/amarok-1.1_beta2.ebuild
@@ -0,0 +1,54 @@
+# 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.1 2004/09/15 21:20:13 eradicator Exp $
+
+inherit kde eutils
+
+MY_P="${P/_beta/-beta}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="amaroK is a media player for KDE"
+HOMEPAGE="http://amarok.kde.org/"
+SRC_URI="mirror://sourceforge/amarok/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# ppc: please test out libvisual!
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="cjk gstreamer xmms opengl xine"
+
+DEPEND="!ppc? ( >=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 )
+	>=media-libs/tunepimp-0.3.0
+	>=dev-util/pkgconfig-0.9.0
+	>=media-libs/taglib-1.1
+	>=kde-base/kdelibs-3.2
+	>=x11-libs/qt-3.3"
+
+need-kde 3.2
+
+src_unpack() {
+	if  ! use gstreamer && ! use xine && ! use arts
+	then
+		die "You must enable either Gstreamer, aRts or Xine"
+	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`"
+	myconf="${myconf} `use_with opengl` `use_with xine`"
+
+	kde_src_compile myconf configure make || die
+}
+
diff --git a/media-sound/amarok/files/digest-amarok-1.1_beta2 b/media-sound/amarok/files/digest-amarok-1.1_beta2
new file mode 100644
index 000000000000..51c619b0053b
--- /dev/null
+++ b/media-sound/amarok/files/digest-amarok-1.1_beta2
@@ -0,0 +1 @@
+MD5 11631363c514ab9d4a7a09326bbe1d44 amarok-1.1-beta2.tar.bz2 2394617