-m

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

5 files changed, 81 insertions, 40 deletions

diff --git a/app-i18n/scim-pinyin/ChangeLog b/app-i18n/scim-pinyin/ChangeLog
index 7daae94548a5..eaa1936297f5 100644
--- a/app-i18n/scim-pinyin/ChangeLog
+++ b/app-i18n/scim-pinyin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/scim-pinyin
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-pinyin/ChangeLog,v 1.31 2008/12/02 23:30:24 ranger Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-pinyin/ChangeLog,v 1.32 2009/02/24 14:49:28 matsuu Exp $
+
+*scim-pinyin-0.5.91-r3 (24 Feb 2009)
+
+  24 Feb 2009; MATSUU Takuto <matsuu@gentoo.org>
+  +files/scim-pinyin-0.5.91-gbk.patch, -scim-pinyin-0.5.91.ebuild,
+  -scim-pinyin-0.5.91-r1.ebuild, +scim-pinyin-0.5.91-r3.ebuild:
+  Fixed locale issue, bug #259384. Fixed DEPEND. Removed old revision.
 
   02 Dec 2008; Brent Baude <ranger@gentoo.org> scim-pinyin-0.5.91-r2.ebuild:
   stable ppc64, bug 245187
diff --git a/app-i18n/scim-pinyin/Manifest b/app-i18n/scim-pinyin/Manifest
index 7b18e275460a..09e3f8ade587 100644
--- a/app-i18n/scim-pinyin/Manifest
+++ b/app-i18n/scim-pinyin/Manifest
@@ -1,9 +1,9 @@
 AUX scim-pinyin-0.5.91-fixconfigure.patch 1313 RMD160 023f960a61daf53e58104aa7a3baf1a0d0e5726a SHA1 9e36de05c68313e76be60b1a786840a7c7ae95c7 SHA256 1ae66b39fbfaaac4d5e6ea605a07c885699546752b4ca52486740e6eedbe7da5
+AUX scim-pinyin-0.5.91-gbk.patch 2501 RMD160 7fe0aa8ee118b11ae097f0be6f191e3af19a1689 SHA1 65da02a133037642aa7f6ffe64e320e93b3b96cb SHA256 a5034eaf3fb0921a14cafb73e7fceccdbf137a66692089e8cd1bf6bde9746491
 AUX scim-pinyin-0.5.91-gcc43.patch 1737 RMD160 d9a407ccad6a7d067dba3e581fa8dfe3245d8b48 SHA1 c766106e5cbf4948542875ec149b685b7ba3206d SHA256 38a1860973b92892f418ff34202309cec2fd61a17f9cd8183e74351fa2eabbf9
 AUX scim-pinyin-qt335.patch 1122 RMD160 8a0a700e49060e573b24dd6d355836facead4b9a SHA1 9affc52c5c4d68287f894a68604e79d21029fc66 SHA256 615f4536c1dbf8e95529eff028cb6efaedd5abc4afec8ef5d6ead3ef5eca98a9
 DIST scim-pinyin-0.5.91.tar.gz 5492055 RMD160 dbde7b7871c7baf3656cd4c7000196cf99ae15e2 SHA1 58bea437a211b7af8420057541a38933a41841c7 SHA256 9b6b24af841cbf0353b919df7f56be931850fccf3b914172af7a39b6db726653
-EBUILD scim-pinyin-0.5.91-r1.ebuild 1254 RMD160 2f42190ad0d493ee9a6f800a3570cb8f8a139ab2 SHA1 f1837e37cda8c22215ebc11e4c00e712be23268f SHA256 db0d15dc72d25db591e6f1c32e6f03acbdc4761c3efb276b55fe582e3fba3b47
 EBUILD scim-pinyin-0.5.91-r2.ebuild 1291 RMD160 9058069a1cd25b44630fc7335c58ceebc95125d7 SHA1 8cf314ae5e1cd33fe44eff0bb7914d93664d5ba2 SHA256 465cb5b6858e6b8b9f6c8785943bd6e4a9e44457363d6c3033d5e90a322394b4
