Version bump.

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index ee50a3080e864ceeee60268db0998eb531c46f77..b58ca07f467448951c077f56a7c70cb309a0531a 100644 (file)
--- 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.38 2004/12/04 21:39:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.39 2004/12/12 23:18:12 eradicator Exp $
+
+*amarok-1.2_beta2 (12 Dec 2004)
+
+  12 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +amarok-1.2_beta2.ebuild:
+  Version bump.
 
   04 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
   amarok-1.1.1.ebuild, amarok-1.2_beta1.ebuild:

diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 357ce7c0945a65551d01b18c4a4f806f25c968b1..8f70fdfe119d37f16e283ec08188ae748fde3969 100644 (file)
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,12 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 095fa024a9015f383f6d371f0759fd24 ChangeLog 5520
+MD5 b041652a2676f4ab7136e64aa604f108 ChangeLog 5655
 MD5 c1b0a4ad7dffff86cdf6b4e2782b0c45 amarok-1.1.1.ebuild 1525
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 877c421a3c3847598b870d5f2889e3f8 amarok-1.2_beta1.ebuild 1551
 MD5 abbaf6509841c49f6394928d1faea57f amarok-1.0.2.ebuild 1166
+MD5 c74ab1de1abacb56708fb88aae692bdf amarok-1.2_beta2.ebuild 1551
 MD5 f3ee5f78e59957e9b40ad6eb82cf9f03 files/digest-amarok-1.2_beta1 70
+MD5 ab9e82aabb62859495632f83d21aaf1f files/digest-amarok-1.2_beta2 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
@@ -14,7 +16,7 @@ MD5 167a3a9a42477903579be25096b8eaab files/digest-amarok-1.0.2 66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBsi5/ArHZZzCEUG0RAtdxAJ9hh0agX+AcQy7H3ZHXqeICiroCsQCfU8yo
-XrVwd4BLX/Cey7vvOEylReM=
-=DAF6
+iD8DBQFBvNI3ArHZZzCEUG0RAvprAJsFKmrWyOCX9WZLXTe8NpJ/bWC1/wCeMmOo
+C2kHEhJYqUrm4rojybam8mM=
+=cJa5
 -----END PGP SIGNATURE-----

diff --git a/media-sound/amarok/amarok-1.2_beta2.ebuild b/media-sound/amarok/amarok-1.2_beta2.ebuild
new file mode 100644 (file)
index 0000000..8d10489
--- /dev/null
+++ b/media-sound/amarok/amarok-1.2_beta2.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_beta2.ebuild,v 1.1 2004/12/12 23:18:12 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.2 )
+       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
+                    >=media-plugins/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_beta2 b/media-sound/amarok/files/digest-amarok-1.2_beta2
new file mode 100644 (file)
index 0000000..5ec1fbb
--- /dev/null
+++ b/media-sound/amarok/files/digest-amarok-1.2_beta2
@@ -0,0 +1 @@
+MD5 8535db7a873f0ee2e697b98135e4b60d amarok-1.2-beta2.tar.bz2 3758100