gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-14 23:22:23 +0100
commit: 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree: 76e74807bc479502e13866b581b6bf86734ec634 /app-i18n
parent: 30d6f67c98d149508509d5e86f176d558793acc0 (diff)
80 files changed, 712 insertions, 378 deletions
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 350b160d7509..c98c9b0041c3 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/anthy/Manifest b/app-i18n/anthy/Manifest
index a49c0eade00d..7cf8f5c90886 100644
--- a/app-i18n/anthy/Manifest
+++ b/app-i18n/anthy/Manifest
@@ -1,5 +1,5 @@
 AUX 50anthy-gentoo.el 63 BLAKE2B 8680f0a54f0c16a4d869f52d1589c6af39d29c151a5f7e7182f7afb2417aa5ba2fea002d7638271f486f95931036a1e4e4a83af8d796c3b751760d5750adf1d6 SHA512 ca11bd44d092da07278905555513e8b5215413af64c46cfb9213cbd27948727133c06fb1fcfc1a48d67d196c693ed2835e8dbae142a52ff4dbd5ea8d49e6e65a
 AUX anthy-anthy_context_t.patch 174 BLAKE2B 0a38c7a467b5a0331762fa1083c2dffef8f4c39c8bfbf7ce0ec431f6f865dc8727fac391ff77a6a1cf5e455ca274c78b7a6ebf7a2326ba90c6cd979f8e3c7a3f SHA512 3f252628f77f53dd96eac50f08a36bb782f0ddc37446c1bdd5bd94fffa3454b9adcaff7118d76fdc7e8bc3f86b1a84e9830da5b67b2b0d281847b26ff62cdee3
 DIST anthy-9100h.tar.gz 4446148 BLAKE2B b07da205694db9223c22ebcf6158158247611be41448457ee112766d1ea5fe72eee3f2292276363245d751eb49bd582c39330cc6df5e52547b6188386439d29a SHA512 315ebd9e1af208f3ecaeaa13620213b35f004e47edb54e60c3e02c2997444cd2326cc58b725dd2d0bd6a723130884d946ea193ea3d92418082256b59ecc8d88b
-EBUILD anthy-9100h-r2.ebuild 1265 BLAKE2B ea58ec088edbc1b562e5db32dfe8422279bc17e1e754c690175d558a8cc5ab12fcab521f41de8da055b89bee7a147e1437ea525a226a481c71a58001eb155bb0 SHA512 1a763145c8d998582583e3c64c2025890e002dc65889d031bdc4c474ef2d11e6cd2f1d76b946ef1061f6d984158e1e9ed98520595fe705f91fe5c8af027d9b1c
+EBUILD anthy-9100h-r2.ebuild 1308 BLAKE2B 65a5aaee9b07d75cd7a047ed5492cb6b3b59c2881e4ca98fd713c325f329f1230cc2431821d615ea1abf9b3426c7e69aeb41e87f9ea6a39faa93cfaf402c5b8c SHA512 9824f69db445997eb75d6fc7b7fbae3779439c8616858e78bd0895b17d14d65663545fa3c98a1bc05e2a92b294fb01fee66907a88b5ae71ad1d5a9db7fa2d409
 MISC metadata.xml 903 BLAKE2B 29e0a9ae0eb05a56ce23659a1693e7d118bb5f7803170e4df02a0515adb841a26c66bf652baea4d921f613424863168500ce69b7282f027fd6a9d6cc7a66f9fa SHA512 6fed9f2dd2b723292db8348fa4977659600b2d755f74bdfd7d9007b60d2c505473af01f5277d41155e9cdee6243d6e8faf9254c9e6963787509ea4a3f37117c9
diff --git a/app-i18n/anthy/anthy-9100h-r2.ebuild b/app-i18n/anthy/anthy-9100h-r2.ebuild
index 45d7ba0deb52..2ae79f831a70 100644
--- a/app-i18n/anthy/anthy-9100h-r2.ebuild
+++ b/app-i18n/anthy/anthy-9100h-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 2003-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit elisp-common ltprune
+inherit elisp-common
 
 DESCRIPTION="Anthy -- free and secure Japanese input system"
 HOMEPAGE="http://anthy.osdn.jp/"
@@ -14,12 +14,16 @@ SLOT="0"
 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 )
+BDEPEND="canna-2ch? ( app-dicts/canna-2ch )
 	emacs? ( virtual/emacs )"
-DEPEND="${RDEPEND}"
+DEPEND=""
+RDEPEND="${BDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-anthy_context_t.patch )
-DOCS=( AUTHORS ChangeLog DIARY NEWS README )
+PATCHES=(
+	"${FILESDIR}/${PN}-anthy_context_t.patch"
+)
+
+DOCS=(AUTHORS ChangeLog DIARY NEWS README)
 
 SITEFILE="50${PN}-gentoo.el"
 
@@ -27,27 +31,27 @@ src_prepare() {
 	default
 
 	if use canna-2ch; then
-		einfo "Adding nichan.ctd to anthy.dic."
-		sed -i "/set_input_encoding eucjp/aread ${EPREFIX}/var/lib/canna/dic/canna/nichan.ctd" mkworddic/dict.args.in
+		einfo "Adding nichan.ctd to anthy.dic"
+		sed -e "/set_input_encoding eucjp/aread ${EPREFIX}/var/lib/canna/dic/canna/nichan.ctd" -i mkworddic/dict.args.in || die
 	fi
 }
 
 src_configure() {
 	econf \
 		$(use_enable static-libs static) \
-		EMACS=$(usex emacs "${EMACS}")
+		EMACS="$(usex emacs "${EMACS}")"
 }
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name "*.la" -type f -delete || die
+
+	rm doc/Makefile* || die
+	dodoc -r doc
 
 	if use emacs; then
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
-
-	rm -f doc/Makefile*
-	dodoc -r doc
 }
 
 pkg_postinst() {
diff --git a/app-i18n/atokx3/Manifest b/app-i18n/atokx3/Manifest
index 9b538ef32f53..541e5b5532cc 100644
--- a/app-i18n/atokx3/Manifest
+++ b/app-i18n/atokx3/Manifest
@@ -2,5 +2,5 @@ AUX xinput-iiimf 259 BLAKE2B 02091d870ca82447aadfc6c33bffc38d2bfca596f4f5958917a
 DIST a20y1406lx.tgz 8491493 BLAKE2B d5823dbc49661434c48d056d0d1d082be3d1d136e8eb8aab6b48f27b8198102201d5daeaca11717fba512b6260b928e165e6f500e8f1d70665c8907b9b1e5ce2 SHA512 bf350be4f15db63b384ff10ec7e362c469a836d052e8885aac1bab049f7d4f0b04dacaecbe5c1303211405938bc3f674136ba5ae3b55ff31aa5e4f14dbec0273
 DIST atokx3gtk216.tar.gz 69246 BLAKE2B 73d246e5c79da0888ffc32deed9d8770500c64377845c553f1ef4ca18b6c9ce93e20dd9188983d9a7664ead60dfb66f53f605a2ab7bf065db336266b5fb38178 SHA512 39c0ff01807626f417f34ef02e4be2fe07c52edc931775299e90fd8725d9c870c3473005fc87be5023d089e94fb4700f9ad36a10ad3373be22ec35e2a418eddd
 DIST atokx3up2.tar.gz 8427265 BLAKE2B 6af19673dd443f69870316413bd53712a5b1f148f07d7b7f9dddff3290a4b6d65866e7d38a3c6a3d1ff15990560b706d46a558a77ff4c8200b36b4f1345c62bb SHA512 b4ce05882418a18e6a0ab58d805a1edeca69187bfa16a98b8f79d749ec0cfdc1b838de30f3049d3b8b0929214164c4c2054dbe283dce0f18a1ab2daa181e306d
-EBUILD atokx3-3.0.0-r12.ebuild 6721 BLAKE2B 38a09411a47bd7ea2a41325377a3ec890ae25567a874953dd2bc0d443903f9c564410f68b50e8507a999f36a3a984077186869a0e6408566f38281e7a463bce4 SHA512 413de37981e24705a8311157df7fe18ae926fcfdbe99e64fa1cb8e01ae3ef238ebe11ef9a9c3e51392787b88215323a17fc6c502e49b0155f180f84e23cdbed1
+EBUILD atokx3-3.0.0-r12.ebuild 6720 BLAKE2B fec62f2205cf732d73ee3a0149a69d90c50fffca424e81459ab934d061a58408fd7085ae7b4a8ac4e6a06b70306b291c610abe916d9d9c5a099147f940f751c9 SHA512 d18c80ce92b18fe567d266a1a3af08be5fcc9ab32d7dfbdd55dceadc2755e079624971468903d8d92e46c57c6ada91abedd39cdce1250a83de4d15c6dd38413c
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
index 70c48e5edce0..4cc9cf8691cd 100644
--- a/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
+++ b/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -28,7 +28,7 @@ RDEPEND="dev-libs/atk
 	media-libs/fontconfig
 	media-libs/libpng
 	sys-apps/tcp-wrappers
-	virtual/pam
+	sys-libs/pam
 	x11-libs/cairo
 	>=x11-libs/gtk+-2.4.13:2
 	x11-libs/libICE
@@ -51,7 +51,7 @@ RDEPEND="dev-libs/atk
 		>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
 		>=media-libs/libpng-1.2.51[abi_x86_32(-)]
 		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
-		>=virtual/pam-0-r1[abi_x86_32(-)]
+		>=sys-libs/pam-0-r1[abi_x86_32(-)]
 		>=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)]
 		>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
 		>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
diff --git a/app-i18n/enca/Manifest b/app-i18n/enca/Manifest
index 7c26209e7187..4c70dd22433e 100644
--- a/app-i18n/enca/Manifest
+++ b/app-i18n/enca/Manifest
@@ -1,3 +1,3 @@
 DIST enca-1.19.tar.xz 465412 BLAKE2B fefd58502cf345f9b88d620d5af349d72b9e2af70d61c9b5aa3632cf91011110dc1fa08e78dd04c02c5a333adfefeb88f529f3cadcb75d0cea2b500a5a70c057 SHA512 6678639992685180457bbef7b0da6e475071ec6935dfd672188fc242ef80b906e75eff9a206e07989893d0ef4ae5eb500f1d0bbd6b4d58146c94bb143b5fb296
-EBUILD enca-1.19-r1.ebuild 2105 BLAKE2B 84c0feea65781ac79eabeee650cd0123408503fac13227c779103ab174233ad36cb6bfe2fe6110c45eb295ad40ebb51ef6324e428ac81247610726134439d233 SHA512 eb96e486d1c7d2a50872bc88f40d1fa8a1c92452b2d1e28d5e6507e6c37dc56af75c6b86e5b63f2bc8478966968e33cbefb9062f792bd07c38964743916d9bd6
+EBUILD enca-1.19-r1.ebuild 2083 BLAKE2B 15023006bbb5c6afb0b9763d2b4a4e3cfe922e1e81a014561a39c4012e05ad21ffab90f1a6b44dcef9a9a23894e36d2d3dfcf215477ce14215f15816bb002ede SHA512 6dd8d065051f3b357863c2e75856a2c252739b74668b01d44d15eb9a95bbbaf9275a9fbc717b8e6020f8b698ff6df2e761caa5305c9434dddb33a16dbe33ac84
 MISC metadata.xml 324 BLAKE2B 61e560fc5161d96f01841ebd42ce64012725667f0545fe3bfa463f94b61a536822e1109bfa044f17f6e12c6c45bd24c284aa4846f36db5836e24742b1cc171e9 SHA512 b10801cd8a372709601915899abe03282148aa9a0519160963f5a7734fbeadc082f5493e46ecfb887a16c4b9b5f28424b3b2b87ab4b34708b77cdf3cd4eba03f
diff --git a/app-i18n/enca/enca-1.19-r1.ebuild b/app-i18n/enca/enca-1.19-r1.ebuild
index d1567c61b8be..bb4028baede3 100644
--- a/app-i18n/enca/enca-1.19-r1.ebuild
+++ b/app-i18n/enca/enca-1.19-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.cihar.com/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +iconv recode static-libs"
 
 RDEPEND="
diff --git a/app-i18n/fcitx-anthy/Manifest b/app-i18n/fcitx-anthy/Manifest
index 98b9aa35aecb..4ffb033ab01e 100644
--- a/app-i18n/fcitx-anthy/Manifest
+++ b/app-i18n/fcitx-anthy/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-anthy-0.2.3.tar.xz 78020 BLAKE2B ae054f753dd7d10a0dafd80d67413c29806b6c3b08de9eac3d7eae1d540f01b7bafd22bd9c722a7fc517f1752d90c1c3d82e75aaf58a807daa60b7e9a047d152 SHA512 2769871059053fb370ba84af7cdf0c461d64724a240d58a5a8889cfd9bfb5d145998f79ed2d06a1ae1ab907f9db04fc122bfaf6957ef572fc833e400ffefc642
-EBUILD fcitx-anthy-0.2.3.ebuild 798 BLAKE2B 805bbb10e45fbd7369062b3eabe60b243e8756cc20ce32a2bc5ecd93ac032a0730391c3ef5a6f988661f816874034129d594c147150fb8d516f537049dd19314 SHA512 fcebed91625aa1384004afa91bdc9e3eff7f6f0a45ba242173d2405b89456efb43ce369b30df5f83c7300fa009ccb99501ed95df88b4eebf93cde1666ee6f394
-EBUILD fcitx-anthy-4.9999.ebuild 779 BLAKE2B 2b3f742f2c2de37be44351048092c61b01a872fff280e573838e6e5d710d0cb3fd0f557d9d1528704d9da8bcbad5418af06fc1c9edcb909e43df13e0d24049ff SHA512 b1a4fe8f93736658012905e027ddb665f4e6602bc4638333fa9af283b50b73a6f7b3b9a9a4a26dda2113131b712c818964b1d1a1ae45adaf94f91baea7b0a04a
+EBUILD fcitx-anthy-0.2.3.ebuild 794 BLAKE2B 02b44220f7de069bf90a64cdf8405fe11905b8c91bf4b16d3d85038f2b42a14a84b09a82954dda3f4ebc8af79584ba9ede75df141f9e3100c574bd2ec8dc43e6 SHA512 b62d0f4344c423beaefcadbe3d8bb55e309bc32666c3ed1d76b7b1e33e8023579f572d52cae92be970c52bb97e55201b44782d29c952930c53a0405b8cc88d75
+EBUILD fcitx-anthy-4.9999.ebuild 775 BLAKE2B 499c8b09c5e4dcff4689780ae84a0651752a210fc660e495a5480062036a1d580c764a3c08223c7c05345bc33ab23743cdf10ddab417869902481536c408889f SHA512 85ffd55a35aed0371fbd356925a302651da9c0d6f73c2594f5c44cf9bce831f983fe44013e9621acd6d3c98156cf2b74ef6a2441e19e382d7ad7108901579718
 MISC metadata.xml 450 BLAKE2B f1d48fdccecc3112eceb62a5c60305b894fdc1ed0856fc176178ff3dbd2ca5a5125a9449cd51947a6e4478b5dd6cf817786824b5cc1841c1cd40f5bf9262e695 SHA512 2a104c976ff4336b60a5c14f49b56f634c808c5c73f8fad195028e2cc71c03e68384d315fb44e993c6ae22489e400759e3a0c11ab04f8e96d3d445a9beb97204
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 7f2661d3e6b3..455118af7af9 100644
--- a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
+++ b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2013-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -24,18 +24,18 @@ SLOT="4"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4[X,xml]
+BDEPEND="virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4[X,xml]
 	app-i18n/anthy:=
 	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 DOCS=(AUTHORS)
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/fcitx-anthy/fcitx-anthy-4.9999.ebuild b/app-i18n/fcitx-anthy/fcitx-anthy-4.9999.ebuild
index a0729a41bd38..24f0e97c1e8f 100644
--- a/app-i18n/fcitx-anthy/fcitx-anthy-4.9999.ebuild
+++ b/app-i18n/fcitx-anthy/fcitx-anthy-4.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2013-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -24,18 +24,18 @@ SLOT="4"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4[X,xml]
+BDEPEND="virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4[X,xml]
 	app-i18n/anthy:=
 	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 DOCS=(AUTHORS)
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/fcitx-chewing/Manifest b/app-i18n/fcitx-chewing/Manifest
index f5ac621a3650..c7bcc8452e11 100644
--- a/app-i18n/fcitx-chewing/Manifest
+++ b/app-i18n/fcitx-chewing/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-chewing-0.2.3.tar.xz 19804 BLAKE2B 0a83ae9a17eb74898e41471450a9054bb05e504a60d05bda91fa53f90cb4328b0db4bd5e1d662c81c9322268660e57a7f2cb9c547593913206a00394883341b1 SHA512 3492ad6ecaf00bb1ea07b76c9c23da075615597c1a68434a2da003cbe410d12172510d4306379777a1d04a359b017c49d278c002a7230b030693b668b6030bfd
-EBUILD fcitx-chewing-0.2.3.ebuild 808 BLAKE2B 99dbdc0625b869c94abe9ffad801da193ae4139925c9fa6a7f2810a358f8f8bf6d71259944e1c717bfcf1ab95e523ed707944b8824147516a43ed26087ecadda SHA512 027294d0a8f06c8900a9352ced15aaec8be43b24cc1766a9dd929e2ad0fde63b9d6323f8c790382a0a7fbddd901876da06274d76bcc244f96da449b4b8a29b79
-EBUILD fcitx-chewing-4.9999.ebuild 789 BLAKE2B 458a1280bfcf52b400836cd6aa2e0c1a2725823da488045105e1c670f3472b9bf285cc6d0a4b854e426af9ea7a47ddf05c549c1078184c2baddc293a675fdbff SHA512 35600562a60083fcdf1d1e33ebbcc0fb227f4aed22eefd4fbd99fe5b55c046a496f6736be83a684ba02d2a2c0c8a75442839a12ff75fbc285cbe643003229c66
+EBUILD fcitx-chewing-0.2.3.ebuild 804 BLAKE2B d981ac85a3140ef255a7b74e6777086cdad0c4ce2975915ec45dd211100095485c51fe575ddfa99d16d382dbb7cfb1e6b51a1672c7aea0e8c4f1dc84572e306c SHA512 9c3a6051fc7efc69eeb19c123902b8adeb89f6b2e741dd191cc7a57c13d7de7e91bc56bc4b7b92cd42d3bd88bfd8dc56e9750c20e0acb1b02543575e01898cde
+EBUILD fcitx-chewing-4.9999.ebuild 785 BLAKE2B cab91a7cb6f334903691c8c4fbe72d574d8a6831f20b4185012b960cd6c961b6ffb9095b6a22fba2312c6ee646446160825393ba0789ed85bfc82b9a01dcb1fc SHA512 6f99f4effc733344e1248c3e0f241aa25051ca88a80235d4371d1644232a1b8ac8f6c2122f9293e73506e692f1d953ca18f56a3f60c1474d97a46a86e2ca19eb
 MISC metadata.xml 452 BLAKE2B 57060504d81e6cd26399a9c925569dee13e82f05b116461e9b5a770b4d85e84c4845750ec57fb863c91f5f1074120fef1416407de3d2250d48b042b998834877 SHA512 c48559820436222f9bb7a7e7decd0a5605b8cefdb08e2a35fd30041cdf61e923592f61cf58efa9c2f35d6c464ab1957c092dd69a324ff1a6a3553259054768fd
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 7b2a3ebd031f..143ad65fd3fd 100644
--- a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild
+++ b/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2013-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -24,18 +24,18 @@ SLOT="4"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND="virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
 	>=app-i18n/libchewing-0.5.0:=
 	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 DOCS=(AUTHORS)
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/fcitx-chewing/fcitx-chewing-4.9999.ebuild b/app-i18n/fcitx-chewing/fcitx-chewing-4.9999.ebuild
index 3d0c5778f7be..37b56eff406c 100644
--- a/app-i18n/fcitx-chewing/fcitx-chewing-4.9999.ebuild
+++ b/app-i18n/fcitx-chewing/fcitx-chewing-4.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2013-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -24,18 +24,18 @@ SLOT="4"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND="virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
 	>=app-i18n/libchewing-0.5.0:=
 	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 DOCS=(AUTHORS)
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/fcitx-cloudpinyin/Manifest b/app-i18n/fcitx-cloudpinyin/Manifest
index 314a299b1d91..657823e21ba8 100644
--- a/app-i18n/fcitx-cloudpinyin/Manifest
+++ b/app-i18n/fcitx-cloudpinyin/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-cloudpinyin-0.3.6.tar.xz 22596 BLAKE2B e53f64dc999eb1ffb1d3c37b6ed75272da9a76d196df681b71876281ded778f83c73eef2f9100233f580a389e36bfc8681cd7be5e23ce4d9c27c26384062cf9a SHA512 d3a05fc48659db64a0a827c9b75cfb8b33f7cdb48bd936a2ba33f49469e29558a7da0f58cb7e6929b1265d451d23b0a37d87b7b69752599656c94049077d9914
-EBUILD fcitx-cloudpinyin-0.3.6.ebuild 739 BLAKE2B e431d4bec95c002becfaf8c68903bd306a03552a84b009b8c1fe6dcc6c1cbe74f7d1913a6aa33ed7e6e7134d2176c0b290c32ddea0048faa1bd073d592abfafd SHA512 09f06cb5f6e0c27faae6d9d1773d2dbf90f2fc3a4d5d0534c3635f9ca931618728f86493b9fafd8c9163b1aa726fe8f6faa65e1880b69cea16e09b7507cb2fab
-EBUILD fcitx-cloudpinyin-4.9999.ebuild 720 BLAKE2B 69e6893afb7bd87ac5f125cd31660e3d5fe62c76541a41ae244ff6f2a4f8b8d432e7d25384d118f7b54b7179d856bb32a4f2fe2ccb418fc990fa79b408f08f9d SHA512 faa3da2b4eaed62823f1b412ae5007de2436b0e2ee050fd1eb0f0c86b38f6ff0bd0a04b55988fe66e95bf5593144278317d4a3f620c01693f02d893189816ef2
+EBUILD fcitx-cloudpinyin-0.3.6.ebuild 744 BLAKE2B 2d2aff5d23b5e4316b30e6422bacaad741948ec8d6920278a079b4bf8c0c4f2590813ba99a961a1c37c09d7bc796fc04cbda3b25d92ba60d392af81b0767549f SHA512 36bb92b5b191bc52e12a6b29eac2b15c9ed18c8a267dde6dec0487c858626d326035528e24b0ad6d69eff04d09bc3e0123300300b4e785baf99f061dc4ec9c5e
+EBUILD fcitx-cloudpinyin-4.9999.ebuild 725 BLAKE2B 875e5908a2487ea13bf4059ec6b355cc350dd090d6fd956a01695640142a8760bced4cd4e60192c43ec4bb3711502f7d85f6d5fad73ea30e81c2d6098b1acf37 SHA512 d97cf9b772f1df579e714b051b696e5221bf91152bc804b308edab74589688c223a0bc9521e22a4a01749681cce428666ca5509e1b9b30a1eaf5f70e8c112586
 MISC metadata.xml 456 BLAKE2B 644db7a23b73c35e0aba40bfb444f6ffe24fa03ac461f57eae0c792428cd0396ccf3079da8ed31ccdb63b2edc32cc2ff2b0964444c77a8148aa4aaae90edcd9c SHA512 213d5df684d2ff47acc1cf54a122cbd345b311e814cb71c4a77e2b05e2d0e869e3d00d9f8d8f8691bdd119fd99e1ad4b8a5dd8e84d762ee8aa454f3d4765d554
diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
index 5eda97b53959..7052fba1ce19 100644
--- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
+++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2012-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit cmake-utils
 
@@ -24,11 +24,11 @@ SLOT="4"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND="virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
 	net-misc/curl:=
 	virtual/libiconv
 	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 DOCS=()
diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild
index 14ed5cf98819..e4582e24ae36 100644
--- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild
+++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2012-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit cmake-utils
 
@@ -24,11 +24,11 @@ SLOT="4"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND="virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
 	net-misc/curl:=
 	virtual/libiconv
 	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 DOCS=()
diff --git a/app-i18n/fcitx-configtool/Manifest b/app-i18n/fcitx-configtool/Manifest
index 46186f4a42ca..f4db626aa8f5 100644
--- a/app-i18n/fcitx-configtool/Manifest
+++ b/app-i18n/fcitx-configtool/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-configtool-0.4.10.tar.xz 50440 BLAKE2B f2f2241d3ea139f6f3de9b8c6ffcc71c789dfa291efe4c551596eebc8a04f13f9fe698cc25d8349a174399044d15ddca2aeab952ac2bc7f0f4e9e47d453329ca SHA512 1c1267e9de694bbd5f258b5bba1e7514c4f8556cdc82a1cce5eafd8a4ec571955285dade0acd02f128eca01f867a30c5c6264ee7e91d32a333eba6e4d275fe8f
-EBUILD fcitx-configtool-0.4.10.ebuild 831 BLAKE2B 5342138dc4af4354b5ca06c03260e407b63a45f1c3f522e8758034f729371751cf2375e6b6682f40e330b7e713e38d68d82e930a1f94b5d4c470ca9232ea9bb4 SHA512 ef003e011c72b05cae5daae39a2df95fb5e0d186f9868e4ebe86d4d0a2e41e9df6d085b02ac9eadfc398364dfec313a7ba36e08e128dc1bb84f6e983c77986f2
-EBUILD fcitx-configtool-4.9999.ebuild 812 BLAKE2B 5104f5a8249c301d2a0cf34b723fde5955fd9fd5a04dcd22db324a4df7a41137a4998c22e7ce8e1203d2e3792924e33f91ab3442bbe0407f8de8e17a2c1cf75a SHA512 f034a758bdb93e6ff25418680c20c1f46133bad1e975ac2dcdf4ecb353d9b146e8ae3c1380efee3956d2ba37b2927f1ad737665bf7f66f1ffc840ff16d73e94b
+EBUILD fcitx-configtool-0.4.10.ebuild 836 BLAKE2B fca93908e735cc7efc3e63fdd13c4349da7500426057caae1652e59f69c98fc9be366d21e78c6922265fda4162cae8e7417af6b57151b88e74e67caa6e974b17 SHA512 b32723817c61dc7892834069547da7ab73abff5e6ca97bbad5b8055ce1467e9b1af47bfb68355c435b8d33a6360ab31507d1d46534339dca981e6a8645a7bd5c
+EBUILD fcitx-configtool-4.9999.ebuild 817 BLAKE2B 919d4c049b0d0753d6b980b3055a6e62effa7f06104514b45af7b7d68f2d2d4aa6cf7520bd8ddee3ec2862c2faa9a27279315dd14e5c335bcce040915652046a SHA512 505f8ae8a1bb4631b6d27eeb0544b080930cdf5dccd5e870a5337b320f3f65439e21b0b06bc9a17da7a2b9195090e936d544343d6ceb9eecdac1b1b40e955b32
 MISC metadata.xml 455 BLAKE2B a7e9760354a785de1313e86c591681c8e3deee0e9debbbe9b1cdc4be1f6c4b669a86db8afaa94aefd7c598748dbedf0a4e4d19a3c18ae94c8876741a63e5bf17 SHA512 34d0456d670a277afe5579b57e5d403fdb936b75efeecba10f37b43fb78d55f57d2722bc9abdf605197e98497ccd71c6f21b55ce6dd6b4e55860f483622ef70e
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 33805e7cbebd..d94a92a71186 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2010-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit cmake-utils
 
@@ -24,12 +24,12 @@ SLOT="4"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND="virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
 	app-text/iso-codes
 	dev-libs/glib:2
 	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 DOCS=()
 
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
index 5778190ca4f5..1243fa0276e8 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2010-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit cmake-utils
 
@@ -24,12 +24,12 @@ SLOT="4"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND="virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
 	app-text/iso-codes
 	dev-libs/glib:2
 	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 DOCS=()
 
diff --git a/app-i18n/fcitx-hangul/Manifest b/app-i18n/fcitx-hangul/Manifest
index d66ee22b1067..0780bc0afd5a 100644
--- a/app-i18n/fcitx-hangul/Manifest
+++ b/app-i18n/fcitx-hangul/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-hangul-0.3.1.tar.xz 26612 BLAKE2B 59770762ecbd5027d9010d99037881c576f638d30cf22234e5b110e9264637c3ff2049fbf8c7e44ca27acebff5668b2eefee5aeff78622ccb338ff68abc42490 SHA512 6ad2e34644c9246490a91342a11b186d40702f7e587beeb056ad98538da50dbf9fdc9f298e5b379bef50f63ad5be5da79ba84e60a22b57c330d0a68dd5bf5ca6
-EBUILD fcitx-hangul-0.3.1.ebuild 836 BLAKE2B 0ad55f3d1b837e567718a43e95f5f336cd15e8b11d1e00bd52e71e452b331d8ca7e5cfa7b562fb89e38cabb357408149f54cd9ecd6a5d5b28b53f58a777713ef SHA512 854327ddb8f94f8a1ca2ed82702f0fba43de259863f7c33642fe82d478bc414609d14f1da506cf89b44a4cb3ae4e5683ead71552e8017987f35d4d981cc40bc7
-EBUILD fcitx-hangul-4.9999.ebuild 817 BLAKE2B 0caa7e0868a86243fe133e3fa5127b2e7fbb7a981c1c994872964ea526f09ad94481102fa6db37d9242da338da734875611f9a551281619ff6047649084553b2 SHA512 5470e79b0843ae01c2ec841c25f376351a2c8b205033d745ad5467733b54bf0658fbe135b88b5d74465c5a761060d5d23906fea9654b70938931d536040af2af
+EBUILD fcitx-hangul-0.3.1.ebuild 832 BLAKE2B 2bd6977a391b4b01831e187e673b16c9e36fbd18429c9162729b078810f11be37da7c85ec2b71ce8541d6162e41fa5d084c7d66a0aa2a58ba8d41c35d597a928 SHA512 62015d2b984964cd56e98a0d19a967d7fac4ed14444813e0b8c155353e89293906d0d43a8d8688da4b5b3f683c1599dd1d3e38b64126b4b0ad5ed2ea2158d581
+EBUILD fcitx-hangul-4.9999.ebuild 813 BLAKE2B 1e49bad0c8fa9f8771fc51b06c4d815e97c24f004a536ca42d061503b66934abef0dbc607f6a37f603deff841cb76da3d2b6219dd905f6f637c06a2698822bfa SHA512 e47e032e70c49a94eaf2fe1d9d8ccca304ad016349403cdb3e4418ccb06740eb1287bbb69fdca5ca449e2a3423b77d5f8e862d185b2454135ed65b9fb7dc0e07
 MISC metadata.xml 451 BLAKE2B f809380d98ca98e0b6ce0704578b4cf132b12355186baafc47db0fdd2adce287f13c94d550871a902402db98c746a8f606508d02c0081b0255146cdfb5148bcd SHA512 a1a91f89a8ec15b789620b27dc73f7dba525ade3a2ba514283216783c0687a53e37d0aec1c1c4477368694d1df188c18aa235bd52dbea12d82ef273dcbd523ff
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 c933884fa90f..16855499c911 100644
--- a/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild
+++ b/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2013-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -24,20 +24,20 @@ SLOT="4"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
 	app-i18n/libhangul:=
 	virtual/libiconv
 	virtual/libintl"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 DOCS=(AUTHORS)
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/fcitx-hangul/fcitx-hangul-4.9999.ebuild b/app-i18n/fcitx-hangul/fcitx-hangul-4.9999.ebuild
index a9af4dd2d47e..917d7e983d20 100644
--- a/app-i18n/fcitx-hangul/fcitx-hangul-4.9999.ebuild
+++ b/app-i18n/fcitx-hangul/fcitx-hangul-4.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2013-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -24,20 +24,20 @@ SLOT="4"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
 	app-i18n/libhangul:=
 	virtual/libiconv
 	virtual/libintl"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 DOCS=(AUTHORS)
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest
index e1c93ba5aaec..325398a402d8 100644
--- a/app-i18n/fcitx-qt5/Manifest
+++ b/app-i18n/fcitx-qt5/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-qt5-1.2.3.tar.xz 134124 BLAKE2B 0c17f9c3b9d9878fe228881c7287375d3b73a8c27f806590747e56b8644a86300e243d62efcb6589d197edd352e2a79d49be704718ff53381e2fb5e2a5a2b1af SHA512 e3e9a76419caca4eeebf3c149a72ee939a25f463d03dd8461caf44cace310278b08e83d460112f240cd54ed05dba3c5e9732198f0c3d0b9d81c3a444c33ab8d3
-EBUILD fcitx-qt5-1.2.3.ebuild 877 BLAKE2B c2fd8acc1d788ea4cffc7f933e7aace5086b7e2872fe7000b3cf68ca06fabc6340bb1fc6492fd62c44d61eff94273c499b25ce8c94e54813e08ba54726f5551d SHA512 afc8f658a894acb45e13a4fbe2bc3ff204f13465b90b471fccf37d7c039aed8c8f5a0a7709fabff1e81745befeb98cbdb659207e261b2ebb9f83b640d6771970
-EBUILD fcitx-qt5-4.9999.ebuild 852 BLAKE2B 1ad3ebf0ac906e6db6ff3c3d6c230da37cffa459101596e4358133737e0def3579e7479098cdf4157e7f65a4bdaa511907532a65b026c357c9dc857cfc7d6eb5 SHA512 15bab1b40244a70f18b331a78c8385d8294b46b0275f5436a6a2f29eb55427ca647320da491454c6a4dc06c9c0b333608e3fd2b54aefd3734cfe96278b41f057
+EBUILD fcitx-qt5-1.2.3.ebuild 883 BLAKE2B ca40cdfbe752e4cb540e8eaf8302e25668e7c35481d8632b8831bc3f5f441fdb4181bfb1588e76ff665ac2dddaa5d7cfbc23f68bddddc51922c834d8f88cfa77 SHA512 dffeca8dc42c30facc4f9581ba618fb46c8af2f5369a0da2478e96e55a04d5183634971d4cec93efbafc61fd00cd5931309d3d709b8c055b23b2ffe1d104791d
+EBUILD fcitx-qt5-4.9999.ebuild 858 BLAKE2B 2aa24b1530ea3789d387c5a5f2e61bdada022a6daca11d8c0276002ab71f4302155c43d83299129b1bf3567935c4941f7458825e8bf7459c494c00eb27c827bc SHA512 93491ab6d61965ec21d61d57a81dd71c33c9eb1704fb5d1e231403bbcaf995da7b2ea2789908e8b25d6373799f1a14fcab1a34294d0815e6d092f2a934f56d7d
 MISC metadata.xml 448 BLAKE2B 1750c8c3d071bf62c166cfcf686e9a37d80e807842a274523454dc88da1dd71f882dcc5d43383966c0389f1cdc0f4c7b355566d0bd9e7272a69a01251e690b12 SHA512 329b0f97ef19e470317fae5493ece05d39e49b4d1c84736cc644c3f22d667157251d7bd176989e0e0968db9e8e36fb388451ba6186a639fc439adc45084bf222
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
index 2c54b501abd1..99e7fd2bb3e6 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2014-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit cmake-utils
 
@@ -24,6 +24,8 @@ SLOT="4"
 KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 IUSE=""
 
+BDEPEND="kde-frameworks/extra-cmake-modules:5
+	virtual/pkgconfig"
 # Private headers of dev-qt/qtgui:5 used.
 RDEPEND=">=app-i18n/fcitx-4.2.9:4
 	dev-qt/qtcore:5
@@ -33,8 +35,6 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4
 	virtual/libintl
 	x11-libs/libxkbcommon"
 DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig"
+	dev-qt/qtconcurrent:5"
 
 DOCS=()
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
index 3d87cd55c432..3484bb692873 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2014-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit cmake-utils
 
@@ -24,6 +24,8 @@ SLOT="4"
 KEYWORDS=""
 IUSE=""
 
+BDEPEND="kde-frameworks/extra-cmake-modules:5
+	virtual/pkgconfig"
 # Private headers of dev-qt/qtgui:5 used.
 RDEPEND=">=app-i18n/fcitx-4.2.9:4
 	dev-qt/qtcore:5
@@ -33,8 +35,6 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4
 	virtual/libintl
 	x11-libs/libxkbcommon"
 DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig"
+	dev-qt/qtconcurrent:5"
 
 DOCS=()
