gentoo resync : 03.03.2019

19 files changed, 321 insertions, 438 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 581b99ee68be..828bcce31ac6 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index acb2ab8cf382..e0eaff05ba24 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,5 +1,5 @@
-DIST ibus-typing-booster-2.5.1.tar.gz 6232907 BLAKE2B 60fa4b287eb61b509e938d7570dcd9db3160ed66dde56ebae17cb3f46c1862d626dede4dca330b292585fb7db86ee97ed5cd020431a300eaf864a35cad76b99a SHA512 69ba68d6da262762df6db3c98ff947d189463eea761aed42b62cc02dee4c6f7badd533300203a4c6d81e53874ff80da2829a3c82a7acdddf4b1cd99556b0eda1
 DIST ibus-typing-booster-2.5.3.tar.gz 6463060 BLAKE2B c1053f2e9536ee1dd1c243702150e7f0d1dce1651a196a705395890d3d6274a369c718c66c62d96bd317862d831da8195e70bddcde53fef27c1531e5525193ae SHA512 6d7f033919223522c9b0fcef5af4d8368f126c2da1acbbb0403c0575cdedaddd1de7d5cbcdf15dda63b05a871f35708586628195c3da4cfd86ca12bfde452672
-EBUILD ibus-typing-booster-2.5.1.ebuild 857 BLAKE2B 9c3b915d672735e7ae52659233459d38b026da04e418299cff0529140c84add60d88a218ee89868f309194ea62e80f6093efcc40abdb3164f4730e0a2ecba463 SHA512 0012c9eaa5f25e1f11b9f496b48f4f5e8b92a7d46e85a59846701c8f6bbe76575982fa8659750396531983671b2f2612693e769afae09d7cc965ed5354fe4bde
+DIST ibus-typing-booster-2.6.0.tar.gz 6863400 BLAKE2B e399ebaa19a2949882de41cb3b11dfc161a0ddb300e23daf216857dea9bb4b3d31db6dcd02846214b8ac677df92672a342c7c9e992ab791f97bdf8abc514ba4a SHA512 7e916eaba5d3f14bde383acedd5ce9cd74e72328f25a84936055ee9183b4aeff79d5297fffdd27713491f23a949377cafc39bc52efa0f7d5995672176cb808c8
 EBUILD ibus-typing-booster-2.5.3.ebuild 857 BLAKE2B 9c3b915d672735e7ae52659233459d38b026da04e418299cff0529140c84add60d88a218ee89868f309194ea62e80f6093efcc40abdb3164f4730e0a2ecba463 SHA512 0012c9eaa5f25e1f11b9f496b48f4f5e8b92a7d46e85a59846701c8f6bbe76575982fa8659750396531983671b2f2612693e769afae09d7cc965ed5354fe4bde
+EBUILD ibus-typing-booster-2.6.0.ebuild 861 BLAKE2B a0e2863e13dd3fd09637a57e2784c2f1e7ac167074aba1a8743c5ae2b49952150c913fde6191d8dab9c9390bf527f6f2fc1f2379efd3a94a9ddea2bcec480d6d SHA512 8e188c18f14a31a9e4446ea52b9357316b32ade472ac27465a48a28515508e944b7d157fabb83b0ccca8f166bce826ab0835db2906132dc9507560816150e033
 MISC metadata.xml 331 BLAKE2B 85b93b548e9cbef93b09e59ebf23c10b1cb4c392bcb6aeeab697cdaa775afa06874b5a6965ab09ffd8c937a0842699cdb27ad70c6146d5c37b516d82a92c80b2 SHA512 e0524c2ebad138f51a5d79d639e809196029a83f46dc331c2bd21d94417d5adf8d059f15694b484f4fcb107dff2aba7d3ad4c87a19accaccf75429bfa2c92b63
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.5.1.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.6.0.ebuild
index 5e80b23f3f31..2b94c3fcc8c1 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.5.1.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.6.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+EAPI="7"
+PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit python-single-r1
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 35c8aff6b905..5c79eda2ac5d 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,11 +1,8 @@
 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
