gentoo resync : 02.11.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-11-02 21:07:25 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-11-02 21:07:25 +0000
commit: 27dfd272ae3be15b1017f733682211afa1c7c0f0 (patch)
tree: 1fe1c9ed5c5d79c63069bb8d541be075ccc3aac2 /app-i18n
parent: d950fa39dbe16d164ed0cb8e3036fd5d0d896a4c (diff)
61 files changed, 48 insertions, 1171 deletions
diff --git a/app-i18n/anthy/Manifest b/app-i18n/anthy/Manifest
index 6d9931b6791d..0662dea4a858 100644
--- a/app-i18n/anthy/Manifest
+++ b/app-i18n/anthy/Manifest
@@ -2,7 +2,7 @@ AUX 50anthy-gentoo.el 63 SHA256 7a1e9904ba583fce8e3275d8e73cc3f5a171099b8abe416b
 AUX anthy-anthy_context_t.patch 174 SHA256 9caf62c425cf537704599da459676ce42cb6a2fb5deca80439ba3be7948652bc SHA512 3f252628f77f53dd96eac50f08a36bb782f0ddc37446c1bdd5bd94fffa3454b9adcaff7118d76fdc7e8bc3f86b1a84e9830da5b67b2b0d281847b26ff62cdee3 WHIRLPOOL 6329db64e6cd3c5487d647f860d3802b19b14e34504c35de69222031f2c73cba3db235f9bb0f2300c15b6e4ba29ff061c977684ef35050e4bf169ff78db53401
 DIST anthy-9100h.tar.gz 4446148 SHA256 d256f075f018b4a3cb0d165ed6151fda4ba7db1621727e0eb54569b6e2275547 SHA512 315ebd9e1af208f3ecaeaa13620213b35f004e47edb54e60c3e02c2997444cd2326cc58b725dd2d0bd6a723130884d946ea193ea3d92418082256b59ecc8d88b WHIRLPOOL dfdaa96e19dbd53ad627c40521922c7df74858e9836a770059dbd6005a09e3978bcd46bcd40380360708c4234e91e77d91161064614596047f53020c2c571245
 EBUILD anthy-9100h-r1.ebuild 1319 SHA256 a78e82f1363d090099d22e1ee5eb0121564209d23d475e810c9488010687cfed SHA512 ad8723d14c9269670c8f46131b92f0646fffdc1e8b20be6bef387e8fdb0168b6f715ebc4a39f0de5e74afbb3fd9619eca755023adfc46e06946f21576b443baa WHIRLPOOL e545556f3c90d6e800a99c4a8b0d4160d25b7c9d06a7bffb5e9cd65e40e3788d4a38695ad9ddaad6ca1e5bc9b13c874bf4f4190c9cc6a305726c9f3794219475
-EBUILD anthy-9100h-r2.ebuild 1273 SHA256 b2c333ecfb20a472f1fbd111c2a8ca37262cad8cce082f87efd32e9084f81fe7 SHA512 88a4ac35a38baba020d3762cab2e7e716dcf8f19901c8c03d85bc69a02f949895d7df49adf0f437a4f7b1fc65c88ba15532b3c594a7bc049d3dd3db32f0cd9a0 WHIRLPOOL 9b978c8e18290dcf1f57ae8b30ff6fc1071adb01e6ce01313c8b30757fa38ea35aa05b819427ef4b00148b56c58b7cb43d215988d48e7e6156647b9adbf67b97
+EBUILD anthy-9100h-r2.ebuild 1271 SHA256 91e1de54bd722dcca0c87f85bdf1d5966a99df09d35f24dcd763bcb742441eb4 SHA512 88d39f33c281f5c2bcf98b871b29aece756056efc3b8c11053513e4ae8cdda403de379914e23c300466c926c1c1cd48f43fe61ab33796e603fdc11d4d482ffa4 WHIRLPOOL 3230fe2203d6332d2f9273e673305e35a9a3966bcecb4ff10aa2749212814b5d191750938762ee0b61a7b1b00418badb609ed79ad2e4a00677a81ab602d82ae6
 MISC ChangeLog 2636 SHA256 40fc27d15ed3932047aa3a2a2f8c0ae1c8fab243864a8fe24f935108c2346f63 SHA512 a6ed41a2e4b303e8d58dad1ab1d616457fd5d2f95ec9df8e87600bc35d56b4124e6ef7a87d0655d0d1c0b555328c4963eb06e2468fdb740b6dadba8d990a0616 WHIRLPOOL 7b5c14bfb04aeaa34b35a057b5f505cbadbbf866b7e7b16ada17c050bb8e6ce94d1811b47e4a95be1dfb6397f5a6bb8f61c0a7e77f1261bd85d2f7be3a4bbb04
 MISC ChangeLog-2015 16940 SHA256 64c550bf8282c0c7739ec8a26a8d6f54b9d4f6fda50e9ebe6486728b9902a6ec SHA512 c919a2643933290b77c6f4940ea8f6242e4914426f10e2a401c316054b8627836347d4d395f73bb21fa13bb34dabb1671859638b01b6e8b72ebbe10278731c4b WHIRLPOOL 437cb056e614b7917f2b686d94758d488bea1e4e090f4250f063c62b096498af426898b9cbec03041760271cf6997d153d145bdecce0d623ab1789f2431a8cb5
 MISC metadata.xml 903 SHA256 ca6cf4e8cb82690a02e746deef29a2c6d388b9571e82cbad29082c943876b25d SHA512 6fed9f2dd2b723292db8348fa4977659600b2d755f74bdfd7d9007b60d2c505473af01f5277d41155e9cdee6243d6e8faf9254c9e6963787509ea4a3f37117c9 WHIRLPOOL 3a7c86c9792ed93937dcc90bc93d0c486fc6e9869abee789a4ba17a9a9d50ba7f8f9b780f4373e87e2d0094245ec47fc108886dfe6d8746551ea633b4d73c964
diff --git a/app-i18n/anthy/anthy-9100h-r2.ebuild b/app-i18n/anthy/anthy-9100h-r2.ebuild
index 7b639dd72147..fb6bc0839f32 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 c6141728d5f0..e5e84fbcd0d1 100644
--- a/app-i18n/fcitx-anthy/Manifest
+++ b/app-i18n/fcitx-anthy/Manifest
@@ -5,7 +5,7 @@ DIST fcitx-anthy-0.2.3.tar.xz 78020 SHA256 ed9b4956356ca68e5f7bdd46492873ebebc92
 EBUILD fcitx-anthy-0.1.1.ebuild 546 SHA256 604f0821ab837ab5e365960809210dff7252088783a3460f10491e720bd16285 SHA512 3fece6bb17e588880cab84dd6f53842fe7aae0e91d9c008412ec601c7552c27714e3641b63f3b74a55f7bb1d9535f9868d6508cb0e3f72f8ecdb3622b77e5c7d WHIRLPOOL 75b35b054f9ecae858ef8bc61d2492f4d3be6caf9a011ba23d5b05ae5e70b27a956d0d51a5fa5f3a917aa1e7906763fbf5eaab193cf50fc9276349463fdaf982
 EBUILD fcitx-anthy-0.2.1.ebuild 555 SHA256 22d3604c182a54f5b8b4eb10abad7248cae45857f99e9e82c364f2c49f8a2339 SHA512 0a3ca967059895b76ee2b1f60ed1e28e2646deca2988a62241035017ccf264f0cebe920c18ffb23e33916e11fcbb2f274f0a0ad234f192b5b2ecbde88c6e3161 WHIRLPOOL b9a7e34c1db46f9e68a0d3ecc2b5d5dafed5f1c1dada3a8c95122603c9ff49cf5d271713bd2991725ac3e44e97c283d9a7c3f4d238d8b645c4a34d85dd02077c
 EBUILD fcitx-anthy-0.2.2.ebuild 557 SHA256 4c1b1635958e41150673e8539c561b2370c464110d7f47ac928a714b99ebfa7f SHA512 0143cadaa44bae98e47f5539ee9cc6d762840cf4c786994d2ad6928c5d5aee723e6a9fc3e05f981d77d8cfdf0da33c0a4b41c50b0a5de7d53920fc0e372b61d4 WHIRLPOOL 54104a3d53bfe2c14b5c80db53b500956d4d7bec8d37b08b8a5f04cdc41e8e383fd6d10d19f527cd9811ebbc27b1c64cef3ff6accf9db2cb1ab50dc47e2efce3
-EBUILD fcitx-anthy-0.2.3.ebuild 798 SHA256 2842e618e62d84fae2a91a9847c2f3cfc468b9f0e2cef68f1e9fb00277aec300 SHA512 98ce1e843c10c2b22fcb0279d63902000f3192cac5149d7de075daad6f6079ecae58d0b49f38ec9ff4406288abad695f1b9d8e6e4a4f15c94daccdf834d0656e WHIRLPOOL bbffee20ab1c8ccd2941aee51fd8d597d36e75194e524cdfb09cd281276f1bf779aa209f4b9d1724d9f942bf5696f50380c418867be44a53e14395a341254b67
+EBUILD fcitx-anthy-0.2.3.ebuild 796 SHA256 ad2951f2b824f2682cac9591c662be0c5271a0e2491845eca587c30a86c00255 SHA512 cb4178b756050af48bb5a590c3764edc2ec08dcf1f7ea5dd5530243229454b76c2144d92f9b1cd6bd3faef2fc7c991573807e9b69256db5e5dd5fdf1f3a33044 WHIRLPOOL d453545b7ab413af3134fac424741770fa07d8891bb752f3412f581573b822bf49075f0b892a5b21c0991a545e09a4ea8b3815ad51a357fa4e195af43cc820f4
 EBUILD fcitx-anthy-4.9999.ebuild 775 SHA256 d5311855be82defe1c47a43816dea7bd07a66c710b7e04dfdee16fb970d8505f SHA512 a8c73f6c922e1712d5a834ea3518b88b077fde056506600db5450c733be11d2570e2553d65d89fd7647909aff8bfd16c6d53fbfcc50e369974db9fdde71062f9 WHIRLPOOL 0dd0cc4c60c41be59d13e5e39f2e8d253cf441f5bff7f5015cbca4c3082a164855217f41a586fc9696a3ad1a824b302f6b8603ae8214b1d2274b668c33acb215
 MISC ChangeLog 3097 SHA256 fb61e0b1c955292d73a91f9be30e9c30ef985eb8d4516001a7457d3bb6ae0f3c SHA512 1c28ac10816fa72549225b86a10a130ebf768e998ad4508fff09018a45f0039e50ad123da4f16d46aff2842b1174e8fdd91efa025e18d5d156de8d565c5284a0 WHIRLPOOL c8f7a53020c3555be3cf1a943918295246bc1367852327323d6792e0108a2fce0e3eeb6c1cd963050f78be8f413b8dad884ee2c08015beb1cee54985a637e16e
 MISC ChangeLog-2015 1546 SHA256 bb0fe2c154f94786e5c0f6644ce7c5b43cae2c70aeb05b461178c57320cdafc8 SHA512 484fdd99f466dd0bda039a267cfdc5e51fc1a240b152a157ea73946046f8d3fc3811399ca031f82453645e76773803399c8f84fd2a42b643a4559553ab8da2a7 WHIRLPOOL c807284e9424a581e9b76344d3b654a0b40591ac0070fb7600a697272b8ec453234b5fe8235e87659857f8c4ea593b5dd134a8bfe435c5f2219e8704c97a4645
diff --git a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
index b9f2d9c0e8dd..817690667e52 100644
--- a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
+++ b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=app-i18n/fcitx-4.2.9:4[X,xml]
diff --git a/app-i18n/fcitx-chewing/Manifest b/app-i18n/fcitx-chewing/Manifest
index 7cf4752da1f1..fdf91aae99fe 100644
--- a/app-i18n/fcitx-chewing/Manifest
+++ b/app-i18n/fcitx-chewing/Manifest
@@ -3,7 +3,7 @@ DIST fcitx-chewing-0.2.2.tar.xz 19684 SHA256 fa278ee9d2c20f7ae0a3093a3e490553798
 DIST fcitx-chewing-0.2.3.tar.xz 19804 SHA256 b313c7134eb173668f42535b0eb6e985eb94fdf5d2fe705940a6cbfdcbadbaf0 SHA512 3492ad6ecaf00bb1ea07b76c9c23da075615597c1a68434a2da003cbe410d12172510d4306379777a1d04a359b017c49d278c002a7230b030693b668b6030bfd WHIRLPOOL 32475349ac0cd89b0741e64a0ba02ef854d42dee51ac96ad7b9134afff8b81901eadb5acf338b018a936bb5fe2a675d4f15beb4d98c261832d95641ca86f4492
 EBUILD fcitx-chewing-0.2.0.ebuild 422 SHA256 236a9eef500dc8407c54de9f982932dff873fef870f3246818cb5840b6417095 SHA512 b3f4b15d0a726d20bef5f13e326f22adea8f3bc5666ca322d1f359f51333d9872f0bb89ea53ce2f876c084d1fbb7ddea693b637371cf692ad36c5e252fe81ca1 WHIRLPOOL 107f4412e8ce1ab9a709fa8982520306615a8d718a9e17a94df21417e7816b5a8b2c1bfe9f0e80722572d7eadf5a933d5e5b91d1db061a5c81a07f53224ebf99
 EBUILD fcitx-chewing-0.2.2.ebuild 431 SHA256 29513957489ee054d055c1e2020a2b32f25fc742da8e7cce26fee01e53f50e69 SHA512 235757c6b38fc73a8720af771adb2b200ec95ee3b0a9aa454ecb2a8ecdb5cd4401ab51d089efb96b076c990c99e91c8ad68401a0b5d44acd5821f9a7bbb1210f WHIRLPOOL 428237d80a8fc69b1f550b295a5c3c546b94a6d802124804161d295285e264f9d3625e6b1c4bd4feee7fe624b6b1914c6b17c9e4da206bf4e0dd82d9edff90c2
-EBUILD fcitx-chewing-0.2.3.ebuild 808 SHA256 14267af25284d48b749a0839ae2f68ab8667a0cb2f662cda39ee4d17c1e45789 SHA512 7662cb384d13b58319df772f4668e91e611b2000214236ce6a3caf186b1b7ad6b706a730f4e39b23d7ba08f6c173e5cbe32636f3815f7e3ec534afdcf42b2cae WHIRLPOOL ef79a831653b70e0970c5932b151e810e4101d542bd9e85cd066666e67ddfae3f9007f8b8bd0b3dbc83125279af1735b027fe8f4550198b89003d7bd5bbaff3e
+EBUILD fcitx-chewing-0.2.3.ebuild 806 SHA256 d8ec54cb3189a6a8ace5dcfe0891cd599751fef543e067e951bbbef88f138fa8 SHA512 1fa17cff02f8569f3f523cbb6886403b4bc68923c703eb861cb31d1061bcfb9080b35b1ac7fafe42b05b8e083add106554c9faa7c9703711c8cf0f6a37e5df6b WHIRLPOOL 09b531da50ec99490e2130ad7394ae84a039ae7c46af6491ad5100b87dc46f0456cfa26a2333f4a8bc9bf53b459c2a3aadaab2a7a0a183857331f118d3e1fa4d
 EBUILD fcitx-chewing-4.9999.ebuild 785 SHA256 81e2d56d6c425439de06a7ae8b67e47b8315693c6e8d004eff6a586a560c3733 SHA512 0f294bfd3c8d5b071f1035eff39e802b4f51aa00034f83507c6b30bca975da223b010f1ad933cd9326ee81efb837918bd4031523b455cab46730a6b44b1836f3 WHIRLPOOL ae556836f9297c0d98af0067631062ec1e7e899ea39bc725d87fb587346fda264155b339f149117ca601a2121e76e24a126ab2d3bd22605dfe0a3a14b44bf877
 MISC ChangeLog 2900 SHA256 84dc0cbc006e11cdd9d74ec8eba129999eb6e4e30073f56ce33550038dcdffb3 SHA512 b0512b343a0f78bec2214b952c727f50db0cf3af55a397d80682587975fd3fd7f7095411862fd5e336a57ed9cbf497551627849afbd0ef769bd46417f6ac1b22 WHIRLPOOL ed31c7f74995e547687108c73ad1bb719905695015c5c6074db228bb579d9f152343e39bf2c9751f5e8c00c3ac0788c87c00702a3a17120879e9069d052a614d
 MISC ChangeLog-2015 1578 SHA256 ab8b2bb320e933efe283b864402860cb4a022d3b5d4d9017710b382d0d8f3e80 SHA512 f08dd10e27e0b3410d30012dba075e504315ce217b956be84187efe051f6afbacb5903fd573c7ecefc7fb81c83eece6df8b85b8ff22a36b4ff79f9c38f8478f3 WHIRLPOOL fc557d9e3ae21e19718e54d34fe6fa2b259f555f7eed08fbec58efcaa0dc58d6744b2f96daa9cce7e70852c39fef4ea0452e465d94418bf7109cd79ce0476fbd
diff --git a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild b/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild
index c6ba5224f161..1cc25f8ec708 100644
--- a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild
+++ b/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=app-i18n/fcitx-4.2.9:4
diff --git a/app-i18n/fcitx-cloudpinyin/Manifest b/app-i18n/fcitx-cloudpinyin/Manifest
index 848e4e2528a5..369bbdca56b5 100644
--- a/app-i18n/fcitx-cloudpinyin/Manifest
+++ b/app-i18n/fcitx-cloudpinyin/Manifest
@@ -3,7 +3,7 @@ DIST fcitx-cloudpinyin-0.3.4.tar.xz 20796 SHA256 c131e8cfd4d171f7749c2934f13092d
 DIST fcitx-cloudpinyin-0.3.5.tar.xz 22424 SHA256 2515fe35d1f9d377a997ce8095425ad71d0c76e3fcba2e1fffefc2ba46b765a3 SHA512 b56cde4955fab02d204cfe937b46aeb5b6adf9e4eb4fead6e7b8e0b5cd1ebce06a0de3f9d477a1cb58eb077655f17975b7e13951074d1766b283b86eeb5b276e WHIRLPOOL bf05a4c882d14a9ac3a52bd2d3faf87ee67aea583199d7c5888f425db0f080bd6bc73a8fd3a2236f69a65f40ceef9bf2882dd24838f7dbba8407eafc8695235a
 EBUILD fcitx-cloudpinyin-0.3.1.ebuild 494 SHA256 06319b12c38901a0a276fe9f0ddfc8994a1a5d0beb8dcefc11890377c6be069c SHA512 a4048142501cc6683b4427127c7c0fa188c99f3e33dfd04783007ccc87a967e86923a8ec17cdfe835d53184bd3628e482ac0f52e75d12af2e5e1ada09ff569aa WHIRLPOOL 31dd82509b63801d291fd8efc375267c6b6a743e3c1da7318f43f9d6c419bf1236422d21c2773ac6d72532e2b3090120bdb2b61be7a1770ed2ff736eb0e145fc
 EBUILD fcitx-cloudpinyin-0.3.4.ebuild 495 SHA256 bfc67b0472a86fa30c80ea532098e8f2c87eb08d1e3fdbfb433fb8143634246f SHA512 37d21184dbba30e7a33c802f8bd22077d97608d882b55f441e273a568bfff2fe0dcd60c6794a93d0595b767555dafbc1e52f9f56ab4e7ccf6344b276554cb7c0 WHIRLPOOL 1d32187c86ba56592ebb724f5465a8faaa0bc107efd8bde9fadf494a08fe9aa10ed2e0c9ca5bbe583340a83c7d5004697a7f6a4f548c442feefa151e23614d43
-EBUILD fcitx-cloudpinyin-0.3.5.ebuild 739 SHA256 4d3fcfafce93d781b73b3e62f28c4f371f6e30c8546d0079b07e363fe1a5efa8 SHA512 c55e0be75dfd53744d1012e084d6d0839644025fd092d97bbe04f356f59401f557bb216e1ea151c55e79ec9b3d115d438005f89fa4a6417af041a01d69e04cb7 WHIRLPOOL 1a17c7084ed9a57263caf68c473b464574bb2148944d1e8175a5e7b7d3276917c60cac681e5029802571e5ab64b5821392b1ab20d5b0028cd90da77d238ec07b
+EBUILD fcitx-cloudpinyin-0.3.5.ebuild 737 SHA256 74f4781472db1ea480969726c5b154909e0057cfebc18c912330af96a0351b87 SHA512 033cbb264db824c35abe01ae23331d99d6dbe26bfc117f91d09b5f34998420098bb0792ff726cd0d47914ac7c414edf2a383f447778a7028c52dfad58608b1a2 WHIRLPOOL b3b209c07565f7111b5298e7607e3c59ab0e857976ce4c1ec24f78252475483bd6d7c4ee544928fe96420f263dbe14bb1a264a6f25fd3d86f9912dc004858be7
 EBUILD fcitx-cloudpinyin-4.9999.ebuild 716 SHA256 0e33a71914ed181209e354931aa0aa914adc7c788cadb200074d2aaece7247e7 SHA512 fb16336058eda6ebd85001efa3f515eadc7dae11d0c0009015fa59a25ce51261cd005dd96b01004a1528e8f31430a39e73bc378035fa188ea30db310e8a33338 WHIRLPOOL 2603c646ab85059c2bec8d81cc05f836a0e6697754aaa14b0df85248c44a5d95c5af0c7737dbe43512103540c06d353ceb8e06adc30c6744dd61fa4bbe13dd62
 MISC ChangeLog 2816 SHA256 1c57c6d043a47016e5fa851b087276cf3f40d7385bb974339c2e012180fa7ab9 SHA512 37a408b59e24acaf682c6435c41a74e7cde0b30717a7e620456940cf8caa237842bc926b3d9bfbd3587e28b1c955c00809a57d31494678b68c69f6310630d3bd WHIRLPOOL d876a0b9d7964fb10070fdd437f8d51a90a245e92ff590dc90c00140d43618fb443eb3a7fafee28ce286e401a8c55b8f6f69f3f47406349f4793b62c934b1568
 MISC ChangeLog-2015 2532 SHA256 66cb3e178ffe129233216cfeaf3788696589cb04705715da287110cf1f2f1ea6 SHA512 6e287439e794d9bd0e8674947a00826a8d321cba9077c4a5246fd51104b8af6a1dd17fd3042917fcfc4dab439bed2268f37765ce784e3c2704c47a143b38890f WHIRLPOOL edb5bec01dbc08ed5cdbacdd132e36047eefff9e400e7de3373ef148af0eef6a048ae35aee0a5dacdb5d9077835f264b430e23443122c4d8e652064b40abe86d
diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.5.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.5.ebuild
index 8991ceab3f88..1319b51a4dbd 100644
--- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.5.ebuild
+++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.5.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=app-i18n/fcitx-4.2.9:4
diff --git a/app-i18n/fcitx-configtool/Manifest b/app-i18n/fcitx-configtool/Manifest
index 11285ab195ba..5ce0067abf0b 100644
--- a/app-i18n/fcitx-configtool/Manifest
+++ b/app-i18n/fcitx-configtool/Manifest
@@ -2,7 +2,7 @@ DIST fcitx-configtool-0.4.10.tar.xz 50440 SHA256 bcc4976976bfbddbfec3f689f38927f
 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
