gentoo resync : 01.12.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-12-01 03:04:39 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-12-01 03:04:39 +0000
commit: 407525b571b48cfd65e1ad7a02d250a927c967c9 (patch)
tree: 844bea44d85dc7218f54970af1c42cc9d55c3f1a /app-i18n
parent: 89c6c06b8c42107dd231687a1012354e7d3039fc (diff)
84 files changed, 61 insertions, 3597 deletions
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 3c5856776446..3b493cb366b9 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/anthy/Manifest b/app-i18n/anthy/Manifest
index a69e7c5d64fb..a49c0eade00d 100644
--- a/app-i18n/anthy/Manifest
+++ b/app-i18n/anthy/Manifest
@@ -1,5 +1,5 @@
 AUX 50anthy-gentoo.el 63 BLAKE2B 8680f0a54f0c16a4d869f52d1589c6af39d29c151a5f7e7182f7afb2417aa5ba2fea002d7638271f486f95931036a1e4e4a83af8d796c3b751760d5750adf1d6 SHA512 ca11bd44d092da07278905555513e8b5215413af64c46cfb9213cbd27948727133c06fb1fcfc1a48d67d196c693ed2835e8dbae142a52ff4dbd5ea8d49e6e65a
 AUX anthy-anthy_context_t.patch 174 BLAKE2B 0a38c7a467b5a0331762fa1083c2dffef8f4c39c8bfbf7ce0ec431f6f865dc8727fac391ff77a6a1cf5e455ca274c78b7a6ebf7a2326ba90c6cd979f8e3c7a3f SHA512 3f252628f77f53dd96eac50f08a36bb782f0ddc37446c1bdd5bd94fffa3454b9adcaff7118d76fdc7e8bc3f86b1a84e9830da5b67b2b0d281847b26ff62cdee3
-DIST anthy-9100h.tar.gz 4446148 SHA256 d256f075f018b4a3cb0d165ed6151fda4ba7db1621727e0eb54569b6e2275547 SHA512 315ebd9e1af208f3ecaeaa13620213b35f004e47edb54e60c3e02c2997444cd2326cc58b725dd2d0bd6a723130884d946ea193ea3d92418082256b59ecc8d88b WHIRLPOOL dfdaa96e19dbd53ad627c40521922c7df74858e9836a770059dbd6005a09e3978bcd46bcd40380360708c4234e91e77d91161064614596047f53020c2c571245
-EBUILD anthy-9100h-r2.ebuild 1266 BLAKE2B 818c91c3d5e80c2cfd8bf3241cefd618184ea3c19e046ea5cdf743c68a772896aebbe67b8fdd792c9ebdb1ad6b02bbb3c4f708421fcc01752e74e3cd873d2999 SHA512 2c64fdbe753e13832682fb54e6c31788941db2c97c144b3c01c84cd0062c0f447877a25314fba498c9747eaa17db1325089f47f47a84e3274b113c64f0708bf1
+DIST anthy-9100h.tar.gz 4446148 BLAKE2B b07da205694db9223c22ebcf6158158247611be41448457ee112766d1ea5fe72eee3f2292276363245d751eb49bd582c39330cc6df5e52547b6188386439d29a SHA512 315ebd9e1af208f3ecaeaa13620213b35f004e47edb54e60c3e02c2997444cd2326cc58b725dd2d0bd6a723130884d946ea193ea3d92418082256b59ecc8d88b
+EBUILD anthy-9100h-r2.ebuild 1265 BLAKE2B ea58ec088edbc1b562e5db32dfe8422279bc17e1e754c690175d558a8cc5ab12fcab521f41de8da055b89bee7a147e1437ea525a226a481c71a58001eb155bb0 SHA512 1a763145c8d998582583e3c64c2025890e002dc65889d031bdc4c474ef2d11e6cd2f1d76b946ef1061f6d984158e1e9ed98520595fe705f91fe5c8af027d9b1c
 MISC metadata.xml 903 BLAKE2B 29e0a9ae0eb05a56ce23659a1693e7d118bb5f7803170e4df02a0515adb841a26c66bf652baea4d921f613424863168500ce69b7282f027fd6a9d6cc7a66f9fa SHA512 6fed9f2dd2b723292db8348fa4977659600b2d755f74bdfd7d9007b60d2c505473af01f5277d41155e9cdee6243d6e8faf9254c9e6963787509ea4a3f37117c9
diff --git a/app-i18n/anthy/anthy-9100h-r2.ebuild b/app-i18n/anthy/anthy-9100h-r2.ebuild
index ae7019d26861..45d7ba0deb52 100644
--- a/app-i18n/anthy/anthy-9100h-r2.ebuild
+++ b/app-i18n/anthy/anthy-9100h-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/37536/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="canna-2ch emacs static-libs"
 
 RDEPEND="canna-2ch? ( app-dicts/canna-2ch )
diff --git a/app-i18n/fcitx-anthy/Manifest b/app-i18n/fcitx-anthy/Manifest
index 2972e51536a7..5e3c2e7a08ec 100644
--- a/app-i18n/fcitx-anthy/Manifest
+++ b/app-i18n/fcitx-anthy/Manifest
@@ -1,10 +1,4 @@
-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
-EBUILD fcitx-anthy-0.1.1.ebuild 546 BLAKE2B 6beba0979e2bbaedb2f2280d9b6892bbcabb43f179f2cc08751015c462e87e940e6fe372c8e53f11c4a10e85e940e64d93806d483b39971aa5d29b94b50d5f6b SHA512 3fece6bb17e588880cab84dd6f53842fe7aae0e91d9c008412ec601c7552c27714e3641b63f3b74a55f7bb1d9535f9868d6508cb0e3f72f8ecdb3622b77e5c7d
-EBUILD fcitx-anthy-0.2.1.ebuild 555 BLAKE2B de32e7dc6488274022a5fb493d577b112bce371e057c9142321792f69e8e9d3eebac6ee2182c58f75555b6fe76e6d6f4676646971cbc218fecf3e9551ce57b89 SHA512 0a3ca967059895b76ee2b1f60ed1e28e2646deca2988a62241035017ccf264f0cebe920c18ffb23e33916e11fcbb2f274f0a0ad234f192b5b2ecbde88c6e3161
-EBUILD fcitx-anthy-0.2.2.ebuild 557 BLAKE2B 7c29dc954834b3d53e0fcdec1773080a6f9df003ebbbb7b4e5d85b4f1381e32ac927d53c67f16ea5d78005eef78c40326f3d44e55a6a550f74206c8d9fb15785 SHA512 0143cadaa44bae98e47f5539ee9cc6d762840cf4c786994d2ad6928c5d5aee723e6a9fc3e05f981d77d8cfdf0da33c0a4b41c50b0a5de7d53920fc0e372b61d4
+DIST fcitx-anthy-0.2.3.tar.xz 78020 BLAKE2B ae054f753dd7d10a0dafd80d67413c29806b6c3b08de9eac3d7eae1d540f01b7bafd22bd9c722a7fc517f1752d90c1c3d82e75aaf58a807daa60b7e9a047d152 SHA512 2769871059053fb370ba84af7cdf0c461d64724a240d58a5a8889cfd9bfb5d145998f79ed2d06a1ae1ab907f9db04fc122bfaf6957ef572fc833e400ffefc642
 EBUILD fcitx-anthy-0.2.3.ebuild 794 BLAKE2B 4150084b54e0e6e9f56056ecedbde76d121a019974c01791b079fac46715f9fff8f6c4089b544d2aa4af04a13410cb45b425da07dfead77729f85a44fe22e5e4 SHA512 191dfcfebe2ef7cf15311c4290a0d9150b894a40edff5435a8cc3576b4be6a2dc3adb50534caea793856efd502b23df9a42c66071402de27cf9c46b275cfde5c
 EBUILD fcitx-anthy-4.9999.ebuild 775 BLAKE2B c7cd12f5aaf316a8a36b4a8c464261cf0178bb55798005ee9e3313f5b4211bec33a81b5451f90e1d3e7e429c43b8dede8ab99cd3d509e9d4541a9e1446b83385 SHA512 a8c73f6c922e1712d5a834ea3518b88b077fde056506600db5450c733be11d2570e2553d65d89fd7647909aff8bfd16c6d53fbfcc50e369974db9fdde71062f9
 MISC metadata.xml 450 BLAKE2B 7b27aad529b9f760cafd38ed497a6a428df9580b0612f40eca157f206bdd145f038973ce2823f42f988af182ea60ebb34abdfa41f5d1b9fcf089ed4f421df8c8 SHA512 6100dad76b1522292d84eac3dacf69890747a6c76cc1c1e519b97f749a6d86ba34d3cfa439b6a529db87df9b4f0a019ac38e616860c6fa734186631dffa75d47
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 b8454c98bec6..0e8e0a865078 100644
--- a/app-i18n/fcitx-chewing/Manifest
+++ b/app-i18n/fcitx-chewing/Manifest
@@ -1,8 +1,4 @@
-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
-EBUILD fcitx-chewing-0.2.0.ebuild 422 BLAKE2B 4ec27268274b5684c40a6c283cc7ec4f3b3f8caaebe2b928ec8148260a0b33855389dbf839baa8ec2be44d1e81387b6ee44ab66dc7372d40f28207122d20410e SHA512 b3f4b15d0a726d20bef5f13e326f22adea8f3bc5666ca322d1f359f51333d9872f0bb89ea53ce2f876c084d1fbb7ddea693b637371cf692ad36c5e252fe81ca1
-EBUILD fcitx-chewing-0.2.2.ebuild 431 BLAKE2B c74116a0b7b993bc8fca292bc77351139d15f044d40b1d41de1df72dbeb88f3495c5af4fb054a3c05ba39084e56dd036f2911df26d00f0a653e6c11327f552ad SHA512 235757c6b38fc73a8720af771adb2b200ec95ee3b0a9aa454ecb2a8ecdb5cd4401ab51d089efb96b076c990c99e91c8ad68401a0b5d44acd5821f9a7bbb1210f
+DIST fcitx-chewing-0.2.3.tar.xz 19804 BLAKE2B 0a83ae9a17eb74898e41471450a9054bb05e504a60d05bda91fa53f90cb4328b0db4bd5e1d662c81c9322268660e57a7f2cb9c547593913206a00394883341b1 SHA512 3492ad6ecaf00bb1ea07b76c9c23da075615597c1a68434a2da003cbe410d12172510d4306379777a1d04a359b017c49d278c002a7230b030693b668b6030bfd
 EBUILD fcitx-chewing-0.2.3.ebuild 804 BLAKE2B ced7bb5b6c6ebbc42481ffe5fd7a9027cb80e8b04378881e1df1af3c7ae51b2c6a88cb7a916d1ccf812dfed8189eaf4dbfdda9e00882cf8b146db9c4b5b5578d SHA512 5e7aeef998e5c6f7efb08b66ca8b88be88732b159cc1d35dad94a5d2ac45fea83ce68aeb315a8a8d179553f222fa4ad1dfe560bbb719fa7a93a2c9c838ed2127
 EBUILD fcitx-chewing-4.9999.ebuild 785 BLAKE2B 7c9c2074e718e77424b163910e72250afa4e4e0c84b6bd777197e252737b59b647c351afd12f8a11be5d5f3ea5ee2fd7cc0836d6067f2e6d22721173352621a0 SHA512 0f294bfd3c8d5b071f1035eff39e802b4f51aa00034f83507c6b30bca975da223b010f1ad933cd9326ee81efb837918bd4031523b455cab46730a6b44b1836f3
 MISC metadata.xml 452 BLAKE2B 9fcd460dbcff6b2c7739019a6a51f1e65d8ed2d215c8ecf4c7b0f60b7286e9e46c5f9e190d9c968ea1216f43dc5da9fb297cf188b514a02068279eed349b8bc2 SHA512 b4a1540d3993d402fb63dcf4e4f45d5812bcec85ce0635830af088afb74a1214a81e75dfdbf6ba408b3ec2ecc9b98b6e6f76298e5f818f945b7ce88717be62e5
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 3839b310ae3d..e591d8d3e5df 100644
--- a/app-i18n/fcitx-cloudpinyin/Manifest
+++ b/app-i18n/fcitx-cloudpinyin/Manifest
@@ -1,8 +1,6 @@
-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
-EBUILD fcitx-cloudpinyin-0.3.1.ebuild 494 BLAKE2B 9f0b71a00bfa7b44360fdb1969e9d7349cf3763fe733e25553d0a97017a93e7f512586176883ddffe24211474e46a30d047878bc6c3683f54835a2fb8cfa2503 SHA512 a4048142501cc6683b4427127c7c0fa188c99f3e33dfd04783007ccc87a967e86923a8ec17cdfe835d53184bd3628e482ac0f52e75d12af2e5e1ada09ff569aa
-EBUILD fcitx-cloudpinyin-0.3.4.ebuild 495 BLAKE2B 8593294d88b203eca293965d4e3356a7f6af1e5ea46875185c98792ef6577b30a3c9ab33ab97e07fc3205f5b0850120d4daa393e42c32c4ee499919ab2013b85 SHA512 37d21184dbba30e7a33c802f8bd22077d97608d882b55f441e273a568bfff2fe0dcd60c6794a93d0595b767555dafbc1e52f9f56ab4e7ccf6344b276554cb7c0
+DIST fcitx-cloudpinyin-0.3.5.tar.xz 22424 BLAKE2B 9f44bf3a16681d994a8f202c7b9ba5bcb14a77c70e6e854626df675f647582632b6b4c110cf315fe376a6dd876607fe815d57d07361e219ddc11222ad1a95d6c SHA512 b56cde4955fab02d204cfe937b46aeb5b6adf9e4eb4fead6e7b8e0b5cd1ebce06a0de3f9d477a1cb58eb077655f17975b7e13951074d1766b283b86eeb5b276e
+DIST fcitx-cloudpinyin-0.3.6.tar.xz 22596 BLAKE2B e53f64dc999eb1ffb1d3c37b6ed75272da9a76d196df681b71876281ded778f83c73eef2f9100233f580a389e36bfc8681cd7be5e23ce4d9c27c26384062cf9a SHA512 d3a05fc48659db64a0a827c9b75cfb8b33f7cdb48bd936a2ba33f49469e29558a7da0f58cb7e6929b1265d451d23b0a37d87b7b69752599656c94049077d9914
 EBUILD fcitx-cloudpinyin-0.3.5.ebuild 735 BLAKE2B 8bdc4639220467f736b4279261d6503672eaa47cb0503b17d45c9e238c00d252a42e29cdc75ab0bd00a2f1b35bb4d4ba870aeaf0bc6bf8ccfc22570d822a3659 SHA512 f49bd32b4d8131934d4e7b48568fe22f6d981e35f15d52f11d20fb9673465d3ff2199dccc30e1625ea49e40f2ca94ebd84e1f5f2f0aaced9382aba590e98bd5c
+EBUILD fcitx-cloudpinyin-0.3.6.ebuild 739 BLAKE2B 78e9ecbea0f2b4389b5af0dcaa9ce1b5015db5afe6734171fbe8870f1cb1c04c33497844bdd10fd30771031e74a1367d0ffefda092d50ab291ffe8dab78dce83 SHA512 c55e0be75dfd53744d1012e084d6d0839644025fd092d97bbe04f356f59401f557bb216e1ea151c55e79ec9b3d115d438005f89fa4a6417af041a01d69e04cb7
 EBUILD fcitx-cloudpinyin-4.9999.ebuild 716 BLAKE2B 3d539d407c980eb098ab9465118f5887e9c7fc1a2422f1313d2726aaa7de250074b125a8f6a1d687e482fbce2f09efdfa4151a16327f4355ebbe9591185533a5 SHA512 fb16336058eda6ebd85001efa3f515eadc7dae11d0c0009015fa59a25ce51261cd005dd96b01004a1528e8f31430a39e73bc378035fa188ea30db310e8a33338
 MISC metadata.xml 456 BLAKE2B e7aea5104a7beb0c6d879e801dd4988557759cc89cb48331dfe64b5cb336da07eb5ca0db77fd07f70e2b035a556b41327a1a619a12fd1a80480e0be40373c227 SHA512 d101b830ffa54146258fa424d14129c3693abe3e64582a3fecae2add16d0928d4d18642ff5c5816227cd458862dde6778d679a9cdf8605187862c657060f63ca
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/fcitx-configtool-0.4.9.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
index 871b14fd1c26..8991ceab3f88 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.9.ebuild
+++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
@@ -5,15 +5,15 @@ EAPI="6"
 
 inherit cmake-utils
 
