Add patch tof ix some upstreamed issues. #455614

Package-Manager: portage-2.2.0_alpha159/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8551514

5 files changed, 582 insertions, 2 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 735b0ae56018..4b59cce07363 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.119 2013/02/05 11:03:58 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.120 2013/02/09 16:22:33 naota Exp $
+
+*ibus-1.5.1-r1 (09 Feb 2013)
+
+  09 Feb 2013; Naohiro Aota <naota@gentoo.org>
+  +files/ibus-1.5.1-queue-events.patch, +files/ibus-1.5.1-setup.patch,
+  +ibus-1.5.1-r1.ebuild:
+  Add patch tof ix some upstreamed issues. #455614
 
 *ibus-1.5.1 (05 Feb 2013)
 
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 6095b744ca1c..2860d144d1b1 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -2,6 +2,8 @@ AUX ibus-1.4.0-machine-id-fallback.patch 750 SHA256 ad1b7538e324a29fd779d7545860
 AUX ibus-1.4.1-gir.patch 482 SHA256 802581c7c4293dd34c5fda9143d8b46d6a2e65dda82836643fbb4122f1b5b275 SHA512 bec6b63bc5e518fa83c077684365354df9402e70ed7b9c7757b56cd778e0f64b9fa391a7cc6c3e22a2197e6389c58232c3748616758f98bd477f665912674f0c WHIRLPOOL 9261329877eb1221c63eb6568b0e075bc8e7fe188164e06ccfa3ece8ad0c190ff31a2ee5e528550b9c3ad65416a72ceae90ec53d17470c9d54e8a63ffd1c21d1
 AUX ibus-1.4.1-libxslt-1.1.27.patch 3413 SHA256 47c0135a406e450676a06e7d6de24b99a972134f9217bb174bea7b5c3e6737c9 SHA512 983e01eec74eaba037d3cde1dc3485615984ab953d4edeffcf2f1e6eefa833055780a381b772fb296f6d625cc0d94bec75e430f7d72b7e23a5cfae03b0e661fb WHIRLPOOL 8b4385f35aef20fb3489c6a45ab1f4ac9f71abacea9f47acc13fcafbe130c5d74db1522dcbabb541254ea8505009dbe438cf0c5022989ca3dd05811497ccb9b9
 AUX ibus-1.4.1-no-gconf.patch 1002 SHA256 7f136de585b41d4ae47e1d9cb58a982f8ab70dc142eb579702e60f67f7f093f2 SHA512 168fefe6d5bb5efdf5e6212ca2ac72ab8a58789cf813c0c280dbbc3788cb70a0d344f9d837e8903b04fed57cdfa98e36f7ca40961b405b969554c384e783a6dd WHIRLPOOL 1fb6f44d7cb24aeaf215c0064bf527af19cd4cf8b0fd767f8ed939103ba3ed1904fd70c591f8f533ec4cc1bc6b6313faf5de7387ec703259639306458fff5206
