Add Version 1.0.

5 files changed, 82 insertions, 8 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 8792e79915b0..eadfcf3683fc 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.16 2004/06/15 17:07:43 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.17 2004/06/18 21:25:44 centic Exp $
+
+*amarok-1.0 (18 Jun 2004)
+
+  18 Jun 2004; Dominik Stadler <centic@gentoo.org>
+  +files/amarok-1.0-cjk-a.diff, +amarok-1.0.ebuild:
+  Add Version 1.0, fixes Bug 54251 and add ~amd64, fixes Bug 54305
 
 *amarok-1.0_beta4 (15 Jun 2004)
 
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 4f26f9365939..a2c49932033c 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,11 +1,14 @@
-MD5 f81856f0cfa069abe447c291736e3e94 amarok-0.9.ebuild 671
-MD5 eb1f1a7797bdc9b5e902fb7adbe0b382 amarok-1.0_beta4.ebuild 1129
-MD5 dc763e60c0978dbfe130ea2dc0cc00f3 amarok-1.0_beta1.ebuild 1046
+MD5 782c6cbbc695e8e90a9d471c6bdd9ddb ChangeLog 2578
 MD5 6419ef683f09299e73b6d2889edb859e amarok-1.0_beta3.ebuild 1129
-MD5 0d3e0c97807e425520b470db35cb7e31 ChangeLog 2383
+MD5 eb1f1a7797bdc9b5e902fb7adbe0b382 amarok-1.0_beta4.ebuild 1129
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 bbca3d5544beef476a52d7ec8147f9ad files/digest-amarok-1.0_beta1 69
+MD5 b3827ff3bc9501f8afc42a9819869808 amarok-0.9.ebuild 672
+MD5 74bee9be67f814d285e7b5493798eed6 amarok-1.0_beta1.ebuild 1047
+MD5 d21011f67770ace3244a303c4b24b35f amarok-1.0.ebuild 1078
 MD5 a971de7c80c09a9836a7238fc865f046 files/digest-amarok-1.0_beta3 70
-MD5 443de3ab98f3d36be327af53a4922b20 files/digest-amarok-1.0_beta4 70
-MD5 23390f7810deeaf8ffd367ff06c8d075 files/amarok-1.0-cjk.diff 1455
+MD5 bbca3d5544beef476a52d7ec8147f9ad files/digest-amarok-1.0_beta1 69
 MD5 df341b2112081d185e977ecd8c3c1f3a files/digest-amarok-0.9 63
+MD5 23390f7810deeaf8ffd367ff06c8d075 files/amarok-1.0-cjk.diff 1455
+MD5 443de3ab98f3d36be327af53a4922b20 files/digest-amarok-1.0_beta4 70
+MD5 17b5755e4e9f300ea1bb96af9e32832d files/digest-amarok-1.0 64
+MD5 8af9e3314d69ebb6341e75b5a1ead176 files/amarok-1.0-cjk-a.diff 1532
diff --git a/media-sound/amarok/amarok-1.0.ebuild b/media-sound/amarok/amarok-1.0.ebuild
new file mode 100644
index 000000000000..8815b1a11a6b
--- /dev/null
+++ b/media-sound/amarok/amarok-1.0.ebuild
@@ -0,0 +1,42 @@
+# 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.ebuild,v 1.1 2004/06/18 21:25:45 centic Exp $
+
+inherit kde eutils
+need-kde 3.2
+
+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.0 )
+	opengl? ( virtual/opengl )
+	xmms? ( >=media-sound/xmms-1.2 )
+	>=dev-util/pkgconfig-0.9.0
+	>=media-libs/taglib-0.95"
+
+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/files/amarok-1.0-cjk-a.diff b/media-sound/amarok/files/amarok-1.0-cjk-a.diff
new file mode 100644
index 000000000000..f7caab3d6ad5
--- /dev/null
+++ b/media-sound/amarok/files/amarok-1.0-cjk-a.diff
@@ -0,0 +1,22 @@
+diff -Nur amarok-1.0/amarok/src/metabundle.cpp /tmp/amarok-1.0/amarok/src/metabundle.cpp
+--- amarok-1.0/amarok/src/metabundle.cpp	2004-06-16 20:53:56.000000000 +0200
++++ /tmp/amarok-1.0/amarok/src/metabundle.cpp	2004-06-18 23:12:02.959888096 +0200
+@@ -90,12 +90,12 @@
+ //Taglib::Tag ctor //TODO DEPRECATE
+ MetaBundle::MetaBundle( const KURL &url, TagLib::Tag *tag, TagLib::AudioProperties *ap )
+   : m_url( url )
+-  , m_title(   TStringToQString( tag->title() ).stripWhiteSpace() )
+-  , m_artist(  TStringToQString( tag->artist() ).stripWhiteSpace() )
+-  , m_album(   TStringToQString( tag->album() ).stripWhiteSpace() )
+-  , m_year(    tag->year() ? QString::number( tag->year() ) : QString::null )
+-  , m_comment( TStringToQString( tag->comment() ).stripWhiteSpace() )
+-  , m_genre(   TStringToQString( tag->genre() ).stripWhiteSpace() )
++  , m_title(   QString::fromLocal8Bit(TStringToQString( tag->title() ).latin1()).stripWhiteSpace() )
++  , m_artist(  QString::fromLocal8Bit(TStringToQString( tag->artist() ).latin1()).stripWhiteSpace() )
++  , m_album(   QString::fromLocal8Bit(TStringToQString( tag->album() ).latin1()).stripWhiteSpace() )
++  , m_year(   tag->year() ? QString::number( tag->year() ) : QString::null )
++  , m_comment(  QString::fromLocal8Bit(TStringToQString( tag->comment() ).latin1()).stripWhiteSpace() )
++  , m_genre(  QString::fromLocal8Bit(TStringToQString( tag->genre() ).latin1()).stripWhiteSpace() )
+   , m_track(   tag->track() ? QString::number( tag->track() ) : QString::null )
+ {
+     init( ap );
diff --git a/media-sound/amarok/files/digest-amarok-1.0 b/media-sound/amarok/files/digest-amarok-1.0
new file mode 100644
index 000000000000..418f8db7ccc5
--- /dev/null
+++ b/media-sound/amarok/files/digest-amarok-1.0
@@ -0,0 +1 @@
+MD5 c52d89bde4c51b17ca7cce767b4515f3 amarok-1.0.tar.bz2 1838323