Removed cjk patch, it does not apply anymore.

Package-Manager: portage-2.0.51-r15

4 files changed, 9 insertions, 29 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index a6836bff7d7d..1654fc93dfb9 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.45 2005/02/01 15:08:05 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.46 2005/02/02 10:21:28 greg_g Exp $
+
+  02 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> -files/amarok-1.0-cjk.diff,
+  amarok-1.2_beta4.ebuild:
+  Removed cjk patch, it does not apply anymore.
 
 *amarok-1.2_beta4 (01 Feb 2005)
 
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index f891072f79dc..550f73aa530f 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,10 +1,9 @@
 MD5 15a028c1f8fff178682119240f0189be metadata.xml 181
 MD5 8dec94b33db41952f96628c1948fa301 amarok-1.0.2.ebuild 1199
-MD5 fa91319853adb5508bb30ee9dffaa0fb ChangeLog 6746
+MD5 811e9cf1fb14c5fdccba766e701c8dcb ChangeLog 6900
 MD5 8ab1d316a1506fe1ecff05ba7f6cf8cb amarok-1.1.1.ebuild 1578
-MD5 64c05743452fe330317d23e1a618cf12 amarok-1.2_beta4.ebuild 1822
+MD5 e5e0490ed4ab4de173dec6928c098dba amarok-1.2_beta4.ebuild 1747
 MD5 33697f318e63c60a1ec8082330eece7f files/digest-amarok-1.1.1 66
 MD5 167a3a9a42477903579be25096b8eaab files/digest-amarok-1.0.2 66
 MD5 36de41fa399d57fd931b94231fbe1c85 files/digest-amarok-1.2_beta4 70
 MD5 8af9e3314d69ebb6341e75b5a1ead176 files/amarok-1.0-cjk-a.diff 1532
-MD5 23390f7810deeaf8ffd367ff06c8d075 files/amarok-1.0-cjk.diff 1455
diff --git a/media-sound/amarok/amarok-1.2_beta4.ebuild b/media-sound/amarok/amarok-1.2_beta4.ebuild
index 7bf105f65fdb..060867fa0165 100644
--- a/media-sound/amarok/amarok-1.2_beta4.ebuild
+++ b/media-sound/amarok/amarok-1.2_beta4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.2_beta4.ebuild,v 1.1 2005/02/01 15:08:05 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.2_beta4.ebuild,v 1.2 2005/02/02 10:21:28 greg_g Exp $
 
 inherit kde eutils
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/amarok/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="noamazon cjk xmms opengl xine kde arts gstreamer mysql"
+IUSE="noamazon xmms opengl xine kde arts gstreamer mysql"
 # kde: enables compilation of the konqueror sidebar plugin
 
 KEYWORDS="~amd64 ~ppc -sparc ~x86"
@@ -45,8 +45,6 @@ src_unpack() {
 	fi
 
 	kde_src_unpack
-	#CJK mp3 tag fix
-	use cjk && epatch ${FILESDIR}/amarok-1.0-cjk-a.diff
 }
 
 src_compile() {
diff --git a/media-sound/amarok/files/amarok-1.0-cjk.diff b/media-sound/amarok/files/amarok-1.0-cjk.diff
deleted file mode 100644
index 2457262974c8..000000000000
--- a/media-sound/amarok/files/amarok-1.0-cjk.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ruN amarok-1.0-beta3/amarok/src/metabundle.cpp amarok-1.0-beta3.cjk/amarok/src/metabundle.cpp
---- amarok-1.0-beta3/amarok/src/metabundle.cpp	2004-05-08 04:04:18.000000000 -0300
-+++ amarok-1.0-beta3.cjk/amarok/src/metabundle.cpp	2004-06-03 20:35:39.222702160 -0300
-@@ -61,12 +61,12 @@
- //Taglib::Tag ctor
- 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_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( TStringToQString( tag->comment() ).stripWhiteSpace() )
--  , m_genre(   TStringToQString( tag->genre() ).stripWhiteSpace() )
-+  , 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 );