-EBUILD fcitx-configtool-0.4.10.ebuild 831 SHA256 a93085c476c436f713945e45b08c0b7fae7b805905d3889e5960d65a45f50d6d SHA512 0036c8a40aa657b937bbfc1c9fe3bdc79c85978e62bf438a3674e573842feb0f645227cb938e2c9faea267c5581926357bfe0525572560bb87846ae7403bad71 WHIRLPOOL f60663979c4b456b68d4bedeb2f057d5ae47f729ec68d863be86c6e5123884e2db77e53f626f2411fe853cd8a9cabb71b7b5e37f4e7c7b94839c8d677b667c4e
+EBUILD fcitx-configtool-0.4.10.ebuild 829 SHA256 a13433ed5ab5d6ebb81c46b3cf7d4f8c93f0d4ca40552f7ed33dc01eb51a95ac SHA512 9445fc116b517e5fec34a3d8ccb671b46bdb8ff075f1e128b46a58ae24603caa33b3243c8dac4212c8f42663af54929ceb0681218744717e212dad48499c9e43 WHIRLPOOL 5aa0ac2cf3f900b0aa47b69f89499e3e5fad7f58943fefe2378bd5174c84b5b544f26224a3eb54448e150668f270923ccc17c9a18039182a9130d8063608a301
 EBUILD fcitx-configtool-0.4.6.ebuild 735 SHA256 ec6c0a585b4a3d6ae21c13b772ef3cd0a271270af71870a4e394dc905ebdb124 SHA512 901003da2ddfef080860b1a4365b95952aac85c0364738b40398daf71fc32f69c3f1477f3a5cac21bd4260f5aca162fe21209564711a8f254b2ae03b8ba8d0a7 WHIRLPOOL 0e828b325ed0e854b4c5f41cd239656d71541310f4f8c02d46721c72c576f4a857fd183c227798e0f9c36d5916537a97ed54720ff54a76986b3b9b010cfc42e9
 EBUILD fcitx-configtool-0.4.8.ebuild 735 SHA256 77adf1ecaffaa2de165be71a7fa64cd0ad1e12614725a8450306a2eced5a2da5 SHA512 71b4fdfbe5fad660ef83fa3941bd704ae8c71dc62fc42619958d376c33f6bd5235b41951a55700fd1d4004564dfaf896bad18c9d47800c79a5a593157d5ae977 WHIRLPOOL e3146c685c8682c59042daab087f24ad9f52ed786bccdbfc9853e2deec135995119daf4e538ec030b0783c34b2b0006a1c6b6780da38184d689e0ca89b3f6752
 EBUILD fcitx-configtool-0.4.9.ebuild 809 SHA256 69b7d71c36cc631f09d8544aa43a4594651544ffba04bb767eba92425274d37f SHA512 d67406a9d177b1e44d70f84b54887d268d3db2c71dd2bed3373943e08e953aeb8ea664cf861c3ddc394b2f41d58de86422b24984e3329280318bcac3ff9c1e6a WHIRLPOOL a09226ec4d5a8e2f0b3b4d47fec65286d1a1050c9d533054f840a2d12a990cc2889f071fd63fb586b0853af1f7607447a0dff740e96a5190fb096b4c92a3595c
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
index aec81502365c..22ce40a463de 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=app-i18n/fcitx-4.2.9:4
diff --git a/app-i18n/fcitx-hangul/Manifest b/app-i18n/fcitx-hangul/Manifest
index 5dec8dc3924d..9e5b828eeb54 100644
--- a/app-i18n/fcitx-hangul/Manifest
+++ b/app-i18n/fcitx-hangul/Manifest
@@ -3,7 +3,7 @@ DIST fcitx-hangul-0.3.0.tar.xz 25600 SHA256 978a66471eb200cc3807fe84e9b5f1392fef
 DIST fcitx-hangul-0.3.1.tar.xz 26612 SHA256 6dd5fd5956924c85af92ebefaef1e113e38fa814355fbb0f07c26049c3014437 SHA512 6ad2e34644c9246490a91342a11b186d40702f7e587beeb056ad98538da50dbf9fdc9f298e5b379bef50f63ad5be5da79ba84e60a22b57c330d0a68dd5bf5ca6 WHIRLPOOL 76796f5ce6b904971ca2c4db0b24eeaa436033b054fed5f16a46f0c31dfcf8dc324c336c1731634cc507874dc1758a363be70d8fa8753c90b9204b4edf6c6da8
 EBUILD fcitx-hangul-0.2.1.ebuild 549 SHA256 a8596dc997324a21d8c01b3aeb377efe1a5e32afd90fb6188aa6ce514f4f971b SHA512 af4427e1a59ab8a963e585f2e9363feba2e2e4fa206b2fac848c011a88c1a3ff6ed569394ec4f6f9078895981ded64cc658427177f9f274574f8952a8b147d0c WHIRLPOOL 4785060a3af6ace7f9dd1740d8df2fba0b77c7ac279a18fbf34c6f8e0307294bec4e16c25d54b4f9166ed746e4400a29e5bf24cb83e393d655749ac820e1139b
 EBUILD fcitx-hangul-0.3.0.ebuild 550 SHA256 7f3f6390dadd1970cf55fba2b305547330ea71e6853b3a25cc4b6e81d21d9298 SHA512 2fc1d3fe285052e91d49bcbc303107261fdb3532c71c0403b47875cd191d0fd9b01eb9ea204f0669a2fddb19dccaaf436d2ff9b3ebe00e7187f4005c3c9f5a1f WHIRLPOOL 9818ec64601a0639b1446b072403f61fba5e6ebacf4187ed4f7013e9a981bd7db17edff5944547c780abf14e9dcf65ac626ba2d61a074cfeed81224eac1a5bed
-EBUILD fcitx-hangul-0.3.1.ebuild 832 SHA256 0adbec681856f81c68ebe8a5f01af2db88ce7e05b9aa559ae092826067b18eb3 SHA512 86ec7d6d86f52695d37efee9ad5fb12d1d518d353aa22256bcd35d77f301eb600c3647cbe34588711a17fffacc5a30cbaff451b5402f6b29e5b0f0d24d3c2896 WHIRLPOOL e31532929aa3ab4e1896192e2f479837cb7ee5afb2ea77fc6d0f1aec72fef470d1d9130659271084fa8ce4ba4abeccbf35c1572d93231994f36e7813f9ff3b50
+EBUILD fcitx-hangul-0.3.1.ebuild 830 SHA256 b1ee634440111e49bbb0b518db116c9410a7dc0bde27cd39fad829a92162e107 SHA512 4738613c8ea8ef7388f992018f11ccffb334814053a2d812d6d7a1d56d2546d628d3f98b5e23187e531d55820a0ca3999c0190fa9d60426c2df938dc04019a45 WHIRLPOOL 350f3d70fbd4a05578620e320b2866842e7a8b8e6d86cbc354721adf106632160aa08f0a5c5320cae4f0b201930d49215ec2531bfef87a8872a4727ae373e186
 EBUILD fcitx-hangul-4.9999.ebuild 809 SHA256 6348bc2b70ceb63ca868382eaf6ec92d0eb07cc8e61d042ca6e678c60f120690 SHA512 5bf31b8fee6835fe2497c1836aae1885197070ea7ceff7955d7e3e3c711ea6ccd6e9d0357a2188ad5c11232bd4c80b1582647135a62ccd08e8121863add017a4 WHIRLPOOL 13066007a9b923092364dbb69df5a2f5d8a40400cb756506e2a410ece3201d90dfadad0518667f0110b39c5e49599c5ce2b697cb393e52118a8335564ebf250f
 MISC ChangeLog 2894 SHA256 f030d5048536285757ae46a20b63127d7e91f8fd6b61346fb59cbd78c8f96683 SHA512 6cfeeeb148d8d31292bc2398d3dfb42933dbe7290c16b8a3c9d6cff02807bc597feaa938c341a41839132dd052cf14600a91b13d0f21bf4c861d6c169f2cd8c7 WHIRLPOOL a62d09a57eef912c07c6761343743dc38f829cac3eef65754559f99f9ff4598e6e08797735a8d93d832905929a71fce9926a8fc9d99fdad89fec7b4d307a0d06
 MISC ChangeLog-2015 1244 SHA256 82c3df1337eeaf0d06de5b5a3e64618d4d6b522b73ce3e5239c3d2c5c78d8524 SHA512 f00ce6b69d5429345a6ee783cdf0209b8c3f3667428f4f2735c095a792f923c5243e2deb1f0cf4c35044ad8099ced25d0cd1afb87c77ee11549588f90ae578d4 WHIRLPOOL 801aea08d6653cf65a240a60224986bd7b395fe4fd5f84551d9f7a5ac94429b6a9ea12c5a17db45527d8846cc6fe4be0dada77d27c42fd89d247621924dc213a
diff --git a/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild b/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild
index 3872437ea348..b23bd9d58766 100644
--- a/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild
+++ b/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=app-i18n/fcitx-4.2.9:4
diff --git a/app-i18n/fcitx-libpinyin/Manifest b/app-i18n/fcitx-libpinyin/Manifest
index 73563cd78a1c..6afec7655210 100644
--- a/app-i18n/fcitx-libpinyin/Manifest
+++ b/app-i18n/fcitx-libpinyin/Manifest
@@ -10,7 +10,7 @@ EBUILD fcitx-libpinyin-0.3.1.ebuild 818 SHA256 1b99e186c1f3002d1c35cc853e95fd02b
 EBUILD fcitx-libpinyin-0.3.3.ebuild 852 SHA256 a44f94db1297dc4f8e16140080a5e5d3360e2852f50890a32d2848a0cc87f76c SHA512 98a2eb59e38dca3ddbcfcbf6d800eeea056e3fd254a6abf7bf608e8351d131d4a2d02532bfb5e9176b6a3fdd8b1f8901ed5f71e23baf6e68581bd071d4bffde1 WHIRLPOOL 8d5046b5ddb8915e90336c2c9c8b3c5ace3f41a67c6173238e7e9634ad7842b6fc351a746ab7281d39b6fcad12c5118229bd3912e965eb9fa5dc4abb79238be8
 EBUILD fcitx-libpinyin-0.5.1.ebuild 1462 SHA256 3531962a31619508131237d0e026ef7d3fb30d4a49357011695249b2b1f8a091 SHA512 56c8f9431d430ffae74466cf63c4d694a41f479d18630d44baffb5ea1babd2841b8653869d3c8c0ea0ecfcbf11eb6e1b49e34c56c56b58f8e917c66f27edb55b WHIRLPOOL 66e03023a67bd5d5c163c64f0f021183799b449c4d7e4ae0114da009f736fed1d8dcfdb5210033efa76ec555494c8f97f245f67f47113147182b4d6a52f01218
 EBUILD fcitx-libpinyin-0.5.2.ebuild 1477 SHA256 6f279c149a52b9879ef3e832eb463433fd7f76a02e8c242c5361822717cc86c9 SHA512 f7b8c6bba8b572904778037f2e5d5a79312d11ba1f7402a73773276a3fff8cbe6e269e722d795f98619ae70871c2bf2e6a9f0c355eea2151892a9c9efbe2ba3a WHIRLPOOL 90b7cb9a22f9d98502be684a5bf88a279604da6a7f599d0b0be3354b2ab27607a8bf3510abca8908b5858feef3140e1cbee244e37ca1900b5ad89a730d49abb9
-EBUILD fcitx-libpinyin-0.5.3.ebuild 1496 SHA256 53321cc67ecf5e03a40829e3c098571a625fcc60a21ba77d08d4c5656843fa7f SHA512 7294c395ae9e5b91f9806a930b7ffb9698690a81ab74942d98763c03e2056eaaf798a3dc9453a5b85db758b78e4818d8fe20b2024531fcb447e587998a3dd35f WHIRLPOOL 3102f2373b6ae2d6255e7294f32bce36b9d7da3c16e6e1f8bd177cc594c29f435f6c70b36a297c0779816677a6cd08cb7462625f4ed08f2a72fadcb2db5e4774
+EBUILD fcitx-libpinyin-0.5.3.ebuild 1494 SHA256 48144f9fc9883408dae8a2bc9eda8e5bbf7492a2b6c399702f1a0663e04b3d91 SHA512 f504cdab21024baaae2f71d3e1c2c328ee34a49ea5d300eb4ee6770b3354c884c87bfe31201b384f783643fed138db35df29a51184f37d79068a7fe2a852685b WHIRLPOOL 9450c4d9090c444fed0f4264824e7ebfe1c44e1e7993655f6949bde43304abca4dee837059a9752cd81c53c24ddc478324f524fb818e57352758abee4b8c04b1
 EBUILD fcitx-libpinyin-4.9999.ebuild 1473 SHA256 7f86aa4bcce91ba772d5ecef0171ac9e508ce5255b288ee8eeca306530be671e SHA512 fe16051864f4aba0516bb5e82602283bdacd100d900f64f3e5b71537825888ad2a269b1a4064008879cdd62ebd8df472edc881df4bbc312853c7d92a8505cffb WHIRLPOOL 0d579053f452af88e06c51c3f6dcf572b8c6ab35d9885c8d0376a899495a0943e8f8e7ee090110adb3ec20f95b6784ba4d6ca0db692ed4b080619bbdf3b317c6
 MISC ChangeLog 3620 SHA256 459e00ada72b01ab3ba4c6c7a27aac2208e009c43d19c6667d9445212de719b7 SHA512 933d74430cf7b67cee2b88fda6b88ad1972608f5dc55689c27c58b9f5f7e7e39706025a7c583da49f7083a0f98be24656b90237f8a94624b278b62c6b188c99f WHIRLPOOL 1a9c4578018fb009d0b8457f3ac83824cceaaf78638e604fd8d2e9c7f30029c1840c0ec4c6c7af18966094b244819fce2ac7f60b5e619e9b0e04b8dddba990f0
 MISC ChangeLog-2015 1654 SHA256 bbd29d6c349aad821a20e6ebf24629b2d4245d5a9e33aee46545dfa935313bcb SHA512 10bfb2b5237075cfd0f4a9fbcb2757bfee5337f16d4c00e6f71d60e6a971df1497d38f53b88324cf80946765009edf24a5bcab55d0f34b7f361f229682ad7419 WHIRLPOOL 62b5c4fdf25a716d93ae350e310a051cd0924451b5eab3e46ca171e14c299ea293e41d0dccea31cf805e1f6a86f9dda2bb9fab33fa04a0ce0da1bcd58cb5c8f1
diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
index 8e48769ebe31..4f0ecbcdecc7 100644
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="dictionary-manager"
 
 RDEPEND=">=app-i18n/fcitx-4.2.9:4
diff --git a/app-i18n/fcitx-m17n/Manifest b/app-i18n/fcitx-m17n/Manifest
index 4d76e73da855..dbf85a28a8c2 100644
--- a/app-i18n/fcitx-m17n/Manifest
+++ b/app-i18n/fcitx-m17n/Manifest
@@ -2,7 +2,7 @@ AUX fcitx-m17n-0.2.3-memory_leak.patch 473 SHA256 938952ec1a5e1842a65c6789393212
 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 SHA256 f5b3760bf7e8c35f7e12091d8dfd390fb56e539f3e2efcd35d42d65e5962ce83 SHA512 1543c23bc95a8a06814bb42d34cef341e8b93e02b9dd2ae33116b9edcf7ee17670d539f5f7caaeb4874e239bd162c7c96f6a60aa1c90d7e6c606a26c290f9c64 WHIRLPOOL 90aee8402378e5c167b093052d665d22eeb68de7ab4c558b9fdb4083cd517b3985a1ca0ee7f716a06c648aa556a77db2b83da0dabe737bd3a0399b2de69284c5
-EBUILD fcitx-m17n-0.2.4.ebuild 688 SHA256 4804060ea1f1d8b93256c3bfab28288067b609dff7f562107a36bc2c71f61845 SHA512 379e8d6ff715bbaec9bbfff8b4c4c428aff523506471cce7991d6da7a89b05fe85e55db1e52c834e8e57a34749d8aefef75f6e7d2a4464e0e2924c8dd699b757 WHIRLPOOL 9a3fa925d8731785104436cb2660a80fc185eac19d0794a7c6c75491881a4c3b2f71b4dcbfe04552cc88c2efce3f7583e646b187da089fb87710dcf8f2ac6dec
+EBUILD fcitx-m17n-0.2.4.ebuild 686 SHA256 bc57ec659e5ac55cdf45581eb693bf6bb37e69b91c70f37c9b9377ebcaf698b3 SHA512 f5f8e14ec7b1679cca93a3f1d461683e744f7f53a683fe95870ec0708d9bd9cc8678d1552f1fa7c744203d6cadf5d8c5fb0d773fa7340ab65478fc2773712ef9 WHIRLPOOL d9106126b4a73920783dcd0d4faa7d114ccef5eff3cf31d46694d9aee24e9b3dba0bbc5ed74f3f8bcfdf3ba720bc279f23de6d3db74a2a356bbfb5d43ceaa8c6
 EBUILD fcitx-m17n-4.9999.ebuild 659 SHA256 f3ebf706494a7d1e5a8771d3fca41296978e6520f3e0282125bff9bbb737c006 SHA512 8958033c23147637814528395f94bad019a3bb130270611a8cc4204cb503f34b6193fcb2a39532588831d99f24e5ead64f791d3e765875c2c108334a8123d694 WHIRLPOOL e23d8f44cfd1da20a176913434c0958da4b7863b17c993e53a75e59b9a5050e711eb595a1f340dcc013521d6e81fa348fbd9f911173f177ae5cce35e20a9fe23
 MISC ChangeLog 386 SHA256 5457c027f6b6736712daa22a671e64d95e77a343effd089194c766e9233200e1 SHA512 d391fb5a91adfe33b88a6f4a9f7ea4e965e2afd0dafb0d09e4e3b217b58535911975b00f98b3aaaa3108c12ea77333337fae898160e38e1f3361be45a1926fe2 WHIRLPOOL 7aac361fffbd53928bbd09dbb811930dc1c80e43e52bdc6347769ee20436bfa6a7662dbcf9895a39c27d1c7d0e852174b67aafa1594c3403ac59f0dfbe7154fb
 MISC metadata.xml 449 SHA256 e53bce354dc6eef291b8e405b9fcbbd1f9fa60b2924e5bb6eb3f51527976ea39 SHA512 97c79c2a23d736128429846b87000d52f815e3b32999ea0ca3ee1be2d6281ff6aeb2208d1340e74414a5b5e31e06e3675292e307960d088767c09c252f5d87ef WHIRLPOOL fa7d9546be08b622140b1b8a140fe337246eb6a908b74c2121c4d2ce5457acd58c2040626b9cc011c084242332eb3d9c1f52789df0cbddc81a100b224818a711
diff --git a/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild b/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild
index b88697a1c677..923f356a240b 100644
--- a/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild
+++ b/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="LGPL-2.1+"
 SLOT="4"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=app-i18n/fcitx-4.2.9:4
diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest
index d01685585f64..4b1459fceee6 100644
--- a/app-i18n/fcitx-qt5/Manifest
+++ b/app-i18n/fcitx-qt5/Manifest
@@ -6,7 +6,7 @@ DIST fcitx-qt5-1.1.1.tar.xz 56352 SHA256 4b062869dae011747ff257e6976debd1d69fb13
 EBUILD fcitx-qt5-1.0.5.ebuild 860 SHA256 d8cb4ee5dc2b7228a6960af1baf075585437c4fc630eb8749c4fcbb9ff2b473e SHA512 08f085874b6e2681846ba6abc3a88f8d21e13e009197e3b2955f920f74f8c6a5778d565ca5d8ec8a0ffcda130b4620b3c7b05f068704493f33a583fce366fb8c WHIRLPOOL afee0f3252f99a044bd7c54852f0b6ec976c05d63a3dcf5fc89b019dd7d93e415a5aea0beff8f1d39d3447ec822a9c090a6b2426a4b62da67acb38f1d94029f2
 EBUILD fcitx-qt5-1.0.6.ebuild 818 SHA256 0a296833bba8c1c01fea77e443b3e792d1c92201cf189ea1fbf2b9205769aa7b SHA512 47626df5ea35a0ed011d12589a95aaf71ef0c59f6070efcf310e64c0de8a3ff5fa77e014e6cfac2cad6694ace40a7fcb313de6d51cd92b83b3e44ba8fcfbd824 WHIRLPOOL 1970b80b93ab02f093998af92b1efc4f004b4382f0c102b86f0818b8cb4ea9bb5384c105a951def436429d45e89067c1f71858d6e9739d0896c6b4c39d6858a8
 EBUILD fcitx-qt5-1.1.0.ebuild 816 SHA256 2c8b0cd85dc0f4805fe1e608d15379ef980fdb42f83a31ec17f2a0e5a1972a22 SHA512 d25fb2bfb7706cba12f36a8cd40b420d94c01cfbd5f177b1dee41e8ad3d259fdefe4da1dd0aed40dd8016f9ebf7ec4364812f21678678ad07d8c771bb8e3dcee WHIRLPOOL 4af6e879bef817f5ff376eced3d7b97d32e3bc98ba339ed45600bb5f7597ec5301f9c78bce5dd05c6306ec7c28fcfd615058de4c9163b3bbdc4a44b30a678038
-EBUILD fcitx-qt5-1.1.1.ebuild 838 SHA256 321cd274c204048f2e14a55f132e876b1c06417f9c0dbd8788c1043e8d5b955a SHA512 dfc9a8eba4aa3834c1194b84d3eb23d7f21046c0659c4c93c71d369a0b689f365542cb9dbec15af72b3d84a5b0b9a60c7ed5e47718f48f1d8a1539864abc7097 WHIRLPOOL 59a9a5b4a109316307042cd36b0a1772e04cf0503b8b17dc523d588d312993a7c93d0aedb3a64723d4374ddd54aca72dfb1e969fc5e62e69db2c113ca2f4bfbe
+EBUILD fcitx-qt5-1.1.1.ebuild 836 SHA256 7a565c4c21b9d96419aba412cdbeef3345b4729009cbe3f7bb91bbfdcbd4a6cd SHA512 d7cd3032b3894e1bf7620a439168388c5aa4a5d44d196ba88e9a264888de443aa9238d2845469958cb61a7d4e179fcd698a90a4818b6e03d28b431d5fcb97c94 WHIRLPOOL cde9831ec92eada24ddc01753d099c5efb3a444bfe48afa025429bde81f6d217068a857204a15c4a3a32b533a73a44afe300c3c09cc41266960e2baecd4cb96a
 EBUILD fcitx-qt5-4.9999.ebuild 837 SHA256 a9538b9ec41a62169f0fa9b1931ebd1e7d34761ab34fadc7d2fa5edea5e37ba9 SHA512 587dae1dba3bbcdfa09329348d8eaed38aa277a8fa84c288bf958a668133f16650a5fc9900ea364fc1b8cd6b8c35d64640c1eea9f59d2b7bd340822e2cd23498 WHIRLPOOL c2492f8558ae8aa8116b9c671f17b72b0cddd75bd5c499ece1de990a11b8fecf4d3912361f3f10c0caa3c52c26d9ecdfd950d3250d53100976ba794c892d0c78
 MISC ChangeLog 4384 SHA256 261f8d3d58fa4dbf1d6ab5855c99b16dd16a4debd289a01ec3c7a197fd03eb1e SHA512 fb76c92b2cb205d781b12b3e11b80104fcf4cabd4c38e953f15ed4eb4bd4e659d7fb5a65748fe2a2e9fe512ce73e0b36eda2dc3dd6fe5be8fde94a356426821d WHIRLPOOL 9f93b04594daeaf416b2093b12ae5d39844968e7ef0d46a0645d688ba1e500973f87541c6cb7ee2a3a4535d137ff6eec905bfe088cf2e84c2f6ad1e9c916087f
 MISC ChangeLog-2015 843 SHA256 e89e001966ce223ad3334738870444dca20664da57c0b0d64b11de32fc26f3cb SHA512 714b955d8a859889a2af1d47882c3d06e5a056a8011a11b191c867997c91f90a8fcffc65bcc891b452a34d04feea31d75c8cb16ff9bff837ee6adab3bf648407 WHIRLPOOL 0e9661f71dfaaf03bf5b68167c5f8442112fc0d7f94b6c82f1cdb5ef0eb1e82a5ed81fd44dd859827fe61f83278b157c50cf4cbf9e840da9cc8d8c15bd38916b
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.1.1.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.1.1.ebuild
index 39f01c90148d..fd45e226e6b5 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.1.1.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.1.1.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="4"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc64 x86"
 IUSE=""
 
 # Private headers of dev-qt/qtgui:5 used.
