8 files changed, 56 insertions, 56 deletions
diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 696267841555..4b6bb85c1e7a 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.14 2004/04/25 17:26:08 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.15 2004/05/22 15:20:19 squinky86 Exp $
+
+*amarok-1.0_beta3 (22 May 2004)
+
+  22 May 2004; Jon Hood <squinky86@gentoo.org> -amarok-0.7.0.ebuild,
+  -amarok-0.8.3.ebuild, +amarok-1.0_beta3.ebuild:
+  version bump, closes #51133
 
   25 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> amarok-0.9.ebuild:
   marked ~amd64.
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 4acc57d8b77a..cd2edccefbea 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,10 +1,8 @@
-MD5 b1be15b57472268f989ae28c98df2a60 ChangeLog 1948
-MD5 c601de00be5835facd1339a399f279ea amarok-0.7.0.ebuild 579
-MD5 a4ee7cb940fdc3ba32132a6fbc03b6f2 amarok-0.8.3.ebuild 579
 MD5 b3827ff3bc9501f8afc42a9819869808 amarok-0.9.ebuild 672
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 74bee9be67f814d285e7b5493798eed6 amarok-1.0_beta1.ebuild 1047
-MD5 c1fe49bbe2ebf5e710a1254d2ec8203d files/digest-amarok-0.7.0 65
-MD5 97680c579752ec85ee3e383443436edf files/digest-amarok-0.8.3 65
-MD5 df341b2112081d185e977ecd8c3c1f3a files/digest-amarok-0.9 63
+MD5 74bee9be67f814d285e7b5493798eed6 amarok-1.0_beta3.ebuild 1047
+MD5 b1be15b57472268f989ae28c98df2a60 ChangeLog 1948
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 bbca3d5544beef476a52d7ec8147f9ad files/digest-amarok-1.0_beta1 69
+MD5 a971de7c80c09a9836a7238fc865f046 files/digest-amarok-1.0_beta3 70
+MD5 df341b2112081d185e977ecd8c3c1f3a files/digest-amarok-0.9 63
diff --git a/media-sound/amarok/amarok-0.7.0.ebuild b/media-sound/amarok/amarok-0.7.0.ebuild
deleted file mode 100644
index bdd245483d9b..000000000000
--- a/media-sound/amarok/amarok-0.7.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-0.7.0.ebuild,v 1.6 2004/04/24 15:04:19 lanius 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"
-IUSE=""
-
-DEPEND="kde-base/kdemultimedia"
-
-need-kde 3
-
-src_compile() {
-	PREFIX=`kde-config --prefix`
-	kde_src_compile myconf configure || die
-	make || die
-}
diff --git a/media-sound/amarok/amarok-0.8.3.ebuild b/media-sound/amarok/amarok-0.8.3.ebuild
deleted file mode 100644
index bd049df2ea92..000000000000
--- a/media-sound/amarok/amarok-0.8.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-0.8.3.ebuild,v 1.6 2004/04/24 15:04:19 lanius 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"
-IUSE=""
-
-DEPEND="kde-base/kdemultimedia"
-
-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.0_beta3.ebuild b/media-sound/amarok/amarok-1.0_beta3.ebuild
new file mode 100644
index 000000000000..4ea9857c6df0
--- /dev/null
+++ b/media-sound/amarok/amarok-1.0_beta3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.0_beta3.ebuild,v 1.1 2004/05/22 15:20:19 squinky86 Exp $
+
+inherit kde
+
+MY_P="${P/_beta/-beta}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="amaroK is a media player for KDE"
+HOMEPAGE="http://amarok.sourceforge.net/"
+SRC_URI="mirror://sourceforge/amarok/${MY_P}.tar.bz2"
+RESTRICT="nomirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="gstreamer xmms arts opengl"
+
+DEPEND=">=kde-base/kdemultimedia-3.2
+	gstreamer? ( >=media-libs/gst-plugins-0.8.0 )
+	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
+}
+
+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/files/digest-amarok-0.7.0 b/media-sound/amarok/files/digest-amarok-0.7.0
deleted file mode 100644
index 2a36b2712c0a..000000000000
--- a/media-sound/amarok/files/digest-amarok-0.7.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9d3bf7849307d2001d03325100e6fd42 amarok-0.7.0.tar.bz2 693939
diff --git a/media-sound/amarok/files/digest-amarok-0.8.3 b/media-sound/amarok/files/digest-amarok-0.8.3
deleted file mode 100644
index 2907c2bb4e39..000000000000
--- a/media-sound/amarok/files/digest-amarok-0.8.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bdd9532e983ca85711e93929c008a5ba amarok-0.8.3.tar.bz2 725349
diff --git a/media-sound/amarok/files/digest-amarok-1.0_beta3 b/media-sound/amarok/files/digest-amarok-1.0_beta3
new file mode 100644
index 000000000000..9fb1361f4c26
--- /dev/null
+++ b/media-sound/amarok/files/digest-amarok-1.0_beta3
@@ -0,0 +1 @@
+MD5 f0ec7a3a16bf28fc1d34d4543e6a67e1 amarok-1.0-beta3.tar.bz2 1585937