gentoo Easter resync : 12.04.2020

9 files changed, 191 insertions, 746 deletions

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 04e5499c8fe7..d87c8e90cdc3 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,12 +1,6 @@
-AUX ibus-1.5.18-enable-gsettings-in-runtest.patch 1707 BLAKE2B 760f99faf079a65b7c36e355f19f16e71a0d3fa5dcee2a8201e571732c317f238d7bac7bcde6d823d5ff6ecde40c430ff310356f921d665f08708c4b5e24c4d0 SHA512 fedcb39f6a4b70055aae2dd90a03fa6e709feebeff20bd5df30deec3346c85036ede017c0a8bab92680a5a004e50e5e450b288bd8981889a8b1cd89334f74531
-AUX ibus-1.5.19-gdk-wayland.patch 2996 BLAKE2B d203c843a0ba692c1be81c1172866bea6ea30e6ea25c562d04ad31934af48f4e2bcc5d5ec862af049a026c3656c0fce960715c7271514e1d4faa54c8f6ed369c SHA512 e53619feafc4f5e7cc662d0c59be5beda916dc3b2ec2f74121b6b3fb874ed3bc15f43ee739b272f2304344c9acbc399b5c522d2f5d54695aca7e48d4b68430bb
-AUX ibus-1.5.19-vala-0.43.4.patch 8430 BLAKE2B 2c87c226b3e52710eac046d5c822031626629f8cc1fd85701f2102ea75883a55391c1f33909d041c31f78c0c305a23515b3151e35f92f2a4ff06d39c4b415e66 SHA512 cdbf1b5ab214a62c67d46c689c2f8ff98ab273b7faba6dafd88b3be78227c2897710ff105938936b93435c0f2ee896f2ffbea78ecfa96e59323e0535b799f367
-DIST ibus-1.5.18.tar.gz 2760121 BLAKE2B dfcf549362ac9ac0cb9adb9cedc3fd7146877a42e0e086ad7be18ccb6239868ed940d2c371d83c2e2706c7120702af0bcb0106da60889f0b3d5857b8929b9165 SHA512 34519c3464eaf2cac3320e1568fc76f4edb281afa70f335c015b828ff4e86b3224d77b95cdc0b2e76e42459c54b1044264ff226963fe739dd553ac7326d2f2d3
-DIST ibus-1.5.19.tar.gz 2842274 BLAKE2B a5aea4770c1c0a58a9e0b1aa26f47a8ab9eb5060a0c06179663984c5b531464ff4575a8ece2f2ee2122f777ca615296c1e46ad4833c68ba2da038f2b85dea374 SHA512 ddcd464c9afb6d081df1cfac65069506877eb4818c3ba5594bcf76f3c6795ef6c17177a778dc89b2ef69d10d87297aa12c8e04f156b750e500b51b32787bd9fc
-DIST ibus-1.5.20.tar.gz 3393487 BLAKE2B 0ed930cbadf7ecf9fa82ee2c0e2a8aa8cfb25a8dc1a2e2ffef0d4f894df31f879f08d7ed14508736836545cbc25b929707939c3b0ea53f2b44ba7489d6dc80ed SHA512 2bbcc19742882fa55d9c8704251f133c5be9f36a93cf52d70c460a4713419868deb634f965e67c1d5c45b615de388b92c0fbb863b118a546fbb89370a38eb77b
+AUX ibus-1.5.21-fix-authorization.patch 6553 BLAKE2B 99207da7679f7751cc90ed9b23e0ed29a472a79b953b122812ece3b883da9ce0542107d61ab409785935d3a7a7cb5dd47a6fc87aa31c026d60524486983b5673 SHA512 66348c8c1894654e432ce3b13e9858adc291c896ac343842486df14fb543d0816cafd4719d91d2417b1d750e0d056ce3a5c8d72498a80bebbb0bc47c3dc0f73f
 DIST ibus-1.5.21.tar.gz 3463069 BLAKE2B 75b9e7cc4d84b69941d53321da1fe63ad911740a36ed51c7fceaa2a7bc30f6ae39d3f575b4b5fc4268d7c3b3e1c0bae11881dd7a8b7bd441ecf89c83c7279858 SHA512 c7c06e13e78fb4d4d26ce8975b6db4f7914efb325a903999a82197229e13d5ebb4afc876ef67e1d86db58f08c16350dc095aaea050b2f69c2bfc4c452adc5331