diff --git a/app-i18n/fcitx-rime/Manifest b/app-i18n/fcitx-rime/Manifest
index be9f055648f0..9520e329bea4 100644
--- a/app-i18n/fcitx-rime/Manifest
+++ b/app-i18n/fcitx-rime/Manifest
@@ -3,7 +3,7 @@ DIST fcitx-rime-0.3.1.tar.xz 39648 SHA256 3ca74de4d20e8fd0e67eb4ccae8af3790bb1f5
 DIST fcitx-rime-0.3.2.tar.xz 40960 SHA256 f97ea6f515fcc5f526cc25dce3d4ba05fa1c83001f68502d6c284ba39cd5a82d SHA512 8c6d845b0899d9b8b9b41b895abd5c1b8916856b71f529aabd08d1c27a2b09bb5a9343912d088da460c2e22da0a3ce759a34fd13099a149bb8cd1ff4eafe29f1 WHIRLPOOL 57b979a8ef850ec1c4f85b6b3b5841ad17f73c1861223d033c7b79db6c301f1f0da13c4ab53661a4899ad13db40c424f3c1b257dd2058e28fe89f6d57c2bf17b
 EBUILD fcitx-rime-0.2.0.ebuild 707 SHA256 25fbf68f0306aadaa989b00f135ac81064713d86092344a65a4a8184690bfcb1 SHA512 3d7c15177bb138a676dc388d2f4db78e58ed0df7458412a36f7957833d6b16858f95eaa34b8d68b1cab96e5b156a4b00b220f45ee8410ab251d1b074eae9d5f9 WHIRLPOOL 6b8c8721f1e18cd57f666896b067a19a25059a3fbf3e04f347d94be1cd861859c01db5d1ee7254470f9355bcd799b1ea89996127e03d16726073a144e76a3d1a
 EBUILD fcitx-rime-0.3.1.ebuild 716 SHA256 59b13adf544139c71e3521e337656b364cbacbd87e8c18994ad8a840b082ae79 SHA512 8e22c660c8cc0fd218a7a0ca735aee10f965013ee7e7e96b66d57afe197e474b7280406e0c1e3110fd2b512c21f5711774d5a01916efffd11f60ffe55cfcc359 WHIRLPOOL 8403b0672b03d2b9ad22ecc403ab892dfb4f85dca6e58cabee98b8cae30acaaf2af235023a211ff588fe09dc871fc733c78f1d36e7ea133371fe505980c14408
-EBUILD fcitx-rime-0.3.2.ebuild 932 SHA256 7012e4d393b420371e44a7c37e76c5dda958b357bd55ed1d4c4d65b435fefc38 SHA512 944fe19801a3980be6a01444cce3a69d28e54597ed9d8143574c8a4653c7ba84d2da3218d7483daddcd71165f36c41227fbbf1af6e342417136c94da62057f42 WHIRLPOOL d1fe87788bb7ca3163fa7903959624897842d3db18d63b6417cd006a2bd9963f4ac31b2bf531a37bd0f150bbcb2750b7e4cf80ab54724202550e7e10291d0af4
+EBUILD fcitx-rime-0.3.2.ebuild 930 SHA256 ddd2c36635a619abe912e4ec41e4e9cd6318399d6941c191fcdb42a30a2ace61 SHA512 e17c759e05af2de9d2fde0bc486edeec6bb1dd7b213952f9cd616bd5bb03891d9974db182157681be0ce276e480d3c1249f5548eb78d50e57de194ab3c724b88 WHIRLPOOL 1964349c90b48f9d28abf1bb55973c8ac1bd0c062ff371f0c87cb47ba0aff67c8a5d4791b7f35d4921843bc36a41ed42772d133a21ef3d7c1380d03615be2f91
 EBUILD fcitx-rime-4.9999.ebuild 909 SHA256 a75119d83505683c5ee428eda83f1d56d5773e5da89846ea8748f7f8244c01dc SHA512 3a913bba52ef1a2f58084a116f2b255afcd5f225b50ac0f6c8bb9b79a4fa578d9e9c6d7efb9fcb9f3218781199019fab74c5ee374e161dbeaf4f9a5b87a9f658 WHIRLPOOL 9a43dc47096903af275f14bc40c0a7312efaf02054e17e0ed3b10d371f0dfa1cd099eae51eee5ad59bb2f755c592d84e22e87fcc88c416d6048b416834ab9e70
 MISC ChangeLog 2972 SHA256 71c10dd05ada26107340c89a2921d037f6caa3a106d2f6867c2a66c6aed77de5 SHA512 d6b9bdaced57ac9bb561ca9a188f7847cc7722f6bcf8e8bdc43b5ae9f150e91da8623276b53217959e7769777837044b1f1646e2141ede330bafe2472cdcd932 WHIRLPOOL 56a5fab9c08b5117fedf63c13c169cbed5b59afa26e5a6063629fcd37686a41e4008b85b0fcd51918586ffdbb53937210443c51cdba3aef2fe2fa2acd263b860
 MISC ChangeLog-2015 2201 SHA256 1c6a150b9716f4e1dbc3f6f2405cfb138f81b4c133a63d2ff605456362376f02 SHA512 5792009e10b17e5e3512c1347db541d925ecc35ad89ea14c03d0f75574195a6f4f3617a119056b616231a291bd0864527b31a9e30d9a98bed587821ce4b9d24c WHIRLPOOL f2652aa2be1cb2e47c43d16be1afdbeb482083ef017947c8dd4eb11ed886062269a49d2d6ab4a0f22492d46defb3d971b26d78a18834417909436539deb09d20
diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
index c11c94262a49..6a1fd7993a1c 100644
--- a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
+++ b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=app-i18n/fcitx-4.2.9:4
diff --git a/app-i18n/fcitx-sayura/Manifest b/app-i18n/fcitx-sayura/Manifest
index f09a60f2e6bc..59559b7399bd 100644
--- a/app-i18n/fcitx-sayura/Manifest
+++ b/app-i18n/fcitx-sayura/Manifest
@@ -1,7 +1,7 @@
 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 SHA256 414111ff847ea2daa1bde0f524046d0f88c9429b39996476eab5cbfa8a06689d SHA512 8d1f1aa4ef1b6955058b460d4076af08383421a533c280827c22c32d9303b78e0ea4e3d174f9df332b5b85076563e211445b1c621967d27351c2d3c4ee9a9f4d WHIRLPOOL f5671f42377e241deff4e5708bc96bef13332ce6c3d56749fd6c4a4274e8ba6c3c2a7b59ce9ded32c32950e92630bde9c224e078aad9dfa2bf5dc1848b6e333a
-EBUILD fcitx-sayura-0.1.2.ebuild 791 SHA256 08f7747e8ad0571579174329e15e64ac0d0b1b572cde5e52b321d202713d00ae SHA512 f68a5531c1a0a7f905800dae9779689c7883f18f6c5fdbbf9c589d6e06f52d423a75142fbad91c8016f5c93b501a551840d920eeda23290b2f730545d227c83b WHIRLPOOL 98062dbb2a44be8cb48c704ce60b51d23033c8833c8978c20bd22fec4470f1c192877b22d2fda87ed142964cd94fbe416348ce3677b7245bf1d93aa5020d7816
+EBUILD fcitx-sayura-0.1.2.ebuild 789 SHA256 e5199cc3287ee93316a8bdce20ca70efe494633c390423cb470ac5c30e193265 SHA512 7ed1ab2b9f41ab230080c88507f71a9affe1c552b48d42b0934192bb3a9e521f4b5a67ab6d3e8eabcc9d999282853ad4aea373755403c836b2091290d3947b00 WHIRLPOOL 6a0d88ed25627b5656697f3f2e234277b799cf929372b1c759df31be90136e5e23e01513d2d635c3ce9abab280f62f0f80376a9d68fb169ecf71e5619cf361a9
 EBUILD fcitx-sayura-4.9999.ebuild 762 SHA256 177d54f30ac61da81eb0a2a659799dfef96dea94d0d1ad9a1a5dbeb8dd5aff6b SHA512 ff1ba3f4f2f96982e328c3911363999e7f3701ff6f9661a978d3e2aeca9aacc57b39dbf8aa4ab3cac763e4014271e945c7f099be6e29b9d52ddf4da02217530f WHIRLPOOL 66c688a94e179ef7946443df9123407f570dc675746bf729a84d29d840c487f0f9114a5f9aa56ede6126360a1a55b57aebd84db8bae029ed7afcfc19cd431c93
 MISC ChangeLog 351 SHA256 1e3488253b49cfcea299347e1ac9acede732feaa7ec966246b6ff642a6214c50 SHA512 a560020a47d2ac966df9d6fdf46ec26fa606e29e068e1331f36f5b80a07fe9d01520a650c9a18612ca9e7035f3698d58daafd58ec259eb59c811d6e5e54106c6 WHIRLPOOL bec4e2e0f7e29f04a9a0b0dd7488d5da356698997e4e2ffb3a3cae2e75d789e6798e6e8e95f3700111a5e1bd4209486e73e28b8c8d917e5732a2d0fd8f62a1e2
 MISC metadata.xml 451 SHA256 9a2b0e5a9512881a5e80e21c8bf24e3cea283612657df3a810353960cd426749 SHA512 d1ba4ff51b06d03e9ff7c13e3f9693c8f91cceaec228f4bd90b560a02be5b42e5fe3d8d7a885816c12b9ef123484537df67f572c0e7bd3d5555f0809132537f1 WHIRLPOOL f19153297a631026e44a1edab75c5d2384676fb3d8f3071cf839ad6ced123fa7daa7ab63b06920948a6d4ea21de612971bb2c3bc7438f10a6cbb3bd42ee9db5e
diff --git a/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild b/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild
index 725a094c5115..5ec817bf14a9 100644
--- a/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild
+++ b/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="4"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=app-i18n/fcitx-4.2.9:4
diff --git a/app-i18n/fcitx-sunpinyin/Manifest b/app-i18n/fcitx-sunpinyin/Manifest
index 24e00b5b0733..eee13343a7c8 100644
--- a/app-i18n/fcitx-sunpinyin/Manifest
+++ b/app-i18n/fcitx-sunpinyin/Manifest
@@ -4,7 +4,7 @@ DIST fcitx-sunpinyin-0.4.1.tar.xz 41076 SHA256 7bd0c61a3c821719760bff72c3c114b28
 DIST fcitx-sunpinyin-0.4.2.tar.xz 42984 SHA256 0bf2d72d77732f06e7f04c119507c08b9618b21c4027e3997186bd7e4d0788c4 SHA512 8ade5d94e5227c0b72d2844c09c2699e4b8c66cecbd4107791168d27e15f68b28a4445bf42df7bd6fb44119ec42c5b574293bb417dcde8998578f0debd656a2a WHIRLPOOL 18c55c3e7fd7a5ad8ef52d7734cbe2b65e4ec635535a0ecb841199af5a39ec3ca720807857ada4b493b7c4de80431b74deb0f8a6c8863ed8f1633e6d6a15f33e
 EBUILD fcitx-sunpinyin-0.4.0.ebuild 619 SHA256 ff07958c8a22c001b70ca4b47c00abca2b709e710b2638f0500fe614bbc454d1 SHA512 aed8dea96a1429e08d8f54ad7de27b7b49add7f126a23330230f13c5d0cbaf54a46f01d7569a52d0789b24bada7a0de72424c1b8252bdf7e91c8af8ea2bfe391 WHIRLPOOL 1783e5bae8d30d26406161edd550b005f8581c5067f50922147781b51283e7419801c5db7f2241f5a84299f3952e34390edea3483ec40525f73ad2e6306c9b37
 EBUILD fcitx-sunpinyin-0.4.1.ebuild 563 SHA256 e7f2f68d62170ab9e570941cb22420d01bbe670d503cbb0dbbbe26ef4c5b5db6 SHA512 e7042ad79158fd8d2b5d06643c75c15c5c676f4fb85ffc4a16041bb5f006b2d3e4f916115b95d73e5279c3c4f41b6c1cd98fbdc2b6058a645bc86460f3e823f2 WHIRLPOOL 59a0d72a90b565bf24ca00af94b62076c463137c91e1898af9c61fd804d1fe9c4353b2cb899f360b0e9575b30350a629a09c27675f8a644bfd0abf64bcd6e092
-EBUILD fcitx-sunpinyin-0.4.2.ebuild 819 SHA256 37f6827b2c0b995e08e0519e09055e8fcebf9c4f890781737fd73f4260d52b3d SHA512 f2640b5bf001d1a27ddeaeec8b83237272d5b72cf3a00d7ae8b09f2aa70c7570d7b7e8afc9fa1a9fe9e5ce108b5a5a1d70745742e5d930fa2078d0906d6b25ae WHIRLPOOL 6d71769af5a29265418bffd928f4ee45cec3c295c5bbfb52c89c1d9fb7e50157913e3d10813d437af2d168afe32e870d96c2bc3cf1af489e03bb80bc2a35f373
+EBUILD fcitx-sunpinyin-0.4.2.ebuild 817 SHA256 7a8747223f6ab46d91e448906a6a63837ec277f9f7901c38db5580a931026051 SHA512 dcd4c93dc6a3fbd1a86622679698edd70f53676af84d86a26ed2aa057dc27ed971cebbfedaf427c5f1011de4f263f7531564ad40504d1838e15778166250d921 WHIRLPOOL b5d44db72548c5c2f8599ee2117336cdbf30480bebfc829191ee18ac8299ca2e076a3777c272524591485263d60dc15e184abe4c119363369473a17279188a54
 EBUILD fcitx-sunpinyin-4.9999.ebuild 796 SHA256 975aed79e64348e9b0d21f4fcf4374895d335b596246dad1c1204c8fcb6f5924 SHA512 6657692f841ed756ad7c0969eb0fc9f136486e55a97bc880a400d203a5cdf6b42102bef0872bb0b5ce2b067e7b9394267304af24db28a2aadd47dc8b91e65538 WHIRLPOOL 78753107b0a58dd886485b69993673c79035f8a826cf80cd5a6e390a2c8bf13d9fa9198ce0abc42411e0252149042dcdfb60bd7a8e2c81af635f2b525196f5e1
 MISC ChangeLog 2971 SHA256 ba05321b743405855a418c70b5007a87386e7eb2aa6f557eaf8a6442be0eb2c4 SHA512 f0bd7f7a401afd6bc1f66ce74cb1b7f06b038ae54a74ee2bcdfff346165eedede68014109cbca91e6561ac642e83671bbe8e9e13238c6113f42a2371188b8224 WHIRLPOOL fcfc7b2d9c256d31047f8fca68bafc7ba6373b9f0cffc55fd042d2120f4c59bebc1984224c17248633513304cf5e751a5add2981ed9d7a3d80679630a0bdbdec
 MISC ChangeLog-2015 1573 SHA256 2b9a8bb93c34c9f2eb045ba0d1a234d81b86d1d844d9e9d318376d8453bfe742 SHA512 06f44a72c7a4db6d41a3bfa4e6c73df90066c403d2ae78416534f79c67467b3e74e571c7b76ddaea1705b8a23c7fd13faebd47bd89a09a1445258b58ec6c3caa WHIRLPOOL 9cdac77d8db93b667a4153714691700576612bd826b57e62c837839430000818267b9cd6e8c0e6accd612b80b9fd392c4883153c8d9386a9cceb437a13487da0
diff --git a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
index f5626388d9ed..bf13525ec208 100644
--- a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
+++ b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=app-i18n/fcitx-4.2.9:4
diff --git a/app-i18n/fcitx-table-extra/Manifest b/app-i18n/fcitx-table-extra/Manifest
index 310788ac53b9..e2b33ffb8785 100644
--- a/app-i18n/fcitx-table-extra/Manifest
+++ b/app-i18n/fcitx-table-extra/Manifest
@@ -5,7 +5,7 @@ DIST fcitx-table-extra-0.3.8.tar.xz 3700736 SHA256 c91bb19c1a7b53c5339bf2f75ae83
 EBUILD fcitx-table-extra-0.3.3.ebuild 557 SHA256 32501d3a92ea3eaf2455cc10169052ba2d6cd68007a209b83b1dd03ce3f16522 SHA512 1f66edb469ae67b439bab0c7e01bb45c3f9429a2a8bde06857e7ee7d6d77571cb52334d96acd429d930558f283608f459c14a189d153b438817c1c54dd36072d WHIRLPOOL 87318adf90a0093c68d8867610e231453f0595b16d7cb54a4fa21e7688035d99c99da69228c37c0e4794b16b204099409ce2dcb4ea5cd4d94e4506c70c3542a6
 EBUILD fcitx-table-extra-0.3.6.ebuild 558 SHA256 3d33cf07c1810aaeca0d057e7046c250b1992d257b8df8cdfbe29a8a597702b0 SHA512 ad38be5004d137d8f2a6f2d8632e8ea88d374e37bdcd3b20f2b1f60e99125d9eb52294cd281fcfa60a712724fdcadaa3d79a9e9b7cc375754e1ad82a13e60060 WHIRLPOOL d7458f00f19692fa0141d45e0d8f3689d38a49e8d230a22fac891fd17bf3171a9a4be90aafbf8295f3b42ac9623e2ddddbbd9ae23b40fd7be662982de39e1e5b
 EBUILD fcitx-table-extra-0.3.7.ebuild 560 SHA256 51cb46dc9873cc1197ca55cc41c72e08f11ddd10a2025a59bdff69d23cd06d25 SHA512 1b6e89b0c97284531294808b00dc57147fa855388bf0c8de9e5e5c771e06c90b22260afbdac07cbff41d52fd9161fd1c9b186ee57e85137659306553966ad589 WHIRLPOOL 096d53446cac367716bd7ba7874611448d1c61aa3a3172ccf3368dfa2cef1d59ceaf54eeb0a67e72ba86c05bf446fdc81e3b04acd3f4971d71cf0c7edf122d56
-EBUILD fcitx-table-extra-0.3.8.ebuild 780 SHA256 1e0cc0bdadf481f75a5a73ed6af99ceef735b26221fe06a3c45108c35fcae0e6 SHA512 29c307ecc60f7c01466d5a379f88e791d305cda3e12daa112b6d9933ea0369d9bc68e97bbdb56835b8dcb57761961df67d45305684878879c1098f911fadbca0 WHIRLPOOL 1ef1c519fbe881db24aaa835cd8426b2b3fc3259bd0c4d03dc3cebadeddead14a9d5e27e0439e47e6ed1fa1491306d2b182619ce2f17ceea7d66566f820ebdac
+EBUILD fcitx-table-extra-0.3.8.ebuild 778 SHA256 764b963c67a4a7ed4ac8ee4517ad4583924b70cee91e6410f230adf6518d3547 SHA512 d7c504e17193f0b539ce3db732680b1ab35b96a80b1a2d56fb3d6574b45e14c63cae359cdfe5bf793e1e19828c6235ffa5fc4f6fd2b31e94cb2d40221c4fef16 WHIRLPOOL b9574a7801cbeb7100a1b086b8332c91d3887dbbddc9c65fca6e58247e22219a5a09ea80f86d5b800bfe297f4666e01392f8343200040a02bd79500982ad55c5
 EBUILD fcitx-table-extra-4.9999.ebuild 757 SHA256 b8d8eb93a57463ccf48314c82314ef4ffe2428ace0047812e07a0bc76d3621d7 SHA512 b584efa38f6457041b4c83501373dce19be53078a4314b1523799637c3b18b7ee5222485527062ad1be15d9b2c65cfe31d17aeb0a3ceb34c6b9473e6c30d82b2 WHIRLPOOL 349cb95ef4b1534a4f7efefb7505bef1bac662f3069a9f94ceca6419b1bf6a0c27f81514c9f4738f9174a74585e6272fa37c7c47c6985ec25d384021e4aaa400
 MISC ChangeLog 2998 SHA256 93143ba44cd8f6d7008dea5416fd7d030e22bcfbe6ab2c8e0826ceff4111cfa2 SHA512 37cd9fcfa3bba326ecadd83eb6f0a242dd7187b4325e13aeb333db95f05610d455df1bd4842232186eda6587c4dacaa00f0bf0c594100cf896c99ab10631e5bb WHIRLPOOL 953da75a052db060ef499ef9ee13db917c6cbed86e28d5f0d2b3aabaa137195a430cc7bd6f79811f403e60807b6cebdc8700f07aaebeb2684d7575d0ca956189
 MISC ChangeLog-2015 2023 SHA256 d3ad4d699cfeacb00ecbb0c3333d613d9fa3a37c721aaaa16468c475d6e88de6 SHA512 7dbad68694b52c1f0093177afcff773a02e9121e0008ce5045aed33e8ad791bb0e2d157a3a274cdf7feb6f0e0e253ca93fdd29bbfc17aab423af5c58153fa08d WHIRLPOOL d20c8ca309851ae2e37b87f888e00566d5337b12754a5118184d9164653a27a26b48c01a08d37fa50d6fbb930a254c7a3cb7baf6f8b1a5e15e9b71de331e8bbf
diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild
index 60a3f7c886a2..31e78e600cb2 100644
--- a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild
+++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=app-i18n/fcitx-4.2.9:4[table]"
diff --git a/app-i18n/fcitx-unikey/Manifest b/app-i18n/fcitx-unikey/Manifest
index bc14986051d2..23f1075ce2ee 100644
--- a/app-i18n/fcitx-unikey/Manifest
+++ b/app-i18n/fcitx-unikey/Manifest
@@ -7,7 +7,7 @@ DIST fcitx-unikey-0.2.6.tar.xz 75124 SHA256 9830910f628d455d2701ba430e6cb5b41409
 EBUILD fcitx-unikey-0.2.0.ebuild 763 SHA256 5a5e9c5ed5d53f6da2fd6061d7098da31fc12313b34adfbb4c3b5fddd1a1b928 SHA512 9203c37b47e975074685483a0cbb5d4efbecb9d77201b20470a1d32e3164370a8ae55514386628a38f24e6b113c4888b1303df1fe2a0c72fb1e3e7e1cd22b12a WHIRLPOOL b0e404ea1b9bfacb467d336bc8f2198c0a680ec0b7b58dea79ea89e94e3430fe098c05827f2802cfaf1769ef8c5d5d9ef59d0e49571155acfe363aa94ad92a6f
 EBUILD fcitx-unikey-0.2.4.ebuild 634 SHA256 ff012bdc1e8a6da07ed0e076db384a49c5c894745216ece1ca0a093af9418466 SHA512 d219a6689d919411d0438eb6a2dca3e4865bd6b770c8a9692452343e0d44beba5651b1331c367de75590efc3f6aa04094fa52f7dec2e12bbc6ed0994999667bb WHIRLPOOL 1293b94ac166d1592106bbc4dba8dbfe8a77d071d82fd4294449024d4616905211eca99967abdad56042feabf99a98130d1cbc51026fbe8c3548d2191c201918
 EBUILD fcitx-unikey-0.2.5.ebuild 1091 SHA256 530d1189d400841074785694dafb8fe5d85cc02c0705ed4188778228fa88de52 SHA512 98fd05cceb73b062866b2b5213a31d0c9c4b918801c24b6704279a01ef97b77da9b75bf9a7d36f0c35eb01bc6082b35b347159398f31470f9a10745a2e40e201 WHIRLPOOL d40a9aa19c439ea98998259995a108cf5cbb2611fb48161d1d77450edba84f0e08d7570704d63d327fff7be3b137afa4def4eccb67325a659ba6b9a40e3ddd3c