-EBUILD scim-pinyin-0.5.91.ebuild 812 RMD160 af7c1f27201cbb8a2535380dd1469dca88736e6b SHA1 dca0ce99f16a54cc42c75987de67eb1ab353930f SHA256 f190f49cc182fe28fd11bc80862821dd109f121a335b0912fdd445d05461a3e0
-MISC ChangeLog 4289 RMD160 31374930c4a4646510b878ec75d0bdc748192770 SHA1 d4056b1a75872669cb373985b81594dca323cc52 SHA256 66b5f0df974504c6ca8d81fca7a9a61105a64af6d0bbad0ace3c1dabdd0e7658
+EBUILD scim-pinyin-0.5.91-r3.ebuild 1340 RMD160 b2e56f863d082a7c78e510efb857dd5df988baac SHA1 ff687338a59e9b986a17a5f66d33772502e9992a SHA256 34dc342e9793a6dda594c2dea97ee389bb9b4e1954372548a0d48d5344ec234c
+MISC ChangeLog 4579 RMD160 39faba1523fefdbe8684a8625332b7ab37e63dcf SHA1 e5aaf48befc3e250bde03712e014b344805de317 SHA256 0c4eac8a0c0efdb2894af6393a28f02e0f72be570d2ec9f796001248fe5a1b97
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
diff --git a/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-gbk.patch b/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-gbk.patch
new file mode 100644
index 000000000000..bc6a228fb0cc
--- /dev/null
+++ b/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-gbk.patch
@@ -0,0 +1,62 @@
+diff -Nru scim-pinyin-0.5.91.orig/src/scim_pinyin_imengine.cpp scim-pinyin-0.5.91/src/scim_pinyin_imengine.cpp
+--- scim-pinyin-0.5.91.orig/src/scim_pinyin_imengine.cpp	2005-08-06 23:31:08.000000000 +0800
++++ scim-pinyin-0.5.91/src/scim_pinyin_imengine.cpp	2009-02-18 00:06:34.000000000 +0800
+@@ -706,8 +706,12 @@
+         m_sys_phrase_lib = m_pinyin_global->get_sys_phrase_lib ();
+         m_user_phrase_lib = m_pinyin_global->get_user_phrase_lib ();
+     }
+-
+-    if (encoding == "GBK" || encoding == "GB2312") {
++    
++    if (encoding == "GBK") {
++        m_simplified = true;
++        m_traditional = true;
++        m_chinese_iconv.set_encoding ("GBK");
++    } else if (encoding == "GB2312") {
+         m_simplified = true;
+         m_traditional = false;
+         m_chinese_iconv.set_encoding ("GB2312");
+@@ -930,10 +934,39 @@
+ 
+     m_iconv.set_encoding (encoding);
+ 
+-    if (encoding == "GBK" || encoding == "GB2312") {
+-        m_simplified = true;
+-        m_traditional = false;
+-        m_chinese_iconv.set_encoding ("GB2312");
++    if (encoding == "GBK") {
++        if (m_simplified == false) {
++            if(m_traditional == true){
++                ; //Big5. Big5togbk is not implemented. Set to next available. 
++                m_simplified = true;
++                m_chinese_iconv.set_encoding ("GBK");
++            }else{ // nochinese mode. Should not happen. 
++                m_forward = true;
++                m_chinese_iconv.set_encoding ("");
++            }
++        }else{
++            if( m_traditional == false) //GB2312
++                m_chinese_iconv.set_encoding("GB2312");
++            else m_chinese_iconv.set_encoding ("GBK"); //ALL
++        }
++    } else if (encoding == "GB2312") {
++        if ( m_simplified == false ) {
++            if(m_traditional == true) {
++                ; //partly map big5 to gb2312 is not done. Set to next.
++                m_forward = true;
++                m_chinese_iconv.set_encoding ("");
++            }else{//Should not happen. 
++                m_forward = true;
++                m_chinese_iconv.set_encoding("");
++            }
++        }else{
++            if (m_traditional == true) { //Should not happen. 
++                m_forward = true;
++                m_chinese_iconv.set_encoding ("");
++            }else{
++                m_chinese_iconv.set_encoding ("GB2312");
++            }
++        }
+     } else if (encoding == "BIG5" || encoding == "BIG5-HKSCS") {
+         m_simplified = false;
+         m_traditional = true;
diff --git a/app-i18n/scim-pinyin/scim-pinyin-0.5.91-r1.ebuild b/app-i18n/scim-pinyin/scim-pinyin-0.5.91-r3.ebuild
index 560758f267e3..880655a29318 100644
--- a/app-i18n/scim-pinyin/scim-pinyin-0.5.91-r1.ebuild
+++ b/app-i18n/scim-pinyin/scim-pinyin-0.5.91-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-pinyin/scim-pinyin-0.5.91-r1.ebuild,v 1.13 2007/07/22 09:25:03 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-pinyin/scim-pinyin-0.5.91-r3.ebuild,v 1.1 2009/02/24 14:49:28 matsuu Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -14,11 +14,11 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
 IUSE="kde nls"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="x11-libs/libXt
 	|| ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 )
-	kde? ( app-i18n/skim )
+	kde? ( >=app-i18n/skim-1.2 )
 	nls? ( virtual/libintl )"
 
 DEPEND="${RDEPEND}
@@ -30,6 +30,8 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-fixconfigure.patch"
 	epatch "${FILESDIR}/${PN}-qt335.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+	epatch "${FILESDIR}/${P}-gbk.patch"
 
 	AT_M4DIR=m4 AT_NO_RECURSIVE=yes eautoreconf
 }
@@ -47,5 +49,5 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHROS NEWS README ChangeLog
+	dodoc AUTHORS NEWS README ChangeLog
 }
diff --git a/app-i18n/scim-pinyin/scim-pinyin-0.5.91.ebuild b/app-i18n/scim-pinyin/scim-pinyin-0.5.91.ebuild
deleted file mode 100644
index 8da586ac9278..000000000000
--- a/app-i18n/scim-pinyin/scim-pinyin-0.5.91.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-pinyin/scim-pinyin-0.5.91.ebuild,v 1.10 2007/07/22 09:25:03 calchan Exp $
-
-inherit kde-functions gnome2
-
-DESCRIPTION="Smart Common Input Method (SCIM) Smart Pinyin Input Method"
-HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
-
-RDEPEND="x11-libs/libXt
-	|| ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-SCROLLKEEPER_UPDATE="0"
-G2CONF="--disable-static --without-arts"
-DOCS="AUTHORS NEWS README ChangeLog"
-USE_DESTDIR=1
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-qt335.patch"
-}