-DIST ibus-1.5.12.tar.gz 2190284 BLAKE2B 57ac7f9e8e8f0419bad1bf3aa629282ef3c0188d29e98bc872e594955f69e0863020d600c674cabed56db156a85210b5b3c1fe137b135395a27d2535e4938164 SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81
-DIST ibus-1.5.16.tar.gz 2375719 BLAKE2B cf4cbd4556e43403c73da3cd2cb9f6da8e0baf5f90b3bc74f6d12c1bad057198ed828053dcbb3ddfd28c37d9011b6166e834385720aa827a68f594dbd4cf9298 SHA512 494ead69cf9c0111fd25fd1de27e796d89db4f08443afa1ec469f638469b25d8b19a59ea7ab0db0f3a130b9a89b3f2819667099ba38fc973d6efc61b367ce237
+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
-EBUILD ibus-1.5.12.ebuild 3678 BLAKE2B 8b08b4f6cf2c188d387c43741f0e430749ba003dd7693ce4b70e36c21d5c046f8f0be82ecc2401df577603f7c074d99904d6dfc3aa60f1327157e835563779a7 SHA512 178fdf0169e444161b598ee800a99328060ec7a28a6cd73ca2c26ddce10372072faabe63234d2a9b7c0e31b758cdf7f533c508f05491be80a9ae130f466a5679
-EBUILD ibus-1.5.16.ebuild 3959 BLAKE2B 7a8872f49d619d6079915884ff25ee90a74653fa4614c61043d34414989cafebe122cedc65d72999b2eaca668f0ab0d76484d6ef177e419a3e284476430bb1ff SHA512 b664b04cc0010f3e6da17f7e2dfd5f10ba2241def9a807d5da176c8b1f0eb14a066dd9df6af3b750f06f3b476d867a30b18e32ce85ab1b4efa44274132b75e96
-EBUILD ibus-1.5.18.ebuild 4279 BLAKE2B cc9c0046615c92f1767e7c1e942a283e7ba6a1d9acc9f65c96b4f7bb60cdc0434017c112f21e1a321a55a0997d942b57ed8ef9013762d4ac635b5da3f0c31725 SHA512 65d60a8f53ea373982e35c8c817a1752565cd98f4c54db339119f762898aed3142ccd8d044ecec54b1375e9ffeaa306d07e6ad0cff198d63b58140ef4c12ee4e
-EBUILD ibus-1.5.19.ebuild 4390 BLAKE2B 664fdf72ac243a5758951556a1f3f30d741a5c956672d57c2a05e80521c02b7293dbbbd4ca054c18fe64c0e3393102ec481c045de3df227980f8a07cbdd134d0 SHA512 6a729644d4142bc953d5bdf8f87f33ac68106beee93cbef4eef5cf5d6a9d4145bed916aa45c9861d9d3172d5bbef707cd9b303939a41f2c680585a11c4b4347b
+EBUILD ibus-1.5.18.ebuild 4307 BLAKE2B 5247b7bfff9f685bc82925aaf076552aa523aa5224557bb4c3ce9aef270478bd0d2339c368e65773d15099fa9b4e6fd52546c0dd0092edd8658cd3592a21f3a8 SHA512 c6ce6899b4c8147ca6719d57cc8ff53dba0cc18857052bc1c71f585f1c7241516e5f9c377654af1062f38f5c03c6e6b2f4d01aba41befc7ed2691bb864f4975c
+EBUILD ibus-1.5.19.ebuild 4397 BLAKE2B e0de168f4b387a859c93f1a23f22ec5eb5bc71eaf6f20c123371ab8954093e71f69de0e052a3f8e250dd332d808214ab7db8f0de09620e4d6ab018db9d16f881 SHA512 d36a9f44a60ca9a833b5779d73b0ad8e38e8b2ac5f63672aa8db7dc98c5ba42fa97c3047ec26c74614190e911cdd9e1d097f101c218a5258c2d25a2b8223a0cc
 MISC metadata.xml 942 BLAKE2B 9d8f0df17ae7c5c60892a8bf661c1f7325f4943e30d51667fe5e56f2c74f55e36c6f40cd6044435b9f046a88a267fa1b5d46f6cddc0cefa6b423554ff905e882 SHA512 5501b7ef3b46de30b69eabe28334556c979c99610f0a6051a254a7591de612d99ea9ee3c18c2f3869ae2046514df8cd555d801cc778bc1db111895256b7ab100
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
new file mode 100644
index 000000000000..0ebb92c21e5d
--- /dev/null
+++ b/app-i18n/ibus/files/ibus-1.5.19-vala-0.43.4.patch
@@ -0,0 +1,191 @@
+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/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
deleted file mode 100644
index 5e7791469af2..000000000000
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-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 ~x86-fbsd"
-IUSE="+X gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland"
-REQUIRED_USE="gtk2? ( 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 )
-	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
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	vala_src_prepare --ignore-use
-	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
-	# fixed in 1.5.14+
-	sed -i "/def test_keymap/a\        self.skipTest('')" bindings/pygobject/test-override-ibus.py
-	sed -i "/[[:space:]]test-stress[[:space:]]/d" bus/Makefile.am
-	sed -i "/^TESTS += ibus-engine-switch/d" src/tests/Makefile.am
-
-	sed -i "/^bash_completion/d" tools/Makefile.am
-
-	default
-	eautoreconf
-	xdg_environment_reset
-}
-
-src_configure() {
-	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 gconf) \
-		$(use_enable gtk gtk3) \
-		$(use_enable gtk ui) \
-		$(use_enable gtk2) \
-		$(use_enable introspection) \
-		$(use_enable libnotify) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(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.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
deleted file mode 100644
index e4ffeb871fa3..000000000000
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-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 ~x86-fbsd"
-IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
-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 )"
-
-src_prepare() {
-	vala_src_prepare --ignore-use
-	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 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.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index 711a75dbc83f..99eecac986fa 100644
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,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
diff --git a/app-i18n/ibus/ibus-1.5.19.ebuild b/app-i18n/ibus/ibus-1.5.19.ebuild
index d39593776ec0..3fbfb9f1be67 100644
--- a/app-i18n/ibus/ibus-1.5.19.ebuild
+++ b/app-i18n/ibus/ibus-1.5.19.ebuild
@@ -4,7 +4,6 @@
 EAPI="6"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 VALA_MIN_API_VERSION="0.34"
-VALA_MAX_API_VERSION="0.36"
 VALA_USE_DEPEND="vapigen"
 
 inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
@@ -15,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 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )
@@ -74,7 +73,10 @@ DEPEND="${CDEPEND}
 	nls? ( sys-devel/gettext )
 	unicode? ( app-i18n/unicode-data )"
 