+AUX ibus-1.5.1-queue-events.patch 13061 SHA256 5ccadbd28e76138f7dfe23fcc87e73d1ba434eae7b0b281172a3921e954e1577 SHA512 e9c0726ff2ff75704cc25af239e59683cf40a9068945f4953e3eb8529bf82ea662917e51bb56aaa3f2cf32966e8824607ad42f187d80a19eec5703f2b76561ae WHIRLPOOL 3ac69997b6f345d34e6e6065a35d064faeb81d51ef2e06d5748a4fee8144ee6a21d6c25738c48a56954ceed6fe2f2ba7bda6f7da5d15a65c1e671812fe490596
+AUX ibus-1.5.1-setup.patch 951 SHA256 9bd2e40af53c165ce5ecee4fdf65fda4b2b754f12302e53cb54a35628eae9b2e SHA512 72f2a3235f679d4c1b541ae7eb4a64c93c01f62f1440b0533d59ea2d1b31afdcf1d9c1965e9200a20dcf2248edf360d14e62df549b0ff4790f49cf1cfaccc1e1 WHIRLPOOL 406a55d81335a62ea6fdfb9d9738265da551188cefd8465fd4d3ccf58c1116a0f43e90aab0926ee88f603fb7a3c4b6d66d5483585533f755c9671e6bbbd8a674
 AUX ibus-gconf-2.m4.patch 1707 SHA256 40c54a970779f4586161f45ebd245c9db71b46ced0d7deda22f47de851c02954 SHA512 5310d371ae53c31551824e01c9fc3ee815b64c5595c778b956f807973be57ba26efa72977b3f3798347ecf25551f7da95f11bb545def761968b96edd81575985 WHIRLPOOL 74337f038a655689911c0fa3d219747b64c440453d62a1c9597f7cd9e8b45f6b3119e81e8daa8f7dd0eff4a74f2e78bef8ed16ea3c41ebad5cb10b0c7b2d9952
 DIST ibus-1.4.1.tar.gz 1479412 SHA256 2f46de279ef3c0a48d3f52061794cfc6544ad8cfe3f04d9d12b251d119a180d6 SHA512 465f5d099ca60612e9d28c77da6a8da2435cc50c3f2f9b93c4c9258d18bb963d85b84ed9d7f9c58e90dc07a4898dc9668a6e2a3484b69074a1777761389ba468 WHIRLPOOL 800e68481202dfd6f4cef0de692f4fa3ceb9e570d34b632f9547605a9ed9688be75a69402ff5df3df71fed12f463502d6e8041862dd065e725e6fa16ec968bcf
 DIST ibus-1.4.2.tar.gz 1489482 SHA256 2418d9960d177c0ce7d3dc5ef8ab75cfc00e30f5e2c730b7d82f4f22666a04d7 SHA512 0070f7d0a4bc6510692851f60e06e487f75fdbe47f50a2371f62dd06b89f20950161b5f1bb91e025dd8dced654d9e90eb910bb5be8e8923869e96e5048f8316d WHIRLPOOL c480ef6fabfe24f2350a0222945860e3b890b32373e159032cc4a9bb1a1df2ad22b6ce11fb9845c5ebacdb7662b9dd26bffb7dd8f6d366551e9ec226e2b14d8d
@@ -10,6 +12,7 @@ DIST ibus-1.5.1.tar.gz 1888861 SHA256 6023809ced2794b75fad07eb1b1d6288154b373920
 EBUILD ibus-1.4.1.ebuild 4018 SHA256 1a03a32ccd2614a24a9fb30a4bc225c50a31005e1629b8487e02a7abd7a6008d SHA512 f12763429aa765b953e73a846190d0fb53fcdb2e144da2bc94142ed9bc00fb3c1d259b090b7dfb87d1732a6696874b02281e5438ebbb8a66bf196da3520b5356 WHIRLPOOL b78dc364143ecdb5d5027f69547290c33f0a7d9cee6facb830276abd0826a2c3cf069909c3d3d69b4f011d12c9cf27ddf6f8a85acca56beb0d5685f15e468f7d
 EBUILD ibus-1.4.2.ebuild 3388 SHA256 d48e09f5233209764a4f927c4d5345a4b886c3d7459e7cb7771bb21b777a7a7f SHA512 dbb20f61ffd58b88e7637b8a6b6daae72344a3c4e67605cb975d3e2a5327befdc29b8052e6f472f12bccb267842bd9ed21a61cf3d34d9f5cc49a33d7c8d1e9e3 WHIRLPOOL 5f7fca4a64a2022a101bc7791dd4053d660fc82156768096bc8bb0332e87c68d83bb7ac63ab4b9626a3f3e73f896891cafd72a07d3c3a083cc53bf2404ea16ce
 EBUILD ibus-1.4.99.20121006.ebuild 4420 SHA256 180bb06a9bb23e7b3686a987f41f768a040c04ebe316e2d674fb5055b6d3cc6c SHA512 e45a6574b3bd32e00c0fb595472351092d027119ae524b78eeac4ffe9ea0ff70012df73253ef4566501d30d1089f34b53e7fa7e01ad73ffc800db3ed53932114 WHIRLPOOL 97e71f1ee15f8f222bb03243bd8635f2a3e5825c4136d6426f42d7f0f421119baeb2977fd9c01adb453e1c5b5cfb94994402fb99f6a167d79d00d767dd5bef19
