app-i18n/*fcitx*: Delete old versions.

author: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> 2017-11-28 18:02:02 +0100
committer: Mike Gilbert <floppym@gentoo.org> 2017-11-28 13:36:27 -0500
commit: 6635ba1924005ba2e0bb614a537d84e8fa74a51b (patch)
tree: 12a323fdb11b7f6cb546fe47f888a4cc80537550
parent: net-print/cups: Use correct perms patch. (diff)
download: gentoo-6635ba1924005ba2e0bb614a537d84e8fa74a51b.tar.gz
gentoo-6635ba1924005ba2e0bb614a537d84e8fa74a51b.tar.bz2
gentoo-6635ba1924005ba2e0bb614a537d84e8fa74a51b.zip
61 files changed, 25 insertions, 2491 deletions
diff --git a/app-i18n/fcitx-anthy/Manifest b/app-i18n/fcitx-anthy/Manifest
index f32c172fee96..814cb3b6b049 100644
--- a/app-i18n/fcitx-anthy/Manifest
+++ b/app-i18n/fcitx-anthy/Manifest
@@ -1,4 +1 @@
-DIST fcitx-anthy-0.1.1.tar.xz 68604 SHA256 c508068c7c9a56c26ea44b8e6ddb90a2ea75860031f89e171dcda8ec4cd08955 SHA512 e2c4bb20f0b0a370e5f28bff14312c2c14210695418438ebe697b94570fe502be8c96dc8fbf813fd3aa6e352283a7d31808a1f12266d4a8050646a8ae86de9d9 WHIRLPOOL 48f674ef23d62f2dc1286712cbb252d709d9e3890921d1f9296ff89f85c5ae211daa887841fc01f267fe44764275e8b6de4aef859d9f1456cb24f00023b262ce
-DIST fcitx-anthy-0.2.1.tar.xz 72196 SHA256 fd208474666f09f1c189c10c2c0fa9cfda33948b704410e02878fdd92174d78d SHA512 18599251d6ebda96a23f81f63d91e9a9d469d2ea534975c2f4ddbc80584d70646ac6d157d0571f9d48565c0cfd1bb111e2907cae2c00b750014b9f39a7bcf961 WHIRLPOOL 99632911a7831ce24c7535b0e0a249cbbc48b24ec44682f6a09e3dc0a61d7eb74363642098158cc409c3390fb141d03591f1e1b1b3683164d4d6002fe9c92769
-DIST fcitx-anthy-0.2.2.tar.xz 72360 SHA256 c8dd54fee3ada834d6ed0df561a95210256ea2a17fa5e00d9ae09892bafbd92b SHA512 a4b1eeba813481cc40617e70bd5ee97d1921dc92bab15cf0bdc059d689c239e46caf9e8aba3403ff6374acfbdea565261a948444fe40fa18d5513797eccbd28d WHIRLPOOL 7427384e8e12d7e35027a4a149cc758828fb9664204490d35f7b43ad083cc8545c4b52164af716065bccdd4a347f047e34c80cac32699641798fd2e21dccc8ea
-DIST fcitx-anthy-0.2.3.tar.xz 78020 SHA256 ed9b4956356ca68e5f7bdd46492873ebebc921a6cf713d7fc62e5680393f5d06 SHA512 2769871059053fb370ba84af7cdf0c461d64724a240d58a5a8889cfd9bfb5d145998f79ed2d06a1ae1ab907f9db04fc122bfaf6957ef572fc833e400ffefc642 WHIRLPOOL 4550f529d98b31abf7e632998fdd5d082045ce2daff251a860f7feaa966fba2955d7fdfbdf0be977f81c64cdd0473f082e8356569d70f3c29943846e9ea92570
+DIST fcitx-anthy-0.2.3.tar.xz 78020 BLAKE2B ae054f753dd7d10a0dafd80d67413c29806b6c3b08de9eac3d7eae1d540f01b7bafd22bd9c722a7fc517f1752d90c1c3d82e75aaf58a807daa60b7e9a047d152 SHA512 2769871059053fb370ba84af7cdf0c461d64724a240d58a5a8889cfd9bfb5d145998f79ed2d06a1ae1ab907f9db04fc122bfaf6957ef572fc833e400ffefc642
diff --git a/app-i18n/fcitx-anthy/fcitx-anthy-0.1.1.ebuild b/app-i18n/fcitx-anthy/fcitx-anthy-0.1.1.ebuild
deleted file mode 100644
index 25918894af39..000000000000
--- a/app-i18n/fcitx-anthy/fcitx-anthy-0.1.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Japanese Anthy module for Fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="https://fcitx.googlecode.com/files/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.5
-	app-i18n/anthy"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/libintl"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.1.ebuild b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.1.ebuild
deleted file mode 100644
index f46787be50e6..000000000000
--- a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Japanese Anthy module for Fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 ~ppc ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.8[X,xml]
-	app-i18n/anthy"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/libintl"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.2.ebuild b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.2.ebuild
deleted file mode 100644
index 4bb55b3b1f6c..000000000000
--- a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Japanese Anthy module for Fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.8[X,xml]
-	app-i18n/anthy"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/libintl"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/fcitx-chewing/Manifest b/app-i18n/fcitx-chewing/Manifest
index 0e8669959a40..3e3b71ef4333 100644
--- a/app-i18n/fcitx-chewing/Manifest
+++ b/app-i18n/fcitx-chewing/Manifest
@@ -1,3 +1 @@
-DIST fcitx-chewing-0.2.0.tar.xz 13968 SHA256 cf03b84004f1839a6f6e10dadf53edfbf8b6dcbb9d70579cde913b6b5e0a8dec SHA512 af8f2fb6fb5fb017522ac81fa9b14907d9537dace21ef594951f1dd717e276319666480aecaa55d0696c2ba80f74d51f7573aea9799d96a37bfa8305b8e04e54 WHIRLPOOL 6508407069d353c05b3167b413f5ab90f839afa6e77282ce79504ae23d831e150747a1c949e5fa8f0c021ba7b44b95087295336ad17d049bfbd41b87555aca5f
-DIST fcitx-chewing-0.2.2.tar.xz 19684 SHA256 fa278ee9d2c20f7ae0a3093a3e490553798186bd67dc1e83f2723bd15b47a450 SHA512 3191c269459779115353fdf3f6fcdd1a8bace2d7f45426eebe1d4198eb8f84ef88680c38b7e03d7db4db45dc41ee2ddbe92d36c71911f09b23ef9f0d5d745617 WHIRLPOOL ab9a2fec736f3e2c4af761360ef0cd0e53fdeae1e850e322d7b5d31ceee9d074f7cb29f9f6e083f26e374928ba559b53d139ba906faf21538771a6f371d677eb
-DIST fcitx-chewing-0.2.3.tar.xz 19804 SHA256 b313c7134eb173668f42535b0eb6e985eb94fdf5d2fe705940a6cbfdcbadbaf0 SHA512 3492ad6ecaf00bb1ea07b76c9c23da075615597c1a68434a2da003cbe410d12172510d4306379777a1d04a359b017c49d278c002a7230b030693b668b6030bfd WHIRLPOOL 32475349ac0cd89b0741e64a0ba02ef854d42dee51ac96ad7b9134afff8b81901eadb5acf338b018a936bb5fe2a675d4f15beb4d98c261832d95641ca86f4492
+DIST fcitx-chewing-0.2.3.tar.xz 19804 BLAKE2B 0a83ae9a17eb74898e41471450a9054bb05e504a60d05bda91fa53f90cb4328b0db4bd5e1d662c81c9322268660e57a7f2cb9c547593913206a00394883341b1 SHA512 3492ad6ecaf00bb1ea07b76c9c23da075615597c1a68434a2da003cbe410d12172510d4306379777a1d04a359b017c49d278c002a7230b030693b668b6030bfd
diff --git a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.0.ebuild b/app-i18n/fcitx-chewing/fcitx-chewing-0.2.0.ebuild
deleted file mode 100644
index d7d21c5424da..000000000000
--- a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Chewing module for Fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="https://fcitx.googlecode.com/files/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.7
-	app-i18n/libchewing"
-DEPEND="${RDEPEND}
-	virtual/libintl"
diff --git a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.2.ebuild b/app-i18n/fcitx-chewing/fcitx-chewing-0.2.2.ebuild
deleted file mode 100644
index 15954fb3655a..000000000000
--- a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Chewing module for Fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 ~ppc ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	>=app-i18n/libchewing-0.4.0"
-DEPEND="${RDEPEND}
-	virtual/libintl"
diff --git a/app-i18n/fcitx-cloudpinyin/Manifest b/app-i18n/fcitx-cloudpinyin/Manifest
index f7753c0bd883..980d06d81892 100644
--- a/app-i18n/fcitx-cloudpinyin/Manifest
+++ b/app-i18n/fcitx-cloudpinyin/Manifest
@@ -1,3 +1 @@
-DIST fcitx-cloudpinyin-0.3.1.tar.xz 19296 SHA256 2c919bf7979964bef861b432b821fc43fa94824e82372b03c653219b0fc05f6e SHA512 fda8501d8c132b3810f70d984f77652cefad5a052580c6607f893efdfed132a05053c6edf3ea8ba829e33abc237808eac6ca3521c6616ad2cfa5e3c4e0045297 WHIRLPOOL bcd8aae0339ecdc3db58a950c475e81133a90b08f9294dfea224d38ec7b6e2f929fff2d389761f2c90ee1553b9bd02fd8bf93ab9ef7c23101affebfff7b76d33
-DIST fcitx-cloudpinyin-0.3.4.tar.xz 20796 SHA256 c131e8cfd4d171f7749c2934f13092dcdffcf3d4ff1cefde7ed67daed74b7d90 SHA512 ecfab0e45387793986fc75f24372d69910552d6168c9dd63f258bf05bfa397350bfea2a6fc419ab067fc5a7737a3e8c39d4b8ae5d0501871e3365c8a07553b09 WHIRLPOOL 7dbecb3f5ec38c50364abddeb5c44318503fdf40783b6efd5c8ece029f0cd56f750057b547a25fa6836458ed15646d5923e09c4fc33d927f9d1a40e5332577c7
-DIST fcitx-cloudpinyin-0.3.5.tar.xz 22424 SHA256 2515fe35d1f9d377a997ce8095425ad71d0c76e3fcba2e1fffefc2ba46b765a3 SHA512 b56cde4955fab02d204cfe937b46aeb5b6adf9e4eb4fead6e7b8e0b5cd1ebce06a0de3f9d477a1cb58eb077655f17975b7e13951074d1766b283b86eeb5b276e WHIRLPOOL bf05a4c882d14a9ac3a52bd2d3faf87ee67aea583199d7c5888f425db0f080bd6bc73a8fd3a2236f69a65f40ceef9bf2882dd24838f7dbba8407eafc8695235a
+DIST fcitx-cloudpinyin-0.3.5.tar.xz 22424 BLAKE2B 9f44bf3a16681d994a8f202c7b9ba5bcb14a77c70e6e854626df675f647582632b6b4c110cf315fe376a6dd876607fe815d57d07361e219ddc11222ad1a95d6c SHA512 b56cde4955fab02d204cfe937b46aeb5b6adf9e4eb4fead6e7b8e0b5cd1ebce06a0de3f9d477a1cb58eb077655f17975b7e13951074d1766b283b86eeb5b276e
diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.1.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.1.ebuild
deleted file mode 100644
index 2a6d5f8ceccb..000000000000
--- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A fcitx module to look up pinyin candidate words on the internet"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="https://fcitx.googlecode.com/files/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.7
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig"
diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.4.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.4.ebuild
deleted file mode 100644
index 3b0a7938c0be..000000000000
--- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A fcitx module to look up pinyin candidate words on the internet"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 ~ppc ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig"
diff --git a/app-i18n/fcitx-configtool/Manifest b/app-i18n/fcitx-configtool/Manifest
index 34fce1a3e93e..1cf6ca87802c 100644
--- a/app-i18n/fcitx-configtool/Manifest
+++ b/app-i18n/fcitx-configtool/Manifest
@@ -1,4 +1 @@
-DIST fcitx-configtool-0.4.10.tar.xz 50440 SHA256 bcc4976976bfbddbfec3f689f38927fbabc7f7fa611ea252a789583ea14cd1fb SHA512 1c1267e9de694bbd5f258b5bba1e7514c4f8556cdc82a1cce5eafd8a4ec571955285dade0acd02f128eca01f867a30c5c6264ee7e91d32a333eba6e4d275fe8f WHIRLPOOL bbbc2a5c9d2247312b00c75a2469ec11f2992d8ca9d5b6bc7fec7b395973dd64fb3c7aed796682ea2a819f227daddb371a565cbedab7ba2b08838a74051c8417
-DIST fcitx-configtool-0.4.6.tar.xz 41992 SHA256 8d64107f9f12b4f2cbd82e40b87a2dc4dc76d0ff854481c1103d5e9a2c2e129d SHA512 946bceb77fc6d14210154d9264c86d3333f910893cf3054f65eab72641421847e8ac003889b742f4c28f74c8ab1cfbcfb82abe35ea83ca2548cfc1decc92fc4c WHIRLPOOL 58f8a420f6c98cb6d710bd05d8ca2a3ca48a115015e6de98b105bf71b59bf3dab34eb63009d763dc7a3554fa6ec0b442e8bb277f890230dd94ec371397a6766c
-DIST fcitx-configtool-0.4.8.tar.xz 47196 SHA256 0ebc06d9d325fed096e9cb61fe53b82000d2de0e9aefe5945ba8f0aa2ca851ed SHA512 7b3c43b9d7d1dab04880effe6fc4e80e64c9bad34699c0c8d2992ec971605ef2eaa0b1fb13f71a582289c75560c3edc95af21f6413ac2bb594d5cdb31a0b4cb7 WHIRLPOOL a1817bcc9d6bdcd96e66dbe71d44cb66d6b66802e366b8f21d5f922495176463fc23adff2bbdbfb4003ddcef43839fab06715231fdaada8714eec1e3a073f18f
-DIST fcitx-configtool-0.4.9.tar.xz 48796 SHA256 592075d28224f8ce5304281c507ab2f9a9dd93f118eeec30d442ff3db214f9fa SHA512 800c731b370ace833179560260df7ffc9c0235c4f3257e8a99a0194f2fd06b71f738e6c77985871c3368179f944da2165dac5d4a8f7ba083519cb2509a9eb62b WHIRLPOOL ae5157178cbaedd66512da6548e79b0a09dd11e4ce8797ae3387c698cd33b51facf1153dca0d3e16cbf77a01959d01251a5dcd7fb6b30f119807d56a2a0f8470
+DIST fcitx-configtool-0.4.10.tar.xz 50440 BLAKE2B f2f2241d3ea139f6f3de9b8c6ffcc71c789dfa291efe4c551596eebc8a04f13f9fe698cc25d8349a174399044d15ddca2aeab952ac2bc7f0f4e9e47d453329ca SHA512 1c1267e9de694bbd5f258b5bba1e7514c4f8556cdc82a1cce5eafd8a4ec571955285dade0acd02f128eca01f867a30c5c6264ee7e91d32a333eba6e4d275fe8f
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.6.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.6.ebuild
deleted file mode 100644
index 1bef6d8f0e68..000000000000
--- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A GTK+ GUI configuration tool for fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="https://fcitx.googlecode.com/files/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="4"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="gtk +gtk3"
-REQUIRED_USE="|| ( gtk gtk3 )"
-
-RDEPEND=">=app-i18n/fcitx-4.2.7
-	dev-libs/glib:2
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3	)"
-DEPEND="${RDEPEND}
-	app-text/iso-codes
-	dev-libs/libunique:1
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs="
-		$(cmake-utils_use_enable gtk GTK2)
-		$(cmake-utils_use_enable gtk3 GTK3)"
-	cmake-utils_src_configure
-}
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.8.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.8.ebuild
deleted file mode 100644
index 3a94d897cdae..000000000000
--- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="A GTK+ GUI configuration tool for fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="4"
-KEYWORDS="amd64 ~ppc ppc64 ~x86"
-IUSE="gtk +gtk3"
-REQUIRED_USE="|| ( gtk gtk3 )"
-
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	dev-libs/glib:2
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )"
-DEPEND="${RDEPEND}
-	app-text/iso-codes
-	dev-libs/libunique:1
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs="
-		$(cmake-utils_use_enable gtk GTK2)
-		$(cmake-utils_use_enable gtk3 GTK3)"
-	cmake-utils_src_configure
-}
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.9.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.9.ebuild
deleted file mode 100644
index 871b14fd1c26..000000000000
--- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx-configtool"
-fi
-
-DESCRIPTION="GTK+ GUI configuration tool for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-configtool"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2+"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	app-text/iso-codes
-	dev-libs/glib:2
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=()
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_GTK2=OFF
-		-DENABLE_GTK3=ON
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/app-i18n/fcitx-configtool/metadata.xml b/app-i18n/fcitx-configtool/metadata.xml
index 16a37e906ad6..c7779e9268e6 100644
--- a/app-i18n/fcitx-configtool/metadata.xml
+++ b/app-i18n/fcitx-configtool/metadata.xml
@@ -9,9 +9,6 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Use GTK+3 instead of 2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">fcitx/fcitx-configtool</remote-id>
 	</upstream>
diff --git a/app-i18n/fcitx-hangul/Manifest b/app-i18n/fcitx-hangul/Manifest
index a836a44c3fc5..2f7704ee57ff 100644
--- a/app-i18n/fcitx-hangul/Manifest
+++ b/app-i18n/fcitx-hangul/Manifest
@@ -1,3 +1 @@
-DIST fcitx-hangul-0.2.1.tar.xz 25064 SHA256 a084789d2f5646af9e60b8f95385ee1cbbd2dc402709a8b3a8ea82a16fbbae97 SHA512 da1a0926be129dcf49b5fd199b7a75d4f66d3c58944c7f5ae70219a2903c0277a99e9bd05e0758ae86f24b51f910425d70ea86112d85e852cf6f5f1f7fe78db8 WHIRLPOOL c4dae7a479d385da877ffdea36d439e61fa441090b8f86cecf83239250f1cc1ba19204f378ce39c02fe135dd120a4858819c183b25a79dc1989b0a236b6d37bd
-DIST fcitx-hangul-0.3.0.tar.xz 25600 SHA256 978a66471eb200cc3807fe84e9b5f1392fefdcd51031e5a0bd8647fa994507cb SHA512 07085508da98c49bcecf75fbfad6681263a735a1efcc4fb7a6fa05cb215dfe0c338e95e26cc55e488501b5abbc1007464b1bbf488f07aaca2d1a0a18c8173074 WHIRLPOOL 9833d6eb8484be33e84275174b2b81cc88dbb8d2561c15c7897e172fef61045c856cb9c2c42e7df9baf4d3dbdeb987db556b6a2e8a3e1462cd93f80b6a933b7a
-DIST fcitx-hangul-0.3.1.tar.xz 26612 SHA256 6dd5fd5956924c85af92ebefaef1e113e38fa814355fbb0f07c26049c3014437 SHA512 6ad2e34644c9246490a91342a11b186d40702f7e587beeb056ad98538da50dbf9fdc9f298e5b379bef50f63ad5be5da79ba84e60a22b57c330d0a68dd5bf5ca6 WHIRLPOOL 76796f5ce6b904971ca2c4db0b24eeaa436033b054fed5f16a46f0c31dfcf8dc324c336c1731634cc507874dc1758a363be70d8fa8753c90b9204b4edf6c6da8
+DIST fcitx-hangul-0.3.1.tar.xz 26612 BLAKE2B 59770762ecbd5027d9010d99037881c576f638d30cf22234e5b110e9264637c3ff2049fbf8c7e44ca27acebff5668b2eefee5aeff78622ccb338ff68abc42490 SHA512 6ad2e34644c9246490a91342a11b186d40702f7e587beeb056ad98538da50dbf9fdc9f298e5b379bef50f63ad5be5da79ba84e60a22b57c330d0a68dd5bf5ca6
diff --git a/app-i18n/fcitx-hangul/fcitx-hangul-0.2.1.ebuild b/app-i18n/fcitx-hangul/fcitx-hangul-0.2.1.ebuild
deleted file mode 100644
index 9037363340e6..000000000000
--- a/app-i18n/fcitx-hangul/fcitx-hangul-0.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Korean Hangul module for Fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="https://fcitx.googlecode.com/files/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.7
-	app-i18n/libhangul"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/libintl"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/fcitx-hangul/fcitx-hangul-0.3.0.ebuild b/app-i18n/fcitx-hangul/fcitx-hangul-0.3.0.ebuild
deleted file mode 100644
index 73218760c8ad..000000000000
--- a/app-i18n/fcitx-hangul/fcitx-hangul-0.3.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Korean Hangul module for Fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 ~ppc ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	app-i18n/libhangul"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/libintl"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/fcitx-libpinyin/Manifest b/app-i18n/fcitx-libpinyin/Manifest
index c83d8477ceba..c20e8286086a 100644
--- a/app-i18n/fcitx-libpinyin/Manifest
+++ b/app-i18n/fcitx-libpinyin/Manifest
@@ -1,7 +1,2 @@
-DIST fcitx-data-model.text.20161206.tar.gz 15099931 SHA256 5c7024e5735389c471f54b867eda0d98c5a40a5e5e75333a9febac107508f704 SHA512 26450e347b7a211e5abd94acbb9befc8cee7d8fc20e5161ef11b8b9b1ad47cde4f1add5c41484d9af04e4dde2aa748090e297e799ee7f6d2f9fcec3873eee429 WHIRLPOOL ed5ee634d8904ed6578f4e6547eb58762d43e8323d755e9c9dd8562737c652395bec3774124c754a7196df9016ffd4dc51052f07185a30f1d75275b894802c8f
-DIST fcitx-libpinyin-0.2.1_dict.tar.xz 10007544 SHA256 1ec33b2c56f98079fa5383b5fffcbe095ec64ffaa07eefebbc5d609136a2fab8 SHA512 7e446ac1e07301d6671f3de1059d099237aeeb46fdb9f68fce40a205cdcb17542345334b13f45b19f356743f92601492d178e6e2d578567c2506bed9c808ccbd WHIRLPOOL 598341a001d4cbb544bf3e3fc4449b1a323fc9ae6d3fc5fe8217b9a15bc2db22fb937e61bae32b3420a6b33d235368d6bd31fecfd1a845d1edd3acda320cb6f3
-DIST fcitx-libpinyin-0.3.1_dict.tar.xz 15143832 SHA256 0b553c90d37c36e82ad692803519cb3cf82ae3597ed2f74b1f5251e942c272ae SHA512 3b7501a75dab2f5b83541c71ccac93709f3354f390f322d7b95e4b94e0c4dc6963522759ab52eb77203d787d6d14d3ce1c838dd92ecd0db041a3b7a25008eaa4 WHIRLPOOL 1f655dc2a4439b8ff0583fa88f3d75f2472a8abdeff9132a98d242f2007d3abaf582f8ae31ec18ef693754bdf29788a37f4dda96bd1777d6a43eb1ac8eb6c194
-DIST fcitx-libpinyin-0.3.3_dict.tar.xz 15145448 SHA256 cac02fb2ac19d9072d58e2d9383297e21942caf71b528aee8fa36c55c899d1e1 SHA512 1d77bb0a73ef2f94058ad8f991c628097c87b0ea9c7c4480d23c972ff20ea8ea2653113c8100f1611911606fe84a470650e1a2e9cc6d596d3e80960bb00900c2 WHIRLPOOL ea9f470a92ad55fbdc561d0df1ba51414c716fac158c8db28cccd18d2f106339ee8dc9eba03067f2473289f485dd1118ffedee6ea5b0fbcd0517f6ef5e68abb8
-DIST fcitx-libpinyin-0.5.1_dict.tar.xz 15147796 SHA256 9464ff6bcff8ff5f89059845a26ece5fe2659b66f65fd0c4a092ee818752adc7 SHA512 85d26e5c036f5fb82005c677d8924e68236f52fab2ddf0e19472e84ca4ae66d9e8e7ec7a84cc7b7cb1da796df2e51f267336640b7957b5caf91ea13e273da411 WHIRLPOOL 676d9f71e2daf76a2b7677f381b32adb28cf3c4034ba949008b95b0fd9df9cd55ec5dfd86a3ae289e86b7e0758d72586e5d6e93267309e49ed1b2627dadb4ec7
-DIST fcitx-libpinyin-0.5.2_dict.tar.xz 15149780 SHA256 26e916d39db952901c95d97d8a6bd22f0a2dd004549553f58562dec04823f66f SHA512 9ff0d55d78f6ef7967df685c494351bc61ee3f6b47924cf265c781bb7ec2d109ddc92f310b65315f4ccbca8e65eb21fa410fb0b255eec52bb3247dc7e5e04368 WHIRLPOOL d9577baa908a7a14d6d70f9fc213f8e85af671aacbd8b9cdd5fabc77b965c03be8fb5acca93df25657739e5667e3ad211782d9a203d05e45eaf913d313982d3d
-DIST fcitx-libpinyin-0.5.3_dict.tar.xz 15149856 SHA256 fccd408b9fad8becebf7f736e3309e775d045d6383742892385b69be91f89b4c SHA512 d132e0c007bd62286cfa89f6605a5315b6f5ae94a75bdd389fff1061e1547ad64c615fb0b75189d8cf35fa289a53e5d485911e06e368b2bf3af7b5a996fcd08a WHIRLPOOL 0bd75c39e148056bce90ddaff9e949b9d43093f56ec80ca0b972e40a005da8f39e481726af9d4fef993149c50287af2069fc27ae9bc3493fd7a4523f2569f6ff
+DIST fcitx-data-model.text.20161206.tar.gz 15099931 BLAKE2B 80e6a6fe5109011d6ea8683658d3fa89fc00e9dacfd140da3e993afc7db088c445da636797fbdac416e70119d37d47bdb0cb18d3865cebb397dbaa8a3055d703 SHA512 26450e347b7a211e5abd94acbb9befc8cee7d8fc20e5161ef11b8b9b1ad47cde4f1add5c41484d9af04e4dde2aa748090e297e799ee7f6d2f9fcec3873eee429
+DIST fcitx-libpinyin-0.5.3_dict.tar.xz 15149856 BLAKE2B 35297477b3a4df9152162b8ad57d536333c5007510f387323d03e862901f17bb337504f20e6edc8d48e338916a6c4543900974027b60f7e87b0005f836677d29 SHA512 d132e0c007bd62286cfa89f6605a5315b6f5ae94a75bdd389fff1061e1547ad64c615fb0b75189d8cf35fa289a53e5d485911e06e368b2bf3af7b5a996fcd08a
diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.2.1.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.2.1.ebuild
deleted file mode 100644
index da9a9373bedc..000000000000
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Libpinyin module for Fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="https://fcitx.googlecode.com/files/${P}_dict.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.7
-	<app-i18n/libpinyin-0.9.0
-	dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/libintl
-	virtual/pkgconfig"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild
deleted file mode 100644
index aced00e9f787..000000000000
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Libpinyin module for Fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="http://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 ~ppc ppc64 ~x86"
-IUSE="dictionary-manager"
-
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	<app-i18n/libpinyin-1.3.0
-	dev-libs/glib:2
-	dictionary-manager? ( >=app-i18n/fcitx-4.2.8[qt4]
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtwebkit:4 )"
-DEPEND="${RDEPEND}
-	virtual/libintl
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs="$(cmake-utils_use_enable dictionary-manager QT)"
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.3.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.3.ebuild
deleted file mode 100644
index 6993a42056b1..000000000000
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Libpinyin module for Fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="http://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="dictionary-manager"
-
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	app-i18n/libpinyin
-	dev-libs/glib:2
-	sys-apps/dbus
-	virtual/libintl
-	dictionary-manager? (
-		>=app-i18n/fcitx-4.2.8[qt4]
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-		dev-qt/qtwebkit:4
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs="$(cmake-utils_use_enable dictionary-manager QT)"
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.1.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.1.ebuild
deleted file mode 100644
index 78ea3d8dfe9e..000000000000
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils gnome2-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx-libpinyin"
-fi
-
-DESCRIPTION="Chinese LibPinyin input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-libpinyin"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI="https://download.fcitx-im.org/data/model.text.20161206.tar.gz -> fcitx-data-model.text.20161206.tar.gz"
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
-fi
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="dictionary-manager"
-
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	>=app-i18n/libpinyin-1.9.91:=
-	dev-libs/glib:2
-	sys-apps/dbus
-	virtual/libintl
-	dictionary-manager? (
-		>=app-i18n/fcitx-qt5-1.1
-		>=dev-qt/qtcore-5.7:5
-		>=dev-qt/qtdbus-5.7:5
-		>=dev-qt/qtgui-5.7:5
-		>=dev-qt/qtnetwork-5.7:5
-		>=dev-qt/qtwebengine-5.7:5[widgets]
-		>=dev-qt/qtwidgets-5.7:5
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	if [[ "${PV}" == "9999" ]]; then
-		ln -s "${DISTDIR}/fcitx-data-model.text.20161206.tar.gz" data/model.text.20161206.tar.gz || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_QT=$(usex dictionary-manager)
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.2.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.2.ebuild
deleted file mode 100644
index fa81ed5ad016..000000000000
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils gnome2-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx-libpinyin"
-fi
-
-DESCRIPTION="Chinese LibPinyin input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-libpinyin"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI="https://download.fcitx-im.org/data/model.text.20161206.tar.gz -> fcitx-data-model.text.20161206.tar.gz"
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
-fi
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="dictionary-manager"
-
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	>=app-i18n/libpinyin-2.1.0:=
-	dev-libs/glib:2
-	sys-apps/dbus
-	virtual/libintl
-	dictionary-manager? (
-		>=app-i18n/fcitx-qt5-1.1
-		>=dev-qt/qtcore-5.7:5
-		>=dev-qt/qtdbus-5.7:5
-		>=dev-qt/qtgui-5.7:5
-		>=dev-qt/qtnetwork-5.7:5
-		>=dev-qt/qtwebengine-5.7:5[widgets]
-		>=dev-qt/qtwidgets-5.7:5
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=(AUTHORS)
-
-src_prepare() {
-	if [[ "${PV}" == "9999" ]]; then
-		ln -s "${DISTDIR}/fcitx-data-model.text.20161206.tar.gz" data/model.text.20161206.tar.gz || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_QT=$(usex dictionary-manager)
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/fcitx-m17n/Manifest b/app-i18n/fcitx-m17n/Manifest
index 23545fe55f4c..1f3a9db32060 100644
--- a/app-i18n/fcitx-m17n/Manifest
+++ b/app-i18n/fcitx-m17n/Manifest
@@ -1,2 +1 @@
-DIST fcitx-m17n-0.2.3.tar.xz 33504 SHA256 84f9a9ac9e8c94db0c124d1c9cafa352191894b4d04d926611c5b0759e86de39 SHA512 6e78b70fb2e3139a59f49d25026c075893a8f192dd2083641ab3e56595a4f631ff13307dd647fd0eedd510dade690d97b44cbdeca96e086855f73910dc5d02af WHIRLPOOL e007a15f5908f37c115934e77ffbb446621ca132e87d13dea7aaed98e1cc566f1376229739572664b1cc90a9ef0ed6f4fafec719310a98815a4bc7d70625e5a3
-DIST fcitx-m17n-0.2.4.tar.xz 35076 SHA256 cf82158b907ba6b79aad3e4c26f9e0e2457a270619548adc31e9f77412144597 SHA512 b7c483e9c88e58a47ead294c36ed182558f09b41996e97faaba9fd3a96612f6a0fc240fdcb95db9a08c1546abe5fc97337957e2124844bd011363b7468f6e112 WHIRLPOOL 5559814bb1756b57e873eff4e5a2b36855da9fd84319bef091a931d8e7172b0fc519ca019c7a541e694d5dc3a26981d37d42d49e574dd654e0040e682bc650f3
+DIST fcitx-m17n-0.2.4.tar.xz 35076 BLAKE2B c53c8ee8156b49607cd5bd951eb031e2dccb6a18bcdafcbfd17ebf07506c750414abac3f2dd5965fdd8b154df9c16820850f61d07cd38745db0af89ccf2acfff SHA512 b7c483e9c88e58a47ead294c36ed182558f09b41996e97faaba9fd3a96612f6a0fc240fdcb95db9a08c1546abe5fc97337957e2124844bd011363b7468f6e112
diff --git a/app-i18n/fcitx-m17n/fcitx-m17n-0.2.3.ebuild b/app-i18n/fcitx-m17n/fcitx-m17n-0.2.3.ebuild
deleted file mode 100644
index 557010c245bf..000000000000
--- a/app-i18n/fcitx-m17n/fcitx-m17n-0.2.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx-m17n"
-fi
-
-DESCRIPTION="m17n-provided input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-m17n"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="4"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	dev-libs/m17n-lib
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=()
-
-PATCHES=(
-	"${FILESDIR}/${P}-memory_leak.patch"
-)
diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest
index d7adbc6f354f..9147671973e8 100644
--- a/app-i18n/fcitx-qt5/Manifest
+++ b/app-i18n/fcitx-qt5/Manifest
@@ -1,5 +1,2 @@
-DIST fcitx-qt5-1.0.5.tar.xz 53584 SHA256 8cef90024ca84c3f607943b91f6bfe63fd077507bbe100e5a1936464095841de SHA512 f4da9ede8918cef7aa0dbacea534ab81024e3c6d812bedd287c4c4c9a8b9ca994d4708489c602967f3504ce057ec6e118674503f5d796883f1890e8ecc11c501 WHIRLPOOL 764190a5f523fc40ca5f937704d5bc1a7018232284f50b9b1b6a36b5dd41dfbebda5db337bdc49b08e601e94f51935f2a70d96dddbd4091744ec8c89a77f26b0
-DIST fcitx-qt5-1.0.6.tar.xz 53892 SHA256 a2aea7b49a9508e68d087ac5c9f3d1d1d414318e1aca14fed92a2f8a7e8848c8 SHA512 ea816a3bc324b838d77d7ee67a05853f7f07cbc3c0c1e0a3809fe72084f7e0db8e98623499299712b8b496922e46acb06cf3a1cbd3ff2ef1de92ca5a74d540da WHIRLPOOL aae4029ad2bd5120cd7910fa0a2644dca346acbf47da22d54d7fd3bdb70fab9bdbcf40207e8870f1bebee48de07d9c4a39d44ef04a56eb8472e31087cf6326d3
-DIST fcitx-qt5-1.1.0.tar.xz 55944 SHA256 9be3205e9bb730a23f28bf742d8c41a5035fcd8d91b51aaef875d888c12c0c65 SHA512 1f11c13162483957f0ff29dc8d05e8c781bfcc6f60d938037b94ae825be9c1bc47f594540a2d1d3ffa7185abcc9fd734522a64e36813d3116ec394b52f98135c WHIRLPOOL bbac0393b3e697d48b8bde3acec54a1f8d3daade53c31b8775418067c450c3960820c6ce2e2ec1583d1aa2263a7f7f13cf08d7b32deb1c1a851fc892e367f4e2
-DIST fcitx-qt5-1.1.1.tar.xz 56352 SHA256 4b062869dae011747ff257e6976debd1d69fb13e6121318ce725c0c240291b02 SHA512 ea7faa953561527fd0f6224a06ab97ab84a9e36a06d44f9807e38e6d8e537ab2c7126c4cda2d4718473ace1245709ce6175ac9431b6f0527a63b2d6e92feb18c WHIRLPOOL 385566104e215309dae5742ee4ed360b4b5a23b282fe64a4e50ac13a710478998262f2022320ceda2c4f423406292e7ded48dd2adec7e7b532d5e4bb8b524776
-DIST fcitx-qt5-1.2.0.tar.xz 134224 SHA256 59e9ff57d04bf82d117d5df9c330b63e2086386976052aac79364575ddfa7dea SHA512 38d49d626e4aaee80f44ddeb627b07e45430c6eb1c1c37f2a5fb0c73d5dae6da5ed276366c40c3b6e8609543af95396091e240b5a88b684f399752b3eceee915 WHIRLPOOL 10877bafe4ce31bb276e1a24f73b81dd87e9611341790b84ae881bcb6cddf30f01236422a64c0ca09b922f8e13ee86a99f703ef0ae16084f3a6ae49ab52e4a33
+DIST fcitx-qt5-1.1.1.tar.xz 56352 BLAKE2B 1fea4484f79fa9f9bcd52ac59b4e64cb9947a2cdc46e3df3c3729ef37d136c4fcf787d7a8abd946e5a0d02f909c0a94b6d19b98a93cf9dc2ec49d172a5f19550 SHA512 ea7faa953561527fd0f6224a06ab97ab84a9e36a06d44f9807e38e6d8e537ab2c7126c4cda2d4718473ace1245709ce6175ac9431b6f0527a63b2d6e92feb18c
+DIST fcitx-qt5-1.2.0.tar.xz 134224 BLAKE2B 8358ec0b1cf95534f15536dd9529d4f7da47e6c08c050cc93503db958348ce4d940eb1903be8f161fec8adeca58c03838f021e36ecf39908361cddee40d806d4 SHA512 38d49d626e4aaee80f44ddeb627b07e45430c6eb1c1c37f2a5fb0c73d5dae6da5ed276366c40c3b6e8609543af95396091e240b5a88b684f399752b3eceee915
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.0.5.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.0.5.ebuild
deleted file mode 100644
index 4c3c996c6d6f..000000000000
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.0.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5"
-fi
-
-DESCRIPTION="Fcitx input method module for Qt 5"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2+"
-SLOT="4"
-KEYWORDS="amd64 ~hppa ~ppc64 x86"
-IUSE=""
-
-# Private headers of dev-qt/qtgui:5 used.
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5
-	virtual/libintl
-	x11-libs/libxkbcommon"
-DEPEND="${RDEPEND}
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ucs4.patch"
-)
-
-DOCS=()
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.0.6.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.0.6.ebuild
deleted file mode 100644
index 7e1852577c1f..000000000000
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.0.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5"
-fi
-
-DESCRIPTION="Fcitx input method module for Qt 5"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2+"
-SLOT="4"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
-IUSE=""
-
-# Private headers of dev-qt/qtgui:5 used.
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5
-	virtual/libintl
-	x11-libs/libxkbcommon"
-DEPEND="${RDEPEND}
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig"
-
-DOCS=()
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.1.0.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.1.0.ebuild
deleted file mode 100644
index 8668783c73fe..000000000000
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5"
-fi
-
-DESCRIPTION="Fcitx input method module for Qt 5"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2+"
-SLOT="4"
-KEYWORDS="amd64 ~hppa ~ppc64 x86"
-IUSE=""
-
-# Private headers of dev-qt/qtgui:5 used.
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5
-	virtual/libintl
-	x11-libs/libxkbcommon"
-DEPEND="${RDEPEND}
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig"
-
-DOCS=()
diff --git a/app-i18n/fcitx-qt5/files/fcitx-qt5-1.0.5-ucs4.patch b/app-i18n/fcitx-qt5/files/fcitx-qt5-1.0.5-ucs4.patch
deleted file mode 100644
index 28cf78efc9c1..000000000000
--- a/app-i18n/fcitx-qt5/files/fcitx-qt5-1.0.5-ucs4.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-https://github.com/fcitx/fcitx-qt5/commit/31ecc9f2f9c8eb77082044944bbb6740d35ae7c3
-https://github.com/fcitx/fcitx-qt5/commit/8fc110e6125d85d3c50112bc20a6ed36395b2b21
-
---- /platforminputcontext/qfcitxplatforminputcontext.cpp
-+++ /platforminputcontext/qfcitxplatforminputcontext.cpp
-@@ -254,6 +254,12 @@
-                     anchor = var2.toInt();
-                 else
-                     anchor = cursor;
-+
-+                // adjust it to real character size
-+                QVector<uint> tempUCS4 = text.leftRef(cursor).toUcs4();
-+                cursor = tempUCS4.size();
-+                tempUCS4 = text.leftRef(anchor).toUcs4();
-+                anchor = tempUCS4.size();
-                 if (data.surroundingText != text) {
-                     data.surroundingText = text;
-                     proxy->SetSurroundingText(text, cursor, anchor);
-@@ -388,6 +394,7 @@
-             delete data.proxy;
-         }
-         data.proxy = new FcitxQtInputContextProxy(m_connection->serviceName(), path, *m_connection->connection(), this);
-+        data.proxy->setProperty("icData", qVariantFromValue(static_cast<void*>(&data)));
-         connect(data.proxy, SIGNAL(CommitString(QString)), this, SLOT(commitString(QString)));
-         connect(data.proxy, SIGNAL(ForwardKey(uint, uint, int)), this, SLOT(forwardKey(uint, uint, int)));
-         connect(data.proxy, SIGNAL(UpdateFormattedPreedit(FcitxQtFormattedPreeditList,int)), this, SLOT(updateFormattedPreedit(FcitxQtFormattedPreeditList,int)));
-@@ -480,15 +487,56 @@
-     update(Qt::ImCursorRectangle);
- }
- 
--void QFcitxPlatformInputContext::deleteSurroundingText(int offset, uint nchar)
-+void QFcitxPlatformInputContext::deleteSurroundingText(int offset, uint _nchar)
- {
-     QObject *input = qApp->focusObject();
-     if (!input)
-         return;
- 
-     QInputMethodEvent event;
--    event.setCommitString("", offset, nchar);
--    QCoreApplication::sendEvent(input, &event);
-+
-+    FcitxQtInputContextProxy *proxy = qobject_cast<FcitxQtInputContextProxy*>(sender());
-+    if (!proxy) {
-+        return;
-+    }
-+
-+    FcitxQtICData *data = static_cast<FcitxQtICData*>(proxy->property("icData").value<void *>());
-+    QVector<uint> ucsText = data->surroundingText.toUcs4();
-+
-+    int cursor = data->surroundingCursor;
-+    // make nchar signed so we are safer
-+    int nchar = _nchar;
-+    // Qt's reconvert semantics is different from gtk's. It doesn't count the current
-+    // selection. Discard selection from nchar.
-+    if (data->surroundingAnchor < data->surroundingCursor) {
-+        nchar -= data->surroundingCursor - data->surroundingAnchor;
-+        offset += data->surroundingCursor - data->surroundingAnchor;
-+        cursor = data->surroundingAnchor;
-+    } else if (data->surroundingAnchor > data->surroundingCursor) {
-+        nchar -= data->surroundingAnchor - data->surroundingCursor;
-+        cursor = data->surroundingCursor;
-+    }
-+
-+    // validates
-+    if (nchar >= 0 && cursor + offset >= 0 && cursor + offset + nchar < ucsText.size()) {
-+        // order matters
-+        QVector<uint> replacedChars = ucsText.mid(cursor + offset, nchar);
-+        nchar = QString::fromUcs4(replacedChars.data(), replacedChars.size()).size();
-+
-+        int start, len;
-+        if (offset >= 0) {
-+            start = cursor;
-+            len = offset;
-+        } else {
-+            start = cursor;
-+            len = -offset;
-+        }
-+
-+        QVector<uint> prefixedChars = ucsText.mid(start, len);
-+        offset = QString::fromUcs4(prefixedChars.data(), prefixedChars.size()).size() * (offset >= 0 ? 1 : -1);
-+        event.setCommitString("", offset, nchar);
-+        QCoreApplication::sendEvent(input, &event);
-+    }
- }
- 
- void QFcitxPlatformInputContext::forwardKey(uint keyval, uint state, int type)
diff --git a/app-i18n/fcitx-rime/Manifest b/app-i18n/fcitx-rime/Manifest
index 37e7f476ec14..860bfc692215 100644
--- a/app-i18n/fcitx-rime/Manifest
+++ b/app-i18n/fcitx-rime/Manifest
@@ -1,3 +1 @@
-DIST fcitx-rime-0.2.0.tar.xz 8116 SHA256 e4bc9243abffd1851b4ee19c88d7c2b32ede134aeda60aee930388f9f33ca269 SHA512 3f02d7bf0e47981e7a135ccaa46653be319d1bb716bd939b50419e47b8d3c07b347434e8529522d4266bd5fac6dbc2cdc1bfd4b7ea0607250023f70f97006228 WHIRLPOOL 7dbdcd3ac90f2d901b5b5c06541b9f6f1debf4ad833c2ddacb840dbd80a4443725fc7bdb41ad2261db8f34cb0dc77fe3d5f0c45e69a0a056618518007c1c708e
-DIST fcitx-rime-0.3.1.tar.xz 39648 SHA256 3ca74de4d20e8fd0e67eb4ccae8af3790bb1f557f183c2af32cb45f371e8521d SHA512 5d3c8fc119e1a104987a7876f3b1c54da074e34ce9feb9c02efa7c9cfd788c3735680a03cdb50d69a5512a9f075c7326bdc267cf076daa916238898da81d2388 WHIRLPOOL ed8f4ed563dfbe01aaac71bb847d4a9b641b041f9916c8c6c34a444202ac00720ebe4274c30906141b103fbbf55d7ce045cef094792c1fffadae03dd0ce73f7a
-DIST fcitx-rime-0.3.2.tar.xz 40960 SHA256 f97ea6f515fcc5f526cc25dce3d4ba05fa1c83001f68502d6c284ba39cd5a82d SHA512 8c6d845b0899d9b8b9b41b895abd5c1b8916856b71f529aabd08d1c27a2b09bb5a9343912d088da460c2e22da0a3ce759a34fd13099a149bb8cd1ff4eafe29f1 WHIRLPOOL 57b979a8ef850ec1c4f85b6b3b5841ad17f73c1861223d033c7b79db6c301f1f0da13c4ab53661a4899ad13db40c424f3c1b257dd2058e28fe89f6d57c2bf17b
+DIST fcitx-rime-0.3.2.tar.xz 40960 BLAKE2B 1c9185dd9d2912e74b9916916fed09a01c30e0867d93fe94e04d5324883783dddbdca0f553d80aa19e2e59d2ec8fd2a50a7f89118c22cb09310296292a566760 SHA512 8c6d845b0899d9b8b9b41b895abd5c1b8916856b71f529aabd08d1c27a2b09bb5a9343912d088da460c2e22da0a3ce759a34fd13099a149bb8cd1ff4eafe29f1
diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.2.0.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.2.0.ebuild
deleted file mode 100644
index 9b139edf92ed..000000000000
--- a/app-i18n/fcitx-rime/fcitx-rime-0.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Rime support for Fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="https://fcitx.googlecode.com/files/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.7
-	app-i18n/librime
-	app-i18n/rime-data
-	x11-libs/libnotify"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# dont build data resource here, already provided by app-i18n/rime-data
-	sed -i -e 's|add_subdirectory(data)||' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DRIME_DATA_DIR=/usr/share/rime-data
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.3.1.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.3.1.ebuild
deleted file mode 100644
index e5394485cf5e..000000000000
--- a/app-i18n/fcitx-rime/fcitx-rime-0.3.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit cmake-utils
-
-DESCRIPTION="Rime support for Fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 ~ppc ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.8.1
-	>=app-i18n/librime-1.0
-	app-i18n/rime-data"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# dont build data resource here, already provided by app-i18n/rime-data
-	sed -i -e 's|add_subdirectory(data)||' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DRIME_DATA_DIR=/usr/share/rime-data
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-i18n/fcitx-sayura/Manifest b/app-i18n/fcitx-sayura/Manifest
index 4f29836bbb2f..a3997a58185e 100644
--- a/app-i18n/fcitx-sayura/Manifest
+++ b/app-i18n/fcitx-sayura/Manifest
@@ -1,2 +1 @@
-DIST fcitx-sayura-0.1.1.tar.xz 18756 SHA256 36b5d79fed0cefaff7832c82473404e96d68cc8560b1d626884604b0aad7bea6 SHA512 1eda91ae985df65982cf6f4e67b676bb8eb7117cd1aad7c2a90e81c13fa2a806bbff5eda7bb7e797cb26cb46bbda51931ecffd50384a89ead24ad90777183dc3 WHIRLPOOL ddcec7ba970868795df0ccf4eb3ebacb9a9ec29f6f05762fb5253ca6cc59fab78459fc11cb715bcc53856e5093378fb99f572ccd615fe84bbe053574efa1b69f
-DIST fcitx-sayura-0.1.2.tar.xz 25400 SHA256 4cf1c26625efbcae05e6a741b6f955d85c4d4970ab0642fd9ecdb1ac6d757f74 SHA512 2118c95d4f831e5f4e0af0549ae3eb4f16bff8b30b03452837bd14f35fcb524f730b27ceb7c14cf6a4db7400a67070929a75465195b5524187e97c7ca02de466 WHIRLPOOL 1fb0146a639ae74b51185c2eef86bf7a5e5e424d5d3d4cb0c6c21357ca55c0ad527aade5a161d9cbcfadde3dee721fb444f6adf5cdc5ea8603bb33c3de948e66
+DIST fcitx-sayura-0.1.2.tar.xz 25400 BLAKE2B 6bed1b86499b4448e87cb76c719d8fec3f7af7e5a4a4846ddc30e6e278f5e67c5ee47d39f4e19d3c8c927ce34bf66f51cf189d1147af0e509c3815ba4552a953 SHA512 2118c95d4f831e5f4e0af0549ae3eb4f16bff8b30b03452837bd14f35fcb524f730b27ceb7c14cf6a4db7400a67070929a75465195b5524187e97c7ca02de466
diff --git a/app-i18n/fcitx-sayura/fcitx-sayura-0.1.1.ebuild b/app-i18n/fcitx-sayura/fcitx-sayura-0.1.1.ebuild
deleted file mode 100644
index c4869ad58411..000000000000
--- a/app-i18n/fcitx-sayura/fcitx-sayura-0.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx-sayura"
-fi
-
-DESCRIPTION="Sinhala Sayura input method for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-sayura"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2+"
-SLOT="4"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	virtual/libiconv
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=()
diff --git a/app-i18n/fcitx-sunpinyin/Manifest b/app-i18n/fcitx-sunpinyin/Manifest
index 00d168755171..1b6c4fb3a442 100644
--- a/app-i18n/fcitx-sunpinyin/Manifest
+++ b/app-i18n/fcitx-sunpinyin/Manifest
@@ -1,3 +1 @@
-DIST fcitx-sunpinyin-0.4.0.tar.xz 40264 SHA256 366af4123455bd85e5af104ca0368057470079937f79eaa70e58951de4743acc SHA512 53def2f36de0d9517da0d154ae8926075c69a5712bf74a3e5ba5ba6266e2d94152dac77e051473828d98ed6a78d3f10557a8ca2081bf1f799405a4f6a4afb83f WHIRLPOOL 2c92a9d0a9d48eb8e4aca895ccddb91f1d1fbaf137bdc4fe32519cd25a8294be39140d117a0d4d20a5a3fa3c21086bd6edbd44d93fafdf8f885aa7d3d36f9843
-DIST fcitx-sunpinyin-0.4.1.tar.xz 41076 SHA256 7bd0c61a3c821719760bff72c3c114b28e277b87f54dcb61d83e3548b1eb6777 SHA512 7ad9065d86d7bb3ceb6536a0fe3559bf2ba60aebe69e2f07c8dadad1a0a2283a1b85712105c6c2a2bf19b9645c4392204db9c3d1db234618ba7f62ee44eda85c WHIRLPOOL 9339656a5b8cf1359af8f3ceeaa630862a31d4a1089a4b3a738f65c275f0f61d8d06bbe89e496f8922ba4b09b384d96aeac43d7bdfcf21bdaa555c79efd10709
-DIST fcitx-sunpinyin-0.4.2.tar.xz 42984 SHA256 0bf2d72d77732f06e7f04c119507c08b9618b21c4027e3997186bd7e4d0788c4 SHA512 8ade5d94e5227c0b72d2844c09c2699e4b8c66cecbd4107791168d27e15f68b28a4445bf42df7bd6fb44119ec42c5b574293bb417dcde8998578f0debd656a2a WHIRLPOOL 18c55c3e7fd7a5ad8ef52d7734cbe2b65e4ec635535a0ecb841199af5a39ec3ca720807857ada4b493b7c4de80431b74deb0f8a6c8863ed8f1633e6d6a15f33e
+DIST fcitx-sunpinyin-0.4.2.tar.xz 42984 BLAKE2B 1f64d96d35c6f455be15a56eb065d97a988f671d40392a3ea3e96fc53b22cf048cff61f406d0e001cc7cfe531a8dc5508ef7862c17253b409330ac2d0af52f7c SHA512 8ade5d94e5227c0b72d2844c09c2699e4b8c66cecbd4107791168d27e15f68b28a4445bf42df7bd6fb44119ec42c5b574293bb417dcde8998578f0debd656a2a
diff --git a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.0.ebuild b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.0.ebuild
deleted file mode 100644
index 4eb55051b4d3..000000000000
--- a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Sunpinyin module for fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="https://fcitx.googlecode.com/files/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.7
-	>app-i18n/sunpinyin-2.0.3"
-DEPEND="${RDEPEND}
-	virtual/libintl"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc46-compatible.patch"
-	epatch_user
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.1.ebuild b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.1.ebuild
deleted file mode 100644
index f23931983c06..000000000000
--- a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Sunpinyin module for fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="4"
-KEYWORDS="amd64 ~ppc ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	>=app-i18n/sunpinyin-2.0.4_alpha
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/fcitx-sunpinyin/files/fcitx-sunpinyin-0.4.0-gcc46-compatible.patch b/app-i18n/fcitx-sunpinyin/files/fcitx-sunpinyin-0.4.0-gcc46-compatible.patch
deleted file mode 100644
index 42b6b91a3428..000000000000
--- a/app-i18n/fcitx-sunpinyin/files/fcitx-sunpinyin-0.4.0-gcc46-compatible.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f43108d900a2ce7fa52d1c6741fdf41b6747c94c Mon Sep 17 00:00:00 2001
-From: Weng Xuetian <wengxt@gmail.com>
-Date: Sat, 26 Jan 2013 19:56:31 -0500
-Subject: [PATCH] [sunpinyin] gcc46 compatible.
-
----
- src/eim.cpp |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/eim.cpp b/src/eim.cpp
-index e09521f..c1c898f 100644
---- a/src/eim.cpp
-+++ b/src/eim.cpp
-@@ -49,8 +49,8 @@
- extern "C" {
- #endif
-     FCITX_DEFINE_PLUGIN(fcitx_sunpinyin, ime, FcitxIMClass) = {
--        .Create = FcitxSunpinyinCreate,
--        .Destroy = FcitxSunpinyinDestroy
-+        FcitxSunpinyinCreate,
-+        FcitxSunpinyinDestroy
-     };
- #ifdef __cplusplus
- }
--- 
-1.7.10
-
diff --git a/app-i18n/fcitx-table-extra/Manifest b/app-i18n/fcitx-table-extra/Manifest
index dec077ea6ed8..377237df5d17 100644
--- a/app-i18n/fcitx-table-extra/Manifest
+++ b/app-i18n/fcitx-table-extra/Manifest
@@ -1,4 +1 @@
-DIST fcitx-table-extra-0.3.3.tar.xz 3350592 SHA256 ae2bbf9146dfdeafb6220c9a738ddc1f0437da2c5f2da0d578ba4970bc74767d SHA512 ea100ba7bfc558395b678390bb787b15f674c13140ab22b5a9ef423e5114399633d24ec322904fd61d8f3613058744d08f615d4330ed948aad9dcff09818e36f WHIRLPOOL 10a61ea0aac14e9b55902276557c5b5daba17c14a3101d4e4e1384c8922c89dbfe96b1ac543e9ad3408f0951ecd7869a8c4c0d36d168129b2f78d611a0f70158
-DIST fcitx-table-extra-0.3.6.tar.xz 3694520 SHA256 9f80984d23622b90a7d5fbf439f54d7d46f6e2f640618b00079214f50a62a233 SHA512 3970fd9fb14afef5bc55fcfb8234c12951cf88a8ead9be1575ba3100d08f83f23c923093722380ca9c066d6a3fa065bd51f176b09815b0c85f13d8351a004304 WHIRLPOOL b296eb3198cbf578c4b556942591aee9a9998e3677776a8a6d5a4b80cc3e360d4b6cd784e88d5eb3714879d1ec1231d13e2ad9cca50439470362ae1a9473963a
-DIST fcitx-table-extra-0.3.7.tar.xz 3704164 SHA256 8933570ecd803a4f4fe932c983004e669d81b2f08c3bcaa532151545a42e659e SHA512 628eb7d2b09a3383ab92460dc8c2bc86771482cc84bdce847a394ee595423642dff29a39ccf31f56ea8de833f25e9d42952b55b754dd234d0831b5de5431d16a WHIRLPOOL 2744d91154d51d2388192ce313f4be2e839d5dc33e20622a68208e8e4f155883aedb7b4828e619a1a81e21ea4f893fb6806e59ebed66d842259477a7b4127122
-DIST fcitx-table-extra-0.3.8.tar.xz 3700736 SHA256 c91bb19c1a7b53c5339bf2f75ae83839020d337990f237a8b9bc0f4416c120ef SHA512 454798e9bd25c630ce98e2daf7296e82ba5fbc98027171038a5a7b9ac3169c153302a6703d9416718ec3a0b76db6d732caf3f03c6e6005841c9d7798702542df WHIRLPOOL 8cc9ec82851872b0ab3f81913099465fe17d32a5e363027de8f16cd71c3d0b14a8dfbd7f035cddb8bcb96b83fd615a5d74784dc1d5ed9a6c72f2b249276161fb
+DIST fcitx-table-extra-0.3.8.tar.xz 3700736 BLAKE2B b8ce4b3aa04eba8b594b86958bb83e348758c30688828a4834643cf7bdd62852c2ca89bc4f75f0cb1b16ce969b0454c58e3abadff9c78318dc0953e0905c75fa SHA512 454798e9bd25c630ce98e2daf7296e82ba5fbc98027171038a5a7b9ac3169c153302a6703d9416718ec3a0b76db6d732caf3f03c6e6005841c9d7798702542df
diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.3.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.3.ebuild
deleted file mode 100644
index ebf56355ca64..000000000000
--- a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Extra tables for Fcitx, including Boshiamy, Zhengma, Cangjie and Quick"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="https://fcitx.googlecode.com/files/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.7[table]"
-DEPEND="${RDEPEND}
-	virtual/libintl"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.6.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.6.ebuild
deleted file mode 100644
index db07468054e3..000000000000
--- a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Extra tables for Fcitx, including Boshiamy, Zhengma, Cangjie and Quick"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 ~ppc ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.8[table]"
-DEPEND="${RDEPEND}
-	virtual/libintl"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.7.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.7.ebuild
deleted file mode 100644
index 79e435b0b422..000000000000
--- a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Extra tables for Fcitx, including Boshiamy, Zhengma, Cangjie and Quick"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.8[table]"
-DEPEND="${RDEPEND}
-	virtual/libintl"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/fcitx-unikey/Manifest b/app-i18n/fcitx-unikey/Manifest
index e35c14e8a8b7..e6734d31cbc6 100644
--- a/app-i18n/fcitx-unikey/Manifest
+++ b/app-i18n/fcitx-unikey/Manifest
@@ -1,5 +1,2 @@
-DIST fcitx-unikey-0.2.0.tar.xz 70944 SHA256 152da48ffeb665fc5d88202f6491fa5f4d11284792c2ef079bea4a94c8b125e1 SHA512 10c5c2c5b7e4f40710daccc485b220ed4cdadc6e866636032873a86f9f8489490a42671c9d02aedbbda78a94e40801dd888efc9b692d26ff81fe6d1fe2e10fa7 WHIRLPOOL d6dfd445bd5aa98ec28ab0bd9668f288d67f27874ecdd079f78956172f3d5695fd990ce9e70f190a26edd1eab4f48a8263efc8682fe93679a85fc1db2f6745be
-DIST fcitx-unikey-0.2.4.tar.xz 72308 SHA256 726e5999c00e93856639258298688c835db1e80e4ac4d5ff0786433c0593c195 SHA512 d55fe71bbcbc420e0ba3ec61ad3c7e9293e33f30b6303d90591d5a94e89d7bbc513dc940ae5a081b81c0d973fa6674872a695eac03cfbbefb460609993219221 WHIRLPOOL 9178a4ec7bcf0b6f969295bef0b066b266e336352c52f9a8761cb1cb6456df6c3d90a90d90212c2fbe137ebc07a1cf6b79f82e959dc6ad3806158675ee040fbb
-DIST fcitx-unikey-0.2.5.tar.xz 72640 SHA256 8e0bc06d7771074e17acf7045f43aa3a6d9dc2c0e48f8d52548af9b393607b18 SHA512 b70cbc468c44677a6f831ab92539dc01386eec66d8b40eba57efc7130a3811548b5b1e8213c278fd26d1eac169d43913a5fe0f3728e925c874e7360ccd93636a WHIRLPOOL 5c223124a9750b1a060b9dc0f99236676f29f1280bc787e306d65a746671f667dfface3f23bb441d2122d9b33ed0d1a58491feea5c026c23dd91f51b71113c1b
-DIST fcitx-unikey-0.2.6.tar.xz 75124 SHA256 9830910f628d455d2701ba430e6cb5b41409a2ac2f9b098e5ed6aaa54d15a3cf SHA512 18efb387387c29bb059e1260bfb3c91e97f9989aedbe590596f1ad8659e9fad20777f048f20fb24e0fb5e2318eee1c25fc20a2d57ac846368c4c9bebf4eb2b90 WHIRLPOOL 6003fa47cba0908268f51ea50a55b62afe3dcd5a6c6f00ef773c3c68f914bce151c3103f5425050a1e79868a6ba383a5e7cd1b1d89221d9cc5c2dda9d46fe331
-DIST fcitx-unikey-0.2.7.tar.xz 75204 SHA256 e750774b73b08e51148b963736d8207e50c3973e5456b6569cb7ad86831e0e59 SHA512 1bb78e4f27f0cda1e3aa5a633be45e0a26d121d5b472b1325b0c028ff65ca156d23e7ffee0367badeac1dd21ba1743ee8a2c9c27c629ae0996e84e0062b67ad2 WHIRLPOOL fdef592af0be43ba91aee5af1a9bf58443085fa2935d27775d3d8332ab9119d6946bc946454a9067bee6db6b4415db55391d1d78a94b4681e46503a74a555cfa
+DIST fcitx-unikey-0.2.6.tar.xz 75124 BLAKE2B f3adedefca336deb73e9a8ddfc5829e6b9455d97ec9f6454c484847e57dc2af9db32f8bd6eb7285f0a4f430ba8fb048105b60e42348271220ac90129c6d8491c SHA512 18efb387387c29bb059e1260bfb3c91e97f9989aedbe590596f1ad8659e9fad20777f048f20fb24e0fb5e2318eee1c25fc20a2d57ac846368c4c9bebf4eb2b90
+DIST fcitx-unikey-0.2.7.tar.xz 75204 BLAKE2B a0d70747a560b2493a3b7f7e06ff35f7e465bb4c4c8d22cb4db02f70a6298c49780fd0045874faeba1f20ad188a01a81fefc67a4f6ac9d6946d959f731a376a4 SHA512 1bb78e4f27f0cda1e3aa5a633be45e0a26d121d5b472b1325b0c028ff65ca156d23e7ffee0367badeac1dd21ba1743ee8a2c9c27c629ae0996e84e0062b67ad2
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.0.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.0.ebuild
deleted file mode 100644
index 1d7c8021eef4..000000000000
--- a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Vietnamese Unikey module for Fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="https://fcitx.googlecode.com/files/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="4"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="+qt4"
-
-RDEPEND=">=app-i18n/fcitx-4.2.7[qt4?]"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_prepare() {
-	# Add cmake option to build the qt based macro editor or not
-	epatch "${FILESDIR}/${P}-cmake-qt-option.patch"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable qt4 QT)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.4.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.4.ebuild
deleted file mode 100644
index 33fddf6a450b..000000000000
--- a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Vietnamese Unikey module for Fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="4"
-KEYWORDS="amd64 ~ppc ppc64 ~x86"
-IUSE="+qt4"
-
-RDEPEND=">=app-i18n/fcitx-4.2.8[qt4?]"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable qt4 QT)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.5.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.5.ebuild
deleted file mode 100644
index 4fd6eaef07ed..000000000000
--- a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils gnome2-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx-unikey"
-fi
-
-DESCRIPTION="Vietnamese Unikey input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-unikey"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="4"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="+macro-editor"
-
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	virtual/libiconv
-	virtual/libintl
-	macro-editor? (
-		>=app-i18n/fcitx-4.2.8[qt4]
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-c++11.patch"
-)
-
-DOCS=()
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_QT=$(usex macro-editor)
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/fcitx-unikey/files/fcitx-unikey-0.2.0-cmake-qt-option.patch b/app-i18n/fcitx-unikey/files/fcitx-unikey-0.2.0-cmake-qt-option.patch
deleted file mode 100644
index 2667b0cd0d11..000000000000
--- a/app-i18n/fcitx-unikey/files/fcitx-unikey-0.2.0-cmake-qt-option.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From f0f0d7c1ee5d83f33ceacaf78f4b7845ec2819de Mon Sep 17 00:00:00 2001
-From: Weng Xuetian <wengxt@gmail.com>
-Date: Sat, 26 Jan 2013 14:45:29 -0500
-Subject: [PATCH] [unikey] option for qt, detect qt 4.8
-
----
- CMakeLists.txt              |    7 ++++++-
- macro-editor/CMakeLists.txt |    4 ++--
- 2 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cef1625..5ccf21c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,6 +4,8 @@ project(fcitx-unikey)
- 
- set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
- 
-+option(ENABLE_QT "Enable Qt based macro editor" On)
-+
- # uninstall target
- configure_file(
-     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
-@@ -21,9 +23,12 @@ set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--as-needed ${CMAKE_MODULE_LINKER_FLAGS}")
- find_package(Fcitx 4.2.7 REQUIRED)
- find_package(Libiconv REQUIRED)
- find_package(Gettext REQUIRED)
--find_package(Qt4)
-+
-+if (ENABLE_QT)
-+find_package(Qt4 4.8)
- 
- pkg_check_modules(FCITX_QT "fcitx-qt>=4.2.7")
-+endif (ENABLE_QT)
- 
- configure_file(config.h.in config.h)
- 
-diff --git a/macro-editor/CMakeLists.txt b/macro-editor/CMakeLists.txt
-index fbb2482..145ee0b 100644
---- a/macro-editor/CMakeLists.txt
-+++ b/macro-editor/CMakeLists.txt
-@@ -16,9 +16,9 @@ fcitx_translate_add_sources(
-     ${MACRO_EDITOR_SRCS}
-     ${MACRO_EDITOR_HDRS})
- 
--if (NOT QT_FOUND OR NOT FCITX_QT_FOUND)
-+if (NOT QT_FOUND OR NOT FCITX_QT_FOUND OR NOT ENABLE_QT)
-     return()
--endif (NOT QT_FOUND OR NOT FCITX_QT_FOUND)
-+endif (NOT QT_FOUND OR NOT FCITX_QT_FOUND OR NOT ENABLE_QT)
- 
- include_directories(
-     ${FCITX_QT_INCLUDE_DIRS}
--- 
-1.7.10
-
diff --git a/app-i18n/fcitx-unikey/files/fcitx-unikey-0.2.5-c++11.patch b/app-i18n/fcitx-unikey/files/fcitx-unikey-0.2.5-c++11.patch
deleted file mode 100644
index cf811ea01e02..000000000000
--- a/app-i18n/fcitx-unikey/files/fcitx-unikey-0.2.5-c++11.patch
+++ /dev/null
@@ -1,264 +0,0 @@
-https://github.com/fcitx/fcitx-unikey/commit/e1fd471a91baffd701c636038b81233bb38a8093
-
---- /unikey/data.cpp
-+++ /unikey/data.cpp
-@@ -96,145 +96,145 @@
- unsigned char SingleByteTables[][TOTAL_VNCHARS] =
- 
- // TCVN3
--{{'A','a','�','�','�','�','�','�','�','�','�','�',      // 0: a
--  '�','�','�','�','�','�','�','�','�','�','�','�',		// 1: a^
--  '�','�','�','�','�','�','�','�','�','�','�','�',		// 2: a(
--  'B','b','C','c','D','d',
--  '�','�',
--  'E','e','�','�','�','�','�','�','�','�','�','�',		// 3: e
--  '�','�','�','�','�','�','�','�','�','�','�','�',      // 4: e^
--  'F','f','G','g','H','h',
--  'I','i','�','�','�','�','�','�','�','�','�','�',		// 5: i
--  'J','j','K','k','L','l','M','m','N','n',
--  'O','o','�','�','�','�','�','�','�','�','�','�',		// 6: o
--  '�','�','�','�','�','�','�','�','�','�','�','�',		// 7: o^
--  '�','�','�','�','�','�','�','�','�','�','�','�',		// 8: o+
--  'P','p','Q','q','R','r','S','s','T','t',
--  'U','u','�','�','�','�','�','�','�','�','�','�',		// 9: u
--  '�','�','�','�','�','�','�','�','�','�','�','�',		//10: u+
--  'V','v','W','w','X','x',
--  'Y','y','�','�','�','�','�','�','�','�','�','�',		//11: y
--  'Z','z',
-+{{static_cast<unsigned char>('A'),static_cast<unsigned char>('a'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),      // 0: a
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),		// 1: a^
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),		// 2: a(
-+  static_cast<unsigned char>('B'),static_cast<unsigned char>('b'),static_cast<unsigned char>('C'),static_cast<unsigned char>('c'),static_cast<unsigned char>('D'),static_cast<unsigned char>('d'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('E'),static_cast<unsigned char>('e'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),		// 3: e
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),      // 4: e^
-+  static_cast<unsigned char>('F'),static_cast<unsigned char>('f'),static_cast<unsigned char>('G'),static_cast<unsigned char>('g'),static_cast<unsigned char>('H'),static_cast<unsigned char>('h'),
-+  static_cast<unsigned char>('I'),static_cast<unsigned char>('i'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),		// 5: i
-+  static_cast<unsigned char>('J'),static_cast<unsigned char>('j'),static_cast<unsigned char>('K'),static_cast<unsigned char>('k'),static_cast<unsigned char>('L'),static_cast<unsigned char>('l'),static_cast<unsigned char>('M'),static_cast<unsigned char>('m'),static_cast<unsigned char>('N'),static_cast<unsigned char>('n'),
-+  static_cast<unsigned char>('O'),static_cast<unsigned char>('o'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),		// 6: o
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),		// 7: o^
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),		// 8: o+
-+  static_cast<unsigned char>('P'),static_cast<unsigned char>('p'),static_cast<unsigned char>('Q'),static_cast<unsigned char>('q'),static_cast<unsigned char>('R'),static_cast<unsigned char>('r'),static_cast<unsigned char>('S'),static_cast<unsigned char>('s'),static_cast<unsigned char>('T'),static_cast<unsigned char>('t'),
-+  static_cast<unsigned char>('U'),static_cast<unsigned char>('u'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),		// 9: u
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),		//10: u+
-+  static_cast<unsigned char>('V'),static_cast<unsigned char>('v'),static_cast<unsigned char>('W'),static_cast<unsigned char>('w'),static_cast<unsigned char>('X'),static_cast<unsigned char>('x'),
-+  static_cast<unsigned char>('Y'),static_cast<unsigned char>('y'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),		//11: y
-+  static_cast<unsigned char>('Z'),static_cast<unsigned char>('z'),
-   0x80, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88,
-   0x89, 0x8A, 0x8B, 0x8C, 0x8E, 0x91, 0x92, 0x93,
-   0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B,
-   0x9C, 0x9E, 0x9F},
- //VPS
--{ 'A','a','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  'B','b','C','c','D','d',
--  '�','�',
--  'E','e','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  'F','f','G','g','H','h',
--  'I','i','�','�','�','�','�','�','�','�','�','�',
--  'J','j','K','k','L','l','M','m','N','n',
--  'O','o','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  'P','p','Q','q','R','r','S','s','T','t',
--  'U','u','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  'V','v','W','w','X','x',
--  'Y','y','�','�','�','�','�','�','�','�','�','�',
--  'Z','z',
-+{ static_cast<unsigned char>('A'),static_cast<unsigned char>('a'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('B'),static_cast<unsigned char>('b'),static_cast<unsigned char>('C'),static_cast<unsigned char>('c'),static_cast<unsigned char>('D'),static_cast<unsigned char>('d'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('E'),static_cast<unsigned char>('e'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('F'),static_cast<unsigned char>('f'),static_cast<unsigned char>('G'),static_cast<unsigned char>('g'),static_cast<unsigned char>('H'),static_cast<unsigned char>('h'),
-+  static_cast<unsigned char>('I'),static_cast<unsigned char>('i'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('J'),static_cast<unsigned char>('j'),static_cast<unsigned char>('K'),static_cast<unsigned char>('k'),static_cast<unsigned char>('L'),static_cast<unsigned char>('l'),static_cast<unsigned char>('M'),static_cast<unsigned char>('m'),static_cast<unsigned char>('N'),static_cast<unsigned char>('n'),
-+  static_cast<unsigned char>('O'),static_cast<unsigned char>('o'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('P'),static_cast<unsigned char>('p'),static_cast<unsigned char>('Q'),static_cast<unsigned char>('q'),static_cast<unsigned char>('R'),static_cast<unsigned char>('r'),static_cast<unsigned char>('S'),static_cast<unsigned char>('s'),static_cast<unsigned char>('T'),static_cast<unsigned char>('t'),
-+  static_cast<unsigned char>('U'),static_cast<unsigned char>('u'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('V'),static_cast<unsigned char>('v'),static_cast<unsigned char>('W'),static_cast<unsigned char>('w'),static_cast<unsigned char>('X'),static_cast<unsigned char>('x'),
-+  static_cast<unsigned char>('Y'),static_cast<unsigned char>('y'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('Z'),static_cast<unsigned char>('z'),
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x8E, 0x91, 0x92, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x9E, 0x00},
- //VISCII
--{ 'A','a','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  'B','b','C','c','D','d',
--  '�','�',
--  'E','e','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  'F','f','G','g','H','h',
--  'I','i','�','�','�','�','�','�','�','�','�','�',
--  'J','j','K','k','L','l','M','m','N','n',
--  'O','o','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  'P','p','Q','q','R','r','S','s','T','t',
--  'U','u','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  'V','v','W','w','X','x',
--  'Y','y','�','�','�','�','�','�','�','�','�','�',
--  'Z','z',
-+{ static_cast<unsigned char>('A'),static_cast<unsigned char>('a'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('B'),static_cast<unsigned char>('b'),static_cast<unsigned char>('C'),static_cast<unsigned char>('c'),static_cast<unsigned char>('D'),static_cast<unsigned char>('d'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('E'),static_cast<unsigned char>('e'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('F'),static_cast<unsigned char>('f'),static_cast<unsigned char>('G'),static_cast<unsigned char>('g'),static_cast<unsigned char>('H'),static_cast<unsigned char>('h'),
-+  static_cast<unsigned char>('I'),static_cast<unsigned char>('i'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('J'),static_cast<unsigned char>('j'),static_cast<unsigned char>('K'),static_cast<unsigned char>('k'),static_cast<unsigned char>('L'),static_cast<unsigned char>('l'),static_cast<unsigned char>('M'),static_cast<unsigned char>('m'),static_cast<unsigned char>('N'),static_cast<unsigned char>('n'),
-+  static_cast<unsigned char>('O'),static_cast<unsigned char>('o'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('P'),static_cast<unsigned char>('p'),static_cast<unsigned char>('Q'),static_cast<unsigned char>('q'),static_cast<unsigned char>('R'),static_cast<unsigned char>('r'),static_cast<unsigned char>('S'),static_cast<unsigned char>('s'),static_cast<unsigned char>('T'),static_cast<unsigned char>('t'),
-+  static_cast<unsigned char>('U'),static_cast<unsigned char>('u'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('V'),static_cast<unsigned char>('v'),static_cast<unsigned char>('W'),static_cast<unsigned char>('w'),static_cast<unsigned char>('X'),static_cast<unsigned char>('x'),
-+  static_cast<unsigned char>('Y'),static_cast<unsigned char>('y'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('Z'),static_cast<unsigned char>('z'),
-   0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x8E, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x9E, 0x00},
- // BKHCM1
--{'A','a','�','�','�','�','�','�','�','�','�','�',
--  '�','�','~','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  'B','b','C','c','D','d',
--  '}','�',
--  'E','e','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  'F','f','G','g','H','h',
--  'I','i','�','�','�','�','�','�','�','�','�','�',
--  'J','j','K','k','L','l','M','m','N','n',
--  'O','o','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  'P','p','Q','q','R','r','S','s','T','t',
--  'U','u','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  'V','v','W','w','X','x',
--  'Y','y','{','�','^','�','`','�','|','�','�','�',
--  'Z','z',
-+{static_cast<unsigned char>('A'),static_cast<unsigned char>('a'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('~'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('B'),static_cast<unsigned char>('b'),static_cast<unsigned char>('C'),static_cast<unsigned char>('c'),static_cast<unsigned char>('D'),static_cast<unsigned char>('d'),
-+  static_cast<unsigned char>('}'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('E'),static_cast<unsigned char>('e'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('F'),static_cast<unsigned char>('f'),static_cast<unsigned char>('G'),static_cast<unsigned char>('g'),static_cast<unsigned char>('H'),static_cast<unsigned char>('h'),
-+  static_cast<unsigned char>('I'),static_cast<unsigned char>('i'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('J'),static_cast<unsigned char>('j'),static_cast<unsigned char>('K'),static_cast<unsigned char>('k'),static_cast<unsigned char>('L'),static_cast<unsigned char>('l'),static_cast<unsigned char>('M'),static_cast<unsigned char>('m'),static_cast<unsigned char>('N'),static_cast<unsigned char>('n'),
-+  static_cast<unsigned char>('O'),static_cast<unsigned char>('o'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('P'),static_cast<unsigned char>('p'),static_cast<unsigned char>('Q'),static_cast<unsigned char>('q'),static_cast<unsigned char>('R'),static_cast<unsigned char>('r'),static_cast<unsigned char>('S'),static_cast<unsigned char>('s'),static_cast<unsigned char>('T'),static_cast<unsigned char>('t'),
-+  static_cast<unsigned char>('U'),static_cast<unsigned char>('u'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('V'),static_cast<unsigned char>('v'),static_cast<unsigned char>('W'),static_cast<unsigned char>('w'),static_cast<unsigned char>('X'),static_cast<unsigned char>('x'),
-+  static_cast<unsigned char>('Y'),static_cast<unsigned char>('y'),static_cast<unsigned char>('{'),static_cast<unsigned char>('�'),static_cast<unsigned char>('^'),static_cast<unsigned char>('�'),static_cast<unsigned char>('`'),static_cast<unsigned char>('�'),static_cast<unsigned char>('|'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('Z'),static_cast<unsigned char>('z'),
-   0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x8E, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x9E, 0x00},
- //Vietware-F
--{ 'A','a','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  'B','b','C','c','D','d',
--  '�','�',
--  'E','e','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  'F','f','G','g','H','h',
--  'I','i','�','�','�','�','�','�','�','�','�','�',
--  'J','j','K','k','L','l','M','m','N','n',
--  'O','o','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  'P','p','Q','q','R','r','S','s','T','t',
--  'U','u','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  'V','v','W','w','X','x',
--  'Y','y','�','�','�','�','�','�','�','�','�','�',
--  'Z','z',
-+{ static_cast<unsigned char>('A'),static_cast<unsigned char>('a'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('B'),static_cast<unsigned char>('b'),static_cast<unsigned char>('C'),static_cast<unsigned char>('c'),static_cast<unsigned char>('D'),static_cast<unsigned char>('d'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('E'),static_cast<unsigned char>('e'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('F'),static_cast<unsigned char>('f'),static_cast<unsigned char>('G'),static_cast<unsigned char>('g'),static_cast<unsigned char>('H'),static_cast<unsigned char>('h'),
-+  static_cast<unsigned char>('I'),static_cast<unsigned char>('i'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('J'),static_cast<unsigned char>('j'),static_cast<unsigned char>('K'),static_cast<unsigned char>('k'),static_cast<unsigned char>('L'),static_cast<unsigned char>('l'),static_cast<unsigned char>('M'),static_cast<unsigned char>('m'),static_cast<unsigned char>('N'),static_cast<unsigned char>('n'),
-+  static_cast<unsigned char>('O'),static_cast<unsigned char>('o'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('P'),static_cast<unsigned char>('p'),static_cast<unsigned char>('Q'),static_cast<unsigned char>('q'),static_cast<unsigned char>('R'),static_cast<unsigned char>('r'),static_cast<unsigned char>('S'),static_cast<unsigned char>('s'),static_cast<unsigned char>('T'),static_cast<unsigned char>('t'),
-+  static_cast<unsigned char>('U'),static_cast<unsigned char>('u'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('V'),static_cast<unsigned char>('v'),static_cast<unsigned char>('W'),static_cast<unsigned char>('w'),static_cast<unsigned char>('X'),static_cast<unsigned char>('x'),
-+  static_cast<unsigned char>('Y'),static_cast<unsigned char>('y'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('Z'),static_cast<unsigned char>('z'),
-   0x80, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88,
-   0x89, 0x8A, 0x8B, 0x8C, 0x8E, 0x91, 0x92, 0x93,
-   0x94, 0x95, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x9E, 0x00},
- // ISC
-- {'A','a','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  'B','b','C','c','D','d',
--  '�','�',
--  'E','e','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  'F','f','G','g','H','h',
--  'I','i','�','�','�','�','�','�','�','�','�','�',
--  'J','j','K','k','L','l','M','m','N','n',
--  'O','o','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  '�','�','�','�','�','�','�','�','�','�','�','�',
--  'P','p','Q','q','R','r','S','s','T','t',
--  'U','u','@','�','�','�','�','�','�','�','|','�',
--  '�','�','`','�',0x5C,'�','^','�','~','�','#','�',
--  'V','v','W','w','X','x',
--  'Y','y','�','�','�','�','�','�','�','�','�','�',
--  'Z','z',
-+ {static_cast<unsigned char>('A'),static_cast<unsigned char>('a'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('B'),static_cast<unsigned char>('b'),static_cast<unsigned char>('C'),static_cast<unsigned char>('c'),static_cast<unsigned char>('D'),static_cast<unsigned char>('d'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('E'),static_cast<unsigned char>('e'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('F'),static_cast<unsigned char>('f'),static_cast<unsigned char>('G'),static_cast<unsigned char>('g'),static_cast<unsigned char>('H'),static_cast<unsigned char>('h'),
-+  static_cast<unsigned char>('I'),static_cast<unsigned char>('i'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('J'),static_cast<unsigned char>('j'),static_cast<unsigned char>('K'),static_cast<unsigned char>('k'),static_cast<unsigned char>('L'),static_cast<unsigned char>('l'),static_cast<unsigned char>('M'),static_cast<unsigned char>('m'),static_cast<unsigned char>('N'),static_cast<unsigned char>('n'),
-+  static_cast<unsigned char>('O'),static_cast<unsigned char>('o'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('P'),static_cast<unsigned char>('p'),static_cast<unsigned char>('Q'),static_cast<unsigned char>('q'),static_cast<unsigned char>('R'),static_cast<unsigned char>('r'),static_cast<unsigned char>('S'),static_cast<unsigned char>('s'),static_cast<unsigned char>('T'),static_cast<unsigned char>('t'),
-+  static_cast<unsigned char>('U'),static_cast<unsigned char>('u'),static_cast<unsigned char>('@'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('|'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('`'),static_cast<unsigned char>('�'),0x5C,static_cast<unsigned char>('�'),static_cast<unsigned char>('^'),static_cast<unsigned char>('�'),static_cast<unsigned char>('~'),static_cast<unsigned char>('�'),static_cast<unsigned char>('#'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('V'),static_cast<unsigned char>('v'),static_cast<unsigned char>('W'),static_cast<unsigned char>('w'),static_cast<unsigned char>('X'),static_cast<unsigned char>('x'),
-+  static_cast<unsigned char>('Y'),static_cast<unsigned char>('y'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
-+  static_cast<unsigned char>('Z'),static_cast<unsigned char>('z'),
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x12, 0x13,
-   0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index c0f4aa4f4609..dff7b4aee84d 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,10 +1,7 @@
-DIST fcitx-4.2.9.1_dict.tar.xz 8684772 SHA256 5337c8226417a1d4e6f88b3b1048aa73695d281ed483568a7b6a9ee849ad6c77 SHA512 5d3b669ed97423f976116385571d07f832e9e18007e6a3c2aef12957219739a81fbf2343825fea4a1b01a83a6bf9e40e9ffa88466c651876602517c6da1fb25d WHIRLPOOL 02b2ff1b0c33b1f2c0461988bc3323ca27ba565a0d8a1f49b96aaceac857c07365aaaee0048d470dea82e60857bedf59ef8c60d3cdfa14a2ff074216d5cdc16d
-DIST fcitx-4.2.9.2_dict.tar.xz 8735848 SHA256 2cdd7c138163f717aacca8eabb18a4a823c808a408e4b0770f5be2e3e892de20 SHA512 9228fc4629479e2c518e0d0a7dbe604f6e56e864b41927d120e1f0b7a277ff53ff1b393870480bc1660662751a31885ddc1ddf43133a11edc2e96cbc7701daee WHIRLPOOL 8f19cd9f34a3957ff42e94ca7a5e28db5feecf658e9ca2535430fe6dd7a269ba9833e9273e8fd87d00a426027aebd97741c3fe909d9a0b0577ae6f64a8f4ba75
-DIST fcitx-4.2.9.3_dict.tar.xz 8737864 SHA256 543cc301f274367429880cb80c53349ed44435e7c64d757cca9b0d1844e2a91e SHA512 813b55c4b13e9d36bdaed6e4d072a841aa7f067f937b46d1fdbc03e8176b76ce83b056e24e2c0fe944f1347c5fe6a8d9bfdd6b0b2ed054e3017f3926fa36bcdd WHIRLPOOL b54c52025a48350c37712a64048ae2cec4e891c75607ded8ce35940252d2c242430e6ff0e64c86e1319b89b57b388c05760728a861cd58af0c99edd634f20c97
-DIST fcitx-4.2.9.4_dict.tar.xz 8731804 SHA256 e4f9069ac82afd72cdaf9d317377113ce361a9f086b930c12026127a3543953a SHA512 2e8ead59a154a857dfc011af83715dbe1225cbccf1e2c6ced1d9aaf92a7881f89fbe806da3c66ed1805cf27994c91a2d463c455be726b7d4b73c07bfde83972b WHIRLPOOL 113c13ea4eff8de68096ea7bfc1a92c62f5c78395436b5885761863c689a2613d0f5bde8a19ea5b1cc45d032fba4b2a6d2790d31e1d46cf9890d8b33df2049e5
-DIST fcitx-4.2.9.5_dict.tar.xz 8736972 SHA256 be398ac4433f6f4599d2728e20615e4f4602a5f67e9c29df4a3d4c1126d376ca SHA512 5e2ec5405b01fe85b1659b1db3e15389b0d7e096808db598d0865381bcb8f6de960e8e16d4432c95c586cfc3359d17d4f7bad0cff2fe0146fe00b9fb80491168 WHIRLPOOL 0aa6eed3f76d77b4fafef9440e6b1b740c932e3a0a2809706126992d2a39e439b677df1c79d77ed147924a9784c0ced31593d3a1e1c7e2064bcfd08007ecc6de
-DIST fcitx-data-en_dict-20121020.tar.gz 630491 SHA256 c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb SHA512 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2 WHIRLPOOL 858b51723035e24756c0ece15ee28f9d25dbc86ca447c50e070f085e47b864f26201a100d3d968bcecf5711e76f99c7908eeabe7bc6d5b3b17d6cf2c53c3204b
-DIST fcitx-data-pinyin.tar.gz 1608886 SHA256 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1 SHA512 1ee19eed3ee58be6cd6562ec363fe3bf630fff5e8820b3bfdd6d4618fceb082695e888dec5366a3685d58706f720e19319d891c223227237aed12674ea982131 WHIRLPOOL c5584213cab5b3729c159759909819bef42d4dba899e58df331aa12b47f5544545d9ba3f8ac7291835cb80c5e180a3a8b31360e9b9e43e4f38387b0eeee74b46
-DIST fcitx-data-py_stroke-20121124.tar.gz 445601 SHA256 8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248 SHA512 d80ff9a3549e07c7a6935e686785f9a076c58f1a782a832ae28ee65e2a213d67f089f450ce09bed87ec2a141c32b9c1fcb83c221ddcab436858fa9009f161fb3 WHIRLPOOL 3b09c21b8f948538b10218bd52ed12235f8d8a1986db7c09a35de5454c89305d5ada27177c8501b6bf72324aa1824a384822a7fbb440d63ce081265b1fa34c65
-DIST fcitx-data-py_table-20121124.tar.gz 186822 SHA256 42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04 SHA512 0fa72ce6820a316e9729bc0d7a08af5ca3468134de9ff1bf0c559a398846a7bcf7313a3609d943e6bab637d930cf45ad9acfe25a8d3df078a774b071a7296486 WHIRLPOOL 43564e50722325215d250287276556fc6e8ccebd4da905fa579668658ff8e41f43a14e027f431489a9edf65691f00f6e95778acb91aed731da13b351ddf518cb
-DIST fcitx-data-table.tar.gz 4144686 SHA256 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7 SHA512 99e1d69c679355fcf3e117a1ef39b131cbd3af841387d2335757247d840b90ff6b7323e16fca98cf7a043033faf250d2e9c6d47b96845d18c278a0cf6f30fec9 WHIRLPOOL 465997dc17e88fb3130abb60e0c73564fbdb50a10de1587f5efaac4859a001b7b4aea1f0f4f6efe01ada5e8751351b7b6106a130f46d550e5dd0081dfaa780e5
+DIST fcitx-4.2.9.4_dict.tar.xz 8731804 BLAKE2B 8363d7908cb68b9da3c71c2bea237dbad20740e4f9b07a1b5625c5228aab09e1c5c86134fce681dcaaaaf2cdc570b7701a23ca6e1c01d09117133fd07f4d8b7a SHA512 2e8ead59a154a857dfc011af83715dbe1225cbccf1e2c6ced1d9aaf92a7881f89fbe806da3c66ed1805cf27994c91a2d463c455be726b7d4b73c07bfde83972b
+DIST fcitx-4.2.9.5_dict.tar.xz 8736972 BLAKE2B 01255554aa0caf5e4f638121febcf0951549d5752884dd436c90042587048598724b91d4839ff2470e8b9ee119f0abb40650c45fd8253ae1bd74608812c84a1d SHA512 5e2ec5405b01fe85b1659b1db3e15389b0d7e096808db598d0865381bcb8f6de960e8e16d4432c95c586cfc3359d17d4f7bad0cff2fe0146fe00b9fb80491168
+DIST fcitx-data-en_dict-20121020.tar.gz 630491 BLAKE2B 2df897b1c9fb3a2ce186ee590e5f3ccbc7930f047218bf0fefa317f74b3287fc0be9c393d3310fe07208379118ec4c46608a1c703ef37b3aee65b2d790cb7f0d SHA512 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
+DIST fcitx-data-pinyin.tar.gz 1608886 BLAKE2B 3b7e72559bb838b4f2245e6faf2d627df17e9383ef8fe382e10333c1a95d79409ec042caa7d77c9bcd956b1c5d5456dab9d82208cd89d90e2be759c76f56f3d1 SHA512 1ee19eed3ee58be6cd6562ec363fe3bf630fff5e8820b3bfdd6d4618fceb082695e888dec5366a3685d58706f720e19319d891c223227237aed12674ea982131
+DIST fcitx-data-py_stroke-20121124.tar.gz 445601 BLAKE2B 43b29b30da11b18196918e4df847406871eff75595b62608ad86b0ef6de83ec5e1b722645cabb809281075b393b5970e4d9580594caa73060c866c2d3cd988e7 SHA512 d80ff9a3549e07c7a6935e686785f9a076c58f1a782a832ae28ee65e2a213d67f089f450ce09bed87ec2a141c32b9c1fcb83c221ddcab436858fa9009f161fb3
+DIST fcitx-data-py_table-20121124.tar.gz 186822 BLAKE2B d696413f2e88f1ca87938d632e12997d14a31a66eaf011c6a7b3c0f607cf45f48e53644ea07d73dbbb0ad898dee6d5ff2d0e4fc2fdcae923acbc03d3d387aaeb SHA512 0fa72ce6820a316e9729bc0d7a08af5ca3468134de9ff1bf0c559a398846a7bcf7313a3609d943e6bab637d930cf45ad9acfe25a8d3df078a774b071a7296486
+DIST fcitx-data-table.tar.gz 4144686 BLAKE2B 696845bb234915a364d614d47cc3baf8421a12ca1778611b0843e52e651da98b5ed9f3e0c9895a829b67f1bcceb1f982a7f6606c8a2d383af8c4573a150c71ef SHA512 99e1d69c679355fcf3e117a1ef39b131cbd3af841387d2335757247d840b90ff6b7323e16fca98cf7a043033faf250d2e9c6d47b96845d18c278a0cf6f30fec9
diff --git a/app-i18n/fcitx/fcitx-4.2.9.1.ebuild b/app-i18n/fcitx/fcitx-4.2.9.1.ebuild
deleted file mode 100644
index b003a374c8ac..000000000000
--- a/app-i18n/fcitx/fcitx-4.2.9.1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx"
-fi
-
-DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz
-		https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz
-		https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz
-		https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz
-		https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz"
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
-fi
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="4"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="+X +autostart +cairo debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
-REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )"
-
-RDEPEND="dev-libs/glib:2
-	sys-apps/dbus
-	virtual/libiconv
-	virtual/libintl
-	x11-libs/libxkbcommon
-	X? (
-		x11-libs/libX11
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrender
-		xml? (
-			x11-libs/libxkbfile
-			x11-misc/xkeyboard-config
-		)
-	)
-	cairo? (
-		x11-libs/cairo[X]
-		x11-libs/libXext
-		pango? ( x11-libs/pango )
-		!pango? ( media-libs/fontconfig )
-	)
-	enchant? ( <app-text/enchant-2 )
-	gtk2? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	introspection? ( dev-libs/gobject-introspection )
-	lua? ( dev-lang/lua:= )
-	nls? ( sys-devel/gettext )
-	opencc? ( app-i18n/opencc:= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-	)
-	xml? (
-		app-text/iso-codes
-		dev-libs/libxml2
-	)"
-DEPEND="${RDEPEND}
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig"
-
-DOCS=(AUTHORS ChangeLog THANKS)
-
-PATCHES=(
-	"${FILESDIR}/${P}-tray_icon.patch"
-	"${FILESDIR}/${P}-qt-4_ucs4.patch"
-)
-
-src_prepare() {
-	if [[ "${PV}" == "9999" ]]; then
-		ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz" src/im/pinyin/data/pinyin.tar.gz || die
-		ln -s "${DISTDIR}/fcitx-data-table.tar.gz" src/im/table/data/table.tar.gz || die
-		ln -s "${DISTDIR}/fcitx-data-py_stroke-20121124.tar.gz" src/module/pinyin-enhance/data/py_stroke-20121124.tar.gz || die
-		ln -s "${DISTDIR}/fcitx-data-py_table-20121124.tar.gz" src/module/pinyin-enhance/data/py_table-20121124.tar.gz || die
-		ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die
-	fi
-
-	# https://github.com/fcitx/fcitx/issues/250
-	sed \
-		-e "/find_package(XkbFile REQUIRED)/i\\    if(ENABLE_X11)" \
-		-e "/find_package(XkbFile REQUIRED)/s/^/    /" \
-		-e "/find_package(XkbFile REQUIRED)/a\\    endif(ENABLE_X11)" \
-		-i CMakeLists.txt
-
-	# https://github.com/fcitx/fcitx/issues/342
-	while IFS='' read -d $'\0' -r f ; do
-		sed 's:^#!/bin/sh$:#!/usr/bin/env bash:' -i "${f}" || die
-	done < <(find "${S}" -name '*.sh' -type f -print0)
-
-	cmake-utils_src_prepare
-	xdg_environment_reset
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DSYSCONFDIR="${EPREFIX}/etc"
-		-DENABLE_CAIRO=$(usex cairo)
-		-DENABLE_DEBUG=$(usex debug)
-		-DENABLE_ENCHANT=$(usex enchant)
-		-DENABLE_GETTEXT=$(usex nls)
-		-DENABLE_GIR=$(usex introspection)
-		-DENABLE_GTK2_IM_MODULE=$(usex gtk2)
-		-DENABLE_GTK3_IM_MODULE=$(usex gtk3)
-		-DENABLE_LIBXML2=$(usex xml)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_OPENCC=$(usex opencc)
-		-DENABLE_PANGO=$(usex pango)
-		-DENABLE_QT=$(usex qt4)
-		-DENABLE_QT_GUI=$(usex qt4)
-		-DENABLE_QT_IM_MODULE=$(usex qt4)
-		-DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
-		-DENABLE_STATIC=$(usex static-libs)
-		-DENABLE_TABLE=$(usex table)
-		-DENABLE_TEST=$(usex test)
-		-DENABLE_X11=$(usex X)
-		-DENABLE_XDGAUTOSTART=$(usex autostart)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	rm -r "${ED}usr/share/doc/${PN}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	use gtk2 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	use gtk2 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-}
diff --git a/app-i18n/fcitx/fcitx-4.2.9.2.ebuild b/app-i18n/fcitx/fcitx-4.2.9.2.ebuild
deleted file mode 100644
index f525853d6f66..000000000000
--- a/app-i18n/fcitx/fcitx-4.2.9.2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx"
-fi
-
-DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz
-		https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz
-		https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz
-		https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz
-		https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz"
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
-fi
-
-LICENSE="GPL-2+ LGPL-2+ MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+X +autostart +cairo debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
-REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )"
-
-RDEPEND="dev-libs/glib:2
-	sys-apps/dbus
-	virtual/libiconv
-	virtual/libintl
-	x11-libs/libxkbcommon
-	X? (
-		x11-libs/libX11
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrender
-		xml? (
-			x11-libs/libxkbfile
-			x11-misc/xkeyboard-config
-		)
-	)
-	cairo? (
-		x11-libs/cairo[X]
-		x11-libs/libXext
-		pango? ( x11-libs/pango )
-		!pango? ( media-libs/fontconfig )
-	)
-	enchant? ( app-text/enchant:0= )
-	gtk2? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	introspection? ( dev-libs/gobject-introspection )
-	lua? ( dev-lang/lua:= )
-	nls? ( sys-devel/gettext )
-	opencc? ( app-i18n/opencc:= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-	)
-	xml? (
-		app-text/iso-codes
-		dev-libs/libxml2
-	)"
-DEPEND="${RDEPEND}
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-scripts.patch"
-)
-
-DOCS=(AUTHORS ChangeLog THANKS)
-
-src_prepare() {
-	if [[ "${PV}" == "9999" ]]; then
-		ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz" src/im/pinyin/data/pinyin.tar.gz || die
-		ln -s "${DISTDIR}/fcitx-data-table.tar.gz" src/im/table/data/table.tar.gz || die
-		ln -s "${DISTDIR}/fcitx-data-py_stroke-20121124.tar.gz" src/module/pinyin-enhance/data/py_stroke-20121124.tar.gz || die
-		ln -s "${DISTDIR}/fcitx-data-py_table-20121124.tar.gz" src/module/pinyin-enhance/data/py_table-20121124.tar.gz || die
-		ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die
-	fi
-
-	# https://github.com/fcitx/fcitx/issues/250
-	sed \
-		-e "/find_package(XkbFile REQUIRED)/i\\    if(ENABLE_X11)" \
-		-e "/find_package(XkbFile REQUIRED)/s/^/    /" \
-		-e "/find_package(XkbFile REQUIRED)/a\\    endif(ENABLE_X11)" \
-		-i CMakeLists.txt
-
-	cmake-utils_src_prepare
-	xdg_environment_reset
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DSYSCONFDIR="${EPREFIX}/etc"
-		-DENABLE_CAIRO=$(usex cairo)
-		-DENABLE_DEBUG=$(usex debug)
-		-DENABLE_ENCHANT=$(usex enchant)
-		-DENABLE_GETTEXT=$(usex nls)
-		-DENABLE_GIR=$(usex introspection)
-		-DENABLE_GTK2_IM_MODULE=$(usex gtk2)
-		-DENABLE_GTK3_IM_MODULE=$(usex gtk3)
-		-DENABLE_LIBXML2=$(usex xml)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_OPENCC=$(usex opencc)
-		-DENABLE_PANGO=$(usex pango)
-		-DENABLE_QT=$(usex qt4)
-		-DENABLE_QT_GUI=$(usex qt4)
-		-DENABLE_QT_IM_MODULE=$(usex qt4)
-		-DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
-		-DENABLE_STATIC=$(usex static-libs)
-		-DENABLE_TABLE=$(usex table)
-		-DENABLE_TEST=$(usex test)
-		-DENABLE_X11=$(usex X)
-		-DENABLE_XDGAUTOSTART=$(usex autostart)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	rm -r "${ED}usr/share/doc/${PN}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	use gtk2 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	use gtk2 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-}
diff --git a/app-i18n/fcitx/fcitx-4.2.9.3.ebuild b/app-i18n/fcitx/fcitx-4.2.9.3.ebuild
deleted file mode 100644
index a6b5e59f5762..000000000000
--- a/app-i18n/fcitx/fcitx-4.2.9.3.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx"
-fi
-
-DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz
-		https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz
-		https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz
-		https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz
-		https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz"
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
-fi
-
-LICENSE="GPL-2+ LGPL-2+ MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+X +autostart +cairo debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
-REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )"
-
-RDEPEND="dev-libs/glib:2
-	sys-apps/dbus
-	virtual/libiconv
-	virtual/libintl
-	x11-libs/libxkbcommon
-	X? (
-		x11-libs/libX11
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrender
-		xml? (
-			x11-libs/libxkbfile
-			x11-misc/xkeyboard-config
-		)
-	)
-	cairo? (
-		x11-libs/cairo[X]
-		x11-libs/libXext
-		pango? ( x11-libs/pango )
-		!pango? ( media-libs/fontconfig )
-	)
-	enchant? ( app-text/enchant:0= )
-	gtk2? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	introspection? ( dev-libs/gobject-introspection )
-	lua? ( dev-lang/lua:= )
-	nls? ( sys-devel/gettext )
-	opencc? ( app-i18n/opencc:= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-	)
-	xml? (
-		app-text/iso-codes
-		dev-libs/libxml2
-	)"
-DEPEND="${RDEPEND}
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-restart.patch"
-)
-
-DOCS=(AUTHORS ChangeLog THANKS)
-
-src_prepare() {
-	if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-		ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz" src/im/pinyin/data/pinyin.tar.gz || die
-		ln -s "${DISTDIR}/fcitx-data-table.tar.gz" src/im/table/data/table.tar.gz || die
-		ln -s "${DISTDIR}/fcitx-data-py_stroke-20121124.tar.gz" src/module/pinyin-enhance/data/py_stroke-20121124.tar.gz || die
-		ln -s "${DISTDIR}/fcitx-data-py_table-20121124.tar.gz" src/module/pinyin-enhance/data/py_table-20121124.tar.gz || die
-		ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die
-	fi
-
-	# https://github.com/fcitx/fcitx/issues/250
-	sed \
-		-e "/find_package(XkbFile REQUIRED)/i\\    if(ENABLE_X11)" \
-		-e "/find_package(XkbFile REQUIRED)/s/^/    /" \
-		-e "/find_package(XkbFile REQUIRED)/a\\    endif(ENABLE_X11)" \
-		-i CMakeLists.txt
-
-	cmake-utils_src_prepare
-	xdg_environment_reset
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DSYSCONFDIR="${EPREFIX}/etc"
-		-DENABLE_CAIRO=$(usex cairo)
-		-DENABLE_DEBUG=$(usex debug)
-		-DENABLE_ENCHANT=$(usex enchant)
-		-DENABLE_GETTEXT=$(usex nls)
-		-DENABLE_GIR=$(usex introspection)
-		-DENABLE_GTK2_IM_MODULE=$(usex gtk2)
-		-DENABLE_GTK3_IM_MODULE=$(usex gtk3)
-		-DENABLE_LIBXML2=$(usex xml)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_OPENCC=$(usex opencc)
-		-DENABLE_PANGO=$(usex pango)
-		-DENABLE_QT=$(usex qt4)
-		-DENABLE_QT_GUI=$(usex qt4)
-		-DENABLE_QT_IM_MODULE=$(usex qt4)
-		-DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
-		-DENABLE_STATIC=$(usex static-libs)
-		-DENABLE_TABLE=$(usex table)
-		-DENABLE_TEST=$(usex test)
-		-DENABLE_X11=$(usex X)
-		-DENABLE_XDGAUTOSTART=$(usex autostart)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	rm -r "${ED}usr/share/doc/${PN}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	use gtk2 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	use gtk2 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-}
diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.1-qt-4_ucs4.patch b/app-i18n/fcitx/files/fcitx-4.2.9.1-qt-4_ucs4.patch
deleted file mode 100644
index e417a0615716..000000000000
--- a/app-i18n/fcitx/files/fcitx-4.2.9.1-qt-4_ucs4.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-https://github.com/fcitx/fcitx/commit/14faccfbb0d87e06c25d182ae842808d18be3dc7
-https://github.com/fcitx/fcitx/commit/216a09e3ec056f272eebfbe82809b803d86012cb
-
---- /src/frontend/qt/qfcitxinputcontext.cpp
-+++ /src/frontend/qt/qfcitxinputcontext.cpp
-@@ -232,6 +232,20 @@
-                         anchor = var2.toInt();
-                     else
-                         anchor = cursor;
-+
-+                    // adjust it to real character size
-+                    // QTBUG-25536;
-+                    QVector<uint> tempUCS4 = text.leftRef(cursor).toUcs4();
-+                    while (!tempUCS4.empty() && tempUCS4.last() == 0) {
-+                        tempUCS4.pop_back();
-+                    }
-+                    cursor = tempUCS4.size();
-+                    tempUCS4 = text.leftRef(anchor).toUcs4();
-+                    while (!tempUCS4.empty() && tempUCS4.last() == 0) {
-+                        tempUCS4.pop_back();
-+                    }
-+                    anchor = tempUCS4.size();
-+
-                     if (data->surroundingText != text) {
-                         data->surroundingText = text;
-                         proxy->SetSurroundingText(text, cursor, anchor);
-@@ -581,6 +595,7 @@
-             delete data->proxy;
-         }
-         data->proxy = new FcitxQtInputContextProxy(m_connection->serviceName(), path, *m_connection->connection(), this);
-+        data->proxy->setProperty("icData", qVariantFromValue(static_cast<void*>(data)));
-         connect(data->proxy, SIGNAL(CommitString(QString)), this, SLOT(commitString(QString)));
-         connect(data->proxy, SIGNAL(ForwardKey(uint, uint, int)), this, SLOT(forwardKey(uint, uint, int)));
-         connect(data->proxy, SIGNAL(UpdateFormattedPreedit(FcitxQtFormattedPreeditList,int)), this, SLOT(updateFormattedPreedit(FcitxQtFormattedPreeditList,int)));
-@@ -680,11 +695,57 @@
-     sendEvent(event);
- }
- 
--void QFcitxInputContext::deleteSurroundingText(int offset, uint nchar)
-+void QFcitxInputContext::deleteSurroundingText(int offset, uint _nchar)
- {
-     QInputMethodEvent event;
--    event.setCommitString("", offset, nchar);
--    sendEvent(event);
-+
-+    FcitxQtInputContextProxy *proxy = qobject_cast<FcitxQtInputContextProxy*>(sender());
-+    if (!proxy) {
-+        return;
-+    }
-+
-+    FcitxQtICData *data = static_cast<FcitxQtICData*>(proxy->property("icData").value<void *>());
-+    QVector<uint> ucsText = data->surroundingText.toUcs4();
-+
-+    // QTBUG-25536
-+    while (!ucsText.empty() && ucsText.last() == 0) {
-+        ucsText.pop_back();
-+    }
-+
-+    int cursor = data->surroundingCursor;
-+    // make nchar signed so we are safer
-+    int nchar = _nchar;
-+    // Qt's reconvert semantics is different from gtk's. It doesn't count the current
-+    // selection. Discard selection from nchar.
-+    if (data->surroundingAnchor < data->surroundingCursor) {
-+        nchar -= data->surroundingCursor - data->surroundingAnchor;
-+        offset += data->surroundingCursor - data->surroundingAnchor;
-+        cursor = data->surroundingAnchor;
-+    } else if (data->surroundingAnchor > data->surroundingCursor) {
-+        nchar -= data->surroundingAnchor - data->surroundingCursor;
-+        cursor = data->surroundingCursor;
-+    }
-+
-+    // validates
-+    if (nchar >= 0 && cursor + offset >= 0 && cursor + offset + nchar < ucsText.size()) {
-+        // order matters
-+        QVector<uint> replacedChars = ucsText.mid(cursor + offset, nchar);
-+        nchar = QString::fromUcs4(replacedChars.data(), replacedChars.size()).size();
-+
-+        int start, len;
-+        if (offset >= 0) {
-+            start = cursor;
-+            len = offset;
-+        } else {
-+            start = cursor;
-+            len = -offset;
-+        }
-+
-+        QVector<uint> prefixedChars = ucsText.mid(start, len);
-+        offset = QString::fromUcs4(prefixedChars.data(), prefixedChars.size()).size() * (offset >= 0 ? 1 : -1);
-+        event.setCommitString("", offset, nchar);
-+        sendEvent(event);
-+    }
- }
- 
- void QFcitxInputContext::forwardKey(uint keyval, uint state, int type)
diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.1-tray_icon.patch b/app-i18n/fcitx/files/fcitx-4.2.9.1-tray_icon.patch
deleted file mode 100644
index 7bfbc6e9ade0..000000000000
--- a/app-i18n/fcitx/files/fcitx-4.2.9.1-tray_icon.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-https://github.com/fcitx/fcitx/issues/241
-https://github.com/fcitx/fcitx/commit/c737618fffa84bfe5a6caf55cee9b9288a791bbf
-https://github.com/fcitx/fcitx/commit/353683e29be4ef26409b9a05e0cb647a5180fa8c
-https://github.com/fcitx/fcitx/commit/fe2732db27a1c2e183400ceeb3283559e10a4ca8
-https://github.com/fcitx/fcitx/commit/440c431d29876a8e4871159d289bc9a573f9a41b
-
---- /src/module/notificationitem/notificationitem.c
-+++ /src/module/notificationitem/notificationitem.c
-@@ -565,8 +565,17 @@
- 
- boolean FcitxNotificationItemEnable(FcitxNotificationItem* notificationitem, FcitxNotificationItemAvailableCallback callback, void* data)
- {
--    if (!callback || notificationitem->callback)
-+    if (!callback)
-         return false;
-+
-+    if (notificationitem->callback == callback) {
-+        return true;
-+    }
-+
-+    if (notificationitem->callback) {
-+        return false;
-+    }
-+
-     if (notificationitem->serviceName) {
-         FcitxLog(ERROR, "This should not happen, please report bug.");
-         return false;
---- /src/ui/classic/TrayWindow.c
-+++ /src/ui/classic/TrayWindow.c
-@@ -48,7 +48,7 @@
-     Display *dpy = classicui->dpy;
-     int iScreen = classicui->iScreen;
-     char   strWindowName[] = "Fcitx Tray Window";
--    if (!classicui->bUseTrayIcon || classicui->isSuspend)
-+    if (!classicui->bUseTrayIcon || classicui->isSuspend || classicui->notificationItemAvailable)
-         return;
- 
-     if (trayWindow->window == None && trayWindow->dockWindow != None) {
-@@ -61,12 +61,12 @@
-             wsa.colormap = colormap;
-             wsa.background_pixel = 0;
-             wsa.border_pixel = 0;
--            trayWindow->window = XCreateWindow(dpy, p, -1, -1, 1, 1,
-+            trayWindow->window = XCreateWindow(dpy, p, -1, -1, 22, 22,
-                                             0, vi->depth, InputOutput, vi->visual,
-                                             CWBackPixmap | CWBackPixel | CWBorderPixel | CWColormap, &wsa);
-         } else {
-             trayWindow->window = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy),
--                                -1, -1, 1, 1, 0,
-+                                -1, -1, 22, 22, 0,
-                                 BlackPixel(dpy, DefaultScreen(dpy)),
-                                 WhitePixel(dpy, DefaultScreen(dpy)));
-             XSetWindowBackgroundPixmap(dpy, trayWindow->window, ParentRelative);
-@@ -74,6 +74,7 @@
-         if (trayWindow->window == (Window) NULL)
-             return;
- 
-+        trayWindow->size = 22;
-         XSizeHints size_hints;
-         size_hints.flags = PWinGravity | PBaseSize;
-         size_hints.base_width = trayWindow->size;
-@@ -161,7 +162,7 @@
-     png_surface = image->image;
- 
-     c = cairo_create(trayWindow->cs);
--    cairo_set_source_rgba(c, 0, 0, 0, 0);
-+    cairo_set_source_rgba(c, 1, 1, 1, 0);
-     cairo_set_operator(c, CAIRO_OPERATOR_SOURCE);
-     cairo_paint(c);
- 
-@@ -226,8 +227,6 @@
-         if (event->xclient.message_type == trayWindow->atoms[ATOM_MANAGER]
-             && event->xclient.data.l[1] == trayWindow->atoms[ATOM_SELECTION]
-             && trayWindow->dockWindow == None) {
--            if (classicui->notificationItemAvailable)
--                return true;
-             trayWindow->dockWindow = event->xclient.data.l[2];
-             TrayWindowRelease(trayWindow);
-             TrayWindowInit(trayWindow);
-@@ -245,6 +244,7 @@
-             int size = event->xconfigure.height;
-             if (size != trayWindow->size) {
-                 trayWindow->size = size;
-+                XResizeWindow(dpy, trayWindow->window, size, size);
-                 XSizeHints size_hints;
-                 size_hints.flags = PWinGravity | PBaseSize;
-                 size_hints.base_width = trayWindow->size;
-@@ -286,6 +286,14 @@
-             return true;
-         }
-         break;
-+    case PropertyNotify:
-+        if (event->xproperty.atom == trayWindow->atoms[ATOM_VISUAL] &&
-+            event->xproperty.window == trayWindow->dockWindow) {
-+            TrayWindowRelease(trayWindow);
-+            TrayWindowInit(trayWindow);
-+            return true;
-+        }
-+        break;
-     }
-     return false;
- }
---- /src/ui/classic/classicui.c
-+++ /src/ui/classic/classicui.c
-@@ -168,7 +168,7 @@
- void ClassicUIDelayedInitTray(void* arg) {
-     FcitxClassicUI* classicui = (FcitxClassicUI*) arg;
-     // FcitxLog(INFO, "yeah we delayed!");
--    if (!classicui->bUseTrayIcon)
-+    if (!classicui->bUseTrayIcon || classicui->isSuspend)
-         return;
-     /*
-      * if this return false, something wrong happened and callback
-@@ -187,7 +187,7 @@
- {
-     FcitxClassicUI* classicui = (FcitxClassicUI*) arg;
-     classicui->trayTimeout = 0;
--    if (!classicui->bUseTrayIcon)
-+    if (!classicui->bUseTrayIcon || classicui->isSuspend)
-         return;
- 
-     if (!classicui->trayWindow->bTrayMapped) {
---- /src/ui/classic/tray.c
-+++ /src/ui/classic/tray.c
-@@ -106,8 +106,9 @@
- 
-     XWindowAttributes attr;
-     XGetWindowAttributes(dpy, DefaultRootWindow(dpy), &attr);
--    if ((attr.your_event_mask & StructureNotifyMask) != StructureNotifyMask) {
--        XSelectInput(dpy, DefaultRootWindow(dpy), attr.your_event_mask | StructureNotifyMask); // for MANAGER selection
-+    int neededMask = StructureNotifyMask;
-+    if ((attr.your_event_mask & neededMask) != neededMask) {
-+        XSelectInput(dpy, DefaultRootWindow(dpy), attr.your_event_mask | neededMask); // for MANAGER selection
-     }
-     return True;
- }
-@@ -123,7 +124,7 @@
-     Display* dpy = tray->owner->dpy;
- 
-     if (tray->dockWindow != None) {
--        XSelectInput(dpy, tray->dockWindow, StructureNotifyMask);
-+        XSelectInput(dpy, tray->dockWindow, PropertyChangeMask | StructureNotifyMask);
-         TraySendOpcode(tray, SYSTEM_TRAY_REQUEST_DOCK, tray->window, 0, 0);
-         tray->bTrayMapped = True;
-         return 1;
diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.2-scripts.patch b/app-i18n/fcitx/files/fcitx-4.2.9.2-scripts.patch
deleted file mode 100644
index a3399767e7b0..000000000000
--- a/app-i18n/fcitx/files/fcitx-4.2.9.2-scripts.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://github.com/fcitx/fcitx/issues/342
-https://github.com/fcitx/fcitx/commit/de4bd3d535736afe061d9ac63fcc897e3ab3237e
-
---- /cmake/fcitx-cmake-helper.sh
-+++ /cmake/fcitx-cmake-helper.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #   Copyright (C) 2012~2013 by Yichao Yu
- #   yyc1992@gmail.com
- #
---- /cmake/fcitx-merge-config.sh
-+++ /cmake/fcitx-merge-config.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/env bash
- #   Copyright (C) 2012~2012 by Yichao Yu
- #   yyc1992@gmail.com
- #
---- /data/icon/data/gen.sh
-+++ /data/icon/data/gen.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/env bash
- 
- a="$(find scabable/status/ -type f -name \*.svg)"
- echo $a
---- /data/script/fcitx-configtool.sh
-+++ /data/script/fcitx-configtool.sh
-@@ -28,7 +28,7 @@
-     }
- fi
- 
--if type gettext > /dev/null 2>&1; then
-+if which gettext > /dev/null 2>&1; then
-     _() {
-         gettext "$@"
-     }
---- /src/lib/fcitx-utils/gen-hotkey.sh
-+++ /src/lib/fcitx-utils/gen-hotkey.sh
-@@ -1,7 +1,6 @@
- #!/bin/sh
- 
--function download_file()
--{
-+download_file() {
-     if [ "x$3" != "xf" ]; then
-         if [ -f $1 ]; then
-             return
---- /src/ui/classic/fcitx-skin-installer.sh
-+++ /src/ui/classic/fcitx-skin-installer.sh
-@@ -25,7 +25,7 @@
-     }
- fi
- 
--if type gettext > /dev/null 2>&1; then
-+if which gettext > /dev/null 2>&1; then
-     _() {
-         gettext "$@"
-     }
diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.3-restart.patch b/app-i18n/fcitx/files/fcitx-4.2.9.3-restart.patch
deleted file mode 100644
index b71bdac9461a..000000000000
--- a/app-i18n/fcitx/files/fcitx-4.2.9.3-restart.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/fcitx/fcitx/issues/362
-https://github.com/fcitx/fcitx/commit/82202f6b81361263693f07ae17c55c8ce048b220
-
---- /src/lib/fcitx/instance.c
-+++ /src/lib/fcitx/instance.c
-@@ -365,6 +365,7 @@
-         setjmp(FcitxRecover);
- 
-         if (instance->destroy || instance->restart) {
-+            FcitxInstanceEnd(instance);
-             FcitxInstanceRealEnd(instance);
-             break;
-         }
diff --git a/app-i18n/kcm-fcitx/Manifest b/app-i18n/kcm-fcitx/Manifest
index b485797c1445..94cb69b079c9 100644
--- a/app-i18n/kcm-fcitx/Manifest
+++ b/app-i18n/kcm-fcitx/Manifest
@@ -1,4 +1,2 @@
-DIST kcm-fcitx-0.4.3.tar.xz 56864 SHA256 b7e9ad4569c0940f9654d58de1f13281fcbcab56febbd346951edcfa0a86e208 SHA512 d311699a5d99f75d353899b7fba0a950491ee8b891724b855033449900ec4b3db9408bb1b80e60ceb0dbb0ce91072162062261a497f83a2a683214b71c3f4713 WHIRLPOOL 04aec049436a120362d02ba900a0d8639feb359b4cc6b99a871c7ffa8d9660270c321828b8660c718890a7f0ea308ea584711ed712762aab712fe8d7e72a205a
-DIST kcm-fcitx-0.5.3.tar.xz 57488 SHA256 f2de5fa4e31a96fea059e4d390c6f1d6fdc98af572c19a0e84cf6181da7c2935 SHA512 19d172cbf1d2a13f289b64b67488ddc5ba83a9d26503438045271c85df3775715614951652dc6f8da52a3b9d692d6e2138a760fc51d1e7f0f8bb0bd467265496 WHIRLPOOL 7be5cfb389bfcf5f451b5619c0818afeaa7b88199375b2f5d85bdcc21b1259008a3653f1cd26e33689a9f18130bc53269dceb20fca5b64aaa8f619e06f2d413e
-DIST kcm-fcitx-0.5.4.tar.xz 59744 SHA256 ebf81446bd7f9478b421c4ab8b8e050d13a15327a3b6cde93cf62ed09a697402 SHA512 349fe50303e027f44b53d954c088e441450aad07dac3a1162a5dcf9c445ca9d04bd3c36475c17dab91ed2df9c3c71031d7582e39b85ad0465a816f7fc24ac0bd WHIRLPOOL e7d9bcad0e1fbe1cb576f69a82e26b4e910e930003b51940cafc5ddcef65eaab0b4c608c8ba878b12a101aad811e74cf9546be129f833b3c7cd33c3597b00fbd
-DIST kcm-fcitx-0.5.5.tar.xz 63364 SHA256 fe6ff7fe4df1e6bdbeb53699cfbd654b7b8c8e7bb299f6b8af86618f873a77ba SHA512 e6a7bcad10003a956389ee266cf6d2f3730dafafcdd0bb43de328397749775e5cd305f16fdca2365e246c903677dba042da81a6dfd873aa1be74174e2b0b372e WHIRLPOOL e23eaae17de906000f808b9a21f46c9b8ea529a13a97c0e832dc708ad130e4668852c46ba92bb16e0f956664932ba38dd650eefcf8fd1f128a4e9de87a36f4c7
+DIST kcm-fcitx-0.4.3.tar.xz 56864 BLAKE2B 29fd64075273b08f4bf36d7f5c63b3548dbbb5ad408f0e48920b6665c7389c408aa3d4b3a88d9299bd29b26fcf06562a21dd739444a444ed4d7bfb56edf3715a SHA512 d311699a5d99f75d353899b7fba0a950491ee8b891724b855033449900ec4b3db9408bb1b80e60ceb0dbb0ce91072162062261a497f83a2a683214b71c3f4713
+DIST kcm-fcitx-0.5.5.tar.xz 63364 BLAKE2B e3b185468a4587c510e47bee4d7260d5d9ed27032174e3928ed3f008a68e8a4b9d124bda14a75348d65c41ddff2e39bb91d8a4f3663a81788850e5fb33740c8a SHA512 e6a7bcad10003a956389ee266cf6d2f3730dafafcdd0bb43de328397749775e5cd305f16fdca2365e246c903677dba042da81a6dfd873aa1be74174e2b0b372e
diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.3.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.3.ebuild
deleted file mode 100644
index 98f3ec001e9b..000000000000
--- a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/kcm-fcitx"
-fi
-
-DESCRIPTION="KDE configuration module for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/kcm-fcitx"
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2+"
-SLOT="4-plasma5"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	app-i18n/fcitx-qt5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	kde-frameworks/kcmutils:5
-	kde-frameworks/kcoreaddons:5
-	kde-frameworks/ki18n:5
-	kde-frameworks/kio:5
-	kde-frameworks/kitemviews:5
-	kde-frameworks/knewstuff:5
-	kde-frameworks/kwidgetsaddons:5
-	virtual/libintl
-	!${CATEGORY}/${PN}:4[-minimal(-)]"
-DEPEND="${RDEPEND}
-	kde-frameworks/extra-cmake-modules:5
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	# x11-libs/libxkbfile only used by kbd-layout-viewer not ported to Qt 5 / KDE 5.
-	sed -e "/find_package(XkbFile REQUIRED)/d" -i CMakeLists.txt
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDE_INSTALL_USE_QT_SYS_PATHS=yes
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.4.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.4.ebuild
deleted file mode 100644
index 5b2b210ad03a..000000000000
--- a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/kcm-fcitx"
-fi
-
-DESCRIPTION="KDE configuration module for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/kcm-fcitx"
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2+"
-SLOT="4-plasma5"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	>=app-i18n/fcitx-qt5-1.1
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	kde-frameworks/kcompletion:5
-	kde-frameworks/kconfigwidgets:5
-	kde-frameworks/kcoreaddons:5
-	kde-frameworks/ki18n:5
-	kde-frameworks/kio:5
-	kde-frameworks/kitemviews:5
-	kde-frameworks/knewstuff:5
-	kde-frameworks/kwidgetsaddons:5
-	virtual/libintl
-	!${CATEGORY}/${PN}:4[-minimal(-)]"
-DEPEND="${RDEPEND}
-	kde-frameworks/extra-cmake-modules:5
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	# x11-libs/libxkbfile only used by kbd-layout-viewer not ported to Qt 5 / KDE 5.
-	sed -e "/find_package(XkbFile REQUIRED)/d" -i CMakeLists.txt
-
-	# Adjust dependencies to match actual usage.
-	# https://github.com/fcitx/kcm-fcitx/issues/12
-	sed -e "s/KCMUtils/Completion\n    ConfigWidgets/" -i CMakeLists.txt
-	sed -e "s/KF5::KCMUtils/KF5::Completion\n  KF5::ConfigWidgets/" -i src/CMakeLists.txt
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDE_INSTALL_USE_QT_SYS_PATHS=yes
-	)
-
-	cmake-utils_src_configure
-}
author	Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>	2017-11-28 18:02:02 +0100
committer	Mike Gilbert <floppym@gentoo.org>	2017-11-28 13:36:27 -0500
commit	6635ba1924005ba2e0bb614a537d84e8fa74a51b (patch)
tree	12a323fdb11b7f6cb546fe47f888a4cc80537550
parent	net-print/cups: Use correct perms patch. (diff)
download	gentoo-6635ba1924005ba2e0bb614a537d84e8fa74a51b.tar.gz gentoo-6635ba1924005ba2e0bb614a537d84e8fa74a51b.tar.bz2 gentoo-6635ba1924005ba2e0bb614a537d84e8fa74a51b.zip