-PATCHES=( "${FILESDIR}"/${P}-gdk-wayland.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gdk-wayland.patch
+	"${FILESDIR}"/${P}-vala-0.43.4.patch
+)
 
 src_prepare() {
 	vala_src_prepare --ignore-use
diff --git a/app-i18n/libchewing/Manifest b/app-i18n/libchewing/Manifest
index 4e2d2eff234b..2cfcde2e9252 100644
--- a/app-i18n/libchewing/Manifest
+++ b/app-i18n/libchewing/Manifest
@@ -1,4 +1,4 @@
 DIST libchewing-0.5.1.tar.bz2 3141084 BLAKE2B 28f9e803c8815c0e1b1a1134becffe12f92c1ae24b4b6d4163769d898861fec024db8332befe7130487a72fc20859b6292837e9d68ab1b6477de4cf4f789f2ee SHA512 a6551661bb5e56bba59730b93b373db56af7d42f2ab4881fbfff8727689dd2604d42d2e5c0b04820df66a431dfb5fcb73cc5c9b538615da76198ee3635501c1f
-EBUILD libchewing-0.5.1.ebuild 1133 BLAKE2B 69e6ebe58d26ab7f69e3c76c096af888d1726fb218fb34b12fadfbcdc19d498f3b17c1c34ca4dff2a11db59e4011e62c24cb79c6136a0235b09bfe9c62123a62 SHA512 c34891aecf91306810278c0ad7e21d34da6a1dd93195fc23b23e871f3dfd9791c0da317fac2c96d2ea63898c1e82e94fe7837a75b7eede5923f4be3b563e52e8
-EBUILD libchewing-9999.ebuild 1102 BLAKE2B 20874411d7bbae1684458fc28a83af4b20620409612c5401982e28c070761da991000f5a144f8a71e8967d6afabc788da0b1eae8803d2033785e5559b394410f SHA512 a6b0d950c98c5635e87557f3b7a59b38363345111ade7679f2f8d289c61fe15accc7e771e911a205dfe4934b1ca63839ef45c7b55a839e0f738df0c8130388ab
+EBUILD libchewing-0.5.1.ebuild 1157 BLAKE2B f9e817f8ef01af9e0e7519784030e1fcfcee909aa1e0668c48b4bcaac1e19f751339d06438629792edf0e16e1637f4f97d8e69dec1841430bbacaf55de86c2f4 SHA512 dbf2d3b7ff80fe5ec410ce3dd8aa3ae3633d98611e053e7d7178d197669364043d9df558a9f4c3e5ba19958a4d951cb04d47da4c2e6e60c063254dbc81d85f59
+EBUILD libchewing-9999.ebuild 1126 BLAKE2B 4e5e2f52f0794e5d411be7b0fcbe28a8e1fc8abfa08e79d57554cfe2f82233072036239ec651bc53ce0cbeaf8ffb6e7c01b6ac41ac02039561afa93e78dea8cd SHA512 b346f7510b75aa0f7e28db5e66b366ae082a5fc4fcdc4b6c21679604c3021de659aa643b7da47e47ad172b11c3009411f51fbcd1179f37e8942fd2896ebe3649
 MISC metadata.xml 327 BLAKE2B 3f9b234590aef775dc0ae62f4eef42cc1e363e04c3dabc2464eee9cfb44ec0b1fc4fe9b233f781c15784b3a699537d67e884ee7f1648a62b3a863480a5e831cd SHA512 c9ab28ab34d940a30e97b989fd96904d2e0816e4b1bc5b843b082d64d6cd476335d9402640e71f2cf8f57f44dcae9af66d5e07075b189fa74f21faba40d819e3
diff --git a/app-i18n/libchewing/libchewing-0.5.1.ebuild b/app-i18n/libchewing/libchewing-0.5.1.ebuild
index 1d3529dc744e..4a2f116c20e0 100644
--- a/app-i18n/libchewing/libchewing-0.5.1.ebuild
+++ b/app-i18n/libchewing/libchewing-0.5.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2004-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit autotools git-r3
@@ -21,6 +21,7 @@ LICENSE="LGPL-2.1"
 SLOT="0/3"
 KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-db/sqlite:3"
 DEPEND="${RDEPEND}
diff --git a/app-i18n/libchewing/libchewing-9999.ebuild b/app-i18n/libchewing/libchewing-9999.ebuild
index 3dbd6c51e6fe..9353fc5f3dd0 100644
--- a/app-i18n/libchewing/libchewing-9999.ebuild
+++ b/app-i18n/libchewing/libchewing-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 2004-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit autotools git-r3
@@ -21,6 +21,7 @@ LICENSE="LGPL-2.1"
 SLOT="0/3"
 KEYWORDS=""
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-db/sqlite:3"
 DEPEND="${RDEPEND}
diff --git a/app-i18n/libpinyin/Manifest b/app-i18n/libpinyin/Manifest
index 70179fba80ba..4eb958f399d3 100644
--- a/app-i18n/libpinyin/Manifest
+++ b/app-i18n/libpinyin/Manifest
@@ -1,5 +1,7 @@
 DIST libpinyin-2.2.1.tar.gz 256262 BLAKE2B 4fc081aa42b07eb7d21277c95407eafbf618c9aaf0c6707893f212be70f51d43fe00f50d1b4758d857d0f8aed1e9c177d61d6ca912e776633e8179279f09fb2e SHA512 d323655419aaceda12d794ac25387a2e073e8c2372511913febd5b8049f9d1764a0011cd97b538bbfb14f5c248495a150cf7e3b9f4af21182941e5920f2d879f
+DIST libpinyin-2.2.2.tar.gz 256304 BLAKE2B 52dc7d8fb4836bfc23137ba96177d488bf425c4bce52ea68933fe873a4ec02e2d49ccfac5c6097b55ea676bed30e635fc9805c205892bba2fe6047d92e5b9ed7 SHA512 80d955bf7f9e85ea90f9469032507713b0e15290fb7cc91a471c8c5564e3c78d430c5fd1dc871693aa40688fb68f7a17f719defe107d1512c5bcefd290c56285
 DIST libpinyin-model15.text.tar.gz 19361973 BLAKE2B 3d24321db407e28c1adf49373dd9bacafe0e89409511c0656d7b9a85f1d1ac8693249088dd99beef069576f4a8d0d5db3fd47f98822b32aa3098315cf2660d22 SHA512 d3f5b42f6ea6b22570b5ba67cf23d94a3fee2d7d894191ebc11eb72edc162c72b90b2fe10b312bfd8d77d110654ee5dc00c21b25fb8b7c3f905d4088c9895ac1
 EBUILD libpinyin-2.2.1.ebuild 1396 BLAKE2B 2a6e6b08af53efbd94a2a78c2d4cfc82e61b65bcb1d9bd1811218531a0b3e4c7b7cd91afeadab3228d7af3c862fa6776c5b47bd677d109d5f5332cebb0c31fe8 SHA512 b3530e8c101990101884a74c06643f75e8e75c01db95313b735e7fec6ca06c792f91964445dd9f88320f5f832b9dda490cdb9b32842500fff4f873fe094249a0
+EBUILD libpinyin-2.2.2.ebuild 1400 BLAKE2B 05c3bc6b24d8ebcc5199eb7a1528c0ec85d666d8a55f7c6dd85f50e63221d975f4c230c3b0bbc0c613834decc6b097d978f160e0a07ecfd478c74c3862d98486 SHA512 1b074887a6e90bff7f8e9f7cf4234e87d4dd3d7f46d8213a2bbb9d02c2456317dfc939ee0303c5fbef919ed7cda77df57b76d7a205c081f8ddd0e9e0c041cde0
 EBUILD libpinyin-9999.ebuild 1370 BLAKE2B e8d09bac832f84d10e84b3f46cf9436d41c752b796c6eb008c04a1ea71d1902a9b90701165dfb9cf4fc85bb56c2830db5b8765f1c9e6ff1d44d0483134ce98e8 SHA512 de49fe3137247ca25e6b175ee3cefa689901de1455698360a513ad732f25e4bb9447a4c5f68c35a8eeb6221e3f10266d4b599bfc8c711966125545dd6a4a0136
 MISC metadata.xml 384 BLAKE2B b3f62b356f505bb69731e6f56d43a080e509b578da0762be6ccc112ed1262446034b82d89cbdcca87d502c006319fd11cb4069804b8d8c12f4263a15bbf4f525 SHA512 4317a502e82b23aa2c66d406148eab83996139b4522f999884559b7b6d15709ded6779dc64aeedc657a1be3cd1337281c9e1297ae22dc6b227aef419dc707518
diff --git a/app-i18n/libpinyin/libpinyin-2.2.2.ebuild b/app-i18n/libpinyin/libpinyin-2.2.2.ebuild
new file mode 100644
index 000000000000..350fc522be25
--- /dev/null
+++ b/app-i18n/libpinyin/libpinyin-2.2.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2012-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/libpinyin/libpinyin"
+fi
+
+LIBPINYIN_MODEL_VERSION="15"
+
+DESCRIPTION="Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao"
+HOMEPAGE="https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/13"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="dev-libs/glib:2
+	sys-libs/db:="
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.gz
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -e "/^\twget .*\/model${LIBPINYIN_MODEL_VERSION}\.text\.tar\.gz$/d" -i data/Makefile.am || die
+	ln -s "${DISTDIR}/${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" "data/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-libzhuyin \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/app-i18n/man-pages-de/Manifest b/app-i18n/man-pages-de/Manifest
index 1ef7557a7c5d..2fa7fdb45a5d 100644
--- a/app-i18n/man-pages-de/Manifest
+++ b/app-i18n/man-pages-de/Manifest
@@ -1,12 +1,10 @@
 AUX man-pages-de-1.3-bzip2.patch 604 BLAKE2B 0569a8303e3e28ecbdeaaab04f9ce7a84fb7309485bf7e82da1cbb3aabe0e1987e3a192a27d793cb32bcb36fd8f4dd06ef5940c90ce32e92f3cc783b0387c5aa SHA512 ab07f650572e97cd4bcc31d438d601be182c98998086be9d875b0193a9c7ebe0add85e2cb14867082f70b009acfdd102fe743af02a947f3f41111594c7082932
 DIST manpages-de-1.15.tar.xz 1529576 BLAKE2B 600d9c186ffa46fd1db110c3889abc44bb6ccb6847ed8385c461c7fa696f5a9e8a65233d1290ae9d1e9eb26694e8769aa35983f07205a0e7e57c9b0c14c7d7bc SHA512 d1f1b9f60c4713d6be650e21b7664ff594dbd542b53148c00d1a2269413d39615dd76be4c4095eeb72e2598b94af134ca5d128b85d9520a1ac404364b8a53948
 DIST manpages-de-1.21.tar.xz 1585600 BLAKE2B f2364e0b5fc1ca8ce8f5eb7fa5987d1bc68b1f8f2c1a26240d5cabd03eb5bb094f0d63274c7208059a766498f5f20ca7ccab72a9d4847057aae3b7d6697018e7 SHA512 24cc36e8e9c2efb8cd2a0c374a3f5da96f6645a306082cc28aae5933081f7de24bac03652f690a2becd32a23a93c17ddd9029190c299dda95eeb25f49b327fac
-DIST manpages-de-2.3.tar.xz 7016372 BLAKE2B 3b89049d11bfd539e9114de38198f610145972068c9cec1da1b6398fb1d3e846b112ca0336891c1782a6fb142f397ac472ad78be0596503377318bfe65ec68d2 SHA512 abc3574c4a315d86b4fcccb25d617851c1ff43844fc7b1b92d7849a098280a96ab73d4986047fe6bb18e8f11d391182370eff9db476e0dd2021d0725b4e945eb
 DIST manpages-de-v2.10.tar.bz2 18037944 BLAKE2B 7f2ec07e4b4b13adfb93c00827ae56cb82c2158de2a59bca729e5fe5bbe1f9a60c39712c52ae8b5856eb55288b1b562fd320473ed94f443e252df80a909df08b SHA512 d74b62903061f5af939c8e5a5f48906fecd2956d9291be54cb00041f3c964c769159989fba888ddfb41e167b5342b7b71d2dcc7b58f1b1453836b24bb9121f26
-DIST manpages-de-v2.5.tar.bz2 8744190 BLAKE2B 06b9f970e652892edda6079bd4b912b2272652b5060a0d7a7c3dcd074f2ac71730800a077b7aa4d5175fb44723a60642e39c1bf81ecc731dcadb0ab703461df9 SHA512 3bf5f794ec9a1036f0fdcbea6afc03fd845f42b83c928116e4f47980060b3dcedfb25cd4330a60cc3da7f573d73a50e61ccb6a681979fcc6bfb63b882de1fd20
+DIST manpages-de-v2.12.tar.bz2 10242050 BLAKE2B fa497a6fce2c2387dad2ab9443584174d8d5fab530b94e0123e71286c588cb3a2e52aa96760dbfd6545bed013c460e1bf61eb4a5af0673bb84c1c0f0c960a357 SHA512 548d3dd500ce1eadc71365119e35072b71e3fbe36eba664d992e94897f442fb93f9397053f72363f83dff2e931d93e2af995976736d8513d11d7c42bdb471862
 EBUILD man-pages-de-1.15.ebuild 1289 BLAKE2B 2aa0d95614a5cb2d22a63c661befd01b789e6c7e322a48c013d5b408058235141bf0db7680f81da0016b8f03d246b8de6cc6ac0528cbbfc3aad4fba11bc475d1 SHA512 7f090cb1bef72e48034e98f5868378f47683575dde6668177871b12e1d06bf46cdfffb7b03877d19e57c925cb5c6cb599f766710743d150a79e36ea4f5258f57
 EBUILD man-pages-de-1.21.ebuild 1252 BLAKE2B 49503d85ab5a60b5dc5475f11d4ddc042abb3883665336450179a2247279ee0171037f7937195467e4d7b25dd8671f7a676171c7ad983f9134c7430689139df1 SHA512 2158482fb6541e0391b3c916da51fbc1bd5e67c8a283cc0a795e6e68462eb3c1ce343b8fc9161199a8bf56632505f0c1fd39e4527dffdbb61e5797286d1ae6b9
 EBUILD man-pages-de-2.10.ebuild 1898 BLAKE2B a44fb94d3d46334e1a2e7a58651cec5dc2091815d204222670d7a8e8a2ae09c78c86643ed7f967d62c18d2c7df00d19ec68c01a2f388f49f325a758f869a4d1a SHA512 4528a8b742541dea23819826909f631b5fb5c2287c21aac80a6e2efafc9fe245effca49b868c554e11394d3759b72f314e9f67adb70a665e8b37f32322026fbc
-EBUILD man-pages-de-2.3.ebuild 1356 BLAKE2B 99e0104647b0f1d80125a744b33a0e846cdf8f3d3acc846908376cebfaa1648aceb4a570116e035765164cbabb360ae7b995c522355aba97ed84530eadb90b12 SHA512 6a6081d2116fd0d756e22b8f1ab6d905ab57b9bbef6f7f084df50afe1afbd1187f16c79d800bcf00f9ab8cf3ea3869dd527fa885c0ebad8b0b3d6074d0d919e9
-EBUILD man-pages-de-2.5.ebuild 1436 BLAKE2B 4e5bc9ae14f8fed5e6a13971e6bb5d688d2d626fafe4390c1946c7fe28d6c6785edc9878efbeaa6aca970911a01cacd50b2c514f4717ae749f0134c72f613b7f SHA512 4a009a516c425f5831e82ea223125cf165ce37b12948313e2c39524cb0ac390ae577e1520c671f65b5370820ad4956cde8905e0ea39913ff47c0c3523023919e
+EBUILD man-pages-de-2.12.ebuild 1890 BLAKE2B 50bfe10ff3519dcd0aee03b0e9e46d8b4f25931ca636290c544d0a9b494a6bd37884fb26613966c3bd458e9036347984561087c84bf1c4c7c8cccfca66da2e2b SHA512 8fc7c4180f0d83dbc34e31c9f27d12816d23c507139bb80f5446e37699c6a928ed4739a0da2b96460bf2debb1338bc17f7551aae1402035505a3138aca8f1cf1
 MISC metadata.xml 369 BLAKE2B 41170815bcde0a65831b0453eee7b99359594bc67d345e31d1228d6b5def740d73087b96473511a8249528ac16a80b0eeee91791f9d4f113cb5caed918b40552 SHA512 e36208b3689927021e51ad2348ba3f5a5598b9657ffd7156d928dc817b90ed91a57d43605eb8a3e2fde1caf04349ba76b68ebc7ead1061ecca66280095179658
diff --git a/app-i18n/man-pages-de/man-pages-de-2.5.ebuild b/app-i18n/man-pages-de/man-pages-de-2.12.ebuild
index d8f50681b5ef..824cbd2c4b4c 100644
--- a/app-i18n/man-pages-de/man-pages-de-2.5.ebuild
+++ b/app-i18n/man-pages-de/man-pages-de-2.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -17,34 +17,58 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE=""
 
 RDEPEND="virtual/man"
-DEPEND="app-text/po4a"
+BDEPEND="app-text/po4a"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
+src_prepare() {
 	default
 
-	# sys-apps/shadow has it's own translated man-page for this
-	rm "${S}/upstream/primary/man1/groups.1" || die
-	rm "${S}/po/primary/man1/groups.1.po" || die
-}
+	sed '/gzip --best/d' -i po/Makefile.am || die
 
-src_prepare() {
-	default
+	# sys-apps/shadow has it's own translated man-page for this
+	local manpage
+	local noinst_manpages=(
+		upstream/debian-unstable/man1/groups.1
+		po/man1/groups.1.po
+		po/man1/su.1.po
+	)
+	for manpage in ${noinst_manpages[@]} ; do
+		rm "${manpage}" || die
+	done
 
 	# Use the same compression as every other manpage
 	local PORTAGE_COMPRESS_LOCAL=${PORTAGE_COMPRESS-bzip2}
-	if [[ ${PORTAGE_COMPRESS+set} == "set" ]] ; then
-		PORTAGE_COMPRESS_LOCAL="#"
-	fi
+	local PORTAGE_COMPRESS_FLAGS_LOCAL=${PORTAGE_COMPRESS_FLAGS}
 	if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
 		case ${PORTAGE_COMPRESS_LOCAL} in
-			bzip2|gzip)  local PORTAGE_COMPRESS_FLAGS_LOCAL="-9"
+			bzip2|gzip)
+				PORTAGE_COMPRESS_FLAGS_LOCAL="-9"
 			;;
 		esac
 	fi
