Backport from git tree.

Package-Manager: portage-2.1.6.6/cvs/Linux 2.6.28-gentoo x86_64

4 files changed, 154 insertions, 3 deletions

diff --git a/app-i18n/ibus-anthy/ChangeLog b/app-i18n/ibus-anthy/ChangeLog
index d7525754d914..ff127d441b55 100644
--- a/app-i18n/ibus-anthy/ChangeLog
+++ b/app-i18n/ibus-anthy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/ibus-anthy
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-anthy/ChangeLog,v 1.2 2008/09/12 16:03:14 matsuu Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-anthy/ChangeLog,v 1.3 2009/01/21 14:42:26 matsuu Exp $
+
+*ibus-anthy-0.1.1.20080912-r1 (21 Jan 2009)
+
+  21 Jan 2009; MATSUU Takuto <matsuu@gentoo.org>
+  +files/ibus-anthy-0.1.1.20080912-gentoo.patch,
+  +ibus-anthy-0.1.1.20080912-r1.ebuild:
+  Backport from git tree.
 
 *ibus-anthy-0.1.1.20080912 (12 Sep 2008)
 
diff --git a/app-i18n/ibus-anthy/Manifest b/app-i18n/ibus-anthy/Manifest
index cbc10d3f30e2..02a59b654be8 100644
--- a/app-i18n/ibus-anthy/Manifest
+++ b/app-i18n/ibus-anthy/Manifest
@@ -1,6 +1,8 @@
+AUX ibus-anthy-0.1.1.20080912-gentoo.patch 3061 RMD160 438376f42d711ec90966d54ad82342aa3b08b141 SHA1 85015ef3945f96bb3da98352d7a7321e31322246 SHA256 4aaf33026fd5bdca54c62d0873f3383dbcc333ce74ef58cafca61504756010be
 DIST ibus-anthy-0.1.1.20080901.tar.gz 386225 RMD160 b59c6f6bc89f2d6a41bcb4a401e5c7455e81aa4e SHA1 d83cbfab4367b9130319ce6498b71c0cfb4eccae SHA256 286d82fbabe54698899b7a62f325f7da927cd43f1c722bf2d655511710042d71
 DIST ibus-anthy-0.1.1.20080912.tar.gz 412471 RMD160 0832a55568d2e51a33f003c94b66dff4916e0db1 SHA1 c1a4746b54a671dd9a44d5a5886c6e81a371ce52 SHA256 03ace1c26fbb3a38f206ddd73983c1aa03ce61837a97ff509fac7d4be912d72e
 EBUILD ibus-anthy-0.1.1.20080901.ebuild 1027 RMD160 91b99f6c7184fb01aeb7c4361aaeac24e94c0c64 SHA1 d0b56adb6e8a1ceb86379155d937ed144a6e9849 SHA256 939e2338e603215cb6eee14893c4b24bd22f4888e3b02e38ce0d5c2d81183ef2
+EBUILD ibus-anthy-0.1.1.20080912-r1.ebuild 1310 RMD160 ee1927f07ebe5b3be039a6ef09575630f4be01c1 SHA1 0663b970d997b12b1f4ce7558efcb25d2dfc3bb1 SHA256 c8e17c4c0cf021b471e3c4c91454212956dbf7be03fe88b86f761d39f05c85d9
 EBUILD ibus-anthy-0.1.1.20080912.ebuild 1027 RMD160 932e6db38f7a94f07951366693ae1cb7bda6fe2d SHA1 5538083215c53bbc41a8e8de1f07620c9c1f973c SHA256 88a401822d43967e8788150af4a689967e0a06739fc079f61eb9381db1f00483
-MISC ChangeLog 555 RMD160 a1d01d5beb109f0c2c8f0563400dc61e143d02aa SHA1 49b434b27a969993c561775068591344caa8a4d9 SHA256 473c1ea3b3176ded70cb35795c451cc4c293e80d17709e940e8ba4a55602f78a
+MISC ChangeLog 765 RMD160 5cf75ef7081ee1f412c6fd754e5ae722c0f18c6e SHA1 6887954d9034bda96c3da3d47353009a7eed1273 SHA256 770ce2bb2a1dbd3b6ef7c12addc7c8d416791f4284a4d319ef4d95b93e707971
 MISC metadata.xml 288 RMD160 80ec129a37916f36dbc8bbb236247019a0da7e3c SHA1 08ce2269a9bf921904f7794db20b87253e2de080 SHA256 57981f7990710007696c34d8a74b2bba5cce68963ec4622b57264c6e98401e1b
