commit:     6ee2d0246aa5a6adb8a8c954fd38209e28a01008
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 25 19:10:45 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 19:10:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ee2d024

app-i18n/ibus: security cleanup (bug #695526)

Bug: https://bugs.gentoo.org/695526
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-i18n/ibus/Manifest                             |   3 -
 .../ibus-1.5.18-enable-gsettings-in-runtest.patch  |  62 -------
 app-i18n/ibus/files/ibus-1.5.19-gdk-wayland.patch  |  88 ----------
 app-i18n/ibus/files/ibus-1.5.19-vala-0.43.4.patch  | 191 --------------------
 app-i18n/ibus/ibus-1.5.18.ebuild                   | 189 --------------------
 app-i18n/ibus/ibus-1.5.19.ebuild                   | 193 ---------------------
 app-i18n/ibus/ibus-1.5.20.ebuild                   | 181 -------------------
 7 files changed, 907 deletions(-)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 12c04718057..8fdca0a8374 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,5 +1,2 @@
-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
 DIST ibus-1.5.21.tar.gz 3463069 BLAKE2B 
75b9e7cc4d84b69941d53321da1fe63ad911740a36ed51c7fceaa2a7bc30f6ae39d3f575b4b5fc4268d7c3b3e1c0bae11881dd7a8b7bd441ecf89c83c7279858
 SHA512 
c7c06e13e78fb4d4d26ce8975b6db4f7914efb325a903999a82197229e13d5ebb4afc876ef67e1d86db58f08c16350dc095aaea050b2f69c2bfc4c452adc5331
 DIST ibus-1.5.22.tar.gz 3578251 BLAKE2B 
08ad72bd455d2841700b11a4ade88e2b9768433f86bac4baf20db882580b10a4705f545a845a03d3b4196a75c43d33c51ffd31a3516d71030f891ce48dce69c2
 SHA512 
0abe89acc6da8cea484a6b9f807c08e94869072f374f9e8f4541a426636f818f1c3cb8b9237f97245771f9e4bf19184983d8ac924177dc4824ca6e8b5304425d

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 24b5cd3f6a8..00000000000
--- 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 <na...@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 <na...@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 8eed29daf39..00000000000
--- 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.fujiwa...@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 0ebb92c21e5..00000000000
--- 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.fujiwa...@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.hu...@gmail.com>
-- * Copyright (C) 2008-2013 Red Hat, Inc.
-+ * Copyright (C) 2013-2019 Takao Fujiwara <takao.fujiwa...@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.fujiwa...@gmail.com>
-- * Copyright (C) 2017 Red Hat, Inc.
-+ * Copyright (C) 2017-2019 Takao Fujiwara <takao.fujiwa...@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.fujiwa...@gmail.com>
-- * Copyright (C) 2018 Red Hat, Inc.
-+ * Copyright (C) 2018-2019 Takao Fujiwara <takao.fujiwa...@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.fujiwa...@gmail.com>
-+ * Copyright (c) 2017-2019 Takao Fujiwara <takao.fujiwa...@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/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
deleted file mode 100644
index 07657d25078..00000000000
--- 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 368c0a122fc..00000000000
--- 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.20.ebuild b/app-i18n/ibus/ibus-1.5.20.ebuild
deleted file mode 100644
index 2ae5a95c9d4..00000000000
--- a/app-i18n/ibus/ibus-1.5.20.ebuild
+++ /dev/null
@@ -1,181 +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_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 nls +python test +unicode 
vala wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="emoji? ( gtk )
-       gtk2? ( gtk )
-       kde? ( 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 )
-       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
-       virtual/pkgconfig
-       emoji? (
-               app-i18n/unicode-cldr
-               app-i18n/unicode-emoji
-       )
-       nls? ( sys-devel/gettext )
-       unicode? ( app-i18n/unicode-data )"
-
-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
-
-       # 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 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
-}

Reply via email to