-	sed -i -e "s/gzip --best/${PORTAGE_COMPRESS_LOCAL} ${PORTAGE_COMPRESS_FLAGS_LOCAL}/"\
-		po/Makefile.in || die
+
+	# Fix source files for symlinks
+	local LINKSOURCE
+	case ${PORTAGE_COMPRESS_LOCAL} in
+		bzip2)
+			for LINKSOURCE in upstream/*/links.txt ; do
+				sed -i -e 's/\.gz/\.bz2/g' "${LINKSOURCE}" || die
+			done
+		;;
+		gzip)
+			# pass
+		;;
+		xz)
+			for LINKSOURCE in upstream/*/links.txt ; do
+				sed -i -e 's/\.gz/\.xz/g' "${LINKSOURCE}" || die
+			done
+		;;
+		*)
+			ewarn "Unexpected compression command ${PORTAGE_COMPRESS} found, symlinks will not work."
+		;;
+	esac
+
 	eautoreconf
 }
 
diff --git a/app-i18n/man-pages-de/man-pages-de-2.3.ebuild b/app-i18n/man-pages-de/man-pages-de-2.3.ebuild
deleted file mode 100644
index 0b4510bd50ca..000000000000
--- a/app-i18n/man-pages-de/man-pages-de-2.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_P="${PN/-/}-${PV}"
-
-DESCRIPTION="A somewhat comprehensive collection of Linux german man page translations"
-HOMEPAGE="https://alioth.debian.org/projects/manpages-de/"
-SRC_URI="https://manpages-de.alioth.debian.org/downloads/${MY_P}.tar.xz"
-
-LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-DEPEND="app-text/po4a"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-
-	# sys-apps/shadow has it's own translated man-page for this
-	rm upstream/primary/man1/groups.1 po/primary/man1/groups.1.po || die
-
-	# Use the same compression as every other manpage
-	local PORTAGE_COMPRESS_LOCAL=${PORTAGE_COMPRESS-bzip2}
-	if [[ ${PORTAGE_COMPRESS+set} == "set" ]] ; then
-		PORTAGE_COMPRESS_LOCAL="#"
-	fi
-	if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
-		case ${PORTAGE_COMPRESS_LOCAL} in
-			bzip2|gzip)  local PORTAGE_COMPRESS_FLAGS_LOCAL="-9"
-			;;
-		esac
-	fi
-	sed -i -e "s/gzip --best/${PORTAGE_COMPRESS_LOCAL} ${PORTAGE_COMPRESS_FLAGS_LOCAL}/"\
-		po/Makefile.in || die
-	eautoreconf
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake mandir="${ED}"/usr/share/man install
-	dodoc CHANGES.md README.md
-}
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index c87878a2814c..2c2e759e9d27 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -2,5 +2,5 @@ AUX xinput-scim 240 BLAKE2B 8c235304288f531db5bea179ff0100f6152b55348057a2604f37
 DIST scim-1.4.17.tar.gz 1285383 BLAKE2B 95b9ecb0bb25a15876df8175ee0b9392c301e3b0c554ac6ccba6b863420828ce185d3454f2fef48c03e7451f01815020290be7611b8536d8a028153af3a3fe2b SHA512 a7e0696330bca6fdf929ec0565ab4af1b4d0e5f73592cf5cccf1af6412eb351cd5a5ec9a3e5b83b24d6abad89bbb38a375cbbb0fd978f2fa17f6d64b69da0e3a
 DIST scim-1.4.18.tar.gz 1288060 BLAKE2B c2f1ce5608423734899aa6698060245c4ee253048d04d32bf5e853b8c68255340a8d35c0ebaaa50871b07c23ee9018b6bac03b18fbd4fa4dbea0e67c32c9ae30 SHA512 9a6090fc1ab950905a9c54d6678ce3d2a44297d1a992a3e933b0466688638e6cf470c1682daa58a6fbb6de3216b649273faf7edff1ac0ecca1c2c77fc19108fb
 EBUILD scim-1.4.17.ebuild 2549 BLAKE2B 32dfb1d2d19757539c79b161a9adb47e36df4747eb139a3f657cf676cdc2d8a1bad42200a40cdbe4a0bffc4c9e4de7dffe2a04da67484037cc235fd7eea01acf SHA512 8901a0b280b589f4285be3754506d40cc9957efaf66302768e5db47035d5563c8ecd38bde285059d43b01c08797737e71ee6759979955270e347366c1300f573