-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
 
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx-configtool"
+	EGIT_REPO_URI="https://github.com/fcitx/fcitx-cloudpinyin"
 fi
 
-DESCRIPTION="GTK+ GUI configuration tool for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-configtool"
-if [[ "${PV}" == "9999" ]]; then
+DESCRIPTION="Internet look-up support for Chinese Pinyin input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-cloudpinyin"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
@@ -24,20 +24,11 @@ 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"
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	net-misc/curl:=
+	virtual/libiconv
+	virtual/libintl"
 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/Manifest b/app-i18n/fcitx-configtool/Manifest
index 4a49ccd0ccd1..45d7587da9cf 100644
--- a/app-i18n/fcitx-configtool/Manifest
+++ b/app-i18n/fcitx-configtool/Manifest
@@ -1,10 +1,4 @@
-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
 EBUILD fcitx-configtool-0.4.10.ebuild 827 BLAKE2B 5368682a0aaac1e504a7a5d4d1c951f1efa5b30843c6e6220c2f7569b8e23bf0c1b623cbc23f5a408fafca1458e4b0d80475a8a03cb6104afcf00284f5df8404 SHA512 7c1fc9ac08a20a1f307bb5c40bc70b15366e4cf59877cb11e645375ad75afc42d5431fb87477f1403e9c62294cde0eed1dadd0855990f38f36be3bc9bd8b5dfd
-EBUILD fcitx-configtool-0.4.6.ebuild 735 BLAKE2B e24de9d59ba8356d807ca088d027342843fcfc38288d59dccee204c54c1266153d5432da574a44b6040b9a7f78a8ad80defba3b8f17f0fb14bde9a261fd8c006 SHA512 901003da2ddfef080860b1a4365b95952aac85c0364738b40398daf71fc32f69c3f1477f3a5cac21bd4260f5aca162fe21209564711a8f254b2ae03b8ba8d0a7
-EBUILD fcitx-configtool-0.4.8.ebuild 735 BLAKE2B 2427171cb3123db91b231cc0147f0a568785bafa1a0a6766e9781ccc90166260733167000c2d802ab186e4dcfc46402af9ebe74299f3e274ec75c09e4ace5414 SHA512 71b4fdfbe5fad660ef83fa3941bd704ae8c71dc62fc42619958d376c33f6bd5235b41951a55700fd1d4004564dfaf896bad18c9d47800c79a5a593157d5ae977
-EBUILD fcitx-configtool-0.4.9.ebuild 809 BLAKE2B 6920c7cada54ea7fdfb6fb2bd668479da2974f8b37650c7c1ff5343c6280899179dee747525eafa5a2019dc156285e38fec8d7446f69bb832f75f6127bd14034 SHA512 d67406a9d177b1e44d70f84b54887d268d3db2c71dd2bed3373943e08e953aeb8ea664cf861c3ddc394b2f41d58de86422b24984e3329280318bcac3ff9c1e6a
 EBUILD fcitx-configtool-4.9999.ebuild 808 BLAKE2B d053e6201acfaa68e6671a665651c9f4c7a701e20698eac4d3fd293ef0c1434bb7cec05e23c148c339c5b40c4ea107f4d62ebe34f722d18a23c6c488f680c20a SHA512 6767d4349e1baa4060bd62bab03abe20b6f0050507d81c80ec4ef1e35ffe3c9d143ad47e51610554b514c470a1a8bed162e5e6cf76d34686333a52c091ec3457
-MISC metadata.xml 520 BLAKE2B 4af46a7eb98f9bd7837838ae1d3617915a7928ad87766de8021924cf65f4a76fac9cd81e796401a36947aae56e84d7a5040941d745a2480f8ec72e25fb5bcc34 SHA512 3c6521342c319563317575bbd5ad69c3f904ed7e0354ebfb059e20c64be93b5b89c62f9b05537524af02e90a8a3ed39abefd46fae331dc3be7b1180febc916b3
+MISC metadata.xml 455 BLAKE2B 89268d866dde8861e25a631d76d7053a6e847134d02195aa883952b79a0f81742c4cad0f8938b0eb180240d5e95ff1c73b7c673d9a3b2dafd0b28f20e186589c SHA512 5fb4ff1f8fe55ba75d4609791f0f41cfe8728000cd0d5bf07d3f4df99bf375ab23f15cfd0754b032b333d67c7cfef6a13daa007d81a67b8be0b27454b7e7548e
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/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 ef19e2f90e24..4dbd212a44eb 100644
--- a/app-i18n/fcitx-hangul/Manifest
+++ b/app-i18n/fcitx-hangul/Manifest
@@ -1,8 +1,4 @@
-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
-EBUILD fcitx-hangul-0.2.1.ebuild 549 BLAKE2B 7a5f58ad16970eca46679ede966da74d749ca89957f30c6e5947f025e0f129a6d284ebad4255e2fc8a67b3b0a9833ded2caeda31836ce3ab97ac3fbd291d1f38 SHA512 af4427e1a59ab8a963e585f2e9363feba2e2e4fa206b2fac848c011a88c1a3ff6ed569394ec4f6f9078895981ded64cc658427177f9f274574f8952a8b147d0c
-EBUILD fcitx-hangul-0.3.0.ebuild 550 BLAKE2B 59397a5bff225819af4d515469ae31fed7c03a78331e75fdce31137f09d055c16286b5e9b524e03183cb4993f5bede3f550f8aab83e406db9d2f3c0ebfba934d SHA512 2fc1d3fe285052e91d49bcbc303107261fdb3532c71c0403b47875cd191d0fd9b01eb9ea204f0669a2fddb19dccaaf436d2ff9b3ebe00e7187f4005c3c9f5a1f
+DIST fcitx-hangul-0.3.1.tar.xz 26612 BLAKE2B 59770762ecbd5027d9010d99037881c576f638d30cf22234e5b110e9264637c3ff2049fbf8c7e44ca27acebff5668b2eefee5aeff78622ccb338ff68abc42490 SHA512 6ad2e34644c9246490a91342a11b186d40702f7e587beeb056ad98538da50dbf9fdc9f298e5b379bef50f63ad5be5da79ba84e60a22b57c330d0a68dd5bf5ca6
 EBUILD fcitx-hangul-0.3.1.ebuild 832 BLAKE2B 70e8873b07aa158d275fa66cdd36e4e2f55d567a25362706469afa7f316726da996c8010f98859ae3169246e7215342d5f24f8e2ff98145e875af1487a5d3f14 SHA512 b1c86764e1586136c2a406f42957e019141819fd33e1ce72f2376be1e7fd9c19b192b8bdfd3172aaa2e9943681afac99763b9f0f1e9fb9862000476186bc51cf
 EBUILD fcitx-hangul-4.9999.ebuild 813 BLAKE2B 68b34378c2ed1acf148ab39feed7565912106400f728fee7eb3df2379da0b9b077c3828d54324b78ea3895735b2e9cda1e03b1bdbdc3c4fd66850025949e647c SHA512 41680514b5b433fb70db9cd2c71536f233678de0775b93a23dcc34021ab8f72e50cb34bdb29ec9b94311731991638f65abde70d33f22e1c3e14aa94aee356ad5
 MISC metadata.xml 451 BLAKE2B 23aaffbadede41a5f006329aaa18e9c9938545b19bc11cd391c37e52581d501abecd44877197a129bb570fb97d0b97bfa205f5dfcf355163e325624c28feed39 SHA512 71946f56143f4b7e4a7a4b032f36d95a94ab5c6a78a8f89860233a0e3b2a5c57088d9312a936316af0035ce2058c473595eb89cd5cd699cc2c86ad57be699891
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 5828db6dadb1..f7882d4ff08a 100644
--- a/app-i18n/fcitx-libpinyin/Manifest
+++ b/app-i18n/fcitx-libpinyin/Manifest
@@ -1,15 +1,5 @@
-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
-EBUILD fcitx-libpinyin-0.2.1.ebuild 574 BLAKE2B 09cfa826f887705cddb6b461b5da61290cd3b0490e2352bee022d689928058cce836912ac7a4fdfbfe55e6c780142f2e840f2ffc61707e0c5ff235292bf9fa15 SHA512 6f62f8b50fdd62cfef0db8992e2769b6779559ba97321a5a2bb22f75aed4babbac443b0efbbc4bf0d9d26dbfc1e12a6af19cf13506215465f666e3639da207ae
-EBUILD fcitx-libpinyin-0.3.1.ebuild 818 BLAKE2B 6eae18543e7f36a43949764c48405749dafd141a80bfd57b1570dec99d69152f021b22539fdaf75f8053d8396860ad598e66eaa7e7134507a983227123fdbad6 SHA512 d708c83d3f619dd6cf6cb7f3aea2e59e57f5c49c7c7893b23b2ec1d39189aa00b49089122b6e21084afd101678ad4f4ca173047daf08f705d358c6cde041e2ab
-EBUILD fcitx-libpinyin-0.3.3.ebuild 852 BLAKE2B 3b6da2996bf0607841cf9498cb5176b8e72f6479f01eaa1d0df3ea1c2b8c0664f78912ccad7297d092305c8b4a8904dbab526eca786c862d8171adb250f7ad8a SHA512 98a2eb59e38dca3ddbcfcbf6d800eeea056e3fd254a6abf7bf608e8351d131d4a2d02532bfb5e9176b6a3fdd8b1f8901ed5f71e23baf6e68581bd071d4bffde1
-EBUILD fcitx-libpinyin-0.5.1.ebuild 1462 BLAKE2B 96a171a620917f18d88aa0290f637020829a43e0c02667ff711c93ba399216873a6067208023ec3a783ddf480e0e58ce58e661c6ee78f68b0c094e71f4524a5c SHA512 56c8f9431d430ffae74466cf63c4d694a41f479d18630d44baffb5ea1babd2841b8653869d3c8c0ea0ecfcbf11eb6e1b49e34c56c56b58f8e917c66f27edb55b
-EBUILD fcitx-libpinyin-0.5.2.ebuild 1477 BLAKE2B 11dc636fd17f5d93caf9110074b2454b45417d822400ce6bf5b50ba2d7a1ce2534b2f5cdefc982d506cbb0385e75ade6f3e36282a3fc2edb26eeec416f51ac6c SHA512 f7b8c6bba8b572904778037f2e5d5a79312d11ba1f7402a73773276a3fff8cbe6e269e722d795f98619ae70871c2bf2e6a9f0c355eea2151892a9c9efbe2ba3a
+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
 EBUILD fcitx-libpinyin-0.5.3.ebuild 1492 BLAKE2B 91b2f7f5f6bfbbd837bf6dacdc32f090c1710c2afed883bf15573e7a04657228cead28ddb9523ccbd314511622314f7be4bdc6f23ff0d47514e5cb306cc6dbbc SHA512 1d877650eaa8908e94ead9f9169c0f4283e3f86309b77d60daeb4481d0fb09e1223002956ced2df8c20eed4924249bae4371eec40fcbaab5cda6a1420c1890a1
 EBUILD fcitx-libpinyin-4.9999.ebuild 1473 BLAKE2B 0d8bae9069312d24d3d09b7671fd8230129b55766e74f042807eea0490d00d0cf32de8fea2b6bf21fd95576011c2f2a83e0aa00c9a00b6d78efc06624be6d851 SHA512 fe16051864f4aba0516bb5e82602283bdacd100d900f64f3e5b71537825888ad2a269b1a4064008879cdd62ebd8df472edc881df4bbc312853c7d92a8505cffb
 MISC metadata.xml 537 BLAKE2B d60daacfeb2a33824bd399d144ea7bd9a99a6a96062df226d4de0b674387df563a1294366b0cb2e216c33b321680f00adc88905167508898f6c3a37d6f0c1bfe SHA512 32e4b2319df016e83055699ada867d1e1aba7b09d26308f03143df986e6aaadf77243da97894d33282ad7d1a7ee881723a4eadcac6f4573fce05ba3700a10609
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 4aeddd506e25..d92c1da409fd 100644
--- a/app-i18n/fcitx-m17n/Manifest
+++ b/app-i18n/fcitx-m17n/Manifest
@@ -1,7 +1,5 @@
 AUX fcitx-m17n-0.2.3-memory_leak.patch 473 BLAKE2B 8d50f4c2a820a8077cdd1c15942b84e3bbcbd821ac970ed38488289cb92a9c6fc7d1506e43f1bbfc328fb1855c28d974f50d6710bec3cc48c1ae01ff6dc21405 SHA512 e279f122ed3fd4bb2a665464e8cfac4def16ebbfd5ce36bd4d8b401147bbf88c0d6915ca7604907269b530e54fbb94da7953288114d0339fbc5fda3c0c762a8d
-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
-EBUILD fcitx-m17n-0.2.3.ebuild 727 BLAKE2B e497c72ce912de4b2e711ca4aa409f3c2e982708ea6185e207e14218e9574798b29bf725554a27798b78c9974d58f2bbce039366858f1ef856119051d14d27a5 SHA512 1543c23bc95a8a06814bb42d34cef341e8b93e02b9dd2ae33116b9edcf7ee17670d539f5f7caaeb4874e239bd162c7c96f6a60aa1c90d7e6c606a26c290f9c64
+DIST fcitx-m17n-0.2.4.tar.xz 35076 BLAKE2B c53c8ee8156b49607cd5bd951eb031e2dccb6a18bcdafcbfd17ebf07506c750414abac3f2dd5965fdd8b154df9c16820850f61d07cd38745db0af89ccf2acfff SHA512 b7c483e9c88e58a47ead294c36ed182558f09b41996e97faaba9fd3a96612f6a0fc240fdcb95db9a08c1546abe5fc97337957e2124844bd011363b7468f6e112
 EBUILD fcitx-m17n-0.2.4.ebuild 684 BLAKE2B a8c3e8060aeed7ffdcfba613fbbd8e15dc66bbdb40910d6794f2841ce5496f7da2f6f27f3656ba3962fe2d7a0228981e63ea879b6ede2cd70a1acd95c6ef86a3 SHA512 5d4e256c65ad8c8a94db686428b38922453e47bf95f58e79d75544739262fab2562ec420b38c802df42199f8bf0bd3e56408c8595cebb0497fbb6820fafdf57a
 EBUILD fcitx-m17n-4.9999.ebuild 659 BLAKE2B 0d8148d1a95d711989d634dd775df8bbc95854c14f790aa641d5ca6bf555ee60cba64d183b806ef69c8df751b2a67b5a0a7eb59087ad334c1b1f6bcde894559a SHA512 8958033c23147637814528395f94bad019a3bb130270611a8cc4204cb503f34b6193fcb2a39532588831d99f24e5ead64f791d3e765875c2c108334a8123d694
 MISC metadata.xml 449 BLAKE2B e146ed29ed13e93285bfdc7a08000f72888b3208c1d5a2d2cf301f613e6b2530499ced88b292ec74d81fd0d2af9e0a01b8f07358bd8d39f4d0de23fb986b0f49 SHA512 97c79c2a23d736128429846b87000d52f815e3b32999ea0ca3ee1be2d6281ff6aeb2208d1340e74414a5b5e31e06e3675292e307960d088767c09c252f5d87ef
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 a1f29e482908..16af65089723 100644
--- a/app-i18n/fcitx-qt5/Manifest
+++ b/app-i18n/fcitx-qt5/Manifest
@@ -1,13 +1,8 @@
-AUX fcitx-qt5-1.0.5-ucs4.patch 3776 BLAKE2B 25ff6c08814ea0cc174ecb2a0b454ad66dfd2fbe6ef74b88d5bb6b612c847cf405a76662de6a66b8f6027d4ae49069780f5ba04bb65ab9db4db73ff1435a7415 SHA512 8c604f95ab49e99cbbc701a5dff619d5940b3e7dceadad93ca16998f8d87eba9995f4ef55c51df2ba2894e4b38575c751617481d3de310da15f6398af53f61d5
-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
-EBUILD fcitx-qt5-1.0.5.ebuild 860 BLAKE2B ee13a63fb2e97a53158c65665c4bca11c1b30c359d072bf4ea451aecdd96d97d8478261570b624d82a5814d278fa654df7699192e556a158f47256ea186b9829 SHA512 08f085874b6e2681846ba6abc3a88f8d21e13e009197e3b2955f920f74f8c6a5778d565ca5d8ec8a0ffcda130b4620b3c7b05f068704493f33a583fce366fb8c
-EBUILD fcitx-qt5-1.0.6.ebuild 818 BLAKE2B 48028485bd784b2283d370f1c7eac0d064a8b8aafdfb31fc6f8be9590cc3160b7592224ca8fcdc944b091f9d9e469b86a7940c848eafd789c8db62e3354fee3f SHA512 47626df5ea35a0ed011d12589a95aaf71ef0c59f6070efcf310e64c0de8a3ff5fa77e014e6cfac2cad6694ace40a7fcb313de6d51cd92b83b3e44ba8fcfbd824
-EBUILD fcitx-qt5-1.1.0.ebuild 816 BLAKE2B 7f837ec5701c7d707725976f6e795fe6f21c116a7c724ed54a99c05c2d49a38e4b2d8fedcbe1d3ab947d3d46bf938b5fc4130f387592da5a087b170630e5b586 SHA512 d25fb2bfb7706cba12f36a8cd40b420d94c01cfbd5f177b1dee41e8ad3d259fdefe4da1dd0aed40dd8016f9ebf7ec4364812f21678678ad07d8c771bb8e3dcee
+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
+DIST fcitx-qt5-1.2.1.tar.xz 134304 BLAKE2B c158b20bdcb287e9cb52aa74d6a7f66f113a759538b6748b1d38dcbb2213956e88dec54ed29307427d45d84861654bf5e70c9effba70d88738bf0a1a664cc3cd SHA512 0fd726974492e173084e29d3308aa1d97141a1e4034b7192cf505391540533eff473849929e931e4a84589d233fefac70cbd9c122cf6d0d0de412150cad1b1d3
 EBUILD fcitx-qt5-1.1.1.ebuild 846 BLAKE2B 2473b95b1dac058ab06d279c79de3cbf8d211439173ff31faaa2cfbef1f4050e257903f47f99b08aab01f7541600dc3ba2e6db393635e60a395db799d5202f52 SHA512 1fdcacc24874adc4ffd7e110265fc029eaf3c2a6e5ef4a427d161f091081e5e8f76d1b9e03f3b3e873ac2e7f2852fecf3e7e0572556e8de23493ee46b2daa4a7
 EBUILD fcitx-qt5-1.2.0.ebuild 872 BLAKE2B b7a400a699a427eecfe044c5aaf0a2521e959ca26b1fe7be59a75c1295d9408ccfdc8f717ef85ec955e7c7af054a9af15292c723388944ec8965ab695cb4bc57 SHA512 93a1876b5b9684f9c624dca1e50b980e37017714cd5bdd24625c51a2a0bff4dcb265a1e7175325ce6faefe509460cc99440d5d6b6928741eb20ace4f39426af2