diff --git a/app-i18n/fcitx-sayura/Manifest b/app-i18n/fcitx-sayura/Manifest
index 6c6c87c329c0..013cccdfb33e 100644
--- a/app-i18n/fcitx-sayura/Manifest
+++ b/app-i18n/fcitx-sayura/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-sayura-0.1.2.tar.xz 25400 BLAKE2B 6bed1b86499b4448e87cb76c719d8fec3f7af7e5a4a4846ddc30e6e278f5e67c5ee47d39f4e19d3c8c927ce34bf66f51cf189d1147af0e509c3815ba4552a953 SHA512 2118c95d4f831e5f4e0af0549ae3eb4f16bff8b30b03452837bd14f35fcb524f730b27ceb7c14cf6a4db7400a67070929a75465195b5524187e97c7ca02de466
-EBUILD fcitx-sayura-0.1.2.ebuild 791 BLAKE2B f94e82f9820377bc8c34770887d6aecad5b99adfddcd84ef32eb8af761ad60c8b494a86f476a29475a29c6e5730c0ac93a70df065f6e63697e6a19e188b3493b SHA512 38fb7050b41d87491e8eb17e05a19fc221b8f800d39d5165f3e9c7f857c04efd9ebdd6375b8fa515321ffd0de7c6f9ad4dc807c194e480f667b974fd2286b340
-EBUILD fcitx-sayura-4.9999.ebuild 766 BLAKE2B 8d43dab894f122b97d445141d97b3395678c342f5d5e67823041e6bc1395d2266c7e9d389e51d862e12a1ac9ab535779567aa299047cab6175f6052729b142b4 SHA512 f48bac2e1168f8860bfe1d5b84dbeeefafbf54f9a878114ceaf27f31ecd51e5b25804a58c1cf0904c6fa5ca4b608a0f02b5853b51ab4d0f0014056a867ba0e49
+EBUILD fcitx-sayura-0.1.2.ebuild 787 BLAKE2B e3b93af6383c85da431dd6d15d5217c1d43bfdbf75754e0da32043f7d5a325f30339a909af3d4e1c55f9b48ae89a19ec6e8a62eabf1dc17b0b2fa0daaf67db14 SHA512 4169dcf34f12034878ef4225bed0cf2e60b80fcd1be68bbd20f9b1fa2ceb77de4390b621b781ac1ef9bfe1f8286421f95d0baf5c9a278c77b7cf3b50e0d46804
+EBUILD fcitx-sayura-4.9999.ebuild 762 BLAKE2B cbda191ba0fa265a408bb5ea647a300d2913ced27bc4caa50c0930beeaba13caf1f9b60fe88d8563ba060afee1ca4b5990fc115683590dbaeedce72fb7144e4b SHA512 8b806845182f01518544ca166745849008483efdd5f6c135c00b84a09abc20f9d2846dacfd86c04c31775cd04478024b187cac7a01087c765a5cf5656874fb00
 MISC metadata.xml 451 BLAKE2B 084d21e15c65487a7e4026c93f4a109cbad30bb760966b9d9e171644263de979ecc359cad3b7f86c1f9d346252eb67a3dd29102b728ae3a1c1b019446a83c6a3 SHA512 e1fd5d3abc6808d56d6ed7d3cb9e93aed582bf391f76c3bcc96ba20522eb5d72029662879c81dd02a0a9f3171f0ed6c8a13f3f2d4675c542ee180d6d3acb4bca
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 aaecf413d372..c767ad9702dc 100644
--- a/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild
+++ b/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2016-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -24,18 +24,18 @@ SLOT="4"
 KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 IUSE=""
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND="virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
 	virtual/libiconv
 	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 DOCS=()
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/fcitx-sayura/fcitx-sayura-4.9999.ebuild b/app-i18n/fcitx-sayura/fcitx-sayura-4.9999.ebuild
index 96a0b8ba5369..782627256f66 100644
--- a/app-i18n/fcitx-sayura/fcitx-sayura-4.9999.ebuild
+++ b/app-i18n/fcitx-sayura/fcitx-sayura-4.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2016-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -24,18 +24,18 @@ SLOT="4"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND="virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
 	virtual/libiconv
 	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 DOCS=()
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
index e1f9e0456c44..3824251bb543 100644
--- a/app-i18n/ibus-hangul/Manifest
+++ b/app-i18n/ibus-hangul/Manifest
@@ -1,5 +1,3 @@
-DIST ibus-hangul-1.5.0.tar.gz 505707 BLAKE2B 4dd630d7ed83ff4913e87c4d77f951845714697500a87ae337d898fe674d29e9421d5d506c2beb3acef859864d655f20d92f6a0cc5620f293a8a7623c4bd3158 SHA512 a9bef9ad887d1b41555af12e7589a9c4c69ddf4f61890907d90cbab6b9bf4cb6df4739c54d34ee1b2507486a1cb568f826bb4641e9ccee8ccfa11ff2d7e962bb
 DIST ibus-hangul-1.5.1.tar.gz 460517 BLAKE2B 913d0d8b8995fac3cd73ca40280761d5bf44f35134cb7e73075c233f9c1ef5aa00bb7d7b8da20a69273cd0eb8202b9deb409e1b8d1b6ebbeccccb5f0ef98d341 SHA512 1254398cc4daef2bcbb4cf5be5cfe4c3478097cc5be1f2b39861efe55529ba36602798a84c2540298c2c3b6405c1bd38c97543827c74a473dca5a2d23e3ac4ec
-EBUILD ibus-hangul-1.5.0-r1.ebuild 942 BLAKE2B 1dfb15cf5f049c350e4cb0eaf1e840249536d51f31db55ed258389a2b6ecb7ccb1dbfbc7c58d03a78b4c4d4b620b95409f8bf29e45f517032b66025e2650cbe0 SHA512 70d277553322d1da4ce2acbb4087b5d5d86fd4e632fc3f70d357fa955f793c25b1b02e384df6c788a68f787cb2f552b6562e23a1a21e08b60f521537afca97e2
 EBUILD ibus-hangul-1.5.1.ebuild 888 BLAKE2B 305410e7da6777cbfec80e1ae38b87c8dab2f62e2bdc7c9c3347e0a96a4a2d48664ceffecf6e09ee289e10f293e5346789bc30b947948b93bd41f8ece7b74074 SHA512 75301abd0f15d1201958eb8fff122d73d7a739251198872d702787a505b266c5aa1f3748903c37dca28993d414bc303a685d1ea17a37098968f2a22bbc013f6b
 MISC metadata.xml 469 BLAKE2B fc2c441dc9e4074913f97fd699f765f5cf658cf2faf60bd2e5794349cf58ae83d875bee8303f4836625111b1af89bfad5379c53424910725fc344bc89eef7eb7 SHA512 e22052e96605c02b108b6ec009c81f92ec83fe39978645ec5fccce5cbe4b17f1e205bd5e2173b3f082ff3a0ca404a6576b7f4bc2afa3915482d7afbb154b0172
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.0-r1.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.0-r1.ebuild
deleted file mode 100644
index 4e80d01814d4..000000000000
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit gnome2-utils python-single-r1
-
-DESCRIPTION="Korean Hangul engine for IBus"
-HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
-SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=app-i18n/libhangul-0.1
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	sed -i "s/@PYTHON@/${EPYTHON}/" setup/${PN/-/-setup-}.in
-
-	default
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest
index d193b89f7541..2b7e2d2432cd 100644
--- a/app-i18n/ibus-libpinyin/Manifest
+++ b/app-i18n/ibus-libpinyin/Manifest
@@ -1,8 +1,10 @@
 DIST boost.282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d.m4 55907 BLAKE2B 16ac81094457c80b418109104139c1604e38ec58d6065474cc512668601f12896c4d470fe15c9a366a5ec63d50135265df71f28f4202fa283231879fafb0efbc SHA512 382c7f8a94059ae9816783b12c2d27ee6ca69e23ef7085bf2ee5a31109e6ab0c3d0b0042a3dc290b89276b6315d767aedf073dca390fa688a9aae07e837f83c9
 DIST ibus-libpinyin-1.10.0.tar.gz 1693440 BLAKE2B 5e0d9debddfbb81fcb45ac86d1fe8fb1220a50c527222fb3c3431149231f41dcc59ae87da9ae9485e2585f0e3051ac4d1792407ba62d90e5e0323c482d52318f SHA512 c9fdc28562714bddc889805e1d439a7dd425f721a8236b8f8ec4727ce24e5053693b3e5bd9b06ced22ceb66bc7621715f7ee52e00af3b8b113503a5ce6963ca0
+DIST ibus-libpinyin-1.11.1.tar.gz 1728202 BLAKE2B 6e2273c4ff1be76bb8b0e65b915e039c0a181981d20ed94662184e161e8639ad3d548de981d7bbae950ab8b5019bedaed9593e03282e2f9d207f831929d422bc SHA512 48691952a10f4ab545d8e233dc3cd75fc54270c03a687820048152636df26d233ee0fba89e4ec2ccd5a6e410b41e556872e3dd2468d59d44b3440e904b93528b
 DIST ibus-libpinyin-1.9.2.tar.gz 1693247 BLAKE2B a887be2a11406420e86cf1e7f76f8d8c06cbffa62a0ab42d450015965c24accab51164ed18cdc8e24f26edf03676603a691c907e00722efc24e947919345570f SHA512 008390049b0186b7163cfd8857806715dd78235fc1e35a89d4b58a38eb7f292b643d48f502c0c924512a9f5a96d2581f577d6a9ec3b660d05d9a4adcde970430
 DIST ibus-libpinyin-1.9.3.tar.gz 1692251 BLAKE2B 6f23a8838f90c082a43fc2922bcaf13ecf287fdfb898f1ba213739f8e2f65ff9a68bdc57cf8f82e73e2c5e1569f1209b8294b45c30c5c3b7e32287b73394ddc7 SHA512 cad3d8415e0c206cbd2eb606ea04b5861e10c3a5f614d90bbba29b751fcc978e2ce1a8a000ceb8cc98de1afcc145ea62b5ee8e9d34e4184bccc487225b34ab1a
 EBUILD ibus-libpinyin-1.10.0.ebuild 1504 BLAKE2B acde303e11eb1247070b722c3091e345baecc52c2be979282f08fd67533df15bf580a203e9def2632ffea5f55e0415e6974822242e8b37894417f3999d485529 SHA512 8e4ef404686546dbc1087ec72ae8869cca35e124a39d1d2b507b922f1e455ccb98485b59066df271d52215ba4ba5f591893f92152b7eb8bb80bc81216cf66cd6
+EBUILD ibus-libpinyin-1.11.1.ebuild 1168 BLAKE2B 61ff0f1bdbde3e2b3457daf7305f26426e22c9a5e8662d85e19b98fc87a1688051d5d77777b65d01464bcfd3dec6e0ec21b9de65cb43932d4c7424c70c9a1e90 SHA512 c0ba8a5cd462971fca1d4413b4631550dd3920599dfbc6339ff3be46cd32a82c81ce8cc1ba2bff558f850cfff309bb46ed24866b9a5ea9bbf4e9e034356d0371
 EBUILD ibus-libpinyin-1.9.2.ebuild 1168 BLAKE2B f6df3141832f86f0efbbde6d92a4f692795b585800f9d3c24eeacbe15300be61996b6d029fce6ac8e02ca8253b9cb6c8e3ce5b21b8d688eb2bab860a157d2cb1 SHA512 ace4d4f847d87b9c44e061457f040f744463a06aff68e762200700913d0f54fcf9d8150c064a44245ef95c31d9ca653c6807f6003620788a5962d3a99370e414
 EBUILD ibus-libpinyin-1.9.3-r1.ebuild 1407 BLAKE2B 9b2424d1fe2ea8f1488909831ba59f6920ca7398aa2810a6caa67dff4ab0a9ac0ab328e03a3c629a2b44552fbd3b758909d5101f97f696dc3cd99dacd2c191fc SHA512 89ce99b04ee1dadcca556f73943327df5fd26b8210fdbecf8fecd899a83c27a92fcac49254c41c145b000e4f84d2eef65fddaa95c7d3be20ab0e2a83f761658f
 EBUILD ibus-libpinyin-1.9.3.ebuild 1065 BLAKE2B 7d8ce41d0bfa9faf82d7651a72b6976953da94e0baaea2abe557cdb931bd667efac553cf8ebcb241ef385b8c55dd237f533a5be6757fb6ab507283c320f9eb3f SHA512 12ceebfafbacb494efee3e90ca78e9c6845aef202b5a432828fbcbce1a0b688294861151324d2e75ccd7f67ccc84084cb2a4310290b975c350011fd422d34457
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1.ebuild
new file mode 100644
index 000000000000..5f6789fe339c
--- /dev/null
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools gnome2-utils python-single-r1
+
+DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus"
+HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/"
+SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost lua opencc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	virtual/pkgconfig"
+
+DEPEND="${PYTHON_DEPS}
+	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+	>=app-i18n/libpinyin-2.1.0:=
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	virtual/libintl
+	dev-db/sqlite:3
+	boost? ( dev-libs/boost:= )
+	lua? ( dev-lang/lua:0 )
+	opencc? ( app-i18n/opencc:= )"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-english-input-mode \
+		$(use_enable boost) \
+		$(use_enable lua lua-extension) \
+		$(use_enable opencc)
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 4d446af7de33..9f02aeb098e3 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -4,7 +4,7 @@ AUX ibus-1.5.19-vala-0.43.4.patch 8430 BLAKE2B 2c87c226b3e52710eac046d5c82203162
 DIST ibus-1.5.18.tar.gz 2760121 BLAKE2B dfcf549362ac9ac0cb9adb9cedc3fd7146877a42e0e086ad7be18ccb6239868ed940d2c371d83c2e2706c7120702af0bcb0106da60889f0b3d5857b8929b9165 SHA512 34519c3464eaf2cac3320e1568fc76f4edb281afa70f335c015b828ff4e86b3224d77b95cdc0b2e76e42459c54b1044264ff226963fe739dd553ac7326d2f2d3
 DIST ibus-1.5.19.tar.gz 2842274 BLAKE2B a5aea4770c1c0a58a9e0b1aa26f47a8ab9eb5060a0c06179663984c5b531464ff4575a8ece2f2ee2122f777ca615296c1e46ad4833c68ba2da038f2b85dea374 SHA512 ddcd464c9afb6d081df1cfac65069506877eb4818c3ba5594bcf76f3c6795ef6c17177a778dc89b2ef69d10d87297aa12c8e04f156b750e500b51b32787bd9fc
 DIST ibus-1.5.20.tar.gz 3393487 BLAKE2B 0ed930cbadf7ecf9fa82ee2c0e2a8aa8cfb25a8dc1a2e2ffef0d4f894df31f879f08d7ed14508736836545cbc25b929707939c3b0ea53f2b44ba7489d6dc80ed SHA512 2bbcc19742882fa55d9c8704251f133c5be9f36a93cf52d70c460a4713419868deb634f965e67c1d5c45b615de388b92c0fbb863b118a546fbb89370a38eb77b
-EBUILD ibus-1.5.18.ebuild 4303 BLAKE2B 8ee9740732ddce17e04235a81334ef3547825a3f5d23029df92e172c6a0fccfc180e46961d025c232acbc89a37fed4a50daed7eed94fa14917b9a7523e4a677c SHA512 22280af357ddc970b4408b8a689c497fa5a13265e5dd0fe48d5182409cdcf42ecf818012ba7177ebdd4485b6ee2878ed0055c377528ebb0fd42e9f6195366c6e
-EBUILD ibus-1.5.19.ebuild 4416 BLAKE2B a32df75cb888844a8ca78753ccb9e8245c288882a38be41dbe8ea503d07e6d2e4c4820a5ecf48eae1e5e987592872cf8aaaad04e6545c2258c63f0eb52bf1b04 SHA512 fe00a1e0e7d336a2d3a9d066334c8a5dd667c9eef7fc8ba516028a5feede945f5b0af59717874a9ac3ce9acd57b189a51182c77bf7eb73d83bd0bcb96ec070b3
-EBUILD ibus-1.5.20.ebuild 4128 BLAKE2B 08e17e2e81a45726bcec5b303f4e2595b8dfbf53845b6a95bbbc575537fd1aee2d95b354cc4c9930b28ba10dff5c0a4b457b84f2a4bb5ef567caa5c3dff49618 SHA512 9167accc9d9d0441f3146113cc140e21bfc9ac7a791cf0107f4d1d433a9d506b49abfc24408c777453ffb6a4c210852af19a46dad4d4e1ecb6c597abe58ac9d6
+EBUILD ibus-1.5.18.ebuild 4293 BLAKE2B 27d5e8f493c30bd818aa6ab1b7e07cee569610cba143d14ee1163b2c236c566ac3be0af30e31e5c4f6285d8d7cb1fa65cd6047a647e5f9f8054decc9673d0ceb SHA512 07172e6efe3ba4abe7dd0c90e9f46d584b447628417b4390388daa8db991cf03e4c5d812ac3d36166942a5697b237110e857b7060c5d1587118bd82b222217c3
+EBUILD ibus-1.5.19.ebuild 4406 BLAKE2B fb24ea2b1043c3c7a4ed507db20a8753eee4c1b93ca7c27e23aa0ffe3cd6ca56dc0c18686c8688ad5bcf3ece4c11cdddbbaba40ac13f8442b5892738e6a3df3a SHA512 dd4b71ca1ad0892519c1a5b41c7e1132e2096051f6301e8dd9aa07b5afb6727a29f5a40da89bd0017d84a1d3fdaad9c49830a9ccc65763d75b060feef108afb7
+EBUILD ibus-1.5.20.ebuild 4118 BLAKE2B c3f56fe42f676aa95724b1529b592cf6667472f9a29eb7462b07090500e838c9bf24c48f7c0130ee4a887105028a9fb0f497b44c8eb835d7c40755c0cdbb96ad SHA512 4fc1cafbc04473c84f96752ae9506b3993bccc1ca822174faa132b8f469fdd0b3a0e922ece8bd763bd6186cc188f05c642bbbd16984a27f4f19009e11a108de5
 MISC metadata.xml 942 BLAKE2B 9d8f0df17ae7c5c60892a8bf661c1f7325f4943e30d51667fe5e56f2c74f55e36c6f40cd6044435b9f046a88a267fa1b5d46f6cddc0cefa6b423554ff905e882 SHA512 5501b7ef3b46de30b69eabe28334556c979c99610f0a6051a254a7591de612d99ea9ee3c18c2f3869ae2046514df8cd555d801cc778bc1db111895256b7ab100
diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index 829aa884abfa..9af4e85e2a2b 100644
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )
diff --git a/app-i18n/ibus/ibus-1.5.19.ebuild b/app-i18n/ibus/ibus-1.5.19.ebuild
index d69062d99186..fe9b1bd85a81 100644
--- a/app-i18n/ibus/ibus-1.5.19.ebuild
+++ b/app-i18n/ibus/ibus-1.5.19.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )
diff --git a/app-i18n/ibus/ibus-1.5.20.ebuild b/app-i18n/ibus/ibus-1.5.20.ebuild
index e1b091cd20bc..2cd45e66e521 100644
--- a/app-i18n/ibus/ibus-1.5.20.ebuild
+++ b/app-i18n/ibus/ibus-1.5.20.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )
diff --git a/app-i18n/kcc/Manifest b/app-i18n/kcc/Manifest
index b85505cbafe2..aa337ed19920 100644
--- a/app-i18n/kcc/Manifest
+++ b/app-i18n/kcc/Manifest
@@ -2,5 +2,5 @@ AUX kcc-1.0-fix-build-system.patch 501 BLAKE2B 716e34d3fec17ed1d5acd62502b65f434
 AUX kcc-exit.diff 161 BLAKE2B 48570ac2b258a9567e9dad4075a248f5a4d685225e4f676322a3430ef43764b95d5d36fac5f68ba6de1537b59d6750be8111ea79407019debf9f3928f069427e SHA512 8ee69339db13935d54562189e86941384dc5c01caa30e4efba11e783690b863a1210a5e841ab8a5ac907af9002ac6debd3516a6928f15777a8b31c2089907214
 AUX kcc-gcc3-gentoo.diff 1026 BLAKE2B e7db744d0ce7b34e5686f5e5d256eb16def94cdf83aaeac1d21a77831c7b21df3852b50313af79a570a2fe21ca24dbcdc545d9f9afa498cbb78a9a867261f5c6 SHA512 59c57ee4c34e27b8a0558896e5a94b21f976351e0cd372bc9bd85ac83757276eecdcabd81e4fb02b6f2513e06542d63bcf656140d5407a0e2804f04d5ab55303
 DIST kcc-1.0.tar.gz 18869 BLAKE2B 122e6e749a0cc6a63244d32d735a23ea3bdc6ce81e90674d4aa8c6460b57c631e504490454710601a3e057c413d5579495533320f37820d4c3afd9053325c1dc SHA512 2ec1645bb7edbe49c6845cd6e6794568bd48efec367d2d9628ddb8a72d2b5edd590be101f4d9c8856764ae85c9aad7b0adf69601b78fddffdc23235b96f65145
