drop old versions, bump 1.5.9; increase vala version to fix dep warning

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)

15 files changed, 192 insertions, 986 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 670cbc616004..5cb599390e06 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.150 2014/08/18 08:33:51 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.151 2014/11/12 14:31:12 dlan Exp $
+
+*ibus-1.5.9 (12 Nov 2014)
+
+  12 Nov 2014; Yixun Lan <dlan@gentoo.org> -ibus-1.4.1.ebuild,
+  -ibus-1.4.2.ebuild, ibus-1.5.5.ebuild, ibus-1.5.8-r1.ebuild,
+  +ibus-1.5.9.ebuild, -files/ibus-1.4.0-machine-id-fallback.patch,
+  -files/ibus-1.4.1-gir.patch, -files/ibus-1.4.1-libxslt-1.1.27.patch,
+  -files/ibus-1.4.1-no-gconf.patch, -files/ibus-1.5.1-queue-events.patch,
+  -files/ibus-1.5.1-setup.patch,
+  -files/ibus-1.5.1-use-system-keyboard-layout.patch,
+  -files/ibus-gconf-2.m4.patch, metadata.xml:
+  drop old versions, bump 1.5.9; increase vala version to fix dep warning
 
   18 Aug 2014; Yixun Lan <dlan@gentoo.org> ibus-1.5.8-r1.ebuild:
   rework dconf sed operation