+EBUILD fcitx-qt5-1.2.1.ebuild 877 BLAKE2B 2da08645fa891ce19efbc3fc69049c19bd9e9d547604c3e23e66484e7a87e3ee067eddd0d07215c6d2ea3046e940d5e4eb9359bc1c484718037f7910a49520ae SHA512 947a7cd11661dcb1aa5e55724e8808d20300ffe49e5653ca19b2ca98c6c52fc32cd705173b20fe014ead0eecd076a1affaf33db1509ab4dea51f42bfb7c1db58
 EBUILD fcitx-qt5-4.9999.ebuild 848 BLAKE2B 9dcd52abba77d2b9679721edc4c5d4614182739cd59912d4a058d2ed56cd34478b934f783aa03d4bdc2912047fb269859d298b91d7f943053c43dd0524948ca0 SHA512 2b13a220dbf44f0acd6872961930dd9f01374bcd4c54c1b668dd49dc1129039a87a620e37cbc04c091a6fdb06837fb75ef8b7c171e030457ee239201dd4426fe
 MISC metadata.xml 448 BLAKE2B 5ce33f3716f2b2d13353f7393c8c406d4025e03c7c6856cf6aae6d3337b566c70fa1bd90be5c8f6e34b940c55dad1803639101b8266b9b91d405611742698f12 SHA512 37fc515507954a58b16c0fc81ddfe1b24ac21db88b7cd858ef14167526ec48ddfaa144ac5653bf9c5fffdc148ecbeb82ae57b807822c8f85a5cf90d3c81bd6a4
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/fcitx-qt5-1.0.5.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.1.ebuild
index 4c3c996c6d6f..a7aa45d5e1dd 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.0.5.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.1.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit cmake-utils
 
-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5"
@@ -13,19 +13,19 @@ fi
 
 DESCRIPTION="Fcitx input method module for Qt 5"
 HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5"
-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
 fi
 
-LICENSE="GPL-2+"
+LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+"
 SLOT="4"
-KEYWORDS="amd64 ~hppa ~ppc64 x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 # Private headers of dev-qt/qtgui:5 used.
-RDEPEND=">=app-i18n/fcitx-4.2.8
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5=
@@ -33,11 +33,8 @@ RDEPEND=">=app-i18n/fcitx-4.2.8
 	virtual/libintl
 	x11-libs/libxkbcommon"
 DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
 	kde-frameworks/extra-cmake-modules:5
 	virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}/${P}-ucs4.patch"
-)
-
 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 e9f00bc533c3..df7f77f8a424 100644