-EBUILD kcc-1.0.ebuild 609 BLAKE2B fc0121ea4e198fb75d3056a7e56133f8bfedcdf9ffcb078461e6db28b9ccec34fa742524bb9f9897e203e617e7ba159b838478d05ef834c8f0f5f0d1c9b8f259 SHA512 516f3b811dc6204ec9dab414926a9d00aed49fd5341ea8be5219316775ce9e32148c122ea7b23cca6d8fc01e61c76176843a97542fafb8db772ebe2e72c43ef5
+EBUILD kcc-1.0.ebuild 593 BLAKE2B 5c68a308e8bbd73cdcc231c4c19badc2019cb145132a6549cb3bbd52c95452897e9d4a87857950e7ff88679bb0abf42a5e0d07cb7ecf7baeb54e6d261e8d10bf SHA512 19a1830d80eb1ea50318d608c4f36aaafa6a9ac0d6dc1af72de4a0e76cccbb1a9e2fbda9ed649ece09c9d26eea97bf671712009f06e102c803abb3fae150ae7f
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/kcc/kcc-1.0.ebuild b/app-i18n/kcc/kcc-1.0.ebuild
index 20ee1ee57350..79b890dd7eb6 100644
--- a/app-i18n/kcc/kcc-1.0.ebuild
+++ b/app-i18n/kcc/kcc-1.0.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="A Kanji code converter"
 HOMEPAGE="http://www2s.biglobe.ne.jp/~Nori/ruby/"
-SRC_URI="mirror://gentoo/${PN}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-i18n/libkkc/Manifest b/app-i18n/libkkc/Manifest
index 57e9a2ce05bc..33671cfeba0d 100644
--- a/app-i18n/libkkc/Manifest
+++ b/app-i18n/libkkc/Manifest
@@ -1,3 +1,6 @@
 DIST libkkc-0.3.5.tar.gz 1424282 BLAKE2B 5c1664f85b15e4f7b82d07c21ee29b82bea0d8f534b2f866c9604e38b5578b323c3252ae76a325ec269d82c972c9155bb42ca9c765bc47e13825edabfd974ca5 SHA512 f611c3104a22ad38af29746870849d8937b6af2a7fee0952cc25f36ef845b5617a192df7ca63ff2a507384f7a6a13c9c1b4fa3b9a34f3f041bee8793d04b9236
+DIST libkkc-0.3.6_pre20190809104047.tar.gz 389976 BLAKE2B 03c43384f4f1f0e48a3eec2afb9f90a39e42469439a7dbc06692e020d83b8362f19c41ea8960cd5147edca04dcf67be5e74315f494dd017a6ce018f217b6a5a7 SHA512 87c5294900b29e4b2225c24ee744c619691a5f25edc453c2ece44133695a8d0e1a1a07bb5a00d615cc95057ae5b451c845c7ce476df555e025097c38aff87a69
 EBUILD libkkc-0.3.5.ebuild 992 BLAKE2B 8d07a03565922a6b07c8048749f1e32369fb3de07ed6d617c4910cf41fbf051bf282432fe88f12a44f66daa961f2111a46c701ae04544c7b4e1e861993e811a1 SHA512 19fed635f96b73fa7ba478ad78af73e60d5d5d41943584eaa208c4829cf2d5d0e8b853043f9294ce7b38fe68461ea64db2091a0767c2b16320bc615cafcd2b02
+EBUILD libkkc-0.3.6_pre20190809104047.ebuild 1517 BLAKE2B 87b30ee93cb675c6c0712ded21cf1f7304f25cf5dcbb9d10acf909002545001f6a500c15c29b26ad204528081569f1559f1f1856f0288f1772bc1452d39ae8e1 SHA512 f32d370aed7997bc9c41c0bb344ea3374db871c19e35a3ffcdb2be397beca1db5270763ad86c65acc1525e21ccf2b64fb5e38d72f412739ebf79c956acecdd16
+EBUILD libkkc-9999.ebuild 1466 BLAKE2B 3a79ce7a060af4aeb3be425ccd03faeede174e19204aadb4c43a2c724e767a1e1ec19ad37f77dc1400abe0ecfd8cfe28e3dd21d337c6e701251995becaba05fc SHA512 7c3760ecbd64c79c31eac546206739cea4ea51c17d0a2c90980cd7631e557207bc99dbe7bbe56f1c4f9b9d9d50d303c4d535ab13e153ff18ff9cad76e81b309b
 MISC metadata.xml 320 BLAKE2B 32f31ada16f19171c1b3347b4ef63e1894a8f5449dba822ce14b6be5a28636acdf0a9d6ad2808f946cb0d58a384ef40abdd65193156c1b31210949be4e55ca9e SHA512 83a16f6a6b7ecbfbb75a77f38b1de0f9b856e4d4c856f157e4d2d8863f830655b78d1969344383d7d3c12df6a4b3e4d1962be4d8bdc8a77ad9a7c204a111504e
diff --git a/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild b/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild
new file mode 100644
index 000000000000..3f920501d615
--- /dev/null
+++ b/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2013-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{3_6,3_7})
+
+inherit autotools python-any-r1 vala
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/ueno/libkkc"
+elif [[ "${PV}" == *_pre* ]]; then
+	LIBKKC_GIT_REVISION="b2e5a152980ee627c39ca8a49082e6df7694b8fc"
+fi
+
+DESCRIPTION="Japanese Kana Kanji conversion input method library"
+HOMEPAGE="https://github.com/ueno/libkkc"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+elif [[ "${PV}" == *_pre* ]]; then
+	SRC_URI="https://github.com/ueno/${PN}/archive/${LIBKKC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+else
+	SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls static-libs"
+
+BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]')
+	$(vala_depend)
+	dev-libs/gobject-introspection
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+DEPEND="dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libgee:0.8
+	dev-libs/marisa
+	nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}"
+
+if [[ "${PV}" == *_pre* ]]; then
+	S="${WORKDIR}/libkkc-${LIBKKC_GIT_REVISION}"
+fi
+
+python_check_deps() {
+	has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+	eautoreconf
+	vala_src_prepare
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -type f -delete || die
+}
diff --git a/app-i18n/libkkc/libkkc-9999.ebuild b/app-i18n/libkkc/libkkc-9999.ebuild
new file mode 100644
index 000000000000..971d75ef2cb5
--- /dev/null
+++ b/app-i18n/libkkc/libkkc-9999.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2013-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{3_6,3_7})
+
+inherit autotools python-any-r1 vala
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/ueno/libkkc"
+elif [[ "${PV}" == *_pre* ]]; then
+	LIBKKC_GIT_REVISION=""
+fi
+
+DESCRIPTION="Japanese Kana Kanji conversion input method library"
+HOMEPAGE="https://github.com/ueno/libkkc"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+elif [[ "${PV}" == *_pre* ]]; then
+	SRC_URI="https://github.com/ueno/${PN}/archive/${LIBKKC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+else
+	SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS=""
+IUSE="nls static-libs"
+
+BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]')
+	$(vala_depend)
+	dev-libs/gobject-introspection
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+DEPEND="dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libgee:0.8
+	dev-libs/marisa
+	nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}"
+
+if [[ "${PV}" == *_pre* ]]; then
+	S="${WORKDIR}/libkkc-${LIBKKC_GIT_REVISION}"
+fi
+
+python_check_deps() {
+	has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+	eautoreconf
+	vala_src_prepare
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -type f -delete || die
+}
diff --git a/app-i18n/librime/Manifest b/app-i18n/librime/Manifest
index b7b47c8c26ad..314ac01d0979 100644
--- a/app-i18n/librime/Manifest
+++ b/app-i18n/librime/Manifest
@@ -3,7 +3,7 @@ DIST librime-1.3.1.tar.gz 8598357 BLAKE2B cd6bc6b63a89f7f11e78ceaf92007c099be34c
 DIST librime-1.4.0.tar.gz 8609316 BLAKE2B cce58c398057ac82f076e3b9e9a25cd6410e738460bd58277a9e3ed6cd11e80922bbb30e8b42828cdd5dd83f6058794b4b32fedb359315186b018ca88161794d SHA512 da68983638c6f25d994060a607f2ccab8917a71dbf10b9c6f1140c87c9ef4124e29a1d0ef16bbd0edc9a3a22bd5845aa894888d678607db372750f300638f562
 DIST librime-1.5.3.tar.gz 2847083 BLAKE2B 4ffb2c5ddaf52f9c9227fa4ea019ef2965e61139f678798c08ef37dc52b863763651b63ed820caad0de1b06f48ab5c1a7a2682653340d2ae7f5f9eec3cec80b2 SHA512 4d7f6ec43bd5728f59f0b3581bcd8a46128651430b6873017d80659942b8f6aa1a2f25f439ba8fba461fe22acbf701c2da7a786104a2e4852a70a89cdc0452d3
 EBUILD librime-1.2.9.ebuild 822 BLAKE2B efd4b54152a4251ddb8351e6be2387b3671227dd13500a670fb7ee0398e5a5a8a28543bdd29740cb617b911ab870e8fe29ef5abb00ed4400c57aa232379208a2 SHA512 2031060b96288f7e2e146d3f044369911ffb3f0a3df12016583a00f2d80c638fa39e4022ca0dd24da23defb93f63d2b0d06495305459f74db4aa38b28140d597
-EBUILD librime-1.3.1.ebuild 851 BLAKE2B 91a6651e7b7dc00faf653c4ed539174ce3c6efda8e4161c5edb23aeeefbd574f3c8874a7c1ff2a89ab80b9bd61276c810fb9f8ae7a501255b01d51453468a868 SHA512 2048f949b95239924ea40515fdfd7158912b3cae0a158b69031e7f388ed5633c21cb3d9a3ce1d23802c9cf5808db2cf90c7c41f83357962a998535e1c710aabb
-EBUILD librime-1.4.0.ebuild 839 BLAKE2B cccdb15cf60fa3cdb163e0e02210e84855c52d3f8fde58c6ecee1645ff90a0d3711474a088ac9292b56d5b2426f911713a36c0ca5afc1a22f9be72ebf4856467 SHA512 c63a7fd8f6dfb89fcb4566f63efccda29c962e9679aeaa384685822da9f7586ef1e96e04c024bf1c4737e620a18dcd99754ce5d0e41de5b62a60ff77fad71b98
-EBUILD librime-1.5.3.ebuild 1438 BLAKE2B b2d55ef42b789ca4a8c3689faddd1eb8d882ba5bcc82a99b89dba339b482a9ab04e24714959c269f364682b6791795c6676dd87cb015e459c63c9bfdf6cc92b5 SHA512 a69aacb796c2822628e2874f6e80283ce8f169a17637e0e69a3e2a5d43676e7aa0933d3a1dcc58a6d36aaa5c11dab2ce06c6d08dfba5a0c8f1e6008169ae4bd7
+EBUILD librime-1.3.1.ebuild 855 BLAKE2B 3e796f6462b75dba504651018b9d3a4d6ccbab8545782a59eb313741e3eee35f5a3f81228e556c9c5528e130d75999db645f0c75966228a640006fb937bc7483 SHA512 6ee82604e8aa82f1d1e33e4316ec554fe485c8c9ae4521907812c1ab6b7ed9c430a8391b900cbf805fdc0df37bc3131038d8bc9eb24653a03990fb39fddc88fb
+EBUILD librime-1.4.0.ebuild 843 BLAKE2B cf3ddd814e996bc0e8633ffb4b918281d232729773d23fc72449ebb9ddeb126ad2eba9c5e0d31dd96ecb3ebd2ac40b023144f713191e25330e3d841c90267a3a SHA512 fa8c3031447238f9015fdb43dded2c874fb711e2c24282bb8fd4dda0967513aede1170a05c82dccabb19b5d088f87b35256ede0f7cf5778e4cc91b8201a89410
+EBUILD librime-1.5.3.ebuild 1453 BLAKE2B 1a743ba7061b07020c8e4ac114c12fbfff81809df5c7549c150f09a463ef26366eff774634807f938f0f7fb93f4196e808c1d8703c429bed8dd749f21daea569 SHA512 6f2e81396c26ceb7d79a74d05bdd7557cd59bbe62a8e475be3dcb5eb5b0050f7e40e4af7839689ca839d4522ce96dede31c6d67f075916d5cea5a01496c2f6c7
 MISC metadata.xml 532 BLAKE2B 200096c7c818b877dd156ab1456309ae4e42a8bf78075d8aeee30a79f09bbf57c6053a41369102becf87aaf3ea4481a0bf6edf1dee258f650661b61c65a9aaee SHA512 83904c4885a57569f4e74483bd5efed886ca1fd6708c1e7146ce4893bcbdd66efa82dfd4e563c7b888603e23566de21e928772a597dd2e6fc75d00793c788800
diff --git a/app-i18n/librime/librime-1.3.1.ebuild b/app-i18n/librime/librime-1.3.1.ebuild
index d2ed92eef3b2..247e65b63c57 100644
--- a/app-i18n/librime/librime-1.3.1.ebuild
+++ b/app-i18n/librime/librime-1.3.1.ebuild
@@ -18,7 +18,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="app-i18n/opencc:=
 	dev-cpp/glog:=
 	dev-cpp/yaml-cpp:=
-	<dev-libs/boost-1.69:=[threads]
+	<dev-libs/boost-1.69:=[nls,threads]
 	dev-libs/leveldb:=
 	dev-libs/marisa:="
 DEPEND="${RDEPEND}
diff --git a/app-i18n/librime/librime-1.4.0.ebuild b/app-i18n/librime/librime-1.4.0.ebuild
index fe6219f824f3..20b5459ab2cb 100644
--- a/app-i18n/librime/librime-1.4.0.ebuild
+++ b/app-i18n/librime/librime-1.4.0.ebuild
@@ -18,7 +18,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="app-i18n/opencc:=
 	dev-cpp/glog:=
 	dev-cpp/yaml-cpp:=
-	dev-libs/boost:=[threads]
+	dev-libs/boost:=[nls,threads]
 	dev-libs/leveldb:=
 	dev-libs/marisa:="
 DEPEND="${RDEPEND}
diff --git a/app-i18n/librime/librime-1.5.3.ebuild b/app-i18n/librime/librime-1.5.3.ebuild
index dbc7f5894fe3..074f50244aa8 100644
--- a/app-i18n/librime/librime-1.5.3.ebuild
+++ b/app-i18n/librime/librime-1.5.3.ebuild
@@ -30,7 +30,7 @@ BDEPEND=""
 RDEPEND="app-i18n/opencc:0=
 	dev-cpp/glog:0=
 	dev-cpp/yaml-cpp:0=
-	dev-libs/boost:0=[threads]
+	dev-libs/boost:0=[nls,threads]
 	dev-libs/leveldb:0=
 	dev-libs/marisa:0="
 DEPEND="${RDEPEND}