-EBUILD scim-1.4.18.ebuild 2559 BLAKE2B 286644bd33c95a1d972a5ae041b1ba63286fa75ce5d234b70c61daada65e8571a2492a0dcf8d6d402085a2c3416df248e3f868c5db7d2cb1b7f507a1715dc601 SHA512 ea2db970429bd58c47f3be08bdb6ef03863298ac11ae685e66ce375936fa2714f66a2c75040d9f5bb33ca14f5a4660e0be552ecd6ec3d676423be4f438ecf3b9
+EBUILD scim-1.4.18.ebuild 2566 BLAKE2B 0d9f4310b03226c5f0345a3be96c70039289ab7e340bbf028a5ec0bfda8c2a150eecde86f18b5950bc957e6548f4c9c94ec381b2205329e91cb2141821fc5804 SHA512 8fed0de1725ba2155b12e552089a657b95b6d24c782e3e2617d67d440f3322f2f5f8411b326a6818b34be4ac010f5aa79c3a26adf43612a80e08fe157c5e20c2
 MISC metadata.xml 399 BLAKE2B 35834cd16ccba6bf71752ae33d56e8a70391517ba09f83526d402b3aec5fc5d9c13513e090bb014cad67658c905c1dbbe396cc0c9dfc6f1e7c32c4c09a81d777 SHA512 3bbbad26a22cc5222316cf769f638a0e181ea94d8cee39058bcbd1a08e61dd0096441721190323ddb285c504dc061027e4c4185f8bee1d4d0b4b197903f3be0e
diff --git a/app-i18n/scim/scim-1.4.18.ebuild b/app-i18n/scim/scim-1.4.18.ebuild
index 922de943bbe6..832865000706 100644
--- a/app-i18n/scim/scim-1.4.18.ebuild
+++ b/app-i18n/scim/scim-1.4.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/scim-im/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="doc gtk3"
 
 RDEPEND="x11-libs/libX11