-EBUILD fcitx-unikey-0.2.6.ebuild 1013 SHA256 a4a70945220b5c7364bc1c2b5d10d441ad877b7c2380da00d19a6554c15b518d SHA512 93e04b532e943fb384b90c676bbeca9850b8f6086eb7f38c25c434639df07fd2a90da6db6e7fdb844be83c9ddc35cb37b2396901c93ec21a4e285949a2826f54 WHIRLPOOL 710e097e77ebcec991a7b51e6470584e69d85f9e33cc0a505191463727b2364e4534f1fae6459c130289dc268fa0c4843535f349becee83af0942a86e14dc306
+EBUILD fcitx-unikey-0.2.6.ebuild 1011 SHA256 d609d7c4080f257591f5e58d7243c2d933bbe6f54fd8303912ed9924262afc32 SHA512 09f72f376d820e5d1a16c312c80ad9c23a9c68aee30aba6a230bddf50c81aed0f4781b992a77aad00a71d02eca782cd83d764d0a4dddf9ec17b464b8c4c76fde WHIRLPOOL 784880e06aa3d770e17853c1cf592abaab0e58169090b8fccf7c9c8975d9994ec4a84a3bfc17b5c86f2660c64d3e238df8b66ab9b8128ab70367a42a6fa68b0e
 EBUILD fcitx-unikey-4.9999.ebuild 1026 SHA256 11b142da0daf75d2336d962198c6f0f994f5025810e23277ae51653586aaed71 SHA512 fa5050db2a5acfcb7badbb1df231461d08d1c789cbce2e4c129be937ba82154843ba9c8a434f66d85b8f2fd3488b96068a69730e45f84af01515794f35221541 WHIRLPOOL 46f37d2f9e1a22462dbd61a178b4731768e172f0ed11f75a08568b541607e214318780d9e96040f9258873d904da6ed464fc9484cd9f2325c3166e93f9fc3d1f
 MISC ChangeLog 3730 SHA256 3ad3d71476fc38d185cddd8d08f03b9f9b2905f33139ac0f7e692a1af221710f SHA512 90dd32766574f2b0b7075fc21d7acd52751092746124aa84c291effdff60f93e175d9166687312d94a4b0488e0fff37beff5533a25890c6dd2679c10c123811e WHIRLPOOL cf32e04e60407a36df03f72807fdd4aaa4c73ecf6152eb65abe41ac457d03cc9fb3fd166b68453bf33228be3b47fd36b34ddb7040ffe2391f633b401aceb7195
 MISC ChangeLog-2015 1791 SHA256 38c01ea949713b3b27ddd895b931c8f190e31ab09501424f3a6294d85740ca45 SHA512 0c7f5bf6eaa51a4c93ee6c69574cd1cc8e09fabc94880d7999aa699b4d8b0bbd0cf4572ced25e4949fa16f724719bf87ee4710f2afe1f7969d67a7395fb3cad3 WHIRLPOOL 79cffc5361cfd803e3d840afb48f247c92dc5423f5a0d256f5ca073de8d37f62da908f05fa583f12a0e1c448d7500406821df574d48346eb4902bbcb3f412318
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.6.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.6.ebuild
index c59a60474930..63b2e0e33171 100644
--- a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.6.ebuild
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.6.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2+ GPL-3+ LGPL-2+"
 SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="+macro-editor"
 
 RDEPEND=">=app-i18n/fcitx-4.2.9:4
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index b1734e792776..6290363bc136 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -14,8 +14,8 @@ DIST fcitx-data-table.tar.gz 4144686 SHA256 6196053c724125e3ae3d8bd6b2f9172d0c83
 EBUILD fcitx-4.2.9.1.ebuild 4535 SHA256 2e3cb9d030a6612042c1f04e26911e70965d569d2cb506e1dd0c741754c3273f SHA512 f24e8557008491e9c5da042e61669abea677f5f4f167baa1dd22b9efdb6782d42fcbae1424cc9a0e6d4ec0c96c7f81032567820d3a73af322237dd8b4ebe41a3 WHIRLPOOL b93bf0c253c787a83a9a77d04358dbf4739fcc45ef5ed758150cf03769410f5038e82b00a321f1115456ce94f2dbfd155bb9481a0341058eb76a68cc1296f317
 EBUILD fcitx-4.2.9.2.ebuild 4309 SHA256 ae7f0e7ffe854b1ac43d9071c0fda9dbc67809ebc5307fae9521871b0e6611b6 SHA512 c4877c23eeec499de4f159c9d3f0b4698681634f9fdda8605e557ab86dafd249599182e5aa2ff42cd3d4c50bd7a81b6a8b3852c512fba92ea29062ee0355ef47 WHIRLPOOL 23ecb6fcf056dc03a9e7dbd10565b2031f30798ba7902671f319c4f2b3b5475ab6f96a80e360243ece6ffd20df5215a364be1a986ff76650ad48c1a1a65fe72f
 EBUILD fcitx-4.2.9.3.ebuild 4324 SHA256 7aa584d564f10da86a6b98f8c62ac9ad62468bf009d1fbf9a2b86958d2c5c3eb SHA512 d49943f1b2cc89559a626d0527d076ae64134402b3084535aae64e56994ff51f03ed95907efaa75553a2d2491283bf1c76c96784b57eee46fc93faafd33c1bdf WHIRLPOOL 815143a15b4d8f4b278cbdfaf80281b5df979af0e16c311013e6a77640f1331f3f9515ca18f8f90bbc35c532de7ad15329f0df977032e2514afdd8fb5937395e
-EBUILD fcitx-4.2.9.4.ebuild 4380 SHA256 236447f3edfef9504d5cd9994cb83cd24466b7f82e8b8209f60c4769015eeb65 SHA512 e29dbecd77f52502a42bb61af239c2d3023362d498d97d8c1137f89cff28aad69918debdcaf49bc29f2c790b28336d331d5a769ebd52593c64aebf4b09cfff7b WHIRLPOOL b2db3b6502db3caa100af87f95876cce9a6c6f951424cdbea43a865c20a73db0cba9a2ee0036ebd724d4884f189d99434258dc552f55f067436d2c64ce0f0513
-EBUILD fcitx-4.9999.ebuild 4351 SHA256 d5c5e98b65ac33fee03b5cdd70f2f3a4e09bd91d751621cf3e8289923926a04b SHA512 13118b2ae6ad40b2c5aa5404df46db5fffec8bd96e709f09b1de1a2091051eaecfda8c32825e9c484203ea06d8bcfc670071a0b56a8a34be11aeebd9018b9f0e WHIRLPOOL 1a7ad3bd34960b1641e67a41ae86341f212aa3044b77221239d470a9dcf7cb3bd7f9636d8e983f93c692385bd56075edf1626e8ca8b116d474eeaf8bb353ed61
+EBUILD fcitx-4.2.9.4.ebuild 4378 SHA256 52bb24692c65a668343a5da4f08bd3efe1bd1d4093890062b38fc9087ed4012a SHA512 7e2ec75d8c117ebe15b2b5001c742e33479c76ccba24a0334e0359037a40a72d7df7206fac2e0259a5962c1a5c351520a521f5d7c2b3d77de852052ab4db0f6c WHIRLPOOL a648c682e17107ece2af15dc8516cfaef7910c4a2428f5f9a1edb23ea3f0888986a2b0b913518a1083c73580f722eb0b361c1545311241b991fdf98219cc35f0
+EBUILD fcitx-4.9999.ebuild 4372 SHA256 df509c3e73965fc283d28fc84083bdaa9d64c47e5bc5708e20b9654f0f7774af SHA512 7e39ee5c35bdfe49ee10b4fb78715b790630b5b34b363bbb8f2c5dbd75dd3e352cef27c2e2fd0bf68596f908bb4b45229d37e274492060f1bc09323c291cc50a WHIRLPOOL 138a0d55b6d352be26924213be9b1d0a78a604c354a95b5ab61cdf2b2c444970674621f48d0aa3c89c6c6ac43f4a46c4d5bf6432c064483304b98cf8d3303ff3
 MISC ChangeLog 6535 SHA256 fa0f53cbd0524fdfc6435a93db20f50305d2839648d8cb079b48cc4ac48b6b8c SHA512 ba0267172792f3257ff221684fbfc5a699a68db02f875abdbd2a01f2051eed1e3466e0a4ab87d858512c817a5e1160e462489fa1c4f66c6fa8106c68c38f31b9 WHIRLPOOL 61de1aae1e122e352a010901865736f54eca110810b66a17daac10c946d3c6daabfafbe41dfd9992f8a229d7ec2670d6f33c4577065caecfe0fb23c08de570d3
 MISC ChangeLog-2015 12322 SHA256 44aaf7bd6d65aa72945da682fcb42b3c96ad81c259ef15c8107960e27739a426 SHA512 2413eec485fc1b31769ba5ca8e0406f56ca390ab46447dcb4343cf2f2ccd11eeb924da785788fc9730ac515b3b6f7c848d7d5ab28c6afcb2b7f1798e0a8cddee WHIRLPOOL e6ccf45e047e81eaa03e90c28f4aee0bcd9d03d8935482638ddc4277644a4d219d92451bf410b894f79f01a46bc33685686e0d97483428796437428c658f5ef5
 MISC metadata.xml 1139 SHA256 103ad4be78317c9844ca8f30e7c30fab508ae6429ec5228ac2b0cb57dc39e33a SHA512 e0b7a99f5909e14025680275bd21d3a089eff766960afe6b55f2663fe833e44e6ca4fa1a2f5f54a8dba24cce9c0c1749bf7d67ea756ed0167a54dd820d546f9a WHIRLPOOL 7431644725ec05adb3204e0232123672a1132b99578ec47ea1a9bee7b453bdcb9abfdf9cdb4e3a8b97155c91833c5932aa779db84f6f0bfdb63743df0cddf581
diff --git a/app-i18n/fcitx/fcitx-4.2.9.4.ebuild b/app-i18n/fcitx/fcitx-4.2.9.4.ebuild
index 75fff9ad261d..80fdc9b6bda1 100644
--- a/app-i18n/fcitx/fcitx-4.2.9.4.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.4.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="GPL-2+ LGPL-2+ MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+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 )"
 
diff --git a/app-i18n/fcitx/fcitx-4.9999.ebuild b/app-i18n/fcitx/fcitx-4.9999.ebuild
index e70c390cd80c..9f9c46e4122c 100644
--- a/app-i18n/fcitx/fcitx-4.9999.ebuild
+++ b/app-i18n/fcitx/fcitx-4.9999.ebuild
@@ -31,6 +31,7 @@ REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )"
 
 RDEPEND="dev-libs/glib:2
 	sys-apps/dbus
+	sys-apps/util-linux
 	virtual/libiconv
 	virtual/libintl
 	x11-libs/libxkbcommon
diff --git a/app-i18n/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest
index 37bb7c6482ba..8d04611942bc 100644
--- a/app-i18n/ibus-libpinyin/Manifest
+++ b/app-i18n/ibus-libpinyin/Manifest
@@ -7,7 +7,7 @@ EBUILD ibus-libpinyin-1.6.92.ebuild 1102 SHA256 7409542ad9d6024bab31ec2b4e2e36aa
 EBUILD ibus-libpinyin-1.7.4.ebuild 1145 SHA256 b8b7bc45b5ee1b1ec8ddd46e85e75084c79b38a04109218a8baae1fd33e398d8 SHA512 6f25d7ab250465b28c754809a5df1f623e9c69a2ed2232d30161ba6b399e64726e1bc264038d01db30635bf5a9cd1ff16a9a7157b30c25618f92a723e65c51c7 WHIRLPOOL cea1f53a8b9135db06814a83c5ccf4dacc00d14d17c9c3a461435550c0ca19ce07925f559fd3d6344d8b374c50853fc0d068c1ab29f36133dd01121b21492cf7
 EBUILD ibus-libpinyin-1.9.0.ebuild 1178 SHA256 a5522fdd99202a6d8d63e65b4798d27fe848ade5a4cf09cf9afc254d6e662b73 SHA512 c91740e67c13ba8146f3a37d0cee51e49ed939e5176414fdbad2f1b99a17762579b96d2e4aa66a907c2409f21bcf31e3da2a1659a7e5262decd6601fe3163531 WHIRLPOOL f132093b9de2101ef220c9c942f13af5915be41f29bc9d637c35a1f04f44b707527639469ac88bb47f489e97ff15b65a502df8fc4aaf6566f7517889dfc20bba
 EBUILD ibus-libpinyin-1.9.1.ebuild 1177 SHA256 3fd421ca3af2747f3fbb901bf8de93c429edda905810fc107c7b544e0ea20456 SHA512 83b3c1555cf81e3dfe2ac1f3c87355a4abec85bfa18c68b0e3ba3ad31047556f696273a61df27d841118da2df06c7ba6260f808eb26ff9b6628b6bf453b1661c WHIRLPOOL f8d1161706d5214a2820222494a9e2016eebb495dfbd47e6fabe9b586f7185a362c6bde46af9f6115d566eb6b122239e9f1846db8aebd2da6994b709c7c751ee
-EBUILD ibus-libpinyin-1.9.2.ebuild 1177 SHA256 3fd421ca3af2747f3fbb901bf8de93c429edda905810fc107c7b544e0ea20456 SHA512 83b3c1555cf81e3dfe2ac1f3c87355a4abec85bfa18c68b0e3ba3ad31047556f696273a61df27d841118da2df06c7ba6260f808eb26ff9b6628b6bf453b1661c WHIRLPOOL f8d1161706d5214a2820222494a9e2016eebb495dfbd47e6fabe9b586f7185a362c6bde46af9f6115d566eb6b122239e9f1846db8aebd2da6994b709c7c751ee
+EBUILD ibus-libpinyin-1.9.2.ebuild 1175 SHA256 bef46235d76daf717ae73ca8b9642776e1065d9053d8dbdc848b701897afc944 SHA512 d407d821b80e2fb2b114cc746ece7688c3e11643dd422523e2cc557ed1995f6fc11e4ce7381e5a93de678439e62d9bb0af5d9334d6b7480a874225f8c11ddbb3 WHIRLPOOL ed28dffb2b9bdaafb1b42bd980849bfbc8fe6a772589502d0bdf4e0c0664c2d0e2e095e52e88b95de9099c8e8a321c7bb660b0e990bb89537e2ebfbc353fee11
 MISC ChangeLog 3275 SHA256 e43b2a4093041c42d23dae5336f159fc0dd02cb3d3efd2320c79d82e6c09e8a5 SHA512 36465f9a79f9df02b68bbdf8d75bd1dbda0f0e3913d8de36bfe891f75792db61e77165b9addd022c1b6f4459f9e41db5ece77c407e3db0d774b8b4fcab375c1e WHIRLPOOL a232887a912f284d13d80088cfef2a6b7413084225ca3d940ec9532d8e7c57895712fd22b5cd1ee7f846e44d95c0824fe0beecb744967f4ec18a887e1971f997
 MISC ChangeLog-2015 612 SHA256 dcd73351a2d701a45f6f85c36bbee140283059083a35377e17919216b654bba5 SHA512 4076a12d878ccb804eec45983597f1d260b9ab795cb0a3e425643720841efa9e799ba9a033dc39ed146a019f8ee39b8a23135b187da911fb802b3dcc25eabad7 WHIRLPOOL c60fdb85d5ae37f002d228576f257700963cf08f16a7fa0c3f335de5a51020135d41325d68e010df25aff8688c6f21ad1019320ac35470a4d0ee9f6103971db5
 MISC metadata.xml 885 SHA256 bc13db8af7ae4dcedc819f54f6c487c3526edda4f68c7affcdb93f2331ee872e SHA512 b9acf7f4ca73c1453ee7c72a59137070c9f480de8758221f1545d05248e0e2657056a31c705b17455a1342867e9331550aa32f39cbe60270190699384b160710 WHIRLPOOL 7b6e4fd8cea784be3225ddf670fe72a40bd17e14c71aa759e125bb2db5b1075f098447c37dc3f00a9381d741f17cd8d96b43573c7ad4d8195111a94244218044
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.2.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.2.ebuild
index 6e9cf595e03c..8afd7a79c0fa 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.2.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="boost lua opencc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-i18n/kcm-fcitx/Manifest b/app-i18n/kcm-fcitx/Manifest
index dc0f7e86e013..5426e6102a0e 100644
--- a/app-i18n/kcm-fcitx/Manifest
+++ b/app-i18n/kcm-fcitx/Manifest
@@ -5,7 +5,7 @@ DIST kcm-fcitx-0.5.5.tar.xz 63364 SHA256 fe6ff7fe4df1e6bdbeb53699cfbd654b7b8c8e7
 EBUILD kcm-fcitx-0.4.3.ebuild 949 SHA256 bb4c64104121ef87e9ec3b2b286087125774b17a225046b459091415bc7c22a1 SHA512 1946700c9e48bfc4dec9c2e7268cbb72e712a7cf7f9ef6f1eb565105215e0063deaf40c231536301dfb29d8272a7decf6b77adbc0a007b79978a9289965f3cd0 WHIRLPOOL 97040f48f477f89812a01ca4739b8f29b356be1d1312352adf70c31b0d99e7bcb20cf5cae63acb270e6627f401e06dca3e27528cfc999500a4044743c776f44e
 EBUILD kcm-fcitx-0.5.3.ebuild 1312 SHA256 d0078a5c8f55e155dfc6cb10a99797c191f28367ea170122e7ba4f5ed503e92b SHA512 1f2536c137ea7cadb169563e86e01a2ec4454bfb1bf3cfcbe65c054b1cad3b48e4655b2b5ea2295625c637080d7093b3d476e821095fe7a076032c0131608861 WHIRLPOOL 3f8566901a07f9f1fc6f8c6cd13c42516ba262c9e16585b9ca87014190c4633f77e2dd4e53acc6d8518e9ddcf9cc932a5453db649a40764b7af803e2ef16140b
 EBUILD kcm-fcitx-0.5.4.ebuild 1606 SHA256 ca687a69ea89af085463dedc580dd8cd19251d486baa1fc8f3e18997aaabd2a7 SHA512 5a268c18e1095cfb588fc251e8e5282748e419167ab78d8d92c784b954bf7937e8a42520f65c103930bc80f910d60b444acd3e3a8d873b4ca427728e191b5806 WHIRLPOOL f41b9736ad5ba73547547aaec8975b440c02e209d9235c4680e09e7cc85389a4f4c6690e087da859dc9db74e7b2a6b0a66d82c63cec213dcae05315e1ff88cb8
-EBUILD kcm-fcitx-0.5.5.ebuild 1201 SHA256 71f1125a35d67c4e9cc842302f982f28c5a54ca5ec92431ba67567d1bd11b6f0 SHA512 dc905981176a1f12b6e1a0a1067ef974eca9e58854177f8446b9a74365954cdfb618167daacd3a4ca68246721a89e68af532a7ddee54eda067a5979d318c8a1e WHIRLPOOL f81c94fb1cc073ba5b980db21ec97158b34a5b88d4df8f5f1e3c2531632d7a65f81efa354da326e3df8a2229a9bd440bc180e2eee33777a614cb293fa74bf873
+EBUILD kcm-fcitx-0.5.5.ebuild 1199 SHA256 e2cf7361123f2fd96701de5449164e29fdb6a094ad5b4ecfeddf0d18faddd62b SHA512 8d708bbde38f28ab3305f9a8a6a4add691c8b54842f5fd2c74b4bf55d56d2c6ec288a4d29a06aeee05cd8dbb4830138f6b801bbce9c4f711bce170e4bf6eb52a WHIRLPOOL aeba17bf60ba54f67e6fd400b2925b6d9a9c8e3fb319790ee317a9c66cf0441094fcfd27c41d24f659e450d71d1ec5de0bd57c773888fe0f7fa42a5c6a932da3
 EBUILD kcm-fcitx-4.4.9999.ebuild 928 SHA256 5e60e36ebcd3e0a216678b6a702c073fe11065d76190702e4370830f9cc79264 SHA512 e061c93dade243b11773f8d5fc2b1925de4c10a42b3f7f2349982348a4b4b5e4ffb7156b658781d49c877811ff572a6048cb2859bc1de5c35c741b5d99922f33 WHIRLPOOL fd6c4a5e9bc632a9fbc75dadbd4ab165058f0fa8e95163c0334e94d3995ffdef2df5e7ed33cf6761a09f17ffa87269b82d2c58eefb16a22b26793dff40a24ec3
 EBUILD kcm-fcitx-4.5.9999.ebuild 1190 SHA256 169ffd5d2d197b2399a061ab2fe42353dea99b670e431e2fe3e5bd6d94d409bb SHA512 abf541143ab31d64a6e8ef13cdf4cc03704d0d568fd696cd02928249ceeef378ed89b396807172bbcc0a518f8a0770d08d118e3a73780e9c51d33c2dddba6b72 WHIRLPOOL f931c2e1a2d9bbf1f88f2d51183cb7c55f29edcc203b262d431643e00497587427c68ee81a2d1965685cf4aea629db116567e73b4fa6e9ad7a265682bd09b472
 MISC ChangeLog 4618 SHA256 f34162ecf943e9019f58ebbca76f13f92d420ba758dd11a9fdf20032f1d2b41b SHA512 f897159413e15ca455807935c113b1653969d2bc7bd01ded26b19a12f7936015193339f4f0c848ddb444eb13eb0b2318b7a738f80fdebd4d72801fcca74403e7 WHIRLPOOL 999f5e3b4cc77382c5d34de1ce30f824a6c262b37b1f5e7c8d7c2073d54f50db019f9f709d131a4ed3443dd070d7ea56f872c3812a322c8fa353deed906a0cb9
diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
index 7d7699c83eb9..6f3fe120c1c4 100644
--- a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="4-plasma5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=app-i18n/fcitx-4.2.9:4
diff --git a/app-i18n/libchewing/Manifest b/app-i18n/libchewing/Manifest
index 2009c8c6be9c..64a55bd84bed 100644
--- a/app-i18n/libchewing/Manifest
+++ b/app-i18n/libchewing/Manifest
@@ -1,9 +1,4 @@
-AUX 0.3.3-strncat-fix.patch 436 SHA256 cf8a9a43898fab83f0397c004f1cf5ecb81742cfa17971db15cfebb0e61ed726 SHA512 181cee5764b57f27148609aa17b7e9140385f2e8fd8f0b783386b6df2ae65b5b8a4f65e1a14a03149c35ba3124752ca5c2f5b175100650d5a14788796b990599 WHIRLPOOL 5b78bd0d74aeafbadd2a85fd051f9cdf5b85df9589be2fbb471f2827143ab64690cdeb4e6207826cc7f2989a69345ada98303e717162bedd390b996e5d1b55d8
-DIST libchewing-0.3.3.tar.bz2 1798134 SHA256 72a0de12b86c4d5f6468a68d88c736227ff16fa7a915f8595ffe5a31cae95eae SHA512 24df8d4a1dab72b32bca03bb1086223248a261d522e703c662aad53cfb16fef74691623361d275b8d811d4a0e6bc2b23b044248f7d3982dc657c9872de1de005 WHIRLPOOL 12b67dc7aa3c34fefe66bed995642d021b5c2997d706b7bb73319a0c26b3f9291c771f6308c50bc1cb3e319ff8848a09bf0aec1ed713eb55706bf11cdefdb824
-DIST libchewing-0.4.0.tar.gz 3367957 SHA256 128eae0616c8b4dadaecfb8982304241e65e2eb397001144ba5ed451ec197cc2 SHA512 8ac2a50531867dd628ed0c084a30b22e24cd102671b9ce23b008fb54d049c07135a8af205186e4ed719077cef6739e230fdcbd33cab0821a9bfab5b8fb4248c7 WHIRLPOOL a7ed4841fac60d402c710a8775b74e61bdb6ed6790ce33221bce1efc9b111192251b60bedbd04654d6afb8264d784600794be402d02c04f802bbe6ba03b54984
 DIST libchewing-0.5.1.tar.bz2 3141084 SHA256 9708c63415fa6034435c0f38100e7d30d0e1bac927f67bec6dfeb3fef016172b SHA512 a6551661bb5e56bba59730b93b373db56af7d42f2ab4881fbfff8727689dd2604d42d2e5c0b04820df66a431dfb5fcb73cc5c9b538615da76198ee3635501c1f WHIRLPOOL 317069206b5e739539c327a071dd3be467d755b561afb2186e94c747ce291dfb4473f110023026bf78974ce53ffadde342fa74db4f608fcb9dc655004ccc7331