--- a/app-i18n/fcitx-rime/Manifest
+++ b/app-i18n/fcitx-rime/Manifest
@@ -1,8 +1,4 @@
-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
-EBUILD fcitx-rime-0.2.0.ebuild 707 BLAKE2B af45af6afd7790529b75ec97e31bf365481a760d7936d5fd22ddef662aef85347b76be50e06b8bcbc37d3f9434fa60755363248eed262f66cb719b37990e0646 SHA512 3d7c15177bb138a676dc388d2f4db78e58ed0df7458412a36f7957833d6b16858f95eaa34b8d68b1cab96e5b156a4b00b220f45ee8410ab251d1b074eae9d5f9
-EBUILD fcitx-rime-0.3.1.ebuild 716 BLAKE2B 5cdec0cc4ab462d40fd5d487ef2199cfaddec6dce3fef3a60d4d1df8c24e18ba67e6e4671450737f64fca19c70834e01be454756611ac8d913c21300ff70666a SHA512 8e22c660c8cc0fd218a7a0ca735aee10f965013ee7e7e96b66d57afe197e474b7280406e0c1e3110fd2b512c21f5711774d5a01916efffd11f60ffe55cfcc359
+DIST fcitx-rime-0.3.2.tar.xz 40960 BLAKE2B 1c9185dd9d2912e74b9916916fed09a01c30e0867d93fe94e04d5324883783dddbdca0f553d80aa19e2e59d2ec8fd2a50a7f89118c22cb09310296292a566760 SHA512 8c6d845b0899d9b8b9b41b895abd5c1b8916856b71f529aabd08d1c27a2b09bb5a9343912d088da460c2e22da0a3ce759a34fd13099a149bb8cd1ff4eafe29f1
 EBUILD fcitx-rime-0.3.2.ebuild 928 BLAKE2B 497a1711ca67fac4bc954557802141844820cd592574dbf9364073cc1c090913771f7230a081c94648935ab17494ae56620efd60579a16e49da27086ba9854b9 SHA512 b37b95bd7f889fab9139a2603ade1e8f0e858f8a7e315551fde0762efabd204d42e8bce1e1b042964f7199322df285474448c6a288a3119a534c02a84e04b2ab
 EBUILD fcitx-rime-4.9999.ebuild 909 BLAKE2B f6816924c86279ebd507e1968c8a6ebc9421bdb42c5dbb53b2fbe93d6151559e58c393d8e72ce4b795d5a3901b0954be9521934968c8a0fdb59d2e9d976868b1 SHA512 3a913bba52ef1a2f58084a116f2b255afcd5f225b50ac0f6c8bb9b79a4fa578d9e9c6d7efb9fcb9f3218781199019fab74c5ee374e161dbeaf4f9a5b87a9f658
 MISC metadata.xml 550 BLAKE2B c147c51dc93c2a125a1dbaf3266ba9a7a85f26fc8a9ef5500621060efb58dea85c2b0abbc3c13a3edf14052ede667fb06ccf11063132c7f8c4fd60655ec4a775 SHA512 c22070e9df3fd2a04ce2ec1c1b1ce1b7b90db41abaa80d8dad82064a4bd218afef7d2ceff15e30530d8f95cf7e91cd43cb0da985f2f2312ef5c4c3c228b9f1e4
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 08d126101d0b..72745d28c315 100644
--- a/app-i18n/fcitx-sayura/Manifest
+++ b/app-i18n/fcitx-sayura/Manifest
@@ -1,6 +1,4 @@
-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
-EBUILD fcitx-sayura-0.1.1.ebuild 674 BLAKE2B dbd362676d64ccf14b0f21654227d136e101fc57970193b6fce074e1cf9c47355ee8aa2dbe19fe4b2cbb3164b0b3d62c77d7f0ed3d1ff454c30fbc2a849226ed SHA512 8d1f1aa4ef1b6955058b460d4076af08383421a533c280827c22c32d9303b78e0ea4e3d174f9df332b5b85076563e211445b1c621967d27351c2d3c4ee9a9f4d
+DIST fcitx-sayura-0.1.2.tar.xz 25400 BLAKE2B 6bed1b86499b4448e87cb76c719d8fec3f7af7e5a4a4846ddc30e6e278f5e67c5ee47d39f4e19d3c8c927ce34bf66f51cf189d1147af0e509c3815ba4552a953 SHA512 2118c95d4f831e5f4e0af0549ae3eb4f16bff8b30b03452837bd14f35fcb524f730b27ceb7c14cf6a4db7400a67070929a75465195b5524187e97c7ca02de466
 EBUILD fcitx-sayura-0.1.2.ebuild 787 BLAKE2B 40eaca78c52fd2ad9615a3a995d19a8571c68b69b2232d96cb7cedd3ad97d20764df592d038ede705e12cc3498264f174c362e7b7d0a485576340c746dc26ec3 SHA512 869f8e66b2bc0678fa141b7eb35d42c4c423a28d46ec8f822247961d201bbd3740bc2cf18304aab8e00cb7dab0bb7cfa1b945a02eb4b1057c1d9925f7558d447
 EBUILD fcitx-sayura-4.9999.ebuild 762 BLAKE2B 4359ec3dabe4ba93ac202f5a94ccde6163a90576ffc0ce16ccb547b7c1617aef45efc71588ff037a0219cc782410d348f29a78893386be72adb5847e64c84a48 SHA512 ff1ba3f4f2f96982e328c3911363999e7f3701ff6f9661a978d3e2aeca9aacc57b39dbf8aa4ab3cac763e4014271e945c7f099be6e29b9d52ddf4da02217530f
 MISC metadata.xml 451 BLAKE2B 1e44b5ecebfb78a8f5990a2ea12bdd0ebeea8f64ae3a0554f3c66642e826be215dda70c24d2b6fcde7d7ae2c3d42092b7b0763b9f8405f967d3e09fe8062b3f5 SHA512 d1ba4ff51b06d03e9ff7c13e3f9693c8f91cceaec228f4bd90b560a02be5b42e5fe3d8d7a885816c12b9ef123484537df67f572c0e7bd3d5555f0809132537f1
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 cd21ec17c6a9..14c17a933a71 100644
--- a/app-i18n/fcitx-sunpinyin/Manifest
+++ b/app-i18n/fcitx-sunpinyin/Manifest
@@ -1,9 +1,4 @@
-AUX fcitx-sunpinyin-0.4.0-gcc46-compatible.patch 672 BLAKE2B fe5302fb6dd577b5523203900c9ab448fc727814519ffb29985c617ca4de6915db6e23a93067cbc7c6d87418b73028226c2bfc3b9483cdc5273c350d914f76ba SHA512 67ef866cb6e0a2c16f53249e60ee6df4ba9fd5a5c796d66527efebe68fe32b7da6daa3fd5488a1b4c86523380cc5dd1b51e975261b38cdb6e49e982fe9b18c85
-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
-EBUILD fcitx-sunpinyin-0.4.0.ebuild 619 BLAKE2B 0407e41e749549c41fb7fc58d7c44954c17cfc210b358aac345875c1d2701b4ff781b597ed30d6f658266e89e891b3b0f0d8c982f80a86963a4b0d536a40aa30 SHA512 aed8dea96a1429e08d8f54ad7de27b7b49add7f126a23330230f13c5d0cbaf54a46f01d7569a52d0789b24bada7a0de72424c1b8252bdf7e91c8af8ea2bfe391
-EBUILD fcitx-sunpinyin-0.4.1.ebuild 563 BLAKE2B 6daaa8b560e615be30aaf85b7f98a0e87c823763381b439f14b71f92821952c71461272649fac182fb4b3f5ddce543b54142b81ab7f45c27b00a411be02f8a0e SHA512 e7042ad79158fd8d2b5d06643c75c15c5c676f4fb85ffc4a16041bb5f006b2d3e4f916115b95d73e5279c3c4f41b6c1cd98fbdc2b6058a645bc86460f3e823f2
+DIST fcitx-sunpinyin-0.4.2.tar.xz 42984 BLAKE2B 1f64d96d35c6f455be15a56eb065d97a988f671d40392a3ea3e96fc53b22cf048cff61f406d0e001cc7cfe531a8dc5508ef7862c17253b409330ac2d0af52f7c SHA512 8ade5d94e5227c0b72d2844c09c2699e4b8c66cecbd4107791168d27e15f68b28a4445bf42df7bd6fb44119ec42c5b574293bb417dcde8998578f0debd656a2a
 EBUILD fcitx-sunpinyin-0.4.2.ebuild 815 BLAKE2B 826a592a3683584f8bf6526b2acd358438af8e792acb833e2790038a491f33917e70bc195b25350bd4593de7907af2fead9469036c77e131698f333d81395ed8 SHA512 bb25b07187c7e32a4ddbe98e63647198dc7bb3b71670593618caef20cecd572c3e3d69b2180e034898ef81a750bf325a29efcbab9359a23a0b40353c69f3e5a8
 EBUILD fcitx-sunpinyin-4.9999.ebuild 796 BLAKE2B bacb5f7e911a90455e34875c7c580be2ac5400eb99ec400ab90905e4c81bbb08fe8504fcde74fec236809d388a84e172348b2e50a31adfe27882142b1a5a6891 SHA512 6657692f841ed756ad7c0969eb0fc9f136486e55a97bc880a400d203a5cdf6b42102bef0872bb0b5ce2b067e7b9394267304af24db28a2aadd47dc8b91e65538
 MISC metadata.xml 454 BLAKE2B eece0c6515bdda6ec7f42b7d74152cfc63a3b85df35e7ccc0d2c829539455793907b717c7ed1cf5bc8012ef718d23ccd293bb712fb28f3eba702009c3a57de90 SHA512 4d1a4ccae3b7f553075938c4d59ea3f7eaf65e6e18969a5af3956ab120d6a88e1c5c67f5e91994498750058b54c5f26436be38599bcd22cbb03068307069e4c7
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 d2639e99a246..9e8b0e2e0a7e 100644
--- a/app-i18n/fcitx-table-extra/Manifest
+++ b/app-i18n/fcitx-table-extra/Manifest
@@ -1,10 +1,4 @@
-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
-EBUILD fcitx-table-extra-0.3.3.ebuild 557 BLAKE2B a55ae5c7ba153c9b4accdb800b3657d0795d80b227499d58749871edc9ca66a761a890e686371fa778679475eb711a8219b122ba27c5f0182e26bacab2320d7a SHA512 1f66edb469ae67b439bab0c7e01bb45c3f9429a2a8bde06857e7ee7d6d77571cb52334d96acd429d930558f283608f459c14a189d153b438817c1c54dd36072d
-EBUILD fcitx-table-extra-0.3.6.ebuild 558 BLAKE2B 81ed0215fe3ffa794b3300a1ff04e1137160dfc90fbd50b2496b86734242f124539b0a172fa12cc54b39f40b4831eef065d74a1a36d034a0c414d391a50a281f SHA512 ad38be5004d137d8f2a6f2d8632e8ea88d374e37bdcd3b20f2b1f60e99125d9eb52294cd281fcfa60a712724fdcadaa3d79a9e9b7cc375754e1ad82a13e60060
-EBUILD fcitx-table-extra-0.3.7.ebuild 560 BLAKE2B fe4bc141c5dc4574b8f4b62b3d3afa921cf6e1c9256142ba65077820d62a5db549b426d898ff3eb21f144bafb2c8dade9f222af1b87d80ded719e14ebe714f30 SHA512 1b6e89b0c97284531294808b00dc57147fa855388bf0c8de9e5e5c771e06c90b22260afbdac07cbff41d52fd9161fd1c9b186ee57e85137659306553966ad589
+DIST fcitx-table-extra-0.3.8.tar.xz 3700736 BLAKE2B b8ce4b3aa04eba8b594b86958bb83e348758c30688828a4834643cf7bdd62852c2ca89bc4f75f0cb1b16ce969b0454c58e3abadff9c78318dc0953e0905c75fa SHA512 454798e9bd25c630ce98e2daf7296e82ba5fbc98027171038a5a7b9ac3169c153302a6703d9416718ec3a0b76db6d732caf3f03c6e6005841c9d7798702542df
 EBUILD fcitx-table-extra-0.3.8.ebuild 776 BLAKE2B 40278772768bbe95b0a1a6c3607fa940820471bb83285dbcd5a17376686348dc9774e85e4cbc9abf752ae950a11c97484826a16b1588c974e18b758957718fd9 SHA512 8e16ac5a2c108ae46b65862ce25296fc2c4e74dbf98c39c84734c71d274ba982c0338c715c1901920a2a7787755743b788294c46de33ad71b1e32ed1b744bacd
 EBUILD fcitx-table-extra-4.9999.ebuild 757 BLAKE2B fef94198c70fd700c8c145a4e61f3b765eba12d06e249b3ba2adce2c4d0cfac38807d0c5669a8671a22d951e0ecc9913ecd87e38117b05d41eecc2110e3a4935 SHA512 b584efa38f6457041b4c83501373dce19be53078a4314b1523799637c3b18b7ee5222485527062ad1be15d9b2c65cfe31d17aeb0a3ceb34c6b9473e6c30d82b2
 MISC metadata.xml 456 BLAKE2B cb14969ef6882db359489ce3eb5700179d3eda829e0e1b59bef1227e5083723ff2f5ee5b82ed075250673fbe89b6c97aa2f3ce694a4fc0d89c6a600f5ca9346a SHA512 543a24a29523fc93626c2783c3035e3ffd1f7e850a62d80920c5b62b32cb54ff9e811f5d3c15fe785c967daa78e5da56eb38ef6b773a1cdaa4ab3e8e2a3b3235
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 75fb0869b02f..f22f9d6bcc9a 100644
--- a/app-i18n/fcitx-unikey/Manifest
+++ b/app-i18n/fcitx-unikey/Manifest
@@ -1,13 +1,5 @@
-AUX fcitx-unikey-0.2.0-cmake-qt-option.patch 1664 BLAKE2B 819b1fec880543d046869d1b540e3286467ec19a56a23db162daafdbd8fb31a532957dd16341d3e18bcad4c6f9854b7da349fd52f1cf6077b7eb92bb5748e4ba SHA512 873879e98423c992b2acfae979a7a08ba6ca54788de6f1c909c7aadb91cf29e2f461dfd3e9b32c5e6a348ba2af37a7649384901e68b1ca44be7610347abdaaa4
-AUX fcitx-unikey-0.2.5-c++11.patch 42596 BLAKE2B 92894d4db94643e29964a69b8fb839114fb52f6467aef18f5570823ba660ceda7ba33916bb00f08e823a66cfdf60a2fd0e62a2768791a33568c95b75d163ef56 SHA512 3b4c2fd307952d84b478e78fef92a70d32b71cb2c4f68227813344818dfd4825464fa7789a077a68ac649606cd89f476192aab96bc1724ec7cf1e49df86e0cae
-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
-EBUILD fcitx-unikey-0.2.0.ebuild 763 BLAKE2B 6301c3bbdf23f8c29ae0cd975c969f0b149d5b53fb272db6abe9455b0b4e171766c6ff116299e6b9591b68671fa030d7f4181ca7472a8ccf73d17cbfb103f4d2 SHA512 9203c37b47e975074685483a0cbb5d4efbecb9d77201b20470a1d32e3164370a8ae55514386628a38f24e6b113c4888b1303df1fe2a0c72fb1e3e7e1cd22b12a
-EBUILD fcitx-unikey-0.2.4.ebuild 634 BLAKE2B 91f208f67e7c3ad7576d5fa0149cf75dba57ebd5ed8e2e35a18db2dac2d6fa81a03eb5eabb25ebd8ee0d3e4b21d73b448dfca3f3ccfc81611d7e3f30d60a9ffe SHA512 d219a6689d919411d0438eb6a2dca3e4865bd6b770c8a9692452343e0d44beba5651b1331c367de75590efc3f6aa04094fa52f7dec2e12bbc6ed0994999667bb
-EBUILD fcitx-unikey-0.2.5.ebuild 1091 BLAKE2B ad1e035203f7cef0275295bd36108a273ec885decc068cfe91dfc1060a96ea91f80b722ac441e3725c69f8744735a08227c75828c60ca6f290f8437a7f5079d2 SHA512 98fd05cceb73b062866b2b5213a31d0c9c4b918801c24b6704279a01ef97b77da9b75bf9a7d36f0c35eb01bc6082b35b347159398f31470f9a10745a2e40e201
+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
 EBUILD fcitx-unikey-0.2.6.ebuild 1009 BLAKE2B 29460778785b893bb1d858161dfb0a726131fd80cb5d487a13e71dc80455deea05646b4cb9541bff59df194adaaf64536a2d402797620e72a9f7de19f7546ecc SHA512 2b750681ad0c13a764ff408a5b9cef1bca099a44147f9b2e180c532e8e9f6e5b2b430b0f9b0c507cbbdc3e4cacc74186b94ca50c331047cfa6320cb2e89359a5
 EBUILD fcitx-unikey-0.2.7.ebuild 1049 BLAKE2B a502f7a4d9d5151df7aec47ae46f90c413e3d1cbbcb6f768a21d5d53e80849900b5d5267d4f5b376bf1392b71ea9292e14326392f3dfe717764d289e9eb16baf SHA512 0bc26755fbcecc8157c5d3e051d1366f17ceb0a5b62ab82af0f4611238dd0eb5a17ec51aba0d5d27b6fc31f7282490552199a150436078d77f5d29bf5a462811
 EBUILD fcitx-unikey-4.9999.ebuild 1026 BLAKE2B 20e92a45b3fc1f7ed45cf1f05de896e8d1d5fc36e679e1b00919384118712579e1aa664ad0a82e3aff5f4049e88e3d1d01f44622bef3ea6a753c3365f4865be1 SHA512 fa5050db2a5acfcb7badbb1df231461d08d1c789cbce2e4c129be937ba82154843ba9c8a434f66d85b8f2fd3488b96068a69730e45f84af01515794f35221541
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 edf52caa270b..4d6817250d18 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,20 +1,10 @@
-AUX fcitx-4.2.9.1-qt-4_ucs4.patch 4061 BLAKE2B 5a026b2870720157deee4718b7e97c3fb21726a730dd076d3ef64ee561589f2cc046299af4c3bad91c6d5611498f407e8ca5ae314e9384aaceac6bd3dfd2fd32 SHA512 525b54c6836e2a3e6e8d5d3868d7dd07c69593e87eb5ecb22a20213b7b016fb5911acb6212f62f2ad0f0e98b463f5849dc0427e9f693b35d28a9b435d679acb0
-AUX fcitx-4.2.9.1-tray_icon.patch 5813 BLAKE2B 6c4d842cbcd3c162f554e9bc904319464b4289537a7fa667572f71614e534afd8dd3dfc19bf5fa611a41122784fd5be85f6221cf31cf9d2b5b40c99d07782b4c SHA512 7ecdeea867f29e95c8518d10357d9358babe81b70a4aae648205a9bd72b0e01dc9befc8d11c514998a2b1396a7f56ff368aec7dfc652ff4c3f9a7c53a6b00913
-AUX fcitx-4.2.9.2-scripts.patch 1353 BLAKE2B ded9aa0b184441981063a14e7e45ded9c30255c04cba55903abebfdfe42601f7527b5353ee663dcf64160ff3b9fb9b107f481987c4c1a66292788d068c3ddb8f SHA512 6d33e43cdb4fbe4968b490550526fb4839c045b08710bc1e31961905bbfb94edb76ddfba1579a7223f080556c05c48ffd9dcd967586ef8f99baff9c86ce18265
-AUX fcitx-4.2.9.3-restart.patch 407 BLAKE2B f0a1dd8c10ebe972d96a4b336406aadff8e7070d692a4b4286d5638a32e43d2cd41d19b8dc2b1244fcd1a60850ceb87bd3aee86ae5540090a3727aef12bf6a4d SHA512 000c0adfb99cb8b6fe8d9d3c6958324fa03ba168576dd3abaa0d9dec0983eca7c92a851d4c94df95593ed7c6dc46384c973af9579bac939aecf9b631f8210c39
-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
-EBUILD fcitx-4.2.9.1.ebuild 4535 BLAKE2B e0069150e8f5ebe84c77ba70e4b40c37feea4fa2283775f25f71ab595923ff7f9b90cafbb848f73f47ed6fce0e3393f83278a33ac7435ec8b95f219d98ec70a2 SHA512 f24e8557008491e9c5da042e61669abea677f5f4f167baa1dd22b9efdb6782d42fcbae1424cc9a0e6d4ec0c96c7f81032567820d3a73af322237dd8b4ebe41a3
-EBUILD fcitx-4.2.9.2.ebuild 4309 BLAKE2B 2ceeb90172d39bf76428ee05067511a7093fe790a6cf70d9fbeaaa09bfd988d9d39484ca8b3d8cf5230a832138ba65584dc90be631220be1d3d85d267a4f5fdf SHA512 c4877c23eeec499de4f159c9d3f0b4698681634f9fdda8605e557ab86dafd249599182e5aa2ff42cd3d4c50bd7a81b6a8b3852c512fba92ea29062ee0355ef47
-EBUILD fcitx-4.2.9.3.ebuild 4324 BLAKE2B 09a760e14e987e263a2eb300b123a066f1d58f4bdb2c0cf593f06a9e1ff9f41ec51ebbbbccee6f0d1b8ca38d6a898618636cdf6680a8b81cc942e1d6a441d9f5 SHA512 d49943f1b2cc89559a626d0527d076ae64134402b3084535aae64e56994ff51f03ed95907efaa75553a2d2491283bf1c76c96784b57eee46fc93faafd33c1bdf
+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
 EBUILD fcitx-4.2.9.4.ebuild 4382 BLAKE2B a2429c0d0ba22c4786732b5646d3f28e067e096629da8d8134a772c6f5ee563a12cb87ab59cb64477cc79ca7fe6168f3763d3649fbae80e8736d2f1876e4ee61 SHA512 efb5fdd20620cf0d4553b61283473e809f170fc8978cefc874c0d59362d6aa5d6668f141ad7647b4f62c5deac394e26824ac6e24cb6fef0a62cc979763150e45
 EBUILD fcitx-4.2.9.5.ebuild 4495 BLAKE2B 2b75146a349196898593bd57b67feddc1df30806ec1177479120ac920a9f04d7fadeb14fec5ab43d575ec91acb2130c84eada97d610a63e2ffb936709b86d1d9 SHA512 5d6021aae6f8c080d210b8f917e3ad7b1703d5be76ddd476ae26e7a34c743b6d6bdea6389bf6bacf1362ad2dbdda0162c69447f7f556709f9da293acd1f49a0c
 EBUILD fcitx-4.9999.ebuild 4466 BLAKE2B 3ba3dc13aa9af2b61f2e9f43d9ebb9e9a0face3d33c12028655ddcdd6edc532da77a570a622369924519872c8cb7e73d00f30f958ed83632eb65d63dc38046dc SHA512 4c31137c4aed49da1373eb419d936f78566ec5b955f740304e93f3afb4d35fa219e3d04437e38b4a40937e38c5b83b37964012b2adeffdff03413c9ad29f23de
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/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest
index 697974b898cd..54241e9ee851 100644
--- a/app-i18n/ibus-libpinyin/Manifest
+++ b/app-i18n/ibus-libpinyin/Manifest
@@ -1,11 +1,3 @@
-DIST ibus-libpinyin-1.6.92.tar.gz 1686249 SHA256 e611cff47b84345e1f60b8e94f74811bcfdf53b6ef7436b5cb5aff47eea743a3 SHA512 b4af0083c9c1dd4273c75372acf5d74ce317effdf56d8a0de8a3e3cd24f40b1b2dba91786d0a1cd72c9d7867b9ae630c4f69b04b378529dca8be0869e91d322d WHIRLPOOL 5dd8493bbbaa0f3d189a825bd4237a56276e88b8da91e75c1e3d49c1c1b2050ee2f9aaa4524ea00418690d8ff2085d6b6f686e60752e838f2515ca9d780347ef
-DIST ibus-libpinyin-1.7.4.tar.gz 1692228 SHA256 4627eab10ded24bd1a95ee56a2f7bd6a82deb94435aea674267fc40febd66f81 SHA512 d94f495e74650830f759889112df8b749d6e28192ed866f6bd132b16e16cda59d97aabc2762596bbe337a3deeb30ccd680ad370c28c1932ab05c6a40d8e1c265 WHIRLPOOL 1227c7f96565c001a90bced8aa4f847cfbe9bfae6810641e76472c437a29cdb539d2b316add9850270fa4eb2436761375f9d436749c8f06a573206ddba02064c
-DIST ibus-libpinyin-1.9.0.tar.gz 1692442 SHA256 c8ec2450cec6f11870982b0130293dc967632631077029ca76c27ef349189e3e SHA512 cf90fd5233ca7a77d45b69efc76a211ff69895eed09998bec09b362f6b67a91687510144f55ee67e31897ee81c47e86e2e1258ee1771bae1f04d8aa398b13e1e WHIRLPOOL cb4a5cb645b2a0126f1d44452813021d3dc6b484e3f07f2a1bf5370b475103f0bf86a91576620ac038342dccf1d3f21da220a457b926c61329dc1e718e7f4c15
-DIST ibus-libpinyin-1.9.1.tar.gz 1691476 SHA256 52371801da350fb98632b20b483a2556ae27b3faf05fdcacc4f7ead01c969718 SHA512 600ceb9cb2ef38b07588914f2071b458825ee32b5cf32e6064394500a6d4854c4beea830f5057bba313c17f805033ab06de79e7fbc0a733506279ab2fc7585f6 WHIRLPOOL 08d7fd63a24af88f521ee0985c6e3b13a197fdb6a3d6c73342e33fe73f1e7cd77810a234b77b4bd947ccf7a773db3c5375d248e58fcbc00f5409860276f05f66
-DIST ibus-libpinyin-1.9.2.tar.gz 1693247 SHA256 b9867b4fd000a1f97317cc16447817dc3e68673f2b049774a49f50612ad0ef72 SHA512 008390049b0186b7163cfd8857806715dd78235fc1e35a89d4b58a38eb7f292b643d48f502c0c924512a9f5a96d2581f577d6a9ec3b660d05d9a4adcde970430 WHIRLPOOL 2230cce4b650a99b755b019825b57d534f70caa36085713987f406080f4daf544a3bdcc35f7dd3d45926b0843c10e7479a4bfe8bbd9d00c9862054738b4a123d
-EBUILD ibus-libpinyin-1.6.92.ebuild 1102 BLAKE2B e38c9a25fe7e07ae2d39bea0ee4eceda35caa454d24870caa1f39fb556f90ce6a79730426ad3d53abcdc514419699e1a3386270d7efb22ba2c504da0530e72b4 SHA512 62c4a11abc55a54e40e735c39908efe02ed1035c60e0e360f120e58f7e1f4226c6f430e22e4b11c992c40f9dd4fed785f0dbd1e501227815a2bd1326256abeb4
-EBUILD ibus-libpinyin-1.7.4.ebuild 1145 BLAKE2B 15de9eef13ccd28f3658565c7263390e9a14347bc56ac7cde45830a97e8229f30001c4c1165e3b5d7a47ba58b85e64058697fc3de96c67e2531c35b50c78ec61 SHA512 6f25d7ab250465b28c754809a5df1f623e9c69a2ed2232d30161ba6b399e64726e1bc264038d01db30635bf5a9cd1ff16a9a7157b30c25618f92a723e65c51c7
-EBUILD ibus-libpinyin-1.9.0.ebuild 1178 BLAKE2B 17c805429a70ec075c8fed971746483bd39f389db3d9c736e3420e547985bfed67e279becdc26f396bdf2914bac26f96f9e712ad867ea2724e11826bf29ff9c0 SHA512 c91740e67c13ba8146f3a37d0cee51e49ed939e5176414fdbad2f1b99a17762579b96d2e4aa66a907c2409f21bcf31e3da2a1659a7e5262decd6601fe3163531
-EBUILD ibus-libpinyin-1.9.1.ebuild 1177 BLAKE2B 410e9a00957e31cdfba10367893bbd0b2deaf85986a94321c887bf6cc33b25d91188913e63f79fa89b438cdacbf2c7dddd46712da8c443b84f9d52aa57ee53b2 SHA512 83b3c1555cf81e3dfe2ac1f3c87355a4abec85bfa18c68b0e3ba3ad31047556f696273a61df27d841118da2df06c7ba6260f808eb26ff9b6628b6bf453b1661c
+DIST ibus-libpinyin-1.9.2.tar.gz 1693247 BLAKE2B a887be2a11406420e86cf1e7f76f8d8c06cbffa62a0ab42d450015965c24accab51164ed18cdc8e24f26edf03676603a691c907e00722efc24e947919345570f SHA512 008390049b0186b7163cfd8857806715dd78235fc1e35a89d4b58a38eb7f292b643d48f502c0c924512a9f5a96d2581f577d6a9ec3b660d05d9a4adcde970430
 EBUILD ibus-libpinyin-1.9.2.ebuild 1175 BLAKE2B ae4cdcdf56038f16466c6487673c9cc3e445fe921965a67823b4b6f5766ec15952a116c2c01c75c42496262a5ad964b96f32f95258bb949115c2b17d1903c870 SHA512 d407d821b80e2fb2b114cc746ece7688c3e11643dd422523e2cc557ed1995f6fc11e4ce7381e5a93de678439e62d9bb0af5d9334d6b7480a874225f8c11ddbb3
 MISC metadata.xml 885 BLAKE2B 904aee6e586dd455e103cc84c2be821752e7c11b543f9b1a2fc3c91f5a91bdf8526b0c0a1b8ec151538836a2cbcfccb5a889acbe3ef26c5931f017e6bd40e971 SHA512 b9acf7f4ca73c1453ee7c72a59137070c9f480de8758221f1545d05248e0e2657056a31c705b17455a1342867e9331550aa32f39cbe60270190699384b160710
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.6.92.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.6.92.ebuild
deleted file mode 100644
index d1387f71db4f..000000000000
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.6.92.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils python-single-r1
-
-DESCRIPTION="ibus-libpinyin - pinyin chinese input for ibus using libpinyin"
-HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin"
-
-SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="boost opencc lua"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	>=app-i18n/ibus-1.4[python,${PYTHON_USEDEP}]
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	=app-i18n/libpinyin-1.0.0
-	app-i18n/pyzy
-	boost? ( >=dev-libs/boost-1.39 )
-	lua? ( >=dev-lang/lua-5.1 )"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	sed -i -e "s/python/${EPYTHON}/" setup/ibus-setup-libpinyin.in || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable boost )
-		$(use_enable opencc )
-		$(use_enable lua lua-extension )
-		--enable-english-input-mode
-	)
-	autotools-utils_src_configure
-}
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.7.4.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.7.4.ebuild
deleted file mode 100644
index 2781f61eb395..000000000000
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.7.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils python-single-r1
-
-DESCRIPTION="ibus-libpinyin - pinyin chinese input for ibus using libpinyin"
-HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin"
-
-SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="boost opencc lua"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	>=app-i18n/ibus-1.5.4[python,${PYTHON_USEDEP}]
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	>=app-i18n/libpinyin-1.2.91
-	app-i18n/pyzy
-	boost? ( >=dev-libs/boost-1.39 )
-	opencc? ( >=app-i18n/opencc-1.0.0 )
-	lua? ( >=dev-lang/lua-5.1 )"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	sed -i -e "s/python/${EPYTHON}/" setup/ibus-setup-libpinyin.in || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable boost )
-		$(use_enable opencc )
-		$(use_enable lua lua-extension )
-		--enable-english-input-mode
-	)
-	autotools-utils_src_configure
-}
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.0.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.0.ebuild
deleted file mode 100644
index 7dc68cc7ab24..000000000000
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit autotools gnome2-utils python-single-r1
-
-DESCRIPTION="Intelligent Pinyin engine based on libpinyin for IBus"
-HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin"
-SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="boost lua opencc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-	>=app-i18n/libpinyin-1.9.91:=
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	boost? ( dev-libs/boost:= )
-	lua? ( dev-lang/lua:0 )
-	opencc? ( app-i18n/opencc:= )"
-
-DEPEND="${RDEPEND}
-	virtual/libintl
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	sed -i "s/python/${EPYTHON}/" setup/ibus-setup-libpinyin.in || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-english-input-mode \
-		$(use_enable boost) \
-		$(use_enable lua lua-extension) \
-		$(use_enable opencc)
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.1.ebuild
deleted file mode 100644
index 6e9cf595e03c..000000000000
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit autotools gnome2-utils python-single-r1
-
-DESCRIPTION="Intelligent Pinyin engine based on libpinyin for IBus"
-HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin"
-SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="boost lua opencc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-	>=app-i18n/libpinyin-2.1.0:=
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	boost? ( dev-libs/boost:= )
-	lua? ( dev-lang/lua:0 )
-	opencc? ( app-i18n/opencc:= )"
-
-DEPEND="${RDEPEND}
-	virtual/libintl
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	sed -i "s/python/${EPYTHON}/" setup/ibus-setup-libpinyin.in || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-english-input-mode \
-		$(use_enable boost) \
-		$(use_enable lua lua-extension) \
-		$(use_enable opencc)
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/kcm-fcitx/Manifest b/app-i18n/kcm-fcitx/Manifest
index b34031169efb..7ddb3d2840be 100644
--- a/app-i18n/kcm-fcitx/Manifest
+++ b/app-i18n/kcm-fcitx/Manifest
@@ -1,10 +1,6 @@
-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
 EBUILD kcm-fcitx-0.4.3.ebuild 949 BLAKE2B bf1f10dcf2fb80320e58a6ea6d617ad791a9506621e5773e11a3e5bf8b9602eb0f141f610c8bfd3870b0d081bde048225c7d949e42a5479443317825028f96f5 SHA512 1946700c9e48bfc4dec9c2e7268cbb72e712a7cf7f9ef6f1eb565105215e0063deaf40c231536301dfb29d8272a7decf6b77adbc0a007b79978a9289965f3cd0