@@ -50,7 +50,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local -x CXXFLAGS="${CXXFLAGS} -I/usr/include/utf8cpp"
+	local -x CXXFLAGS="${CXXFLAGS} -I${ESYSROOT}/usr/include/utf8cpp"
 
 	local mycmakeargs=(
 		-DBOOST_USE_CXX11=ON
diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
index 0d18b21f8a08..0ca47c34dc22 100644
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@@ -5,6 +5,6 @@ DIST nkf-2.1.3.tar.gz 195020 BLAKE2B 7ffd2acdc16d98cfe1e7a73ff5999756a1c46e5dbbb
 DIST nkf-2.1.4.tar.gz 232479 BLAKE2B 81887b8b0422e92b2fa2be285c1d9fa4da16d572ca50e1fbeef7be4f50af9ba9b64ef140163e325e57c351dd384ee8b09849bad7c37b03d48a9cb4b88f2ee199 SHA512 8667c20a6c5e9c0c6df7ebe2571bcf24090f04dafd306d32f07312acd659ea026a91d31521b4b213f77aba8218159effd73607d0b7236b7287e4a4cde8cc62b9
 DIST nkf.1j 24160 BLAKE2B 1d461dbacfb6e5ee358d7ea162582da5042a03f02448791c4ed33a10e9eb6e5907220db8d70aea691e3908252daffcbacdaab1b9fe52b0e4e25f7b590e5bca72 SHA512 4680dfb59ceb9db5031ecefeca808e34202c841309d5b634cdd7aa89ee97118701ddeddb0ae18a2cf791987929dc9c5a528275cb1f63b1742eac2197ac9c1416
 DIST python-nkf-0.2.0_p20141211.tar.gz 187761 BLAKE2B b607e155934dd14ad4d29298f209a233d846122299326df48e45339661d1cd08a789f5278928cb4a32c747673723f5f8877d98c7a6200af6b2dbbf29cd100f00 SHA512 5a493f32244e3cb72d188fa39b810baef31ce5f530309797a05474e3f58cf22fd5f8b6c66cdf5268451c49ffb759c476c707329ce1ccf42da0362ad4f5c24d71
-EBUILD nkf-2.1.3-r2.ebuild 1708 BLAKE2B a9e7a012f30b5863f14aebadf2fcb78919aa9ac542da917e87dbe169d703fd1bb6d339296f615cec0b3ff60f2828633b64997e20714659e68ea9ca777feed652 SHA512 56da040d161b4ecd45a394691d972b25eaebb8b1cf96e3d0a55b935cc3ae5929c31dc6c79feccb64c12495625f693d297bb16eb8f9f674305583c33f61c2d2e6
-EBUILD nkf-2.1.4.ebuild 1823 BLAKE2B 7b0b4abac9620d1b48cf8c5fc5ab41b34d0f3dc67daea7b9dc8f073441005c69901773931df998c9b2dd6b17067214b7e091bc0df535f954f1b54c1bdb8f1bf1 SHA512 4bf0647b19a131bff101afda3d35c17317a5ce4a394c9d45f00100949d6430deff2c10349230265f5291fe2019be6134ac682df5e4730101a6883fa72bc32fb5
+EBUILD nkf-2.1.3-r2.ebuild 1686 BLAKE2B 857479545baf5c7cd0c5786e839b1c0adcd6d296b02d99326d7ddd0f437e9720cb6ee36830f82f07c28cfea6c6b105285842bf5075c1f0064b7a5766ad3a09b4 SHA512 167cd508e69495ed1646a535ccd65b1202cba8aedd875872d81c2f0be5eee789cf11f6c2173db3af5cd824cab2d8c7b3f8e26933e1a428345bbebce96ef631f6
+EBUILD nkf-2.1.4.ebuild 1801 BLAKE2B 9c7bd03df2ba6c858d51c948bf466142562f98d839fe0c2882fc892f8ab5cb22bde1d51111ad2b07f2b77e02e6cef6f166df8f82584e2cb90d36d5768d8570d3 SHA512 32c61a571fa435aaa4df2317935b3208c7097b35e09fa0cec80e4782ad61b8c32bc240143214ec8420bb8e3efab6a6aa95d6d8502c4e254513df5d0745c655ac
 MISC metadata.xml 310 BLAKE2B 5db509d8ef0ebd0727be43314f12d877a704ff9eb8b9cde61733c4dbad8196780c07c9de484f29786116e7fe9267ca3f6be9f727be9f4fa34e582b23fa586594 SHA512 2db03c97fb76c37b779c7f6e467c03b2bc08d2642090cc27a99ae07296edcde04924e37c8a3e6cb23d61552e8cf4bee273e5c17077fac0ae0ea3458aaa81eacd
diff --git a/app-i18n/nkf/nkf-2.1.3-r2.ebuild b/app-i18n/nkf/nkf-2.1.3-r2.ebuild
index 987c68e8253e..185e7961b93f 100644
--- a/app-i18n/nkf/nkf-2.1.3-r2.ebuild
+++ b/app-i18n/nkf/nkf-2.1.3-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/59912/${P}.tar.gz
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-macos"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-macos"
 IUSE="perl python l10n_ja"
 
 src_prepare() {
diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
index 8d94ae691118..1c8e0e68da49 100644
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/64158/${P}.tar.gz
 
 LICENSE="ZLIB python? ( BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-macos"
 IUSE="perl python l10n_ja"
 
 src_prepare() {
diff --git a/app-i18n/scim-anthy/Manifest b/app-i18n/scim-anthy/Manifest
index 0c4d30712cc9..f239ebb18301 100644
--- a/app-i18n/scim-anthy/Manifest
+++ b/app-i18n/scim-anthy/Manifest
@@ -1,5 +1,5 @@
 AUX scim-anthy-1.2.7-gtk2_build.patch 24547 BLAKE2B 22b20c7b34e83a9392fe89a2484d994364e12b5618fd7fac0e19af3c8988c1b3acbfe31872f98308c1c201d4e5c1ea598597bc15e04e77e54cfb2fedea7d9e4d SHA512 2814481606429228891cda1c70ed53b4014d2e192f6ab7859d5033a9353ab02dea044291ec8e5667853ac6db2da19f06c4a42ce6fe27d11110a5b0f6ee56bd0e
 DIST scim-anthy-1.2.7-patches.tar.xz 11236 BLAKE2B 5db168479db59bdd1a9a9561af8635e370a338620f4c4cb1676a707c60c0140e2ddd6517896ff5d8a90cd0fe9e2fe25eea7dca693c02e765fb6b8a584f9f409c SHA512 ff265547ea78912b3cb2519793fc7159d466da6bbd3cd47f63a67731207c46ba8932a5384899ffbe517bb3d91f14ee282906ee287025ae64ccee7636dd633f08
 DIST scim-anthy-1.2.7.tar.gz 680942 BLAKE2B 9f2b33d53e5ed14c806dcae50a73d3bb234ec74b820651b09ccf0e3b78924bb0331ec4f5b93f9b0bcb2429bf528f9ddc35d0cda9b3a4d30780f083493945c963 SHA512 4ece2e458b204a68392ed676134ff45f1e193fda00d5ffb219c4e947f7f069a0221b279f110bf4093a22e57c41cb1555c6be4d42bea1c9e848af06ad8e0bc2da
-EBUILD scim-anthy-1.2.7-r1.ebuild 1096 BLAKE2B d9e107bcc922d19c22c3cda58ecf6b592154dfcd76cd81190929dbd0552c800ca4b68dc484750ab0ef6527f52a65de2b88fb0707d46a147d35166b2bb55ab58a SHA512 1029842a4f895c65a91ee8d44aedb48ab92879d25afcdae763bb0204a71f95d1d7ebba67e338892ef00e31c5ac1694ef733a3ebfa228168730532ee1e6008b01
+EBUILD scim-anthy-1.2.7-r1.ebuild 1086 BLAKE2B b0e376ae8038a5b94914fd9a62cef5a4de067519c02d5d37a1da6abd90faa64ee3e030ce7e1ef55dc5c904a4585a75f7d192e03f76d1b1a5e4fcde3a12474beb SHA512 fcd51678b14fa2db1addd71694b5edbc91ede4803956318207ac25db1b77c21c3f55ca3f2e8a36860d098e6a414f93b038bab822323b300c801587efe5edcbbb
 MISC metadata.xml 505 BLAKE2B 811e271383ea3c8f7f3ef772c8b97a395682e3f40c948d6ac09e9aed18b96e7ad0943a4e11e5e2f9fdd5615d86aaf3e5977975d02e5f6c2342d1fee3b563d3f4 SHA512 85aba6ffa284906fc8732242f5efe3563483930dd625871d670840c558f99e04e509080d0ff804746db8d5a3da9210680bab223dd78bcae79cc2ebcde622114b
diff --git a/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild b/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild
index f901ad56c278..255974c23e5d 100644
--- a/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild
+++ b/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge.jp/scim-imengine/37309/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ppc sparc x86"
 IUSE="+gtk3 nls kasumi"
 
 DEPEND=">=app-i18n/scim-1.2[gtk3=]
diff --git a/app-i18n/scim-wnn/Manifest b/app-i18n/scim-wnn/Manifest
index d2f517d8f55f..9d6eb18cf26a 100644
--- a/app-i18n/scim-wnn/Manifest
+++ b/app-i18n/scim-wnn/Manifest
@@ -1,6 +1,4 @@
 AUX scim-wnn-1.0.0-gcc43.patch 987 BLAKE2B 3d523516eaa127e1982d9b795252e01772ee91f46e4629eda6a0fe3ebe32f30f3302545fee9770daffd37ae63877bb6028409d7d5a3fa2b02ed11156a48bc62d SHA512 d3c3baf5399a17f0ca1c6fa77e9e7a37fbbffbeb1b0eeaf1f099c6f07367cccb9e7705955797c218d216384b8621d328e8de7e9eff09ce288c51fe7bcec8b5e7
-DIST scim-wnn-0.2.4.tar.gz 524325 BLAKE2B c1a36cf38e18d27eb501c2e15a59734cc4f6b568bb29b99690bbe7f7bde257f3f2080ddd03a1cae485f510245ecd8ab31be936d27761b54a9f62f02b6204c738 SHA512 72a4e3a0397a711a86733a4f8162627be676280e118e12ef798e4041892bc835869e173710627547978d39f5cd00c032e043e4d2b9db95046cca66cd7ae3a1a1
 DIST scim-wnn-1.0.0.tar.gz 536488 BLAKE2B 5ae2e198bcc2d95bb6f89a57b1331f2a7fd1ad41faecad958cc9f1f011623fbcdabee40b173d17e331b5c96d2b6114d13bc1ae3ebd4605128d69e79db9a299af SHA512 2ba49d247e0dd84b4fd74dee18a2cc83468ffd2dfd98923e588e0ceee82e78c2b25b48c9d7c173f4626f93ac031bfe50764f78624fcf60770784df74bf5f7a33
-EBUILD scim-wnn-0.2.4.ebuild 1138 BLAKE2B e327966de6b8e384b5d3f30a11379297d3186957a4a2b38d1a4ef888bb20d9676d50c662d8c90c12ff2ad00590756efb592c9a1760a01b32d8926361fb4a532a SHA512 e9654b2662fc47c21772b338abb5d38443cbc9b39ee97161b81873ac10ba74caf09401129e7a49c6755f5e1fc7181e2f2d6a7b3540284c7745c413475efe56bc
 EBUILD scim-wnn-1.0.0-r1.ebuild 1290 BLAKE2B e8a8d1b0b4de2e5ed364b0419630197b57ce9ad62da954a7b6b0c7af7c699b7dd112f34d12ea1a025a909311f7242510ed47243acd922a3075df8c4ba53ba629 SHA512 c982bcec2c1ce614b5963dcaafac8ba790062fec82a34eb82c5544662b7b91887d8e13a78537e34829d79f65f6ce6ebc079f5c9687fbc38c2b9205d195cee536
 MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-i18n/scim-wnn/scim-wnn-0.2.4.ebuild b/app-i18n/scim-wnn/scim-wnn-0.2.4.ebuild
deleted file mode 100644
index 6320ed302243..000000000000
--- a/app-i18n/scim-wnn/scim-wnn-0.2.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Japanese input method Wnn IMEngine for SCIM"
-HOMEPAGE="http://nop.net-p.org/modules/pukiwiki/index.php?%5B%5Bscim-wnn%5D%5D"
-SRC_URI="http://nop.net-p.org/files/scim-wnn/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="freewnn"
-
-RDEPEND=">=app-i18n/scim-1.0
-	dev-libs/wnn7sdk
-	freewnn? ( app-i18n/freewnn )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/src
-	sed -i -e "s:/usr/lib/wnn7:/usr/lib/wnn:g" \
-		scim_wnn_def.h wnnconversion.cpp || die "sed failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS THANKS README
-}
-
-pkg_postinst() {
-	elog
-	elog "To use SCIM with both GTK2 and XIM, you should use the following"
-	elog "in your user startup scripts such as .gnomerc or .xinitrc:"
-	elog
-	elog "LANG='your_language' scim -d"
-	elog "export XMODIFIERS=@im=SCIM"
-	elog
-	if ! use freewnn ; then
-	ewarn
-	ewarn "You disabled freewnn USE flag."
-	ewarn "Please make sure you have wnnenvrc visible to scim-wnn."
-	ewarn
-	fi
-}
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index 8e4814555f57..ed9bbfeef28e 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -1,6 +1,6 @@
 AUX xinput-scim 240 BLAKE2B 8c235304288f531db5bea179ff0100f6152b55348057a2604f37e37522a54883d06c954f2804ad4c04dfd3b3518fc5401ad5185e85a85a68d80e38dbbd728eef SHA512 1cfe95fdbf840b9fa43c980bb3f2e16fc6008714f8807650582ca906cb91ddd28b3b7b3c9f1325035e2c614d587d172071b2b7e3c6b30ca3128902b335773893
 DIST scim-1.4.17.tar.gz 1285383 BLAKE2B 95b9ecb0bb25a15876df8175ee0b9392c301e3b0c554ac6ccba6b863420828ce185d3454f2fef48c03e7451f01815020290be7611b8536d8a028153af3a3fe2b SHA512 a7e0696330bca6fdf929ec0565ab4af1b4d0e5f73592cf5cccf1af6412eb351cd5a5ec9a3e5b83b24d6abad89bbb38a375cbbb0fd978f2fa17f6d64b69da0e3a
 DIST scim-1.4.18.tar.gz 1288060 BLAKE2B c2f1ce5608423734899aa6698060245c4ee253048d04d32bf5e853b8c68255340a8d35c0ebaaa50871b07c23ee9018b6bac03b18fbd4fa4dbea0e67c32c9ae30 SHA512 9a6090fc1ab950905a9c54d6678ce3d2a44297d1a992a3e933b0466688638e6cf470c1682daa58a6fbb6de3216b649273faf7edff1ac0ecca1c2c77fc19108fb
-EBUILD scim-1.4.17.ebuild 2549 BLAKE2B 32dfb1d2d19757539c79b161a9adb47e36df4747eb139a3f657cf676cdc2d8a1bad42200a40cdbe4a0bffc4c9e4de7dffe2a04da67484037cc235fd7eea01acf SHA512 8901a0b280b589f4285be3754506d40cc9957efaf66302768e5db47035d5563c8ecd38bde285059d43b01c08797737e71ee6759979955270e347366c1300f573
-EBUILD scim-1.4.18.ebuild 2564 BLAKE2B bf331328eac7aa0013ca7bdc57c87f902f2d323a21c12a7152d8e7a164aa92151905f41ef8d30a8aa0d6393fb916c1b635d3fcd3bdc566a60b92e1b28c8a32ca SHA512 d951884c152a488c68dc4717b8f10d4cf6d7c5d7d2223208b5c97712d3ba3fce9e258423d6d5cf2edbeb0e01d044c137cd2d74473be46e502a1d8f99bd12603e
+EBUILD scim-1.4.17.ebuild 2539 BLAKE2B 0329ad328466f89c7103dd20fd152e3c3c27467c673325b25bafb1a358c066ae8e4fba19de3d0c76c4e6f435ac5033576811bb40d21ed8498e132815686a0b17 SHA512 704c5eb449232a6095252c053d63fc2ad529eb36e1d80e552aeb454df98b6b0ac3f3e335bbe034b8a4578111e9792965664d1eaff8afd08b46d91291fb31ee8a
+EBUILD scim-1.4.18.ebuild 2554 BLAKE2B eb650145de69647b4e5ce253316323c1d484a84b7cc769aebb6650f4089f8b20eef8d5d6504b00267a3f1846d2235ba2178b684cea9aea834ec12df43016da5b SHA512 3465f390071fe645d1d962d12e1c2812118e68b61f12073266449cdc84be16cf4312d77ba46b140e2b20769375461cbd33b1e48f75aad9125de475765666e8a5
 MISC metadata.xml 399 BLAKE2B 35834cd16ccba6bf71752ae33d56e8a70391517ba09f83526d402b3aec5fc5d9c13513e090bb014cad67658c905c1dbbe396cc0c9dfc6f1e7c32c4c09a81d777 SHA512 3bbbad26a22cc5222316cf769f638a0e181ea94d8cee39058bcbd1a08e61dd0096441721190323ddb285c504dc061027e4c4185f8bee1d4d0b4b197903f3be0e
diff --git a/app-i18n/scim/scim-1.4.17.ebuild b/app-i18n/scim/scim-1.4.17.ebuild
index e8653806f6b4..2cb314971f61 100644
--- a/app-i18n/scim/scim-1.4.17.ebuild
+++ b/app-i18n/scim/scim-1.4.17.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
 IUSE="doc gtk3"
 
 RDEPEND="x11-libs/libX11
diff --git a/app-i18n/scim/scim-1.4.18.ebuild b/app-i18n/scim/scim-1.4.18.ebuild
index 5d4dad86662d..eb5a8626a9fe 100644
--- a/app-i18n/scim/scim-1.4.18.ebuild
+++ b/app-i18n/scim/scim-1.4.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/scim-im/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
 IUSE="doc gtk3"
 
 RDEPEND="x11-libs/libX11
diff --git a/app-i18n/skk-jisyo/Manifest b/app-i18n/skk-jisyo/Manifest
index a8f41bd424d0..08a9d7cc58f4 100644
--- a/app-i18n/skk-jisyo/Manifest
+++ b/app-i18n/skk-jisyo/Manifest
@@ -1,6 +1,6 @@
 DIST skk-jisyo-201605.tar.xz 6288104 BLAKE2B d68332a4fa0804b596fc42f3dc8231a6eebe8bddacc6e0babec6cc5992ddaadb46e8fa9af742daa30545a585428afe79eab28329ce1d37e0192b08b20d7c584e SHA512 1093d363fe571c3e3e05fa54046fc4b88cbed2fbd104838576c83694556585401c3affa0afb2ed078c6f1b06f62a7b14145b1305f6fef089f160b4073900c7a1
 DIST skk-jisyo-201805.tar.xz 6133180 BLAKE2B 52408eb2f1fa5e5146fd4db55c249f80b5ede7d2ce1e7a3c11fb69507f87f86d778e25b04ce4e39dd241ea2d8000d829b34c47df991cb91f886923e330b652eb SHA512 13675502332609857b66391bdb9dc252b9f7a48814f6db10c60106b9cc3ce823df7615d77e0579d13b9d3da93dae2006cedc145d8dd80af39b9d4ecfe94373d5
 EBUILD skk-jisyo-201605.ebuild 1309 BLAKE2B 8cad5144891e505667dcba43458e50f02c07ac57b1d329a68c23ea8089c1f7e598cbbe92ebd2fff65b371df99483c2d5ba9b2d6e281023b2ae8641d254939232 SHA512 856f31033950f5d7cfabb6d6833592bc4c0a88978a23650357a4d80ebf8c6c4caf0941d3c9d6069a1f8c43ff9f0d9a113148107405bab65e83781c7d961c79e1
-EBUILD skk-jisyo-201805.ebuild 1315 BLAKE2B db4e0cf6388f8b08907236fb064248743afc4e001d963c2858b3e2bcc2ac3f337d7e0802742762d0b074f31a639929dd52a54eec44267e6217439631bdc2c5dc SHA512 1b623dd576ab168e6375cb66207028894da3d7f4011ce3f09e18ea46e3ccf3fb55a33cf46f63826d13277b0ed1cce52448362ed584f37a569ab62ff692694b3d
-EBUILD skk-jisyo-999999.ebuild 1609 BLAKE2B f0a40eeaa4e4834b3f6f9d3d0361b7ddccf1ede445a819c7a9854a64f8956bbc775a844ee509bc0d600ccd0a3119dc121fe628977f7fee1e5eed0bd6d69ae53b SHA512 a456906128d32b4bb2fe251738bf34d343c77074c73e6e77f2e2900146505e41360f24d4e87c46482352bb0ee014882c3ecb61a0de4b6482fb4257628c5593ea
+EBUILD skk-jisyo-201805.ebuild 1347 BLAKE2B 562c99ed17a9e0f947b2d73f6cc7958d03be23e3059e42132e5d0cb55a0854345431909c5b06a619e3cfc176419126a37a2aacded7f8e3bb5b99df784dc87931 SHA512 0da12814ce93b9cff23f5b718f5fb99cd1cb900ba2da2141d0f22975d44e0bdbdbf26eab4bd1d34ff599d43938327e7921df91e555f0635ea9b8d54fdd190c2a
+EBUILD skk-jisyo-999999.ebuild 1648 BLAKE2B 93b07b219378be74e87817da306968951b22e92791246672e31b3817911b7a6b25a5e7da68e9cdd5317da6a9fcbee5cccdc2ea7a560da7aa6a5b3791eb1c453b SHA512 28648a723fab209828dc2fde0e664aa444fa4a2327e6308e9ac63a08d9e521008a905520ff68606a123901cb3a18e5d09b7ae24e97140daab8d072ccaff7b289
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/skk-jisyo/skk-jisyo-201805.ebuild b/app-i18n/skk-jisyo/skk-jisyo-201805.ebuild
index 097ef29ed4cb..191cef66c281 100644
--- a/app-i18n/skk-jisyo/skk-jisyo-201805.ebuild
+++ b/app-i18n/skk-jisyo/skk-jisyo-201805.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2 freedist public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="cdb"
 
 DEPEND="virtual/awk
@@ -24,7 +24,7 @@ DEPEND="virtual/awk
 	)"
 RDEPEND=""
 
-DOCS=( ChangeLog{,.{1..3}} READMEs/committers.txt edict_doc.txt zipcode/README.ja )
+DOCS=( ChangeLog{,.{1..3}} READMEs/committers.txt edict_doc.txt )
 
 src_prepare() {
 	rm -f ${MY_PN}.{wrong*,noregist,not_wrong,hukugougo,notes,requested,pubdic+}
@@ -63,4 +63,8 @@ src_compile() {
 src_install() {
 	insinto /usr/share/skk
 	doins {,zipcode/}${MY_PN}.*
+
+	einstalldocs
+	docinto zipcode
+	dodoc zipcode/README.ja
 }
diff --git a/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild b/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
index 5954af57aa56..ff740ab28884 100644
--- a/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
+++ b/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
@@ -28,7 +28,7 @@ DEPEND="${RUBY_DEPS}
 	)"
 RDEPEND=""
 
-DOCS=( ChangeLog{,.{1..3}} committers.txt edict_doc.txt zipcode/README.ja )
+DOCS=( ChangeLog{,.{1..3}} committers.txt edict_doc.txt )
 
 SKKTOOLS_DIR="${EPREFIX}/usr/share/skktools/convert2skk"
 
@@ -78,4 +78,8 @@ src_compile() {
 src_install() {
 	insinto /usr/share/skk
 	doins {,zipcode/}${MY_PN}.*
+
+	einstalldocs
+	docinto zipcode
+	dodoc zipcode/README.md
 }
diff --git a/app-i18n/skkfep/Manifest b/app-i18n/skkfep/Manifest
index 155fb50fd51d..f0f97f1d279b 100644
--- a/app-i18n/skkfep/Manifest
+++ b/app-i18n/skkfep/Manifest
@@ -2,5 +2,5 @@ AUX skkfep-annotation.patch 540 BLAKE2B af0332372b17175124477c494a2f09d0bb688a63
 AUX skkfep-gentoo.patch 1836 BLAKE2B f8430c997bbdd192446e952ebbbb141b7de2b12b10ce6f6e63c7ede577719033b7969e6fde4a685717ea78a6f5e02be3c1f51a3ad058a6f31b6cb60e590822ee SHA512 7af2a73f36277fd99d9ab42e928183be4db00de665d3d4b51b6735ca7cdb9259aa1ecb6572b87732b6af865c7f04122fa3341543d9feea89081a1b53b3e58298
 AUX skkfep-system-dic.patch 325 BLAKE2B 2b13ae10b3be26a5674d69ec558351aed6ee4c56a22141d1220f9840e384b22c65583439e913ac9fddd128cd88fc1695eeb202b495558d0e89b283f1253d000a SHA512 af149e67e9b8fc727404bc67e50eeaf3ba37effccd73cd9416279631bd1c000685c129ddcdbd909ef1d1dbd4e84ac4efb0d3236b988c9c9b9416342edb005254
 DIST skkfep-0.87.tar.gz 45711 BLAKE2B ed2d9a7f779ba09fe71b023de395a37a84be81a7e70de7dcd0b04494c44319f067d19182e762b9a48395c08587b353457ffa8bdb84b5e0526880d6c735ffef53 SHA512 3dc842559640b56b967679042c31bfa889e66cd6b7d0347ec17ddc606b85f2a4bb49dc995b3b38c30e71f500031714e2083bfc028ad4ff76ac4f07476a3f2469
-EBUILD skkfep-0.87-r1.ebuild 904 BLAKE2B 8de72221ca38069420d478006dc4f91b27d4025aff69840ff1830df8327f59c766d3fade0521b393c8a84a4a90dda0510541e617642c480c44508fdd871daf75 SHA512 7694564505e70933e52700e45b75dd2d0b320d6e33b7d44c68d4a83eaa67ab19c0d1a8b9bab472c85771773a0411f67166eb8f1f7389dc810720dbd6e3c81881
+EBUILD skkfep-0.87-r1.ebuild 973 BLAKE2B 50a6ae11dbf2951d4f7cebad647322cd0357c6ae3ce07b1ccfad7ce0f0f7560d0649ca4cce3c25d213a9f57373a99ae19c4c84e991accc7025c8bae792aa2382 SHA512 eb20949d6ef986587acf1a3517cad4fe2c96acea54318e35325c06d0f5569ecd5a7cf3276b2e6c110f6beccefdcf157c65b6f9f62268181810a0b6dad6b2ae49
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/skkfep/skkfep-0.87-r1.ebuild b/app-i18n/skkfep/skkfep-0.87-r1.ebuild
index a74c53e6af37..3a217647e69b 100644
--- a/app-i18n/skkfep/skkfep-0.87-r1.ebuild
+++ b/app-i18n/skkfep/skkfep-0.87-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,12 +11,13 @@ SRC_URI="http://aitoweb.world.coocan.jp/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="sys-apps/sed
 	sys-libs/ncurses:=
-	virtual/awk"
+	virtual/awk
+	virtual/pkgconfig"
 RDEPEND="sys-libs/ncurses:=
 	app-i18n/skk-jisyo"
 
@@ -36,7 +37,8 @@ src_prepare() {
 src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
-		OPTIMIZE="${CFLAGS}"
+		OPTIMIZE="${CFLAGS}" \
+		EXTRALIBS="$($(tc-getPKG_CONFIG) --libs ncurses)"
 }
 
 src_install() {
diff --git a/app-i18n/tagainijisho/Manifest b/app-i18n/tagainijisho/Manifest
index ecde08600287..5179447127a7 100644
--- a/app-i18n/tagainijisho/Manifest
+++ b/app-i18n/tagainijisho/Manifest
@@ -1,7 +1,11 @@
 DIST JMdict-2018-06-12.gz 18306650 BLAKE2B 3ddb29bf631567717085912b1fa21c701e6183c94907f64121daedf358303df09a754bcdf51f24f0d7c95bf1bfe4ea13779f5e3532bd19a3f99a33751259a893 SHA512 cd8e0a737ccd1ccbe7c53ab0affb5d4ca068656966c75f0abbc184ffcdc69d8a1dbe0f096a16f0b59ecaed40371a29e566ee5076a7e80e3f51796e32798bed3e
+DIST JMdict-2019-10-01.gz 19418133 BLAKE2B a7f3fb45fafaa0d5fdaa7366d2d299cd872edfc6834743529604cb2803f60112daccf82b6c48db0e100b52fb31b1fe2705369fb8a1c2b83c0eba65176ef59d90 SHA512 033968dfc3504611db23269361d72564fbf81a59d7f1ed94f4303c51748f4f31a2b38b3c2a6d846941a886f357d5dd320bc0f043a151ac1c70e43df9c594a599
 DIST kanjidic2-2018-06-12.xml.gz 1482391 BLAKE2B c6f1d18f17b2107937fe07b77d6aa297d156d9c250cdc480000aeb7f8c9cd27a94e2cce1df80e4612d1bcadc94d92d5d013cfc8d923c5ceaba9ed5b0a692ae78 SHA512 700aba18e18ab271dbc583f1a1cc16dd7209e4aa48417201f0b51723d35f5aedcff299ed1503cb743151abce37c94c0facbab09dd0a46126131bb54f2004aa23
+DIST kanjidic2-2019-10-01.xml.gz 1482675 BLAKE2B faf2ce4367796b18c3e858ef05203610810e38e44cf3b6e06fceda4204809fd366f6c16604618bf8b668761c9ac2045ed18484a374f2648cc88ba43fa5e5eb7b SHA512 aff301e824a1c31ff4850f709ee6c4ee6a0a54aa4823a5fcb0c5419d7b96239c16bd091f5557f02e2b7c3d0ced8cb2ae19805723c46f9a3a906adecc20ec631c
 DIST kanjivg-20160426.xml.gz 3587660 BLAKE2B c85291f3671f0980186e8deb296cfa743322df438d6f09fd69a4f5a30c3db6f097d6ff0a817b88c5c9a2c8d4a40c90b31c0a54cb71d681849b557ee364707c48 SHA512 1d35a8cc5d4947f6bedfc71a2f08e2d1fda832d7a02588c00953e1746812b0e51d4d1c39dff49999b4f65ec850788359f6e0d1465f0e688b1bf753c4c67b3c54
 DIST tagainijisho-1.2.0_pre20180610092832.tar.gz 3634107 BLAKE2B f5cb75f45fced30c64f615147c3eb7e4d473e81dd734517710bcfdf390d1a34a1780196b6dbbb7a6d297df0bb8d73933d09a76eb6b8dd13d1c0759c562e81695 SHA512 3b17ff6972e3cfd35f4f9e8c575153a4c2021a66a238f631616452a16a151d604106586d438cdc574211bff54118d89e492f9460da4b25fef88a2354b0bd8555
+DIST tagainijisho-1.2.0_pre20190507124027.tar.gz 3634210 BLAKE2B ec11eba3e20f2a1d55b24c67b95bd98d9ec96a7476533bc42d56866c87f03fd8d58133b5f6aa4e6f37a7ca4dd8b447a0414f0b9651adaa6fb0141c6df4b61073 SHA512 ace6fd4ff46d1bea329f3c85ea6df63583f256d5a26b78e3d64d47be2a37f74b262c0b6254fad4b258b6bb1cb3eff3bb4a4ed712f9ee72f21810717ce1a8f3d8
 EBUILD tagainijisho-1.2.0_pre20180610092832.ebuild 6180 BLAKE2B ac53048f5508366e943275fdf19ce7dfc7e5ccc4d228608d57828098911a5219ac89b0f4f5450cfba87dadd06fcde209438834e4264286b257cf98dba6e26bad SHA512 8ed6439eae16cea8e714fe8a5de659286414bbaffccc6b3c9a0c79d33a36534039b6a56a5e8fa936556a9264c2e4b164841ced3c3805f21da82928621198baab
-EBUILD tagainijisho-9999.ebuild 6109 BLAKE2B 0d10127700103382266b6606877e92de3205bac43a795a93bb30ed1c4d89c9f6bf2612a51e4e3bf3d92e611f3b1d1959c56cf2f5f34214220a80eb21fe72a5c6 SHA512 55c11b49c483b7654539a5627e44ee65111569be3fdc45c10f0db4600e09c0eef02c2f800337449f77a53b1c51ce01790d3c18b41945499d518b4f5a28883d32
+EBUILD tagainijisho-1.2.0_pre20190507124027_p20191001_p20191001.ebuild 6662 BLAKE2B 08869518725b5f883b75e2fbb1520c1db6c77ecafcd18dfb702b4c887103583f0def09895a0c62b2b64afb9597ec10bab9220d5ed1276c245434d4bd217564f4 SHA512 cf8efd353a6e9df25b4f198026c83b788a66f8b4a1b61dfddd3b77eb474a821fc4361a49c7b69905e268dedf59427cfe609fd97b690eaea67dfab230232aeb85
+EBUILD tagainijisho-9999.ebuild 6611 BLAKE2B 49eb2ad3a99a2cae8097c3fbe54f99b7d63fe1ba2b88793bfe9a57f38afc04ae4ccd5297642603cc55203ec461d2b56885cf0a504c75b9319194df878d27b752 SHA512 ff98dc941da2ae88e664564a5fbf674e75f5da2e8d1501dac23c294bc1ed718f6b8e7252c9e889cc9b3519217b9a2b37a5e6f38dd828dce7f269296af316311d
 MISC metadata.xml 1133 BLAKE2B 863fcd0cbb85b715cf7666210c74a9e88423b0e982b3e05b4333036b607e4d2cf73b35dc6b8f5e549a35a6d8e2cc107f110f3500762d49065bd1ed2097dd6338 SHA512 cde2818f44f02091ac994ca049a25b90519b62b669b7923a52043df23a0de7f3e1f657d3080e574048556dbacd5521995addd35267ec9d1357360f473222cef7
diff --git a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20190507124027_p20191001_p20191001.ebuild b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20190507124027_p20191001_p20191001.ebuild
new file mode 100644
index 000000000000..9f4d2eb48253
--- /dev/null
+++ b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20190507124027_p20191001_p20191001.ebuild
@@ -0,0 +1,200 @@
+# Copyright 2014-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake-utils xdg-utils
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/Gnurou/tagainijisho"
+elif [[ "${PV}" == *_pre* ]]; then
+	inherit vcs-snapshot
+
+	TAGAINIJISHO_GIT_REVISION="d189cfcb389b8b7f481ea452fcdf1987514d60d7"
+fi
+if [[ "${PV}" != 9999 ]]; then
+	TAGAINIJISHO_VERSION="${PV%_p*_p*}"
+	JMDICT_DATE="${PV#${TAGAINIJISHO_VERSION}_p}"
+	JMDICT_DATE="${JMDICT_DATE%_p*}"
+	JMDICT_DATE="${JMDICT_DATE:0:4}-${JMDICT_DATE:4:2}-${JMDICT_DATE:6}"
+	KANJIDIC2_DATE="${PV#${TAGAINIJISHO_VERSION}_p*_p}"
+	KANJIDIC2_DATE="${KANJIDIC2_DATE:0:4}-${KANJIDIC2_DATE:4:2}-${KANJIDIC2_DATE:6}"
+fi
+if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then
+	KANJIVG_VERSION="20160426"
+fi
+
+DESCRIPTION="Open-source Japanese dictionary and kanji lookup tool"
+HOMEPAGE="https://www.tagaini.net/ https://github.com/Gnurou/tagainijisho"
+if [[ "${PV}" == 9999 ]]; then
+	SRC_URI=""
+elif [[ "${PV}" == *_pre* ]]; then
+	SRC_URI="https://github.com/Gnurou/${PN}/archive/${TAGAINIJISHO_GIT_REVISION}.tar.gz -> ${PN}-${TAGAINIJISHO_VERSION}.tar.gz"
+else
+	SRC_URI="https://github.com/Gnurou/${PN}/releases/download/${PV}/${PN}-${TAGAINIJISHO_VERSION}.tar.gz"
+fi
+if [[ "${PV}" != 9999 ]]; then
+	# Upstream: http://ftp.monash.edu.au/pub/nihongo/JMdict.gz
+	SRC_URI+=" https://home.apache.org/~arfrever/distfiles/JMdict-${JMDICT_DATE}.gz"
+	# Upstream: http://www.edrdg.org/kanjidic/kanjidic2.xml.gz
+	SRC_URI+=" https://home.apache.org/~arfrever/distfiles/kanjidic2-${KANJIDIC2_DATE}.xml.gz"
+fi
+if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then
+	SRC_URI+=" https://github.com/KanjiVG/kanjivg/releases/download/r${KANJIVG_VERSION}/kanjivg-${KANJIVG_VERSION}.xml.gz"
+fi
+
+LICENSE="GPL-3+ public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+if [[ "${PV}" == 9999 ]]; then
+	PROPERTIES="live"
+fi
+
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND=">=dev-db/sqlite-3.12:3
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+pkg_langs=(ar cs de es fa fi fr hu id it nb nl pl pt ru sv th tr uk vi zh)
+IUSE+=" ${pkg_langs[@]/#/l10n_}"
+unset pkg_langs
+
+if [[ "${PV}" != 9999 ]]; then
+	S="${WORKDIR}/${PN}-${TAGAINIJISHO_VERSION}"
+fi
+
+src_unpack() {
+	if [[ "${PV}" == 9999 ]]; then
+		git-r3_src_unpack
+	elif [[ "${PV}" == *_pre* ]]; then
+		unpack ${PN}-${TAGAINIJISHO_VERSION}.tar.gz
+		mv ${PN}-${TAGAINIJISHO_GIT_REVISION} ${PN}-${TAGAINIJISHO_VERSION} || die
+	else
+		unpack ${PN}-${TAGAINIJISHO_VERSION}.tar.gz
+	fi
+
+	if [[ "${PV}" == 9999 ]]; then
+		# JMdict.gz and kanjidic2.xml.gz are updated once per day.
+
+		local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+		local today="$(TZ="UTC" date --date=today "+%Y-%m-%d")"
+		local yesterday="$(TZ="UTC" date --date=yesterday "+%Y-%m-%d")"
+
+		if [[ -f ${distdir}/JMdict-${today}.gz && -s ${distdir}/JMdict-${today}.gz ]]; then
+			# Use previously downloaded file from today.
+			JMDICT_DATE="${today}"
+		elif [[ -f ${distdir}/JMdict-${yesterday}.gz && -s ${distdir}/JMdict-${yesterday}.gz ]]; then
+			# Use previously downloaded file from yesterday. File from today may still be nonexistent.
+			JMDICT_DATE="${yesterday}"
+		else
+			# Download file from today or yesterday.
+			wget http://ftp.monash.edu.au/pub/nihongo/JMdict.gz -O JMdict.gz || die
+			JMDICT_DATE="$(gzip -cd JMdict.gz | grep -E "^<!-- JMdict created: [[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2} -->$" | sed -e "s/.*\([[:digit:]]\{4\}-[[:digit:]]\{2\}-[[:digit:]]\{2\}\).*/\1/")"
+			if [[ ${JMDICT_DATE} != ${today} && ${JMDICT_DATE} != ${yesterday} ]]; then
+				die "Unexpected date in JMdict.gz: '${JMDICT_DATE}'"
+			fi
+			(
+				addwrite "${distdir}"
+				mv JMdict.gz "${distdir}/JMdict-${JMDICT_DATE}.gz" || die
+			)
+		fi
+		einfo "Date in JMdict.gz: '${JMDICT_DATE}'"
+
+		if [[ -f ${distdir}/kanjidic2-${today}.xml.gz && -s ${distdir}/kanjidic2-${today}.xml.gz ]]; then
+			# Use previously downloaded file from today.
+			KANJIDIC2_DATE="${today}"
+		elif [[ -f ${distdir}/kanjidic2-${yesterday}.xml.gz && -s ${distdir}/kanjidic2-${yesterday}.xml.gz ]]; then
+			# Use previously downloaded file from yesterday. File from today may still be nonexistent.
+			KANJIDIC2_DATE="${yesterday}"
+		else
+			# Download file from today or yesterday.
+			wget http://www.edrdg.org/kanjidic/kanjidic2.xml.gz -O kanjidic2.xml.gz || die
+			KANJIDIC2_DATE="$(gzip -cd kanjidic2.xml.gz | grep -E "^<date_of_creation>[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}</date_of_creation>$" | sed -e "s/.*\([[:digit:]]\{4\}-[[:digit:]]\{2\}-[[:digit:]]\{2\}\).*/\1/")"
+			if [[ ${KANJIDIC2_DATE} != ${today} && ${KANJIDIC2_DATE} != ${yesterday} ]]; then
+				die "Unexpected date in kanjidic2.xml.gz: '${KANJIDIC2_DATE}'"
+			fi
+			(
+				addwrite "${distdir}"
+				mv kanjidic2.xml.gz "${distdir}/kanjidic2-${KANJIDIC2_DATE}.xml.gz" || die
+			)
+		fi
+		einfo "Date in kanjidic2.xml.gz: '${KANJIDIC2_DATE}'"
+
+		mkdir "${S}/3rdparty" || die
+		gzip -cd "${distdir}/JMdict-${JMDICT_DATE}.gz" > "${S}/3rdparty/JMdict" || die
+		gzip -cd "${distdir}/kanjidic2-${KANJIDIC2_DATE}.xml.gz" > "${S}/3rdparty/kanjidic2.xml" || die
+	else
+		mkdir "${S}/3rdparty" || die
+		pushd "${S}/3rdparty" > /dev/null || die
+
+		unpack JMdict-${JMDICT_DATE}.gz
+		mv JMdict-${JMDICT_DATE} JMdict || die
+
+		unpack kanjidic2-${KANJIDIC2_DATE}.xml.gz
+		mv kanjidic2-${KANJIDIC2_DATE}.xml kanjidic2.xml || die
+
+		popd > /dev/null || die
+	fi
+
+	if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then
+		pushd "${S}/3rdparty" > /dev/null || die
+
+		unpack kanjivg-${KANJIVG_VERSION}.xml.gz
+		mv kanjivg-${KANJIVG_VERSION}.xml kanjivg.xml || die
+
+		popd > /dev/null || die
+	fi
+}
+
+src_configure() {
+	# GUI linguae
+	# en is not optional, and build fails if none other than en is set, so adding ja as non-optional too.
+	local lang use_lang
+	for lang in i18n/*.ts; do
+		lang=${lang#i18n/tagainijisho_}
+		lang=${lang%.ts}
+		case ${lang} in
+			fa_IR|fi_FI|pt_BR)
+				# Use generic tags.
+				use_lang=${lang%%_*}
+				;;
+			*)
+				use_lang=${lang}
+				;;
+		esac
+
+		if [[ ${lang} != en && ${lang} != ja ]] && ! use l10n_${use_lang}; then
+			rm i18n/tagainijisho_${lang}.ts || die
+		fi
+	done
+
+	# Dictionary linguae
+	# en is not optional here either, but nothing special needs to be done.
+	local dict_langs
+	for lang in $(sed -e 's/;/ /g' -ne '/set(DICT_LANG ".*")/s/.*"\(.*\)".*/\1/p' CMakeLists.txt); do
+		if use l10n_${lang}; then
+			dict_langs+="${dict_langs:+;}${lang}"
+		fi
+	done
+
+	local mycmakeargs=(
+		-DDICT_LANG="${dict_langs:-;}"
+		-DEMBED_SQLITE=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-i18n/tagainijisho/tagainijisho-9999.ebuild b/app-i18n/tagainijisho/tagainijisho-9999.ebuild
index 11c02a413f1c..ca0b9b195131 100644
--- a/app-i18n/tagainijisho/tagainijisho-9999.ebuild
+++ b/app-i18n/tagainijisho/tagainijisho-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2014-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
 
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
@@ -14,9 +14,15 @@ elif [[ "${PV}" == *_pre* ]]; then
 
 	TAGAINIJISHO_GIT_REVISION=""
 fi
+if [[ "${PV}" != 9999 ]]; then
+	TAGAINIJISHO_VERSION="${PV%_p*_p*}"
+	JMDICT_DATE="${PV#${TAGAINIJISHO_VERSION}_p}"
+	JMDICT_DATE="${JMDICT_DATE%_p*}"
+	JMDICT_DATE="${JMDICT_DATE:0:4}-${JMDICT_DATE:4:2}-${JMDICT_DATE:6}"
+	KANJIDIC2_DATE="${PV#${TAGAINIJISHO_VERSION}_p*_p}"
+	KANJIDIC2_DATE="${KANJIDIC2_DATE:0:4}-${KANJIDIC2_DATE:4:2}-${KANJIDIC2_DATE:6}"
+fi
 if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then
-	JMDICT_DATE=""
-	KANJIDIC2_DATE=""
 	KANJIVG_VERSION="20160426"
 fi
 
@@ -25,15 +31,13 @@ HOMEPAGE="https://www.tagaini.net/ https://github.com/Gnurou/tagainijisho"
 if [[ "${PV}" == 9999 ]]; then
 	SRC_URI=""
 elif [[ "${PV}" == *_pre* ]]; then
-	SRC_URI="https://github.com/Gnurou/${PN}/archive/${TAGAINIJISHO_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/Gnurou/${PN}/archive/${TAGAINIJISHO_GIT_REVISION}.tar.gz -> ${PN}-${TAGAINIJISHO_VERSION}.tar.gz"
 else
-	SRC_URI="https://github.com/Gnurou/${PN}/releases/download/${PV}/${P}.tar.gz"
+	SRC_URI="https://github.com/Gnurou/${PN}/releases/download/${PV}/${PN}-${TAGAINIJISHO_VERSION}.tar.gz"
 fi
-if [[ "${PV}" == *_pre* ]]; then
+if [[ "${PV}" != 9999 ]]; then
 	# Upstream: http://ftp.monash.edu.au/pub/nihongo/JMdict.gz
 	SRC_URI+=" https://home.apache.org/~arfrever/distfiles/JMdict-${JMDICT_DATE}.gz"
-fi
-if [[ "${PV}" == *_pre* ]]; then
 	# Upstream: http://www.edrdg.org/kanjidic/kanjidic2.xml.gz
 	SRC_URI+=" https://home.apache.org/~arfrever/distfiles/kanjidic2-${KANJIDIC2_DATE}.xml.gz"
 fi
@@ -45,27 +49,34 @@ LICENSE="GPL-3+ public-domain"
 SLOT="0"
 KEYWORDS=""
 IUSE=""
+if [[ "${PV}" == 9999 ]]; then
+	PROPERTIES="live"
+fi
 
-RDEPEND=">=dev-db/sqlite-3.12:3
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND=">=dev-db/sqlite-3.12:3
 	dev-qt/qtcore:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtwidgets:5"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
+RDEPEND="${DEPEND}"
 
 pkg_langs=(ar cs de es fa fi fr hu id it nb nl pl pt ru sv th tr uk vi zh)
 IUSE+=" ${pkg_langs[@]/#/l10n_}"
 unset pkg_langs
 
+if [[ "${PV}" != 9999 ]]; then
+	S="${WORKDIR}/${PN}-${TAGAINIJISHO_VERSION}"
+fi
+
 src_unpack() {
 	if [[ "${PV}" == 9999 ]]; then
 		git-r3_src_unpack
 	elif [[ "${PV}" == *_pre* ]]; then
-		unpack ${P}.tar.gz
-		mv tagainijisho-${TAGAINIJISHO_GIT_REVISION} ${P} || die
+		unpack ${PN}-${TAGAINIJISHO_VERSION}.tar.gz
+		mv ${PN}-${TAGAINIJISHO_GIT_REVISION} ${PN}-${TAGAINIJISHO_VERSION} || die
 	else
-		unpack ${P}.tar.gz
+		unpack ${PN}-${TAGAINIJISHO_VERSION}.tar.gz
 	fi
 
 	if [[ "${PV}" == 9999 ]]; then
@@ -118,7 +129,7 @@ src_unpack() {
 		mkdir "${S}/3rdparty" || die
 		gzip -cd "${distdir}/JMdict-${JMDICT_DATE}.gz" > "${S}/3rdparty/JMdict" || die
 		gzip -cd "${distdir}/kanjidic2-${KANJIDIC2_DATE}.xml.gz" > "${S}/3rdparty/kanjidic2.xml" || die
-	elif [[ "${PV}" == *_pre* ]]; then
+	else
 		mkdir "${S}/3rdparty" || die
 		pushd "${S}/3rdparty" > /dev/null || die
 
@@ -181,9 +192,9 @@ src_configure() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/unicode-cldr/Manifest b/app-i18n/unicode-cldr/Manifest
index 4cdfc82c3cdb..a138cf47bfe7 100644
--- a/app-i18n/unicode-cldr/Manifest
+++ b/app-i18n/unicode-cldr/Manifest
@@ -2,6 +2,6 @@ DIST unicode-cldr-common-31.0.1.zip 16370865 BLAKE2B 46e941471074116eb00ba81848b
 DIST unicode-cldr-common-33.0.zip 20401984 BLAKE2B 1318f8c73678f4ed2ff6a2d947171515d52825c2395e77c8149fb6a5646110876dd8e1bc30a3b918cb25c4bf106b42fe2a372a9938ff0dbf106cf0d7dc33d75a SHA512 f2f9fa5242702fd8044c9b239e175b7ead41e36da39c9e67e70b4fde7ed5d28115141ea457cda4f645b10a2d29734b35590bd0f012296bdf4986a920b87532dd
 DIST unicode-cldr-common-35.1.zip 22368309 BLAKE2B 3d00bafccca8d0b8821083fdf94440adca6f8931951de33f5914308bccddaf5c3b642d59c2b7d04588995c9a284852677ae3ab2feeb9fe531e7479d08f4ee7be SHA512 e06594da3d6dc376457e507fe234281fcb04d08daabfdaed60afb3aa59f88cdc0a7c27974c52ebd432746fcc7664948f9d6e6fde5874ad85c6c73a6441425465
 EBUILD unicode-cldr-31.0.1.ebuild 496 BLAKE2B 8df1bcb6bbc05a9177c20aab6337a752e65d21ac11993aaa85a48025f5e196eb151a09dd3525ee76ffdae1710c0ff399fe6428dbada25ae89d83f64300b445ff SHA512 93ba56c3abf39bc27c7d825c63255fcea2c1c2d942b3984fd5a98cd911399f5ac4002e1e89972ca5495e9787cba266d0ce82f4d83ff9699d4c33bce90a02a880
-EBUILD unicode-cldr-33.0.ebuild 705 BLAKE2B 73ea6797b4239c42a965749a75c0b3518010604f4b00a9d644ee4ed88cc73dfab1538da90e7715997695e3e43e7ac5499e84ffd82cad40bf6e43f7827291047a SHA512 dbbcedd585bcb20a8371dccc438dcd9af8653f211bb2514b30723326153d438a30477cec3619dcd9d31a51e1382dc0badb3219025895bc289f3ed47cc0bf9495
-EBUILD unicode-cldr-35.1.ebuild 714 BLAKE2B 660aa4e4733954759697589d9c6bdfeecafd650e29c67d2b3b70030cfef9d757c46d2ce0308c424520ea551fef793bdc383004b4b628c44cb21ec333efe07120 SHA512 a67513fd77f045cbf113baacc41a24e3637c9765719b26db0fb47f7ae44bccfccb4c4f5895253334fd2844978f6dff67fd5dabc7007863f338f92b715734ab28
+EBUILD unicode-cldr-33.0.ebuild 683 BLAKE2B ef342c11738c8e801b0867abc0d28a3e04d6782201ddf3c2d58e6c902ccc53189033f66ae749f86f2dd9485e8ff5d338decdd2e655f0a1bb928a70b73e24c6b0 SHA512 87c1ad72bf85f7eb3ed81fafebe1c65cbe44b59994354dbdf2bb85d38bb36355fc30e490198139a5b51b1157003092e1a4cc37d9ca8ec22943a468b8f2f8ea35
+EBUILD unicode-cldr-35.1.ebuild 692 BLAKE2B d97dbe12a6e6f6a9df84253f71f65b2eed95851e56dc99d3a4b27ea63c844848cfb0d2b588841e056305157650d9e31c2a790772b5deba39e5dc973fdd93ec8c SHA512 6899ab659b5b52e4fa814efa6bea6b55669d3eccae1e97561bcedd8d74efcd007b4f3a8e78f8ea815614353e08442859e003a120bc18706e2e553d7bf16b0b08
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild b/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
index 89f7987b2c63..1834d8672123 100644
--- a/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
+++ b/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
@@ -13,7 +13,7 @@ fi
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-i18n/unicode-cldr/unicode-cldr-35.1.ebuild b/app-i18n/unicode-cldr/unicode-cldr-35.1.ebuild
index b79862fb4e50..cb5a1743d529 100644
--- a/app-i18n/unicode-cldr/unicode-cldr-35.1.ebuild
+++ b/app-i18n/unicode-cldr/unicode-cldr-35.1.ebuild
@@ -13,7 +13,7 @@ fi
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-i18n/unicode-data/Manifest b/app-i18n/unicode-data/Manifest
index 7ea58c18a9d1..6f8ee99d520e 100644
--- a/app-i18n/unicode-data/Manifest
+++ b/app-i18n/unicode-data/Manifest
@@ -8,9 +8,9 @@ DIST unicode-data-12.1.0-UCD.zip 8410738 BLAKE2B b635b449a04f3ffed8ec7311064cf20
 DIST unicode-data-12.1.0-Unihan.zip 6749737 BLAKE2B a6caeb86f5c9dc13bc265c81acaa8ae791fdc8dbf728d3fba7a7004edcfbfa655424371cd4c9e667e1f1d6a5623b0ac1d320f0709c232b58b02494a728c7d2dd SHA512 7fdefad078284c14a9105655d1cb4d2b0dc1c89c56effe92ffcbd5a30b325559a56d97574b6077144d7a4ed02df6e6a402a2a5360e4abc0c84bae5c589044375
 DIST unicode-data-9.0.0-UCD.zip 5655592 BLAKE2B bacfd82142e2327d5633a927d6283d1bf3d43d0476b43ca5b23190abafba5aec3f29a59f096a651acc320a7bbf5f511aaa39e1f09b9fe24e96b0623610bec6a0 SHA512 e9bdf8ed6647b4d0bd83c6fcd885cb450fddbf84dac376e9771bddbb7ee1e8ea1ca8c2ca79e23832c26a4819dd62f86fcfa6eb6a1fcc7294185f5bc78be8fa2a
 DIST unicode-data-9.0.0-Unihan.zip 6558824 BLAKE2B 18900bacb9ec84eef99758a1647f657685f2fc40d705b7cd8f88ea727d9494aab38cf4d40829d52afca7c11087e6b2b2c03547c14980b7d206ba241bff3d3e47 SHA512 9856d30afe5d7b0b088bde36c12431eae267992b315944ca8a7ddb3559adee7474fedd2d0d6b22716439f9cddad573a4bb45c6209036b0066a85fbd19412852e
-EBUILD unicode-data-10.0.0.ebuild 805 BLAKE2B 541f56221efd9e3e525ddd8812c3f417f254ec51550fb42ccbb7f73b8ba470e77769c991c0e5eec5471827ed275f4a2578ebf39c48ed5bae0b71942bfd5214c7 SHA512 9b4edc49c53726cc5daf1a243605956a70469976d6bb1d631032be5cc2beb11298271d180928dac2f66f4db4cbf228858ba56484a39f72262065210cae5c4be9
-EBUILD unicode-data-11.0.0.ebuild 802 BLAKE2B a64cb2b75c1fa941c00cddc85ad04970a5322b5fcd589315bcbbf5188f3a52b7427e1306c273900a70bd3cbd9adea388903ad76592e845789ad6744558c49e13 SHA512 0ccbc6f2a2dff02b5fc72e28e2e87b378001f20415e5ef00384f70f3b17e63d59420ab53a85cb1fa0a5dde0b20475eb72bfe327f14ea8b7571c6917ce080f58b
-EBUILD unicode-data-12.0.0.ebuild 801 BLAKE2B 03580aa0bcb94d89a74bceca03253a4be1dd8fc461b3d027d337853b05e00b9a16cc509d454b851302e8f0b2c7dae41ea4260bd9eebb1b02b33b68d2d0e99fb6 SHA512 9a39d83b76dd8e2f1c1c7c93f27f7bb967597590802b4acd36693b9f5f1298ffef5c24b3d13e9758ba952efb93c6158a319d4dbd37589ae3565f6bc9dee6736b
-EBUILD unicode-data-12.1.0.ebuild 815 BLAKE2B 8be607c4cdd73b237e95930c822b4dd0f9e26f51478535ac818bff7ceb1cc6c07a007498994937946679eb24fcc26523ca2cd007f64ad53e54f0287bee225152 SHA512 16a0eabc8686cbe00b58daf73019eaa4aa11e3503c930847eb75c2538c187bc0780fb5ded0d805585113e1251e6fc2fcaab4f4a01ab41f037a3ee2aec72abdf8
-EBUILD unicode-data-9.0.0.ebuild 799 BLAKE2B c384b186534f8d15cb0531293d091231b8594148500d7e620be5e4915a3b1b7ca8a4018f8d0dc660d438b2216c507f8aa92b1ebfd701224857bd9e29311c1c4d SHA512 3138843b7a6df197b6394e4b521f41c1e7351f615b037ed6a7a0fe7f7a8534ca45cc0161939516dc00c1b16ca70feacabe9e11c621ecb57d4fdcf7f47afd00e0
+EBUILD unicode-data-10.0.0.ebuild 783 BLAKE2B 694d96d98904a7048f23ef2719e8c4e492d4f65153b50c267ad07f5898e68112a2fe401ce5e526efedf2ba9dd691c8af7ea5bbf6703425214c9d378dfb54ce23 SHA512 7651df6a8ca62271803f7302d307b15c07c8eca7ebf411459cb12ce052720d859ebe3367f9d03e10a5d76cecbf409c31407c6369576e9d76d54e7bc1d4f0300d
+EBUILD unicode-data-11.0.0.ebuild 780 BLAKE2B 464876ef4b83cdf6892e4d0dcfa20a996ea93aae44c9c93a0cceff98f1b35c6fd2e0c408e3d4c9ebc03f5fc162be39a4900c47a4c3a0e31ec2a513c3ef7b7b54 SHA512 f5ed010833993db3afb73d14322fbe2c34dfa5ce7ed4531e2afeb3a6603cc5cb38bcad98cf77f37fa68eb0a83b818085f579fbe3b2a47dc9f981e6dc7893f61f
+EBUILD unicode-data-12.0.0.ebuild 779 BLAKE2B df016b272de79fbb8f4e35c547838b12cfee3a6aa73cef3faae1b22f22702567d3d9958009501c892e602d76da979fba646d96cf25015bfa97e8d240533be5b4 SHA512 cc60afd9127552a9522b1907ae2db7bc927684a9b05cb5ee4c65d074517cced8f73796ae207a0ec6d0c11321228d58e57a8f493d0efce2107dabe92576be242a
+EBUILD unicode-data-12.1.0.ebuild 793 BLAKE2B fab2098bcc5c34446b048cddeba1bd970a99750ebca3597159ad0f2cbd6cfa745c09808a5cf4c5078984c40761d6fef278dc72430fe004d90ae5d74ffeda4e34 SHA512 33d7b60d03ca917850900b980dce4a2b1e9798466ccc5075d3f467d233ee6288b461d6b3d1efd0feb336c5d1b72f3eb4705ad94dc7efe2f01b93ccaaf2de96da
+EBUILD unicode-data-9.0.0.ebuild 777 BLAKE2B 794eab2fc85ede44296e472ab578dc5e1b49e40411e3212a024f95bd5d96588c88d5f5e6aab17428c057f3c8d3b90a813db6946c2424c0ec61ae4ec3b580853e SHA512 557dbc6b7668a8fc71e250f6adbebd58bcde0f3a57aed13c6378c824155fae6bb0022ac86c4f616d10d18e341efbe9168bd8f569f4b85aa52db4049d5c8729cd
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/app-i18n/unicode-data/unicode-data-10.0.0.ebuild b/app-i18n/unicode-data/unicode-data-10.0.0.ebuild
index 9a963e92fa63..55718a614238 100644
--- a/app-i18n/unicode-data/unicode-data-10.0.0.ebuild
+++ b/app-i18n/unicode-data/unicode-data-10.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-i18n/unicode-data/unicode-data-11.0.0.ebuild b/app-i18n/unicode-data/unicode-data-11.0.0.ebuild
index 81caaa932567..6a3b6f1680fe 100644
--- a/app-i18n/unicode-data/unicode-data-11.0.0.ebuild
+++ b/app-i18n/unicode-data/unicode-data-11.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-i18n/unicode-data/unicode-data-12.0.0.ebuild b/app-i18n/unicode-data/unicode-data-12.0.0.ebuild
index dad13b4d6cf0..0ee1c00fa55a 100644
--- a/app-i18n/unicode-data/unicode-data-12.0.0.ebuild
+++ b/app-i18n/unicode-data/unicode-data-12.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-i18n/unicode-data/unicode-data-12.1.0.ebuild b/app-i18n/unicode-data/unicode-data-12.1.0.ebuild
index c6c8d2f851f7..b4b5023a9867 100644
--- a/app-i18n/unicode-data/unicode-data-12.1.0.ebuild
+++ b/app-i18n/unicode-data/unicode-data-12.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-i18n/unicode-data/unicode-data-9.0.0.ebuild b/app-i18n/unicode-data/unicode-data-9.0.0.ebuild
index 937e1ac1e114..c4b5e5dec71c 100644
--- a/app-i18n/unicode-data/unicode-data-9.0.0.ebuild
+++ b/app-i18n/unicode-data/unicode-data-9.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-i18n/unicode-emoji/Manifest b/app-i18n/unicode-emoji/Manifest
index b55370298012..06a0f772c878 100644
--- a/app-i18n/unicode-emoji/Manifest
+++ b/app-i18n/unicode-emoji/Manifest
@@ -13,7 +13,7 @@ DIST unicode-emoji-variation-sequences-5.0.txt 36120 BLAKE2B 50e19bd7147486437dc
 DIST unicode-emoji-zwj-sequences-11.0.txt 126959 BLAKE2B 82d78fd5fd47bb4201001903c0610e3950a2fa1c315fe8494e15977999ba0b8f0d4431eb842db6f01ab765fd181067b07258ddb4c547ddfc01fc0da7680ea540 SHA512 a2a50cd5451d3ba1da0f3b46e18a10d621ead0372599b98dad0fd47fdb271407f72bd72854136c93311b13950cedc2b1594f06d460e551ab120ed30ba8abce4d
 DIST unicode-emoji-zwj-sequences-12.0.txt 148234 BLAKE2B d5facf566e48f49f87df30b928b4d60cfeafa11da383aa34cefae0b05a796f3a9c78bbaa79ee8b460eea92c753b7e7d7840849fdc9f7bc57b2752f8b63d2988c SHA512 8d7c59d01d702d10f162476d7f96feea0d515521d1dca6aa819ed4d482a83d54c26ed225fcf864b607999a7016dddc89961b0760584d7ec0b5cbdf8e12b85051
 DIST unicode-emoji-zwj-sequences-5.0.txt 115207 BLAKE2B beb8f304be16ffe34fde4cab20bfb981f3ae61ffc6827ced0b3160de7e405459fdf38c6e7fcafdd3887da16da7870b84520f1c68e661480efbd0cb9510a04649 SHA512 26398ac77035d2f5df7a61f4c2a8a098af8e551576c9c9f157379c05aa8f75de5a0827c9bc476eb20f32c38b0c3605f6a1d9e07fe27f0e75df359ed2a7e6d25b
-EBUILD unicode-emoji-11.0.ebuild 1019 BLAKE2B eaf29ee5adc2ef74b2d7b74d57fbb7a97665d89ff092e7f5c93df72b7891d32b6e1ef078c2fb2259aba912bf9fd4b8a3a6fff21c5ca8495ecfa48bcf580073dc SHA512 3db83763f3415b6f8ede1ff61ae781ea8cbf3ebe4188a64ec773cde558ba9ce54cc09425ec44ec7377a78b8f28dc92773d5861d9853f806267e005899e5d4519
-EBUILD unicode-emoji-12.0.ebuild 1028 BLAKE2B ae016b05e8c3730ed541a54d0d3b394f1d54fda85bab777e1fc690532c4afde6b03ae5a496a619d1a63b9340646af84945e3bf9821473184e3b5a29636dab6a9 SHA512 8ff247a3fd2c1cee31ef9b46b1283463d69641f97233aad86b3e2ffaf5680fecd9208b2b38ef98902a3900ce606b8e375169c3d3b600d2998f202902295f4eb2
+EBUILD unicode-emoji-11.0.ebuild 997 BLAKE2B 030615646e0c20d155fe48ae276f9cfd743240c2e574d8e2f0b028b79931cb4a7b4004599f864b4438df186bbf2985f9474f263df2bb082ba855f5f3e90a483d SHA512 75fdf0cfea9aaebcede5fd4951e1ba41cd1d1dfa680bd3043216ad55ca3741c6f1daea09912330d92b56890f4181bcea437ff489e52922a3914a5380d7b7ef41
+EBUILD unicode-emoji-12.0.ebuild 1006 BLAKE2B 25297006b65daead9be9df4871a0909c02851b3b2244856d2ff430ff04a33f8cc9c9796f36019412fafe42eca01575a2954cd009c86f9a20c836fbd1ea236c52 SHA512 dc3cf5e6e0aa9ecb8dcdb352c7a082e6a05c92b87b068c4846f7a3840c4eb4e6adaf708d094eed579c8d3e1160e82798975c710c645b9e920da2343b27d404ca
 EBUILD unicode-emoji-5.0.ebuild 880 BLAKE2B 08d91ce21e632d7a1befe8be1ca4495ece3e56d38d9bf2f062d086ebe10c0b8db89d021ddde659f0c1a383edfae80bdc5becbcd0ca37c7edc158c1d93ef8775a SHA512 b23eae90ba1df31c6965028ebc6d9b0f3064cfdb16f1069a7774e20ea61780bc4b4c086113f45aaa7e5aa00c4501782ed01972186cb5b753b61d9b33dbc328c5
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
index 1180358b305e..eec5f1794e04 100644
--- a/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
+++ b/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="${BASE_URI}/${PN#*-}-data.txt -> ${PN}-data-${PV}.txt
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-i18n/unicode-emoji/unicode-emoji-12.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-12.0.ebuild
index fb64854ccb1a..9460559ffde2 100644
--- a/app-i18n/unicode-emoji/unicode-emoji-12.0.ebuild
+++ b/app-i18n/unicode-emoji/unicode-emoji-12.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="${BASE_URI}/${PN#*-}-data.txt -> ${PN}-data-${PV}.txt
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-i18n/xcin/Manifest b/app-i18n/xcin/Manifest
index 164f248b38f6..e80e4717730a 100644
--- a/app-i18n/xcin/Manifest
+++ b/app-i18n/xcin/Manifest
@@ -3,6 +3,5 @@ AUX xcin-2.5.3_pre3-ldflags.patch 4525 BLAKE2B b66701186b4d37bf7191ab43fe87e4f9d
 AUX xcin-2.5.3_pre3-make.patch 3886 BLAKE2B d7d43a493f5d0bc8349f5e6fc5a32733db033e370ff03b8d4ecd9a424c2e568a33e8b645ab9a5fc67d228e4faeec92e9cddaf2aeb7a2e79f6c35279df08cd023 SHA512 033811b89842369740af7df884d29acd52a9c47fa773e087226116d6cbf7d9127cc1bfc7de3b511a9a01d7135c74d17860d0a782ba6c32ee6220b828b3055e6c
 DIST xcin_2.5.2.99.pre2+cvs20030224-1.4.diff.gz 1321937 BLAKE2B 4213f585d62d37215495354890203272fda0d7068bd6ceb8c0d75a2d1cd8c6626997607ab5b821887248f2e4207733eb3a26d021873893488b8dee83fddd3e52 SHA512 d1c6a667a8dcf996e02d694a0ff73eca409f542ce11b0e4d8563ed04c62e12c1d8feb6307153c5cfe982e66848b414dd65fc23d022ccc54cf2a0e3978b8c33e5
 DIST xcin_2.5.2.99.pre2+cvs20030224.orig.tar.gz 1530591 BLAKE2B 1c68d8bd4f11c458c2fefe974fc5f565a59deee23129f1c53e5714655d5be543e7a97f72eab2dc56aa098b78b53bfa77a4c0fbcb56cb93b936cc8b4ee5435135 SHA512 1068a9cf7f3b7ff3c2ff7e0443e487e660f3ec8c7f0114f1ad614fb1c7a73d15613ce0c198514816f00afaaa22434660ed11d329413bf010aa52b27513a5ac14
-EBUILD xcin-2.5.3_pre3-r2.ebuild 1594 BLAKE2B 63ec3b7caefb1706525ba7fd5fb6067ded36e2a14516b305b50145c6f5c419bead3a758d9881a26990fd58ee1c3ba5905b1f1618893eb7872935abf1db4bf519 SHA512 f55670efd003105c3c2f0c98255e46e6f4e3d44de4b6374e2af31f4355d045303af3b07ffe7bcd919c5572a1ee1207e769f55868c6c78fba9cc67ac49831c4f4
-EBUILD xcin-2.5.3_pre3-r3.ebuild 1785 BLAKE2B 77da973cfb86b3fb3612cf0bf35efd0b1c797b200303fcb80a61f456823d27f834eb7615e4629a6ada3223028e5ff10819e4c223780ac2c9b7440c78608e31e3 SHA512 229f3107ffedb76d20d9fccb19a6be4c86393e8b5ed382d1ef44c45148487210192b96f3dffb8c6a3aa0e8612380bb3e24cb7bec2fbe986f8cb21c7e8bce646e
+EBUILD xcin-2.5.3_pre3-r3.ebuild 1780 BLAKE2B 8cf1f50ba2cbde0c1277c97692128b6143ad2911c0a6db29c34f10a43f6c77dfa69506010f32734537322409b24b5c68ebca2adb08b4522caf86a6076a28d9ef SHA512 c55caba36a5b6340d10aef8c8497877cba65786d9656da64a89b374fe3c92b647015246e17990512276e945c7a7f5dd56f4136d55786ce84497545c5cea2482b
 MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-i18n/xcin/xcin-2.5.3_pre3-r2.ebuild b/app-i18n/xcin/xcin-2.5.3_pre3-r2.ebuild
deleted file mode 100644
index 44255b37febd..000000000000
--- a/app-i18n/xcin/xcin-2.5.3_pre3-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit multilib eutils autotools libtool
-
-MY_P=${PN}_2.5.2.99.pre2+cvs20030224
-
-DESCRIPTION="Chinese X Input Method"
-HOMEPAGE="http://cle.linux.org.tw/xcin/"
-SRC_URI="mirror://debian/pool/main/x/${PN}/${MY_P}.orig.tar.gz
-	mirror://debian/pool/main/x/${PN}/${MY_P}-1.4.diff.gz"
-
-LICENSE="XCIN GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="debug nls unicode"
-
-RDEPEND=">=sys-libs/db-4.5
-	>=app-i18n/libtabe-0.2.6
-	unicode? ( media-fonts/hkscs-ming
-		media-fonts/arphicfonts )
-	app-i18n/libchewing
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P/_/-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${MY_P}-1.4.diff
-	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
-	rm -f configure
-	cd script
-	elibtoolize
-	eautoreconf
-	mv configure ../
-	cd ..
-}
-
-src_compile() {
-	myconf="--with-xcin-rcdir=/etc
-		--with-xcin-dir=/usr/$(get_libdir)/xcin25
-		--with-db-lib=/usr/$(get_libdir)
-		--with-tabe-inc=/usr/include/tabe
-		--with-tabe-lib=/usr/$(get_libdir)
-		$(use_enable debug)"
-
-	econf ${myconf}
-	emake -j1 || die "emake failed."
-}
-
-src_install() {
-	emake \
-		prefix="${D}/usr" \
-		program_prefix="${D}" \
-		install || die
-
-	for docdir in doc doc/En doc/En/internal doc/history doc/internal doc/modules; do
-		docinto ${docdir#doc/}
-		if use unicode; then
-			for doc in $(find ${docdir} -maxdepth '1' -type 'f'); do
-				iconv -f BIG5 -t UTF-8 --output=${doc}.UTF-8 ${doc}
-				mv ${doc}.UTF-8 ${doc}
-			done
-		fi
-		dodoc ${docdir}/*
-	done
-}
diff --git a/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild b/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild
index 5ba8a1b13e56..e83ff62b4098 100644
--- a/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild
+++ b/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/x/${PN}/${MY_P}.orig.tar.gz
 
 LICENSE="XCIN GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE="debug nls unicode"
 
 RDEPEND=">=sys-libs/db-4.5
diff --git a/app-i18n/yaskkserv/Manifest b/app-i18n/yaskkserv/Manifest
index 7d76f28f00fe..6bc36079f5c6 100644
--- a/app-i18n/yaskkserv/Manifest
+++ b/app-i18n/yaskkserv/Manifest
@@ -3,5 +3,7 @@ AUX yaskkserv.confd 280 BLAKE2B 465561acdcf1daa1589d84a74708ceff777dee5ed04510e2
 AUX yaskkserv.initd 341 BLAKE2B 1e26304d24ecb6a931936ff06d9f24bb92b4aa01a3ea7d5db0ec7cd12c48c062f5ce664624b51592d87bb971cb82855fbc2220ca82cd6d0f4d55172e7ba2b0f5 SHA512 2fd63604283c811c7f6fe192e3d8f2b5b3542106b54d39707aa8d6116328634ae43421d6a620fcd1555cdbd53985b2444a381bc32e071cac7e040f6a337a3d8e
 AUX yaskkserv.service 277 BLAKE2B 7755728e443ceccdd359864bea9e9e25926c860f13fb3acbecebfdedd919db7fd65ecc1e922f662dc676b2aa90b325a7aaed049abcae9291602f0bb5097b0015 SHA512 8ff4aa6ec41c3df17f560de157a60cd3bf3fcc03a2613c603d533f2891207b7001e2469dd3e9ac8c8cfc7ab5909978467922906e22ba4b4635627b234008ce32
 DIST yaskkserv-1.1.0.tar.xz 75108 BLAKE2B ac567d4715d1767f0690462de934768335eafe4a61010534c16b430876f81ce43ac175dcc0a2546af996dd0bef8fd4c744b475985365abe3d571a4ed3f1c3a4c SHA512 9956a9b2fe587491b7c5f76482f13f91d1c87d445f2ff7effa5ffb68efe076f54f1c63e95b980d889963ac507ed49fa37f76f9deb239da7b7409da5be025c000
+DIST yaskkserv-1.1.1.tar.xz 75136 BLAKE2B b5a26e7d12951d9256e050d543338a48a61e9b6883a0866e4f7a2d367783a5757a5a12cdd810a87e84ade5bfebdc9c24eb093c09081e1d9099ce848d435eb45e SHA512 5f421ef684011aed716e929b90ab98fb1703abe707928847d79a34815750d59df59f4dec8bef6e8ce399340aedb32688d6dd8a5d02ba9372a935ec8f1adffc29
 EBUILD yaskkserv-1.1.0.ebuild 1579 BLAKE2B 7e490c06545e15ed6884d9b4f43eeb02e4445a5cf2728ad94a90afac8b4aeccd2b4e577f1fc6cbe10db81bbf6db51f2e68cfc6676ce5d10d05ead6e27feb2124 SHA512 6e3ae4f95f14765307ec861065d7e6f818b09f812b7a437ead85fe12f91a592f923460c963578e351214f07aa01e5d79b3c6fb53b4fb5fb2a221566239342600
+EBUILD yaskkserv-1.1.1.ebuild 1581 BLAKE2B 2e86f01a8244d264e941558858d017530d1474419246a9450429878a86b60c4e2c3c132c0a2e2c7fc916431e91a7ef66c655d29803ab5d39b20235c19f184cc9 SHA512 86c2ffe07cbb754059744700670034b543cabf01c67d8fbf0dd1847c253703b611a70da184b2163ee62efbf3ab8667b651029286354cab2a2f048bece0286251
 MISC metadata.xml 317 BLAKE2B fbc4f3d636930729ccd570bcdcfd2ff7a12f856b6d5a39fc0d8f65870557fb950a856123beff19c601058016d7353db674221ec823a495298f37ceb295728067 SHA512 01ef8712d73a0b66562c2c90c76271c590a6d07ed3641db256e10b7a079ea21e3d7dfcc2542f3452234a7f24d81645e64172a3e745bbcf537e0e857e68a3b446
diff --git a/app-i18n/yaskkserv/yaskkserv-1.1.1.ebuild b/app-i18n/yaskkserv/yaskkserv-1.1.1.ebuild
new file mode 100644
index 000000000000..8faf1afe8655
--- /dev/null
+++ b/app-i18n/yaskkserv/yaskkserv-1.1.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs systemd
+
+DESCRIPTION="Yet Another SKK server"
+HOMEPAGE="http://umiushi.org/~wac/yaskkserv/"
+SRC_URI="http://umiushi.org/~wac/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls libressl systemd"
+
+RDEPEND="app-i18n/skk-jisyo
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	systemd? ( virtual/udev[systemd] )"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
+HTML_DOCS=( documentation/. )
+
+src_configure() {
+	econf \
+		$(use_enable gnutls) \
+		$(use_enable systemd) \
+		--compiler="${tc_getCXX}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install_all
+	einstalldocs
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	systemd_dounit examples/${PN}.socket
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+yaskkserv_update() {
+	local f
+	for f in "${ROOT}"/usr/share/skk/SKK-JISYO.*; do
+		case ${f} in
+		*.cdb)
+			;;
+		*.${PN})
+			[[ -f ${f%.*} ]] || rm -f "${f}"
+			;;
+		*)
+			[[ ${f} -nt ${f}.${PN} ]] && ${PN}_make_dictionary "${f}" "${f}.${PN}"
+			;;
+		esac
+	done
+}
+
+pkg_postinst() {
+	yaskkserv_update
+
+	elog "You need to run:"
+	elog "  emerge --config =${CATEGORY}/${PF}"
+	elog "after updating app-i18n/skk-jisyo from next time."
+}
+
+pkg_postrm() {
+	rm -f "${ROOT}"/usr/share/skk/SKK-JISYO.*.${PN}
+	rmdir "${ROOT}"/usr/share/skk 2>/dev/null
+}
+
+pkg_config() {
+	yaskkserv_update
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-14 23:22:23 +0100
commit	4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree	76e74807bc479502e13866b581b6bf86734ec634 /app-i18n
parent	30d6f67c98d149508509d5e86f176d558793acc0 (diff)