Fixed kanji input issue, bug 142056.

Package-Manager: portage-2.1.1-r1

diff --git a/app-i18n/scim/ChangeLog b/app-i18n/scim/ChangeLog
index 42fbf500b2925077faa2878b95a938bdfb012ff6..9c8b11be27edbd0143761667040a02c4099166f1 100644 (file)
--- a/app-i18n/scim/ChangeLog
+++ b/app-i18n/scim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/scim
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.100 2006/10/10 10:54:37 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.101 2006/10/10 16:31:29 matsuu Exp $
+
+  10 Oct 2006; MATSUU Takuto <matsuu@gentoo.org>
+  +files/scim-1.4.5-imengine.patch, scim-1.4.5.ebuild:
+  Fixed kanji input issue, bug 142056.
 
   10 Oct 2006; MATSUU Takuto <matsuu@gentoo.org> scim-1.4.4.ebuild,
   scim-1.4.5.ebuild:

diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index 52683be667e3fbdfe07eff638937b2dad1f155f7..e5b6ccfa061978b17d1a8c32cb5cba3fddd976d7 100644 (file)
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -2,6 +2,10 @@ AUX 1.4.4-nodoxygen.patch 532 RMD160 ff75f4e8b181a19cc00fe1ef3ae0d40597348a60 SH
 MD5 d12710062cc8edc7c79aea8597867db1 files/1.4.4-nodoxygen.patch 532
 RMD160 ff75f4e8b181a19cc00fe1ef3ae0d40597348a60 files/1.4.4-nodoxygen.patch 532
 SHA256 2bab7e4f6f179ff88afb8b845c76e7a7f4e3d67ceed6dcfc0e06e88c221a5cee files/1.4.4-nodoxygen.patch 532
+AUX scim-1.4.5-imengine.patch 869 RMD160 609baff78ef99ab6895e17a18a20dfc9a4c21a08 SHA1 ecedf7b09467829d63d905a950cebeddd3cab40c SHA256 bb4eb7e0e0a06dc2ed9d99703b5d7f63b1356a2ffd59a4736caa3c6a75bf11b6
+MD5 329fd62b512b9c4a0f6736ddc3f34f86 files/scim-1.4.5-imengine.patch 869
+RMD160 609baff78ef99ab6895e17a18a20dfc9a4c21a08 files/scim-1.4.5-imengine.patch 869
+SHA256 bb4eb7e0e0a06dc2ed9d99703b5d7f63b1356a2ffd59a4736caa3c6a75bf11b6 files/scim-1.4.5-imengine.patch 869
 DIST scim-1.4.2.tar.gz 2574997 RMD160 7e237b4e1a886b67c7d02cb4c0236f1bb6ca356f SHA1 e8563cb0e464f3595b16909c3ee47edcb86ce622 SHA256 c9e62cc5ee18ed0982dde6b6a258a239f5812ff9a6807283472ff16df1e6421e
 DIST scim-1.4.3.tar.gz 2608572 RMD160 3c7dbe33896cede20858e9414966a28fef194765 SHA1 e6f88a123f43315fe2ef470629197a8f298e76b4 SHA256 b8587b45d841b559e9b36c6b1db034a5f4223643dbdb9e0a2ba02c493b5c6bca
 DIST scim-1.4.4.tar.gz 2610165 RMD160 e2025f246b82583fff6bc0237fa747d5ff2a6816 SHA1 f6d7cb0ca70d9c3430e460bef58e78ba04919137 SHA256 a0bc87a5e779250a6ae7cdc56c2fbfb3ca09aec8ae01d90b2f18116fa624110c
@@ -18,14 +22,14 @@ EBUILD scim-1.4.4.ebuild 3046 RMD160 1dd18f66a863c589593fc5fe842fe9205c56f807 SH
 MD5 6f299cb70bf8ccdf43dccbc921198ccf scim-1.4.4.ebuild 3046
 RMD160 1dd18f66a863c589593fc5fe842fe9205c56f807 scim-1.4.4.ebuild 3046
 SHA256 ce36de1a5a816f8be0df7db973aa719e47e7ba9a0890bc705ccaeabd3cd31238 scim-1.4.4.ebuild 3046
