Version bump (package.mask'd beta) and fix missing depend on media-sound/kdemultimedia for CD playback.

5 files changed, 81 insertions, 8 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index a54c73d6d8dd..7d06d20d4b7f 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,13 @@
 # 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.35 2004/11/23 03:00:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.36 2004/11/29 12:45:58 eradicator Exp $
+
+*amarok-1.2_beta1 (29 Nov 2004)
+
+  29 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  amarok-1.1.1.ebuild, +amarok-1.2_beta1.ebuild:
+  Version bump (package.mask'd beta) and fix missing depend on
+  media-sound/kdemultimedia for CD playback.
 
   22 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 c3188e3e1bd6..e316ffc4e591 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,10 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1e1db685a2d8ca570ddb28f34293e249 ChangeLog 4981
-MD5 5bff2285c32b30cd64ba62788bc52e5d amarok-1.1.1.ebuild 1489
+MD5 44024550f76522f6c830dfa18cdfffa4 ChangeLog 5229
+MD5 6e86cc32256616f169191081c6c59bd6 amarok-1.1.1.ebuild 1512
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 05deb065d7c32567eb5f39df6a79dfea amarok-1.2_beta1.ebuild 1539
 MD5 abbaf6509841c49f6394928d1faea57f amarok-1.0.2.ebuild 1166
+MD5 f3ee5f78e59957e9b40ad6eb82cf9f03 files/digest-amarok-1.2_beta1 70
 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
@@ -12,7 +14,7 @@ MD5 167a3a9a42477903579be25096b8eaab files/digest-amarok-1.0.2 66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBoqfoArHZZzCEUG0RAqKyAKCGjz8ChEFuMXxPz8xKGc8TgbvaHQCgg0tP
-BoT1tMzrs+mIg1nFUj68WN0=
-=6G/y
+iD8DBQFBqxoSArHZZzCEUG0RAi4EAJ9kMPSPqQHLZ4uvKn80ttz3CAUNuACdGpEX
+Aiu9k5+5sFt3SSbN99mv3JI=
+=SnvY
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.1.1.ebuild b/media-sound/amarok/amarok-1.1.1.ebuild
index fe144cf2a30a..50d3354e27e7 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.8 2004/11/23 03:00:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.1.1.ebuild,v 1.9 2004/11/29 12:45:58 eradicator Exp $
 
 IUSE="noamazon cjk xmms opengl xine arts gstreamer"
 
@@ -19,7 +19,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc -sparc ~x86"
 
 DEPEND="=media-libs/libvisual-0.1.6
-	arts? ( >=kde-base/kdemultimedia-3.2 )
+	>=kde-base/kdemultimedia-3.2 
+	arts? ( >=kde-base/arts-1.3.1)
 	opengl? ( virtual/opengl )
 	xmms? ( >=media-sound/xmms-1.2 )
 	xine? ( >=media-libs/xine-lib-1_rc4 )
diff --git a/media-sound/amarok/amarok-1.2_beta1.ebuild b/media-sound/amarok/amarok-1.2_beta1.ebuild
new file mode 100644
index 000000000000..9559a1a11de4
--- /dev/null
+++ b/media-sound/amarok/amarok-1.2_beta1.ebuild
@@ -0,0 +1,62 @@
+# 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.2_beta1.ebuild,v 1.1 2004/11/29 12:45:58 eradicator Exp $
+
+IUSE="noamazon cjk xmms opengl xine arts gstreamer"
+
+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"
+
+KEYWORDS="~amd64 ~ppc -sparc ~x86"
+
+#	Not yet released:
+#	">=media-libs/libvisual-0.2.0
+DEPEND=">=kde-base/kdemultimedia-3.2 
+	arts? ( >=kde-base/arts-1.3.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.3
+	>=kde-base/kdelibs-3.2
+	>=x11-libs/qt-3.3
+	gstreamer? ( >=media-libs/gst-plugins-0.8.1
+	             >=gst-plugins-mad-0.8.1 )"
+
+need-kde 3.2
+
+src_unpack() {
+	if  use !xine && use !arts
+	then
+		die "You must enable either 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 xine` `use_with gstreamer`"
+	myconf="${myconf} `use_with opengl` `use_enable !noamazon amazon`"
+
+	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-1.2_beta1 b/media-sound/amarok/files/digest-amarok-1.2_beta1
new file mode 100644
index 000000000000..c1fdb931b7fa
--- /dev/null
+++ b/media-sound/amarok/files/digest-amarok-1.2_beta1
@@ -0,0 +1 @@
+MD5 4477bf2c90f3afe4ae343f07978e59a5 amarok-1.2-beta1.tar.bz2 3554832