-EBUILD libchewing-0.3.3.ebuild 1049 SHA256 202855c8111ce42e34f0b3105e16073b65889d945ef947967c14f3f1653adce9 SHA512 ec082eb6696154596fe4a32ee0d569e3bd84cee9a9f4d5be8670216ff1ef5775203a2ae3a8cc925248673d11b6313b6fcd5e8e696847748ff9dfb1664be8a3ca WHIRLPOOL e0e962834de696cdc419f9a33f533ee484e731a08b7bf216979925c05d2fb7b2296792a0f170680ff825981d90d4b074bddc4ce5c29e7522ee779ecaef9f6f9b
-EBUILD libchewing-0.4.0-r1.ebuild 742 SHA256 87eb8af8eac1720d87725895369023e4cc337cfb6f7a8be1eaf9d72d969d2f69 SHA512 bc6dea513d8c5568134a6fc32769a95dbd3e2d85e7019a6eac5f5e04fe12edee0e0e78595e89e4fe64b9c62e3c7d41a6230a728589564df498497d84eb451bf6 WHIRLPOOL 24f697884c1cb2851ce8b063049445af38f13f386a994c5d54120d0a316d0f7cd2908c43b8632b4064c57ddac0dba554bf9863b7c8ac38da10dc7d18703af927
 EBUILD libchewing-0.5.1.ebuild 1128 SHA256 e06d2f57d6993165a811977710f0c5b5dd02de66581db786bf82b8e64f1e9aa5 SHA512 37bf5f22627b97b6f44aefe9602a27a3085ab2048922cbd21330eba5dffc8195c136c553f2fb6b02eae677d35aa06b9d4ad1bd5360f6a2d94c0579662655e9e1 WHIRLPOOL 2f53a7d3f1608e38c76e9fd7d3a306b50ef5e5d67400510d6c247d1fea7a056b7ed9d0da0bf78531c926545290aed2931cb00aac9d406998ec682788f12b47ec
 EBUILD libchewing-9999.ebuild 1102 SHA256 c8d5957744bc324bb8783e626b50bf57516f963b67d90e1c56f5023e06eb08d0 SHA512 a6b0d950c98c5635e87557f3b7a59b38363345111ade7679f2f8d289c61fe15accc7e771e911a205dfe4934b1ca63839ef45c7b55a839e0f738df0c8130388ab WHIRLPOOL f4a25aed6d979eaccb6c422284dc7ac9af246c3135d400f45f1d2ac657b7afffea271d99f808e5336420be0dea1d18f3ed2b82db833ac4b556672780b1537714
 MISC metadata.xml 327 SHA256 e4e2542c5695dc15f7714db2cb554c9a63809a12aa0674e7c8a9e3e1642f3a0d SHA512 c9ab28ab34d940a30e97b989fd96904d2e0816e4b1bc5b843b082d64d6cd476335d9402640e71f2cf8f57f44dcae9af66d5e07075b189fa74f21faba40d819e3 WHIRLPOOL 7914b74f50280e9b89cd1442e993beef7ea6beeede2c6af126a2af1221b10890a7bdb1368b160f4e03d4b8a9c000b694a4595d7187e70c39004818b0c965f389
diff --git a/app-i18n/libchewing/files/0.3.3-strncat-fix.patch b/app-i18n/libchewing/files/0.3.3-strncat-fix.patch
deleted file mode 100644
index 8f2676c0c2b7..000000000000
--- a/app-i18n/libchewing/files/0.3.3-strncat-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/tree.c b/src/tree.c
-index 7e8f665..89ad0d5 100644
---- a/src/tree.c
-+++ b/src/tree.c
-@@ -586,7 +586,7 @@ static void LoadChar( char *buf, int buf_len, uint16 phoneSeq[], int nPhoneSeq )
- 	memset(buf, 0, buf_len);
- 	for ( i = 0; i < nPhoneSeq; i++ ) {
- 		GetCharFirst( &word, phoneSeq[ i ] );
--		strncat(buf, word.word, buf_len);
-+		strncat(buf, word.word, buf_len - strlen(buf) - 1);
- 	}
- 	buf[ buf_len - 1 ] = '\0';
- }
diff --git a/app-i18n/libchewing/libchewing-0.3.3.ebuild b/app-i18n/libchewing/libchewing-0.3.3.ebuild
deleted file mode 100644
index fcb0674cabde..000000000000
--- a/app-i18n/libchewing/libchewing-0.3.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit multilib toolchain-funcs eutils
-
-DESCRIPTION="Library for Chinese Phonetic input method"
-HOMEPAGE="http://chewing.csie.net/"
-SRC_URI="http://chewing.csie.net/download/libchewing/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="debug test static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? (
-		sys-libs/ncurses[unicode]
-		>=dev-libs/check-0.9.4
-	)"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-strncat-fix.patch
-}
-
-src_configure() {
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-	econf $(use_enable debug) \
-		$(use_enable static-libs static) || die
-}
-
-src_test() {
-	# test subdirectory is not enabled by default; this means that we
-	# have to make it explicit.
-	emake -C test check || die "emake check failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	find "${ED}"usr/$(get_libdir)/ -name '*.la' -delete || die
-
-	dodoc AUTHORS ChangeLog NEWS README TODO || die
-}
diff --git a/app-i18n/libchewing/libchewing-0.4.0-r1.ebuild b/app-i18n/libchewing/libchewing-0.4.0-r1.ebuild
deleted file mode 100644
index 32ca6a5ae6fd..000000000000
--- a/app-i18n/libchewing/libchewing-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools ltprune
-
-DESCRIPTION="Library for Chinese Phonetic input method"
-HOMEPAGE="http://chewing.csie.net/"
-SRC_URI="https://github.com/${PN/lib}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/3"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm64 ~ppc ppc64 ~x86"
-IUSE="static-libs test"
-REQUIRED_USE="test? ( static-libs )"
-
-RDEPEND="dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	test? ( sys-libs/ncurses[unicode] )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--with-sqlite3
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/app-i18n/libpinyin/Manifest b/app-i18n/libpinyin/Manifest
index d740d1c96413..524c1cad840c 100644
--- a/app-i18n/libpinyin/Manifest
+++ b/app-i18n/libpinyin/Manifest
@@ -12,7 +12,7 @@ EBUILD libpinyin-0.8.0.ebuild 723 SHA256 10bf617acdf60d830e71cfaadfd15d28cbb73cd
 EBUILD libpinyin-1.0.0.ebuild 769 SHA256 eba1f32f1e09da0a0f125c06ea49b9adbfac99c933f8fce93a13ba6c3ddd76a8 SHA512 5327dfbec65535b38dbaa70f1008b2c29417e644213ec9427ff067cdb16cb20f6432bb070c82f9e24ba56ee8dce18fa588682a89b019ef90e156e00684dfab6b WHIRLPOOL f40834f55ead8f7bb3cc5682c30e4fc123ad74bb9ff978c95342fd9a270b3c3888b4264605a750cf2f5888a6e69deaf9bf2135a4e96b3844d7ceb9d09132101a
 EBUILD libpinyin-1.3.0-r1.ebuild 771 SHA256 fc82e0b37214617390c5eab1145c3e073efa6892f5a4d0f9f02ea7a27260893f SHA512 8edf87ae898328a23a07743f629029012cc0dee82d2b7406764a623f75a91284e6c2d8d71bc3108e30f41200047d05fac220c1ea58709931b76551bf70fc03cc WHIRLPOOL 5075c09a628f6fcb983a443c4c0f71df9816b89e4a49e6e728e06215d50b365a26542cb5d4a357e6fcf6d008cff23ac468f17b012301199d06181a5ee3239b29
 EBUILD libpinyin-2.0.92.ebuild 757 SHA256 db21bdc14edba7a3984691283dbaf89305308b7b396857b0e7e490ab3fb621ff SHA512 354c222130c1b931f2fef9661add143f3db23a9e557cd2726927eb6b53dd4429a4b541b13ae0cc1b8007d99a2c0e7706960716dde77e11d7964947f6c8e4f41d WHIRLPOOL e00932af664d1353ebb5fb2ff34ae75f44ba20cdc2bda43c6b70adc63a0dfc24869f65e41c7ce74ed9285c134a934d619ddf309d71bef14990742f4344b64b1e
-EBUILD libpinyin-2.1.0.ebuild 1354 SHA256 e728b9fe944974fce64bf113f74357eea09b24113b6f5044890c7e1130fef7ad SHA512 d762e40f6df9bda1f4acd28d355ff601e23181f110f369896e10716efcbffce99c76a738ddbb1f3efd7be762416eff912ab15f89f3d9f6a2e89b637c5c59d246 WHIRLPOOL 671442b13c915f860a80f550d9d27914ea9508b0176b9f395e0766ceb9bff9ac021e12defea1387650790384541256905d36e745a038a00ff9948c17673098ae
+EBUILD libpinyin-2.1.0.ebuild 1352 SHA256 2b0b220c0c2e1cb940f83d6e92b9d3b8db7cb16df662e3cc8689e0cc2906d9ac SHA512 f9c86397d609ed814235aa7ea0456dc08ac5ea864bad476592bdb1c1934b32e0de384ffe2d051326abb8661c85ce35a0e238d255d83c64aea99fee8461288f1a WHIRLPOOL 4e6a02b188896bf9f5e809083f98b718364ad4aacbdc09c2c05cdc224b787940f347cb9249ef210e504c9da32be2e426081692038ce158831147989f766785e7
 EBUILD libpinyin-9999.ebuild 1324 SHA256 f4ea629acc1c5345c03b9ed85530389b36962b9bee1499c4e5f128e3aa6a86ba SHA512 4d0b893b7f40303d60ec59ef4afcfb11b017814ef79ab751e5b5cc382a0b1721a8dd3e67ab5a7684d05c72b164274c1c9b6d60f621923107c1d54c79ee39e1ba WHIRLPOOL 7eb629062a9fac8ef48a84412093a42e88f990d18550642b6f190c303757b563b9942bb62d03639de065929b44c08a3d4038f08b521921c2aa1dd5ed386cd569
 MISC ChangeLog 2804 SHA256 cb7b1ee1e346acc0975ad54dce2ee22c7c1accaac05d2b74bf40d06a59ce8e31 SHA512 7c3aaf1a0416df3d73934eb0f85e2cf4835a8bc3ee48e956f3cc4b1853239e08695b837fc0f2e7e04dc93e86d4d1efab9b79cced06642d30d2ce47d66fafce6d WHIRLPOOL 8ca387acc2a45b368ca250db6aecfb39d7749d94ee363c02b15c8cec4120be3e54aaedbd21f56c40157809c62a3c17c5083f71bfe28998c8b6600360ae9d873a
 MISC ChangeLog-2015 1865 SHA256 2eaddf26ac3a0ae49fff77042388f32de3e22f3076ede11b87f8c54a207f201c SHA512 03252ed7e66bb5e055e92c3656906e6cafb82121e74bf0b3ad61f10d3a93fe846b4873c780a448552abe9a96f70908706db3403c5f5f2dc1d719be16f6c113e9 WHIRLPOOL ab9a7422033b39553360887240827a4aac0700046fd0f6f619e6091cbc099ba0572e76776873dd759f4a48c6ba909b97b6073302b551f6f2233de9eaf43a7671
diff --git a/app-i18n/libpinyin/libpinyin-2.1.0.ebuild b/app-i18n/libpinyin/libpinyin-2.1.0.ebuild
index 1d9868e1e94d..641b099ff24a 100644
--- a/app-i18n/libpinyin/libpinyin-2.1.0.ebuild
+++ b/app-i18n/libpinyin/libpinyin-2.1.0.ebuild
@@ -24,7 +24,7 @@ SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.tex
 
 LICENSE="GPL-3+"
 SLOT="0/13"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-libs/glib:2
diff --git a/app-i18n/librime/Manifest b/app-i18n/librime/Manifest
index e6531bd13bb4..0851770b2179 100644
--- a/app-i18n/librime/Manifest
+++ b/app-i18n/librime/Manifest
@@ -6,7 +6,7 @@ DIST librime-0.9.9.tar.gz 2548968 SHA256 e828acc853a5d9e3ca191d065112c410183aadb
 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 SHA256 f7f624b33eec3800e2984448d81039d6c58271e09159ebd21ebec5062a10b60f SHA512 905c76d5b75824318e94d8953eb3b5233d2721c1783b42e7312b56f4ab69be89a158f59a6ce4aa259f89d0baf233fb41bd10129a8b87a519c22c4e7f4d5c75ec WHIRLPOOL e8e9a0e6da2f691ee058e92c90a7308c3ce3109f610e32cfaad8adc899c74cb5cb68870539cad9ebd65f0f3754bfe782f44e0ab62deb24fc98c4f866165160e4
-EBUILD librime-1.2.9.ebuild 896 SHA256 5140cbca967a82700e296d55e4065ebe159ad9047910fd8a2d03e5d07baaa5bc SHA512 3dd8bc615cf7d555dc909fec154922e64733033899db5f27d2e8e7e7fa334c5f77958be3dcc4825ca682e17a4dd0929cedf62eea94117e7c0db1b00a3169f9eb WHIRLPOOL 49b9385458f72df29dcd15c4bb3fd7c6e733dbff8ad08d723ea4eab29b84266828dbea56830cfc77cd7c7838c6e329d559be4e8359901fba59ca1c512770d6e7
+EBUILD librime-1.2.9.ebuild 894 SHA256 ad5b8c1fd034da65172bd522d76765f6d5ec023704e24341885f6099262b7afd SHA512 3f9e33314d88b5a5529ca68126abca53a27ec2214fab0ba321ec13c7d4d1013a6b86acc27bef35e52d383bb376f1e52bc9648d9a5958fb80db1e513c3794a6b8 WHIRLPOOL c6555091fa9b34460d07d0cb7f4912b00c0bf5b3092d179a7feae5a49b812de331e47422915b31760703cbdf4c872ae8012d66738f516342d20a8e28c00ba4d4
 EBUILD librime-1.2.ebuild 1020 SHA256 ed061f3873b657d3d25a85a2123b9d3e671c248e2e9f0302a1cf97435284b78f SHA512 1671e8fff663a6bf2e90e8b176be0ab178d67ff8f4d511b0a0e0fcc1601932e5d2e1336a832573a97a5923bef5169d63832ce8d03e30145b60b86bf9681b9661 WHIRLPOOL 8ae0bf0609e8d4117c82501bd7c2a20c4392a70f67c8f4c3f3f8b6ba304fa53fe185d8efb067a09369aa672102e688351fd7f7fde90e471836a2fc5eda79a0cd
 MISC ChangeLog 3599 SHA256 7d8ce3e1b9502ca204f9ba3ac0e93db523e5bd093f2a92f518fbfed3e29b0345 SHA512 84168f25368df59942feedab779cc5b4fa7e55b501f99c172a0c27dd0c19e7321c94c57bb0118faa3ce7254c7168563ea5efa35bd630c36316e98a81fa5266c9 WHIRLPOOL 7e4985ad4358c7da94812dbcc317c5bd03b819dcca3306aaa88fe03b03e448cf2c8b4e4b6113edb616a0da46b1a891ee95901587a3df5392a5dcce7d8e883358
 MISC ChangeLog-2015 3322 SHA256 1d5b9b9ce52e660b7dc571cc70c7d7ec01b14447a4c6029a481b733c422d180a SHA512 19325ca6fb92c4ce0bb82757a8fd0be33ddc3dbef5eccb3bc70cd8843c6c9cadfce7b98baee22ae1442f7c49785cbc5da2c613471e2a3f794cef11de9c8c718f WHIRLPOOL 56d910f0c173359ae55f8e3898a38bfac1cca797178145e8f514609905a8888846f3dbfd7dc014257bbab6128df7dcb730d73e9e9640ae98a472e801dfdf473b
diff --git a/app-i18n/librime/librime-1.2.9.ebuild b/app-i18n/librime/librime-1.2.9.ebuild
index 881db9f137f9..d2313f54f936 100644
--- a/app-i18n/librime/librime-1.2.9.ebuild
+++ b/app-i18n/librime/librime-1.2.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rime/${PN}/archive/rime-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="static-libs test"
 
 RDEPEND="app-i18n/opencc:=
diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index 46260baa7f3f..74a77aa962f8 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -1,29 +1,13 @@
 AUX 50mozc-gentoo.el 121 SHA256 833039439dea484a430e832df869b3af0b8d42bae63c4d6999e72c97d55d897b SHA512 2d67a6723374872717ab7132f02f4030f00ddecabb8a1fc20c9d69d64406dc2ba2a1109734378fae7b4718a8ae9601beff4b6f27cb43a280fa2e0f946da70685 WHIRLPOOL b9e5235177ee432509c9428b632a1148e8788c1bf9b6fe57bbc4f3f747a038008ef4752a1dfacb86a5be9a018504405e6a68053dd54d381af1fd9170ba9c6ed7
-AUX mozc-1.10.1390.102-drop-Werror.patch 353 SHA256 894411a2dc704157661cc7386abf32b62abea9dc5621bc30474ce3161c54adf7 SHA512 203066f08a5094306d09c3c58f81bfb7a4069bb1eacd31f0d257701a4560adee5452a516351cd9bc5ea7227e40d31bbc6eb177422d3c37514f7573398b389bc2 WHIRLPOOL 0a3cdabbc653c42403fa60d9486927a8b4d9c2003262b973a4f4264424331a02a8fb3c413a736e797525e57f25b12a7ba2fb328ff7a7684b4bb2533f35b2ba96
-AUX mozc-1.13.1651.102-gtk-renderer.patch 547 SHA256 6daa6d077dffbcc133f49745bce5b2503b6097d8280c52a602a99b24eaac7b40 SHA512 7b4a4910a8a0a821fd8130e77ecd0b4f846f7fc2b573607e2ce0280889d625f4e374c60e35995dd5cbc2e8ccaf3443652b60764f538584e0a9d351ca67a28af4 WHIRLPOOL f4dabc1a7a4d29f5830bc641019b939405abc6c36d6acc384ed74a06995dfc31d5993653965acf60f8208969e9643ba97c1d4aca3bb7eac19ee73b4bccbd22e3
 AUX mozc-2.20.2673.102-gcc-5.patch 413 SHA256 6d422910257aa8fb408f36a6e1dce3df9e13760a93c0b935e819405befe5652d SHA512 4c05db865fa7985ff977ac574fe53e43ec103dc17432ed2a2d8a76c5e0230d8ca430eda3848da06b855471e0cd690e62ce73521b9a354f5f3cd4e901ad7e3760 WHIRLPOOL 6e30af73a93c440a363e7c6e5048c1033907a9819be2bcb8245a6cc5885001c564b203de0e00ddde341d1d0c0abba840c475ff6976077d7f426651499f253574
 AUX mozc-2.20.2673.102-system_libraries.patch 9659 SHA256 658ccac9192258e4838b4f25a7aed107fc2121ae16e4e92cf61570a53251f9ad SHA512 c0f858a9536fc449e0d9fb3191df2419f0273a478c31d0404713fc4feae5ffb72afec7b47b57ae2111ed0bf40ead4a75e31a68286440113968e2f4e4d6c2d856 WHIRLPOOL 068e3a5f2d41314cc5f6b3d42787b99ac3f92039061fa83fe4d9728e0d5ff22afad23762b0a75126a273d985a8e3869855bd5eaf381b7e62df9c286b13646763
 AUX mozc-2.20.2673.102-tests_build.patch 1037 SHA256 1f8e35f257e7952fc7818da1748b1be4af578066150304a7f62bdabbc1b95233 SHA512 d99ee7edbb406e123b26ec186933608b42d36193b7bfe67232810c0fbd7a92bd8cfff26dc45eae4f020e82e9a8370cf2033c750250455585b6b3d88cc8c973ef WHIRLPOOL e9384d30f4f8add826dc53fdda1e816563c51c4f7444170667fb041b18782a20f7a3f79c51d7cef19b9a27a078b375d33fdc67d6f5f6bc4321a8a3e03b208329
 AUX mozc-2.20.2673.102-tests_skipping.patch 2086 SHA256 dc86b4d5124e5c3bbce38cf12a0eaf04f7ebad932330fb3a86e7391d14e5843d SHA512 4a2e5a35c5e65ebeb737f656d6efb313c660c2c7cf62abd5d9295fd16e2dffde21d069cd74fd0cfd2454cd7f7c9d136dfbadbf79832db8441c619ff37c7e4b0e WHIRLPOOL f7576123d2e9c096d9301bb3085e3875cb8c72f53621a8adad162b826b8c5784885f4cca6cbfd28a7f7b6d589ffec4e509adcfa1d0c2d2b7e8dfdb4def89fede
-AUX mozc-ibus-1.5.4.patch 10078 SHA256 8164b72ef41800f4327bf4571fa788ce927511c42c6026936a48823a76466511 SHA512 4b2c8027409acac0c70dc1b665ba2cb103bf37ac4e808c9f102e7f860d17fa5bb376d7d9bbe52b255bba87918118002eb85094b74ab70c879410ed32b5f3557e WHIRLPOOL 3850def4d1602ed594369ca8963a776a1d72d0cb008bc374779fb6fdb012c921edc0ea67388df96773c2004addcc238f0b9edb80357b4b0a115800a011eddb7f
-DIST fcitx-mozc-2.16.2037.102.2.patch 140421 SHA256 ff175f3e0301c33f750780765ea264887827d00bc7a59fc8b55ae514ba449a1e SHA512 22b885859588bb8e0efd354d153da461a654203729c723156a419bf33fae473e3f7165964aa3cb3b5c969f97c2727f9d87b0d587330e4eeab67f07d4458542a3 WHIRLPOOL cd9534c8904a7c9f866a8ddd41ab4c57b3ad8b5650fda4cf9ccc1e544c8e0da25c749870606687ee66e4252f224babdbe10415e035038ced654812bad8d299dc
 DIST fcitx-mozc-2.18.2612.102.1.patch 140722 SHA256 0ec5dc2e9798ce7a6dbcbe847cf016b0b49be1851008143d167c13333a15ed27 SHA512 725c464727f230707b90975705ef1565f1178f9144e66c5a688696a4ef520a6fec1d11f7aa68ee05f82aa9417060b1cccf49a155e30734871a525eaa4c76addb WHIRLPOOL 25d0efd313175f6648504b989302c73ab6d82a0cf4eecf332b68347331e1feff2df6251edd49c3d4e9251a2c7e01df56eb8de54ebbbc31582f7c2b89d1da53c1
-DIST gmock-1.6.0.zip 2053682 SHA256 341ad07c31c619ba32c88c2265bc23693da1df062f47f146a7ed340f646d82b7 SHA512 7adff00bb6ff81a6ffb704be71d0747636d69e24b4a8b709e1fb8c177a9a47f6dea8d14fde73034ebfb1529c291c7212a944ad92a34f88abdfe23c2d0b11b6f7 WHIRLPOOL 1a03ff8f2d96287f5deb24f970688f20f3480e77a4a71089ef1399a87f28f616bf0feaedc217e7ac1ca8ca1246e53f5d882f350704be111ae547961949939530
-DIST gtest-1.6.0.zip 1121697 SHA256 5ec97df8e75b4ee796604e74716d1b50582beba22c5502edd055a7e67a3965d8 SHA512 f4718dfbfa3339bb9449c3f14e5b44ae405ea7df64c10a0957a6300985b71c4642981d069a1382e27ae041a4e2873527a9e442aff978447e795a190f99fac115 WHIRLPOOL 745a49020d4353ed2fa38adfc80bbd777358c831719bbe3b7c90d243f84256615222ba5f04d48d98b9e1a803bb40766799b3aedd575024c19d853d9239a12f8a
-DIST gyp-20140602.tar.bz2 432422 SHA256 f67be748f4dc36aa1619f43d4624c746728cf268af7f4ebf78dab3fa6d43d973 SHA512 e3a59daac57ddafc5804384c01cf51d4b90cd119d263afd83ec6eef9239c38bc7715736f70e20e44fae04fd8be1b86aa5323908a92d574372aa298f3355ce15f WHIRLPOOL 17e4630dcd7592e8ee197b4130d6147d9fd63404938f62e08ad10a204bd4bddcfc7d394abf3572a337e3dea46d4a7361dbc0cccc02e07ab99ed8f90e80830451
-DIST japanese-usage-dictionary-10.tar.bz2 56142 SHA256 8c22284c97fdfad854790517f9200c439453c033db8f6a9d25aa5d95266b2384 SHA512 f299cf9183b9ec219d80c1fa745f351765d246d601f3c4091d1705e3c8b5ef66a32288d4c162e7bbc456b6d49ee90f1e5bf33721e1229165f3ee069daddd3198 WHIRLPOOL d2f690335cf271b0780c969f56616ece9d28f3dbe990548053a252c855db18a4a31d21e6bd8c34160c0893c21fab4543e5ff3cecb48c7f6ecfd5c84465d314a6
 DIST japanese-usage-dictionary-20120416091336.tar.gz 71051 SHA256 0b6efee0eebac2c1a8eeea333278aa40fcef7846bba9a379962c6e567e7e3dc1 SHA512 b7e997a979b6d50e49b9af5dc830ea4df0532f6ab1321b9ef14983f65bb54f1b2967375c82e07957ae7693ebbf43c9b56ecea6bfea8dd1fdaee444bd549d83a7 WHIRLPOOL 1c4324a6408cfc0b2e1df33a32583384ccf10374bc1a8f49f574e681a72174f7bee7e8500c93d714ee6459c087f7cd408e57cb52b8506ec50292249e50045cd2