-EBUILD kcm-fcitx-0.5.3.ebuild 1312 BLAKE2B e9c42c8f486338dff218618da956c78bb413db405246a1579b2eb8775e965593ddc436bbe09d672b4a5dcd69b0a8dad6a04a8fb04fd615f9342fa5072ae85766 SHA512 1f2536c137ea7cadb169563e86e01a2ec4454bfb1bf3cfcbe65c054b1cad3b48e4655b2b5ea2295625c637080d7093b3d476e821095fe7a076032c0131608861
-EBUILD kcm-fcitx-0.5.4.ebuild 1606 BLAKE2B ca7e8d528bf1124bd43ef0d41324afab949efadc6ebc8acc0f9565f05c138c5f3ccf4834c78006341093a75e3518c9b5900d97cd739018963ac06458cd642762 SHA512 5a268c18e1095cfb588fc251e8e5282748e419167ab78d8d92c784b954bf7937e8a42520f65c103930bc80f910d60b444acd3e3a8d873b4ca427728e191b5806
 EBUILD kcm-fcitx-0.5.5.ebuild 1199 BLAKE2B 9186ce35d1f594c8ead460c3c366452c276803df7c41d95cd8c7c90d31a20fb6a4d3b1c7e2766803ac7f33c51b82b924020497af6ef3538b38ddc56cd8e6a6c6 SHA512 8d708bbde38f28ab3305f9a8a6a4add691c8b54842f5fd2c74b4bf55d56d2c6ec288a4d29a06aeee05cd8dbb4830138f6b801bbce9c4f711bce170e4bf6eb52a
 EBUILD kcm-fcitx-4.4.9999.ebuild 928 BLAKE2B 93cf37311f6ab5d6a33430d767f1c8ddc37ca4e719540fd34ba0e758a918b2749c3bdaad4502cf65f96c10b609ff2cdcc9369876aac61480ca836aac45545c63 SHA512 e061c93dade243b11773f8d5fc2b1925de4c10a42b3f7f2349982348a4b4b5e4ffb7156b658781d49c877811ff572a6048cb2859bc1de5c35c741b5d99922f33
 EBUILD kcm-fcitx-4.5.9999.ebuild 1190 BLAKE2B 9a433e8e24730b407c8062109bbf47b75253a06ac6707073486bb177453f5955b83f0dbc0afc7a54b1e071914a9a6f3ee1d15b7c903ff192755324c573c3bdd8 SHA512 abf541143ab31d64a6e8ef13cdf4cc03704d0d568fd696cd02928249ceeef378ed89b396807172bbcc0a518f8a0770d08d118e3a73780e9c51d33c2dddba6b72
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
-}
diff --git a/app-i18n/libpinyin/Manifest b/app-i18n/libpinyin/Manifest
index cf53c499f0bb..e48509a3fbdc 100644
--- a/app-i18n/libpinyin/Manifest
+++ b/app-i18n/libpinyin/Manifest
@@ -1,17 +1,5 @@
-DIST libpinyin-0.8.0.tar 2682880 SHA256 42fdb08a880a8c42a25712267463704f988293e0bec20871a306022aefb08290 SHA512 762686b9e2fc95e8071832735764c54cb6252fa40bd5d3eb1e15445a267795b775288cef41f671bf4680f13c0a8b44377b12696ade832b80684300e1dd8787a0 WHIRLPOOL 0be6445e6e39c2f8f9124d0f549d11421092364d55c9345f2862f465ba78044b01df9e338acba055818a7d735e0c41e8e71b3f2f03830a14dd196a9dfe2c9107
-DIST libpinyin-1.0.0.tar 2744320 SHA256 ba72c5a71f373771086198b844470d7384cb25b293f962212b02f8f4d718e40c SHA512 577d6d3d3e647a4a5047e3fc019d0e5b7778f49a229eabbf71da9ea73f6d8b935e6ca673698ddfb7d677e1634e05fb2dd0d3811f7b64e7b1184504160af42b87 WHIRLPOOL ad0b975b17010bcb5481eb3aa7304880fe97a682c8fcd0944a9070cf5148130c90714205fb16c440476667876b9f30834eaeec0ec6ef948a5dd59a1bf8a10454
-DIST libpinyin-1.3.0.tar.gz 190686 SHA256 71a5749ff96a1ae5a71bea8d5c1394b16f9252c4e3ad5225cc66ad2a76ab6d7d SHA512 063fd114732650636aba21611042a3461eb5c0447dddef04957edfebd186b76d6eb9f29bc4d095c9b5aebcc7fc2acea345f49adae00eac1fad44822f088c7415 WHIRLPOOL c2840d0272ded79902047d46c14eb5c1ddd6ec3df322086c904f0a1d85e5150b9fdb33f97b276ed56c18039cbbb4d668f9ad014f65aadb9e703957b2e4ceea73
-DIST libpinyin-2.0.92.tar.gz 245949 SHA256 8a37f0ab6334f1d64de1d83ebe290254e07bfaf27dde7dde01b4acb2bba51ca7 SHA512 acf90ab484d6e76d5247916ded71febb0d41152aa41eb7a90ef60d7d9d9ffd11512af078387542501e03edcf6e4f75c28157ed390186ab6d25ccbe4aa1cf8777 WHIRLPOOL ca196d008f3e083f97a97db6eb80ae2922c9bbb4dc3098b62a045c9a870a8a5ec3025e55e5ea677b6855be59dab54bea9cd54373b78ae298f442bab272d84073
-DIST libpinyin-2.1.0.tar.gz 246219 SHA256 d6ce0da926cb3485fa4b2e3805d49674a96a55e0cde9d31d57afb2626cbc32c6 SHA512 e6aa3998ac466cb155750b574140dd43673bfeb4f13d1b88c4892b61bb773aee84610dd67ad17871961d51a48067c535eab33a6fb6c9ac28179a9958c4e9b518 WHIRLPOOL 88827f2901e7394745f337d76742e1a2842b33ed732935ed96e740afebecd897c8720115a3c90deff751dabd4b7891e6575e26cfa5a99b433ff2cd79c5052e6c
-DIST libpinyin-model14.text.tar.gz 19361973 SHA256 185f0f175a90bcfc55cf3cf6ceff8d447a6269492c0ca1a1fc0748ea2c181363 SHA512 792d3cf7ab7fdea701737cea66d18f697015f19d18b6d26273db2da0ae28291f38b3d8a5717f595da63fbe573921c552bdce10c4bec9a0834947dfec92265da9 WHIRLPOOL 5de2ed18c20cfd94a31420085d7fafa93601858279126e553b7aed2ff9a69e6efed6fd8aae3cab8c9fe0b5bd6dfad2c3002857777b6ab6f0e0d94719943f834d
-DIST model.text.tar.gz 10285854 SHA256 a4924c5b5923c3ff9ce55456a417486d07d3b2f7afc194f4338a1221fe36b533 SHA512 d3f137c7de0f357950abbb1e00c0f5d62fb5b4b0ea9f3a6dff29bf6bb2e4f5293319321abf1bad88742868563f65d74f0226f433ba4bcfdfe2c23fef6fea7c74 WHIRLPOOL fd1d637cfcecbbbd7506d15fd107106e578013aa9ca4c0be1aab110fb49ebcb2dbf1493953349e7cf7b0a8a5a0c2c216d993278d8ae78b42f5c703363b4efe60
-DIST model11.text.tar.gz 17197590 SHA256 d0428e87a8c6b214036641a3317834f8352e77cbba0f040c7bd3495d13ef3f71 SHA512 21c048e7f93db9626ec1545a977abb555e12149b791ddab0b0b4fe4adf6fc082d2c2ede28fc42407e72e15f0af1cf428dc58ad955c514d1bcbc67006803e0be7 WHIRLPOOL 7549d45219912880b179c844b5398f063ab27b1db23f2b40a96ff7a29a0217ec430fbef9b2b2b031cb27d22a77eea363ee810e5c259dc7340365d2901a1a1fad
-DIST model14.text.tar.gz 19361973 SHA256 185f0f175a90bcfc55cf3cf6ceff8d447a6269492c0ca1a1fc0748ea2c181363 SHA512 792d3cf7ab7fdea701737cea66d18f697015f19d18b6d26273db2da0ae28291f38b3d8a5717f595da63fbe573921c552bdce10c4bec9a0834947dfec92265da9 WHIRLPOOL 5de2ed18c20cfd94a31420085d7fafa93601858279126e553b7aed2ff9a69e6efed6fd8aae3cab8c9fe0b5bd6dfad2c3002857777b6ab6f0e0d94719943f834d
-DIST model7.text.tar.gz 19666966 SHA256 c9a3c38e6439302603b5c3772ea9dae280b4ef46bd6e8762ed40452dc400af78 SHA512 74a56a23cdca24124037f688ed85a921089155a1b9a0b61e646f805b2bb698c56682c5d6a47ff86657c8b131a831dbee9d5cc5165d4c1f235b77fcd5b2e480ad WHIRLPOOL 5285398bb6bd431caa3449b9540a1c08dad785456d9152fc44f6303866891de5538da4c5945eb8e8a0b64a081a58e7e6d25caacd05e2e3a7219e4335f0414986
-EBUILD libpinyin-0.8.0.ebuild 723 BLAKE2B bf57bb98f372a3833242e8338df80098861796c55995b9bb2ba5c0065f0aedd6aec69509d384bbb8ffa7531606b1be8a18f33320e54b1ab5bb011321355b9e88 SHA512 3153251713d28655f62cfb5fbe92c329fa5eb7776bfaa9739ba1be63cb18bb0a9019b6af1d7eb9125800434f5453e8a4383b1d816990b5a14643a4817dbe39e1
-EBUILD libpinyin-1.0.0.ebuild 769 BLAKE2B a2afecf0a09f51ed30a7620d70a2894e9794e3dea86c6b11fa64a35b981bab71387f9fc7aeae7d35bb07ba9faa2c3fe169733eadb0bfbaae6a428594021c08c9 SHA512 5327dfbec65535b38dbaa70f1008b2c29417e644213ec9427ff067cdb16cb20f6432bb070c82f9e24ba56ee8dce18fa588682a89b019ef90e156e00684dfab6b
-EBUILD libpinyin-1.3.0-r1.ebuild 771 BLAKE2B 527e6ac9c5243a39844df9a7766769397ce0ccac3568802e49c3cbbee53c89a8c54ec7cf96cba5c01db5f0d035aba30222209987fe79635197784695a93d64fa SHA512 8edf87ae898328a23a07743f629029012cc0dee82d2b7406764a623f75a91284e6c2d8d71bc3108e30f41200047d05fac220c1ea58709931b76551bf70fc03cc
-EBUILD libpinyin-2.0.92.ebuild 757 BLAKE2B e365583b3995070d20d0dfd8ca9155036b6568b87704a3e319b9fd5b9716ad47fe99192716fd20dc1f3407f84ab24c975a0a343b0e654e8c76f1f284bcf7c59d SHA512 354c222130c1b931f2fef9661add143f3db23a9e557cd2726927eb6b53dd4429a4b541b13ae0cc1b8007d99a2c0e7706960716dde77e11d7964947f6c8e4f41d
+DIST libpinyin-2.1.0.tar.gz 246219 BLAKE2B cae5b41faeb2e0eedc2ae2c098b2db04b22e36d0bd9fd222a4516f71ab9b3e8ade7fa96e0d6d898e197bf91c1cb6a0b98a9fff97e7be31bb4f901400c87bfea7 SHA512 e6aa3998ac466cb155750b574140dd43673bfeb4f13d1b88c4892b61bb773aee84610dd67ad17871961d51a48067c535eab33a6fb6c9ac28179a9958c4e9b518
+DIST libpinyin-model14.text.tar.gz 19361973 BLAKE2B 702f0c2cb0c8157758f8c46e7b47221475f2a96a5e4f6181b5dee605bd72002827431f017a913275b4e9cf6b4b07bccec4b9a5b7960a9b2c42ffba4631c57ed6 SHA512 792d3cf7ab7fdea701737cea66d18f697015f19d18b6d26273db2da0ae28291f38b3d8a5717f595da63fbe573921c552bdce10c4bec9a0834947dfec92265da9
 EBUILD libpinyin-2.1.0.ebuild 1350 BLAKE2B bd3e4ccd07dc7cdfb87558edc664cedf6a0fd6a2c8ab8b6e89007b5157ed4a055483370a1eb314c21139a9bc32b92eb07b04cad3c8568969cf435fed947d1355 SHA512 22c4a8e787b2b74e8150440f67a8a9e7ee93d0a2080f6023358cebc74be1de6ddde1263caf243f37ced254d408f08558752e1744468a66d6111235029c753085
 EBUILD libpinyin-9999.ebuild 1324 BLAKE2B 7137a2f1512622794c0e5d698d48ab299025962cee78218ea050642fbc78d1fe14bb927b24532ec5ce99706a54681e64e695b5027e0fc93d9e317150dd9f80eb SHA512 4d0b893b7f40303d60ec59ef4afcfb11b017814ef79ab751e5b5cc382a0b1721a8dd3e67ab5a7684d05c72b164274c1c9b6d60f621923107c1d54c79ee39e1ba
 MISC metadata.xml 384 BLAKE2B b3f62b356f505bb69731e6f56d43a080e509b578da0762be6ccc112ed1262446034b82d89cbdcca87d502c006319fd11cb4069804b8d8c12f4263a15bbf4f525 SHA512 4317a502e82b23aa2c66d406148eab83996139b4522f999884559b7b6d15709ded6779dc64aeedc657a1be3cd1337281c9e1297ae22dc6b227aef419dc707518