+EBUILD ibus-1.5.1-r1.ebuild 4577 SHA256 033e9361147e752153290c8354a641653b6c1a2be09c960ace2728b6a857c1e6 SHA512 5cf8d534be46651f5d12f516911e96928fb2ec6ff60935f81b3f0118df4a4c6c35c3855e1ba95076e7d868cf7511e995ec81c8451410bbc811918fbb75ae9f31 WHIRLPOOL 87eb14f8b709aecb5728d6004c9cb34c19164edf7f1f22a57e79852493b5af36c19ccd2a9135e743109d4dcf8d0b0bcf60d2ef2b78da46bb1c4124fd21b7ee63
 EBUILD ibus-1.5.1.ebuild 4413 SHA256 2ee0742ec4c74f5c180e28a76c2b204a2383a11bd518cb0f9e0a6a5a4f433c24 SHA512 e416bf01c40ab88ca95b5848f57b02afd71bd4524c3197308e8a67dc1e2f977ab533e9c40cbd80e98663ac2bc0f90131e0151263fd2654b60a59ff3bdc0e5455 WHIRLPOOL 844e07ff24166c172b20bfa6c6d8d7cee89b26322ffbea1b3f36d922ab8a0497511ced6ab73cf841b86aade5751bb76d83c6683c3501e5010e4da33967c83a45
-MISC ChangeLog 19120 SHA256 e32a575d69a2a380a4ce0e89a9c6fcd4836d1339df0ad39f04b1e0d6f0b4a2db SHA512 dfa6a7b4b4c198db7f0c438d81f51df2d258bc271f3280925dd01e34f0cb0115707b8aedff003b164004f6d04b5e0b2932436fc99d22c51c24762b65d70b672f WHIRLPOOL 8dc33c4b0ee7097c866c097419745b835502c60765533a868fcb1c31c3e310bf2f071b85aadc0e5be0463bdf76db4fd49884e1df7be8b9f40450998348b8750a
+MISC ChangeLog 19344 SHA256 071de468ad207012ef7b58a2beb75c485cc44eef512c9dd53920184acec642dd SHA512 7367630608d642763140fb782dfcb422f12f98afbb2001e73d43e31e2104dbaaf478da81fa5e01b94b34dec4d3b055cdf7c8e1b2429a2f772e72173a109245cd WHIRLPOOL 29e13fea6a3742f383ad83407476d83b8f2469c12e587e2f81e2621cddc65566f31be3614e4269aa253fd33774179b583a7f331ee13ed9ec341d698c5f930940
 MISC metadata.xml 874 SHA256 b4601d52556db214f080e217b8ba86b0a9f9eda360fbb334d2a32f7399f432d3 SHA512 1c4ff452971777a3c64ba53b4c013aa92b8962f1e62f3ead43468da88fa8bc5e330226cfd2c5cc6e9fa0ab94b756dfff43bb0086cceea8a622a22c5dfec8cf6d WHIRLPOOL f1891ef7eb11b751d8550bc7f26d1233b1c0e589f27dc838f94242174b11501f0296c165bbdba5e005064837a079fd433aefcaab9ffe4713acdd012821425e07