-DIST jsoncpp-src-0.6.0-rc2.tar.gz 117661 SHA256 d4d193d163f520b08b9155cba978615892ca1359d77e3fb261fce2f86d09b283 SHA512 5d44e766aa2d7657bc68cf16173130febaa6744d5fca0c6df5465617a3f306023a17cbeb07a62ad1a34c2d183d916401b4be48f37c2416c895db4ad5d9481b3d WHIRLPOOL bfa7e70e14f3ed0911c5127da0d2099ca8b9159a900a5bc5147d1e50b5a9f9d5be69a8d46a761d277ca1edabaab8d0d3b9f81417572e4664ed8239fd83c953e6
-DIST mozc-1.10.1390.102.tar.bz2 57879881 SHA256 72a8ed6657daa1c03b1efe50c262a69be2ab66d45747a47df6e54996b6d5ee39 SHA512 4482e822f8a14bffd02cb1eaa5d14ba0a213266b2f0dd6402c42b9b357bf0d8c4dd572cef79f1d400bd68b7bd6cb4367933574f8f5967f68738249a300e3cfb9 WHIRLPOOL 90518e621ef784b438fcf677e211fdb6753719f3d78d14ce866ccea22d6d87f8d64e334bc568eebe93cb2850d3d545eb0b73d6f6de820eaf1d43f16bfdef4100
-DIST mozc-1.13.1651.102.tar.bz2 31635636 SHA256 a275accc726d55d696adf235fa40822ae099f0a02d3dc9f8d0257ba191a1bc49 SHA512 caa75e60704e904a72fd06e315a219ff304a54adaeee70a8ab75d413f7801960add103b9aae1c19ee92f6d10c4c408fd840cf78c5dde0cc21c605feac59deaf4 WHIRLPOOL 72a870cc1bc5bc63227bba61c73183f69160aa5c58c9b89e75fa65bf16bbdc2c2b873b7407d0543b3847bc046866392d9bbe6d771d7b4b7eb3f6be759f1a63b4
-DIST mozc-2.16.2037.102.tar.bz2 41172838 SHA256 4b78769b36366f056282267935a859e587f77e9aaf17132687d0e4d0c4da5cd0 SHA512 ff114a93054b43109407c44bc7c75de79fa2b028f9dba5c2ecc1776c5cbb032f184a91155b6b31bc17f0183dd70b0150ce13e80f59e26810daf4b65ba7e52be1 WHIRLPOOL 625c5a28da164ee96cdf523af32a7101357254cea1d57cd7f272bdf86ba8344d3e39bf2b2bfb0a79640d7961fd46c183eabc4002c8d86215ecffe183e4e0d193
 DIST mozc-2.20.2673.102.tar.gz 48624369 SHA256 004cb773d335e7e1075cf20fd9e713f6dcf6d158d75077bcb95358a116ad3cca SHA512 ad7a78b03b29847057625fd5422c03ac8fc5755c5e85c66fd6e80f81be719dd56bf1349a1d745797118deed239641512789687b4f9ffe49bab1bc966385229ae WHIRLPOOL f78140126a950eb28548c6ef8b20ec5599e04ac1de7d22d2b0ba00cc2471d43ec9823996e399f9025cfcbc7b50a3ecdbd3283463acb423b65089f56c96cc88db
-DIST protobuf-2.5.0.tar.bz2 1866763 SHA256 13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 SHA512 5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee WHIRLPOOL 7e6786e1f20bf253d0e386a95c2bbfe1b443f484d492f97552cadcea62c24461436aa88130e3ff20b4dc9f352c101458cb8c03686f1cc4e6e2133b6e78f5b70d
-EBUILD mozc-1.10.1390.102-r1.ebuild 4854 SHA256 f0c67e771fbe8f2dd8d324f0525e6cf90f14e84d9b1d7919da075f2262818efd SHA512 f84435093d31d49b8b7dd5b71c4f753ed8d0da7fb5666ff4381578dff7d9ab8cbbc02b728923f3f75c00dfe4591f7709f85df9ac7e586a1c3653b79ec0d3c60d WHIRLPOOL a97880e4d4c14843052465f1e981737e5e379d21febd2115a515cc9b20659c0f38f7af6f772f0e00e7b7b5d2bca1adf5887b7358f6d5d319db661befb7d004ae
-EBUILD mozc-1.13.1651.102.ebuild 5036 SHA256 968aa5ea57c352fe27832db8242637d57f2f809b45362144d7556760e17dc405 SHA512 ee8f4d4feffc39dd01dc70ae03a5f4f307d0fff5319c38c25d7dabc35ea66855e58d84e71220ab812e31dcdb47c32097ff6685be945299213dbba24a8836fecb WHIRLPOOL a7fab3c787335db1b8f32bb693b566edb747074df9f278d55abbc22af2443fdc0e8623f1f2b4dd582ba1a854eb8dc64d5bcf38288648fa34c12bc9084ff9c598
-EBUILD mozc-2.16.2037.102.ebuild 6726 SHA256 9dc66731dcb8a792b0a309fc21b262625e1f8c22016ce2bb580b872856730e25 SHA512 eb4d744a8fb5902c66296b96987f8b50e0a3e5d8792951fe44bb84f12c3308d2512341ac89781b62e9db4d1c19b40646a3948449ea744e2e7470e28c048ecaf6 WHIRLPOOL 991dc805f479a90f2ad540ea1d1ed1fd6147f628081e9048554cb85e47583c53b7e1cec19cada1200475a8d8d42d30ea8e5acbf57869a32f1565dac3cde25b75
 EBUILD mozc-2.20.2673.102.ebuild 8980 SHA256 7e06e6da0516bbefe16a1a84760a6989488196d1eead07d60c2ec2ee9636d400 SHA512 658afe79f1121d4d920e908743fe3a21ee9529f054a1ec0c74baf304a67ae2549ef81f7ef475a5fcf5072efa67635a0f4db5fa3fb27c2d3e255fdefe00737e1c WHIRLPOOL 50b0ecccf9c7a168a72b09396a9312023a2dc068e95ba15f82e8b03909e9030421b5acdfab5d592d8fab6f14eb0202cdda0077250f254008971376ce636f8f28
 EBUILD mozc-9999.ebuild 8875 SHA256 1efdce8761ce9c4b23b6b147e48bebc8a6e15ce70cde27db015c088175a32ae3 SHA512 325c139315a060116f1ae64f88c93bcc191000a0ec06717e3adb359e624b02f7ad334c806b1b01147c233337ee247f5b53122f7287299e3bb12700b2e812729e WHIRLPOOL b845063d7078942de41a01f0737726e65f938a1b25cc6413798ef049e2cabb25633b1ca6ce3084781e3d6f2b4d8f24df78cba85dd25214a3ff8be7c4f4eaff34
 MISC ChangeLog 3991 SHA256 40dc9da4e7d6d62958c610f045da2e78bdca028852617be136838e3cdb707fdb SHA512 ad3b884e40c14154afe299f353dde7cd3fc08555e281911a1b97b2da60e6e5a34c4de396b974b59bfd9cda4ca6068b74e0ce3cef24c3828d55b708c16fffbcbe WHIRLPOOL 99d04bfcd81c2cce998a72f71a3b6577650d413c02fb05b36ac2e82a8ab3fc625076ff51a5093b5f682fd1c2224b8d6af3813bb7684ed8891e74d2f9425dda9e
 MISC ChangeLog-2015 8901 SHA256 096cea82e38f33a34acfac0b7622c959de656cfe4f1cb3afd3f148e12f3e013d SHA512 2f9acbcf3e7eafd3a1b7052e9b0e7f9a41c565d876cb4eb78360964b3fb7acd9dee3b45ee6a3ed76fe04c00b175e56c63b0b83698c0dbfc6554ab4b474566e87 WHIRLPOOL eed311405f838d6daa955f118d9429db8508a1b08120bed39debe3af397c8bdd5100a6cda0c0b77ae48550407a6b2d49bb63f2c40f6faac62aa183c1479479d6