-EBUILD scim-1.4.5.ebuild 2802 RMD160 90ac82e914d607c51c8e548aa3c53d36bf3bf437 SHA1 f9137b492165a2e65242184520caef5979f6b865 SHA256 44dacd3f3569d51d47e539b116c09c96f5cd1b4cd49bb2c7b8872d71bba8b81f
-MD5 74e0172022985a597e7a90eb5d2b28df scim-1.4.5.ebuild 2802
-RMD160 90ac82e914d607c51c8e548aa3c53d36bf3bf437 scim-1.4.5.ebuild 2802
-SHA256 44dacd3f3569d51d47e539b116c09c96f5cd1b4cd49bb2c7b8872d71bba8b81f scim-1.4.5.ebuild 2802
-MISC ChangeLog 13710 RMD160 966272d7dc366918b755c44678b232823ed25496 SHA1 14cb7acc05959f0fada23c34f18d354ad2b24ae1 SHA256 7ecbfeb14bd0f739c092054ba16a00b2de01401ea9f76d5af3b33c4fcf61ab43
-MD5 ff759e58a2f95b36eae1d4b8e688a33c ChangeLog 13710
-RMD160 966272d7dc366918b755c44678b232823ed25496 ChangeLog 13710
-SHA256 7ecbfeb14bd0f739c092054ba16a00b2de01401ea9f76d5af3b33c4fcf61ab43 ChangeLog 13710
+EBUILD scim-1.4.5.ebuild 2892 RMD160 9fa9658cf3a04fbd7104ef0e430c517d46cb0ddf SHA1 17ab0e42dae63103f3df3595f00c8cea485817fb SHA256 00c51b63d84487412bba653178086162ba7e56cea9eca437ca5d10f57d8d2703
+MD5 a555d1e6420e38d0b6239a83efb325ef scim-1.4.5.ebuild 2892
+RMD160 9fa9658cf3a04fbd7104ef0e430c517d46cb0ddf scim-1.4.5.ebuild 2892
+SHA256 00c51b63d84487412bba653178086162ba7e56cea9eca437ca5d10f57d8d2703 scim-1.4.5.ebuild 2892
+MISC ChangeLog 13854 RMD160 0dbe667681c53376c834986bf66f55b5a1e79c14 SHA1 04013862a94ef3c29dd0ded20ffe4bb7d8cd9411 SHA256 8bc592c5e2581f8240fc5ba485a8fd7720bb86e544ac2ed284451d4f43e7345e
+MD5 26207606eb1b4eb6b7a9b86144074d37 ChangeLog 13854
+RMD160 0dbe667681c53376c834986bf66f55b5a1e79c14 ChangeLog 13854
+SHA256 8bc592c5e2581f8240fc5ba485a8fd7720bb86e544ac2ed284451d4f43e7345e ChangeLog 13854
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156

diff --git a/app-i18n/scim/files/scim-1.4.5-imengine.patch b/app-i18n/scim/files/scim-1.4.5-imengine.patch
new file mode 100644 (file)
index 0000000..e850f0a
--- /dev/null
+++ b/app-i18n/scim/files/scim-1.4.5-imengine.patch
@@ -0,0 +1,21 @@
+diff -urN scim-1.4.4/modules/IMEngine/scim_rawcode_imengine.cpp scim-1.4.3/modules/IMEngine/scim_rawcode_imengine.cpp
+--- scim-1.4.4/modules/IMEngine/scim_rawcode_imengine.cpp      2006-01-12 08:00:36.000000000 +0100
++++ scim-1.4.3/modules/IMEngine/scim_rawcode_imengine.cpp      2005-08-15 16:27:56.000000000 +0200
+@@ -53,6 +53,8 @@
+ static String __rawcode_locales ("zh_CN.GB18030,zh_CN.GBK,zh_CN.GB2312,zh_TW,zh_TW.EUC-TW,zh_HK,ja_JP,ja_JP.sjis,ko_KR,en_US.UTF-8");
+ 
+ static std::vector<String> __rawcode_encodings;
++static const char * _DEFAULT_LANGUAGES = N_(
++    "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR");
+ 
+ extern "C" {
+     void scim_module_init (void)
+@@ -99,7 +82,7 @@
+ // implementation of RawCode
+ RawCodeFactory::RawCodeFactory ()
+ {
+-    set_locales (__rawcode_locales);
++    set_languages (String (_(_DEFAULT_LANGUAGES)));
+ }
+ 
+ RawCodeFactory::~RawCodeFactory ()

diff --git a/app-i18n/scim/scim-1.4.5.ebuild b/app-i18n/scim/scim-1.4.5.ebuild
index add24a2f63eb852d77fa69c26d672c036ad80b4c..6c9b2c529545c9861944ed1ecdda38ab84ca7a35 100644 (file)
--- a/app-i18n/scim/scim-1.4.5.ebuild
+++ b/app-i18n/scim/scim-1.4.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.5.ebuild,v 1.2 2006/10/10 10:54:37 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.5.ebuild,v 1.3 2006/10/10 16:31:29 matsuu Exp $
 
-inherit flag-o-matic
+inherit eutils flag-o-matic
 
 DESCRIPTION="Smart Common Input Method (SCIM) is an Input Method (IM) development platform"
 HOMEPAGE="http://www.scim-im.org/"
@@ -29,13 +29,20 @@ PDEPEND="!alpha? ( !hppa? ( kde? ( app-i18n/skim ) ) )
        !alpha? ( !hppa? ( !ppc64? ( !sparc? ( qt3? ( || ( app-i18n/scim-qtimm app-i18n/scim-bridge ) ) ) ) ) )"
 
 get_gtk_confdir() {
-       if useq amd64 || ( [ "${CONF_LIBDIR}" == "lib32" ] && useq x86 ) ; then
+       if use amd64 || ( [ "${CONF_LIBDIR}" == "lib32" ] && use x86 ) ; then
                echo "/etc/gtk-2.0/${CHOST}"
        else
                echo "/etc/gtk-2.0"
        fi
 }
 
+src_unpack() {
+       unpack ${A}
+
+       cd "${S}"
+       epatch "${FILESDIR}"/${P}-imengine.patch
+}
+
 src_compile() {
        # bug #83625
        filter-flags -fvisibility-inlines-hidden