diff --git a/app-i18n/ibus/files/ibus-1.4.0-machine-id-fallback.patch b/app-i18n/ibus/files/ibus-1.4.0-machine-id-fallback.patch
deleted file mode 100644
index 6932e4cda02e..000000000000
--- a/app-i18n/ibus/files/ibus-1.4.0-machine-id-fallback.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://cgit.freedesktop.org/dbus/dbus/commit/dbus/dbus-sysdeps-unix.c?id=66e52541d5bdd4927a5c702963749760643313f4
-
-http://bugs.gentoo.org/390463
-
---- src/ibusshare.c
-+++ src/ibusshare.c
-@@ -41,7 +41,11 @@ ibus_get_local_machine_id (void)
- 
-     if (machine_id == NULL) {
-         GError *error = NULL;
--        if (!g_file_get_contents ("/var/lib/dbus/machine-id",
-+        if (!g_file_get_contents ("/etc/machine-id",
-+                                  &machine_id,
-+                                  NULL,
-+                                  NULL) &&
-+            !g_file_get_contents ("/var/lib/dbus/machine-id",
-                                   &machine_id,
-                                   NULL,
-                                   &error)) {
diff --git a/app-i18n/ibus/files/ibus-1.4.1-gir.patch b/app-i18n/ibus/files/ibus-1.4.1-gir.patch
deleted file mode 100644
index 91f06c6768b4..000000000000
--- a/app-i18n/ibus/files/ibus-1.4.1-gir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.am.orig
-+++ src/Makefile.am
-@@ -170,7 +170,7 @@ introspection_files =           \
-     ibusenumtypes.h             \
-     $(NULL)
- IBus-1.0.gir: $(libibus) Makefile
--IBus_1_0_gir_SCANNERFLAGS = --pkg=ibus-1.0 $(IBUS_GIR_SCANNERFLAGS)
-+IBus_1_0_gir_SCANNERFLAGS = --pkg-export=ibus-1.0 $(IBUS_GIR_SCANNERFLAGS)
- IBus_1_0_gir_INCLUDES = GLib-2.0 GObject-2.0 Gio-2.0
- IBus_1_0_gir_LIBS = $(libibus)
- IBus_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files))
diff --git a/app-i18n/ibus/files/ibus-1.4.1-libxslt-1.1.27.patch b/app-i18n/ibus/files/ibus-1.4.1-libxslt-1.1.27.patch
deleted file mode 100644
index 4b135bfd9ad0..000000000000
--- a/app-i18n/ibus/files/ibus-1.4.1-libxslt-1.1.27.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Fixes building documents.
-https://bugs.gentoo.org/442904
-
---- ibus-1.4.2.orig/docs/reference/ibus/ibus-docs.sgml.in
-+++ ibus-1.4.2/docs/reference/ibus/ibus-docs.sgml.in
-@@ -74,8 +74,10 @@
-       <xi:include href="xml/ibusenginedesc.xml"/>
-       <xi:include href="xml/ibusfactory.xml"/>
-       <xi:include href="xml/ibusinputcontext.xml"/>
-+      <xi:include href="xml/ibuskeys.xml"/>
-       <xi:include href="xml/ibuskeymap.xml"/>
-       <xi:include href="xml/ibuskeysyms.xml"/>
-+      <xi:include href="xml/ibusutil.xml"/>
-   </chapter>
-   <chapter>
-       <title>Configuration</title>
-@@ -92,9 +94,6 @@
-       <title>Communication</title>
-       <para>Here lists the service communication functions.</para>
-       <xi:include href="xml/ibusbus.xml"/>
--      <xi:include href="xml/ibusconnection.xml"/>
--      <xi:include href="xml/ibusmessage.xml"/>
--      <xi:include href="xml/ibuspendingcall.xml"/>
-       <xi:include href="xml/ibusproxy.xml"/>
-       <xi:include href="xml/ibusserializable.xml"/>
-       <xi:include href="xml/ibusservice.xml"/>
-@@ -104,11 +103,18 @@
-       <para>Definition and functions for IBus internal use.</para>
-       <xi:include href="xml/ibusdebug.xml"/>
-       <xi:include href="xml/ibuserror.xml"/>
--      <xi:include href="xml/ibusmainloop.xml"/>
-       <xi:include href="xml/ibusobject.xml"/>
--      <xi:include href="xml/ibusserver.xml"/>
-       <xi:include href="xml/ibusshare.xml"/>
-       <xi:include href="xml/ibustypes.xml"/>
-   </chapter>
-+  <index id="api-index-full">
-+    <title>Index</title>
-+    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
-+  </index>
-+  <index id="api-index-deprecated" role="deprecated">
-+    <title>Index of deprecated symbols</title>
-+    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
-+  </index>
-+  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
- </book>
- 
---- ibus-1.4.2.orig/src/ibusobservedpath.h
-+++ ibus-1.4.2/src/ibusobservedpath.h
-@@ -75,6 +75,7 @@ struct _IBusObservedPath {
-     IBusSerializable parent;
-     /* instance members */
- 
-+    /*< public >*/
-     gchar *path;
-     glong mtime;
-     gboolean is_dir;
---- ibus-1.4.2.orig/src/ibusproperty.h
-+++ ibus-1.4.2/src/ibusproperty.h
-@@ -124,15 +124,15 @@ typedef struct _IBusPropListClass IBusPr
- 
- /**
-  * IBusProperty:
-- * @key: Unique Identity for the IBusProperty.
-- * @icon: Icon file for the IBusProperty.
-- * @label: Text shown in UI.
-- * @tooltip: Message shown if mouse hovered the  IBusProperty.
-- * @sensitive: Whether the IBusProperty is sensitive to keyboard and mouse event.
-- * @visible: Whether the IBusProperty is visible.
-- * @type: IBusPropType of IBusProperty.
-- * @state: IBusPropState of IBusProperty.
-- * @sub_props: IBusPropList that contains sub IBusProperties. These IBusProperties are usually
-+ * key: Unique Identity for the IBusProperty.
-+ * icon: Icon file for the IBusProperty.
-+ * label: Text shown in UI.
-+ * tooltip: Message shown if mouse hovered the  IBusProperty.
-+ * sensitive: Whether the IBusProperty is sensitive to keyboard and mouse event.
-+ * visible: Whether the IBusProperty is visible.
-+ * type: IBusPropType of IBusProperty.
-+ * state: IBusPropState of IBusProperty.
-+ * sub_props: IBusPropList that contains sub IBusProperties. These IBusProperties are usually
-  * shown as sub menu item.
-  *
-  * UI component for input method engine property.
-
diff --git a/app-i18n/ibus/files/ibus-1.4.1-no-gconf.patch b/app-i18n/ibus/files/ibus-1.4.1-no-gconf.patch
deleted file mode 100644
index bdc1f206a2d0..000000000000
--- a/app-i18n/ibus/files/ibus-1.4.1-no-gconf.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur ibus-1.4.1.orig/configure.ac ibus-1.4.1/configure.ac
---- ibus-1.4.1.orig/configure.ac	2012-02-05 23:04:15.000000000 +0900
-+++ ibus-1.4.1/configure.ac	2012-02-06 01:20:18.303186786 +0900
-@@ -259,23 +259,8 @@
- )
- AM_CONDITIONAL([ENABLE_GCONF], [test x"$enable_gconf" = x"yes"])
- 
--if test x"$enable_gconf" = x"yes"; then
--    # check gconf
--    PKG_CHECK_MODULES(GCONF,
--        [gconf-2.0 >= 2.12],
--    )
--
--    AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
--    if test x"$GCONFTOOL" = xno; then
--        AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
--    fi
--
--    AM_GCONF_SOURCE_2
--    # GCONF_SCHEMAS_INSTALL should be set in macro AM_GCONF_SOURCE_2
--else
--    AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
--    enable_gconf="no (disabled, use --enable-gconf to enable)"
--fi
-+AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
-+enable_gconf="no (disabled, use --enable-gconf to enable)"
- 
- # --enable-memconf option.
- AC_ARG_ENABLE(memconf,
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
deleted file mode 100644
index 38c3fe9865a9..000000000000
--- a/app-i18n/ibus/files/ibus-1.5.1-queue-events.patch
+++ /dev/null
@@ -1,367 +0,0 @@
-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
deleted file mode 100644
index 54d0f35a2e72..000000000000
--- a/app-i18n/ibus/files/ibus-1.5.1-setup.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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/files/ibus-1.5.1-use-system-keyboard-layout.patch b/app-i18n/ibus/files/ibus-1.5.1-use-system-keyboard-layout.patch
deleted file mode 100644
index 56d99a0b9478..000000000000
--- a/app-i18n/ibus/files/ibus-1.5.1-use-system-keyboard-layout.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
-index dbb6da8..54ccb4c 100644
---- a/data/ibus.schemas.in
-+++ b/data/ibus.schemas.in
-@@ -224,7 +224,7 @@
-       <applyto>/desktop/ibus/general/use_system_keyboard_layout</applyto>
-       <owner>ibus</owner>
-       <type>bool</type>
--      <default>true</default>
-+      <default>false</default>
-       <locale name="C">
-         <short>Use system keyboard layout</short>
- 	    <long>Use system keyboard (XKB) layout</long>
-diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
-index 24e6b2e..18ef5c0 100644
---- a/ui/gtk3/panel.vala
-+++ b/ui/gtk3/panel.vala
-@@ -48,6 +48,7 @@ class Panel : IBus.PanelService {
-     private Gtk.AboutDialog m_about_dialog;
-     private Gtk.CssProvider m_css_provider;
-     private int m_switcher_delay_time = 400;
-+    private bool m_use_system_keyboard_layout = false;
-     private const string ACCELERATOR_SWITCH_IME_FOREWARD = "<Control>space";
- 
-     private GLib.List<Keybinding> m_keybindings = new GLib.List<Keybinding>();
-@@ -265,6 +266,22 @@ class Panel : IBus.PanelService {
-         }
-     }
- 
-+    private void set_use_system_keyboard_layout(Variant? variant) {
-+        Variant var_use_system_kbd_layout = variant;
-+
-+        if (var_use_system_kbd_layout == null) {
-+            var_use_system_kbd_layout = m_config.get_value(
-+                    "general",
-+                    "use_system_keyboard_layout");
-+        }
-+
-+        if (var_use_system_kbd_layout == null) {
-+            return;
-+        }
-+
-+        m_use_system_keyboard_layout = var_use_system_kbd_layout.get_boolean();
-+    }
-+
-     public void set_config(IBus.Config config) {
-         if (m_config != null) {
-             m_config.value_changed.disconnect(config_value_changed_cb);
-@@ -278,9 +295,13 @@ class Panel : IBus.PanelService {
-             m_config.watch("general", "preload_engines");
-             m_config.watch("general", "engines_order");
-             m_config.watch("general", "switcher_delay_time");
-+            m_config.watch("general", "use_system_keyboard_layout");
-             m_config.watch("general/hotkey", "triggers");
-             m_config.watch("panel", "custom_font");
-             m_config.watch("panel", "use_custom_font");
-+            // Update m_use_system_keyboard_layout before update_engines()
-+            // is called.
-+            set_use_system_keyboard_layout(null);
-             update_engines(m_config.get_value("general", "preload_engines"),
-                            m_config.get_value("general", "engines_order"));
-             unbind_switch_shortcut();
-@@ -352,7 +373,9 @@ class Panel : IBus.PanelService {
-             return;
-         }
-         // set xkb layout
--        exec_setxkbmap(engine);
-+        if (!m_use_system_keyboard_layout) {
-+            exec_setxkbmap(engine);
-+        }
-     }
- 
-     private void config_value_changed_cb(IBus.Config config,
-@@ -380,6 +403,11 @@ class Panel : IBus.PanelService {
-             set_switcher_delay_time(variant);
-             return;
-         }
-+
-+        if (section == "general" && name == "use_system_keyboard_layout") {
-+            set_use_system_keyboard_layout(variant);
-+            return;
-+        }
-     }
- 
-     private void handle_engine_switch(Gdk.Event event, bool revert) {
diff --git a/app-i18n/ibus/files/ibus-gconf-2.m4.patch b/app-i18n/ibus/files/ibus-gconf-2.m4.patch
deleted file mode 100644
index 266a2bf61339..000000000000
--- a/app-i18n/ibus/files/ibus-gconf-2.m4.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-http://bugs.gentoo.org/395239
-
---- m4/gconf-2.m4
-+++ m4/gconf-2.m4
-@@ -0,0 +1,44 @@
-+dnl AM_GCONF_SOURCE_2
-+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-+dnl  (i.e. pass to gconftool-2
-+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-+dnl  you should install foo.schemas files
-+dnl
-+
-+AC_DEFUN([AM_GCONF_SOURCE_2],
-+[
-+  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-+    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-+  else
-+    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-+  fi
-+
-+  AC_ARG_WITH([gconf-source],
-+	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
-+			     [Config database for installing schema files.]),
-+	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
-+
-+  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-+  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-+
-+  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-+    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-+  fi
-+
-+  AC_ARG_WITH([gconf-schema-file-dir],
-+	      AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-+			     [Directory for installing schema files.]),
-+	      [GCONF_SCHEMA_FILE_DIR="$withval"],)
-+
-+  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-+  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-+
-+  AC_ARG_ENABLE(schemas-install,
-+  	AC_HELP_STRING([--disable-schemas-install],
-+		       [Disable the schemas installation]),
-+     [case ${enableval} in
-+       yes|no) ;;
-+       *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
-+      esac])
-+  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
-+])
diff --git a/app-i18n/ibus/ibus-1.4.1.ebuild b/app-i18n/ibus/ibus-1.4.1.ebuild
deleted file mode 100644
index c05570d662a7..000000000000
--- a/app-i18n/ibus/ibus-1.4.1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# 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.4.1.ebuild,v 1.15 2013/05/14 06:05:49 naota Exp $
-
-EAPI=4
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit eutils gnome2-utils multilib python autotools vala
-
-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="amd64 arm ppc ppc64 x86 ~x86-fbsd"
-IUSE="dconf doc +gconf gtk gtk3 +introspection nls +python vala +X"
-REQUIRED_USE="|| ( gtk gtk3 X )" #342903
-
-RDEPEND=">=dev-libs/glib-2.26
-	dconf? ( >=gnome-base/dconf-0.7.5 )
-	gconf? ( >=gnome-base/gconf-2.12:2 )
-	gnome-base/librsvg
-	sys-apps/dbus[X?]
-	app-text/iso-codes
-	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 )
-	python? (
-		dev-python/notify-python
-		>=dev-python/dbus-python-0.83
-	)
-	nls? ( virtual/libintl )
-	vala? ( $(vala_depend) )"
-#	X? ( x11-libs/libX11 )
-#	gtk? ( x11-libs/gtk+:2 x11-libs/gtk+:3 )
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5.8.1
-	dev-util/intltool
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )
-	nls? ( >=sys-devel/gettext-0.16.1 )"
-RDEPEND="${RDEPEND}
-	x11-apps/setxkbmap
-	python? (
-		dev-python/pygtk
-		dev-python/pyxdg
-	)"
-
-RESTRICT="test"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-update_gtk_immodules() {
-	local GTK2_CONFDIR="/etc/gtk-2.0"
-	# bug #366889
-	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
-		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
-	fi
-	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
-
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
-
-update_gtk3_immodules() {
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
-	fi
-}
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	>py-compile #397497
-	echo ibus/_config.py >> po/POTFILES.skip
-	use vala && vala_src_prepare
-
-	epatch \
-		"${FILESDIR}"/${PN}-gconf-2.m4.patch \
-		"${FILESDIR}"/${PN}-1.4.0-machine-id-fallback.patch \
-		"${FILESDIR}"/${PN}-1.4.1-gir.patch \
-		"${FILESDIR}"/${PN}-1.4.1-libxslt-1.1.27.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	# We cannot call $(PYTHON) if we haven't called python_pkg_setup
-	use python && PYTHON=$(PYTHON) || PYTHON=
-	econf \
-		$(use_enable dconf) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable doc gtk-doc-html) \
-		$(use_enable introspection) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk2) \
-		$(use_enable gtk xim) \
-		$(use_enable gtk3) \
-		$(use_enable nls) \
-		$(use_enable python) \
-		$(use_enable vala) \
-		$(use_enable X xim) \
-		PYTHON="${PYTHON}"
-}
-
-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() {
-	use gconf && gnome2_gconf_install
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
-	use python && 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() {
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
-	use python && python_mod_cleanup /usr/share/${PN}
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/ibus/ibus-1.4.2.ebuild b/app-i18n/ibus/ibus-1.4.2.ebuild
deleted file mode 100644
index 88f7a88a72a4..000000000000
--- a/app-i18n/ibus/ibus-1.4.2.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# 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.4.2.ebuild,v 1.7 2013/05/14 06:05:49 naota Exp $
-
-EAPI=4
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit eutils gnome2-utils multilib python autotools vala
-
-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="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dconf doc +gconf gtk gtk3 +introspection nls +python vala +X"
-REQUIRED_USE="|| ( gtk gtk3 X )" #342903
-
-RDEPEND=">=dev-libs/glib-2.26
-	dconf? ( >=gnome-base/dconf-0.7.5 )
-	gconf? ( >=gnome-base/gconf-2.12:2 )
-	gnome-base/librsvg
-	sys-apps/dbus[X?]
-	app-text/iso-codes
-	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 )
-	python? (
-		dev-python/notify-python
-		>=dev-python/dbus-python-0.83
-	)
-	nls? ( virtual/libintl )
-	vala? ( $(vala_depend) )"
-#	X? ( x11-libs/libX11 )
-#	gtk? ( x11-libs/gtk+:2 x11-libs/gtk+:3 )
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5.8.1
-	dev-util/intltool
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )
-	nls? ( >=sys-devel/gettext-0.16.1 )"
-RDEPEND="${RDEPEND}
-	x11-apps/setxkbmap
-	python? (
-		dev-python/pygtk
-		dev-python/pyxdg
-	)"
-
-RESTRICT="test"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	>py-compile #397497
-	echo ibus/_config.py >> po/POTFILES.skip
-	use vala && vala_src_prepare
-
-	epatch \
-		"${FILESDIR}"/${PN}-gconf-2.m4.patch \
-		"${FILESDIR}"/${PN}-1.4.1-libxslt-1.1.27.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	# We cannot call $(PYTHON) if we haven't called python_pkg_setup
-	use python && PYTHON=$(PYTHON) || PYTHON=
-	econf \
-		$(use_enable dconf) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable doc gtk-doc-html) \
-		$(use_enable introspection) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk2) \
-		$(use_enable gtk xim) \
-		$(use_enable gtk3) \
-		$(use_enable nls) \
-		$(use_enable python) \
-		$(use_enable vala) \
-		$(use_enable X xim) \
-		PYTHON="${PYTHON}"
-}
-
-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() {
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use python && 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() {
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use python && python_mod_cleanup /usr/share/${PN}
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/ibus/ibus-1.5.5.ebuild b/app-i18n/ibus/ibus-1.5.5.ebuild
index f9ee1b70da47..16bf2f55be2a 100644
--- a/app-i18n/ibus/ibus-1.5.5.ebuild
+++ b/app-i18n/ibus/ibus-1.5.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.5.ebuild,v 1.7 2014/08/01 08:28:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.5.ebuild,v 1.8 2014/11/12 14:31:12 dlan Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
-VALA_MIN_API_VERSION="0.18"
+VALA_MIN_API_VERSION="0.20"
 VALA_USE_DEPEND="vapigen"
 # Vapigen is needed for the vala binding
 # Valac is needed when building from git for the engine
diff --git a/app-i18n/ibus/ibus-1.5.8-r1.ebuild b/app-i18n/ibus/ibus-1.5.8-r1.ebuild
index 3c088720b2f6..939e5218f081 100644
--- a/app-i18n/ibus/ibus-1.5.8-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.8-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.8-r1.ebuild,v 1.2 2014/08/18 08:33:51 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.8-r1.ebuild,v 1.3 2014/11/12 14:31:12 dlan Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION="0.18"
+VALA_MIN_API_VERSION="0.20"
 VALA_USE_DEPEND="vapigen"
 # Vapigen is needed for the vala binding
 # Valac is needed when building from git for the engine
diff --git a/app-i18n/ibus/ibus-1.5.9.ebuild b/app-i18n/ibus/ibus-1.5.9.ebuild
new file mode 100644
index 000000000000..c8c0a1b5dcd1
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.9.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.9.ebuild,v 1.1 2014/11/12 14:31:12 dlan Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+VALA_MIN_API_VERSION="0.20"
+VALA_USE_DEPEND="vapigen"
+# Vapigen is needed for the vala binding
+# Valac is needed when building from git for the engine
+
+inherit bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="http://code.google.com/p/ibus/"
+SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
+REQUIRED_USE="|| ( gtk gtk3 X )
+	deprecated? ( python )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		|| ( deprecated ( gtk3 introspection ) ) )" #342903
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.26:2
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	app-text/iso-codes
+	>=gnome-base/dconf-0.13.4
+	x11-libs/libnotify
+
+	gconf? ( >=gnome-base/gconf-2.12:2 )
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	python? ( ${PYTHON_DEPS} )
+	X? (
+		x11-libs/libX11
+		x11-libs/gtk+:2 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
+	nls? ( virtual/libintl )
+	wayland? ( dev-libs/wayland )"
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/setxkbmap
+	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) )
+	gnome-base/gconf"
+
+# 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"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To use ibus, you should:
+1. Get input engines from sunrise overlay.
+Run \"emerge -s ibus-\" in your favorite terminal
+for a list of packages we already have.
+
+2. Setup ibus:
+$ ibus-setup
+
+3. Set the following in your user startup scripts
+such as .xinitrc, .xsession or .xprofile:
+
+export XMODIFIERS=\"@im=ibus\"
+export GTK_IM_MODULE=\"ibus\"
+export QT_IM_MODULE=\"xim\"
+ibus-daemon -d -x
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
+	sed -e 's/dconf update/:/' \
+		-i data/dconf/Makefile.{am,in} || die
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local python_conf
+	if use python; then
+		python_conf="PYTHON=${PYTHON}
+			$(use_enable deprecated python-library)
+			$(use_enable gtk3 setup)"
+	else
+		python_conf="--disable-python-library --disable-setup"
+	fi
+	econf \
+		--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 X xim) \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		${python_conf}
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+
+	mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
+	rm -rf "${ED}"/usr/share/bash-completion || die
+	newbashcomp "${T}"/ibus.bash ${PN}
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-ibus ibus.conf
+
+	keepdir /usr/share/ibus/{engine,icons} #289547
+
+	use deprecated && python_optimize
+	use python && use gtk3 && python_optimize
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_schemas_savelist
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	use gconf && gnome2_schemas_update
+	gnome2_schemas_savelist
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml
index 8aff7428d371..aa28d00b9544 100644
--- a/app-i18n/ibus/metadata.xml
+++ b/app-i18n/ibus/metadata.xml
@@ -8,7 +8,6 @@ full featured and user friendly input method user interface. It also may help
 developers to develop input method easily.
 </longdescription>
   <use>
-    <flag name="dconf">Enable support for <pkg>gnome-base/dconf</pkg></flag>
     <flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag>
     <flag name="gtk3">Enable support for gtk+3</flag>
     <flag name="vala">Enable support for <pkg>dev-lang/vala</pkg></flag>