diff --git a/app-i18n/libpinyin/libpinyin-0.8.0.ebuild b/app-i18n/libpinyin/libpinyin-0.8.0.ebuild
deleted file mode 100644
index 6d35c85f9298..000000000000
--- a/app-i18n/libpinyin/libpinyin-0.8.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 autotools eutils
-
-DESCRIPTION="Library for Chinese pinyin input methods"
-HOMEPAGE="https://github.com/libpinyin/libpinyin"
-SRC_URI="mirror://github/${PN}/${PN}/${PN}-lite-${PV}.tar.gz -> ${P}.tar
-	mirror://github/${PN}/${PN}/model.text.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0/2"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND="sys-libs/db:=
-	dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/libintl
-	virtual/pkgconfig"
-
-src_prepare() {
-	ln -s "${DISTDIR}"/model.text.tar.gz data || die
-	sed -e '/wget/d' -i data/Makefile.am || die
-	epatch_user
-	eautoreconf
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/app-i18n/libpinyin/libpinyin-1.0.0.ebuild b/app-i18n/libpinyin/libpinyin-1.0.0.ebuild
deleted file mode 100644
index c699c09c6fa3..000000000000
--- a/app-i18n/libpinyin/libpinyin-1.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-MODELV=7
-
-DESCRIPTION="Library for Chinese pinyin input methods"
-HOMEPAGE="https://github.com/libpinyin/libpinyin"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${PN}-lite-${PV}.tar.gz -> ${P}.tar
-	mirror://sourceforge/${PN}/models/model${MODELV}.text.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0/4"
-KEYWORDS="amd64 ~arm64 ~ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="sys-libs/db:=
-	dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/libintl
-	virtual/pkgconfig"
-
-src_prepare() {
-	ln -s "${DISTDIR}"/model${MODELV}.text.tar.gz data || die
-	sed -e '/wget/d' -i data/Makefile.am || die
-	epatch_user
-	eautoreconf
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/app-i18n/libpinyin/libpinyin-1.3.0-r1.ebuild b/app-i18n/libpinyin/libpinyin-1.3.0-r1.ebuild
deleted file mode 100644
index c0bb0eb4f522..000000000000
--- a/app-i18n/libpinyin/libpinyin-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-MODELV=11
-
-DESCRIPTION="Library for Chinese pinyin input methods"
-HOMEPAGE="https://github.com/libpinyin/libpinyin"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	mirror://sourceforge/${PN}/models/model${MODELV}.text.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0/7"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/db:=
-	dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/libintl
-	virtual/pkgconfig"
-
-src_prepare() {
-	ln -s "${DISTDIR}"/model${MODELV}.text.tar.gz data || die
-	sed -e '/wget/d' -i data/Makefile.am || die
-	epatch_user
-	eautoreconf
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/app-i18n/libpinyin/libpinyin-2.0.92.ebuild b/app-i18n/libpinyin/libpinyin-2.0.92.ebuild
deleted file mode 100644
index 3040ea3f35a0..000000000000
--- a/app-i18n/libpinyin/libpinyin-2.0.92.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools ltprune
-
-MODELV=14
-
-DESCRIPTION="Library to deal with pinyin"
-HOMEPAGE="https://github.com/libpinyin/libpinyin"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	mirror://sourceforge/${PN}/models/model${MODELV}.text.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0/12"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	sys-libs/db:="
-
-DEPEND="${RDEPEND}
-	virtual/libintl
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	ln -s "${DISTDIR}"/model${MODELV}.text.tar.gz data || die
-	sed -i "/wget/d" data/Makefile.am || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/app-i18n/librime/Manifest b/app-i18n/librime/Manifest
index f950e673450b..cca46bfae4d6 100644
--- a/app-i18n/librime/Manifest
+++ b/app-i18n/librime/Manifest
@@ -1,11 +1,3 @@
-AUX librime-1.1-gcc53613.patch 12167 BLAKE2B dba9237f9d237db24788a8acd5225999fc934d9a21e90206595da5195fdae0d4e9b4dae2eff3154bd18514cab02751e01cd9a3c37cd37402cb7ccb4b249994c8 SHA512 d1d0288c8ec3e00547665b6d1304cf073628c085b4144662218f4260a479a4d317897e20ded07fd853791e0a0cab3100248e12de1b958458f9d5fb72c1c5c05e
-AUX librime-1.2-BOOST_NO_SCOPED_ENUMS.patch 6887 BLAKE2B 8999be210102e7c55e7680458d322a1b94fab23b8e3d0f3e3d305d05f04bf2851ee3421989d83631e2d23bd05de694e1a29f2d63e114c6821be4282d8ffd7029 SHA512 3c0d4b0f7d63a9a708825ce9a56a33bd7f7fd13ae97cefe108bcb1ba48a1798a020c8980d52c9450342c7f39cabd73c10b494ac4da5e8513f298ce771fc69d8c
-AUX librime-dictionary.patch 409 BLAKE2B 36fc4f3152dd05606c4bd1b3e18409db76719f5fddff38f3e7481a04e9859894d972da0f27aec2987760f277cc6aca5aac6dfaba778870e5bbe3f09e6f22f53c SHA512 ca529ab32c5453e338c952670071fc2ad489c8785ac2336811ecad31f9e09f1fb0d081b68f61fac4b53f65ebeb3067e3ff499292ec7a3da63f51d3148a7cfd07
-AUX librime-test.patch 1398 BLAKE2B 56ce92cba990184b63da618e16b58d2de40173fa4f3693fa6135d045cfe4c5f1e40e371bc7acf6084ad8451cfa0bc95304e32a18059de1224ce86f9a72b927ce SHA512 2fba47701527439e74d5511feb70dc604ccfa0d3eb8a402812b97617077ef721b8d7ad07b9a7cf7b69e5204f58a7366bf8d6b114c89a39f50f69a039c268e09b
-DIST librime-0.9.9.tar.gz 2548968 SHA256 e828acc853a5d9e3ca191d065112c410183aadb5bd1d021704f82a8644ff6fd8 SHA512 71b39e713d5bbb73441dfb3038be6dc04518d2169df336e7fcb19b4c3b19a48d7db7c230fb1107148f3b7d95342851d23569617ff8138200c7ef1d750060c00f WHIRLPOOL fb5798491352eb1682a2bed7a73486df153a2479eef0adadc00726ab958b50606e32d59bfa8ded86c3aa35bac5e120e4251903fcb54326936251f1f3af726f92
-DIST librime-1.2.9.tar.gz 5516609 SHA256 d9f0e732b5bf0ee9d8872d00c79322eec7682139a898a65555f794795ac5f410 SHA512 2266ef96ad21ec5981b4ca5371d4e16eefed545ffbde07093ae0d0be070a64f9869baa09b6bdcee2522438e08c72a842a7e0b225a6ca1b661708a80cf3aba83a WHIRLPOOL 032c517008b0f4b4d9ccd9d188d480018fa1116d252786953b136de060534486b73997c6574f3ed040f337ca028b83669b135fd2683e54ddf576039a77db19d7
-DIST librime-1.2.tar.gz 5199581 SHA256 fb04a7e0a4eeb2f25031c9a366cedfdab641ab06960f50c42febef5195de9381 SHA512 75a771916a58b1ab678dbf05ac074a651cea077e81d25e4dfd0ea839fabe6cf606135851e72c19d6a8a9c6ed66b89928b90785f282e8786c375bc1d393059227 WHIRLPOOL 44a821fc4e1a562cb01ce7c28efc5a4fd3ca8e9d2d4e55ddda3434b677a17b59d7114a634bfd95ae53072f0e6f2e5f027b2c81ab70fa51b011934c7c39fbcf51
-EBUILD librime-0.9.9.ebuild 885 BLAKE2B 38907d2875acc3089834ef421a824779a2cf03523786bb290ffec1994d3d43eaf733f8ce4ba3e13ffdeb5474a53d23fdd92dc3abaea094ece77de07fbd67fd6a SHA512 905c76d5b75824318e94d8953eb3b5233d2721c1783b42e7312b56f4ab69be89a158f59a6ce4aa259f89d0baf233fb41bd10129a8b87a519c22c4e7f4d5c75ec
+DIST librime-1.2.9.tar.gz 5516609 BLAKE2B 7b05fedb093f7595c7bf7f4893624b35b0cdde1816c9c99f9ed5d408c8fd21d34a361d16b94c43b3e5e23b10945f075711762f08ca30abee35849a332ecfee2d SHA512 2266ef96ad21ec5981b4ca5371d4e16eefed545ffbde07093ae0d0be070a64f9869baa09b6bdcee2522438e08c72a842a7e0b225a6ca1b661708a80cf3aba83a
 EBUILD librime-1.2.9.ebuild 892 BLAKE2B e768dd801d40523427bc613c02034707d7960e2576d2722d6135d5c62d3e610087986be181c68ee33299f2ab76115c284eefbe67ab18ef5aef9a307b6d7b35bf SHA512 88be6b3d55f057ebbc5048162a676f56e611ccdcb2cca37b9fb5ef39ec554e478c96e577102858cdb5a3e02e0001b3ea5469f8673d5d9d8a0d3211f4e5d88f4c
-EBUILD librime-1.2.ebuild 1020 BLAKE2B 0c9afd7cfca1aca5903f9062906296e55dd76241c8d2e7c0e66507605bd937b2760b216c773b8996a40fbc7b97f12f7ca6ac4a0c4e8ebb3c33fbc7705d20709b SHA512 1671e8fff663a6bf2e90e8b176be0ab178d67ff8f4d511b0a0e0fcc1601932e5d2e1336a832573a97a5923bef5169d63832ce8d03e30145b60b86bf9681b9661
 MISC metadata.xml 532 BLAKE2B 200096c7c818b877dd156ab1456309ae4e42a8bf78075d8aeee30a79f09bbf57c6053a41369102becf87aaf3ea4481a0bf6edf1dee258f650661b61c65a9aaee SHA512 83904c4885a57569f4e74483bd5efed886ca1fd6708c1e7146ce4893bcbdd66efa82dfd4e563c7b888603e23566de21e928772a597dd2e6fc75d00793c788800
diff --git a/app-i18n/librime/files/librime-1.1-gcc53613.patch b/app-i18n/librime/files/librime-1.1-gcc53613.patch
deleted file mode 100644
index 28dfb1ec36b5..000000000000
--- a/app-i18n/librime/files/librime-1.1-gcc53613.patch
+++ /dev/null
@@ -1,367 +0,0 @@
-Index: librime-1.1git20140306/include/rime/algo/calculus.h
-===================================================================
---- librime-1.1git20140306.orig/include/rime/algo/calculus.h
-+++ librime-1.1git20140306/include/rime/algo/calculus.h
-@@ -22,11 +22,12 @@ class Calculation {
-   using Factory = Calculation* (const std::vector<std::string>& args);
- 
-   Calculation() = default;
--  virtual ~Calculation() = default;
-+  virtual ~Calculation();
-   virtual bool Apply(Spelling* spelling) = 0;
-   virtual bool addition() { return true; }
-   virtual bool deletion() { return true; }
- };
-+inline Calculation::~Calculation() = default;
- 
- class Calculus {
-  public:
-Index: librime-1.1git20140306/include/rime/dict/db.h
-===================================================================
---- librime-1.1git20140306.orig/include/rime/dict/db.h
-+++ librime-1.1git20140306/include/rime/dict/db.h
-@@ -18,7 +18,7 @@ class DbAccessor {
-   DbAccessor() = default;
-   explicit DbAccessor(const std::string& prefix)
-       : prefix_(prefix) {}
--  virtual ~DbAccessor() = default;
-+  virtual ~DbAccessor();
- 
-   virtual bool Reset() = 0;
-   virtual bool Jump(const std::string &key) = 0;
-@@ -30,11 +30,12 @@ class DbAccessor {
- 
-   std::string prefix_;
- };
-+inline DbAccessor::~DbAccessor() = default;
- 
- class Db : public Class<Db, const std::string&> {
-  public:
-   explicit Db(const std::string& name);
--  virtual ~Db() = default;
-+  virtual ~Db();
- 
-   bool Exists() const;
-   bool Remove();
-@@ -72,11 +73,12 @@ class Db : public Class<Db, const std::s
-   bool readonly_ = false;
-   bool disabled_ = false;
- };
-+inline Db::~Db() = default;
- 
- class Transactional {
-  public:
-   Transactional() = default;
--  virtual ~Transactional() = default;
-+  virtual ~Transactional();
-   virtual bool BeginTransaction() { return false; }
-   virtual bool AbortTransaction() { return false; }
-   virtual bool CommitTransaction() { return false; }
-@@ -84,12 +86,14 @@ class Transactional {
-  protected:
-   bool in_transaction_ = false;
- };
-+inline Transactional::~Transactional() = default;
- 
- class Recoverable {
-  public:
--  virtual ~Recoverable() = default;
-+  virtual ~Recoverable();
-   virtual bool Recover() = 0;
- };
-+inline Recoverable::~Recoverable() = default;
- 
- }  // namespace rime
- 
-Index: librime-1.1git20140306/include/rime/algo/encoder.h
-===================================================================
---- librime-1.1git20140306.orig/include/rime/algo/encoder.h
-+++ librime-1.1git20140306/include/rime/algo/encoder.h
-@@ -24,7 +24,7 @@ class RawCode : public std::vector<std::
- class PhraseCollector {
-  public:
-   PhraseCollector() = default;
--  virtual ~PhraseCollector() = default;
-+  virtual ~PhraseCollector();
- 
-   virtual void CreateEntry(const std::string& phrase,
-                            const std::string& code_str,
-@@ -33,13 +33,14 @@ class PhraseCollector {
-   virtual bool TranslateWord(const std::string& word,
-                              std::vector<std::string>* code) = 0;
- };
-+inline PhraseCollector::~PhraseCollector() = default;
- 
- class Config;
- 
- class Encoder {
-  public:
-   Encoder(PhraseCollector* collector) : collector_(collector) {}
--  virtual ~Encoder() = default;
-+  virtual ~Encoder();
- 
-   virtual bool LoadSettings(Config* config) {
-     return false;
-@@ -53,7 +54,7 @@ class Encoder {
-  protected:
-   PhraseCollector* collector_;
- };
--
-+inline Encoder::~Encoder() = default;
- // Aa : code at index 0 for character at index 0
- // Az : code at index -1 for character at index 0
- // Za : code at index 0 for character at index -1
-Index: librime-1.1git20140306/include/rime/candidate.h
-===================================================================
---- librime-1.1git20140306.orig/include/rime/candidate.h
-+++ librime-1.1git20140306/include/rime/candidate.h
-@@ -21,7 +21,7 @@ class Candidate {
-             size_t end,
-             double quality = 0.)
-       : type_(type), start_(start), end_(end), quality_(quality) {}
--  virtual ~Candidate() = default;
-+  virtual ~Candidate();
- 
-   static shared_ptr<Candidate>
-   GetGenuineCandidate(const shared_ptr<Candidate>& cand);
-@@ -53,6 +53,7 @@ class Candidate {
-   size_t end_ = 0;
-   double quality_ = 0.;
- };
-+inline Candidate::~Candidate() = default;
- 
- using CandidateList = std::vector<shared_ptr<Candidate>>;
- 
-Index: librime-1.1git20140306/include/rime/component.h
-===================================================================
---- librime-1.1git20140306.orig/include/rime/component.h
-+++ librime-1.1git20140306/include/rime/component.h
-@@ -16,8 +16,9 @@ namespace rime {
- class ComponentBase {
-  public:
-   ComponentBase() = default;
--  virtual ~ComponentBase() = default;
-+  virtual ~ComponentBase();
- };
-+inline ComponentBase::~ComponentBase() = default;
- 
- template <class T, class Arg>
- struct Class {
-Index: librime-1.1git20140306/include/rime/config.h
-===================================================================
---- librime-1.1git20140306.orig/include/rime/config.h
-+++ librime-1.1git20140306/include/rime/config.h
-@@ -22,7 +22,7 @@ class ConfigItem {
-   enum ValueType { kNull, kScalar, kList, kMap };
- 
-   ConfigItem() = default;  // null
--  virtual ~ConfigItem() = default;
-+  virtual ~ConfigItem();
- 
-   ValueType type() const { return type_; }
- 
-@@ -31,6 +31,7 @@ class ConfigItem {
- 
-   ValueType type_ = kNull;
- };
-+inline ConfigItem::~ConfigItem() = default;
- 
- using ConfigItemPtr = shared_ptr<ConfigItem>;
- 
-Index: librime-1.1git20140306/include/rime/deployer.h
-===================================================================
---- librime-1.1git20140306.orig/include/rime/deployer.h
-+++ librime-1.1git20140306/include/rime/deployer.h
-@@ -25,10 +25,11 @@ using TaskInitializer = boost::any;
- class DeploymentTask : public Class<DeploymentTask, TaskInitializer> {
-  public:
-   DeploymentTask() = default;
--  virtual ~DeploymentTask() = default;
-+  virtual ~DeploymentTask();
- 
-   virtual bool Run(Deployer* deployer) = 0;
- };
-+inline DeploymentTask::~DeploymentTask() = default;
- 
- class Deployer : public Messenger {
-  public:
-Index: librime-1.1git20140306/include/rime/filter.h
-===================================================================
---- librime-1.1git20140306.orig/include/rime/filter.h
-+++ librime-1.1git20140306/include/rime/filter.h
-@@ -22,7 +22,7 @@ class Filter : public Class<Filter, cons
-  public:
-   explicit Filter(const Ticket& ticket)
-       : engine_(ticket.engine), name_space_(ticket.name_space) {}
--  virtual ~Filter() = default;
-+  virtual ~Filter();
- 
-   virtual void Apply(CandidateList* recruited,
-                      CandidateList* candidates) = 0;
-@@ -35,6 +35,7 @@ class Filter : public Class<Filter, cons
-   Engine* engine_;
-   std::string name_space_;
- };
-+inline Filter::~Filter() = default;
- 
- }  // namespace rime
- 
-Index: librime-1.1git20140306/include/rime/formatter.h
-===================================================================
---- librime-1.1git20140306.orig/include/rime/formatter.h
-+++ librime-1.1git20140306/include/rime/formatter.h
-@@ -20,7 +20,7 @@ class Formatter : public Class<Formatter
-  public:
-   Formatter(const Ticket& ticket)
-       : engine_(ticket.engine), name_space_(ticket.name_space) {}
--  virtual ~Formatter() = default;
-+  virtual ~Formatter();
- 
-   virtual void Format(std::string* text) = 0;
- 
-@@ -28,6 +28,7 @@ class Formatter : public Class<Formatter
-   Engine* engine_;
-   std::string name_space_;
- };
-+inline Formatter::~Formatter() = default;
- 
- }  // namespace rime
- 
-Index: librime-1.1git20140306/include/rime/lever/custom_settings.h
-===================================================================
---- librime-1.1git20140306.orig/include/rime/lever/custom_settings.h
-+++ librime-1.1git20140306/include/rime/lever/custom_settings.h
-@@ -19,7 +19,7 @@ class CustomSettings {
-   CustomSettings(Deployer* deployer,
-                  const std::string& config_id,
-                  const std::string& generator_id);
--  virtual ~CustomSettings() = default;
-+  virtual ~CustomSettings();
- 
-   virtual bool Load();
-   virtual bool Save();
-@@ -39,6 +39,7 @@ class CustomSettings {
-   Config config_;
-   Config custom_config_;
- };
-+inline CustomSettings::~CustomSettings() = default;
- 
- }  // namespace rime
- 
-Index: librime-1.1git20140306/include/rime/processor.h
-===================================================================
---- librime-1.1git20140306.orig/include/rime/processor.h
-+++ librime-1.1git20140306/include/rime/processor.h
-@@ -25,7 +25,7 @@ class Processor : public Class<Processor
-  public:
-   explicit Processor(const Ticket& ticket)
-       : engine_(ticket.engine), name_space_(ticket.name_space) {}
--  virtual ~Processor() = default;
-+  virtual ~Processor();
- 
-   virtual ProcessResult ProcessKeyEvent(const KeyEvent& key_event) {
-     return kNoop;
-@@ -35,6 +35,7 @@ class Processor : public Class<Processor
-   Engine* engine_;
-   std::string name_space_;
- };
-+inline Processor::~Processor() = default;
- 
- }  // namespace rime
- 
-Index: librime-1.1git20140306/include/rime/segmentor.h
-===================================================================
---- librime-1.1git20140306.orig/include/rime/segmentor.h
-+++ librime-1.1git20140306/include/rime/segmentor.h
-@@ -19,7 +19,7 @@ class Segmentor : public Class<Segmentor
-  public:
-   explicit Segmentor(const Ticket& ticket)
-       : engine_(ticket.engine), name_space_(ticket.name_space) {}
--  virtual ~Segmentor() = default;
-+  virtual ~Segmentor();
- 
-   virtual bool Proceed(Segmentation* segmentation) = 0;
- 
-@@ -27,6 +27,7 @@ class Segmentor : public Class<Segmentor
-   Engine* engine_;
-   std::string name_space_;
- };
-+inline Segmentor::~Segmentor() = default;
- 
- }  // namespace rime
- 
-Index: librime-1.1git20140306/include/rime/translation.h
-===================================================================
---- librime-1.1git20140306.orig/include/rime/translation.h
-+++ librime-1.1git20140306/include/rime/translation.h
-@@ -19,7 +19,7 @@ namespace rime {
- class Translation {
-  public:
-   Translation() = default;
--  virtual ~Translation() = default;
-+  virtual ~Translation();
- 
-   // A translation may contain multiple results, looks
-   // something like a generator of candidates.
-@@ -40,6 +40,7 @@ class Translation {
-  private:
-   bool exhausted_ = false;
- };
-+inline Translation::~Translation() = default;
- 
- class UniqueTranslation : public Translation {
-  public:
-Index: librime-1.1git20140306/include/rime/translator.h
-===================================================================
---- librime-1.1git20140306.orig/include/rime/translator.h
-+++ librime-1.1git20140306/include/rime/translator.h
-@@ -23,7 +23,7 @@ class Translator : public Class<Translat
-  public:
-   explicit Translator(const Ticket& ticket)
-       : engine_(ticket.engine), name_space_(ticket.name_space) {}
--  virtual ~Translator() = default;
-+  virtual ~Translator();
- 
-   virtual shared_ptr<Translation> Query(const std::string& input,
-                                         const Segment& segment,
-@@ -33,6 +33,7 @@ class Translator : public Class<Translat
-   Engine* engine_;
-   std::string name_space_;
- };
-+inline Translator::~Translator() = default;
- 
- }  // namespace rime
- 
-Index: librime-1.1git20140306/include/rime/dict/db_utils.h
-===================================================================
---- librime-1.1git20140306.orig/include/rime/dict/db_utils.h
-+++ librime-1.1git20140306/include/rime/dict/db_utils.h
-@@ -14,17 +14,18 @@ namespace rime {
- 
- class Sink {
-  public:
--  virtual ~Sink() = default;
-+  virtual ~Sink();
-   virtual bool MetaPut(const std::string& key, const std::string& value) = 0;
-   virtual bool Put(const std::string& key, const std::string& value) = 0;
- 
-   template <class SourceType>
-   int operator<< (SourceType& source);
- };
-+inline Sink::~Sink() = default;
- 
- class Source {
-  public:
--  virtual ~Source() = default;
-+  virtual ~Source();
-   virtual bool MetaGet(std::string* key, std::string* value) = 0;
-   virtual bool Get(std::string* key, std::string* value) = 0;
- 
-@@ -33,6 +34,7 @@ class Source {
- 
-   int Dump(Sink* sink);
- };
-+inline Source::~Source() = default;
- 
- template <class SourceType>
- int Sink::operator<< (SourceType& source) {
diff --git a/app-i18n/librime/files/librime-1.2-BOOST_NO_SCOPED_ENUMS.patch b/app-i18n/librime/files/librime-1.2-BOOST_NO_SCOPED_ENUMS.patch
deleted file mode 100644
index 71c1e9a96210..000000000000
--- a/app-i18n/librime/files/librime-1.2-BOOST_NO_SCOPED_ENUMS.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-diff --git a/include/rime/lever/customizer.h b/include/rime/lever/customizer.h
-index 8418410..f6811d9 100644
---- a/include/rime/lever/customizer.h
-+++ b/include/rime/lever/customizer.h
-@@ -8,6 +8,9 @@
- #define RIME_CUSTOMIZER_H_
- 
- #include <string>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- 
- namespace rime {
-diff --git a/include/rime/lever/switcher_settings.h b/include/rime/lever/switcher_settings.h
-index 8263e14..f7c9d1e 100644
---- a/include/rime/lever/switcher_settings.h
-+++ b/include/rime/lever/switcher_settings.h
-@@ -9,6 +9,9 @@
- 
- #include <string>
- #include <vector>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include "custom_settings.h"
- 
-diff --git a/include/rime/lever/user_dict_manager.h b/include/rime/lever/user_dict_manager.h
-index e971ad8..e765678 100644
---- a/include/rime/lever/user_dict_manager.h
-+++ b/include/rime/lever/user_dict_manager.h
-@@ -9,6 +9,9 @@
- 
- #include <string>
- #include <vector>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- 
- namespace rime {
-diff --git a/src/core_module.cc b/src/core_module.cc
-index 785c22f..4d078ae 100644
---- a/src/core_module.cc
-+++ b/src/core_module.cc
-@@ -5,6 +5,9 @@
- // 2013-10-17 GONG Chen <chen.sst@gmail.com>
- //
- 
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <rime_api.h>
- #include <rime/common.h>
-diff --git a/src/dict/db.cc b/src/dict/db.cc
-index b8c46a6..eadacb9 100644
---- a/src/dict/db.cc
-+++ b/src/dict/db.cc
-@@ -5,6 +5,9 @@
- // 2011-11-02 GONG Chen <chen.sst@gmail.com>
- //
- #include <boost/algorithm/string.hpp>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <rime_version.h>
- #include <rime/common.h>
-diff --git a/src/dict/dict_compiler.cc b/src/dict/dict_compiler.cc
-index 2bd9aa4..f383f7e 100644
---- a/src/dict/dict_compiler.cc
-+++ b/src/dict/dict_compiler.cc
-@@ -7,6 +7,9 @@
- #include <fstream>
- #include <map>
- #include <set>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <rime/algo/algebra.h>
- #include <rime/algo/utilities.h>
-diff --git a/src/dict/dictionary.cc b/src/dict/dictionary.cc
-index 66306b5..b0d755d 100644
---- a/src/dict/dictionary.cc
-+++ b/src/dict/dictionary.cc
-@@ -5,6 +5,9 @@
- // 2011-07-05 GONG Chen <chen.sst@gmail.com>
- //
- #include <utility>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <rime/common.h>
- #include <rime/schema.h>
-diff --git a/src/dict/mapped_file.cc b/src/dict/mapped_file.cc
-index 6fd21a6..cd46994 100644
---- a/src/dict/mapped_file.cc
-+++ b/src/dict/mapped_file.cc
-@@ -7,6 +7,9 @@
- // 2011-06-30 GONG Chen <chen.sst@gmail.com>
- //
- #include <fstream>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <boost/interprocess/file_mapping.hpp>
- #include <boost/interprocess/mapped_region.hpp>
-diff --git a/src/dict/preset_vocabulary.cc b/src/dict/preset_vocabulary.cc
-index f74ea58..136f9fa 100644
---- a/src/dict/preset_vocabulary.cc
-+++ b/src/dict/preset_vocabulary.cc
-@@ -4,6 +4,9 @@
- //
- // 2011-11-27 GONG Chen <chen.sst@gmail.com>
- //
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <boost/lexical_cast.hpp>
- #include <utf8.h>
-diff --git a/src/dict/tree_db.cc b/src/dict/tree_db.cc
-index 4b6ed2e..542fe83 100644
---- a/src/dict/tree_db.cc
-+++ b/src/dict/tree_db.cc
-@@ -4,6 +4,9 @@
- //
- // 2011-11-02 GONG Chen <chen.sst@gmail.com>
- //
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #if defined(_MSC_VER)
- #pragma warning(disable: 4244)
-diff --git a/src/gear/simplifier.cc b/src/gear/simplifier.cc
-index 6bb8524..d02b979 100644
---- a/src/gear/simplifier.cc
-+++ b/src/gear/simplifier.cc
-@@ -7,6 +7,9 @@
- #include <string>
- #include <vector>
- #include <boost/algorithm/string.hpp>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <opencc/opencc.h>
- #include <stdint.h>
-diff --git a/src/lever/custom_settings.cc b/src/lever/custom_settings.cc
-index 0153830..0713cbc 100644
---- a/src/lever/custom_settings.cc
-+++ b/src/lever/custom_settings.cc
-@@ -5,6 +5,9 @@
- // 2012-02-26 GONG Chen <chen.sst@gmail.com>
- //
- #include <boost/algorithm/string.hpp>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <rime/config.h>
- #include <rime/deployer.h>
-diff --git a/src/lever/deployment_tasks.cc b/src/lever/deployment_tasks.cc
-index 495066f..589c883 100644
---- a/src/lever/deployment_tasks.cc
-+++ b/src/lever/deployment_tasks.cc
-@@ -5,6 +5,9 @@
- // 2011-12-10 GONG Chen <chen.sst@gmail.com>
- //
- #include <boost/algorithm/string.hpp>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <boost/uuid/random_generator.hpp>
- #include <boost/uuid/uuid.hpp>
-diff --git a/src/lever/switcher_settings.cc b/src/lever/switcher_settings.cc
-index 4ee7d57..bb4dbd0 100644
---- a/src/lever/switcher_settings.cc
-+++ b/src/lever/switcher_settings.cc
-@@ -6,6 +6,9 @@
- //
- #include <utility>
- #include <boost/algorithm/string.hpp>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <rime/config.h>
- #include <rime/deployer.h>
-diff --git a/src/lever/user_dict_manager.cc b/src/lever/user_dict_manager.cc
-index 601cfc2..e087739 100644
---- a/src/lever/user_dict_manager.cc
-+++ b/src/lever/user_dict_manager.cc
-@@ -6,6 +6,9 @@
- //
- #include <fstream>
- #include <boost/algorithm/string.hpp>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <boost/scope_exit.hpp>
- #include <rime/common.h>
-diff --git a/src/lever/userdb_recovery_task.cc b/src/lever/userdb_recovery_task.cc
-index 818e2fd..2a25efd 100644
---- a/src/lever/userdb_recovery_task.cc
-+++ b/src/lever/userdb_recovery_task.cc
-@@ -5,6 +5,9 @@
- // 2013-04-22 GONG Chen <chen.sst@gmail.com>
- //
- #include <boost/algorithm/string.hpp>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <boost/scope_exit.hpp>
- #include <rime/deployer.h>
diff --git a/app-i18n/librime/files/librime-dictionary.patch b/app-i18n/librime/files/librime-dictionary.patch
deleted file mode 100644
index b8ce53f3992e..000000000000
--- a/app-i18n/librime/files/librime-dictionary.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/data/test/dictionary_test.dict.yaml b/data/test/dictionary_test.dict.yaml
-index c0b6d65..7e362b1 100644
---- a/data/test/dictionary_test.dict.yaml
-+++ b/data/test/dictionary_test.dict.yaml
-@@ -5,7 +5,7 @@
- # http://android.git.kernel.org/?p=platform/packages/inputmethods/PinyinIME.git
- 
- ---
--name: luna_pinyin
-+name: dictionary_test
- version: "0.1"
- sort: by_weight  # by_weight / original
- ...
diff --git a/app-i18n/librime/files/librime-test.patch b/app-i18n/librime/files/librime-test.patch
deleted file mode 100644
index b890cabfbb33..000000000000
--- a/app-i18n/librime/files/librime-test.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 82cd141..bdb5169 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -10,6 +10,7 @@ set(LIBRIME_SOVERSION 0)
- option(BUILD_SHARED_LIBS "Build Rime as shared library" ON)
- option(BUILD_STATIC "Build Rime using static libraries" OFF)
- option(BUILD_DATA "Build data for Rime" OFF)
-+option(BUILD_TEST "Build gtest framwork for Rime" OFF)
- 
- SET(RIME_DATA_DIR "/share/rime-data" CACHE STRING "Target directory for Rime data")
- 
-@@ -47,10 +48,14 @@ if(Glog_FOUND)
- endif(Glog_FOUND)
- 
- find_package(Threads)
--find_package(GTest)
-+
-+if(BUILD_TEST)
-+  find_package(GTest REQUIRED)
- if(GTEST_FOUND)
-+  enable_testing()
-   include_directories(${GTEST_INCLUDE_DIRS})
- endif(GTEST_FOUND)
-+endif(BUILD_TEST)
- 
- find_package(YamlCpp REQUIRED)
- if(YamlCpp_FOUND)
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 05db7bd..205b1c9 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -19,8 +19,5 @@ file(COPY ${PROJECT_SOURCE_DIR}/data/test/dictionary_test.dict.yaml
- 
- if(NOT MSVC AND NOT XCODE_VERSION)
- set(RIME_TEST_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/rime_test${EXT})
--add_custom_command(TARGET rime_test
--                   POST_BUILD
--                   COMMAND ${RIME_TEST_EXECUTABLE}
--                   WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
-+add_test(rime_test ${RIME_TEST_EXECUTABLE})
- endif(NOT MSVC AND NOT XCODE_VERSION)
diff --git a/app-i18n/librime/librime-0.9.9.ebuild b/app-i18n/librime/librime-0.9.9.ebuild
deleted file mode 100644
index c1693bf1f7e3..000000000000
--- a/app-i18n/librime/librime-0.9.9.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-DESCRIPTION="Rime Input Method Engine library"
-HOMEPAGE="http://rime.im/"
-SRC_URI="https://rimeime.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="static-libs test"
-
-RDEPEND="app-i18n/opencc:=
-	dev-cpp/glog
-	>=dev-cpp/yaml-cpp-0.5.0
-	dev-db/kyotocabinet
-	>=dev-libs/boost-1.46.0[threads(+)]
-	sys-libs/zlib
-	x11-proto/xproto"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-test.patch"
-	"${FILESDIR}/${PN}-dictionary.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build static-libs STATIC)
-		-DBUILD_DATA=OFF
-		$(cmake-utils_use_build test TEST)
-		-DLIB_INSTALL_DIR=/usr/$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-i18n/librime/librime-1.2.ebuild b/app-i18n/librime/librime-1.2.ebuild
deleted file mode 100644
index e2ccff847d1d..000000000000
--- a/app-i18n/librime/librime-1.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib versionator toolchain-funcs
-
-DESCRIPTION="Rime Input Method Engine library"
-HOMEPAGE="http://rime.im/"
-SRC_URI="http://dl.bintray.com/lotem/rime/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/1"
-KEYWORDS="amd64 ~ppc ppc64 ~x86"
-IUSE="static-libs test"
-
-RDEPEND="app-i18n/opencc:=
-	dev-cpp/glog
-	>=dev-cpp/yaml-cpp-0.5.0
-	dev-db/kyotocabinet
-	dev-libs/marisa
-	>=dev-libs/boost-1.46.0[threads(+)]
-	sys-libs/zlib
-	x11-proto/xproto"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-
-S="${WORKDIR}/${PN}"
-
-#bug 496080, backport patch for <gcc-4.8
-PATCHES=(
-	"${FILESDIR}/${PN}-1.2-BOOST_NO_SCOPED_ENUMS.patch"
-	"${FILESDIR}/${PN}-1.1-gcc53613.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build static-libs STATIC)
-		-DBUILD_DATA=OFF
-		-DBUILD_SEPARATE_LIBS=OFF
-		$(cmake-utils_use_build test TEST)
-		-DLIB_INSTALL_DIR=/usr/$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 7119de75abfd..25a2c20414d3 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -3,7 +3,7 @@ AUX uim-1.5.4-zhTW.patch 1034 BLAKE2B 131fe0940d02f1a12984db63ad92190a131c66ee64
 AUX uim-1.6.0-gentoo.patch 381 BLAKE2B 4a9184a9c5e28258691a116c4b7bde8bca200d27e125748834b1ce460be04041065ff025cc8f55d9164b75d37206ab728210a8b28943255dde959ccaa38a33c8 SHA512 c5445c74269aa51a07fc41e5ecc05bc6c4e73527dd6780e13070efa4f9074f5a3eddcd150c38981393cec5d883e73ba55e4b1f3d460aeaf40817ce60c268f417
 AUX uim-1.8.6-libressl.patch 2041 BLAKE2B d13fc555ce0351b46a08f6fd258a5f222ac104e5107281548a97d2251cfcec89ece8addc2bd5be51f192a854b72701bb9abdc1f97e2c717cd2ae907a088579c1 SHA512 a1af2af13b26b631064165c8f6d6dafaba09d236b489e0e8fd84a7ab6d9c0720a8a91cd9f8baabcc1e640157559fd77f68e18d5e85aaf0c335e25b69e0ef120a
 AUX xinput-uim 108 BLAKE2B f66525e52af923170224ca9953e82489d7f6f92c3e83d96452663ebd538723d1dbaaaa4233bf2bebe1ad6f783fffd4e3e4e82bba5f6fd92d0ef88e3cbaaff6eb SHA512 b3ba31a87e19f589ac8051ece45b6b6c44b295dde76a5ce6164d1e435d791c4e7cafc7192177384f4052fd928caabb8574a9192cf783f4cb22e4ee16741343fc
-DIST uim-1.8.6.tar.bz2 6500739 SHA256 7b1ea803c73f3478917166f04f67cce6e45ad7ea5ab6df99b948c17eb1cb235f SHA512 26a95d3b51ef7a99108234b9af30ee7b74141cb3af13d092d4cdbf0749f630934cfd67f74b09dacc3adcdce4a390104489d68a4e2419ec07418645a9b4e5715b WHIRLPOOL 77362b5ac6bea217b4373184eb19d79c0b19a8c3f9c27945abccfd414d0409a33438a3cd1d1d2370b6b2f7154a6c35688ae4b2e57f50dc29524bf71938a38a28
-EBUILD uim-1.8.6-r1.ebuild 5863 BLAKE2B ca52e494265a75928527c0a74b638e0d8976badb026665df01f9cd142cd8ae115b2bd4d048714dadbaac97d0a8423f5c3474514a1f405ddf781b6e958172cfc3 SHA512 1068c38129f16af382a6642edab0225e0d31b533eb6faf821f668fe7e595ec86bca3abe7ca08113f8ceafa90094610f8b492d004066fab0c05a0f839625386ec
-EBUILD uim-1.8.6-r2.ebuild 5971 BLAKE2B f464034bfa1a3467253e7330bb6bd6916ef450ecad8e42a82c2621e252a05bef940201c9172a2245be591eba1ff61f4def66f3ab0313fd3a1c2def34beaf0812 SHA512 9fe8ead692d3ec17f05bbc34b77545be6a597f44cd00c6ac9543da56799164b4379e801535bb402cecc2a18cf5eba96b3be4a47127c12a4f1a7aa2a9379ce2c3
+DIST uim-1.8.6.tar.bz2 6500739 BLAKE2B 78623c015cafafa1fbaf32542535de1f0207f8452a422d929a15f4421e4c9926192d0d3b761a7865a38affdf616dc5477e083c0fd8655261ff80ca817fd37029 SHA512 26a95d3b51ef7a99108234b9af30ee7b74141cb3af13d092d4cdbf0749f630934cfd67f74b09dacc3adcdce4a390104489d68a4e2419ec07418645a9b4e5715b
+EBUILD uim-1.8.6-r1.ebuild 5791 BLAKE2B cb61ee664c059f9c68d6625d6d59b937c0d518d284094db9cb1b7f54fed48300483f75553d83328b314a71227ebd935a15bfa361d005d07860bbb8892af99231 SHA512 ef2acdb2a57f4a809790bbd2e8d6886a32fa6581dd2ccf19578cc54030433eb7ca7bad1ff1cb3f2bd1d1cd275ac98500f81392da6b4062a99cff9a50911b44f3
+EBUILD uim-1.8.6-r2.ebuild 5899 BLAKE2B 435a763610a8ecd15ebf877d41b9fa86615302aa1e312af1a0e8966220821eb7e3c82c54f63c8da0493ea55fb6a77e1121e9885995d1c20c698550fb1492dfce SHA512 8582ea76d6ba9ad94d3bbc4e4b721c36dbcb3353529f0f5d64e1c0c17b5f48880e4841b72436734539629c00973e432c464b38b197e6fa66d9fa54390bb3eaff
 MISC metadata.xml 1064 BLAKE2B 627c105f3c768168368bfa609de02f0fa067902f6975926e50c4b36983f44b34fcd46905d2d59cbda4533e045f8c7dfb1a1c4a58c92ccc78a3217232a6a67b60 SHA512 e265b2bab3338a8cc89b456fbbd46b8a2a1c59f50704e66fe3505e955b75226b786fff3abc061b9c7fe2edb5039fe265d59cf5b4750fd73ad092aafe4b390a56
diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
index c5648efd8e3d..4689635b1b7f 100644
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="https://uim.googlecode.com/files/${P}.tar.bz2"
 LICENSE="BSD GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm hppa ppc ppc64 x86"
-IUSE="+anthy canna curl eb emacs expat libffi gtk gtk3 kde libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs test unicode X xft l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW"
+IUSE="+anthy canna curl eb emacs expat libffi gtk gtk3 libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs test unicode X xft l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW"
 
 RESTRICT="test"
 
@@ -38,7 +38,6 @@ RDEPEND="X? (
 	libffi? ( virtual/libffi )
 	gtk? ( >=x11-libs/gtk+-2.4:2 )
 	gtk3? ( x11-libs/gtk+:3 )
-	kde? ( kde-frameworks/kdelibs:4 )
 	libedit? ( dev-libs/libedit )
 	libnotify? ( >=x11-libs/libnotify-0.4 )
 	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
@@ -56,7 +55,6 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
 	>=sys-devel/gettext-0.15
-	kde? ( dev-util/cmake )
 	X? (
 		x11-proto/xextproto
 		x11-proto/xproto
@@ -135,7 +133,7 @@ src_configure() {
 		$(use_with gtk3) \
 		$(use_with libedit) \
 		--disable-kde-applet \
-		$(use_enable kde kde4-applet) \
+		--disable-kde4-applet \
 		$(use_with m17n-lib m17nlib) \
 		$(use_enable ncurses fep) \
 		$(use_enable nls) \
diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
index bd5220cb72cc..ffe51b96501d 100644
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="https://uim.googlecode.com/files/${P}.tar.bz2"
 LICENSE="BSD GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+anthy canna curl eb emacs expat libffi gtk gtk3 kde libedit libnotify libressl m17n-lib ncurses nls qt4 skk sqlite ssl static-libs test unicode X xft l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW"
+IUSE="+anthy canna curl eb emacs expat libffi gtk gtk3 libedit libnotify libressl m17n-lib ncurses nls qt4 skk sqlite ssl static-libs test unicode X xft l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW"
 
 RESTRICT="test"
 
@@ -38,7 +38,6 @@ RDEPEND="X? (
 	libffi? ( virtual/libffi )
 	gtk? ( >=x11-libs/gtk+-2.4:2 )
 	gtk3? ( x11-libs/gtk+:3 )
-	kde? ( kde-frameworks/kdelibs:4 )
 	libedit? ( dev-libs/libedit )
 	libnotify? ( >=x11-libs/libnotify-0.4 )
 	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
@@ -59,7 +58,6 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
 	>=sys-devel/gettext-0.15
-	kde? ( dev-util/cmake )
 	X? (
 		x11-proto/xextproto
 		x11-proto/xproto
@@ -139,7 +137,7 @@ src_configure() {
 		$(use_with gtk3) \
 		$(use_with libedit) \
 		--disable-kde-applet \
-		$(use_enable kde kde4-applet) \
+		--disable-kde4-applet \
 		$(use_with m17n-lib m17nlib) \
 		$(use_enable ncurses fep) \
 		$(use_enable nls) \
author	V3n3RiX <venerix@redcorelinux.org>	2017-12-01 03:04:39 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-12-01 03:04:39 +0000
commit	407525b571b48cfd65e1ad7a02d250a927c967c9 (patch)
tree	844bea44d85dc7218f54970af1c42cc9d55c3f1a /app-i18n
parent	89c6c06b8c42107dd231687a1012354e7d3039fc (diff)