-MISC metadata.xml 1334 SHA256 a4f99e39449d176f6d38e09097c5df85be755c5747430bfdc41f0a7e1aedf276 SHA512 07979f2fb42667e6281f7617f88d86eae9117e7fb33203acb456379db9468992e2105e520c1ecb7e77c9ad79900daa8c11d57c53b03b5ea89f644dcca020f9de WHIRLPOOL 5c3c78f349c84e394d98d7468145b7ab6e73786b59621987f135ab8fdb6182418d26e0c9bcd18d458062a28d89d81f1bf7b7691fa40b46eb3594109356499207
+MISC metadata.xml 1127 SHA256 70fc6593888bd56623d4ca6851d5a4115848589c494885dd8c57f72884dd6f3b SHA512 8d1ee79d5e359c746627cc10ddae170088dd1be8a69379f60969e588c0c6141fea80ebcba0183a91e786116e8937c14e76888c9232526244aab584ed4ef27a54 WHIRLPOOL f401c3065ca9f5b69f81b491b23721db046d06a16a1465910c95c43ab505a075bc1508706cb396de04be01e1cc79af212411dd0e64de7beaef8195f3e7320e9f
diff --git a/app-i18n/mozc/files/mozc-1.10.1390.102-drop-Werror.patch b/app-i18n/mozc/files/mozc-1.10.1390.102-drop-Werror.patch
deleted file mode 100644
index e254f38b8745..000000000000
--- a/app-i18n/mozc/files/mozc-1.10.1390.102-drop-Werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/gyp/common.gypi b/gyp/common.gypi
-index 6c176ff..3613b1b 100755
---- a/gyp/common.gypi
-+++ b/gyp/common.gypi
-@@ -58,7 +58,6 @@
-     # warning_cflags will be shared with Mac and Linux.
-     'warning_cflags': [
-       '-Wall',
--      '-Werror',
-       '-Wno-char-subscripts',
-       '-Wno-sign-compare',
-       '-Wno-deprecated-declarations',
diff --git a/app-i18n/mozc/files/mozc-1.13.1651.102-gtk-renderer.patch b/app-i18n/mozc/files/mozc-1.13.1651.102-gtk-renderer.patch
deleted file mode 100644
index bff0822a602d..000000000000
--- a/app-i18n/mozc/files/mozc-1.13.1651.102-gtk-renderer.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/unix/ibus/mozc_engine.cc b/unix/ibus/mozc_engine.cc
-index e256ea4..534262e 100755
---- a/unix/ibus/mozc_engine.cc
-+++ b/unix/ibus/mozc_engine.cc
-@@ -250,8 +250,6 @@ MozcEngine::MozcEngine()
- #ifdef ENABLE_GTK_RENDERER
-       gtk_candidate_window_handler_(new GtkCandidateWindowHandler(
-           new renderer::RendererClient())),
--#else
--      gtk_candidate_window_handler_(NULL),
- #endif  // ENABLE_GTK_RENDERER
-       ibus_candidate_window_handler_(new IBusCandidateWindowHandler()),
-       preedit_method_(config::Config::ROMAN) {
diff --git a/app-i18n/mozc/files/mozc-ibus-1.5.4.patch b/app-i18n/mozc/files/mozc-ibus-1.5.4.patch
deleted file mode 100644
index 619b1d251507..000000000000
--- a/app-i18n/mozc/files/mozc-ibus-1.5.4.patch
+++ /dev/null
@@ -1,299 +0,0 @@
-Index: engine_interface.h
-===================================================================
---- unix/ibus/engine_interface.h	(revision 177)
-+++ unix/ibus/engine_interface.h	(working copy)
-@@ -106,6 +106,11 @@
-                                  gint y,
-                                  gint w,
-                                  gint h) = 0;
-+
-+  // The interface function for the "set-content-type" signal
-+  virtual void SetContentType(IBusEngine *engine,
-+                              guint purpose,
-+                              guint hints) = 0;
- };
- 
- }  // namespace ibus
-Index: engine_registrar.cc
-===================================================================
---- unix/ibus/engine_registrar.cc	(revision 177)
-+++ unix/ibus/engine_registrar.cc	(working copy)
-@@ -63,7 +63,9 @@
-   engine_class->reset = Reset;
-   engine_class->set_capabilities = SetCapabilities;
-   engine_class->set_cursor_location = SetCursorLocation;
--
-+#if defined(MOZC_ENABLE_IBUS_INPUT_PURPOSE)
-+  engine_class->set_content_type = SetContentType;
-+#endif  // MOZC_ENABLE_IBUS_INPUT_PURPOSE
-   return true;
- }
- 
-@@ -87,6 +89,9 @@
-   engine_class->reset = NULL;
-   engine_class->set_capabilities = NULL;
-   engine_class->set_cursor_location = NULL;
-+#if defined(MOZC_ENABLE_IBUS_INPUT_PURPOSE)
-+  engine_class->set_content_type = NULL;
-+#endif  // MOZC_ENABLE_IBUS_INPUT_PURPOSE
- 
-   mozc::ibus::EngineInterface *previous = g_engine;
-   g_engine = NULL;
-@@ -179,5 +184,12 @@
-   g_engine->SetCursorLocation(engine, x, y, w, h);
- }
- 
-+void EngineRegistrar::SetContentType(
-+    IBusEngine *engine,
-+    guint purpose,
-+    guint hints) {
-+  g_engine->SetContentType(engine, purpose, hints);
-+}
-+
- }  // namespace ibus
- }  // namespace mozc
-Index: engine_registrar.h
-===================================================================
---- unix/ibus/engine_registrar.h	(revision 177)
-+++ unix/ibus/engine_registrar.h	(working copy)
-@@ -84,6 +84,9 @@
-                                 gint y,
-                                 gint w,
-                                 gint h);
-+  static void SetContentType(IBusEngine *engine,
-+                             guint purpose,
-+                             guint hints);
- };
- 
- }  // namespace ibus
-Index: ibus_header.h
-===================================================================
---- unix/ibus/ibus_header.h	(revision 177)
-+++ unix/ibus/ibus_header.h	(working copy)
-@@ -36,5 +36,10 @@
- #error "ibus-mozc now requires IBus>=1.4.1"
- #endif  // libibus (<1.4.1)
- 
-+#if IBUS_CHECK_VERSION(1, 5, 4)
-+#if !defined(MOZC_ENABLE_IBUS_INPUT_PURPOSE)
-+#define MOZC_ENABLE_IBUS_INPUT_PURPOSE
-+#endif  // !MOZC_ENABLE_IBUS_INPUT_PURPOSE
-+#endif  // libibus(>=1.5.4)
- 
- #endif  // MOZC_UNIX_IBUS_IBUS_HEADER_H_
-Index: mozc_engine.cc
-===================================================================
---- unix/ibus/mozc_engine.cc	(revision 177)
-+++ unix/ibus/mozc_engine.cc	(working copy)
-@@ -372,6 +372,7 @@
- 
- void MozcEngine::FocusOut(IBusEngine *engine) {
-   GetCandidateWindowHandler(engine)->Hide(engine);
-+  property_handler_->ResetContentType(engine);
- 
-   // Do not call SubmitSession or RevertSession. Preedit string will commit on
-   // Focus Out event automatically by ibus_engine_update_preedit_text_with_mode
-@@ -397,6 +398,11 @@
-   VLOG(2) << "keyval: " << keyval
-           << ", keycode: " << keycode
-           << ", modifiers: " << modifiers;
-+  if (property_handler_->IsDisabled()) {
-+    // It is each enginze's responsibility for ignoreing keyevents on
-+    // the password field on the locked screen since IBus 1.5.4.
-+    return FALSE;
-+  }
- 
-   // Send current caret location to mozc_server to manage suggest window
-   // position.
-@@ -501,6 +507,18 @@
-   // Do nothing
- }
- 
-+void MozcEngine::SetContentType(IBusEngine *engine,
-+                                guint purpose,
-+                                guint hints) {
-+  const bool prev_disabled =
-+      property_handler_->IsDisabled();
-+  property_handler_->UpdateContentType(engine);
-+  if (!prev_disabled && property_handler_->IsDisabled()) {
-+    // Make sure on-going composition is reverted.
-+    RevertSession(engine);
-+  }
-+}
-+
- GType MozcEngine::GetType() {
-   static GType type = 0;
- 
-Index: mozc_engine.h
-===================================================================
---- unix/ibus/mozc_engine.h	(revision 177)
-+++ unix/ibus/mozc_engine.h	(working copy)
-@@ -99,6 +99,9 @@
-                          gint y,
-                          gint w,
-                          gint h);
-+  void SetContentType(IBusEngine *engine,
-+                      guint purpose,
-+                      guint hints);
- 
-   // Returns the GType which this class represents.
-   static GType GetType();
-Index: property_handler.cc
-===================================================================
---- unix/ibus/property_handler.cc	(revision 177)
-+++ unix/ibus/property_handler.cc	(working copy)
-@@ -61,6 +61,19 @@
- bool IsMozcToolAvailable() {
-   return FileUtil::FileExists(SystemUtil::GetToolPath());
- }
-+
-+bool GetDisabled(IBusEngine *engine) {
-+  bool disabled = false;
-+#if defined(MOZC_ENABLE_IBUS_INPUT_PURPOSE)
-+  guint purpose = IBUS_INPUT_PURPOSE_FREE_FORM;
-+  guint hints = IBUS_INPUT_HINT_NONE;
-+  ibus_engine_get_content_type(engine, &purpose, &hints);
-+  disabled = (purpose == IBUS_INPUT_PURPOSE_PASSWORD ||
-+              purpose == IBUS_INPUT_PURPOSE_PIN);
-+#endif  // MOZC_ENABLE_IBUS_INPUT_PURPOSE
-+  return disabled;
-+}
-+
- }  // namespace
- 
- PropertyHandler::PropertyHandler(MessageTranslatorInterface *translator,
-@@ -71,7 +84,8 @@
-       client_(client),
-       translator_(translator),
-       original_composition_mode_(kMozcEngineInitialCompositionMode),
--      is_activated_(true) {
-+      is_activated_(true),
-+      is_disabled_(false) {
- 
-   AppendCompositionPropertyToPanel();
- #ifndef OS_CHROMEOS
-@@ -105,6 +119,7 @@
- 
- void PropertyHandler::Register(IBusEngine *engine) {
-   ibus_engine_register_properties(engine, prop_root_);
-+  UpdateContentType(engine);
- }
- 
- // TODO(nona): do not use kMozcEngine*** directory.
-@@ -228,8 +243,34 @@
-   ibus_prop_list_append(prop_root_, prop_mozc_tool_);
- }
- 
-+void PropertyHandler::UpdateContentTypeImpl(IBusEngine *engine,
-+                                            bool disabled) {
-+  const bool prev_is_disabled = is_disabled_;
-+  is_disabled_ = disabled;
-+  if (prev_is_disabled == is_disabled_) {
-+    return;
-+  }
-+  const commands::CompositionMode visible_mode = 
-+      (prev_is_disabled && !is_disabled_ && IsActivated())
-+          ? original_composition_mode_ : 
-+            kMozcEnginePropertyIMEOffState->composition_mode;
-+  UpdateCompositionModeIcon(engine, visible_mode);
-+}
-+
-+void PropertyHandler::ResetContentType(IBusEngine *engine) {
-+  UpdateContentTypeImpl(engine, false);
-+}
-+
-+void PropertyHandler::UpdateContentType(IBusEngine *engine) {
-+  UpdateContentTypeImpl(engine, GetDisabled(engine));
-+}
-+
- void PropertyHandler::Update(IBusEngine *engine,
-                              const commands::Output &output) {
-+  if (IsDisabled()) {
-+    return;
-+  }
-+
-   if (output.has_status() &&
-       (output.status().activated() != is_activated_ ||
-        output.status().mode() != original_composition_mode_)) {
-@@ -325,6 +366,10 @@
-                                               const gchar *property_name,
-                                               guint property_state) {
- #ifndef OS_CHROMEOS
-+  if (IsDisabled()) {
-+    return;
-+  }
-+
-   if (prop_mozc_tool_) {
-     for (guint prop_index = 0; ; ++prop_index) {
-       IBusProperty *prop = ibus_prop_list_get(
-@@ -371,9 +416,13 @@
- }
- 
- bool PropertyHandler::IsActivated() const {
--  return is_activated_;
-+  return is_activated_ && !IsDisabled();
- }
- 
-+bool PropertyHandler::IsDisabled() const {
-+  return is_disabled_;
-+}
-+
- commands::CompositionMode PropertyHandler::GetOriginalCompositionMode() const {
-   return original_composition_mode_;
- }
-Index: property_handler.h
-===================================================================
---- unix/ibus/property_handler.h	(revision 177)
-+++ unix/ibus/property_handler.h	(working copy)
-@@ -54,14 +54,19 @@
-   virtual ~PropertyHandler();
- 
-   virtual void Register(IBusEngine *engine);
-+  virtual void ResetContentType(IBusEngine *engine);
-+  virtual void UpdateContentType(IBusEngine *engine);
-   virtual void Update(IBusEngine *engine, const commands::Output &output);
-   virtual void ProcessPropertyActivate(IBusEngine *engine,
-                                        const gchar *property_name,
-                                        guint property_state);
-   virtual bool IsActivated() const;
-+  virtual bool IsDisabled() const;
-   virtual commands::CompositionMode GetOriginalCompositionMode() const;
- 
-  private:
-+  void UpdateContentTypeImpl(IBusEngine *engine, bool disabled);
-+
-   // Appends composition properties into panel
-   void AppendCompositionPropertyToPanel();
-   // Appends tool properties into panel
-@@ -79,6 +84,7 @@
-   scoped_ptr<MessageTranslatorInterface> translator_;
-   commands::CompositionMode original_composition_mode_;
-   bool is_activated_;
-+  bool is_disabled_;
- };
- 
- }  // namespace ibus
-Index: property_handler_interface.h
-===================================================================
---- unix/ibus/property_handler_interface.h	(revision 177)
-+++ unix/ibus/property_handler_interface.h	(working copy)
-@@ -45,6 +45,9 @@
-   // Registers current properties into engine.
-   virtual void Register(IBusEngine *engine) ABSTRACT;
- 
-+  virtual void ResetContentType(IBusEngine *engine) ABSTRACT;
-+  virtual void UpdateContentType(IBusEngine *engine) ABSTRACT;
-+
-   // Update properties.
-   virtual void Update(IBusEngine *engine,
-                       const commands::Output &output) ABSTRACT;
-@@ -55,6 +58,9 @@
-   // Returns if IME is activated or not.
-   virtual bool IsActivated() const ABSTRACT;
- 
-+  // Returns if IME is forcesully disabled, e.g. on a password field.
-+  virtual bool IsDisabled() const ABSTRACT;
-+
-   // Returns original composition mode before.
-   virtual commands::CompositionMode GetOriginalCompositionMode() const ABSTRACT;
- };
diff --git a/app-i18n/mozc/metadata.xml b/app-i18n/mozc/metadata.xml
index f5031cbbd25c..5b85ef8a79d9 100644
--- a/app-i18n/mozc/metadata.xml
+++ b/app-i18n/mozc/metadata.xml
@@ -10,10 +10,9 @@
 		<name>Cjk</name>
 	</maintainer>
 	<longdescription lang="en">
-Mozc is a Japanese Input Method Editor (IME) designed for multi-platform such as Chromium OS, Windows, Mac and Linux. This open-source project originates from Google Japanese Input.
-</longdescription>
+		Mozc is a subset of Google Japanese Input (Google 日本語入力) released in open-source form.
+	</longdescription>
 	<use>
-		<flag name="fcitx">Enable support for <pkg>app-i18n/fcitx</pkg></flag>
 		<flag name="fcitx4">Enable support for <pkg>app-i18n/fcitx</pkg> 4</flag>
 		<flag name="gui">Install graphical user interface tool (mozc_tool)</flag>
 		<flag name="handwriting-tegaki">Use handwriting recognition model from <pkg>app-i18n/tegaki-zinnia-japanese</pkg></flag>
@@ -22,7 +21,6 @@ Mozc is a Japanese Input Method Editor (IME) designed for multi-platform such as
 		<flag name="renderer">Enable native candidate window</flag>
 	</use>
 	<upstream>
-		<remote-id type="sourceforge">jsoncpp</remote-id>
 		<remote-id type="github">google/mozc</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/mozc/mozc-1.10.1390.102-r1.ebuild b/app-i18n/mozc/mozc-1.10.1390.102-r1.ebuild
deleted file mode 100644
index 7aa21965a5f9..000000000000
--- a/app-i18n/mozc/mozc-1.10.1390.102-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit elisp-common eutils multilib multiprocessing python-single-r1 toolchain-funcs
-
-DESCRIPTION="The Mozc engine for IBus Framework"
-HOMEPAGE="https://github.com/google/mozc"
-
-PROTOBUF_VER="2.5.0"
-GMOCK_VER="1.6.0"
-GTEST_VER="1.6.0"
-JSONCPP_VER="0.6.0-rc2"
-MOZC_URL="https://mozc.googlecode.com/files/${P}.tar.bz2"
-PROTOBUF_URL="https://protobuf.googlecode.com/files/protobuf-${PROTOBUF_VER}.tar.bz2"
-GMOCK_URL="https://googlemock.googlecode.com/files/gmock-${GMOCK_VER}.zip"
-GTEST_URL="https://googletest.googlecode.com/files/gtest-${GTEST_VER}.zip"
-JSONCPP_URL="mirror://sourceforge/jsoncpp/jsoncpp-src-${JSONCPP_VER}.tar.gz"
-SRC_URI="${MOZC_URL} ${PROTOBUF_URL}
-	test? ( ${GMOCK_URL} ${GTEST_URL} ${JSONCPP_URL} )"
-
-LICENSE="BSD ipadic public-domain unicode"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs +ibus +qt4 renderer test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/openssl:0=
-	x11-libs/libxcb
-	emacs? ( virtual/emacs )
-	ibus? ( >=app-i18n/ibus-1.4.1 )
-	renderer? ( x11-libs/gtk+:2 )
-	qt4? (
-		dev-qt/qtgui:4
-		app-i18n/zinnia
-	)
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-BUILDTYPE="${BUILDTYPE:-Release}"
-
-RESTRICT="test"
-
-SITEFILE=50${PN}-gentoo.el
-
-src_unpack() {
-	unpack $(basename ${MOZC_URL})
-
-	cd "${S}"/protobuf
-	unpack $(basename ${PROTOBUF_URL})
-	mv protobuf-${PROTOBUF_VER} files || die
-
-	if use test; then
-		cd "${S}"/third_party
-		unpack $(basename ${GMOCK_URL}) $(basename ${GTEST_URL}) \
-			$(basename ${JSONCPP_URL})
-		mv gmock-${GMOCK_VER} gmock || die
-		mv gtest-${GTEST_VER} gtest || die
-		mv jsoncpp-src-${JSONCPP_VER} jsoncpp || die
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-drop-Werror.patch
-	epatch "${FILESDIR}"/${PN}-ibus-1.5.4.patch
-	epatch_user
-}
-
-src_configure() {
-	local myconf="--server_dir=/usr/$(get_libdir)/mozc"
-
-	if ! use qt4 ; then
-		myconf+=" --noqt"
-		export GYP_DEFINES="use_libzinnia=0"
-	fi
-
-	if ! use renderer ; then
-		export GYP_DEFINES="${GYP_DEFINES} enable_gtk_renderer=0"
-	fi
-
-	# export GYP_DEFINES="${GYP_DEFINES} use_libprotobuf=1"
-
-	"${PYTHON}" build_mozc.py gyp ${myconf} || die "gyp failed"
-}
-
-src_compile() {
-	tc-export CC CXX AR AS RANLIB LD
-
-	local my_makeopts=$(makeopts_jobs)
-	# This is for a safety. -j without a number, makeopts_jobs returns 999.
-	local myjobs=-j${my_makeopts/999/1}
-
-	local mytarget="server/server.gyp:mozc_server"
-	use emacs && mytarget="${mytarget} unix/emacs/emacs.gyp:mozc_emacs_helper"
-	use ibus && mytarget="${mytarget} unix/ibus/ibus.gyp:ibus_mozc"
-	use renderer && mytarget="${mytarget} renderer/renderer.gyp:mozc_renderer"
-	if use qt4 ; then
-		export QTDIR="${EPREFIX}/usr"
-		mytarget="${mytarget} gui/gui.gyp:mozc_tool"
-	fi
-
-	V=1 "${PYTHON}" build_mozc.py build_tools -c "${BUILDTYPE}" ${myjobs} || die
-	V=1 "${PYTHON}" build_mozc.py build -c "${BUILDTYPE}" ${mytarget} ${myjobs} || die
-
-	if use emacs ; then
-		elisp-compile unix/emacs/*.el || die
-	fi
-}
-
-src_test() {
-	tc-export CC CXX AR AS RANLIB LD
-	V=1 "${PYTHON}" build_mozc.py runtests -c "${BUILDTYPE}" || die
-}
-
-src_install() {
-	if use emacs ; then
-		dobin "out_linux/${BUILDTYPE}/mozc_emacs_helper" || die
-		elisp-install ${PN} unix/emacs/*.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN} || die
-	fi
-
-	if use ibus ; then
-		exeinto /usr/libexec || die
-		newexe "out_linux/${BUILDTYPE}/ibus_mozc" ibus-engine-mozc || die
-		insinto /usr/share/ibus/component || die
-		doins "out_linux/${BUILDTYPE}/obj/gen/unix/ibus/mozc.xml" || die
-		insinto /usr/share/ibus-mozc || die
-		(
-			cd data/images/unix
-			newins ime_product_icon_opensource-32.png product_icon.png || die
-			for f in ui-*
-			do
-				newins ${f} ${f/ui-} || die
-			done
-		)
-
-	fi
-
-	exeinto "/usr/$(get_libdir)/mozc" || die
-	doexe "out_linux/${BUILDTYPE}/mozc_server" || die
-
-	if use qt4 ; then
-		exeinto "/usr/$(get_libdir)/mozc" || die
-		doexe "out_linux/${BUILDTYPE}/mozc_tool" || die
-	fi
-
-	if use renderer ; then
-		exeinto "/usr/$(get_libdir)/mozc" || die
-		doexe "out_linux/${BUILDTYPE}/mozc_renderer" || die
-	fi
-}
-
-pkg_postinst() {
-	if use emacs ; then
-		elisp-site-regen
-		elog "You can use mozc-mode via LEIM (Library of Emacs Input Method)."
-		elog "Write the following settings into your init file (~/.emacs.d/init.el"
-		elog "or ~/.emacs) in order to use mozc-mode by default, or you can call"
-		elog "\`set-input-method' and set \"japanese-mozc\" anytime you have loaded"
-		elog "mozc.el"
-		elog
-		elog "  (require 'mozc)"
-		elog "  (set-language-environment \"Japanese\")"
-		elog "  (setq default-input-method \"japanese-mozc\")"
-		elog
-		elog "Having the above settings, just type C-\\ which is bound to"
-		elog "\`toggle-input-method' by default."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/app-i18n/mozc/mozc-1.13.1651.102.ebuild b/app-i18n/mozc/mozc-1.13.1651.102.ebuild
deleted file mode 100644
index 6fa63db9ed91..000000000000
--- a/app-i18n/mozc/mozc-1.13.1651.102.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit elisp-common eutils multilib multiprocessing python-single-r1 toolchain-funcs
-
-DESCRIPTION="The Mozc engine for IBus Framework"
-HOMEPAGE="https://github.com/google/mozc"
-
-PROTOBUF_VER="2.5.0"
-GMOCK_VER="1.6.0"
-GTEST_VER="1.6.0"
-JSONCPP_VER="0.6.0-rc2"
-GYP_DATE="20140602"
-MOZC_URL="https://mozc.googlecode.com/files/${P}.tar.bz2"
-PROTOBUF_URL="https://protobuf.googlecode.com/files/protobuf-${PROTOBUF_VER}.tar.bz2"
-GMOCK_URL="https://googlemock.googlecode.com/files/gmock-${GMOCK_VER}.zip"
-GTEST_URL="https://googletest.googlecode.com/files/gtest-${GTEST_VER}.zip"
-JSONCPP_URL="mirror://sourceforge/jsoncpp/jsoncpp-src-${JSONCPP_VER}.tar.gz"
-GYP_URL="https://dev.gentoo.org/~naota/files/gyp-${GYP_DATE}.tar.bz2"
-SRC_URI="${MOZC_URL} ${PROTOBUF_URL} ${GYP_URL}
-	test? ( ${GMOCK_URL} ${GTEST_URL} ${JSONCPP_URL} )"
-
-LICENSE="BSD ipadic public-domain unicode"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs +ibus +qt4 renderer test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/openssl:0=
-	>=dev-libs/protobuf-2.5.0
-	x11-libs/libxcb
-	emacs? ( virtual/emacs )
-	ibus? ( >=app-i18n/ibus-1.4.1 )
-	renderer? ( x11-libs/gtk+:2 )
-	qt4? (
-		dev-qt/qtgui:4
-		app-i18n/zinnia
-	)
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-BUILDTYPE="${BUILDTYPE:-Release}"
-
-RESTRICT="test"
-
-SITEFILE=50${PN}-gentoo.el
-
-src_unpack() {
-	unpack $(basename ${MOZC_URL})
-
-	unpack $(basename ${GYP_URL})
-	mv gyp-${GYP_DATE}/* "${S}"/third_party/gyp || die
-
-	cd "${S}"/protobuf
-	unpack $(basename ${PROTOBUF_URL})
-	mv protobuf-${PROTOBUF_VER} files || die
-
-	if use test; then
-		cd "${S}"/third_party
-		unpack $(basename ${GMOCK_URL}) $(basename ${GTEST_URL}) \
-			$(basename ${JSONCPP_URL})
-		mv gmock-${GMOCK_VER} gmock || die
-		mv gtest-${GTEST_VER} gtest || die
-		mv jsoncpp-src-${JSONCPP_VER} jsoncpp || die
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gtk-renderer.patch
-	epatch_user
-}
-
-src_configure() {
-	local myconf="--server_dir=/usr/$(get_libdir)/mozc"
-
-	if ! use qt4 ; then
-		myconf+=" --noqt"
-		export GYP_DEFINES="use_libzinnia=0"
-	fi
-
-	if ! use renderer ; then
-		export GYP_DEFINES="${GYP_DEFINES} enable_gtk_renderer=0"
-	fi
-
-	export GYP_DEFINES="${GYP_DEFINES} use_libprotobuf=1"
-
-	"${PYTHON}" build_mozc.py gyp ${myconf} || die "gyp failed"
-}
-
-src_compile() {
-	tc-export CC CXX AR AS RANLIB LD
-
-	local my_makeopts=$(makeopts_jobs)
-	# This is for a safety. -j without a number, makeopts_jobs returns 999.
-	local myjobs=-j${my_makeopts/999/1}
-
-	local mytarget="server/server.gyp:mozc_server"
-	use emacs && mytarget="${mytarget} unix/emacs/emacs.gyp:mozc_emacs_helper"
-	use ibus && mytarget="${mytarget} unix/ibus/ibus.gyp:ibus_mozc"
-	use renderer && mytarget="${mytarget} renderer/renderer.gyp:mozc_renderer"
-	if use qt4 ; then
-		export QTDIR="${EPREFIX}/usr"
-		mytarget="${mytarget} gui/gui.gyp:mozc_tool"
-	fi
-
-	V=1 "${PYTHON}" build_mozc.py build_tools -c "${BUILDTYPE}" ${myjobs} || die
-	V=1 "${PYTHON}" build_mozc.py build -c "${BUILDTYPE}" ${mytarget} ${myjobs} || die
-
-	if use emacs ; then
-		elisp-compile unix/emacs/*.el || die
-	fi
-}
-
-src_test() {
-	tc-export CC CXX AR AS RANLIB LD
-	V=1 "${PYTHON}" build_mozc.py runtests -c "${BUILDTYPE}" || die
-}
-
-src_install() {
-	if use emacs ; then
-		dobin "out_linux/${BUILDTYPE}/mozc_emacs_helper" || die
-		elisp-install ${PN} unix/emacs/*.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN} || die
-	fi
-
-	if use ibus ; then
-		exeinto /usr/$(get_libdir)/ibus-mozc || die
-		newexe "out_linux/${BUILDTYPE}/ibus_mozc" ibus-engine-mozc || die
-		insinto /usr/share/ibus/component || die
-		doins "out_linux/${BUILDTYPE}/obj/gen/unix/ibus/mozc.xml" || die
-		insinto /usr/share/ibus-mozc || die
-		(
-			cd data/images/unix
-			newins ime_product_icon_opensource-32.png product_icon.png || die
-			for f in ui-*
-			do
-				newins ${f} ${f/ui-} || die
-			done
-		)
-
-	fi
-
-	exeinto "/usr/$(get_libdir)/mozc" || die
-	doexe "out_linux/${BUILDTYPE}/mozc_server" || die
-
-	if use qt4 ; then
-		exeinto "/usr/$(get_libdir)/mozc" || die
-		doexe "out_linux/${BUILDTYPE}/mozc_tool" || die
-	fi
-
-	if use renderer ; then
-		exeinto "/usr/$(get_libdir)/mozc" || die
-		doexe "out_linux/${BUILDTYPE}/mozc_renderer" || die
-	fi
-}
-
-pkg_postinst() {
-	if use emacs ; then
-		elisp-site-regen
-		elog "You can use mozc-mode via LEIM (Library of Emacs Input Method)."
-		elog "Write the following settings into your init file (~/.emacs.d/init.el"
-		elog "or ~/.emacs) in order to use mozc-mode by default, or you can call"
-		elog "\`set-input-method' and set \"japanese-mozc\" anytime you have loaded"
-		elog "mozc.el"
-		elog
-		elog "  (require 'mozc)"
-		elog "  (set-language-environment \"Japanese\")"
-		elog "  (setq default-input-method \"japanese-mozc\")"
-		elog
-		elog "Having the above settings, just type C-\\ which is bound to"
-		elog "\`toggle-input-method' by default."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/app-i18n/mozc/mozc-2.16.2037.102.ebuild b/app-i18n/mozc/mozc-2.16.2037.102.ebuild
deleted file mode 100644
index cb43400250d9..000000000000
--- a/app-i18n/mozc/mozc-2.16.2037.102.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PLOCALES="de ja zh_CN zh_TW"
-inherit elisp-common eutils l10n multilib multiprocessing python-single-r1 toolchain-funcs
-
-DESCRIPTION="The Mozc engine for IBus Framework"
-HOMEPAGE="https://github.com/google/mozc"
-
-PROTOBUF_VER="2.5.0"
-GMOCK_VER="1.6.0"
-GTEST_VER="1.6.0"
-JSONCPP_VER="0.6.0-rc2"
-GYP_DATE="20140602"
-JAPANESE_USAGE_DICT_VER="10"
-FCITX_PATCH_VER="2"
-FCITX_PATCH="fcitx-mozc-${PV}.${FCITX_PATCH_VER}.patch"
-MOZC_URL="https://dev.gentoo.org/~naota/files/${P}.tar.bz2"
-PROTOBUF_URL="https://protobuf.googlecode.com/files/protobuf-${PROTOBUF_VER}.tar.bz2"
-GMOCK_URL="https://googlemock.googlecode.com/files/gmock-${GMOCK_VER}.zip"
-GTEST_URL="https://googletest.googlecode.com/files/gtest-${GTEST_VER}.zip"
-JSONCPP_URL="mirror://sourceforge/jsoncpp/jsoncpp-src-${JSONCPP_VER}.tar.gz"
-GYP_URL="https://dev.gentoo.org/~naota/files/gyp-${GYP_DATE}.tar.bz2"
-JAPANESE_USAGE_DICT_URL="https://dev.gentoo.org/~naota/files/japanese-usage-dictionary-${JAPANESE_USAGE_DICT_VER}.tar.bz2"
-FCITX_PATCH_URL="http://download.fcitx-im.org/fcitx-mozc/${FCITX_PATCH}"
-SRC_URI="${MOZC_URL} ${PROTOBUF_URL} ${GYP_URL} ${JAPANESE_USAGE_DICT_URL}
-	fcitx? ( ${FCITX_PATCH_URL} )
-	test? ( ${GMOCK_URL} ${GTEST_URL} ${JSONCPP_URL} )"
-
-LICENSE="BSD ipadic public-domain unicode"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs fcitx +ibus +qt4 renderer test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="app-i18n/tegaki-zinnia-japanese
-	dev-libs/glib:2
-	>=dev-libs/protobuf-2.5.0
-	x11-libs/libxcb
-	emacs? ( virtual/emacs )
-	fcitx? ( app-i18n/fcitx )
-	ibus? (
-		>=app-i18n/ibus-1.4.1
-		qt4? ( app-i18n/ibus-qt )
-	)
-	renderer? ( x11-libs/gtk+:2 )
-	qt4? (
-		dev-qt/qtgui:4
-		app-i18n/zinnia
-	)
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-util/ninja
-	virtual/pkgconfig"
-
-BUILDTYPE="${BUILDTYPE:-Release}"
-
-RESTRICT="test"
-
-SITEFILE=50${PN}-gentoo.el
-
-src_unpack() {
-	unpack $(basename ${MOZC_URL})
-
-	unpack $(basename ${GYP_URL})
-	unpack $(basename ${JAPANESE_USAGE_DICT_URL})
-	mv gyp-${GYP_DATE} "${S}"/third_party/gyp || die
-	mv japanese-usage-dictionary-${JAPANESE_USAGE_DICT_VER} "${S}"/third_party/japanese_usage_dictionary || die
-
-	cd "${S}"/protobuf
-	unpack $(basename ${PROTOBUF_URL})
-	mv protobuf-${PROTOBUF_VER} files || die
-
-	if use test; then
-		cd "${S}"/third_party
-		unpack $(basename ${GMOCK_URL}) $(basename ${GTEST_URL}) \
-			$(basename ${JSONCPP_URL})
-		mv gmock-${GMOCK_VER} gmock || die
-		mv gtest-${GTEST_VER} gtest || die
-		mv jsoncpp-src-${JSONCPP_VER} jsoncpp || die
-	fi
-}
-
-src_prepare() {
-	# verbose build
-	sed -i -e "/RunOrDie(\[make_command\]/s/build_args/build_args + [\"-v\"]/" \
-		build_mozc.py || die
-	sed -i -e "s/<!(which clang)/$(tc-getCC)/" \
-		-e "s/<!(which clang++)/$(tc-getCXX)/" \
-		gyp/common.gypi || die
-	if use fcitx; then
-		EPATCH_OPTS="-p2" epatch "${DISTDIR}/${FCITX_PATCH}"
-	fi
-	epatch_user
-}
-
-src_configure() {
-	local myconf="--server_dir=/usr/$(get_libdir)/mozc"
-
-	if ! use qt4 ; then
-		myconf+=" --noqt"
-		export GYP_DEFINES="use_libzinnia=0"
-	fi
-
-	if ! use renderer ; then
-		export GYP_DEFINES="${GYP_DEFINES} enable_gtk_renderer=0"
-	fi
-
-	export GYP_DEFINES="${GYP_DEFINES} use_libprotobuf=1 compiler_target=gcc compiler_host=gcc"
-
-	tc-export CC CXX AR AS RANLIB LD NM
-
-	"${PYTHON}" build_mozc.py gyp -v ${myconf} || die "gyp failed"
-}
-
-src_compile() {
-	tc-export CC CXX AR AS RANLIB LD
-
-	local my_makeopts=$(makeopts_jobs)
-	# This is for a safety. -j without a number, makeopts_jobs returns 999.
-	local myjobs=-j${my_makeopts/999/1}
-
-	local mytarget="server/server.gyp:mozc_server"
-	use emacs && mytarget="${mytarget} unix/emacs/emacs.gyp:mozc_emacs_helper"
-	use fcitx && mytarget="${mytarget} unix/fcitx/fcitx.gyp:fcitx-mozc"
-	use ibus && mytarget="${mytarget} unix/ibus/ibus.gyp:ibus_mozc"
-	use renderer && mytarget="${mytarget} renderer/renderer.gyp:mozc_renderer"
-	if use qt4 ; then
-		export QTDIR="${EPREFIX}/usr"
-		mytarget="${mytarget} gui/gui.gyp:mozc_tool"
-	fi
-
-	# V=1 "${PYTHON}" build_mozc.py build_tools -c "${BUILDTYPE}" ${myjobs} || die
-	"${PYTHON}" build_mozc.py build -v -c "${BUILDTYPE}" ${mytarget} ${myjobs} || die
-
-	if use emacs ; then
-		elisp-compile unix/emacs/*.el || die
-	fi
-}
-
-src_test() {
-	tc-export CC CXX AR AS RANLIB LD
-	V=1 "${PYTHON}" build_mozc.py runtests -c "${BUILDTYPE}" || die
-}
-src_install() {
-	install_fcitx_locale() {
-		lang=$1
-		insinto "/usr/share/locale/${lang}/LC_MESSAGES/"
-		newins out_linux/${BUILDTYPE}/gen/unix/fcitx/po/${lang}.mo fcitx-mozc.mo
-	}
-
-	if use emacs ; then
-		dobin "out_linux/${BUILDTYPE}/mozc_emacs_helper" || die
-		elisp-install ${PN} unix/emacs/*.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN} || die
-	fi
-
-	if use fcitx; then
-		exeinto /usr/$(get_libdir)/fcitx
-		doexe "out_linux/${BUILDTYPE}/fcitx-mozc.so"
-		insinto /usr/share/fcitx/addon
-		doins "unix/fcitx/fcitx-mozc.conf"
-		insinto /usr/share/fcitx/inputmethod
-		doins "unix/fcitx/mozc.conf"
-		insinto /usr/share/fcitx/mozc/icon
-		(
-			cd data/images
-			newins product_icon_32bpp-128.png mozc.png
-			cd unix
-			for f in ui-* ; do
-				newins ${f} mozc-${f/ui-}
-			done
-		)
-		l10n_for_each_locale_do install_fcitx_locale
-	fi
-
-	if use ibus ; then
-		exeinto /usr/$(get_libdir)/ibus-mozc || die
-		newexe "out_linux/${BUILDTYPE}/ibus_mozc" ibus-engine-mozc || die
-		insinto /usr/share/ibus/component || die
-		doins "out_linux/${BUILDTYPE}/gen/unix/ibus/mozc.xml" || die
-		insinto /usr/share/ibus-mozc || die
-		(
-			cd data/images/unix
-			newins ime_product_icon_opensource-32.png product_icon.png || die
-			for f in ui-*
-			do
-				newins ${f} ${f/ui-} || die
-			done
-		)
-
-	fi
-
-	exeinto "/usr/$(get_libdir)/mozc" || die
-	doexe "out_linux/${BUILDTYPE}/mozc_server" || die
-
-	if use qt4 ; then
-		exeinto "/usr/$(get_libdir)/mozc" || die
-		doexe "out_linux/${BUILDTYPE}/mozc_tool" || die
-	fi
-
-	if use renderer ; then
-		exeinto "/usr/$(get_libdir)/mozc" || die
-		doexe "out_linux/${BUILDTYPE}/mozc_renderer" || die
-	fi
-}
-
-pkg_postinst() {
-	if use emacs ; then
-		elisp-site-regen
-		elog "You can use mozc-mode via LEIM (Library of Emacs Input Method)."
-		elog "Write the following settings into your init file (~/.emacs.d/init.el"
-		elog "or ~/.emacs) in order to use mozc-mode by default, or you can call"
-		elog "\`set-input-method' and set \"japanese-mozc\" anytime you have loaded"
-		elog "mozc.el"
-		elog
-		elog "  (require 'mozc)"
-		elog "  (set-language-environment \"Japanese\")"
-		elog "  (setq default-input-method \"japanese-mozc\")"
-		elog
-		elog "Having the above settings, just type C-\\ which is bound to"
-		elog "\`toggle-input-method' by default."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest
index 2f4fc446ba11..8b0d94b1e876 100644
--- a/app-i18n/opencc/Manifest
+++ b/app-i18n/opencc/Manifest
@@ -1,8 +1,5 @@
-AUX opencc-1.0.4-cmake-libdir.patch 350 SHA256 c799f0a96dd4e4dc72454f96e6ccabe79716b425448af34d17c9e214b3f8182a SHA512 03b73b009fe8d19cf202fbe7d635a8f8e68df842ae40c5dfca32f4d8c74691e489be856e7e44ee4ead2a364fb189a321b79bf7582905b5c1c0a99f54bc548bef WHIRLPOOL 5a6cae2a06a0a205253c5468a3e39a914fa3b0aaba8c75cefd1da86b973fc1e501a573ecfd21b1ed4cced0e8a09157e76f85304c61f003f4a2c12234ac7508a1
 AUX opencc-test.patch 202 SHA256 d234eaf721c0d72fb11813f012783baa8428cf82dfd893fd0807c0e4e259fcb6 SHA512 5318058587b41fb7021ffce64d4b999b1beed294ce4c00137fb4b0396dd2cb471af789bceb8a8076b1d4ec2226d3c3fdf8b3d3d6a1f5d80936cf2407b8bdd3ec WHIRLPOOL cba0d87dc9f20f33987771e3c17dec25bffe58c318eda6094edaa73a44e19cafee9d8fb6aea17ea4868485326f85a7ed90fa0d37f80359af64b0052f0e6caf72
-DIST opencc-1.0.4.tar.gz 1597309 SHA256 0553b7461ebd379d118d45d7f40f8a6e272750115bdbc49267595a05ee3481ac SHA512 682cc621fddb6495f26675863faefe7c9f584d2c60676cee0a3ff2120828a09a5e71671f5537030c2cc874f55b7f22af70d9d376f17b83e30cb04dcd5f6bba8a WHIRLPOOL 964180d27db85df6ffb4310ea6cae7b6c294c163bce68d05a5a21e8e736be6c11b44f8a2a856481b47e14c8c1104d244fc294259cbfa2f3160912743ac933cd6
 DIST opencc-1.0.5.tar.gz 1598354 SHA256 1ce1649ba280cfc88bb76e740be5f54b29a9c034400c97a3ae211c37d7030705 SHA512 3fbefbafe5c3c2491032158577ab97b5a3edf6ea98a03a7250deba082b72c3112ad4a3396d1a469936ec32e1d141f0a2236001c2891ac9c793add2b082596cc1 WHIRLPOOL eea817748d94c973f39c527d86359dd6710157b340ad906c85123129dee34f300d17dd9cc3d851d749c6651e9743ae0ff612009130de06c0ac97fd3fca409b9e
-EBUILD opencc-1.0.4.ebuild 753 SHA256 fe48e191df04a7ee07dc318e10e24906f6b99993fe3eed0238f42677fd9d8df3 SHA512 01a3585d1b3fdb13f3b6b52639c8349a3fb29842026fc5b8a96d88380efb830bc16aa47bf9f396584ea1367f6fed2ae54fcfaebd6b0b358bb18426afce0d54f9 WHIRLPOOL 25cfd24e3319e8376de03fab581c1d071576150f990dcf98fe5147a2071d4e05bda4aa5b4d0bbc10f63f4e85ad30827b17ceeb5a000c280933dfd93947cea5c0
 EBUILD opencc-1.0.5.ebuild 951 SHA256 d7a49df2d39c87a0c5c72c64d8c499c950d097ffe6003f0586241409b1b1d7ed SHA512 065cf96608de11939d91a30c5d1c6358c64066cd3a3c858d2c4ecc4aef2a4b77a83554e072e0f05234331818b7a4662dd32dfe114735023dd6ff0f44686aba8c WHIRLPOOL 0847307d7d432565a66ca83e52bee69340b1e392ce2cba63d8edd02eaf4ac2f1e26aa1628c69062aab0e6832e4ed5fe6aab678597d3a70d23ec3c61a92ce4425
 EBUILD opencc-9999.ebuild 927 SHA256 bedc796d21894d85230088a80662493756831ffff4ec919e6b35be53939ed65e SHA512 868b831de1cc47afe1b471848df50eb036c8f29701839a3ca3767aba8e42b10a227dd9dc33ee726331a890ef3938ef71af444582f1f2d16c785158f7b36e5eb6 WHIRLPOOL 48d0050edecabc0f7add00cf9bcc1a9f9c50a976ac2095d9b33655ce7d12f084a7840382c72dd6e131d8a2dc3a1baa735b232836cfbbf1a85d2ec92c8cb00572
 MISC ChangeLog 3872 SHA256 77eea797e59444961c119965d7f4089772140312d07b9a711c18ddd67b6b5dfd SHA512 570413355a497655be18f827fe2e0a7dc30bb6800975999197eb14f95180e991a40b361d83dbc4503d3800098f2cd95c8da3296642cdd71f1ce929f224542cd7 WHIRLPOOL c3a5b6bb034235acb136ff575a368cafe6990031ce475b15811c9a7714a108cc2d2c3dccb483c22de739480964a2a5918f912136c8b6319c252a53046458debc
diff --git a/app-i18n/opencc/files/opencc-1.0.4-cmake-libdir.patch b/app-i18n/opencc/files/opencc-1.0.4-cmake-libdir.patch
deleted file mode 100644
index dc8859d8e28e..000000000000
--- a/app-i18n/opencc/files/opencc-1.0.4-cmake-libdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -83,6 +83,10 @@
-   set (DIR_ETC ${SYSCONF_INSTALL_DIR})
- endif (DEFINED SYSCONF_INSTALL_DIR)
- 
-+if (DEFINED CMAKE_INSTALL_LIBDIR)
-+  set (DIR_LIBRARY ${CMAKE_INSTALL_LIBDIR})
-+endif (DEFINED CMAKE_INSTALL_LIBDIR)
-+
- set (DIR_SHARE_OPENCC ${DIR_SHARE}opencc/)
- set (DIR_SHARE_LOCALE ${DIR_SHARE}locale/)
- 
diff --git a/app-i18n/opencc/opencc-1.0.4.ebuild b/app-i18n/opencc/opencc-1.0.4.ebuild
deleted file mode 100644
index 139e1b4bf186..000000000000
--- a/app-i18n/opencc/opencc-1.0.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils vcs-snapshot
-
-DESCRIPTION="Libraries for conversion between Traditional and Simplified Chinese"
-HOMEPAGE="https://github.com/BYVoid/OpenCC"
-SRC_URI="https://github.com/BYVoid/${PN^^[oc]}/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/2"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
-IUSE="doc test"
-
-DEPEND="doc? ( app-doc/doxygen )"
-
-DOCS="AUTHORS *.md"
-PATCHES=(
-	"${FILESDIR}"/${P}-cmake-libdir.patch
-	"${FILESDIR}"/${PN}-test.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DBUILD_SHARED_LIBS=ON
-		-DENABLE_GTEST=$(usex test)
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-i18n/rime-data/Manifest b/app-i18n/rime-data/Manifest
index f72d6f4233d2..8fb80ec6b8ed 100644
--- a/app-i18n/rime-data/Manifest
+++ b/app-i18n/rime-data/Manifest
@@ -1,8 +1,4 @@
-DIST brise-0.22.tar.gz 6061141 SHA256 a048b741a7651dbb47d1b6e6e25d266d670680112b70ca3c27f2bc17dcafde59 SHA512 8bf0585ba6e01a1bc1c708d7017987041dc5a9ce74ba5022514b0f6bf2016c2b23212d7396126f30748387ced7d83aa73001164793881ea18553b5e923eab1b9 WHIRLPOOL b2a2ea6a24130e595bb5e0039106f28f293785fe8f1016e13edc4f83655abbc94f60522c4df864da5a136f037588a7613b588f68858baee6874000b552cccded
-DIST brise-0.32.tar.gz 6697747 SHA256 4462d1f1e8f9cf62bfabc490d2ed1ead4747a92d05018fa78ff6db6c69932f62 SHA512 c41d4a7399a963b9e023015e1268f0f63693091d0ae2edff9db68397d223bb25ea6c392d2649f7817edd40998b1ed144d63478a01241cdaa5f2e84fd846e24d7 WHIRLPOOL 518442446506bc9e3743069667e596764e2561c5093f1e3d1b8f50518af98e4506cf7205f867ad0ff9614043c3d45008b00501840439730d39baf18d752667fa
 DIST brise-0.35.tar.gz 6707277 SHA256 89670753ffdd321053a5b8f0b82c68e29129b330a411b841b5b9e900b9a3da4f SHA512 1a2a3ddba9be7089a1b82ce446a3e5dc93a13fff121f861aa1acbdea950f490c9367866902a056296e17de5076a59a54741ceb3a59a9c0ec58b6b7c54f519f3d WHIRLPOOL e00ac2e3f7f50737491b5213b75ed2ee3fa3c08c4073584b6a31315982edcf8090ff3a39fe1fd602f82513dbcf0dab57107d09bc582babc8a966de2b8dccff66
-EBUILD rime-data-0.22.ebuild 438 SHA256 d699d79348590f44bccf29f384530f0121f5af815ff3bb7d1b247ce296f4babc SHA512 0f57059ad5cac0972a48f444a1539f69eeabe98d921c161cad26d4ccecb5712838b5856d5bf9eff0ddfea73515f33d7b822693f3b729f8fbe9523234b29b0d89 WHIRLPOOL f68bb2ce45c97ced2d1d8d1fff3a03d98b9ae8d7d42ad71a6b9358ae912d532cc8997e7446f213692d37e805c4de203b14f7a427e580a51ee648326825ca6383
-EBUILD rime-data-0.32.ebuild 440 SHA256 0a5239caa7c6a00842af6bc9ff6c2c4ef733f2869091a122a396acea57ec098a SHA512 09ae2407d77e5299a3e2ba961f6c320533610515d97f666f447f016b6fcd2e6e3c6b360ffa99dadb37c8d2962f9fcfdd90a771716bac5b83498c612db027fe0a WHIRLPOOL 1e9ab2f70645a9bd4069e9fd7c4515a84f585efe6ab0d44b6c3a9ea6075f9420fdef5bad2e3d27f0fa55d95d23ce3b4dfa6e4ddcbe3c2de919870cbb2c555ba7
 EBUILD rime-data-0.35.ebuild 467 SHA256 bf96b18ad5bc90dc7505bc3ae53863c87e0f128db15817972d278dc9b5134792 SHA512 88835bae1dc94bec5796d015c177bb7107b10d6c414c403cc3a267791bb4f2460e70e17f2a6aa4723cc1b0226a179d8bec3db337caea56a18c6102d596abd814 WHIRLPOOL 545e4cc8be31954c2d56b764f1b7acc27e31022705202440635244a2a4f107a8ebf54cfb00b8abd016ad27d5710e8692adfdc66d7066cfa1ae91240b0e845c98
 MISC ChangeLog 3164 SHA256 41942dad869d9e7ed28ab8499de593f7fb4c1b690ba268ea5e7adce4011b0ff8 SHA512 77911bb2dc5d66a2a5d10bfa8b6c9f6b7dc600019a7b7d8c4fd788b7dce5eda2a424cfbf6279a6701de4af32327e1683147ab3beaa3aaa11a21b5594c0d29223 WHIRLPOOL d0e9a91e86b231b0b1a77d2c2d7b5e4e0d866f45bf7564853c2a3fbcebb61a6592850d4467bf1e16812a2aa2283c3f3ffce57dc7fca0871bd89461a095721f6d
 MISC ChangeLog-2015 2386 SHA256 62ecb6da650ba9879b08e5e9b66a21386646ccf15d7c2a680e90ed75ab7f748a SHA512 c077ae09d9daf036125b8922a966ba808ebebee002400e7b94d9cb936d31af8cf89610bf6360de5db81c87947f02bb60c1e3c812c11cf492dda0bb6299e4eab3 WHIRLPOOL 17fd6554d1471327c03b7dda7a73f6a6ec69c2ac01bedfbe3544d4c174e96868648286d3948f9ba5dc33e622943b3fd727cea68d94464af4d7fcba223cf1750e
diff --git a/app-i18n/rime-data/rime-data-0.22.ebuild b/app-i18n/rime-data/rime-data-0.22.ebuild
deleted file mode 100644
index 7cc85e79be4d..000000000000
--- a/app-i18n/rime-data/rime-data-0.22.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit vcs-snapshot
-MY_P=brise-${PV}
-DESCRIPTION="Data resources for Rime Input Method Engine"
-HOMEPAGE="http://rime.im/"
-SRC_URI="https://rimeime.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="app-i18n/librime"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}"/${MY_P}
diff --git a/app-i18n/rime-data/rime-data-0.32.ebuild b/app-i18n/rime-data/rime-data-0.32.ebuild
deleted file mode 100644
index df6a4ffb1bf3..000000000000
--- a/app-i18n/rime-data/rime-data-0.32.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vcs-snapshot
-MY_P=brise-${PV}
-DESCRIPTION="Data resources for Rime Input Method Engine"
-HOMEPAGE="http://rime.im/"
-SRC_URI="https://rimeime.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="app-i18n/librime"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}"/${MY_P}
diff --git a/app-i18n/sunpinyin-data/Manifest b/app-i18n/sunpinyin-data/Manifest
index 9d099ab4f007..71d8cf625e30 100644
--- a/app-i18n/sunpinyin-data/Manifest
+++ b/app-i18n/sunpinyin-data/Manifest
@@ -3,7 +3,7 @@ DIST dict.utf8-20120830.tar.bz2 652472 SHA256 f39bedd2fba009445a947ee522e5db0b25
 DIST dict.utf8-20130220.tar.bz2 652859 SHA256 fc93d3934628f557ed41cd28e04d86c98ff2ce93ccd2d8b63d72939e8a2194ed SHA512 d58ec106959a7713e452df2fe2fa5a5f66e82bd67eeeee8740cd3eeedf30af8d14a90dae224ed2931dffd85b0327c704927409bde0247452d79cf40c5bc7cff8 WHIRLPOOL e72fea8256f2970f7e8c42876fba77bc901dd72d33a27c6fa47a709bee52b394982aa23823ab58664ecd28a3e412e12326ad22a4052374e7946539066a6751f9
 DIST lm_sc.t3g.arpa-20121025.tar.bz2 36262281 SHA256 3d5b0a841a53af404ca4e88b76957e4486c90e3943bb7a774a1719337163593d SHA512 3159dd3700382cfa617ba025ce542660580f3057e0dd6bbb92947902495db08e4454c1d09d01a55c90653444513d125dd034e944b060a9d8e009c3633b106d97 WHIRLPOOL 0e6a2e80f83753397fe5401421d163c8ece92a9f1343d1d398d809dec09c6f641b1e1d66705d729f2a163c8496c892a44dcc7d3f545bcf3d91921621a1a7d15a
 EBUILD sunpinyin-data-20121025.ebuild 910 SHA256 32368ace589b0328e370f80b088784c8d812d4f5654aef372977042749e6e39b SHA512 6fcf7bc0d142f966c42c0ea54627d677649db74b1c93e6630ab708438cf22a29f33cd8d4f88fe154c6712d647880deaf5a5cac197ebea2376b810b36a9df8d7c WHIRLPOOL 0e62f1f88290b36f34b2fd4b00c0232a3fb2c1767f48a66a0ac6b274ca34f43d4572994906d52ce7ff30f48d004e4b0521b078facfda9608aa681381e1e02a11
-EBUILD sunpinyin-data-20130220.ebuild 908 SHA256 5ad1e9b428c94b19b83571738d3f29676745523d994bd4ddb9aceb3876d5ef47 SHA512 b5bfe358475ea6817fe954591eaa40653350085fdaa01cd41eccf77543aa73d25d7b93b877b43bfc4dd0fc84fa9edcab69fd8a816273072ab2d49bf1f32a0053 WHIRLPOOL c584f1428869dc20b1c085bbd1b2233e8c52446747464d696b517d02510050f952e83f2e443de79c729fda21452500f17e2053cc4d0755be09eecaaf6d797dcb
+EBUILD sunpinyin-data-20130220.ebuild 907 SHA256 88ae911bc0be351ec76bbb37a2cb401b31b4163ffab0ff908a1451b9fc1e94ed SHA512 3f62695db950943d4d73afb33dae99c78d70b4714f28354b84d628d6b73ae9f25d657ad2803023ee08c2d8a486d01fefae1292a1fb29c7737670efb979b130ec WHIRLPOOL 8bdd708f31d5f687e0e2737ef86243092223bbdf30640c174336718d7ec333c52814a47def4a3ecad05cb0f3ae5a6d4e258aface869aa7e1855d0e5269ad8b83
 MISC ChangeLog 2755 SHA256 3014d2df79d60deac07972ceef73a63e042694e9dca0d6d6540434ee9c3469bb SHA512 94655a7c8ae3723b4d71296cdf9eb5f061dbf313df414034117d77ed6c454ec3f8cee2f11c91499d67d886ee5acc4d004eef743ad7094c522565b0b9121786f3 WHIRLPOOL 8b6c15926fa3f42b6d12647940a7bf3abb7a82103e2365e216f1bd967b77105065bd19482dd6f9f4cdb4ef5d204b200baadfe02ffaffae9b054821a6f47a4121
 MISC ChangeLog-2015 1012 SHA256 69fcbb87a2cdc23d720e22301516d41891e39e43d8e12a03970b77d5bc4fcab3 SHA512 488c94b6969c8b004b1c125424b0680f823406897f172604ac106563b08aa34bfaf660d6df0d83904c49e046816dc3e6aea7e011d35ba962af37f166e8f88e24 WHIRLPOOL 5843f44c2ba3481f1813f0d2993157d009d05bee2165189550cc3be03eb1ef55ca197c58a1368ad6a8c35885694e6dfbdc3b08c43519cdaa9e8e2033d17c43e7
 MISC metadata.xml 323 SHA256 e567379129e686d818c3a2937d0a84d383843f8ef5e9c711a69a2a18c2935d5c SHA512 b91630bdda4510f930c9b114a77859e6350c16cfd41c8b585895d4f40a9d8d7ce4a02dd6f46be41ecc7ba6ad2ce6846b143d1745ac9e1385821e403419df9a39 WHIRLPOOL 3aeadf7473707ef5136e146c50a0b0777d80adc0a52746cfdff1e9e274a5748aab5bbefed834d8cca242f80ae856f89db29632b80bfa310787fbdaf91a8d8a66
diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild
index 0a56a826c8cb..4d7db19d3e3d 100644
--- a/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild
+++ b/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://open-gram.googlecode.com/files/dict.utf8-${DICT_VERSION}.tar.bz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
 IUSE=""
 
 DEPEND=">=app-i18n/sunpinyin-2.0.4_pre20130108"
diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest
index 490f23638f6d..bf1031813f75 100644
--- a/app-i18n/sunpinyin/Manifest
+++ b/app-i18n/sunpinyin/Manifest
@@ -7,7 +7,7 @@ DIST lm_sc.t3g.arpa.tar.bz2 25098718 SHA256 c80093a8b43561e64158de4139967eef39b8
 DIST sunpinyin-2.0.3.tar.gz 169394 SHA256 4ab776e7563f69f8dbda8fac7cfaa42bd0db1ea68bab15f756094ce5398d83d1 SHA512 25f1fc4b8f550663861f2c7426832924676f83e1f201689fde51b04ca78704b46dbbf2b92736234d5e1a729ba1bb23bd1f3a0394f6b8b54cb0df57b9bb7ece1d WHIRLPOOL 71a4efedcbe4ec1dda9ecb1b94256a0e5e8ca570a234a8b378f85af68bf3da9f3b9220aee98c2f3ce509daa33996fea8b554e81594c299281ede58167cf633e8
 DIST sunpinyin-2.0.4_pre20130108.tar.xz 964764 SHA256 e650957aced55075448b7f02298d0c5cf59a8b8e041e9c7d92d24cb5170de93f SHA512 7c1dd7db8b800e9d436746a560a16de2c6777576868f2e7e28f6dcb767b91ccd62b974f9d4ce6bd6ce80d30e1ee83887c3ee03c227e7e9fa59c01db4867465b2 WHIRLPOOL 82535dcde38c2fce17877e465db7ebeaed14a7f305ad96ca451c5b35ae04244a94e9bde9ce51092a390964c557e39ab43742d2370342f9b72722b24f916c55d6
 EBUILD sunpinyin-2.0.3-r1.ebuild 1617 SHA256 c5eddf6b1868e5e05e46c88a145551111fe9633cf97ed0fa71843bc1ceba2f7c SHA512 285f5aed247330d819dea7299230def6cabe23d12b1658bfc5c24004e78f95a38bb9862463ee533a540a32e8780ac78a01966d2f70dd71563a58b7bc22325bae WHIRLPOOL cb2da32c6c9302ec58ba258b52921f8a5d3367d3b7a37e40d8d32e519102e1882fee40f0f2eda09d25218ef881e3c2bf3085fd829af1ea02d20c2eb24a5889e0
-EBUILD sunpinyin-2.0.4_pre20130108-r1.ebuild 1059 SHA256 55eca806a5b8c6cc35ceda5d22eee512d6a371c5dc2fe488bef9cd55503dcc97 SHA512 9581f70e323fa36ad580ad4db354d129da3d3f3eeccedf4dbd277c78543bddedc827750588db9fe1a14f2b8218b9ee506f98020d7e49feec68974df1cccaa488 WHIRLPOOL ccf1bc95d979a1b79c9cb5b1294e52b84845935e4d5e5b35c8a052f06267a66e2a6e0a469a2c5fea33ece85d3aeabbc984467f0a65da34550a8ab616e993b895
+EBUILD sunpinyin-2.0.4_pre20130108-r1.ebuild 1058 SHA256 42e15dc68223c9b7c960300dd8c36919cba68ba5af7a9b23dbea040c6ed433a7 SHA512 fcd9fabb3ef3a865da683442080475749f7b4560d54914da3b06f3e2b25796d23797f5671a13a7c4fcc4db1f142ff9d59dc6674662b85fdf7e5d071ba7788493 WHIRLPOOL 2b3d384a63d5c71565ac50be561e0c9c0ff74797f63411cd18a9d28a12cdc4f3a31a56560631ef079dd46fe4031c3b91ced27de3648f0e6c1edab3f1404aa479
 MISC ChangeLog 3463 SHA256 bcd93ab07bf8a5a245eda401780d01978eddd06d511689424911fa65980bd196 SHA512 9fa7ebe4e935e33fc4b7dd932877287223f93993df5451220229e3f65175472ef5c6d5fa3c14d199f99afb515962147bb4ee3ae3abc675d64a6d2641fc52fe4a WHIRLPOOL 759ad97189825adb8de6d21a025d3d90031442d0cc73cce51590cf6199c6a7933ec51a18919618fee0b79f3e88ad7df882af664fd59d4f95acd8087c92e69117
 MISC ChangeLog-2015 3001 SHA256 e31d7745175660fb756dd46882d0942c329b96db2be582126144ab44dafd6274 SHA512 c455286568062737730ede3b5dc55f7c7330aa08ea8f3e897063f6514d8904c870c8be765699f2d7a8dfa0b641a499c01478b3ed4201ed74d264ade3b1e82c60 WHIRLPOOL 4883106b612c18a9723c026090e7bd269521b9adc2103340cdd13c6b2533bda4fa895e6dca0e46be47e2e96e552e19eb0633ad77c028ce2c69f090ca6699efc5
 MISC metadata.xml 328 SHA256 28e1068608e622ed813bc6cd681a3f6d035b2550a6f884ab0b8b8250a33dae17 SHA512 c67333df77b03f92845334d6b738c172cc2e1935b5df4cad2d7bc983c08cda59f1427588ab8d054cd40b7fdc52c0adcb516d74c7de4bb320f85979a6a3297628 WHIRLPOOL 1293bb8bd16e7a829cb0099f40b9c6c45f8d4d17d9cd608ea5adddb61dd8d5888cb50802e7c110e03f84597a94bb8f0917908a8b8576de0e031ad3305703c72b
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild
index 6f6822d8fdb3..5f0df26b8fd3 100644
--- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
 
 LICENSE="LGPL-2.1 CDDL"
 SLOT="0/3"
-KEYWORDS="amd64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-db/sqlite:3"
author	V3n3RiX <venerix@redcorelinux.org>	2017-11-02 21:07:25 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-11-02 21:07:25 +0000
commit	27dfd272ae3be15b1017f733682211afa1c7c0f0 (patch)
tree	1fe1c9ed5c5d79c63069bb8d541be075ccc3aac2 /app-i18n
parent	d950fa39dbe16d164ed0cb8e3036fd5d0d896a4c (diff)