diff --git a/app-i18n/ibus-anthy/files/ibus-anthy-0.1.1.20080912-gentoo.patch b/app-i18n/ibus-anthy/files/ibus-anthy-0.1.1.20080912-gentoo.patch
new file mode 100644
index 000000000000..d11500135741
--- /dev/null
+++ b/app-i18n/ibus-anthy/files/ibus-anthy-0.1.1.20080912-gentoo.patch
@@ -0,0 +1,86 @@
+diff -Naur ibus-anthy-0.1.1.20080912.orig/engine/engine.py ibus-anthy-0.1.1.20080912/engine/engine.py
+--- ibus-anthy-0.1.1.20080912.orig/engine/engine.py	2008-09-04 00:12:21.000000000 +0900
++++ ibus-anthy-0.1.1.20080912/engine/engine.py	2009-01-13 19:06:22.000000000 +0900
+@@ -568,6 +568,15 @@
+         return True
+ 
+     def __on_key_space(self):
++        if self.__input_mode == INPUT_MODE_WIDE_LATIN:
++            #  Input Wide Latin chars
++            char = unichr(keysyms.space)
++            wide_char = symbol_rule.get(char, None)
++            if wide_char == None:
++                wide_char = ibus.unichar_half_to_full(char)
++            self.__commit_string(wide_char)
++            return True
++
+         if self.__preedit_ja_string.is_empty():
+             return False
+ 
+diff -Naur ibus-anthy-0.1.1.20080912.orig/engine/romaji.py ibus-anthy-0.1.1.20080912/engine/romaji.py
+--- ibus-anthy-0.1.1.20080912.orig/engine/romaji.py	2008-09-03 15:12:49.000000000 +0900
++++ ibus-anthy-0.1.1.20080912/engine/romaji.py	2009-01-13 17:57:03.000000000 +0900
+@@ -56,6 +56,12 @@
+             self._jachars = jachars
+             return [RomajiSegment(c)]
+ 
++        jachars, c = romaji_correction_rule.get(text, (None, None))
++        if jachars:
++            self._enchars = text[0]
++            self._jachars = jachars
++            return [RomajiSegment(c)]
++
+         for i in range(-min(4, len(text)), 0):
+             enchars = text[i:]
+ 
+@@ -107,6 +113,11 @@
+             self._enchars = c
+             return [RomajiSegment(text[0], jachars)]
+ 
++        jachars, c = romaji_correction_rule.get(text, (None, None))
++        if jachars:
++            self._enchars = c
++            return [RomajiSegment(text[0], jachars)]
++
+         for i in range(min(4, len(text)), 0, -1):
+             enchars = text[:i]
+ 
+diff -Naur ibus-anthy-0.1.1.20080912.orig/engine/tables.py ibus-anthy-0.1.1.20080912/engine/tables.py
+--- ibus-anthy-0.1.1.20080912.orig/engine/tables.py	2008-09-04 00:13:03.000000000 +0900
++++ ibus-anthy-0.1.1.20080912/engine/tables.py	2009-01-13 18:31:31.000000000 +0900
+@@ -228,6 +228,7 @@
+ 
+ symbol_rule = {
+     # symbols
++    u" "  : u"　",
+     u","  : u"、",
+     u"."  : u"。",
+     u"!"  : u"！",
+@@ -570,22 +571,22 @@
+     u"％" : (u"％", u"%"),
+     u"＆" : (u"＆", u"&"),
+     u"’"  : (u"’", u"'"),
+-    u"（" : (u"（", u""),
++    u"（" : (u"（", u"("),
+     u"）" : (u"）", u")"),
+     u"〜" : (u"〜", u"~"),
+     u"＝" : (u"＝", u"="),
+-    u"＾" : (u"＾", u"u"),
++    u"＾" : (u"＾", u"^"),
+     u"＼" : (u"＼", u"\\"),
+     u"｜" : (u"｜", u"|"),
+     u"‘"  : (u"‘", u"`"),
+     u"＠" : (u"＠", u"@"),
+-    u"｛" : (u"｛", u""),
++    u"｛" : (u"｛", u"{"),
+     u"「" : (u"「", u"｢"),
+     u"＋" : (u"＋", u"+"),
+     u"；" : (u"；", u";"),
+     u"＊" : (u"＊", u"*"),
+-    u"：" : (u"：", u" : u"),
+-    u"｝" : (u"｝", u")"),
++    u"：" : (u"：", u":"),
++    u"｝" : (u"｝", u"}"),
+     u"」" : (u"」", u"｣"),
+     u"＜" : (u"＜", u"<"),
+     u"＞" : (u"＞", u">"),
diff --git a/app-i18n/ibus-anthy/ibus-anthy-0.1.1.20080912-r1.ebuild b/app-i18n/ibus-anthy/ibus-anthy-0.1.1.20080912-r1.ebuild
new file mode 100644
index 000000000000..302fd273b12b
--- /dev/null
+++ b/app-i18n/ibus-anthy/ibus-anthy-0.1.1.20080912-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-anthy/ibus-anthy-0.1.1.20080912-r1.ebuild,v 1.1 2009/01/21 14:42:26 matsuu Exp $
+
+inherit eutils python
+
+DESCRIPTION="Japanese input method Anthy IMEngine for IBus Framework"
+HOMEPAGE="http://code.google.com/p/ibus/"
+SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="app-i18n/ibus
+	app-i18n/anthy
+	>=dev-lang/python-2.5
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-lang/swig
+	dev-util/pkgconfig
+	nls? ( >=sys-devel/gettext-0.16.1 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	mv py-compile py-compile.orig || die
+	ln -s "$(type -P true)" py-compile || die
+}
+
+src_compile() {
+	econf $(use_enable nls) || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_postinst() {
+	ewarn "This package is very experimental, please report your bugs to"
+	ewarn "http://ibus.googlecode.com/issues/list"
+	elog
+	elog "You should run ibus-setup and enable IM Engines you want to use!"
+	elog
+
+	python_mod_optimize /usr/share/${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/share/${PN}
+}