-EBUILD ibus-1.5.18.ebuild 4317 BLAKE2B 704b07c49a7f2fc61f639d805039edc75de499658afd5e2307e392b4acc315502b779a46a3f519da462e7da3c42b2344f979894bae5cbabc2fc72bb13ad8aa94 SHA512 fd67d859e5ec0c9d48a86c2064ff8766be66d743e0a342ab8cd277924ab865b2df60419eff2a7604688e5e40b4e9b0def868696f4e430d374300db88d3c6629b
-EBUILD ibus-1.5.19.ebuild 4431 BLAKE2B 0fd2ce30ac58f8a650b52482b3b3c46f10d89fee3a0f3f20e3a6b4e0a07f713af5da86c9a740f6ad8a97a5acff25c2d6121a3fbf82cc17bef91f3a9d74e877aa SHA512 56770a304f75a5f93b9effc63fe8c21dfb51e019af00bea7d3e99e37b0e9dd2ccccf9e647815fdcf21ec9a5ee47ece587302d8c2c8cccaae61c581a7b07a9ff5
-EBUILD ibus-1.5.20.ebuild 4142 BLAKE2B f2900cffaaf23fdea948172b8171061df4ec4b0ac86dd35518d7cba01555d6c7db45687424b5e0647abdf80900180131cd73b05b88a5b578ba1c289a418891a1 SHA512 465d545578163fe8a90b9e7fc26959c1912962b7058aa72103de12bc879f978bc1e02de5ebf23b73524b00e94a2307982068e77af6361178a1d132778de4cafa
-EBUILD ibus-1.5.21.ebuild 4150 BLAKE2B 538ed0faf3ad25242f9c5e5ec8b8cd0e40d9a0665f7acd37c4e703f6302b4d06488a4e22ec1af63835329909b821da53f94f38733b432e52d0c87c54d0a8c06d SHA512 e0fc70e73398d013bc206f4eb2b493133674e48d9fff443c25159d60b174dc22e5ad36120504ed692853c49a9d5a28e6c6eb76814f31f945b91fb6c88e757400
+DIST ibus-1.5.22.tar.gz 3578251 BLAKE2B 08ad72bd455d2841700b11a4ade88e2b9768433f86bac4baf20db882580b10a4705f545a845a03d3b4196a75c43d33c51ffd31a3516d71030f891ce48dce69c2 SHA512 0abe89acc6da8cea484a6b9f807c08e94869072f374f9e8f4541a426636f818f1c3cb8b9237f97245771f9e4bf19184983d8ac924177dc4824ca6e8b5304425d
+EBUILD ibus-1.5.21-r1.ebuild 4198 BLAKE2B 9da040a6f282dae6c6a669672ca2e346e2ddb111dc2bb9d6469736258139a77c9dac2da81996a1f915110e3f8b588544c214d84dbd0baa2e6788890675c3fc8e SHA512 ec0eedb15e94a726375235e9fdc17397911a86755b94c68d6d647523b542c68cedd761011052117c4de9087c4c53f92d03a67147d01b237d703a31d7c4725b17
+EBUILD ibus-1.5.22.ebuild 4126 BLAKE2B 1ddb8d94ac83d214f080c1ad7dc63aa3fac674c2c03c1f9b6b0e4382f9d220d7ec556890f9b80eacfe84d519a933812f70d4df57ee18714100fc10e334c7b6da SHA512 9d89cae90bbfe5fc6d0492325bb4ac7f724e80f70e467bf12a32dd6d9e343abce9a064245c33a5b697dbbfbb01c4ba326fe0d83dc651d489ded9e924cd650346
 MISC metadata.xml 942 BLAKE2B 9d8f0df17ae7c5c60892a8bf661c1f7325f4943e30d51667fe5e56f2c74f55e36c6f40cd6044435b9f046a88a267fa1b5d46f6cddc0cefa6b423554ff905e882 SHA512 5501b7ef3b46de30b69eabe28334556c979c99610f0a6051a254a7591de612d99ea9ee3c18c2f3869ae2046514df8cd555d801cc778bc1db111895256b7ab100