diff --git a/app-i18n/ibus/files/ibus-1.5.1-queue-events.patch b/app-i18n/ibus/files/ibus-1.5.1-queue-events.patch
new file mode 100644
index 000000000000..38c3fe9865a9
--- /dev/null
+++ b/app-i18n/ibus/files/ibus-1.5.1-queue-events.patch
@@ -0,0 +1,367 @@
+From 62cd0492e3459416e1775aedc327bced53f66828 Mon Sep 17 00:00:00 2001
+From: Rui Matos <tiagomatos@gmail.com>
+Date: Wed, 9 Jan 2013 10:14:55 -0500
+Subject: [PATCH] client: Queue events while the IBus context isn't ready
+
+There are actually 3 patches here.
+
+---
+client: Queue events while the IBus context isn't ready
+
+We may lose events that ought to be processed while the IBus context
+isn't ready or if the connection to IBus isn't fully established yet.
+
+To avoid that, enqueue events to be processed later when the IBus
+context creation finishes.
+
+---
+client: Don't cancel an ongoing create input context on another request
+
+This would only add more delays.
+
+---
+client: Cancel any ongoing create input context request on finalize
+
+BUG=
+
+Review URL: https://codereview.appspot.com/6988047
+Patch from Rui Matos <tiagomatos@gmail.com>.
+---
+ client/gtk2/ibusimcontext.c |  220 ++++++++++++++++++++++++++-----------------
+ 1 file changed, 133 insertions(+), 87 deletions(-)
+
+diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
+index 011676f..94005b7 100644
+--- a/client/gtk2/ibusimcontext.c
++++ b/client/gtk2/ibusimcontext.c
+@@ -40,6 +40,8 @@
+ #  define IDEBUG(a...)
+ #endif
+ 
++#define MAX_QUEUED_EVENTS 20
++
+ struct _IBusIMContext {
+     GtkIMContext parent;
+ 
+@@ -63,6 +65,7 @@ struct _IBusIMContext {
+ 
+     /* cancellable */
+     GCancellable    *cancellable;
++    GQueue          *events_queue;
+ };
+ 
+ struct _IBusIMContextClass {
+@@ -154,6 +157,8 @@ static void     _slave_preedit_end_cb       (GtkIMContext       *slave,
+ static GtkIMContextClass    *parent_class = NULL;
+ 
+ static IBusBus              *_bus = NULL;
++static guint                _daemon_name_watch_id = 0;
++static gboolean             _daemon_is_running = FALSE;
+ 
+ void
+ ibus_im_context_register_type (GTypeModule *type_module)
+@@ -261,6 +266,46 @@ static void     _slave_preedit_end_cb       (GtkIMContext       *slave,
+     gdk_event_free ((GdkEvent *)event);
+ }
+ 
++static gboolean
++_process_key_event (IBusInputContext *context,
++                    GdkEventKey      *event)
++{
++    guint state = event->state;
++    gboolean retval = FALSE;
++
++    if (event->type == GDK_KEY_RELEASE) {
++        state |= IBUS_RELEASE_MASK;
++    }
++
++    if (_use_sync_mode) {
++        retval = ibus_input_context_process_key_event (context,
++            event->keyval,
++            event->hardware_keycode - 8,
++            state);
++    }
++    else {
++        ibus_input_context_process_key_event_async (context,
++            event->keyval,
++            event->hardware_keycode - 8,
++            state,
++            -1,
++            NULL,
++            _process_key_event_done,
++            gdk_event_copy ((GdkEvent *) event));
++
++        retval = TRUE;
++    }
++
++    if (retval) {
++        event->state |= IBUS_HANDLED_MASK;
++    }
++    else {
++        event->state |= IBUS_IGNORED_MASK;
++    }
++
++    return retval;
++}
++
+ 
+ /* emit "retrieve-surrounding" glib signal of GtkIMContext, if
+  * context->caps has IBUS_CAP_SURROUNDING_TEXT and the current IBus
+@@ -387,38 +432,7 @@ static void     _slave_preedit_end_cb       (GtkIMContext       *slave,
+         ibusimcontext->time = event->time;
+     }
+ 
+-    guint state = event->state;
+-    if (event->type == GDK_KEY_RELEASE) {
+-        state |= IBUS_RELEASE_MASK;
+-    }
+-
+-    if (_use_sync_mode) {
+-        retval = ibus_input_context_process_key_event (
+-                                        ibuscontext,
+-                                        event->keyval,
+-                                        event->hardware_keycode - 8,
+-                                        state);
+-    }
+-    else {
+-        ibus_input_context_process_key_event_async (
+-                                        ibuscontext,
+-                                        event->keyval,
+-                                        event->hardware_keycode - 8,
+-                                        state,
+-                                        -1,
+-                                        NULL,
+-                                        _process_key_event_done,
+-                                        gdk_event_copy ((GdkEvent *) event));
+-        retval = TRUE;
+-
+-    }
+-
+-    if (retval) {
+-        event->state |= IBUS_HANDLED_MASK;
+-    }
+-    else {
+-        event->state |= IBUS_IGNORED_MASK;
+-    }
++    retval = _process_key_event (ibuscontext, event);
+ 
+     if (ibusimcontext != NULL) {
+         /* unref ibusimcontext could call ibus_im_context_finalize here
+@@ -450,6 +464,23 @@ static void     _slave_preedit_end_cb       (GtkIMContext       *slave,
+ }
+ 
+ static void
++daemon_name_appeared (GDBusConnection *connection,
++                      const gchar     *name,
++                      const gchar     *owner,
++                      gpointer         data)
++{
++    _daemon_is_running = TRUE;
++}
++
++static void
++daemon_name_vanished (GDBusConnection *connection,
++                      const gchar     *name,
++                      gpointer         data)
++{
++    _daemon_is_running = FALSE;
++}
++
++static void
+ ibus_im_context_class_init (IBusIMContextClass *class)
+ {
+     IDEBUG ("%s", __FUNCTION__);
+@@ -533,6 +564,14 @@ static void     _slave_preedit_end_cb       (GtkIMContext       *slave,
+     /* always install snooper */
+     if (_key_snooper_id == 0)
+         _key_snooper_id = gtk_key_snooper_install (_key_snooper_cb, NULL);
++
++    _daemon_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
++                                              IBUS_SERVICE_IBUS,
++                                              G_BUS_NAME_WATCHER_FLAGS_NONE,
++                                              daemon_name_appeared,
++                                              daemon_name_vanished,
++                                              NULL,
++                                              NULL);
+ }
+ 
+ static void
+@@ -543,6 +582,8 @@ static void     _slave_preedit_end_cb       (GtkIMContext       *slave,
+         gtk_key_snooper_remove (_key_snooper_id);
+         _key_snooper_id = 0;
+     }
++
++    g_bus_unwatch_name (_daemon_name_watch_id);
+ }
+ 
+ /* Copied from gtk+2.0-2.20.1/modules/input/imcedilla.c to fix crosbug.com/11421.
+@@ -602,6 +643,7 @@ static void     _slave_preedit_end_cb       (GtkIMContext       *slave,
+     ibusimcontext->caps = IBUS_CAP_PREEDIT_TEXT | IBUS_CAP_FOCUS;
+ #endif
+ 
++    ibusimcontext->events_queue = g_queue_new ();
+ 
+     // Create slave im context
+     ibusimcontext->slave = gtk_im_context_simple_new ();
+@@ -651,6 +693,13 @@ static void     _slave_preedit_end_cb       (GtkIMContext       *slave,
+ 
+     g_signal_handlers_disconnect_by_func (_bus, G_CALLBACK (_bus_connected_cb), obj);
+ 
++    if (ibusimcontext->cancellable != NULL) {
++        /* Cancel any ongoing create input context request */
++        g_cancellable_cancel (ibusimcontext->cancellable);
++        g_object_unref (ibusimcontext->cancellable);
++        ibusimcontext->cancellable = NULL;
++    }
++
+     if (ibusimcontext->ibuscontext) {
+         ibus_proxy_destroy ((IBusProxy *)ibusimcontext->ibuscontext);
+     }
+@@ -670,6 +719,9 @@ static void     _slave_preedit_end_cb       (GtkIMContext       *slave,
+         pango_attr_list_unref (ibusimcontext->preedit_attrs);
+     }
+ 
++    g_queue_free_full (ibusimcontext->events_queue,
++                       (GDestroyNotify)gdk_event_free);
++
+     G_OBJECT_CLASS(parent_class)->finalize (obj);
+ }
+ 
+@@ -681,65 +733,56 @@ static void     _slave_preedit_end_cb       (GtkIMContext       *slave,
+ 
+     IBusIMContext *ibusimcontext = IBUS_IM_CONTEXT (context);
+ 
+-    if (G_LIKELY (ibusimcontext->ibuscontext && ibusimcontext->has_focus)) {
+-        /* If context does not have focus, ibus will process key event in sync mode.
+-         * It is a workaround for increase search in treeview.
+-         */
+-        gboolean retval = FALSE;
+-
+-        if (event->state & IBUS_HANDLED_MASK)
+-            return TRUE;
++    if (!_daemon_is_running)
++        return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
+ 
+-        if (event->state & IBUS_IGNORED_MASK)
+-            return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
++    /* If context does not have focus, ibus will process key event in
++     * sync mode.  It is a workaround for increase search in treeview.
++     */
++    if (!ibusimcontext->has_focus)
++        return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
+ 
+-        /* XXX it is a workaround for some applications do not set client window. */
+-        if (ibusimcontext->client_window == NULL && event->window != NULL)
+-            gtk_im_context_set_client_window ((GtkIMContext *)ibusimcontext, event->window);
++    if (event->state & IBUS_HANDLED_MASK)
++        return TRUE;
+ 
+-        _request_surrounding_text (ibusimcontext);
++    if (event->state & IBUS_IGNORED_MASK)
++        return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
+ 
+-        if (ibusimcontext != NULL) {
+-            ibusimcontext->time = event->time;
+-        }
++    /* XXX it is a workaround for some applications do not set client
++     * window. */
++    if (ibusimcontext->client_window == NULL && event->window != NULL)
++        gtk_im_context_set_client_window ((GtkIMContext *)ibusimcontext,
++                                          event->window);
+ 
+-        guint state = event->state;
+-        if (event->type == GDK_KEY_RELEASE) {
+-            state |= IBUS_RELEASE_MASK;
+-        }
++    _request_surrounding_text (ibusimcontext);
+ 
+-        if (_use_sync_mode) {
+-            retval = ibus_input_context_process_key_event (
+-                                        ibusimcontext->ibuscontext,
+-                                        event->keyval,
+-                                        event->hardware_keycode - 8,
+-                                        state);
+-        }
+-        else {
+-            ibus_input_context_process_key_event_async (
+-                                        ibusimcontext->ibuscontext,
+-                                        event->keyval,
+-                                        event->hardware_keycode - 8,
+-                                        state,
+-                                        -1,
+-                                        NULL,
+-                                        _process_key_event_done,
+-                                        gdk_event_copy ((GdkEvent *) event));
+-            retval = TRUE;
+-        }
++    ibusimcontext->time = event->time;
+ 
+-        if (retval) {
+-            event->state |= IBUS_HANDLED_MASK;
++    if (ibusimcontext->ibuscontext) {
++        if (_process_key_event (ibusimcontext->ibuscontext, event))
+             return TRUE;
+-        }
+-        else {
+-            event->state |= IBUS_IGNORED_MASK;
+-            return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
+-        }
++        else
++            return gtk_im_context_filter_keypress (ibusimcontext->slave,
++                                                   event);
+     }
+-    else {
+-        return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
++
++    /* At this point we _should_ be waiting for the IBus context to be
++     * created or the connection to IBus to be established. If that's
++     * the case we queue events to be processed when the IBus context
++     * is ready. */
++    g_return_val_if_fail (ibusimcontext->cancellable != NULL ||
++                          ibus_bus_is_connected (_bus) == FALSE,
++                          FALSE);
++    g_queue_push_tail (ibusimcontext->events_queue,
++                       gdk_event_copy ((GdkEvent *)event));
++
++    if (g_queue_get_length (ibusimcontext->events_queue) > MAX_QUEUED_EVENTS) {
++        g_warning ("Events queue growing too big, will start to drop.");
++        gdk_event_free ((GdkEvent *)
++                        g_queue_pop_head (ibusimcontext->events_queue));
+     }
++
++    return TRUE;
+ }
+ 
+ static void
+@@ -1482,6 +1525,14 @@ static void     _slave_preedit_end_cb       (GtkIMContext       *slave,
+             ibus_input_context_focus_in (ibusimcontext->ibuscontext);
+             _set_cursor_location_internal (ibusimcontext);
+         }
++
++        if (!g_queue_is_empty (ibusimcontext->events_queue)) {
++            GdkEventKey *event;
++            while (event = g_queue_pop_head (ibusimcontext->events_queue)) {
++                _process_key_event (context, event);
++                gdk_event_free ((GdkEvent *)event);
++            }
++        }
+     }
+ 
+     g_object_unref (ibusimcontext);
+@@ -1494,12 +1545,7 @@ static void     _slave_preedit_end_cb       (GtkIMContext       *slave,
+ 
+     g_assert (ibusimcontext->ibuscontext == NULL);
+ 
+-    if (ibusimcontext->cancellable != NULL) {
+-        /* Cancel previous create input context request */
+-        g_cancellable_cancel (ibusimcontext->cancellable);
+-        g_object_unref (ibusimcontext->cancellable);
+-        ibusimcontext->cancellable = NULL;
+-    }
++    g_return_if_fail (ibusimcontext->cancellable == NULL);
+ 
+     ibusimcontext->cancellable = g_cancellable_new ();
+ 
+-- 
+1.7.10
+
diff --git a/app-i18n/ibus/files/ibus-1.5.1-setup.patch b/app-i18n/ibus/files/ibus-1.5.1-setup.patch
new file mode 100644
index 000000000000..54d0f35a2e72
--- /dev/null
+++ b/app-i18n/ibus/files/ibus-1.5.1-setup.patch
@@ -0,0 +1,30 @@
+From 8ac534fc002356b93e2015a8866f1ea89e3895f9 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Sat, 15 Dec 2012 17:40:18 +0900
+Subject: [PATCH] Use Variant.unpack() instead of Variant.dup_strv().
+
+Variant.dup_strv() returns a tuple in pygobject 3.2, e.g. (['<Control>space'], 1L), and a list in pygobject 3.4, e.g. ['<Control>space'] .
+
+BUG=RH#887153
+
+Review URL: https://codereview.appspot.com/6941051
+---
+ setup/main.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup/main.py b/setup/main.py
+index a8acc7a..707faa4 100644
+--- a/setup/main.py
++++ b/setup/main.py
+@@ -87,7 +87,7 @@ def __init_hotkey(self):
+         label = 'switch_engine'
+         variant = self.__config.get_value('general/hotkey', name)
+         if variant != None:
+-            shortcuts = variant.dup_strv()
++            shortcuts = variant.unpack()
+         else:
+             shortcuts =  ['<Control>space']
+ 
+-- 
+1.7.10
+
diff --git a/app-i18n/ibus/ibus-1.5.1-r1.ebuild b/app-i18n/ibus/ibus-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..d8dacc807677
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.1-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.1-r1.ebuild,v 1.1 2013/02/09 16:22:33 naota Exp $
+
+EAPI=4
+PYTHON_DEPEND="python? 2:2.5"
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
+# Vapigen is needed for the vala binding
+# Valac is needed when building from git for the engine
+
+inherit eutils gnome2-utils multilib python vala virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="http://code.google.com/p/ibus/"
+SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="dconf deprecated +gconf gtk +gtk3 +introspection nls +python test vala +X"
+REQUIRED_USE="|| ( gtk gtk3 X )
+	deprecated? ( python )
+	python? ( || ( deprecated ( gtk3 introspection ) ) )" #342903
+
+COMMON_DEPEND=">=dev-libs/glib-2.26:2
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	app-text/iso-codes
+
+	dconf? ( >=gnome-base/dconf-0.13.4 )
+	gconf? ( >=gnome-base/gconf-2.12:2 )
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	X? (
+		x11-libs/libX11
+		x11-libs/gtk+:2 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
+	nls? ( virtual/libintl )"
+RDEPEND="${COMMON_DEPEND}
+	python? (
+		dev-python/pyxdg
+		deprecated? (
+			>=dev-python/dbus-python-0.83
+			dev-python/pygobject:2
+			dev-python/pygtk:2 )
+		gtk3? (
+			dev-python/pygobject:3
+			x11-libs/gdk-pixbuf:2[introspection]
+			x11-libs/pango[introspection]
+			x11-libs/gtk+:3[introspection] )
+	)"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5.8.1
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.16.1 )
+	vala? ( $(vala_depend) )"
+
+# stress test in bus/ fails
+# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
+RESTRICT="test"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
+	sed -e 's/dconf update/$(NULL)/' \
+		-i data/dconf/Makefile.{am,in} || die
+	use python && python_clean_py-compile_files
+	use vala && vala_src_prepare
+	epatch "${FILESDIR}"/${P}-setup.patch \
+		"${FILESDIR}"/${P}-queue-events.patch
+	cp "${S}"/client/gtk2/ibusimcontext.c "${S}"/client/gtk3/ibusimcontext.c || die
+}
+
+src_configure() {
+	local python_conf
+	if use python; then
+		# We cannot call $(PYTHON) if we haven't called python_pkg_setup
+		python_conf="PYTHON=$(PYTHON)
+			$(use_enable deprecated python-library)
+			$(use_enable gtk3 setup)"
+	else
+		python_conf="--disable-python-library --disable-setup"
+	fi
+	econf \
+		$(use_enable dconf) \
+		$(use_enable introspection) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk2) \
+		$(use_enable gtk xim) \
+		$(use_enable gtk3) \
+		$(use_enable gtk3 ui) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable vala) \
+		$(use_enable X xim) \
+		${python_conf}
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-ibus ibus.conf
+
+	keepdir /usr/share/ibus/{engine,icons} #289547
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if use dconf; then
+		ebegin "Updating dconf system databases"
+		dconf update
+		eend $?
+	fi
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	use deprecated && python_mod_optimize ${PN}
+	use python && use gtk3 && python_mod_optimize /usr/share/${PN}
+	gnome2_icon_cache_update
+
+	elog "To use ibus, you should:"
+	elog "1. Get input engines from sunrise overlay."
+	elog "   Run \"emerge -s ibus-\" in your favorite terminal"
+	elog "   for a list of packages we already have."
+	elog
+	elog "2. Setup ibus:"
+	elog
+	elog "   $ ibus-setup"
+	elog
+	elog "3. Set the following in your user startup scripts"
+	elog "   such as .xinitrc, .xsession or .xprofile:"
+	elog
+	elog "   export XMODIFIERS=\"@im=ibus\""
+	elog "   export GTK_IM_MODULE=\"ibus\""
+	elog "   export QT_IM_MODULE=\"xim\""
+	elog "   ibus-daemon -d -x"
+}
+
+pkg_postrm() {
+	if use dconf; then
+		ebegin "Updating dconf system databases"
+		dconf update
+		eend $?
+	fi
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	use deprecated && python_mod_cleanup ${PN}
+	use python && use gtk3 && python_mod_cleanup /usr/share/${PN}
+	gnome2_icon_cache_update
+}