diff --git a/app-i18n/ibus/files/ibus-1.5.18-enable-gsettings-in-runtest.patch b/app-i18n/ibus/files/ibus-1.5.18-enable-gsettings-in-runtest.patch
deleted file mode 100644
index 24b5cd3f6a8c..000000000000
--- a/app-i18n/ibus/files/ibus-1.5.18-enable-gsettings-in-runtest.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 4b4fe00cc2750713ef8d2bc0a9f396ab577c36fc Mon Sep 17 00:00:00 2001
-From: Naohiro Aota <naota@gentoo.org>
-Date: Thu, 4 Oct 2018 18:14:17 +0900
-Subject: [PATCH] src/tests: Enable GSettings in runtest in ibus-1.5.18
-
-This patch is based on:
-https://github.com/ibus/ibus/commit/10cc30eac200d10b581d9d2122d5a732f4880943
-
-Signed-off-by: Naohiro Aota <naota@gentoo.org>
----
- src/tests/runtest | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/src/tests/runtest b/src/tests/runtest
-index 0e43fee..84d85ab 100755
---- a/src/tests/runtest
-+++ b/src/tests/runtest
-@@ -29,6 +29,7 @@ ibus-engine-switch
- ibus-compose
- test-stress
- "
-+IBUS_SCHEMA_FILE='org.freedesktop.ibus.gschema.xml'
- 
- # Portable replacement of basename.
- func_basename () {
-@@ -80,6 +81,12 @@ trap 'func_cleanup $tstdir' 1 2 3 15
- tst=$1; shift
- tstdir=tmp-`func_basename $tst`
- 
-+# IBusEngine has GSettings
-+if test ! -f "$top_builddir/data/dconf/$IBUS_SCHEMA_FILE" ; then
-+    echo "NOT FOUND $top_builddir/data/dconf/$IBUS_SCHEMA_FILE"
-+    exit -1
-+fi
-+
- test -d $tstdir || mkdir $tstdir
- 
- ( cd $tstdir
-@@ -101,6 +108,20 @@ test -d $tstdir || mkdir $tstdir
-     IBUS_ADDRESS_FILE=$PWD/ibus-daemon.pid
-     export IBUS_ADDRESS_FILE
- 
-+    cp "../$top_builddir/data/dconf/$IBUS_SCHEMA_FILE" $PWD
-+    glib-compile-schemas $PWD
-+    if test $? -ne 0 ; then
-+        echo "FAILED glib-compile-schemas"
-+        retval=1
-+        return
-+    fi
-+    if test ! -f $PWD/gschemas.compiled ; then
-+        echo "NOT FOUND $PWD/gschemas.compiled"
-+        retval=1
-+        return
-+    fi
-+    export GSETTINGS_SCHEMA_DIR=$PWD
-+
-     # Start ibus-daemon.
-     ../$top_builddir/bus/ibus-daemon \
-     --daemonize \
--- 
-2.19.0
-
diff --git a/app-i18n/ibus/files/ibus-1.5.19-gdk-wayland.patch b/app-i18n/ibus/files/ibus-1.5.19-gdk-wayland.patch
deleted file mode 100644
index 8eed29daf397..000000000000
--- a/app-i18n/ibus/files/ibus-1.5.19-gdk-wayland.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From aa0f4252ff965729b871c91b4ed089bf98963c0b Mon Sep 17 00:00:00 2001
-From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Fri, 10 Aug 2018 15:43:58 +0900
-Subject: [PATCH] ui/gtk3: Check if gdk-wayland is installed
-
-BUG=https://github.com/ibus/ibus/issues/2035
----
- configure.ac              | 10 ++++++++++
- ui/gtk3/Makefile.am       |  5 ++++-
- ui/gtk3/panelbinding.vala |  5 +++++
- 3 files changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 091e20f2..4b6a7a21 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -237,12 +237,21 @@ if test x"$enable_gtk3" = x"yes"; then
-     PKG_CHECK_MODULES(GTK3, [
-         gtk+-3.0
-     ])
-+    PKG_CHECK_EXISTS([gdk-wayland-3.0],
-+        [enable_gdk3_wayland=yes],
-+        [enable_gdk3_wayland=no]
-+    )
- 
-     gtk3_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
-     GTK3_IM_MODULEDIR="$libdir"/gtk-3.0/$gtk3_binary_version/immodules
- else
-     enable_gtk3="no (disabled, use --enable-gtk3 to enable)"
-+    enable_gdk3_wayland=no
-+fi
-+if test x"$enable_gdk3_wayland" != x"yes"; then
-+    enable_gdk3_wayland="no (disabled, need to install gdk-wayland-3.0.pc)"
- fi
-+AM_CONDITIONAL([ENABLE_GDK3_WAYLAND], [test x"$enable_gdk3_wayland" = x"yes"])
- 
- if test x"$enable_xim" = x"yes"; then
-     # Check for x11
-@@ -785,6 +794,7 @@ Build options:
-   Build gtk3 immodule           $enable_gtk3
-   Build XIM agent server        $enable_xim
-   Build wayland support         $enable_wayland
-+  Build gdk3 wayland support    $enable_gdk3_wayland
-   Build appindicator support    $enable_appindicator
-   Build appindicator engine icon $enable_appindicator_engine_icon
-   Build python library          $enable_python_library
-diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
-index aaba7a4d..6ebc96ce 100644
---- a/ui/gtk3/Makefile.am
-+++ b/ui/gtk3/Makefile.am
-@@ -78,7 +78,6 @@ AM_VALAFLAGS = \
- 	--pkg=ibus-1.0 \
- 	--pkg=config \
- 	--pkg=xi \
--	--pkg=gdk-wayland \
- 	--target-glib="$(VALA_TARGET_GLIB_VERSION)" \
- 	$(NULL)
- 
-@@ -105,6 +104,10 @@ if ENABLE_APPINDICATOR_ENGINE_ICON
- AM_VALAFLAGS += --define=INDICATOR_ENGINE_ICON
- endif
- 
-+if ENABLE_GDK3_WAYLAND
-+AM_VALAFLAGS += --pkg=gdk-wayland --define=USE_GDK_WAYLAND
-+endif
-+
- libexec_PROGRAMS = ibus-ui-gtk3
- 
- ibus_ui_gtk3_SOURCES = \
-diff --git a/ui/gtk3/panelbinding.vala b/ui/gtk3/panelbinding.vala
-index 95115b13..981b5509 100644
---- a/ui/gtk3/panelbinding.vala
-+++ b/ui/gtk3/panelbinding.vala
-@@ -237,9 +237,14 @@ class PanelBinding : IBus.PanelService {
-         GLib.Object(connection : bus.get_connection(),
-                     object_path : IBus.PATH_PANEL_EXTENSION_EMOJI);
- 
-+#if USE_GDK_WAYLAND
-         Type instance_type = Gdk.Display.get_default().get_type();
-         Type wayland_type = typeof(GdkWayland.Display);
-         m_is_wayland = instance_type.is_a(wayland_type);
-+#else
-+        m_is_wayland = false;
-+        warning("Checking Wayland is disabled");
-+#endif
- 
-         m_bus = bus;
-         m_application = application;
diff --git a/app-i18n/ibus/files/ibus-1.5.19-vala-0.43.4.patch b/app-i18n/ibus/files/ibus-1.5.19-vala-0.43.4.patch
deleted file mode 100644
index 0ebb92c21e5d..000000000000
--- a/app-i18n/ibus/files/ibus-1.5.19-vala-0.43.4.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-From 4d7c1e00e15921a0448947961183c1c124b6b49f Mon Sep 17 00:00:00 2001
-From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Tue, 29 Jan 2019 17:57:16 +0900
-Subject: [PATCH] Delete weak pointer in GList.SList for vala 0.43.4
-
-Vala 0.43.4 does not allow to convert a weak pointer to the full one in SList.
-
-emojier.vala:424.36-425.73: error: Assignment: Cannot convert from
-`GLib.SList<weak IBus.EmojiData>' to `GLib.SList<IBus.EmojiData>?'
-emojier.vala:636.9-637.69: error: Assignment: Cannot convert from
-`GLib.SList<weak IBus.UnicodeBlock>' to `GLib.SList<IBus.UnicodeBlock>'
-panel.vala:526.36-526.65: error: Assignment: Cannot convert from
-`GLib.List<weak IBus.EngineDesc>' to `GLib.List<IBus.EngineDesc>?'
----
- src/ibusbus.h        | 11 ++++++-----
- src/ibusemoji.h      |  6 +++---
- src/ibusunicode.h    |  8 ++++----
- ui/gtk3/emojier.vala | 24 ++++++++++++++++--------
- 4 files changed, 29 insertions(+), 20 deletions(-)
-
-diff --git a/src/ibusbus.h b/src/ibusbus.h
-index dff3dfb7..fddcf5b2 100644
---- a/src/ibusbus.h
-+++ b/src/ibusbus.h
-@@ -2,7 +2,8 @@
- /* vim:set et sts=4: */
- /* ibus - The Input Bus
-  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
-- * Copyright (C) 2008-2013 Red Hat, Inc.
-+ * Copyright (C) 2013-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
-+ * Copyright (C) 2008-2019 Red Hat, Inc.
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -692,7 +693,7 @@ gboolean     ibus_bus_register_component_async_finish
-  *
-  * List engines synchronously.
-  *
-- * Returns: (transfer container) (element-type IBusEngineDesc):
-+ * Returns: (transfer full) (element-type IBusEngineDesc):
-  *         A List of engines.
-  */
- GList       *ibus_bus_list_engines      (IBusBus        *bus);
-@@ -725,7 +726,7 @@ void         ibus_bus_list_engines_async
-  *
-  * Finishes an operation started with ibus_bus_list_engines_async().
-  *
-- * Returns: (transfer container) (element-type IBusEngineDesc):
-+ * Returns: (transfer full) (element-type IBusEngineDesc):
-  *         A List of engines.
-  */
- GList       *ibus_bus_list_engines_async_finish
-@@ -740,7 +741,7 @@ GList       *ibus_bus_list_engines_async_finish
-  *
-  * List active engines synchronously.
-  *
-- * Returns: (transfer container) (element-type IBusEngineDesc):
-+ * Returns: (transfer full) (element-type IBusEngineDesc):
-  *        A List of active engines.
-  *
-  * Deprecated: 1.5.3: Read dconf value
-@@ -782,7 +783,7 @@ void         ibus_bus_list_active_engines_async
-  *
-  * Finishes an operation started with ibus_bus_list_active_engines_async().
-  *
-- * Returns: (transfer container) (element-type IBusEngineDesc):
-+ * Returns: (transfer full) (element-type IBusEngineDesc):
-  *         A List of active engines.
-  *
-  * Deprecated: 1.5.3: Read dconf value
-diff --git a/src/ibusemoji.h b/src/ibusemoji.h
-index 4edee726..5e9fbcf4 100644
---- a/src/ibusemoji.h
-+++ b/src/ibusemoji.h
-@@ -1,8 +1,8 @@
- /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
- /* vim:set et sts=4: */
- /* bus - The Input Bus
-- * Copyright (C) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
-- * Copyright (C) 2017 Red Hat, Inc.
-+ * Copyright (C) 2017-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
-+ * Copyright (C) 2017-2019 Red Hat, Inc.
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -209,7 +209,7 @@ void            ibus_emoji_data_save            (const gchar    *path,
-  * ibus_emoji_data_load:
-  * @path: A path of the saved dictionary file.
-  *
-- * Returns: (element-type IBusEmojiData) (transfer container):
-+ * Returns: (element-type IBusEmojiData) (transfer full):
-  * An #IBusEmojiData list loaded from the saved cache file.
-  */
- GSList *        ibus_emoji_data_load            (const gchar    *path);
-diff --git a/src/ibusunicode.h b/src/ibusunicode.h
-index 99de9451..473bdb19 100644
---- a/src/ibusunicode.h
-+++ b/src/ibusunicode.h
-@@ -1,8 +1,8 @@
- /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
- /* vim:set et sts=4: */
- /* bus - The Input Bus
-- * Copyright (C) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
-- * Copyright (C) 2018 Red Hat, Inc.
-+ * Copyright (C) 2018-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
-+ * Copyright (C) 2018-2019 Red Hat, Inc.
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -201,7 +201,7 @@ void              ibus_unicode_data_save      (const gchar        *path,
-  *    #IBusUnicodeData, * the total number of #IBusUnicodeData) of uint values
-  *    with that signal by 100 times. Otherwise %NULL.
-  *
-- * Returns: (element-type IBusUnicodeData) (transfer container):
-+ * Returns: (element-type IBusUnicodeData) (transfer full):
-  * An #IBusUnicodeData list loaded from the saved cache file.
-  */
- GSList *          ibus_unicode_data_load      (const gchar        *path,
-@@ -290,7 +290,7 @@ void              ibus_unicode_block_save     (const gchar        *path,
-  * ibus_unicode_block_load:
-  * @path: A path of the saved dictionary file.
-  *
-- * Returns: (element-type IBusUnicodeBlock) (transfer container):
-+ * Returns: (element-type IBusUnicodeBlock) (transfer full):
-  * An #IBusUnicodeBlock list loaded from the saved cache file.
-  */
- GSList *          ibus_unicode_block_load     (const gchar        *path);
-diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
-index 0b9b54a9..aedeb4cb 100644
---- a/ui/gtk3/emojier.vala
-+++ b/ui/gtk3/emojier.vala
-@@ -2,7 +2,7 @@
-  *
-  * ibus - The Input Bus
-  *
-- * Copyright (c) 2017-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
-+ * Copyright (c) 2017-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -882,8 +882,13 @@ public class IBusEmojier : Gtk.ApplicationWindow {
-             update_unicode_blocks();
-             return;
-         } else {
--            unowned GLib.SList<unowned string> emojis =
--                    m_category_to_emojis_dict.lookup(category);
-+            // Use copy_deep() since vala 0.43.4 does not allow to assign
-+            // a weak pointer to the full one in SList:
-+            // emojier.vala:885.48-886.62: error: Assignment: Cannot convert
-+            // from `GLib.SList<string>' to `GLib.SList<weak string>?'
-+            GLib.SList<string> emojis =
-+                    m_category_to_emojis_dict.lookup(category).copy_deep(
-+                            GLib.strdup);
-             m_lookup_table.clear();
-             m_candidate_panel_mode = true;
-             foreach (unowned string emoji in emojis) {
-@@ -1547,8 +1552,8 @@ public class IBusEmojier : Gtk.ApplicationWindow {
-             m_vbox.add(widget);
-             widget.show_all();
-         }
--        unowned GLib.SList<unowned string>? annotations =
--                data.get_annotations();
-+        GLib.SList<string> annotations =
-+                data.get_annotations().copy_deep(GLib.strdup);
-         var buff = new GLib.StringBuilder();
-         int i = 0;
-         foreach (unowned string annotation in annotations) {
-@@ -2001,17 +2006,20 @@ public class IBusEmojier : Gtk.ApplicationWindow {
-                     ) as IBus.EmojiData;
-                 m_emoji_to_data_dict.insert(favorite, new_data);
-             } else {
--                unowned GLib.SList<string> annotations = data.get_annotations();
-+                GLib.SList<string> annotations =
-+                        data.get_annotations().copy_deep(GLib.strdup);
-                 if (annotations.find_custom(annotation, GLib.strcmp) == null) {
-                     annotations.append(annotation);
--                    data.set_annotations(annotations.copy());
-+                    data.set_annotations(annotations.copy_deep(GLib.strdup));
-                 }
-             }
-             unowned GLib.SList<string> emojis =
-                     m_annotation_to_emojis_dict.lookup(annotation);
-             if (emojis.find_custom(favorite, GLib.strcmp) == null) {
-                 emojis.append(favorite);
--                m_annotation_to_emojis_dict.replace(annotation, emojis.copy());
-+                m_annotation_to_emojis_dict.replace(
-+                        annotation,
-+                        emojis.copy_deep(GLib.strdup));
-             }
-         }
-     }
diff --git a/app-i18n/ibus/files/ibus-1.5.21-fix-authorization.patch b/app-i18n/ibus/files/ibus-1.5.21-fix-authorization.patch
new file mode 100644
index 000000000000..8b7674cddea3
--- /dev/null
+++ b/app-i18n/ibus/files/ibus-1.5.21-fix-authorization.patch
@@ -0,0 +1,175 @@
+From 3d442dbf936d197aa11ca0a71663c2bc61696151 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Fri, 13 Sep 2019 15:59:03 +0900
+Subject: [PATCH] bus: Implement GDBusAuthObserver callback
+
+ibus uses a GDBusServer with G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS,
+and doesn't set a GDBusAuthObserver, which allows anyone who can connect
+to its AF_UNIX socket to authenticate and be authorized to send method calls.
+It also seems to use an abstract AF_UNIX socket, which does not have
+filesystem permissions, so the practical effect might be that a local
+attacker can connect to another user's ibus service and make arbitrary
+method calls.
+
+BUGS=rhbz#1717958
+---
+ bus/server.c | 89 ++++++++++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 73 insertions(+), 16 deletions(-)
+
+diff --git a/bus/server.c b/bus/server.c
+index 3a626230..2439de14 100644
+--- a/bus/server.c
++++ b/bus/server.c
+@@ -2,7 +2,8 @@
+ /* vim:set et sts=4: */
+ /* bus - The Input Bus
+  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
+- * Copyright (C) 2008-2010 Red Hat, Inc.
++ * Copyright (C) 2011-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
++ * Copyright (C) 2008-2019 Red Hat, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -69,17 +70,64 @@ _restart_server (void)
+     exit (-1);
+ }
+ 
++/**
++ * bus_allow_mechanism_cb:
++ * @observer: A #GDBusAuthObserver.
++ * @mechanism: The name of the mechanism.
++ * @user_data: always %NULL.
++ *
++ * Check if @mechanism can be used to authenticate the other peer.
++ * Returns: %TRUE if the peer's mechanism is allowed.
++ */
++static gboolean
++bus_allow_mechanism_cb (GDBusAuthObserver     *observer,
++                        const gchar           *mechanism,
++                        G_GNUC_UNUSED gpointer user_data)
++{
++    if (g_strcmp0 (mechanism, "EXTERNAL") == 0)
++        return TRUE;
++    return FALSE;
++}
++
++/**
++ * bus_authorize_authenticated_peer_cb:
++ * @observer: A #GDBusAuthObserver.
++ * @stream: A #GIOStream.
++ * @credentials: A #GCredentials.
++ * @user_data: always %NULL.
++ *
++ * Check if a peer who has already authenticated should be authorized.
++ * Returns: %TRUE if the peer's credential is authorized.
++ */
++static gboolean
++bus_authorize_authenticated_peer_cb (GDBusAuthObserver     *observer,
++                                     GIOStream             *stream,
++                                     GCredentials          *credentials,
++                                     G_GNUC_UNUSED gpointer user_data)
++{
++    gboolean authorized = FALSE;
++    if (credentials) {
++        GCredentials *own_credentials = g_credentials_new ();
++        if (g_credentials_is_same_user (credentials, own_credentials, NULL))
++            authorized = TRUE;
++        g_object_unref (own_credentials);
++    }
++    return authorized;
++}
++
+ /**
+  * bus_new_connection_cb:
+- * @user_data: always NULL.
+- * @returns: TRUE when the function can handle the connection.
++ * @observer: A #GDBusAuthObserver.
++ * @dbus_connection: A #GDBusconnection.
++ * @user_data: always %NULL.
+  *
+  * Handle incoming connections.
++ * Returns: %TRUE when the function can handle the connection.
+  */
+ static gboolean
+-bus_new_connection_cb (GDBusServer     *server,
+-                       GDBusConnection *dbus_connection,
+-                       gpointer         user_data)
++bus_new_connection_cb (GDBusServer           *server,
++                       GDBusConnection       *dbus_connection,
++                       G_GNUC_UNUSED gpointer user_data)
+ {
+     BusConnection *connection = bus_connection_new (dbus_connection);
+     bus_dbus_impl_new_connection (dbus, connection);
+@@ -94,9 +142,9 @@ bus_new_connection_cb (GDBusServer     *server,
+ }
+ 
+ static void
+-_server_connect_start_portal_cb (GObject      *source_object,
+-                                 GAsyncResult *res,
+-                                 gpointer      user_data)
++_server_connect_start_portal_cb (GObject               *source_object,
++                                 GAsyncResult          *res,
++                                 G_GNUC_UNUSED gpointer user_data)
+ {
+     GVariant *result;
+     GError *error = NULL;
+@@ -113,9 +161,9 @@ _server_connect_start_portal_cb (GObject      *source_object,
+ }
+ 
+ static void
+-bus_acquired_handler (GDBusConnection *connection,
+-                      const gchar     *name,
+-                      gpointer         user_data)
++bus_acquired_handler (GDBusConnection       *connection,
++                      const gchar           *name,
++                      G_GNUC_UNUSED gpointer user_data)
+ {
+     g_dbus_connection_call (connection,
+                             IBUS_SERVICE_PORTAL,
+@@ -136,14 +184,17 @@ void
+ bus_server_init (void)
+ {
+     GError *error = NULL;
++    GDBusServerFlags flags = G_DBUS_SERVER_FLAGS_NONE;
++    gchar *guid;
++    GDBusAuthObserver *observer;
+ 
+     dbus = bus_dbus_impl_get_default ();
+     ibus = bus_ibus_impl_get_default ();
+     bus_dbus_impl_register_object (dbus, (IBusService *)ibus);
+ 
+     /* init server */
+-    GDBusServerFlags flags = G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS;
+-    gchar *guid = g_dbus_generate_guid ();
++    guid = g_dbus_generate_guid ();
++    observer = g_dbus_auth_observer_new ();
+     if (!g_str_has_prefix (g_address, "unix:tmpdir=") &&
+         !g_str_has_prefix (g_address, "unix:path=")) {
+         g_error ("Your socket address does not have the format unix:tmpdir=$DIR "
+@@ -152,7 +203,7 @@ bus_server_init (void)
+     server =  g_dbus_server_new_sync (
+                     g_address, /* the place where the socket file lives, e.g. /tmp, abstract namespace, etc. */
+                     flags, guid,
+-                    NULL /* observer */,
++                    observer,
+                     NULL /* cancellable */,
+                     &error);
+     if (server == NULL) {
+@@ -162,7 +213,13 @@ bus_server_init (void)
+     }
+     g_free (guid);
+ 
+-    g_signal_connect (server, "new-connection", G_CALLBACK (bus_new_connection_cb), NULL);
++    g_signal_connect (observer, "allow-mechanism",
++                      G_CALLBACK (bus_allow_mechanism_cb), NULL);
++    g_signal_connect (observer, "authorize-authenticated-peer",
++                      G_CALLBACK (bus_authorize_authenticated_peer_cb), NULL);
++    g_object_unref (observer);
++    g_signal_connect (server, "new-connection",
++                      G_CALLBACK (bus_new_connection_cb), NULL);
+ 
+     g_dbus_server_start (server);
+ 
+-- 
+2.24.0
+
diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
deleted file mode 100644
index 07657d250782..000000000000
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_6} )
-VALA_MIN_API_VERSION="0.34"
-VALA_MAX_API_VERSION="0.42"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
-IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="emoji? ( gtk )
-	gtk2? ( gtk )
-	kde? ( gtk )
-	libnotify? ( gtk )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		introspection
-	)
-	test? ( gtk )
-	vala? ( introspection )"
-
-CDEPEND="app-text/iso-codes
-	dev-libs/glib:2
-	gnome-base/dconf
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	X? (
-		x11-libs/libX11
-		!gtk? ( x11-libs/gtk+:2 )
-	)
-	gconf? ( gnome-base/gconf:2 )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXi
-		gtk2? ( x11-libs/gtk+:2 )
-	)
-	introspection? ( dev-libs/gobject-introspection )
-	kde? ( dev-qt/qtgui:5 )
-	libnotify? ( x11-libs/libnotify )
-	nls? ( virtual/libintl )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)"
-RDEPEND="${CDEPEND}
-	python? (
-		gtk? (
-			x11-libs/gtk+:3[introspection]
-		)
-	)"
-DEPEND="${CDEPEND}
-	$(vala_depend)
-	dev-util/intltool
-	virtual/pkgconfig
-	emoji? (
-		app-i18n/unicode-cldr
-		app-i18n/unicode-emoji
-	)
-	nls? ( sys-devel/gettext )
-	unicode? ( app-i18n/unicode-data )"
-
-PATCHES=( "${FILESDIR}"/${P}-enable-gsettings-in-runtest.patch )
-
-src_prepare() {
-	vala_src_prepare --ignore-use
-	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
-	if ! use emoji; then
-		touch \
-			tools/main.vala \
-			ui/gtk3/panel.vala
-	fi
-	if ! use kde; then
-		touch ui/gtk3/panel.vala
-	fi
-	if ! use libnotify; then
-		touch ui/gtk3/panel.vala
-	fi
-	# for multiple Python implementations
-	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
-	# fix for parallel install
-	sed -i \
-		-e "/^py2_compile/,/^$/d" \
-		-e "/^install-data-hook/,/^$/d" \
-		bindings/pygobject/Makefile.am
-	# require user interaction
-	sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
-
-	sed -i "/^bash_completion/d" tools/Makefile.am
-
-	default
-	eautoreconf
-	xdg_environment_reset
-}
-
-src_configure() {
-	local unicodedir="${EPREFIX}"/usr/share/unicode
-	local python_conf=()
-	if use python; then
-		python_setup
-		python_conf+=(
-			$(use_enable gtk setup)
-			--with-python=${EPYTHON}
-		)
-	else
-		python_conf+=( --disable-setup )
-	fi
-
-	econf \
-		$(use_enable X xim) \
-		$(use_enable emoji emoji-dict) \
-		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
-		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk3) \
-		$(use_enable gtk ui) \
-		$(use_enable gtk2) \
-		$(use_enable introspection) \
-		$(use_enable kde appindicator) \
-		$(use_enable libnotify) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		"${python_conf[@]}"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	virtx emake -j1 check
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	if use python; then
-		python_install() {
-			emake -C bindings/pygobject \
-				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
-				DESTDIR="${D}" \
-				install
-		}
-		python_foreach_impl python_install
-	fi
-
-	keepdir /usr/share/ibus/engine
-
-	newbashcomp tools/${PN}.bash ${PN}
-
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-${PN} ${PN}.conf
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	dconf update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus/ibus-1.5.19.ebuild b/app-i18n/ibus/ibus-1.5.19.ebuild
deleted file mode 100644
index 368c0a122fc4..000000000000
--- a/app-i18n/ibus/ibus-1.5.19.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-VALA_MIN_API_VERSION="0.34"
-VALA_MAX_API_VERSION="0.42"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
-IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="emoji? ( gtk )
-	gtk2? ( gtk )
-	kde? ( gtk )
-	libnotify? ( gtk )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		introspection
-	)
-	test? ( gtk )
-	vala? ( introspection )"
-
-CDEPEND="app-text/iso-codes
-	dev-libs/glib:2
-	gnome-base/dconf
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	X? (
-		x11-libs/libX11
-		!gtk? ( x11-libs/gtk+:2 )
-	)
-	gconf? ( gnome-base/gconf:2 )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXi
-		gtk2? ( x11-libs/gtk+:2 )
-	)
-	introspection? ( dev-libs/gobject-introspection )
-	kde? ( dev-qt/qtgui:5 )
-	libnotify? ( x11-libs/libnotify )
-	nls? ( virtual/libintl )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)"
-RDEPEND="${CDEPEND}
-	python? (
-		gtk? (
-			x11-libs/gtk+:3[introspection]
-		)
-	)"
-DEPEND="${CDEPEND}
-	$(vala_depend)
-	dev-util/glib-utils
-	dev-util/intltool
-	virtual/pkgconfig
-	emoji? (
-		app-i18n/unicode-cldr
-		app-i18n/unicode-emoji
-	)
-	nls? ( sys-devel/gettext )
-	unicode? ( app-i18n/unicode-data )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gdk-wayland.patch
-	"${FILESDIR}"/${P}-vala-0.43.4.patch
-)
-
-src_prepare() {
-	vala_src_prepare --ignore-use
-	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
-	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
-		touch ui/gtk3/panelbinding.vala
-	fi
-	if ! use emoji; then
-		touch \
-			tools/main.vala \
-			ui/gtk3/panel.vala
-	fi
-	if ! use kde; then
-		touch ui/gtk3/panel.vala
-	fi
-	if ! use libnotify; then
-		touch ui/gtk3/panel.vala
-	fi
-	# for multiple Python implementations
-	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
-	# fix for parallel install
-	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am
-	# require user interaction
-	sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am
-
-	sed -i "/^bash_completion/d" tools/Makefile.am
-
-	default
-	eautoreconf
-	xdg_environment_reset
-}
-
-src_configure() {
-	local unicodedir="${EPREFIX}"/usr/share/unicode
-	local python_conf=()
-	if use python; then
-		python_setup
-		python_conf+=(
-			$(use_enable gtk setup)
-			--with-python=${EPYTHON}
-		)
-	else
-		python_conf+=( --disable-setup )
-	fi
-
-	econf \
-		$(use_enable X xim) \
-		$(use_enable emoji emoji-dict) \
-		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
-		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk3) \
-		$(use_enable gtk ui) \
-		$(use_enable gtk2) \
-		$(use_enable introspection) \
-		$(use_enable kde appindicator) \
-		$(use_enable libnotify) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		"${python_conf[@]}"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	virtx emake -j1 check
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	if use python; then
-		python_install() {
-			emake -C bindings/pygobject \
-				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
-				DESTDIR="${D}" \
-				install
-		}
-		python_foreach_impl python_install
-	fi
-
-	keepdir /usr/share/ibus/engine
-
-	newbashcomp tools/${PN}.bash ${PN}
-
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-${PN} ${PN}.conf
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	dconf update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus/ibus-1.5.21.ebuild b/app-i18n/ibus/ibus-1.5.21-r1.ebuild
index 7d58048b6672..66c047159f59 100644
--- a/app-i18n/ibus/ibus-1.5.21.ebuild
+++ b/app-i18n/ibus/ibus-1.5.21-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )
@@ -71,6 +71,7 @@ DEPEND="${CDEPEND}
 	nls? ( sys-devel/gettext )
 	unicode? ( app-i18n/unicode-data )"
 
+PATCHES=( "${FILESDIR}"/${P}-fix-authorization.patch )
 src_prepare() {
 	vala_src_prepare --ignore-use
 	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
diff --git a/app-i18n/ibus/ibus-1.5.20.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild
index 2ae5a95c9d46..5bd83c3fbbe4 100644
--- a/app-i18n/ibus/ibus-1.5.20.ebuild
+++ b/app-i18n/ibus/ibus-1.5.22.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 VALA_MIN_API_VERSION="0.34"
 VALA_USE_DEPEND="vapigen"
 
@@ -14,8 +14,8 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86"
-IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )
@@ -36,7 +36,6 @@ CDEPEND="app-text/iso-codes
 		x11-libs/libX11
 		!gtk? ( x11-libs/gtk+:2 )
 	)
-	gconf? ( gnome-base/gconf:2 )
 	gtk? (
 		x11-libs/gtk+:3
 		x11-libs/libX11
@@ -118,7 +117,6 @@ src_configure() {
 		$(use_enable emoji emoji-dict) \
 		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
 		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
-		$(use_enable gconf) \
 		$(use_enable gtk gtk3) \
 		$(use_enable gtk ui) \
 		$(use_enable gtk2) \
@@ -148,6 +146,8 @@ src_install() {
 				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
 				DESTDIR="${D}" \
 				install
+
+			python_optimize
 		}
 		python_foreach_impl python_install
 	fi
@@ -158,17 +158,15 @@ src_install() {
 
 	insinto /etc/X11/xinit/xinput.d
 	newins xinput-${PN} ${PN}.conf
-}
 
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
+	# Undo compression of man page
+	find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die
 }
 
 pkg_postinst() {
-	use gconf && gnome2_gconf_install
 	use gtk && gnome2_query_immodules_gtk3
 	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	gnome2_schemas_update
 	dconf update
 }
@@ -176,6 +174,6 @@ pkg_postinst() {
 pkg_postrm() {
 	use gtk && gnome2_query_immodules_gtk3
 	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	gnome2_schemas_update
 }