gentoo resync : 14.07.2018

833 files changed, 20841 insertions, 2555 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 418874e57c97..fbdac13f929d 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/anthy-9100h-r2 b/app-i18n/anthy-9100h-r2
deleted file mode 100644
index b60306d8fc87..000000000000
--- a/app-i18n/anthy-9100h-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=canna-2ch? ( app-dicts/canna-2ch ) emacs? ( virtual/emacs )
-DESCRIPTION=Anthy -- free and secure Japanese input system
-EAPI=6
-HOMEPAGE=http://anthy.osdn.jp/
-IUSE=canna-2ch emacs static-libs
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=canna-2ch? ( app-dicts/canna-2ch ) emacs? ( virtual/emacs )
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/anthy/37536/anthy-9100h.tar.gz
-_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8e4ded9ef1b66257393ef5bff424fc2d
diff --git a/app-i18n/anthy/Manifest b/app-i18n/anthy/Manifest
new file mode 100644
index 000000000000..a49c0eade00d
--- /dev/null
+++ b/app-i18n/anthy/Manifest
@@ -0,0 +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
+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
new file mode 100644
index 000000000000..45d7ba0deb52
--- /dev/null
+++ b/app-i18n/anthy/anthy-9100h-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit elisp-common ltprune
+
+DESCRIPTION="Anthy -- free and secure Japanese input system"
+HOMEPAGE="http://anthy.osdn.jp/"
+SRC_URI="mirror://sourceforge.jp/${PN}/37536/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="canna-2ch emacs static-libs"
+
+RDEPEND="canna-2ch? ( app-dicts/canna-2ch )
+	emacs? ( virtual/emacs )"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-anthy_context_t.patch )
+DOCS=( AUTHORS ChangeLog DIARY NEWS README )
+
+SITEFILE="50${PN}-gentoo.el"
+
+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
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		EMACS=$(usex emacs "${EMACS}")
+}
+
+src_install() {
+	default
+	prune_libtool_files
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	rm -f doc/Makefile*
+	dodoc -r doc
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/app-i18n/anthy/files/50anthy-gentoo.el b/app-i18n/anthy/files/50anthy-gentoo.el
new file mode 100644
index 000000000000..ab154f8d4eff
--- /dev/null
+++ b/app-i18n/anthy/files/50anthy-gentoo.el
@@ -0,0 +1,2 @@
+(set-language-info "Japanese" 'input-method "japanese-anthy")
+
diff --git a/app-i18n/anthy/files/anthy-anthy_context_t.patch b/app-i18n/anthy/files/anthy-anthy_context_t.patch
new file mode 100644
index 000000000000..aab4ab749ea0
--- /dev/null
+++ b/app-i18n/anthy/files/anthy-anthy_context_t.patch
@@ -0,0 +1,11 @@
+--- a/anthy/input.h
++++ b/anthy/input.h
+@@ -10,6 +10,8 @@
+ #ifndef INPUT_H_INCLUDE
+ #define INPUT_H_INCLUDE
+ 
++#include "anthy.h"
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
diff --git a/app-i18n/anthy/metadata.xml b/app-i18n/anthy/metadata.xml
new file mode 100644
index 000000000000..0b8350b78af9
--- /dev/null
+++ b/app-i18n/anthy/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hattya@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <longdescription>
+    Anthy is a free and secure Japanese kana-kanji server.  This ebuild includes
+    cannadic as a server-side dictionary, so you don't need any extra package to
+    run it.  You can use anthy with <pkg>app-i18n/uim</pkg> (XIM, GTK+ immodule)
+    and <pkg>virtual/emacs</pkg> (to enable Anthy support for emacs, build this
+    package with emacs USE flag).
+  </longdescription>
+  <use>
+    <flag name="canna-2ch">Enable support for <pkg>app-dicts/canna-2ch</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge-jp">anthy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/atokx3-3.0.0-r12 b/app-i18n/atokx3-3.0.0-r12
deleted file mode 100644
index 4ad10bd4c06c..000000000000
--- a/app-i18n/atokx3-3.0.0-r12
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=ATOK X3 for Linux - The most famous Japanese Input Method Engine
-EAPI=6
-HOMEPAGE=https://www.justsystems.com/jp/products/atok_linux/
-IUSE=abi_x86_32 abi_x86_64
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=ATOK MIT
-PROPERTIES=interactive
-RDEPEND=dev-libs/atk dev-libs/glib:2 dev-libs/libxml2:2 media-libs/fontconfig media-libs/libpng sys-apps/tcp-wrappers virtual/pam x11-libs/cairo >=x11-libs/gtk+-2.4.13:2 x11-libs/libICE x11-libs/libSM x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXxf86vm x11-libs/libdrm x11-libs/pangox-compat amd64? ( >=dev-libs/atk-2.10.0[abi_x86_32(-)] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)] >=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(-)] >=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(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] >=x11-libs/libdrm-2.4.46[abi_x86_32(-)] >=x11-libs/pangox-compat-0.0.2[abi_x86_32(-)] )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=https://gate.justsystems.com/download/atok/up/lin/atokx3up2.tar.gz https://gate.justsystems.com/download/atok/up/lin/atokx3gtk216.tar.gz https://gate.justsystems.com/download/zipcode/up/lin/a20y1406lx.tgz
-_eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6088bd096521136e4e4827a621a81b36
diff --git a/app-i18n/atokx3/Manifest b/app-i18n/atokx3/Manifest
new file mode 100644
index 000000000000..9b538ef32f53
--- /dev/null
+++ b/app-i18n/atokx3/Manifest
@@ -0,0 +1,6 @@
+AUX xinput-iiimf 259 BLAKE2B 02091d870ca82447aadfc6c33bffc38d2bfca596f4f5958917a07bf3bfd924818a1d805022616076da699a063fcfac1867060ae14a9911223102ea697bbf793c SHA512 bbc852628d17c56124cf977c8fba28d9819944ca1bc7994da38222707ac9f785aafe9d854a70fec968d87382be053753ae599f0d47d666d133c49c62096eb3cd
+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
+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
new file mode 100644
index 000000000000..70c48e5edce0
--- /dev/null
+++ b/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
+inherit cdrom eutils gnome2-utils multilib-build
+
+MY_UPDATE_P="${PN}up2"
+MY_UPDATE_GTK="${PN}gtk216"
+MY_ZIPCODE_P="a20y1406lx"
+
+DESCRIPTION="ATOK X3 for Linux - The most famous Japanese Input Method Engine"
+HOMEPAGE="https://www.justsystems.com/jp/products/atok_linux/"
+SRC_URI="https://gate.justsystems.com/download/atok/up/lin/${MY_UPDATE_P}.tar.gz
+	https://gate.justsystems.com/download/atok/up/lin/${MY_UPDATE_GTK}.tar.gz
+	https://gate.justsystems.com/download/zipcode/up/lin/${MY_ZIPCODE_P}.tgz"
+
+LICENSE="ATOK MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+RESTRICT="strip mirror"
+
+RDEPEND="dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	media-libs/fontconfig
+	media-libs/libpng
+	sys-apps/tcp-wrappers
+	virtual/pam
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.4.13:2
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXxf86vm
+	x11-libs/libdrm
+	x11-libs/pangox-compat
+	amd64? (
+		>=dev-libs/atk-2.10.0[abi_x86_32(-)]
+		>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
+		>=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)]
+		>=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(-)]
+		>=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(-)]
+		>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
+		>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
+		>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+		>=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)]
+		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+		>=x11-libs/libXfixes-5.0.1[abi_x86_32(-)]
+		>=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)]
+		>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+		>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+		>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+		>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+		>=x11-libs/libdrm-2.4.46[abi_x86_32(-)]
+		>=x11-libs/pangox-compat-0.0.2[abi_x86_32(-)]
+	)"
+S="${WORKDIR}"
+
+EMULTILIB_PKG="true"
+
+pkg_setup() {
+	if ! cdrom_get_cds ${PN}index ; then
+		die "Please mount ATOK for Linux CD-ROM or set CD_ROOT variable to the directory containing ATOK X3 for Linux."
+	fi
+
+	QA_PREBUILT="opt/${PN}/lib/server/*
+		opt/${PN}/lib/client/xaux/*
+		opt/${PN}/lib/client/*
+		opt/${PN}/bin/*
+		usr/libexec/*
+		usr/bin/*
+		usr/$(get_libdir)/*
+		usr/$(get_libdir)/gtk-2.0/immodules/*
+		usr/$(get_libdir)/iiim/le/${PN}/64/*
+		usr/$(ABI=x86 get_libdir)/*
+		usr/$(ABI=x86 get_libdir)/gtk-2.0/immodules/*
+		usr/$(ABI=x86 get_libdir)/iiim/*
+		usr/$(ABI=x86 get_libdir)/iiim/le/${PN}/*"
+}
+
+src_unpack() {
+	local targets="
+		IIIMF/iiimf-client-lib-trunk_r3104-js*.i386.tar.gz
+		IIIMF/iiimf-gtk-trunk_r3104-js*.i386.tar.gz
+		IIIMF/iiimf-protocol-lib-trunk_r3104-js*.i386.tar.gz
+		IIIMF/iiimf-server-trunk_r3104-js*.i386.tar.gz
+		IIIMF/iiimf-x-trunk_r3104-js*.i386.tar.gz
+		IIIMF/iiimf-client-lib-devel-trunk_r3104-js*.i386.tar.gz
+		IIIMF/iiimf-protocol-lib-devel-trunk_r3104-js*.i386.tar.gz
+		ATOK/atokx-20.0-*.0.0.i386.tar.gz"
+	#	IIIMF/iiimf-properties-trunk_r3104-js*.i386.tar.gz
+	#	IIIMF/iiimf-docs-trunk_r3104-js*.i386.tar.gz
+	#	IIIMF/iiimf-notuse-trunk_r3104-js*.i386.tar.gz
+
+	if use abi_x86_64 ; then
+		targets+="
+			IIIMF/iiimf-client-lib-64-trunk_r3104-js*.x86_64.tar.gz
+			IIIMF/iiimf-gtk-64-trunk_r3104-js*.x86_64.tar.gz
+			IIIMF/iiimf-protocol-lib-64-trunk_r3104-js*.x86_64.tar.gz
+			ATOK/atokx-64-20.0-*.0.0.x86_64.tar.gz"
+		#	IIIMF/iiimf-client-lib-devel-64-trunk_r3104-js*.x86_64.tar.gz
+		#	IIIMF/iiimf-protocol-lib-devel-64-trunk_r3104-js*.x86_64.tar.gz
+		#	IIIMF/iiimf-notuse-64-trunk_r3104-js*.x86_64.tar.gz
+	fi
+
+	targets+=" ATOK/atokxup-20.0-*.0.0.i386.tar.gz"
+
+	unpack ${MY_UPDATE_P}.tar.gz
+
+	local i
+	for i in ${targets} ; do
+		if [[ -f "${S}"/${MY_UPDATE_P}/bin/${i} ]] ; then
+			einfo "unpack" $(basename "${S}"/${MY_UPDATE_P}/bin/${i})
+			tar xzf "${S}"/${MY_UPDATE_P}/bin/${i} || die "Failed to unpack ${i}"
+		elif [[ -f "${CDROM_ROOT}"/bin/tarball/${i} ]] ; then
+			einfo "unpack" $(basename "${CDROM_ROOT}"/bin/tarball/${i})
+			tar xzf "${CDROM_ROOT}"/bin/tarball/${i} || die "Failed to unpack ${i}"
+		else
+			die "${i} not found."
+		fi
+	done
+	unpack ${MY_UPDATE_GTK}.tar.gz
+	unpack ${MY_ZIPCODE_P}.tgz
+}
+
+src_prepare() {
+	if use abi_x86_64 ; then
+		local lib32="$(ABI=x86 get_libdir)"
+		local lib64="$(get_libdir)"
+		if [[ "lib" != "${lib32}" ]] ; then
+			mv usr/lib "usr/${lib32}" || die
+		fi
+		if [[ "lib64" != "${lib64}" ]] ; then
+			mv usr/lib64 "usr/${lib64}" || die
+		fi
+		mkdir -p "usr/${lib64}/iiim/le/${PN}" || die
+		mv "usr/${lib32}/iiim/le/${PN}/64" "usr/${lib64}/iiim/le/${PN}/64" || die
+		rm "usr/${lib32}/iiim/le/${PN}/amd64" || die
+		sed -e "s:/usr/lib:/usr/${lib64}:" "usr/${lib32}/libiiimcf.la" > "usr/${lib64}/libiiimcf.la" || die
+		sed -e "s:/usr/lib:/usr/${lib64}:" "usr/${lib32}/libiiimp.la" > "usr/${lib64}/libiiimp.la" || die
+		sed -i -e "s:/usr/lib:/usr/${lib32}:" "usr/${lib32}/libiiimcf.la" || die
+		sed -i -e "s:/usr/lib:/usr/${lib32}:" "usr/${lib32}/libiiimp.la" || die
+	fi
+}
+
+src_install() {
+	DOCS=( ${MY_UPDATE_P}/README_UP2.txt "${CDROM_ROOT}"/doc/atok.pdf )
+	HTML_DOCS=( "${CDROM_ROOT}"/readme.html )
+	einstalldocs
+	rm -rf ${MY_UPDATE_P}
+
+	cp -dpR * "${ED}" || die
+
+	# amd64 hack
+	if use abi_x86_64 ; then
+		local lib32="$(ABI=x86 get_libdir)"
+		local lib64="$(get_libdir)"
+		if [[ "${lib32}" != "${lib64}" ]] ; then
+			local f
+			for f in xiiimp.so xiiimp.a iiim-xbe xiiimp.so.2 xiiimp.so.2.0.0 iiimd-watchdog xiiimp.la ; do
+				dosym "${EPREFIX}/usr/${lib32}/iiim/${f}" "/usr/${lib64}/iiim/${f}"
+			done
+			for f in ${PN}aux.so ${PN}.so ; do
+				dosym "${EPREFIX}/usr/${lib32}/iiim/le/${PN}/${f}" "/usr/${lib64}/iiim/le/${PN}/${f}"
+			done
+			dosym "${EPREFIX}/usr/${lib64}/iiim/le/${PN}/64" "/usr/${lib32}/iiim/le/${PN}/64"
+			dosym "${EPREFIX}/usr/${lib64}/iiim/le/${PN}/64" "/usr/${lib32}/iiim/le/${PN}/amd64"
+		fi
+	fi
+
+	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-iiimf" > "${T}/iiimf.conf" || die
+	insinto /etc/X11/xinit/xinput.d
+	doins "${T}/iiimf.conf"
+}
+
+pkg_preinst() {
+	# bug #343325
+	if use abi_x86_64 && has_multilib_profile && [[ -L "${EPREFIX}/usr/$(get_libdir)/iiim" ]] ; then
+		rm -f "${EPREFIX}/usr/$(get_libdir)/iiim"
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "To use ATOK for Linux, you need to add following to .xinitrc or .xprofile:"
+	elog
+	elog ". /opt/${PN}/bin/${PN}start.sh"
+	elog
+	multilib_foreach_abi gnome2_query_immodules_gtk2
+}
+
+pkg_postrm() {
+	multilib_foreach_abi gnome2_query_immodules_gtk2
+}
diff --git a/app-i18n/atokx3/files/xinput-iiimf b/app-i18n/atokx3/files/xinput-iiimf
new file mode 100644
index 000000000000..bc2330c49970
--- /dev/null
+++ b/app-i18n/atokx3/files/xinput-iiimf
@@ -0,0 +1,11 @@
+XIM=iiimx
+XIM_PROGRAM="@EPREFIX@/usr/bin/iiimx"
+XIM_ARGS=-iiimd
+GTK_IM_MODULE=iiim
+QT_IM_MODULE=xim
+
+export HTT_DISABLE_STATUS_WINDOW=t
+export HTT_GENERATES_KANAKEY=t
+export HTT_USES_LINUX_XKEYSYM=t
+export HTT_IGNORES_LOCK_MASK=t
+export JS_FEEDBACK_CONVERT=t
diff --git a/app-i18n/atokx3/metadata.xml b/app-i18n/atokx3/metadata.xml
new file mode 100644
index 000000000000..e1a49f498885
--- /dev/null
+++ b/app-i18n/atokx3/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-i18n/bidiv-1.5-r1 b/app-i18n/bidiv-1.5-r1
deleted file mode 100644
index aa009c8a365b..000000000000
--- a/app-i18n/bidiv-1.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A BiDirectional Text Viewer
-EAPI=4
-HOMEPAGE=http://www.ivrix.org.il
-KEYWORDS=~alpha amd64 ~ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/fribidi-0.19.2-r2
-SLOT=0
-SRC_URI=http://ftp.ivrix.org.il/pub/ivrix/src/cmdline/bidiv-1.5.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a402d6bd317a8cc77692c027c8e1db8a
diff --git a/app-i18n/bidiv-1.5_p4 b/app-i18n/bidiv-1.5_p4
deleted file mode 100644
index 1996cc075425..000000000000
--- a/app-i18n/bidiv-1.5_p4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A commandline tool displaying logical Hebrew/Arabic
-EAPI=4
-HOMEPAGE=https://packages.qa.debian.org/b/bidiv.html
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/fribidi-0.19.2-r2
-SLOT=0
-SRC_URI=mirror://debian/pool/main/b/bidiv/bidiv_1.5.orig.tar.gz mirror://debian/pool/main/b/bidiv/bidiv_1.5-4.debian.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=52453c811c6788dbab3dc056c50d1dae
diff --git a/app-i18n/bidiv/Manifest b/app-i18n/bidiv/Manifest
new file mode 100644
index 000000000000..779d749a89e3
--- /dev/null
+++ b/app-i18n/bidiv/Manifest
@@ -0,0 +1,7 @@
+AUX bidiv-1.5-fribidi.patch 1164 BLAKE2B 50a0a3a35ea7d7b526552fe0b4f1f99bd5ca52b1b42dd76a5dbad2127de2cdf40c1553263902d946d3ea8f7bfae1464de37737eb5af768a2767020b17f272f3c SHA512 0f2bbf5b2f337c335c009cf4672b896ff7b7dcdc94a839544aa5af1f80d43d64b373387b49e21f5bbd5111fc7f7014e0f058973a70154f1ad913ba8d7228c1be
+DIST bidiv-1.5.tgz 13865 BLAKE2B 9f289a2674b3d5ce895e65f6068252d78eafea735783ca8947be446d0830166708474fda041bea85adcc8930ec615d68978d7f8151afdcd645640b9941be009c SHA512 f8ddaa4a7ae6e7b723eb6e4f5dc91bd2e189c02e116ecd1fb02d300f12e913e9dbf328d65f40ef8c2e7d8e822d1a612966fe0f59f44129fd5dc7ece26c021cc2
+DIST bidiv_1.5-4.debian.tar.gz 5863 BLAKE2B b91f6756156815bd12b6c6e56a058a63db5be805cab2c5fb29e47f0e66bf8ba8638bdca2ed83c63117144c2f9912ed4ba79bb1b143f3bd2f6c4fef33397225e2 SHA512 63e998cae38e08181cf4e40a54119b9b4b5ab3ede7fcfbf852a1a7ad51a671d14d4094b3af8b89574eef51f8c6ee34f2eab6242bf69e77d954826931a801e8b1
+DIST bidiv_1.5.orig.tar.gz 13865 BLAKE2B 9f289a2674b3d5ce895e65f6068252d78eafea735783ca8947be446d0830166708474fda041bea85adcc8930ec615d68978d7f8151afdcd645640b9941be009c SHA512 f8ddaa4a7ae6e7b723eb6e4f5dc91bd2e189c02e116ecd1fb02d300f12e913e9dbf328d65f40ef8c2e7d8e822d1a612966fe0f59f44129fd5dc7ece26c021cc2
+EBUILD bidiv-1.5-r1.ebuild 631 BLAKE2B 22ff8101240d213b4593214b6c18481d6ea236c9d187367473401708bb71b43b008b6273351a329c783460f7f47cdf75b415ea63c5e03022140504dcccc58600 SHA512 89f0a57e7f3bb741e41d4c416cef6d3ef76dcfe1b3bccf314f71b325d3703945e4e7e898fdbc2ce4699c0b5243c0809c97e29e13fae9471744b69a0a9cbd2f1b
+EBUILD bidiv-1.5_p4.ebuild 1061 BLAKE2B c9c181238c39eaef6bab6a0af6e58953415487b51dc025f7c456f980d5ad4bc1174220161160b8cb1c52bc0269f0576c618d182573b63b35967f91ebf94dd138 SHA512 c86d3fdd1a5b924acef7a1588e5abdb786849d7ada0ab2535116a3a3cbb2d70ca2fd12db419d02512ab732050244881e2e382cc14a008cf115fe9cc3bbf02e34
+MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-i18n/bidiv/bidiv-1.5-r1.ebuild b/app-i18n/bidiv/bidiv-1.5-r1.ebuild
new file mode 100644
index 000000000000..86d05fe04bf0
--- /dev/null
+++ b/app-i18n/bidiv/bidiv-1.5-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A BiDirectional Text Viewer"
+HOMEPAGE="http://www.ivrix.org.il"
+SRC_URI="http://ftp.ivrix.org.il/pub/ivrix/src/cmdline/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/fribidi-0.19.2-r2"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fribidi.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake
+}
+
+src_install() {
+	dobin bidiv
+	dodoc README WHATSNEW
+	doman bidiv.1
+}
diff --git a/app-i18n/bidiv/bidiv-1.5_p4.ebuild b/app-i18n/bidiv/bidiv-1.5_p4.ebuild
new file mode 100644
index 000000000000..9635bec349c9
--- /dev/null
+++ b/app-i18n/bidiv/bidiv-1.5_p4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+PATCH_LEVEL=4
+
+DESCRIPTION="A commandline tool displaying logical Hebrew/Arabic"
+HOMEPAGE="https://packages.qa.debian.org/b/bidiv.html"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PATCH_LEVEL}.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/fribidi-0.19.2-r2"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	# Use order from "series" file:
+	local ddir=${WORKDIR}/debian/patches
+	epatch \
+		"${ddir}"/try_utf8_fix \
+		"${ddir}"/makefile \
+		"${ddir}"/fribidi_019 \
+		"${ddir}"/hyphen_minus \
+		"${ddir}"/term_size_get \
+		"${ddir}"/type_fix \
+		"${ddir}"/cast_fix
+}
+
+src_compile() {
+	tc-export CC
+	emake CC_OPT_FLAGS="-Wall"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc README WHATSNEW "${WORKDIR}"/debian/changelog
+}
diff --git a/app-i18n/bidiv/files/bidiv-1.5-fribidi.patch b/app-i18n/bidiv/files/bidiv-1.5-fribidi.patch
new file mode 100644
index 000000000000..0223329cbe5e
--- /dev/null
+++ b/app-i18n/bidiv/files/bidiv-1.5-fribidi.patch
@@ -0,0 +1,46 @@
+--- bidiv.c
++++ bidiv.c
+@@ -172,7 +172,7 @@
+ 		}
+ #ifndef TRY_UTF8
+ 		in[len]='\0';
+-		fribidi_iso8859_8_to_unicode(in, unicode_in);
++		fribidi_charset_to_unicode(FRIBIDI_CHAR_SET_ISO8859_8, in, unicode_in);
+ #endif
+ 
+ 		/* output the line */
+@@ -201,10 +201,10 @@
+ 			rtl_line=0;
+ 
+ 		if(out_utf8)
+-			fribidi_unicode_to_utf8(unicode_out, len,
++			fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8, unicode_out, len,
+ 					     out);
+ 		else
+-			fribidi_unicode_to_iso8859_8(unicode_out, len,
++			fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_ISO8859_8, unicode_out, len,
+ 						     out);
+ 		/* if rtl_line (i.e., base_dir is RL), and we didn't fill the
+ 		   entire width, we need to pad with spaces. Maybe in the
+--- Makefile
++++ Makefile
+@@ -1,16 +1,14 @@
+ PREFIX=/usr/local
+ BIN_DIR=$(PREFIX)/bin
+ MAN_PATH=$(PREFIX)/man
+-CC_OPT_FLAGS=-O2 -Wall
+ 
+-
+-CFLAGS= $(CC_OPT_FLAGS) $(DEFS) `fribidi-config --cflags`
+-LDFLAGS=`fribidi-config --libs`
++CFLAGS+=`pkg-config fribidi --cflags` -Wall
++LIBS=`pkg-config fribidi --libs`
+ 
+ all: bidiv
+ 
+ bidiv: bidiv.o
+-	$(CC) -o bidiv bidiv.o $(LDFLAGS)
++	$(CC) $(LDFLAGS) -o bidiv bidiv.o $(LIBS)
+ 
+ clean:
+ 	rm -f bidiv.o *~
diff --git a/app-i18n/bidiv/metadata.xml b/app-i18n/bidiv/metadata.xml
new file mode 100644
index 000000000000..c921b96adf6c
--- /dev/null
+++ b/app-i18n/bidiv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-i18n/canfep-1.0 b/app-i18n/canfep-1.0
deleted file mode 100644
index 25cdfe0ea138..000000000000
--- a/app-i18n/canfep-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-i18n/canna sys-libs/ncurses:= virtual/pkgconfig
-DESCRIPTION=Canna Japanese kana-kanji frontend processor on console
-EAPI=6
-HOMEPAGE=http://www.geocities.co.jp/SiliconValley-Bay/7584/canfep/
-IUSE=unicode
-KEYWORDS=-alpha ~amd64 ppc ~sparc x86
-LICENSE=canfep
-RDEPEND=app-i18n/canna sys-libs/ncurses:=
-SLOT=0
-SRC_URI=http://www.geocities.co.jp/SiliconValley-Bay/7584/canfep/canfep-1.0.tar.gz unicode? ( http://hp.vector.co.jp/authors/VA020411/patches/canfep_utf8.diff )
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a5be4cd8ea5920f7a83cdd9564522359
diff --git a/app-i18n/canfep-1.0-r1 b/app-i18n/canfep-1.0-r1
deleted file mode 100644
index 9e9f6c80dfdb..000000000000
--- a/app-i18n/canfep-1.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-i18n/canna sys-libs/ncurses:= virtual/pkgconfig
-DESCRIPTION=Canna Japanese kana-kanji frontend processor on console
-EAPI=6
-HOMEPAGE=http://www.geocities.co.jp/SiliconValley-Bay/7584/canfep/
-IUSE=unicode
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
-LICENSE=canfep
-RDEPEND=app-i18n/canna sys-libs/ncurses:=
-SLOT=0
-SRC_URI=http://www.geocities.co.jp/SiliconValley-Bay/7584/canfep/canfep-1.0.tar.gz unicode? ( http://hp.vector.co.jp/authors/VA020411/patches/canfep_utf8.diff )
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e0d7f45308c278376d19e5946d4bd048
diff --git a/app-i18n/canfep/Manifest b/app-i18n/canfep/Manifest
new file mode 100644
index 000000000000..53e07f570b29
--- /dev/null
+++ b/app-i18n/canfep/Manifest
@@ -0,0 +1,7 @@
+AUX canfep-posix-pty.patch 1674 BLAKE2B dfeda6e249501ed6b5a8bd185dbd9df735bd9f0825cf29ff83abdec9b7514f91f0a9eca61a4291a9dd9982262eb92f40db185630b6a89573de364b855ac1097f SHA512 dc02c9fca1e964f04c7fc223fee7935d5e68d25699bb279327904ac2ce042a9cf9fc02e4f1c4e59515c931a6a157861d113e685a8484242b791c367d132d5f7b
+AUX canfep-termcap.patch 6533 BLAKE2B c8e9ffa84390bac88e6ad1fc30e47d237a6fc10d3f8b727a730358faa69d76a24ddb9b1467d695eed691ceb9e1b5558baf12d45178e44b642fb3fc7ff0f9d36d SHA512 7ebaf5745bdc8b1aa1bd07879fe51c3c6410c1475f9e44535bf863f9ab0b7ee6ac0f3dca852c22036ae2ecfababfd976a0c3027ad9d33e3aae7e289c00bd60bc
+DIST canfep-1.0.tar.gz 8067 BLAKE2B 1a6e8af357d2b7aaccf442b0f8bab577ed05a5a0fdf2fb4c189105c2c41f739c2e559e740584bf393fcc52d3f3bd0bb6216e06e2b685f62f7dded9d576e95bed SHA512 0fd7c8ca56282fa537b76fe33f46e03d4f0f4727528ccad95cd4726888372da9158fc8bed2cdc67d645defb479040cd4a4d0999f69d38fd8b4080f7ece4e67d6
+DIST canfep_utf8.diff 7152 BLAKE2B e3848d5119b01d3296c93b5ed8495c6f93ecb1ef39f168d6e1685636055295b8f7277c6b680cadb648fe6847c92e3b038a9b5a9a58f23fe3490dcbe675bcc96f SHA512 32d946b8b78efd3b95736738497fe46a7d0e2383f2b665c8af79270d7b0d1404ca051e63fc67375f0b953b8f604475c8d6b2d683089bc97b098fa9524b89208c
+EBUILD canfep-1.0-r1.ebuild 980 BLAKE2B f3681c10cd62315c8f3f31f5a216b6a2ab6d36ffb9fb09d3a5ad6d1db85c0c8414d351342ad7b4b17035fd78ccca11ce42ada2dacb81f5efdea24048dd2c14a0 SHA512 57c102baccceafdbbf894576a9e0b338c8c0213b1d51cd41e93f8a9414aae37881e1101e9a05cbadac35ce31e6f4d57c49cd60f980987932a7415df408492054
+EBUILD canfep-1.0.ebuild 893 BLAKE2B ad7563343f58d9e831d31ad9f3cec03f833aaa0d09a15cbb5a3ab2a57b809435ad153858f003a0d2947d3e06d2248af93b79b5575d0483501700de4adc3504b6 SHA512 7970b0c9ce1fdd16e933c5f3c5b82216f9ab212433881ff51d0020e13fb05d4d96dd150ba0c305701e9c9029575aa5c52875bb61049962a47c5cb3c45f68b939
+MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/canfep/canfep-1.0-r1.ebuild b/app-i18n/canfep/canfep-1.0-r1.ebuild
new file mode 100644
index 000000000000..d46bf3258374
--- /dev/null
+++ b/app-i18n/canfep/canfep-1.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Canna Japanese kana-kanji frontend processor on console"
+HOMEPAGE="http://www.geocities.co.jp/SiliconValley-Bay/7584/canfep/"
+SRC_URI="http://www.geocities.co.jp/SiliconValley-Bay/7584/${PN}/${P}.tar.gz
+	unicode? ( http://hp.vector.co.jp/authors/VA020411/patches/${PN}_utf8.diff )"
+
+LICENSE="canfep"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="unicode"
+
+RDEPEND="app-i18n/canna
+	sys-libs/ncurses:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-posix-pty.patch
+	"${FILESDIR}"/${PN}-termcap.patch
+)
+
+src_prepare() {
+	use unicode && eapply "${DISTDIR}"/${PN}_utf8.diff
+	sed -i 's/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/' Makefile
+
+	default
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCXX)" \
+		LIBS="-lcanna $(pkg-config --libs ncurses)"
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc 00{changes,readme}
+}
diff --git a/app-i18n/canfep/canfep-1.0.ebuild b/app-i18n/canfep/canfep-1.0.ebuild
new file mode 100644
index 000000000000..a290748825da
--- /dev/null
+++ b/app-i18n/canfep/canfep-1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Canna Japanese kana-kanji frontend processor on console"
+HOMEPAGE="http://www.geocities.co.jp/SiliconValley-Bay/7584/canfep/"
+SRC_URI="http://www.geocities.co.jp/SiliconValley-Bay/7584/${PN}/${P}.tar.gz
+	unicode? ( http://hp.vector.co.jp/authors/VA020411/patches/${PN}_utf8.diff )"
+
+LICENSE="canfep"
+SLOT="0"
+KEYWORDS="-alpha ~amd64 ppc ~sparc x86"
+IUSE="unicode"
+
+RDEPEND="app-i18n/canna
+	sys-libs/ncurses:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	use unicode && eapply "${DISTDIR}"/${PN}_utf8.diff
+	sed -i 's/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/' Makefile
+
+	default
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCXX)" \
+		LIBS="-lcanna $(pkg-config --libs ncurses)"
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc 00{changes,readme}
+}
diff --git a/app-i18n/canfep/files/canfep-posix-pty.patch b/app-i18n/canfep/files/canfep-posix-pty.patch
new file mode 100644
index 000000000000..caa451232ef4
--- /dev/null
+++ b/app-i18n/canfep/files/canfep-posix-pty.patch
@@ -0,0 +1,67 @@
+https://bugs.gentoo.org/show_bug.cgi?id=212709
+
+Author: OKUMURA N. Shin-ya <oku.ns@dream.com>
+
+--- a/pty.C
++++ b/pty.C
+@@ -257,6 +257,23 @@
+         }
+     }
+ 
++#if defined(_POSIX_C_SOURCE)
++    // BSD pty ¤¬³«¤±¤Ê¤¤¤Î¤Ç¡¢POSIX ¤ÎÊýË¡¤ò»î¤¹
++    if ((master = posix_openpt(O_RDWR)) >= 0) {
++        if (grantpt(master) == 0 && unlockpt(master) == 0) {
++            // ¥Þ¥¹¥¿¥Ç¥Ð¥¤¥¹Ì¾¤Ï¸ÇÄê
++            strcpy(line, "/dev/ptmx");
++            tcgetattr(0, &tt);
++            tt.c_iflag &= ~ISTRIP;
++            ioctl(0, TIOCGWINSZ, (char*) &win);
++            return;
++        }
++        close(master);
++    } else {
++        perror("/dev/ptmx");
++    }
++#endif  // _POSIX_C_SOURCE
++
+     printf("Out of pty's\n");
+     fail();
+ }
+@@ -265,12 +282,36 @@
+ void
+ Pty::getslave()
+ {
++#if defined(_POSIX_C_SOURCE)
++    // ¥Þ¥¹¥¿¥Ç¥Ð¥¤¥¹¤¬ POSIX Êý¼°¤Î¾ì¹ç
++    if (strcmp(line, "/dev/ptmx") == 0) {
++        char *slave_devname = ptsname(master);
++        if (slave_devname == NULL) {
++            perror("ptsname");
++            fail();
++        }
++        slave = open(slave_devname, O_RDWR);
++        if (slave < 0) {
++            perror(slave_devname);
++            fail();
++        }
++        strcpy(line, slave_devname);
++    } else {
++        line[strlen("/dev/")] = 't';
++        slave = open(line, O_RDWR);
++        if (slave < 0) {
++            perror(line);
++            fail();
++        }
++    }
++#else   // ! _POSIX_C_SOURCE
+     line[strlen("/dev/")] = 't';
+     slave = open(line, O_RDWR);
+     if (slave < 0) {
+         perror(line);
+         fail();
+     }
++#endif  // _POSIX_C_SOURCE
+     tcsetattr(slave, TCSAFLUSH, &tt);
+     if (!hs)
+         win.ws_row--;
diff --git a/app-i18n/canfep/files/canfep-termcap.patch b/app-i18n/canfep/files/canfep-termcap.patch
new file mode 100644
index 000000000000..afd215b07e79
--- /dev/null
+++ b/app-i18n/canfep/files/canfep-termcap.patch
@@ -0,0 +1,266 @@
+--- a/pty.C
++++ b/pty.C
+@@ -4,9 +4,18 @@
+ int Pty::child = 0;
+ struct termios Pty::tt;
+ int Pty::wfd = 0;
++char Pty::buf[] = "";
++char Pty::funcstr[] = "";
+ int Pty::hs = 0;
++char* Pty::so = 0;
++char* Pty::se = 0;
++char* Pty::us = 0;
++char* Pty::ue = 0;
++char* Pty::sc = 0;
++char* Pty::rc = 0;
+ char* Pty::ce = 0;
+ char* Pty::ts = 0;
++char* Pty::fs = 0;
+ char* Pty::ds = 0;
+ char Pty::endstr[] = "";
+ char Pty::endmsg[] = "";
+@@ -14,88 +23,7 @@
+ // ¥³¥ó¥¹¥È¥é¥¯¥¿¤À¤è¤ó
+ Pty::Pty(int ac, char** av, char* amsg, char* emsg)
+ {
+-    // ´Ä¶­ÊÑ¿ô TERM ¤Î¥¨¥ó¥È¥ê¤ò¼èÆÀ
+-    char buff[BUFSIZ];
+-    char* term = getenv("TERM");
+-    if (!term)
+-        term = "vt100";
+-    int ret = tgetent(buff, term);
+-    if (ret != 1) {
+-        tgetent(buff, "vt100");
+-        putenv("TERM=vt100");
+-    }
+-
+-    // termcap ¤«¤éÁõ¾þÍѤΥ¨¥ó¥È¥ê¤ò¼è¤Ã¤Æ¤¯¤ë
+-    char funcstr[BUFSIZ];
+-    char* pt = funcstr;
+-
+-    // ¥¹¥¿¥ó¥É¥¢¥¦¥È (ȿž)
+-    so = tgetstr("so", &pt);
+-    adjstr(so);
+-    se = tgetstr("se", &pt);
+-    adjstr(se);
+-
+-    // ¥¢¥ó¥À¡¼¥é¥¤¥ó (²¼Àþ)
+-    us = tgetstr("us", &pt);
+-    adjstr(us);
+-    ue = tgetstr("ue", &pt);
+-    adjstr(ue);
+-
+-    // ¥«¡¼¥½¥ë°ÌÃÖ¤ÎÊݸ¡¤Êݸ¤·¤¿°ÌÃ֤ؤÎÉüµ¢
+-    sc = tgetstr("sc", &pt);
+-    adjstr(sc);
+-    rc = tgetstr("rc", &pt);
+-    adjstr(rc);
+-
+-    // ¥«¡¼¥½¥ë°ÌÃÖ¤«¤é¹Ô¤ÎºÇ¸å¤Þ¤Ç¤òºï½ü¤¹¤ë
+-    ce = tgetstr("ce", &pt);
+-    adjstr(ce);
+-
+-    // ¥¹¥Æ¡¼¥¿¥¹¥é¥¤¥ó¤ò»ý¤Ã¤Æ¤¤¤ë¤«¤É¤¦¤«
+-    hs = tgetflag("hs");
+-
+-    // kon ¤È jfbterm ¤Ç¤Ï¥¹¥Æ¡¼¥¿¥¹¥é¥¤¥ó¤ò»È¤ï¤Ê¤¤
+-    if (strcmp(term, "kon") == 0)
+-        hs = 0;
+-    if (strcmp(term, "jfbterm") == 0)
+-        hs = 0;
+-
+-    // ¥¹¥Æ¡¼¥¿¥¹¥é¥¤¥ó¤Ø°ÜÆ°¡¤Ìá¤ë
+-    if (hs) {
+-        ts = tgoto(tgetstr("ts", &pt), 0, 0);
+-        adjstr(ts);
+-        fs = tgetstr("fs", &pt);
+-        adjstr(fs);
+-        ds = tgetstr("ds", &pt);
+-        adjstr(ds);
+-        if (ds) {
+-            strcat(endstr, ds);
+-            strcat(endstr, ce);
+-        }
+-    }
+-    else {
+-        char* cs = tgoto(tgetstr("cs", &pt), tgetnum("li") - 2, 0);
+-        adjstr(cs);
+-        if (cs) {
+-            write(1, ce, strlen(ce));
+-            write(1, cs, strlen(cs));
+-        }
+-        char* cl = tgetstr("cl", &pt);
+-        adjstr(cl);
+-        if (cl) {
+-            write(1, cl, strlen(cl));
+-            strcat(endstr, cl);
+-        }
+-        ds = tgoto(tgetstr("cs", &pt), tgetnum("li") - 1, 0);
+-        adjstr(ds);
+-        if (ds) {
+-            strcat(endstr, ds);
+-            strcat(endstr, ce);
+-        }
+-        ts = tgoto(tgetstr("cm", &pt), 0, tgetnum("li") - 1);
+-        adjstr(ts);
+-        fs = rc;
+-    }
++    gettermcap();
+ 
+     // ³«»Ï¤È½ªÎ»¤Î¥á¥Ã¥»¡¼¥¸
+     if (amsg && ac == 1)
+@@ -209,21 +137,75 @@
+     done();
+ }
+ 
+-// termcap ¥¨¥ó¥È¥ê¤«¤é¥Ñ¥Ç¥£¥ó¥°¤òºï½ü¤¹¤ë
+ void
+-Pty::adjstr(char* str)
++Pty::gettermcap()
+ {
+-    char* sp = strdup(str);
+-    char* p = sp;
+-    while (*p != '\0') {
+-        if (strncmp(p, "$<", 2) == 0) {
+-            while (*p != '>')
+-                p++;
+-            *p = '\0';
++    // ´Ä¶­ÊÑ¿ô TERM ¤Î¥¨¥ó¥È¥ê¤ò¼èÆÀ
++    char* term = getenv("TERM");
++    if (!term)
++        term = "vt100";
++    int ret = tgetent(buf, term);
++    if (ret != 1) {
++        tgetent(buf, "vt100");
++        putenv("TERM=vt100");
++    }
++
++    // termcap ¤«¤éÁõ¾þÍѤΥ¨¥ó¥È¥ê¤ò¼è¤Ã¤Æ¤¯¤ë
++    char* pt = funcstr;
++
++    // ¥¹¥¿¥ó¥É¥¢¥¦¥È (ȿž)
++    so = tgetstr("so", &pt);
++    se = tgetstr("se", &pt);
++
++    // ¥¢¥ó¥À¡¼¥é¥¤¥ó (²¼Àþ)
++    us = tgetstr("us", &pt);
++    ue = tgetstr("ue", &pt);
++
++    // ¥«¡¼¥½¥ë°ÌÃÖ¤ÎÊݸ¡¤Êݸ¤·¤¿°ÌÃ֤ؤÎÉüµ¢
++    sc = tgetstr("sc", &pt);
++    rc = tgetstr("rc", &pt);
++
++    // ¥«¡¼¥½¥ë°ÌÃÖ¤«¤é¹Ô¤ÎºÇ¸å¤Þ¤Ç¤òºï½ü¤¹¤ë
++    ce = tgetstr("ce", &pt);
++
++    // ¥¹¥Æ¡¼¥¿¥¹¥é¥¤¥ó¤ò»ý¤Ã¤Æ¤¤¤ë¤«¤É¤¦¤«
++    hs = tgetflag("hs");
++
++    // kon ¤È jfbterm ¤Ç¤Ï¥¹¥Æ¡¼¥¿¥¹¥é¥¤¥ó¤ò»È¤ï¤Ê¤¤
++    if (strcmp(term, "kon") == 0)
++        hs = 0;
++    if (strcmp(term, "jfbterm") == 0)
++        hs = 0;
++
++    // ¥¹¥Æ¡¼¥¿¥¹¥é¥¤¥ó¤Ø°ÜÆ°¡¤Ìá¤ë
++    if (hs) {
++        ts = tgoto(tgetstr("ts", &pt), 0, 0);
++        fs = tgetstr("fs", &pt);
++        ds = tgetstr("ds", &pt);
++        if (ds) {
++            strcat(endstr, ds);
++            strcat(endstr, ce);
+         }
+-        *str++ = *p++;
+     }
+-    free(sp);
++    else {
++        char* cs = tgoto(tgetstr("cs", &pt), tgetnum("li") - 2, 0);
++        if (cs) {
++            write(1, ce, strlen(ce));
++            write(1, cs, strlen(cs));
++        }
++        char* cl = tgetstr("cl", &pt);
++        if (cl) {
++            write(1, cl, strlen(cl));
++            strcat(endstr, cl);
++        }
++        ds = tgoto(tgetstr("cs", &pt), tgetnum("li") - 1, 0);
++        if (ds) {
++            strcat(endstr, ds);
++            strcat(endstr, ce);
++        }
++        ts = tgoto(tgetstr("cm", &pt), 0, tgetnum("li") - 1);
++        fs = rc;
++    }
+ }
+ 
+ // ¥Þ¥¹¥¿¥Ç¥Ð¥¤¥¹¤ò¼è¤ë
+@@ -327,34 +309,7 @@
+ {
+     signal(SIGWINCH, SIG_IGN);
+ 
+-    // ¥¹¥Æ¡¼¥¿¥¹¥é¥¤¥ó¤¬»È¤¨¤Ê¤¤¾ì¹ç¤Ï cs/ds/ts ¤ò¼è¤êľ¤¹
+-    if (!hs) {
+-        char buff[BUFSIZ];
+-        char* term = getenv("TERM");
+-        tgetent(buff, term);
+-        char funcstr[BUFSIZ];
+-        char* pt = funcstr;
+-        char* cs = tgoto(tgetstr("cs", &pt), tgetnum("li") - 2, 0);
+-        adjstr(cs);
+-        if (cs) {
+-            write(1, ce, strlen(ce));
+-            write(1, cs, strlen(cs));
+-        }
+-        char* cl = tgetstr("cl", &pt);
+-        adjstr(cl);
+-        if (cl) {
+-            write(1, cl, strlen(cl));
+-            strcpy(endstr, cl);
+-        }
+-        ds = tgoto(tgetstr("cs", &pt), tgetnum("li") - 1, 0);
+-        adjstr(ds);
+-        if (ds) {
+-            strcat(endstr, ds);
+-            strcat(endstr, ce);
+-        }
+-        ts = tgoto(tgetstr("cm", &pt), 0, tgetnum("li") - 1);
+-        adjstr(ts);
+-    }
++    gettermcap();
+ 
+     // ¥¦¥£¥ó¥É¥¦¤Î¥µ¥¤¥º¤òÀßÄꤷľ¤¹ (stty -a ¤Î ¹Ô¿ô/·å¿ô Åù)
+     struct winsize win;
+--- a/pty.H
++++ b/pty.H
+@@ -50,18 +50,21 @@
+     int rfd;
+     static int wfd;
+ private:
+-    static void adjstr(char* str);
++    static char buf[BUFSIZ];
++    static char funcstr[BUFSIZ];
++private:
++    static void gettermcap();
+ protected:
+     static int hs;
+-    char* so;
+-    char* se;
+-    char* us;
+-    char* ue;
+-    char* sc;
+-    char* rc;
++    static char* so;
++    static char* se;
++    static char* us;
++    static char* ue;
++    static char* sc;
++    static char* rc;
+     static char* ce;
+     static char* ts;
+-    char* fs;
++    static char* fs;
+     static char* ds;
+ private:
+     static void finish();
diff --git a/app-i18n/canfep/metadata.xml b/app-i18n/canfep/metadata.xml
new file mode 100644
index 000000000000..e1a49f498885
--- /dev/null
+++ b/app-i18n/canfep/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-i18n/canna-3.7_p3-r1 b/app-i18n/canna-3.7_p3-r1
deleted file mode 100644
index d330ffae0511..000000000000
--- a/app-i18n/canna-3.7_p3-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=x11-misc/gccmakedep x11-misc/imake
-DESCRIPTION=A client-server based Kana-Kanji conversion system
-EAPI=6
-HOMEPAGE=http://canna.osdn.jp/
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=MIT GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/canna/9565/Canna37p3.tar.bz2
-_eclasses_=cannadic	6d8054590c0aef2c11c567e1a815c052	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=13a14c79c1da1b5d03a1984909cba7e7
diff --git a/app-i18n/canna-3.7_p3-r2 b/app-i18n/canna-3.7_p3-r2
deleted file mode 100644
index 4f93b50a9900..000000000000
--- a/app-i18n/canna-3.7_p3-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=x11-misc/gccmakedep x11-misc/imake doc? ( app-text/ghostscript-gpl dev-texlive/texlive-langjapanese dev-texlive/texlive-latexrecommended )
-DESCRIPTION=A client-server based Kana-Kanji conversion system
-EAPI=6
-HOMEPAGE=http://canna.osdn.jp/
-IUSE=doc ipv6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/canna/9565/Canna37p3.tar.bz2
-_eclasses_=cannadic	6d8054590c0aef2c11c567e1a815c052	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2ad533e8571f166a2b3597db0d3a749f
diff --git a/app-i18n/canna-3.7_p3-r3 b/app-i18n/canna-3.7_p3-r3
deleted file mode 100644
index 9cc9cd9d8a4a..000000000000
--- a/app-i18n/canna-3.7_p3-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=canuum? ( dev-libs/libspt sys-libs/ncurses:= ) x11-misc/gccmakedep x11-misc/imake canuum? ( virtual/pkgconfig ) doc? ( app-text/ghostscript-gpl dev-texlive/texlive-langjapanese dev-texlive/texlive-latexrecommended ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A client-server based Kana-Kanji conversion system
-EAPI=6
-HOMEPAGE=http://canna.osdn.jp/
-IUSE=canuum doc ipv6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT GPL-2
-RDEPEND=canuum? ( dev-libs/libspt sys-libs/ncurses:= )
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/canna/9565/Canna37p3.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cannadic	6d8054590c0aef2c11c567e1a815c052	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b1026274d71d4055f0065f8cf46fb812
diff --git a/app-i18n/canna/Manifest b/app-i18n/canna/Manifest
new file mode 100644
index 000000000000..70bcad257d9e
--- /dev/null
+++ b/app-i18n/canna/Manifest
@@ -0,0 +1,16 @@
+AUX canna-Wformat-security.patch 4545 BLAKE2B 796bd97f2b9af03a63c13cde02d59eda227b0b7ba51238de9780057447fd23bd42290e07d1585804e5141ef754919ddc10e908296a7ca8fcbf47366989196c34 SHA512 7c2649d98b5eac8d625586b245fff7e07b19616395e754a59443d7858e818f3651fb5e03e97ebcacb5ff4b2c1cb0f0c45aa0838ae85350e0c24906faa3a36102
+AUX canna-Wformat.patch 340 BLAKE2B b9b31b256ae43dc8ec4e1589bef9c6f221e4e8d4a8532ac7cb6e20ff58806b73b7009c30d83656c879b243fce674263e0b6f1077a8e30595704230cebaf71dd4 SHA512 38b2cc703ff69f29352b1c2bc4bc01c3387edaada98f724344525c68ee5a8ae1490ba0ce84fac53b00ca89b7cab201640631638ee578fb00211cc59d4d968bcd
+AUX canna-canuum.patch 779 BLAKE2B a27f98b535846fb387cb9946319a52c7b5fb22feb19bdc2f3f8860066234459ae66b643d298bdef821edc3c918956941dab6a8770b81e141a5709cda89d7b980 SHA512 62005fe564b7c6cb627c10af136e4ad15bfd6f2d17cd71093ae34b9e7f7f47c582ff5c32fadf5068fdaa5c685dd2b898cccb71ccd86b19b429e34f57c290cdd6
+AUX canna-gentoo.patch 4310 BLAKE2B 8386af1ba3b2c6c2a420246c6de5f218c92553c3569fb47bf275682570ca877c7e0d8cd61c36537218cca77f60421d7ccf460615ff957e54d9488f1df2789cd4 SHA512 31d893ba6fe873d1b9ceb5106c87d027b31013e049ed673d14e7f32232bf259b44a1fa397c133fa0b5a39252a61d400d4d1951a4448e4aaffad649f648652e6b
+AUX canna-kpdef.patch 202 BLAKE2B 44c443da25ac63ad7a418378df55c490c3f288c0ccbb6803fd6d7f2fcd764dca32650f484ec8a5267ca0d8db0349f3736e974a44e7ab0eeebee32a4a5603f3f1 SHA512 f258be22226109b63df7e2aae3a42fb42d13d9f3ca4b92ad9a15f477ac0a4906bf5af3065f4ebfc69a49165073451f310a6b8c43ad57cb772d9af6ece74a50df
+AUX canna-overflow.patch 788 BLAKE2B bd71eafb119ce107540ae4de355755e7e575ee8d197414e24831f6025d2445395a816a7b3c1a9824e5f9d6cc1b732389551abebbb706cfeeac17c1d61275f83a SHA512 7caaf95c9e01277247036488e3f154abca6e7811e17a2c7d1dd34f3a1906ee780ed2cd03a0435d051098d99521b55350d3332e218cebfdebf2391e1f38da541c
+AUX canna-posix-sort.patch 282 BLAKE2B f13360695b7209d1865494438ffc9f5e246173bc82a578ca2e2790072e338c59dd6dc762993624514337cf6d9001020fbf093307ea8c5ea408ae5d911649cc09 SHA512 310b16878d8f2fb0fa35d45ac43709186a70a36d4fba86abe78a6ccc7df410ddba38f7113effa69da4a5afe1ecf9d81175d285338e59793fee352eca93069d5d
+AUX canna.confd 129 BLAKE2B aef79cdd496fbf5a13929a8fa1b08b65ab15e15c9ce690d5f345372e6e5e15cf54b96ce851a564ba4a64613976630b4cc828fd0c9ec4d24f4e0305bc23eab3eb SHA512 401fdca224f3ab85ceff0786865efdda01c121481f9f084c3983f806d5e5543b706a844676d65529fd06a19d264877499c01c1ecc2b4a7dcb94e686c20d34a41
+AUX canna.hosts 5 BLAKE2B a10fe2813bf946464641605e8cdda362629a62817de0a7f72f2b0e54963d3370ebd8d9fa9db28753d1e0567d78c0e5c830c1e13db54e4eea562276263da9fda8 SHA512 88cabd1d372defd4bed25c23bafa0a883b13c1184be0287717df6a0946de0d39b73cdbda3660432f787cded46b57bd187106b12969e960760a9cc2db76e5b497
+AUX canna.initd 782 BLAKE2B 1e34cfc3ed28f5903600f591e55d0eb559aa5336eee54a54a7ab40d2be3816f6a62a947e9c87d4834425f71640c96847836830439f4eeb76a4f25a372fc9d1d0 SHA512 1fd348f2aa4139bbe6154b157b75bf8a39a8ddf36a9a072088279c88241981a9af9024df71aa777ca4e93270d53d0bea8363b31cfb07d229d4a37c48828779e6
+AUX update-canna-dics_dir 1101 BLAKE2B 9b429c2ddfb0e3c2c8a754f7fb61b776abbb809f81c93127e5f8be9ec768df6c28fcce75fe69a5b92a195ce49e20572c083aca5b4309f042a50b53bffafc4042 SHA512 135fdabf3995ddf82d3f14aece908e952f3d514fd83e2f86d8113b1026b7dcaea2156225be251a6d9a74a35ee075d5ebb32c05d9deb85905120287d0af1f4207
+DIST Canna37p3.tar.bz2 1263065 BLAKE2B b5fb496c0ef71dc57b2da1409eea2238ea62ece3286d498d694bc7a18cb0f5e052dca95d692b4302988acd2199d350b893ae4aedc91aab0b737c3e0675be9cba SHA512 82846f2393aa2654dd2c97a93178098b8bd11e5409b584447f1b6fdf303adacc9802e2293cafd98b68af8b69622625ed00aa9712bf270feaa119adfdf4211158
+EBUILD canna-3.7_p3-r1.ebuild 2258 BLAKE2B b03a2e8c85e6fb544b2870e44990d35f5b48616f0500c0ac332a2287e4ab3e0b61bd222023b6cf4c207dee49c3e96dad2818d9042b8b353f5bcfd4f2bd972a59 SHA512 77a8ab7a8a8ffef263500364aa5fec7f888f2c55b9d5adea10c531852b8317872dfbfb807e9f92daacefee2a0bb725cd8a86f53f648964d672edfe8e0b238458
+EBUILD canna-3.7_p3-r2.ebuild 2893 BLAKE2B caf22d1d8914257992917784c03f173446e3cfa0c28aeb55a9007b07d053e33d9cc574d4f55eb253954442ab8c6f17805bf72c04113b36874a6693fe690490a2 SHA512 8c5a7660f2be089841953914fa8863d0ba9190b88c23d8266d5181c1da9e17f313e36b4448ec8009a65802b203d69c72428a640a3a2e0bf01049dffac3f12bba
+EBUILD canna-3.7_p3-r3.ebuild 3297 BLAKE2B 5cb2d2305ab5b780efa5ab5a261c12f48aa536c53283c05bc1a448669c9d639cd9fb41f46609135082397bec23e00634691e2011a421bed9030abcbf080baacc SHA512 16111ac8cef55bfb54c6666ed50288629e3753d571defa98d68fb156e2e4d8c562c130b2ea374faeab2194a53e6521d66e092e054bc884cfad1ead480e9b7323
+MISC metadata.xml 383 BLAKE2B 2947ceefe007eb9bcfd46a69a4b97a2406383931cb320cb594b96952697378147824461f1b55d5caddc419b19aebeb1c5ce69c0f0d31568cbbbe3d1d15fba9ba SHA512 8affc10d697147ea5430d73c40eb4e7621ee9a06d444725566d4e16a28ccab4f53aed3025905894fe6cba0ea874dcf0d2d583d3dcedf3a0ccc8b139af02e5e98
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild b/app-i18n/canna/canna-3.7_p3-r1.ebuild
new file mode 100644
index 000000000000..e38caaff6fb5
--- /dev/null
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cannadic toolchain-funcs
+
+MY_P="Canna${PV//[._]/}"
+
+DESCRIPTION="A client-server based Kana-Kanji conversion system"
+HOMEPAGE="http://canna.osdn.jp/"
+SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND="x11-misc/gccmakedep
+	x11-misc/imake"
+RDEPEND=""
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-kpdef.patch
+	"${FILESDIR}"/${PN}-overflow.patch
+	"${FILESDIR}"/${PN}-posix-sort.patch
+	"${FILESDIR}"/${PN}-Wformat.patch
+	"${FILESDIR}"/${PN}-Wformat-security.patch
+)
+DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
+
+src_prepare() {
+	default
+
+	find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die
+
+	# Multilib-strict fix for amd64
+	sed -i "/DefLibCannaDir/s:/lib$:/$(get_libdir):" Canna.conf
+}
+
+src_configure() {
+	xmkmf -a || die
+}
+
+src_compile() {
+	# bug #279706
+	emake -j1 \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		SHLIBGLOBALSFLAGS="${LDFLAGS}" \
+		${PN}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install.man
+	einstalldocs
+
+	dodir /usr/share/man{,/ja}/man8
+	local man mandir
+	for man in cannaserver cannakill ; do
+		for mandir in "${D}"/usr/share/man "${D}"/usr/share/man/ja ; do
+			mv ${mandir}/man1/${man}.1 ${mandir}/man8/${man}.8
+		done
+	done
+
+	# for backward compatibility
+	dosbin "${FILESDIR}"/update-canna-dics_dir
+
+	keepdir /var/lib/${PN}/dic/{user,group}
+	fowners bin:bin /var/lib/${PN}/dic/{user,group}
+	fperms 0775 /var/lib/${PN}/dic/{user,group}
+
+	insinto /var/lib/${PN}/dic/dics.d
+	newins "${ED}"/var/lib/${PN}/dic/${PN}/dics.dir 00${PN}.dics.dir
+
+	keepdir /var/log/${PN}
+
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+	insinto /etc
+	newins "${FILESDIR}"/${PN}.hosts hosts.${PN}
+}
+
+pkg_postinst() {
+	update-cannadic-dir
+
+	if ! locale -a | grep -iq "ja_JP.eucjp"; then
+		elog "Some dictionary tools in this package require ja_JP.EUC-JP locale."
+		elog
+		elog "# echo 'ja_JP.EUC-JP EUC-JP' >> /etc/locale.gen"
+		elog "# locale-gen"
+		elog
+	fi
+}
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild
new file mode 100644
index 000000000000..a06d55f21d76
--- /dev/null
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cannadic toolchain-funcs
+
+MY_P="Canna${PV//[._]/}"
+
+DESCRIPTION="A client-server based Kana-Kanji conversion system"
+HOMEPAGE="http://canna.osdn.jp/"
+SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc ipv6"
+
+DEPEND="x11-misc/gccmakedep
+	x11-misc/imake
+	doc? (
+		app-text/ghostscript-gpl
+		dev-texlive/texlive-langjapanese
+		dev-texlive/texlive-latexrecommended
+	)"
+RDEPEND=""
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-kpdef.patch
+	"${FILESDIR}"/${PN}-overflow.patch
+	"${FILESDIR}"/${PN}-posix-sort.patch
+	"${FILESDIR}"/${PN}-Wformat.patch
+	"${FILESDIR}"/${PN}-Wformat-security.patch
+)
+DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
+
+src_prepare() {
+	default
+
+	find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die
+
+	sed -i \
+		-e "/DefLibCannaDir/s:/lib$:/$(get_libdir):" \
+		-e "/UseInet6/s:0:$(usex ipv6 1 0):" \
+		Canna.conf
+}
+
+src_configure() {
+	xmkmf -a || die
+
+	if use doc; then
+		cd doc/man/guide/tex
+		xmkmf -a || die
+		cd - > /dev/null
+	fi
+}
+
+src_compile() {
+	# bug #279706
+	emake -j1 \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		SHLIBGLOBALSFLAGS="${LDFLAGS}" \
+		${PN}
+
+	if use doc; then
+		# NOTE: build fails if infinality enabled in fontconfig
+		einfo "Compiling DVI, PS, and PDF documents"
+		# bug #223077
+		emake -C doc/man/guide/tex -j1 \
+			JLATEXCMD="platex -kanji=euc" \
+			DVI2PSCMD="dvips" \
+			VARTEXFONTS="${T}"/fonts \
+			${PN}.ps \
+			${PN}.pdf
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install.man
+	einstalldocs
+
+	dodir /usr/share/man{,/ja}/man8
+	local man mandir
+	for man in cannaserver cannakill ; do
+		for mandir in "${D}"/usr/share/man "${D}"/usr/share/man/ja ; do
+			mv ${mandir}/man1/${man}.1 ${mandir}/man8/${man}.8
+		done
+	done
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins doc/man/guide/tex/${PN}.{dvi,ps,pdf}
+	fi
+
+	# for backward compatibility
+	dosbin "${FILESDIR}"/update-canna-dics_dir
+
+	keepdir /var/lib/${PN}/dic/{user,group}
+	fowners bin:bin /var/lib/${PN}/dic/{user,group}
+	fperms 0775 /var/lib/${PN}/dic/{user,group}
+
+	insinto /var/lib/${PN}/dic/dics.d
+	newins "${ED}"/var/lib/${PN}/dic/${PN}/dics.dir 00${PN}.dics.dir
+
+	keepdir /var/log/${PN}
+
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+	insinto /etc
+	newins "${FILESDIR}"/${PN}.hosts hosts.${PN}
+}
+
+pkg_postinst() {
+	update-cannadic-dir
+
+	if ! locale -a | grep -iq "ja_JP.eucjp"; then
+		elog "Some dictionary tools in this package require ja_JP.EUC-JP locale."
+		elog
+		elog "# echo 'ja_JP.EUC-JP EUC-JP' >> /etc/locale.gen"
+		elog "# locale-gen"
+		elog
+	fi
+}
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild b/app-i18n/canna/canna-3.7_p3-r3.ebuild
new file mode 100644
index 000000000000..ac8473821f75
--- /dev/null
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools cannadic toolchain-funcs
+
+MY_P="Canna${PV//[._]/}"
+
+DESCRIPTION="A client-server based Kana-Kanji conversion system"
+HOMEPAGE="http://canna.osdn.jp/"
+SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="canuum doc ipv6"
+
+RDEPEND="canuum? (
+		dev-libs/libspt
+		sys-libs/ncurses:=
+	)"
+DEPEND="${RDEPEND}
+	x11-misc/gccmakedep
+	x11-misc/imake
+	canuum? ( virtual/pkgconfig )
+	doc? (
+		app-text/ghostscript-gpl
+		dev-texlive/texlive-langjapanese
+		dev-texlive/texlive-latexrecommended
+	)"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-canuum.patch
+	"${FILESDIR}"/${PN}-kpdef.patch
+	"${FILESDIR}"/${PN}-overflow.patch
+	"${FILESDIR}"/${PN}-posix-sort.patch
+	"${FILESDIR}"/${PN}-Wformat.patch
+	"${FILESDIR}"/${PN}-Wformat-security.patch
+)
+DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "/DefLibCannaDir/s:/lib$:/$(get_libdir):" \
+		-e "/UseInet6/s:0:$(usex ipv6 1 0):" \
+		${PN^c}.conf
+
+	if use canuum; then
+		cd canuum
+		mv configure.{in,ac}
+		eautoreconf
+		cd - > /dev/null
+	fi
+}
+
+src_configure() {
+	xmkmf -a || die
+
+	if use canuum; then
+		cd canuum
+		xmkmf -a || die
+		# workaround for sys-libs/ncurses[tinfo]
+		sed -i "/^TERMCAP_LIB/s:=.*:=$(pkg-config --libs ncurses):" Makefile
+		cd - > /dev/null
+	fi
+
+	if use doc; then
+		cd doc/man/guide/tex
+		xmkmf -a || die
+		cd - > /dev/null
+	fi
+}
+
+src_compile() {
+	# bug #279706
+	emake -j1 \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		SHLIBGLOBALSFLAGS="${LDFLAGS}" \
+		${PN}
+
+	if use canuum; then
+		einfo "Compiling canuum"
+		emake -C canuum -j1 \
+			CC="$(tc-getCC)" \
+			CDEBUGFLAGS="${CFLAGS}" \
+			LOCAL_LDFLAGS="${LDFLAGS}" \
+			canuum
+	fi
+
+	if use doc; then
+		# NOTE: build fails if infinality enabled in fontconfig
+		einfo "Compiling DVI, PS, and PDF documents"
+		# bug #223077
+		emake -C doc/man/guide/tex -j1 \
+			JLATEXCMD="platex -kanji=euc" \
+			DVI2PSCMD="dvips" \
+			VARTEXFONTS="${T}"/fonts \
+			${PN}.ps \
+			${PN}.pdf
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install.man
+	einstalldocs
+
+	if use canuum; then
+		emake -C canuum DESTDIR="${D}" install install.man
+		docinto canuum
+		dodoc README.jp
+	fi
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins doc/man/guide/tex/${PN}.{dvi,ps,pdf}
+	fi
+
+	# for backward compatibility
+	dosbin "${FILESDIR}"/update-canna-dics_dir
+
+	keepdir /var/lib/${PN}/dic/{user,group}
+	fowners bin:bin /var/lib/${PN}/dic/{user,group}
+	fperms 0775 /var/lib/${PN}/dic/{user,group}
+
+	insinto /var/lib/${PN}/dic/dics.d
+	newins "${ED}"/var/lib/${PN}/dic/${PN}/dics.dir 00${PN}.dics.dir
+
+	keepdir /var/log/${PN}
+
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+	insinto /etc
+	newins "${FILESDIR}"/${PN}.hosts hosts.${PN}
+}
+
+pkg_postinst() {
+	update-cannadic-dir
+
+	if ! locale -a | grep -iq "ja_JP.eucjp"; then
+		elog "Some dictionary tools in this package require ja_JP.EUC-JP locale."
+		elog
+		elog "# echo 'ja_JP.EUC-JP EUC-JP' >> /etc/locale.gen"
+		elog "# locale-gen"
+		elog
+	fi
+}
diff --git a/app-i18n/canna/files/canna-Wformat-security.patch b/app-i18n/canna/files/canna-Wformat-security.patch
new file mode 100644
index 000000000000..c83552b5cba5
--- /dev/null
+++ b/app-i18n/canna/files/canna-Wformat-security.patch
@@ -0,0 +1,199 @@
+--- a/cmd/catdic/can.c
++++ b/cmd/catdic/can.c
+@@ -1236,7 +1236,7 @@
+ 	break;
+       default:
+ 	if (init[0] == '/') {
+-	    (void)fprintf(stderr,msg_abnl);
++	    (void)fprintf(stderr,"%s",msg_abnl);
+ 	} else {
+ 	    (void)fprintf(stderr,msg_abnls,init);
+ 	}
+@@ -1297,11 +1297,11 @@
+ 
+     if ( opt_fq ) {
+       if ( opt_s ) {
+-        (void) fprintf(stderr,msg_sfq);
++        (void) fprintf(stderr,"%s",msg_sfq);
+         exit(ERR_VALUE) ;
+       }  
+       if ( opt_l || opt_std ) {
+-        (void) fprintf(stderr,msg_l);
++        (void) fprintf(stderr,"%s",msg_l);
+         exit(ERR_VALUE) ;
+       }
+       mode = mode | PL_DIC ;
+@@ -1491,7 +1491,7 @@
+     break;
+   default:
+     if(init[0] == '/') {
+-      fprintf(stderr,msg_abnl );
++      fprintf(stderr,"%s",msg_abnl );
+     }
+     else {
+       fprintf(stderr,msg_abnls,init);
+--- a/cmd/catdic/rutil.c
++++ b/cmd/catdic/rutil.c
+@@ -271,7 +271,7 @@
+ 	 "Dictionary \"%s\" does not exist.\n"), dicname);
+     break;
+   case NOTALC :
+-    (void)fprintf(stderr, msg_mem);
++    (void)fprintf(stderr, "%s", msg_mem);
+     break;
+   case BADF :
+     (void)fprintf(stderr, gettxt("cannacmd:196",
+@@ -297,7 +297,7 @@
+ 	(void)fprintf(stderr,msg_abnls,init);
+     }
+     else {
+-	(void)fprintf(stderr,msg_abnl);
++	(void)fprintf(stderr,"%s",msg_abnl);
+     }
+     break;
+   }
+@@ -321,7 +321,7 @@
+ 	(void)fprintf(stderr, msg_abnls, init);
+     }
+     else {
+-	(void)fprintf(stderr, msg_abnl);
++	(void)fprintf(stderr, "%s", msg_abnl);
+     }
+     ret = -1;
+     return ret;
+@@ -332,13 +332,13 @@
+ 	  (void)fprintf(stderr, msg_mnts, init);
+       }
+       else {
+-	  (void)fprintf(stderr, msg_mnt);
++	  (void)fprintf(stderr, "%s", msg_mnt);
+       }
+       ret = -1;
+       return ret;
+     }
+     if ((mode & PL_DIC) == PL_DIC ) {
+-      (void)fprintf(stderr,msg_fq);
++      (void)fprintf(stderr,"%s",msg_fq);
+       ret = -1 ;
+       return ret ;
+     }
+@@ -359,7 +359,7 @@
+     ret = 0;
+     break;
+   case NOTALC :
+-    (void)fprintf(stderr, msg_mem);
++    (void)fprintf(stderr, "%s", msg_mem);
+     ret = -1;
+     break;
+   case BADF :
+@@ -421,7 +421,7 @@
+     ret = -1;
+     break;
+   case BADCONT :
+-    (void)fprintf(stderr,msg_cnt);
++    (void)fprintf(stderr,"%s",msg_cnt);
+     ret = -1;
+     break;
+   default:
+@@ -429,7 +429,7 @@
+       (void)fprintf(stderr, msg_abnls, init);
+     }
+     else {
+-	(void)fprintf(stderr, msg_abnl);
++	(void)fprintf(stderr, "%s", msg_abnl);
+     }
+     exit(ERR_VALUE);
+     break;
+@@ -448,7 +448,7 @@
+     ret = 0;
+     break;
+   case NOTALC :
+-    (void)fprintf(stderr, msg_mem);
++    (void)fprintf(stderr, "%s", msg_mem);
+     ret = -1;
+     break;
+   case BADF :
+@@ -509,11 +509,11 @@
+     ret = -1;
+     break;
+   case BADARG :
+-    (void)fprintf(stderr,msg_fq);
++    (void)fprintf(stderr,"%s",msg_fq);
+     ret = -1;
+     break;
+   case BADCONT :
+-    (void)fprintf(stderr,msg_cnt);
++    (void)fprintf(stderr,"%s",msg_cnt);
+     ret = -1;
+     break;
+   case NOENT  :   /* 91.12.03 */
+@@ -526,7 +526,7 @@
+       (void)fprintf(stderr, msg_abnls, init);
+     }
+     else {
+-	(void)fprintf(stderr, msg_abnl);
++	(void)fprintf(stderr, "%s", msg_abnl);
+     }
+     exit(ERR_VALUE);
+     break;
+@@ -556,7 +556,7 @@
+       (void)fprintf(stderr, msg_abnls,init);
+     }
+     else {
+-	(void)fprintf(stderr, msg_abnl);
++	(void)fprintf(stderr, "%s", msg_abnl);
+     }
+     ret = -1;
+     return ret;
+@@ -567,13 +567,13 @@
+ 	(void)fprintf(stderr, msg_mnts, init);
+       }
+       else {
+-	  (void)fprintf(stderr, msg_mnt);
++	  (void)fprintf(stderr, "%s", msg_mnt);
+       }
+       ret = -1;
+       return ret;
+     }
+     if ((mode & PL_DIC) == PL_DIC ) {
+-      (void)fprintf(stderr, msg_fq);
++      (void)fprintf(stderr, "%s", msg_fq);
+       ret = -1 ;
+       return ret ;
+     }
+@@ -608,7 +608,7 @@
+     ret = -2;   /* 93.03.03 */
+     break;
+   case BADCONT :
+-    (void)fprintf(stderr, msg_cnt);
++    (void)fprintf(stderr, "%s", msg_cnt);
+     ret = -1;
+     break;
+   default:
+@@ -616,7 +616,7 @@
+ 	(void)fprintf(stderr, msg_abnls, init);
+     }
+     else {
+-	(void)fprintf(stderr, msg_abnl);
++	(void)fprintf(stderr, "%s", msg_abnl);
+     }
+     ret = -1;
+     break;
+@@ -651,7 +651,7 @@
+     ret = -2;   /* 93.03.03 */
+     break;
+   case BADCONT :
+-    (void)fprintf(stderr, msg_cnt);
++    (void)fprintf(stderr, "%s", msg_cnt);
+     ret = -1;
+     break;
+   default:
+@@ -659,7 +659,7 @@
+ 	(void)fprintf(stderr, msg_abnls, init);
+     }
+     else {
+-	(void)fprintf(stderr, msg_abnl);
++	(void)fprintf(stderr, "%s", msg_abnl);
+     }
+     ret = -1;
+     break;
diff --git a/app-i18n/canna/files/canna-Wformat.patch b/app-i18n/canna/files/canna-Wformat.patch
new file mode 100644
index 000000000000..a8f5aa37163e
--- /dev/null
+++ b/app-i18n/canna/files/canna-Wformat.patch
@@ -0,0 +1,11 @@
+--- a/doc/man/guide/tex/cannaindex.c
++++ b/doc/man/guide/tex/cannaindex.c
+@@ -198,7 +198,7 @@
+   }
+   inf = fopen(argv[1], "r");
+   if (!inf) {
+-    fprintf(stderr, "%s: Can not open file \"%s\".\n", argv[1]);
++    fprintf(stderr, "%s: Can not open file \"%s\".\n", program, argv[1]);
+     exit(1);
+   }
+   pages = readindex(inf, entries);
diff --git a/app-i18n/canna/files/canna-canuum.patch b/app-i18n/canna/files/canna-canuum.patch
new file mode 100644
index 000000000000..293ffbb54c90
--- /dev/null
+++ b/app-i18n/canna/files/canna-canuum.patch
@@ -0,0 +1,34 @@
+--- a/canuum/configure.in
++++ b/canuum/configure.in
+@@ -401,7 +401,7 @@
+ dnl
+ olibs="$LIBS"
+ AC_MSG_CHECKING(--with-term-libs argument)
+-AC_ARG_WITH(tlib,
++AC_ARG_WITH(term-libs,
+ [  --with-term-libs=-lLIB    terminal library to be used ],)
+ if test -n "$with_term_libs"; then
+   AC_MSG_RESULT($with_term_libs)
+--- a/canuum/wnn_config.h
++++ b/canuum/wnn_config.h
+@@ -149,8 +149,8 @@
+ #define TTY_KCODE J_EUJIS
+ #define PTY_KCODE J_EUJIS
+ # else /* !DGUX */
+-#define TTY_KCODE J_JIS
+-#define PTY_KCODE J_JIS
++#define TTY_KCODE J_EUJIS
++#define PTY_KCODE J_EUJIS
+ # endif
+ #endif
+ 
+--- a/canuum/wnn_os.h
++++ b/canuum/wnn_os.h
+@@ -41,6 +41,7 @@
+ #include <signal.h>
+ #if STDC_HEADERS
+ #  include <stdlib.h>
++#  include <string.h>
+ #  include <limits.h>
+ #endif /* STDC_HEADERS */
+ 
diff --git a/app-i18n/canna/files/canna-gentoo.patch b/app-i18n/canna/files/canna-gentoo.patch
new file mode 100644
index 000000000000..7ecfb4b9cd84
--- /dev/null
+++ b/app-i18n/canna/files/canna-gentoo.patch
@@ -0,0 +1,146 @@
+--- a/Canna.conf
++++ b/Canna.conf
+@@ -109,12 +109,12 @@
+ # define DefErrDir $(cannaPrefix)/log
+ # define DefLibCannaDir $(cannaExecPrefix)/lib
+ #else 
+-# define DefCannaPrefix /usr/local/canna
++# define DefCannaPrefix $(EPREFIX)/usr
+ # ifdef ObsoleteInstallDir
+ #  define DefErrDir /usr/spool/canna
+ #  define DefLibCannaDir /usr/lib
+ # else
+-#  define DefErrDir /var/log
++#  define DefErrDir $(EPREFIX)/var/log/$(PN)
+ #  define DefLibCannaDir $(cannaExecPrefix)/lib
+ # endif
+ #endif
+@@ -123,7 +123,7 @@
+ # define DefCannaLibDir $(cannaPrefix)/lib
+ #else
+ # define DefCannaSrvDir $(cannaExecPrefix)/sbin
+-# define DefCannaLibDir $(cannaPrefix)/share/canna
++# define DefCannaLibDir $(cannaPrefix)/share/$(PN)
+ #endif
+ 
+ #if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) \
+@@ -147,9 +147,11 @@
+ XCOMM cannaLibDir = /var/lib/canna
+ XCOMM cannaLibDir = /var/db/canna
+ cannaLibDir = DefCannaLibDir
+-XCOMM cannaManDir = $(cannaPrefix)/share/man
+-cannaManDir = $(cannaPrefix)/man
+-cannaIncDir = $(cannaPrefix)/include/canna
++cannaManDir = $(cannaPrefix)/share/man
++XCOMM cannaManDir = $(cannaPrefix)/man
++cannaIncDir = $(cannaPrefix)/include/$(PN)
++cannaShareDir = $(cannaPrefix)/share/$(PN)
++cannaDocDir = $(cannaPrefix)/share/doc/$(PF)
+ 
+ libCannaDir = DefLibCannaDir
+ ErrDir  = DefErrDir
+@@ -237,7 +239,7 @@
+ /* #define UseInstalledLibCanna YES */
+ #define UseInstalledLibCanna NO
+ 
+-DicDir   = $(cannaLibDir)/dic
++DicDir   = $(EPREFIX)/var/lib/$(PN)/dic
+ 
+ /* ¤³¤³¤«¤é²¼¤ÏÊѹ¹ÉÔÍפǤ¹ */
+ 
+--- a/Imakefile
++++ b/Imakefile
+@@ -87,6 +87,7 @@
+ 	 echo "#define CANNAHOSTFILE \"$(cannaLibDir)/cannahost\"";\
+ 	 echo "/* for lib/canna */";\
+ 	 echo "#define CANNALIBDIR \"$(cannaLibDir)\""; \
++	 echo "#define CANNASHAREDIR \"$(cannaShareDir)\""; \
+ 	 echo "#define SUPPORT_OLD_WCHAR $(supportOldWchar)"; \
+ 	 echo "/* for scripts */";\
+ 	 echo "#define CANNABINDIR $(cannaBinDir)"; \
+--- a/dic/phono/Imakefile
++++ b/dic/phono/Imakefile
+@@ -27,9 +27,10 @@
+ 
+        ROMAJI_DIC_DEF = -DSHIFT
+ 
+-               DICDIR = $(cannaLibDir)/dic
+-            SAMPLEDIR = $(cannaLibDir)/sample
+-         SAMPLESRCDIR = $(cannaLibDir)/sample/src
++               DICDIR = $(DicDir)
++        CANNASHAREDIR = $(cannaShareDir)
++            SAMPLEDIR = $(cannaDocDir)/sample
++         SAMPLESRCDIR = $(cannaDocDir)/sample/src
+ 
+     KPDEF = default.kpdef jdaemon.kpdef just.kpdef kaisoku.kpdef kana.kpdef \
+             lan5.kpdef matsu.kpdef newjis.kpdef romaji.kpdef sokuon.kpdef \
+@@ -69,7 +70,7 @@
+ MakeDirectories(install,$(DICDIR))
+ MakeDirectories(install,$(SAMPLESRCDIR))
+ 
+-InstallMultiple($(ROMKANA_TABLES),$(DICDIR))
++InstallMultiple($(ROMKANA_TABLES),$(CANNASHAREDIR))
+ 
+ #ifdef USE_OBSOLETE_STYLE_FILENAME
+ InstallNonExec(default.kpdef,$(SAMPLESRCDIR))
+--- a/lib/canna/romaji.c
++++ b/lib/canna/romaji.c
+@@ -427,7 +427,6 @@
+ 	}
+       }
+       
+-#if 0 /* currently CANNASHAREDDIR is not defined */
+       if (retval == (struct RkRxDic *)NULL) { /* added for Debian by ISHIKAWA Mutsumi <ishikawa@linux.or.jp> */
+         extern jrUserInfoStruct *uinfo;
+ 	
+@@ -450,7 +449,6 @@
+ 	  }
+ 	}
+       }
+-#endif
+       
+       if (retval == (struct RkRxDic *)NULL) { /* Á´Éô¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤¤ */
+ 	sprintf(rdic, 
+--- a/misc/Imakefile
++++ b/misc/Imakefile
+@@ -48,7 +48,7 @@
+ MakeLintLibSubdirs($(SUBDIRS))
+ MakeLintSubdirs($(SUBDIRS),install.ln,install.ln)
+ 
+-MakeDirectories(install,$(cannaLibDir)/sample/src)
++MakeDirectories(install,$(cannaDocDir)/sample/src)
+ 
+ #ifdef USE_OBSOLETE_STYLE_FILENAME
+ default.canna: default.ca
+@@ -58,8 +58,8 @@
+ 	$(CP) default.ca default.canna
+ #endif
+ 
+ InstallNonExec(default.canna,$(cannaLibDir))
+-InstallNonExec(is.c,$(cannaLibDir)/sample/src)
++InstallNonExec(is.c,$(cannaDocDir)/sample/src)
+ 
+ clean::
+ 	$(RM) $(PROGRAMS)
+--- a/misc/initfiles/Imakefile
++++ b/misc/initfiles/Imakefile
+@@ -6,7 +6,7 @@
+ #endif
+ 
+             CANNAROOT = ../..
+-            SAMPLEDIR = $(cannaLibDir)/sample
++            SAMPLEDIR = $(cannaDocDir)/sample
+ 
+ all::
+ 
+--- a/server/Imakefile
++++ b/server/Imakefile
+@@ -6,7 +6,7 @@
+ #ifdef __EMX__
+          INSTFLAGS = $(INSTUGIDFLAGS)
+ #else
+-         INSTFLAGS = -s $(INSTUGIDFLAGS)
++         INSTFLAGS = $(INSTUGIDFLAGS)
+ #endif
+            DEFINES = $(CANNASERVER_DEFINES) $(SIGNAL_DEFINES) ConnectionFlags
+           INCLUDES = -I$(CANNAROOT)/include
diff --git a/app-i18n/canna/files/canna-kpdef.patch b/app-i18n/canna/files/canna-kpdef.patch
new file mode 100644
index 000000000000..b0b71b4442c8
--- /dev/null
+++ b/app-i18n/canna/files/canna-kpdef.patch
@@ -0,0 +1,18 @@
+--- a/dic/phono/default.kpdef
++++ b/dic/phono/default.kpdef
+@@ -350,3 +350,15 @@
+ _	¡²
+ /	¡¿
+ \\	¡ï
++
++# some useful romkan symbols
++z,	¡Å
++z-	¡Á
++z.	¡Ä
++z/	¡¦
++z[	¡Ø
++z]	¡Ù
++zh	¢«
++zj	¢­
++zk	¢¬
++zl	¢ª
diff --git a/app-i18n/canna/files/canna-overflow.patch b/app-i18n/canna/files/canna-overflow.patch
new file mode 100644
index 000000000000..ef3b6ad1b95d
--- /dev/null
+++ b/app-i18n/canna/files/canna-overflow.patch
@@ -0,0 +1,20 @@
+--- a/cmd/catdic/rutil.c
++++ b/cmd/catdic/rutil.c
+@@ -384,7 +384,7 @@
+ 	(void)fprintf(stderr,gettxt("cannacmd:205", 
+     "Specified dictionary \"%s\" already exists. Do you overwrite it ? (y/n)"),
+ 		      dicname);
+-	fgets(ans,80,stdin);
++	fgets(ans,sizeof(ans),stdin);
+     } else {
+ 	(void)fprintf(stderr,gettxt("cannacmd:206", 
+ 	    "Specified dictionary \"%s\" already exists."),dicname);
+@@ -474,7 +474,7 @@
+     if (isatty(fileno(stdin)) != 0) {
+ 	(void)fprintf(stderr,gettxt("cannacmd:216", 
+ "Personal learning file of dictionary \"%s\" exists. Do you overwrite it ? (y/n)"),dicname);
+-	fgets(ans,80,stdin);
++	fgets(ans,sizeof(ans),stdin);
+     } else {
+ 	(void)fprintf(stderr,gettxt("cannacmd:217", 
+     "Personal learning file of system dictionary \"%s\" already exists."),
diff --git a/app-i18n/canna/files/canna-posix-sort.patch b/app-i18n/canna/files/canna-posix-sort.patch
new file mode 100644
index 000000000000..1f98aaf5efdd
--- /dev/null
+++ b/app-i18n/canna/files/canna-posix-sort.patch
@@ -0,0 +1,11 @@
+--- a/cmd/mkbindic/mkbindic.cpp
++++ b/cmd/mkbindic/mkbindic.cpp
+@@ -40,7 +40,7 @@
+ bck_text=;
+ flag=;
+ compat_flag=;
+-sortcmd="sort -d -s +0 -1"
++sortcmd="sort -d -s -k 1,1"
+ usage="usage: mkbindic [-m|-s] [-name dicname] [-c version] textfile [cpp-args ...]";
+ : ${TMPDIR:=/tmp}
+ 
diff --git a/app-i18n/canna/files/canna.confd b/app-i18n/canna/files/canna.confd
new file mode 100644
index 000000000000..d3fdce5425a2
--- /dev/null
+++ b/app-i18n/canna/files/canna.confd
@@ -0,0 +1,7 @@
+CANNASERVER_ENABLE_SYSLOG="yes"
+
+# Specify user to run as
+CANNASERVER_OWNER="bin"
+
+# Options for cannaserver
+CANNASERVER_OPTS=""
diff --git a/app-i18n/canna/files/canna.hosts b/app-i18n/canna/files/canna.hosts
new file mode 100644
index 000000000000..509143d86315
--- /dev/null
+++ b/app-i18n/canna/files/canna.hosts
@@ -0,0 +1 @@
+unix
diff --git a/app-i18n/canna/files/canna.initd b/app-i18n/canna/files/canna.initd
new file mode 100644
index 000000000000..97dac733fa94
--- /dev/null
+++ b/app-i18n/canna/files/canna.initd
@@ -0,0 +1,31 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/${RC_SVCNAME}server"
+command_args="${CANNASERVER_OPTS}"
+
+# CANNASERVER_OPTS and CANNASERVER_OWNER is defined in /etc/conf.d/canna
+CANNASERVER_LOGFILE="/var/log/${RC_SVCNAME}/CANNA0msgs"
+
+depend() {
+	use logger
+	need net
+}
+
+start_pre() {
+	if [ "${CANNASERVER_ENABLE_SYSLOG}" = "yes" ]; then
+		command_args="${command_args} -syslog"
+	elif [ -z "${CANNASERVER_OWNER}" ]; then
+		checkpath "${CANNASERVER_LOGFILE}"
+	else
+		checkpath -o "${CANNASERVER_OWNER}" "${CANNASERVER_LOGFILE}"
+		command_args="${command_args} -u ${CANNASERVER_OWNER}"
+	fi
+}
+
+stop() {
+	ebegin "Stopping ${name:-${RC_SVCNAME}}"
+	/usr/sbin/${RC_SVCNAME}kill
+	eend ${?}
+}
diff --git a/app-i18n/canna/files/update-canna-dics_dir b/app-i18n/canna/files/update-canna-dics_dir
new file mode 100644
index 000000000000..a57290ec3bad
--- /dev/null
+++ b/app-i18n/canna/files/update-canna-dics_dir
@@ -0,0 +1,36 @@
+#!/bin/sh
+# update-canna-dics_dir
+# compiles dics.dir files for Canna Server
+# Copyright 2001 ISHIKAWA Mutsumi
+# Licensed under the GNU General Public License, version 2.  See the file
+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+
+SRC=/var/lib/canna/dic/dics.d
+DEST=/var/lib/canna/dic/canna
+
+for DIR in $SRC $DEST; do
+    VALID=yes
+    if [ ! -d $DIR ]; then
+	echo "$0: $DIR does not exist or is not a directory." >&2
+	VALID=
+    fi
+done
+
+if [ -n "$VALID" ]; then
+    # write new dics.dir file in case we are interrupted
+    echo '# dics.dir -- automatically generated file.  DO NOT EDIT.' > $DEST/dics.dir.update-new
+#    echo '# To modify, see update-canna-dics_dir(8). >> $DEST/dics.dir.update-new
+    # are there any files to process?
+    if [ "$(echo $SRC/*.dics.dir)" != "$SRC/*.dics.dir" ]; then
+	for file in $SRC/*.dics.dir; do
+	    echo "# $file" >> $DEST/dics.dir.update-new
+	    cat $file >> $DEST/dics.dir.update-new
+	done
+	mv $DEST/dics.dir.update-new $DEST/dics.dir
+    else
+      # no files to process, remove the one
+	rm -f $DEST/dics.dir
+    fi
+fi
+
+exit
diff --git a/app-i18n/canna/metadata.xml b/app-i18n/canna/metadata.xml
new file mode 100644
index 000000000000..af8866b3beb0
--- /dev/null
+++ b/app-i18n/canna/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <use>
+    <flag name="canuum">Build canuum</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge-jp">canna</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/cstools-3.42 b/app-i18n/cstools-3.42
deleted file mode 100644
index a0daef38b2bb..000000000000
--- a/app-i18n/cstools-3.42
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/MIME-tools dev-lang/perl[-build(-)]
-DESCRIPTION=A charset conversion tool cstocs and two Perl modules for Czech language
-EAPI=5
-HOMEPAGE=https://www.adelton.com/perl/Cstools/
-KEYWORDS=amd64 x86
-LICENSE=Artistic
-RDEPEND=dev-perl/MIME-tools dev-lang/perl[-build(-)]
-SLOT=0
-SRC_URI=https://www.adelton.com/perl/Cstools/Cstools-3.42.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	4b65c2afee485a204b0b22518141ae47	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=21872550f3204c7aeb709f22a4917233
diff --git a/app-i18n/cstools/Manifest b/app-i18n/cstools/Manifest
new file mode 100644
index 000000000000..5d22497828c4
--- /dev/null
+++ b/app-i18n/cstools/Manifest
@@ -0,0 +1,3 @@
+DIST Cstools-3.42.tar.gz 30650 BLAKE2B bf67d60b2373bed444086a8866695ee861f473fde5a623b7813659fda5dc905bffc968fefb479bd76e8345a1d9f47d3094c55a683a939a45e9a5fffd402ad33c SHA512 78f2f95b5cfde77d23249550085a895abc35965b02ff26382b248d4e713c90c113ad7909b916713dff55c9ee210f13672d609d794b3caf9985fcb207a071f19f
+EBUILD cstools-3.42.ebuild 484 BLAKE2B 856f05f5fb15e74e2f2a45ba213710b103e288dd132f78f5e202d4793fce1fbd880fd19063c4de853904770164612a760c18171e6db1661b9520157bc50b161c SHA512 6a86863aa2afc34d399d37605a54da8b4f3485579b94f54d5f9f30be17df59c22db3adcdc378c12736f69239f49ec3f9a85f5cec02bbc9e90e27721b85e47a47
+MISC metadata.xml 630 BLAKE2B e49440973b0869398113f9f601fd894e40a9a0035e42f18232e3f140b49db84876cbc6c7d02a38336de4023d438137c00856db2ff52891207db682376d4d67f8 SHA512 9fc60f84d9cdc0ae1fd60e9443126e618bbe8b029a2a6b44696754164cadbad61714b2ce8e8847f8b70486ad7c62f8e7edc52ecd16410220ce577e376729e0b3
diff --git a/app-i18n/cstools/cstools-3.42.ebuild b/app-i18n/cstools/cstools-3.42.ebuild
new file mode 100644
index 000000000000..d3aba33b2715
--- /dev/null
+++ b/app-i18n/cstools/cstools-3.42.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-app
+
+MY_P="Cstools-${PV}"
+DESCRIPTION="A charset conversion tool cstocs and two Perl modules for Czech language"
+SRC_URI="https://www.adelton.com/perl/Cstools/${MY_P}.tar.gz"
+HOMEPAGE="https://www.adelton.com/perl/Cstools/"
+SLOT="0"
+LICENSE="Artistic"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-perl/MIME-tools"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/app-i18n/cstools/metadata.xml b/app-i18n/cstools/metadata.xml
new file mode 100644
index 000000000000..cef9b13e3ce9
--- /dev/null
+++ b/app-i18n/cstools/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		Distribution Cstools contains well-known character set conversion
+		program cstocs, and module Cz::Cstocs that makes it easy to do charset
+		conversions directly in Perl scripts, without spawning external process.
+		Also included is Cz::Sort module that provides functions for Czech
+		collation in Perl scripts without a need of locale settings. It is based
+		on conversion table from csr program by Petr Olsak.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-i18n/dbskkd-cdb-2.00 b/app-i18n/dbskkd-cdb-2.00
deleted file mode 100644
index 4941dac11aff..000000000000
--- a/app-i18n/dbskkd-cdb-2.00
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=|| ( dev-db/tinycdb dev-db/cdb )
-DESCRIPTION=SKK dictionary server based on cdb
-EAPI=6
-HOMEPAGE=https://github.com/jj1bdx/dbskkd-cdb
-KEYWORDS=amd64 ppc x86
-LICENSE=BSD-2
-RDEPEND=app-i18n/skk-jisyo[cdb] sys-apps/xinetd
-SLOT=0
-SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/dbskkd-cdb/dbskkd-cdb-2.00.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e855c03ba4bf338b018530648f20b196
diff --git a/app-i18n/dbskkd-cdb-3.00 b/app-i18n/dbskkd-cdb-3.00
deleted file mode 100644
index ce68c28c327c..000000000000
--- a/app-i18n/dbskkd-cdb-3.00
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=|| ( dev-db/tinycdb dev-db/cdb )
-DESCRIPTION=SKK dictionary server based on cdb
-EAPI=6
-HOMEPAGE=https://github.com/jj1bdx/dbskkd-cdb
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=MIT
-RDEPEND=app-i18n/skk-jisyo[cdb] sys-apps/xinetd
-SLOT=0
-SRC_URI=https://github.com/jj1bdx/dbskkd-cdb/archive/3.00.tar.gz -> dbskkd-cdb-3.00.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b78b4eefe4c09f690822a4396355b7ad
diff --git a/app-i18n/dbskkd-cdb/Manifest b/app-i18n/dbskkd-cdb/Manifest
new file mode 100644
index 000000000000..d7554b35406d
--- /dev/null
+++ b/app-i18n/dbskkd-cdb/Manifest
@@ -0,0 +1,7 @@
+AUX dbskkd-cdb-gentoo.patch 505 BLAKE2B c97ca86f77514ee8a887a2091449a44aa20180c4e5f10582656cb298f7a361b16dd7bfed7cb4a7b6a1a3543218f63e3f3b6706a5cb8b078c10c5b5f83828eb72 SHA512 015ffd8bb191ef1d16ce367fb9e8dd6cbade11f5fe24e4302f9781b679f07bd37376bee1a04e34e439f1b8858c4dda4a39a008bd421cca7097cb6762389dcadf
+AUX dbskkd-cdb.xinetd 239 BLAKE2B 46b6b7bafff05f00ea2d1e6420cf443e490e2692ec96065b25c14e41ca7adfbec80d3d9a2dbbe5c848c81a6da7da0a19a2815ef4af5320e2a4a91539abbe1e39 SHA512 a7efd15b7676b857b2adcc23df023f5af8d29a7357b77ab3fcb494fe6cbd401b28caf51f4f3ded5432bed0a3f1d29b0cc65148f3a8e083ebce70a0aca0437915
+DIST dbskkd-cdb-2.00.tar.gz 9296 BLAKE2B d863e2a05cdcf9c8c030c2e3cc2a46a22f5bb01d844ee5120d686a672952ff2609f994fe8a4915daa5b293357f3da87cc9f702f7307dc162a20ffd0a7d47f804 SHA512 3582728d2a1917c00437b273208fa150a5a32dcd462752c6751ddbd574ca7f1476b2aca0d2613471a800bd17f80e2c4b60846f9056ae621996f8f5a5592fa22a
+DIST dbskkd-cdb-3.00.tar.gz 9380 BLAKE2B 81b167485a0ac287c01a5cab2fc638d4303bb8e1529dfc14b89ba8242915de38165acba5d0df00714bf8b1c5b190b3cf655e654e96bae5081bd3fba1f71e7a6a SHA512 a3fe5a0f2e96828d22a75e4daf36eecaa8d903efe8c8a5f6972178f52dc01cac5df5f3e1d8a2cf684d6b78a9c10c207b655a296ceb456dec9f0e502142de094b
+EBUILD dbskkd-cdb-2.00.ebuild 1225 BLAKE2B a4d0f6a2475aea89ab4db9ab852592e18ee4aab70f171e04cd2431ce46d018fd4e5ae5d271908b0b69c68f4957da27ff7a6b48f6dbc58ce12ea65652d57a1780 SHA512 89a38d92e9573336aca31c3e0f2cca6398d864c1790703aa5691ac8c10cc9260603dcb192863c9fbeaeacc1618ff0163c1ea8c037f3e82155553025956a7d6ed
+EBUILD dbskkd-cdb-3.00.ebuild 1179 BLAKE2B 71aa41006a1b373cc292a17352dd40ef23f440af34ec3471086e97331de0c98b520b4beab2f62b0198f56641ca0178bd29500fab882cb714dd8d0cc063f4e819 SHA512 84b38add6d9befc6280e1cdb6265a54902b505b939e4c9c39d41bbfa131934a9d7c30edac39c7a65faaf5fdb2ee0a150a419647c36d2aa6277f5480eef4dba2d
+MISC metadata.xml 326 BLAKE2B 5471d3951565efeb1d626e1189d835e9c70ec80fe1a877698380019aae8ba8ed9e48ae9d1eb4f70ae9386162dd3fd5f402a764291c22ec6f6ae9893ed5f15c80 SHA512 56d019cc1f6e39d358e431b910f36dced992bb1f202bf7ef405979633383301751e853e19eaaaa84408a71699bcf63480575a081a5981a49022a0fc0d32cda2f
diff --git a/app-i18n/dbskkd-cdb/dbskkd-cdb-2.00.ebuild b/app-i18n/dbskkd-cdb/dbskkd-cdb-2.00.ebuild
new file mode 100644
index 000000000000..a1acbae2b9ab
--- /dev/null
+++ b/app-i18n/dbskkd-cdb/dbskkd-cdb-2.00.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic toolchain-funcs user
+
+DESCRIPTION="SKK dictionary server based on cdb"
+HOMEPAGE="https://github.com/jj1bdx/dbskkd-cdb"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="|| (
+		dev-db/tinycdb
+		dev-db/cdb
+	)"
+RDEPEND="app-i18n/skk-jisyo[cdb]
+	sys-apps/xinetd"
+
+PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
+DOCS="CHANGES README* *.txt"
+
+pkg_setup() {
+	enewuser dbskkd -1 -1 -1
+}
+
+src_prepare() {
+	default
+
+	local cdblib=()
+	if has_version dev-db/cdb; then
+		append-cflags -I"${EPREFIX}"/usr/include/cdb
+		local a
+		for a in cdb.a alloc.a buffer.a byte.a unix.a; do
+			cdblib+=( "${EPREFIX}"/usr/$(get_libdir)/${a} )
+		done
+	else
+		cdblib+=( -lcdb )
+	fi
+
+	sed -i "/^CDBLIB/s|=.*$|= ${cdblib[*]}|" Makefile
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		COMPAT="-DJISYO_FILE=\\\"${EPREFIX}/usr/share/skk/SKK-JISYO.L.cdb\\\""
+}
+
+src_install() {
+	exeinto /usr/libexec
+	doexe ${PN}
+	einstalldocs
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/${PN}.xinetd ${PN}
+}
diff --git a/app-i18n/dbskkd-cdb/dbskkd-cdb-3.00.ebuild b/app-i18n/dbskkd-cdb/dbskkd-cdb-3.00.ebuild
new file mode 100644
index 000000000000..d8cb4b874391
--- /dev/null
+++ b/app-i18n/dbskkd-cdb/dbskkd-cdb-3.00.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic toolchain-funcs user
+
+DESCRIPTION="SKK dictionary server based on cdb"
+HOMEPAGE="https://github.com/jj1bdx/dbskkd-cdb"
+SRC_URI="https://github.com/jj1bdx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="|| (
+		dev-db/tinycdb
+		dev-db/cdb
+	)"
+RDEPEND="app-i18n/skk-jisyo[cdb]
+	sys-apps/xinetd"
+
+PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
+DOCS="*.md"
+
+pkg_setup() {
+	enewuser dbskkd -1 -1 -1
+}
+
+src_prepare() {
+	default
+
+	local cdblib=()
+	if has_version dev-db/cdb; then
+		append-cflags -I"${EPREFIX}"/usr/include/cdb
+		local a
+		for a in cdb.a alloc.a buffer.a byte.a unix.a; do
+			cdblib+=( "${EPREFIX}"/usr/$(get_libdir)/${a} )
+		done
+	else
+		cdblib+=( -lcdb )
+	fi
+
+	sed -i "/^CDBLIB/s|=.*$|= ${cdblib[*]}|" Makefile
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		COMPAT="-DJISYO_FILE=\\\"${EPREFIX}/usr/share/skk/SKK-JISYO.L.cdb\\\""
+}
+
+src_install() {
+	exeinto /usr/libexec
+	doexe ${PN}
+	einstalldocs
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/${PN}.xinetd ${PN}
+}
diff --git a/app-i18n/dbskkd-cdb/files/dbskkd-cdb-gentoo.patch b/app-i18n/dbskkd-cdb/files/dbskkd-cdb-gentoo.patch
new file mode 100644
index 000000000000..0fe0b8a31ea3
--- /dev/null
+++ b/app-i18n/dbskkd-cdb/files/dbskkd-cdb-gentoo.patch
@@ -0,0 +1,24 @@
+--- a/Makefile
++++ b/Makefile
+@@ -6,7 +6,7 @@
+ INSTALLDIR = /usr/local/libexec
+ 
+ .c.o:
+-	$(CC) $(COMPAT) $(PRIVATE) -c $*.c
++	$(CC) $(CFLAGS) $(COMPAT) $(PRIVATE) -c $*.c
+ 
+ all: 	dbskkd-cdb 
+ 
+@@ -14,11 +14,10 @@
+ 	/bin/rm -f dbskkd-cdb *.o
+ 
+ dbskkd-cdb: dbskkd-cdb.o 
+-	$(CC) $(COMPAT) $(PRIVATE) -o dbskkd-cdb \
++	$(CC) $(LDFLAGS) $(COMPAT) $(PRIVATE) -o dbskkd-cdb \
+ 		dbskkd-cdb.o ${CDBLIB}
+ 
+ dbskkd-cdb.o: dbskkd-cdb.c 
+-	$(CC) $(COMPAT) $(PRIVATE) -c dbskkd-cdb.c
+ 
+ error.o: error.c error.h
+ 
diff --git a/app-i18n/dbskkd-cdb/files/dbskkd-cdb.xinetd b/app-i18n/dbskkd-cdb/files/dbskkd-cdb.xinetd
new file mode 100644
index 000000000000..98b1b501ef7e
--- /dev/null
+++ b/app-i18n/dbskkd-cdb/files/dbskkd-cdb.xinetd
@@ -0,0 +1,11 @@
+service skkserv
+{
+	disable         = yes
+	socket_type     = stream
+	wait            = no
+	user            = dbskkd
+	server          = /usr/libexec/dbskkd-cdb
+	only_from       = 127.0.0.1
+	log_on_failure += USERID
+	port            = 1178
+}
diff --git a/app-i18n/dbskkd-cdb/metadata.xml b/app-i18n/dbskkd-cdb/metadata.xml
new file mode 100644
index 000000000000..e6d1445169e6
--- /dev/null
+++ b/app-i18n/dbskkd-cdb/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jj1bdx/dbskkd-cdb</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/enca-1.19-r1 b/app-i18n/enca-1.19-r1
deleted file mode 100644
index 4ecbbdbb4a84..000000000000
--- a/app-i18n/enca-1.19-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) recode? ( app-text/recode[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/gettext doc? ( dev-util/gtk-doc ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Detect and convert encoding of text files
-EAPI=6
-HOMEPAGE=https://cihar.com/software/enca/
-IUSE=doc +iconv recode static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-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
-LICENSE=GPL-2
-RDEPEND=iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) recode? ( app-text/recode[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://dl.cihar.com/enca/enca-1.19.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dfba9d005ff44edf46e1cb51866997e4
diff --git a/app-i18n/enca/Manifest b/app-i18n/enca/Manifest
new file mode 100644
index 000000000000..7c26209e7187
--- /dev/null
+++ b/app-i18n/enca/Manifest
@@ -0,0 +1,3 @@
+DIST enca-1.19.tar.xz 465412 BLAKE2B fefd58502cf345f9b88d620d5af349d72b9e2af70d61c9b5aa3632cf91011110dc1fa08e78dd04c02c5a333adfefeb88f529f3cadcb75d0cea2b500a5a70c057 SHA512 6678639992685180457bbef7b0da6e475071ec6935dfd672188fc242ef80b906e75eff9a206e07989893d0ef4ae5eb500f1d0bbd6b4d58146c94bb143b5fb296
+EBUILD enca-1.19-r1.ebuild 2105 BLAKE2B 84c0feea65781ac79eabeee650cd0123408503fac13227c779103ab174233ad36cb6bfe2fe6110c45eb295ad40ebb51ef6324e428ac81247610726134439d233 SHA512 eb96e486d1c7d2a50872bc88f40d1fa8a1c92452b2d1e28d5e6507e6c37dc56af75c6b86e5b63f2bc8478966968e33cbefb9062f792bd07c38964743916d9bd6
+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
new file mode 100644
index 000000000000..d1567c61b8be
--- /dev/null
+++ b/app-i18n/enca/enca-1.19-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="Detect and convert encoding of text files"
+HOMEPAGE="https://cihar.com/software/enca/"
+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"
+IUSE="doc +iconv recode static-libs"
+
+RDEPEND="
+	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	recode? ( app-text/recode[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	doc? ( dev-util/gtk-doc )
+"
+
+pkg_pretend() {
+	if tc-is-cross-compiler && use iconv; then
+		die "${PN} can't be cross built with iconv USE enabled. See Gentoo bug 593220."
+	fi
+}
+
+src_prepare() {
+	default_src_prepare
+
+	# Disable unconditional documentation build.
+	sed -i -e '/SUBDIRS/s/ devel-docs//g' Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Workaround GCC-4.8 brokenness. See Gentoo bug 501386.
+	if tc-is-gcc && [[ $(gcc-version) == "4.8" ]]; then
+		replace-flags -O[3-9] -O2
+	fi
+
+	local myeconfargs=(
+		--enable-external
+		$(use_enable doc gtk-doc)
+		$(use_enable static-libs static)
+		$(use_with iconv libiconv-prefix "${EPREFIX}/usr")
+		$(use_with recode librecode "${EPREFIX}/usr")
+	)
+
+	# Workaround automagic virtual/libiconv dependency.
+	use iconv || export am_cv_func_iconv=no
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	# Workaround cross compilation issues. See Gentoo bug 424473.
+	tc-is-cross-compiler && tc-env_build emake -e -C tools
+
+	if ! multilib_is_native_abi; then
+		emake -C lib
+	else
+		emake
+		use doc && emake -C devel-docs docs
+	fi
+}
+
+multilib_src_install() {
+	if ! multilib_is_native_abi; then
+		emake -C lib DESTDIR="${D}" install
+		emake DESTDIR="${D}" install-pkgconfigDATA
+	else
+		emake DESTDIR="${D}" install
+		use doc && emake -C devel-docs DESTDIR="${D}" install
+	fi
+	prune_libtool_files
+}
diff --git a/app-i18n/enca/metadata.xml b/app-i18n/enca/metadata.xml
new file mode 100644
index 000000000000..095f5a5eb044
--- /dev/null
+++ b/app-i18n/enca/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">nijel/enca</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/fbterm-1.7-r4 b/app-i18n/fbterm-1.7-r4
deleted file mode 100644
index e373e6bc9487..000000000000
--- a/app-i18n/fbterm-1.7-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=media-libs/fontconfig media-libs/freetype:2 gpm? ( sys-libs/gpm ) video_cards_vesa? ( dev-libs/libx86 ) sys-libs/ncurses virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap )
-DESCRIPTION=Fast terminal emulator for the Linux framebuffer
-EAPI=6
-HOMEPAGE=https://code.google.com/p/fbterm
-IUSE=gpm video_cards_vesa +filecaps
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/fontconfig media-libs/freetype:2 gpm? ( sys-libs/gpm ) video_cards_vesa? ( dev-libs/libx86 ) !>=sys-libs/ncurses-6.1
-SLOT=0
-SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/fbterm-1.7.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	fcaps	9445d60c1eb084a91c38ef4c070b2f16	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=247459bce431d78b30f78de634fcf1de
diff --git a/app-i18n/fbterm-1.7-r5 b/app-i18n/fbterm-1.7-r5
deleted file mode 100644
index f7deacc80ca1..000000000000
--- a/app-i18n/fbterm-1.7-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=media-libs/fontconfig media-libs/freetype:2 gpm? ( sys-libs/gpm ) video_cards_vesa? ( dev-libs/libx86 ) >=sys-libs/ncurses-6.1 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap )
-DESCRIPTION=Fast terminal emulator for the Linux framebuffer
-EAPI=6
-HOMEPAGE=https://code.google.com/p/fbterm
-IUSE=gpm video_cards_vesa +filecaps
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/fontconfig media-libs/freetype:2 gpm? ( sys-libs/gpm ) video_cards_vesa? ( dev-libs/libx86 ) >=sys-libs/ncurses-6.1
-SLOT=0
-SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/fbterm-1.7.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	fcaps	9445d60c1eb084a91c38ef4c070b2f16	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=6554d367e3567f37383247d22ea9b2e4
diff --git a/app-i18n/fbterm/Manifest b/app-i18n/fbterm/Manifest
new file mode 100644
index 000000000000..46d15435b0f1
--- /dev/null
+++ b/app-i18n/fbterm/Manifest
@@ -0,0 +1,5 @@
+AUX fbterm-gcc6.patch 1627 BLAKE2B 80167f0616e8e17669f98347884b6d793f1f2331aa3d4341e99b6e44b1f66cfbd811921e488b29f3ba1a194150d0decfd97992bc6f0509dfe6e423b7ff413944 SHA512 742969c5b568006d0592e1c71480f38d63437f50ec4a213f561325ba7570f5ed7d7d6e700b4973bda4d74b8c4992e25f731fb69efb450eff2ed97fcd49d713b9
+DIST fbterm-1.7.0.tar.gz 188642 BLAKE2B 2f4e0a989a58d6dd67e7696786d820f15b18039d8912b967de55b09aa03c723cad1d76171a264c41487171f6650089f8a7e02e50bed267f2465fc8a6af62c57e SHA512 ba78b5118b5e4c65046f7f91ce88cb4f828e2debb34358df8518e1907a8d601a2be4dfcf144e84494dc30e4828d333574debe8dd3ffb59e2169c3e48ba1f6a10
+EBUILD fbterm-1.7-r4.ebuild 1349 BLAKE2B 151ef78477b5ccb1a2fb33684eca050431fb5cdaedd07c8bdb4e6113607ccfa72c2b47f9d72588a700a3b9a2bb97d95adca099bcf6ab618328c43641e3823ba4 SHA512 6f565086806d41c514b8084208c406f607fcc8f2ebaa843d5241f48b5734ecc564c85d10af13fa710aced02346519bac2b0a8386235e2c927ce83715d45d1327
+EBUILD fbterm-1.7-r5.ebuild 1253 BLAKE2B bab40d86a2589cc4e1295dcd0c8c4d2a6a55a9c88ce18a43d86cd03b5cd10f45e419b51cbea0ef5c4e2889387a275ced3d6242de097bae6457d53227f8499915 SHA512 9c019a5916cf66747c7fe07fa3915d7a991eb2da3cfbf2d2a22321a8c362897c85aaf56278be51b5bc6a6bdf772069d7ce69c117708fe44c4b31149b6d24fb47
+MISC metadata.xml 320 BLAKE2B e927f9410ab7cc7b6528a9b1b3dfcda79e208783786f7c9a8906328d8644f52c7c1aeea32abce83bd4f5b9c907adb4364577f3053200de2d202c031c3bb9c0ff SHA512 c6a430df744723fb4a59ea103f5a379d7d533b84a4286573dc29acb61cba3210b48f31c2b30b3c190bf0135a475f69fe51309ea68f10709715007e3d37646892
diff --git a/app-i18n/fbterm/fbterm-1.7-r4.ebuild b/app-i18n/fbterm/fbterm-1.7-r4.ebuild
new file mode 100644
index 000000000000..b8952a615af8
--- /dev/null
+++ b/app-i18n/fbterm/fbterm-1.7-r4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools fcaps
+
+DESCRIPTION="Fast terminal emulator for the Linux framebuffer"
+HOMEPAGE="https://code.google.com/p/fbterm"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.0.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="gpm video_cards_vesa"
+
+CDEPEND="media-libs/fontconfig
+	media-libs/freetype:2
+	gpm? ( sys-libs/gpm )
+	video_cards_vesa? ( dev-libs/libx86 )"
+RDEPEND="${CDEPEND}
+	!>=sys-libs/ncurses-6.1"
+DEPEND="${CDEPEND}
+	sys-libs/ncurses
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-gcc6.patch )
+
+FILECAPS=(
+	cap_sys_tty_config+ep usr/bin/${PN}
+)
+
+src_prepare() {
+	sed -i "s|tic|tic -o '\$(DESTDIR)\$(datadir)/terminfo'|" terminfo/Makefile.am
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable gpm) \
+		$(use_enable video_cards_vesa vesa)
+}
+
+src_install() {
+	dodir /usr/share/terminfo
+	default
+
+	use filecaps || fperms u+s /usr/bin/${PN}
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	elog "${PN} won't work with vga16fb. You have to use other native"
+	elog "framebuffer drivers or vesa driver."
+	elog "See ${EPREFIX}/usr/share/doc/${P}/README for details."
+	elog
+	elog "To use ${PN}, ensure you are in video group."
+}
diff --git a/app-i18n/fbterm/fbterm-1.7-r5.ebuild b/app-i18n/fbterm/fbterm-1.7-r5.ebuild
new file mode 100644
index 000000000000..45117addebe2
--- /dev/null
+++ b/app-i18n/fbterm/fbterm-1.7-r5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools fcaps
+
+DESCRIPTION="Fast terminal emulator for the Linux framebuffer"
+HOMEPAGE="https://code.google.com/p/fbterm"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.0.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="gpm video_cards_vesa"
+
+RDEPEND="media-libs/fontconfig
+	media-libs/freetype:2
+	gpm? ( sys-libs/gpm )
+	video_cards_vesa? ( dev-libs/libx86 )
+	>=sys-libs/ncurses-6.1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-gcc6.patch )
+
+FILECAPS=(
+	cap_sys_tty_config+ep usr/bin/${PN}
+)
+
+src_prepare() {
+	# bug #648472
+	sed -i "s/terminfo//" Makefile.am
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable gpm) \
+		$(use_enable video_cards_vesa vesa)
+}
+
+src_install() {
+	default
+
+	use filecaps || fperms u+s /usr/bin/${PN}
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	elog "${PN} won't work with vga16fb. You have to use other native"
+	elog "framebuffer drivers or vesa driver."
+	elog "See ${EPREFIX}/usr/share/doc/${P}/README for details."
+	elog
+	elog "To use ${PN}, ensure you are in video group."
+}
diff --git a/app-i18n/fbterm/files/fbterm-gcc6.patch b/app-i18n/fbterm/files/fbterm-gcc6.patch
new file mode 100644
index 000000000000..aa19fac96723
--- /dev/null
+++ b/app-i18n/fbterm/files/fbterm-gcc6.patch
@@ -0,0 +1,72 @@
+https://bugs.gentoo.org/show_bug.cgi?id=594308
+
+Author: Peter Levine <plevine457@gmail.com>
+
+--- a/src/lib/vterm_states.cpp
++++ b/src/lib/vterm_states.cpp
+@@ -39,14 +39,14 @@
+ 	{ 0x1B, 0,	ESesc },
+ 	{ 0x7F, 0,	ESkeep },
+ 	{ 0x9B, 0,	ESsquare },
+-	{ -1}
++	{ (u16) -1}
+ };
+ 
+ const VTerm::Sequence VTerm::escape_sequences[] = {
+ 	{   0, 0, ESnormal },
+ 
+ 	// ESnormal
+-	{ -1 },
++	{ (u16) -1 },
+ 
+ 	// ESesc
+ 	{ '[', &VTerm::clear_param,	ESsquare },
+@@ -65,7 +65,7 @@
+ 	{ '8', &VTerm::restore_cursor,	ESnormal },
+ 	{ '>', &VTerm::keypad_numeric,	ESnormal },
+ 	{ '=', &VTerm::keypad_application,	ESnormal },
+-	{ -1 },
++	{ (u16) -1 },
+ 
+ 	// ESsquare
+ 	{ '[', 0,	ESfunckey },
+@@ -104,7 +104,7 @@
+ 	{ '`', &VTerm::cursor_position_col,	ESnormal },
+ 	{ ']', &VTerm::linux_specific, ESnormal },
+ 	{ '}', &VTerm::fbterm_specific, ESnormal },
+-	{ -1 },
++	{ (u16) -1 },
+ 
+ 	// ESnonstd
+ 	{ '0' | ADDSAME(9), &VTerm::set_palette,    ESkeep },
+@@ -112,25 +112,25 @@
+ 	{ 'a' | ADDSAME(5), &VTerm::set_palette,    ESkeep },
+ 	{ 'P', &VTerm::begin_set_palette, ESkeep },
+ 	{ 'R', &VTerm::reset_palette, ESnormal },
+-	{ -1 },
++	{ (u16) -1 },
+ 
+ 	// ESpercent
+ 	{ '@', &VTerm::clear_utf8,	ESnormal },
+ 	{ 'G', &VTerm::set_utf8,	ESnormal },
+ 	{ '8', &VTerm::set_utf8,	ESnormal },
+-	{ -1 },
++	{ (u16) -1 },
+ 
+ 	// EScharset
+ 	{ '0', &VTerm::set_charset, ESnormal },
+ 	{ 'B', &VTerm::set_charset, ESnormal },
+ 	{ 'U', &VTerm::set_charset, ESnormal },
+ 	{ 'K', &VTerm::set_charset, ESnormal },
+-	{ -1 },
++	{ (u16) -1 },
+ 
+ 	// EShash
+ 	{ '8', &VTerm::screen_align,	ESnormal },
+-	{ -1 },
++	{ (u16) -1 },
+ 
+ 	// ESfunckey
+-	{ -1 },
++	{ (u16) -1 },
+ };
diff --git a/app-i18n/fbterm/metadata.xml b/app-i18n/fbterm/metadata.xml
new file mode 100644
index 000000000000..165c6df0ed29
--- /dev/null
+++ b/app-i18n/fbterm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">fbterm</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/fcitx-4.2.9.6 b/app-i18n/fcitx-4.2.9.6
deleted file mode 100644
index b6ab689b9fb1..000000000000
--- a/app-i18n/fcitx-4.2.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile x11-misc/xkeyboard-config ) ) cairo? ( x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) enchant? ( app-text/enchant:0= ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) xml? ( app-text/iso-codes dev-libs/libxml2 ) kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx
-IUSE=+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
-LICENSE=BSD-1 GPL-2+ LGPL-2+ MIT
-RDEPEND=dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile x11-misc/xkeyboard-config ) ) cairo? ( x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) enchant? ( app-text/enchant:0= ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) xml? ( app-text/iso-codes dev-libs/libxml2 )
-REQUIRED_USE=cairo? ( X ) pango? ( cairo ) qt4? ( X )
-SLOT=4
-SRC_URI=https://download.fcitx-im.org/fcitx/fcitx-4.2.9.6_dict.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=319796263908cdc14990464552561ec3
diff --git a/app-i18n/fcitx-4.9999 b/app-i18n/fcitx-4.9999
deleted file mode 100644
index 5573be5e60eb..000000000000
--- a/app-i18n/fcitx-4.9999
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile x11-misc/xkeyboard-config ) ) cairo? ( x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) enchant? ( app-text/enchant:0= ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) xml? ( app-text/iso-codes dev-libs/libxml2 ) kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx
-IUSE=+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml
-LICENSE=BSD-1 GPL-2+ LGPL-2+ MIT
-RDEPEND=dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile x11-misc/xkeyboard-config ) ) cairo? ( x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) enchant? ( app-text/enchant:0= ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) xml? ( app-text/iso-codes dev-libs/libxml2 )
-REQUIRED_USE=cairo? ( X ) pango? ( cairo ) qt4? ( X )
-SLOT=4
-SRC_URI=https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ad9f22b77f5b902358d83ddbfdba797c
diff --git a/app-i18n/fcitx-anthy-0.2.3 b/app-i18n/fcitx-anthy-0.2.3
deleted file mode 100644
index 70e4dee41468..000000000000
--- a/app-i18n/fcitx-anthy-0.2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-i18n/fcitx-4.2.9:4[X,xml] app-i18n/anthy:= virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Japanese Anthy input methods for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-anthy
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4[X,xml] app-i18n/anthy:= virtual/libintl
-SLOT=4
-SRC_URI=https://download.fcitx-im.org/fcitx-anthy/fcitx-anthy-0.2.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=df9c8bbf2f66770c5f63e92867f4bb6f
diff --git a/app-i18n/fcitx-anthy-4.9999 b/app-i18n/fcitx-anthy-4.9999
deleted file mode 100644
index 741ee02b182e..000000000000
--- a/app-i18n/fcitx-anthy-4.9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-i18n/fcitx-4.2.9:4[X,xml] app-i18n/anthy:= virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Japanese Anthy input methods for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-anthy
-LICENSE=GPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4[X,xml] app-i18n/anthy:= virtual/libintl
-SLOT=4
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9fe6aeae749df191d026ae0a9e1f3a77
diff --git a/app-i18n/fcitx-anthy/Manifest b/app-i18n/fcitx-anthy/Manifest
new file mode 100644
index 000000000000..98b9aa35aecb
--- /dev/null
+++ b/app-i18n/fcitx-anthy/Manifest
@@ -0,0 +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
+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
new file mode 100644
index 000000000000..7f2661d3e6b3
--- /dev/null
+++ b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-anthy.git"
+fi
+
+DESCRIPTION="Japanese Anthy input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-anthy"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4[X,xml]
+	app-i18n/anthy:=
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS)
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_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
new file mode 100644
index 000000000000..a0729a41bd38
--- /dev/null
+++ b/app-i18n/fcitx-anthy/fcitx-anthy-4.9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-anthy.git"
+fi
+
+DESCRIPTION="Japanese Anthy input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-anthy"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4[X,xml]
+	app-i18n/anthy:=
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS)
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/fcitx-anthy/metadata.xml b/app-i18n/fcitx-anthy/metadata.xml
new file mode 100644
index 000000000000..c29ae3fb402f
--- /dev/null
+++ b/app-i18n/fcitx-anthy/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">fcitx/fcitx-anthy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/fcitx-chewing-0.2.3 b/app-i18n/fcitx-chewing-0.2.3
deleted file mode 100644
index 3ebfbf81e11a..000000000000
--- a/app-i18n/fcitx-chewing-0.2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/libchewing-0.5.0:= virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Chinese Chewing input method for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-chewing
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/libchewing-0.5.0:= virtual/libintl
-SLOT=4
-SRC_URI=https://download.fcitx-im.org/fcitx-chewing/fcitx-chewing-0.2.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=35411ec9348e3ec239bae969f89f36e8
diff --git a/app-i18n/fcitx-chewing-4.9999 b/app-i18n/fcitx-chewing-4.9999
deleted file mode 100644
index 4e0f0a4492e3..000000000000
--- a/app-i18n/fcitx-chewing-4.9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/libchewing-0.5.0:= virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Chinese Chewing input method for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-chewing
-LICENSE=GPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/libchewing-0.5.0:= virtual/libintl
-SLOT=4
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=58e9dca180bace1b0ff304a4a94bb63e
diff --git a/app-i18n/fcitx-chewing/Manifest b/app-i18n/fcitx-chewing/Manifest
new file mode 100644
index 000000000000..f5ac621a3650
--- /dev/null
+++ b/app-i18n/fcitx-chewing/Manifest
@@ -0,0 +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
+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
new file mode 100644
index 000000000000..7b2a3ebd031f
--- /dev/null
+++ b/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-chewing.git"
+fi
+
+DESCRIPTION="Chinese Chewing input method for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-chewing"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	>=app-i18n/libchewing-0.5.0:=
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS)
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_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
new file mode 100644
index 000000000000..3d0c5778f7be
--- /dev/null
+++ b/app-i18n/fcitx-chewing/fcitx-chewing-4.9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-chewing.git"
+fi
+
+DESCRIPTION="Chinese Chewing input method for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-chewing"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	>=app-i18n/libchewing-0.5.0:=
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS)
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/fcitx-chewing/metadata.xml b/app-i18n/fcitx-chewing/metadata.xml
new file mode 100644
index 000000000000..9a5bbb63bce1
--- /dev/null
+++ b/app-i18n/fcitx-chewing/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">fcitx/fcitx-chewing</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/fcitx-cloudpinyin-0.3.6 b/app-i18n/fcitx-cloudpinyin-0.3.6
deleted file mode 100644
index a7dd0ae42957..000000000000
--- a/app-i18n/fcitx-cloudpinyin-0.3.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-i18n/fcitx-4.2.9:4 net-misc/curl:= virtual/libiconv virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Internet look-up support for Chinese Pinyin input methods for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-cloudpinyin
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 net-misc/curl:= virtual/libiconv virtual/libintl
-SLOT=4
-SRC_URI=https://download.fcitx-im.org/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dd651d6a346a612ed21f101808e431b6
diff --git a/app-i18n/fcitx-cloudpinyin-4.9999 b/app-i18n/fcitx-cloudpinyin-4.9999
deleted file mode 100644
index 78313222a1cf..000000000000
--- a/app-i18n/fcitx-cloudpinyin-4.9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=app-i18n/fcitx-4.2.9:4 net-misc/curl:= virtual/libiconv virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Internet look-up support for Chinese Pinyin input methods for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-cloudpinyin
-LICENSE=GPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 net-misc/curl:= virtual/libiconv virtual/libintl
-SLOT=4
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e3c342e93d8e7619d8c9cc7cc0eb8de3
diff --git a/app-i18n/fcitx-cloudpinyin/Manifest b/app-i18n/fcitx-cloudpinyin/Manifest
new file mode 100644
index 000000000000..314a299b1d91
--- /dev/null
+++ b/app-i18n/fcitx-cloudpinyin/Manifest
@@ -0,0 +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
+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
new file mode 100644
index 000000000000..5eda97b53959
--- /dev/null
+++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-cloudpinyin.git"
+fi
+
+DESCRIPTION="Internet look-up support for Chinese Pinyin input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-cloudpinyin"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	net-misc/curl:=
+	virtual/libiconv
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=()
diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild
new file mode 100644
index 000000000000..14ed5cf98819
--- /dev/null
+++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-cloudpinyin.git"
+fi
+
+DESCRIPTION="Internet look-up support for Chinese Pinyin input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-cloudpinyin"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	net-misc/curl:=
+	virtual/libiconv
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=()
diff --git a/app-i18n/fcitx-cloudpinyin/metadata.xml b/app-i18n/fcitx-cloudpinyin/metadata.xml
new file mode 100644
index 000000000000..183e87e5137e
--- /dev/null
+++ b/app-i18n/fcitx-cloudpinyin/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">fcitx/fcitx-cloudpinyin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/fcitx-configtool-0.4.10 b/app-i18n/fcitx-configtool-0.4.10
deleted file mode 100644
index 19cb1c23c5f6..000000000000
--- a/app-i18n/fcitx-configtool-0.4.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-i18n/fcitx-4.2.9:4 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=GTK+ GUI configuration tool for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-configtool
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3
-SLOT=4
-SRC_URI=https://download.fcitx-im.org/fcitx-configtool/fcitx-configtool-0.4.10.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=14d9086ac46d8bf6d71ea9297b17fae4
diff --git a/app-i18n/fcitx-configtool-4.9999 b/app-i18n/fcitx-configtool-4.9999
deleted file mode 100644
index 1b6bb98a9880..000000000000
--- a/app-i18n/fcitx-configtool-4.9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=app-i18n/fcitx-4.2.9:4 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=GTK+ GUI configuration tool for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-configtool
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3
-SLOT=4
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=67c58793994fc5524bb59072deb5375f
diff --git a/app-i18n/fcitx-configtool/Manifest b/app-i18n/fcitx-configtool/Manifest
new file mode 100644
index 000000000000..46186f4a42ca
--- /dev/null
+++ b/app-i18n/fcitx-configtool/Manifest
@@ -0,0 +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
+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
new file mode 100644
index 000000000000..33805e7cbebd
--- /dev/null
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-configtool.git"
+fi
+
+DESCRIPTION="GTK+ GUI configuration tool for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-configtool"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="4"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	app-text/iso-codes
+	dev-libs/glib:2
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=()
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_GTK2=OFF
+		-DENABLE_GTK3=ON
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
new file mode 100644
index 000000000000..5778190ca4f5
--- /dev/null
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-configtool.git"
+fi
+
+DESCRIPTION="GTK+ GUI configuration tool for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-configtool"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="4"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	app-text/iso-codes
+	dev-libs/glib:2
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=()
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_GTK2=OFF
+		-DENABLE_GTK3=ON
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/app-i18n/fcitx-configtool/metadata.xml b/app-i18n/fcitx-configtool/metadata.xml
new file mode 100644
index 000000000000..163f08b0b6df
--- /dev/null
+++ b/app-i18n/fcitx-configtool/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">fcitx/fcitx-configtool</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/fcitx-hangul-0.3.1 b/app-i18n/fcitx-hangul-0.3.1
deleted file mode 100644
index c1ac6e61a73f..000000000000
--- a/app-i18n/fcitx-hangul-0.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-i18n/fcitx-4.2.9:4 app-i18n/libhangul:= virtual/libiconv virtual/libintl sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Korean Hangul input method for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-hangul
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=BSD GPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 app-i18n/libhangul:= virtual/libiconv virtual/libintl
-SLOT=4
-SRC_URI=https://download.fcitx-im.org/fcitx-hangul/fcitx-hangul-0.3.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=00d3ef2ad917b0acbd69b76ffb7924bd
diff --git a/app-i18n/fcitx-hangul-4.9999 b/app-i18n/fcitx-hangul-4.9999
deleted file mode 100644
index 3e91b0e07b97..000000000000
--- a/app-i18n/fcitx-hangul-4.9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-i18n/fcitx-4.2.9:4 app-i18n/libhangul:= virtual/libiconv virtual/libintl sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Korean Hangul input method for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-hangul
-LICENSE=BSD GPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 app-i18n/libhangul:= virtual/libiconv virtual/libintl
-SLOT=4
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1184e70319aed17d5357817199d902fb
diff --git a/app-i18n/fcitx-hangul/Manifest b/app-i18n/fcitx-hangul/Manifest
new file mode 100644
index 000000000000..d66ee22b1067
--- /dev/null
+++ b/app-i18n/fcitx-hangul/Manifest
@@ -0,0 +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
+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
new file mode 100644
index 000000000000..c933884fa90f
--- /dev/null
+++ b/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-hangul.git"
+fi
+
+DESCRIPTION="Korean Hangul input method for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-hangul"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="BSD GPL-2+"
+SLOT="4"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	app-i18n/libhangul:=
+	virtual/libiconv
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS)
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_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
new file mode 100644
index 000000000000..a9af4dd2d47e
--- /dev/null
+++ b/app-i18n/fcitx-hangul/fcitx-hangul-4.9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-hangul.git"
+fi
+
+DESCRIPTION="Korean Hangul input method for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-hangul"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="BSD GPL-2+"
+SLOT="4"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	app-i18n/libhangul:=
+	virtual/libiconv
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS)
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/fcitx-hangul/metadata.xml b/app-i18n/fcitx-hangul/metadata.xml
new file mode 100644
index 000000000000..c07e8a1bcdb6
--- /dev/null
+++ b/app-i18n/fcitx-hangul/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">fcitx/fcitx-hangul</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/fcitx-libpinyin-0.5.3 b/app-i18n/fcitx-libpinyin-0.5.3
deleted file mode 100644
index d421af5526ef..000000000000
--- a/app-i18n/fcitx-libpinyin-0.5.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/libpinyin-2.1.0:= dev-libs/glib:2 sys-apps/dbus virtual/libintl dictionary-manager? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtdbus-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwebengine-5.7:5[widgets] >=dev-qt/qtwidgets-5.7:5 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Chinese LibPinyin input methods for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-libpinyin
-IUSE=dictionary-manager
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2+ GPL-3+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/libpinyin-2.1.0:= dev-libs/glib:2 sys-apps/dbus virtual/libintl dictionary-manager? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtdbus-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwebengine-5.7:5[widgets] >=dev-qt/qtwidgets-5.7:5 )
-SLOT=4
-SRC_URI=https://download.fcitx-im.org/fcitx-libpinyin/fcitx-libpinyin-0.5.3_dict.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9fc22822398886b295a2e58b526d7b65
diff --git a/app-i18n/fcitx-libpinyin-4.9999 b/app-i18n/fcitx-libpinyin-4.9999
deleted file mode 100644
index 63c129e04f7b..000000000000
--- a/app-i18n/fcitx-libpinyin-4.9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/libpinyin-2.1.0:= dev-libs/glib:2 sys-apps/dbus virtual/libintl dictionary-manager? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtdbus-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwebengine-5.7:5[widgets] >=dev-qt/qtwidgets-5.7:5 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Chinese LibPinyin input methods for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-libpinyin
-IUSE=dictionary-manager
-LICENSE=GPL-2+ GPL-3+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/libpinyin-2.1.0:= dev-libs/glib:2 sys-apps/dbus virtual/libintl dictionary-manager? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtdbus-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwebengine-5.7:5[widgets] >=dev-qt/qtwidgets-5.7:5 )
-SLOT=4
-SRC_URI=https://download.fcitx-im.org/data/model.text.20161206.tar.gz -> fcitx-data-model.text.20161206.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=35b881f7e34ea38de34e5b5892d7c1a4
diff --git a/app-i18n/fcitx-libpinyin/Manifest b/app-i18n/fcitx-libpinyin/Manifest
new file mode 100644
index 000000000000..78ce2b306c75
--- /dev/null
+++ b/app-i18n/fcitx-libpinyin/Manifest
@@ -0,0 +1,5 @@
+DIST fcitx-data-model.text.20161206.tar.gz 15099931 BLAKE2B 80e6a6fe5109011d6ea8683658d3fa89fc00e9dacfd140da3e993afc7db088c445da636797fbdac416e70119d37d47bdb0cb18d3865cebb397dbaa8a3055d703 SHA512 26450e347b7a211e5abd94acbb9befc8cee7d8fc20e5161ef11b8b9b1ad47cde4f1add5c41484d9af04e4dde2aa748090e297e799ee7f6d2f9fcec3873eee429
+DIST fcitx-libpinyin-0.5.3_dict.tar.xz 15149856 BLAKE2B 35297477b3a4df9152162b8ad57d536333c5007510f387323d03e862901f17bb337504f20e6edc8d48e338916a6c4543900974027b60f7e87b0005f836677d29 SHA512 d132e0c007bd62286cfa89f6605a5315b6f5ae94a75bdd389fff1061e1547ad64c615fb0b75189d8cf35fa289a53e5d485911e06e368b2bf3af7b5a996fcd08a
+EBUILD fcitx-libpinyin-0.5.3.ebuild 1496 BLAKE2B e926edffedae10bffe9fd241c85180470acce7ca467956137750c0873bf63eb8927de10312cc899a0251e505707038f10c2e00e4026749bae1b227f76f9f3c1c SHA512 68d75607aae059a06317c4c5043d53afebfa38f7347c5526b207e045ce813749e6d84d686321fa3609b79b91a9e58b6456f30f5061db4f61b2a6d7a75da47978
+EBUILD fcitx-libpinyin-4.9999.ebuild 1477 BLAKE2B d3b6af1e01ae6d45bd291a63aabc8dad710fdd03a2d881d1f786efb80a1372dedf2f1572bd366e5da02f34fc9ba90a94750b96d15ead6add083dbd0d8a3c7438 SHA512 42d90efa3bcc06cd90543713a793bd9379cc3864e5ecb7e164a6567cf7a0a51cdc72175dc20d794a7edef86a0e8b06dd2653c4447f3fc5efe72c8cd263570062
+MISC metadata.xml 537 BLAKE2B 3430f7078a3ef6b84509da967b2572759bc4a9d53c4dd1ccd07508f92efdb8c4a3a4a2304c2418e815c3307ddc43ccc6fb9f784fde0477e30c5517bfd4c23dd0 SHA512 9fcf161b2ca1d0351f59449d78903790fab673ffb1af913e9a5743d453d776d9f38cf241376ef0731adec728363f524e86ca152d0f87b33217e850a34975130c
diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
new file mode 100644
index 000000000000..cfcd437107b6
--- /dev/null
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-libpinyin.git"
+fi
+
+DESCRIPTION="Chinese LibPinyin input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-libpinyin"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI="https://download.fcitx-im.org/data/model.text.20161206.tar.gz -> fcitx-data-model.text.20161206.tar.gz"
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
+fi
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="4"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="dictionary-manager"
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	>=app-i18n/libpinyin-2.1.0:=
+	dev-libs/glib:2
+	sys-apps/dbus
+	virtual/libintl
+	dictionary-manager? (
+		>=app-i18n/fcitx-qt5-1.1:4
+		>=dev-qt/qtcore-5.7:5
+		>=dev-qt/qtdbus-5.7:5
+		>=dev-qt/qtgui-5.7:5
+		>=dev-qt/qtnetwork-5.7:5
+		>=dev-qt/qtwebengine-5.7:5[widgets]
+		>=dev-qt/qtwidgets-5.7:5
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS)
+
+src_prepare() {
+	if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+		ln -s "${DISTDIR}/fcitx-data-model.text.20161206.tar.gz" data/model.text.20161206.tar.gz || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_QT=$(usex dictionary-manager)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
new file mode 100644
index 000000000000..38b963d8ecc8
--- /dev/null
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-libpinyin.git"
+fi
+
+DESCRIPTION="Chinese LibPinyin input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-libpinyin"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI="https://download.fcitx-im.org/data/model.text.20161206.tar.gz -> fcitx-data-model.text.20161206.tar.gz"
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
+fi
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="4"
+KEYWORDS=""
+IUSE="dictionary-manager"
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	>=app-i18n/libpinyin-2.1.0:=
+	dev-libs/glib:2
+	sys-apps/dbus
+	virtual/libintl
+	dictionary-manager? (
+		>=app-i18n/fcitx-qt5-1.1:4
+		>=dev-qt/qtcore-5.7:5
+		>=dev-qt/qtdbus-5.7:5
+		>=dev-qt/qtgui-5.7:5
+		>=dev-qt/qtnetwork-5.7:5
+		>=dev-qt/qtwebengine-5.7:5[widgets]
+		>=dev-qt/qtwidgets-5.7:5
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS)
+
+src_prepare() {
+	if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+		ln -s "${DISTDIR}/fcitx-data-model.text.20161206.tar.gz" data/model.text.20161206.tar.gz || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_QT=$(usex dictionary-manager)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/fcitx-libpinyin/metadata.xml b/app-i18n/fcitx-libpinyin/metadata.xml
new file mode 100644
index 000000000000..8cb60642717a
--- /dev/null
+++ b/app-i18n/fcitx-libpinyin/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<use>
+		<flag name="dictionary-manager">Install dictionary manager</flag>
+	</use>
+	<upstream>
+		<remote-id type="gitlab">fcitx/fcitx-libpinyin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/fcitx-m17n-0.2.4 b/app-i18n/fcitx-m17n-0.2.4
deleted file mode 100644
index 21cc27b7bf9a..000000000000
--- a/app-i18n/fcitx-m17n-0.2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-i18n/fcitx-4.2.9:4 dev-libs/m17n-lib virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=m17n-provided input methods for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-m17n
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 dev-libs/m17n-lib virtual/libintl
-SLOT=4
-SRC_URI=https://download.fcitx-im.org/fcitx-m17n/fcitx-m17n-0.2.4.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e93f32424acec20da4baa11615a206cd
diff --git a/app-i18n/fcitx-m17n-4.9999 b/app-i18n/fcitx-m17n-4.9999
deleted file mode 100644
index a902ebf3272d..000000000000
--- a/app-i18n/fcitx-m17n-4.9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=app-i18n/fcitx-4.2.9:4 dev-libs/m17n-lib virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=m17n-provided input methods for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-m17n
-LICENSE=LGPL-2.1+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 dev-libs/m17n-lib virtual/libintl
-SLOT=4
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ddb6febff96f4d841293bed20c11c2ff
diff --git a/app-i18n/fcitx-m17n/Manifest b/app-i18n/fcitx-m17n/Manifest
new file mode 100644
index 000000000000..00aea0f2e260
--- /dev/null
+++ b/app-i18n/fcitx-m17n/Manifest
@@ -0,0 +1,4 @@
+DIST fcitx-m17n-0.2.4.tar.xz 35076 BLAKE2B c53c8ee8156b49607cd5bd951eb031e2dccb6a18bcdafcbfd17ebf07506c750414abac3f2dd5965fdd8b154df9c16820850f61d07cd38745db0af89ccf2acfff SHA512 b7c483e9c88e58a47ead294c36ed182558f09b41996e97faaba9fd3a96612f6a0fc240fdcb95db9a08c1546abe5fc97337957e2124844bd011363b7468f6e112
+EBUILD fcitx-m17n-0.2.4.ebuild 688 BLAKE2B 389c0c042a46952a30449c17dc75a76233c72f357c22e43cac5362ded73d05f94faff949e23a5c7942acc316ad2f307b4a67eb171d5475b6fb80d14040d6f121 SHA512 fd69f4fddd3d51f07ede549ebf58e49a089f1df91018f24e4d42bbedea3f67645420ffed3a7d4616f66b417babbd3d5141aa5a83b46e044f92a999f6913f261b
+EBUILD fcitx-m17n-4.9999.ebuild 663 BLAKE2B 9bdaa5c8383dc2ca29a11216d746d8208d6fff006c61d482229c921d57b8a4add2769ac14f59154b913a0d07d9bf1f1ef717cc0c55491d3a26092ccca50cd6fd SHA512 7fe9827a5eaf9aaebf79d929be02a315cf54cfa9c54decdf267a6a233cc0d422286fb1798cc787cecd31caa6c7527ac9fa36dd5f607b605179206722d30286dc
+MISC metadata.xml 449 BLAKE2B 1aad8157da938be9d75d7891112ef9725d82f5e6dadb3df228066851a9a4e84da1ed06b3318a3c69e686b931dc4baefccf9a17e48d1807b8bbdbcf358ced1963 SHA512 02ccc11e815a14a90fa2b61fb550267722f612b240eea63738dedd8a22b8e9a0316e037057a3a9b780164c3cd3dc246988f441139ca9b29664539b8a95ff69a3
diff --git a/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild b/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild
new file mode 100644
index 000000000000..65a80442349f
--- /dev/null
+++ b/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-m17n.git"
+fi
+
+DESCRIPTION="m17n-provided input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-m17n"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="4"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	dev-libs/m17n-lib
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=()
diff --git a/app-i18n/fcitx-m17n/fcitx-m17n-4.9999.ebuild b/app-i18n/fcitx-m17n/fcitx-m17n-4.9999.ebuild
new file mode 100644
index 000000000000..45cd1d24ec28
--- /dev/null
+++ b/app-i18n/fcitx-m17n/fcitx-m17n-4.9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-m17n.git"
+fi
+
+DESCRIPTION="m17n-provided input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-m17n"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="4"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	dev-libs/m17n-lib
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=()
diff --git a/app-i18n/fcitx-m17n/metadata.xml b/app-i18n/fcitx-m17n/metadata.xml
new file mode 100644
index 000000000000..0972630f0941
--- /dev/null
+++ b/app-i18n/fcitx-m17n/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">fcitx/fcitx-m17n</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/fcitx-qt5-1.2.3 b/app-i18n/fcitx-qt5-1.2.3
deleted file mode 100644
index e23ed88399d7..000000000000
--- a/app-i18n/fcitx-qt5-1.2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 virtual/libintl x11-libs/libxkbcommon dev-qt/qtconcurrent:5 kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Fcitx input method module for Qt 5
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-qt5
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
-LICENSE=BSD GPL-2+ GPL-3+ LGPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 virtual/libintl x11-libs/libxkbcommon
-SLOT=4
-SRC_URI=https://download.fcitx-im.org/fcitx-qt5/fcitx-qt5-1.2.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0183d0c25112b654576b3d9ac88806de
diff --git a/app-i18n/fcitx-qt5-4.9999 b/app-i18n/fcitx-qt5-4.9999
deleted file mode 100644
index fca16456e5c7..000000000000
--- a/app-i18n/fcitx-qt5-4.9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 virtual/libintl x11-libs/libxkbcommon dev-qt/qtconcurrent:5 kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Fcitx input method module for Qt 5
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-qt5
-LICENSE=BSD GPL-2+ GPL-3+ LGPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 virtual/libintl x11-libs/libxkbcommon
-SLOT=4
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c91ff62a4a360664c8d99a8e99e0d5b1
diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest
new file mode 100644
index 000000000000..e1c93ba5aaec
--- /dev/null
+++ b/app-i18n/fcitx-qt5/Manifest
@@ -0,0 +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
+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
new file mode 100644
index 000000000000..2c54b501abd1
--- /dev/null
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-qt5.git"
+fi
+
+DESCRIPTION="Fcitx input method module for Qt 5"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-qt5"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+"
+SLOT="4"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+IUSE=""
+
+# Private headers of dev-qt/qtgui:5 used.
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5
+	virtual/libintl
+	x11-libs/libxkbcommon"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	kde-frameworks/extra-cmake-modules:5
+	virtual/pkgconfig"
+
+DOCS=()
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
new file mode 100644
index 000000000000..3d87cd55c432
--- /dev/null
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-qt5.git"
+fi
+
+DESCRIPTION="Fcitx input method module for Qt 5"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-qt5"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+"
+SLOT="4"
+KEYWORDS=""
+IUSE=""
+
+# Private headers of dev-qt/qtgui:5 used.
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5
+	virtual/libintl
+	x11-libs/libxkbcommon"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	kde-frameworks/extra-cmake-modules:5
+	virtual/pkgconfig"
+
+DOCS=()
diff --git a/app-i18n/fcitx-qt5/metadata.xml b/app-i18n/fcitx-qt5/metadata.xml
new file mode 100644
index 000000000000..8410356fbf60
--- /dev/null
+++ b/app-i18n/fcitx-qt5/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">fcitx/fcitx-qt5</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/fcitx-rime-0.3.2 b/app-i18n/fcitx-rime-0.3.2
deleted file mode 100644
index cfc55c833c86..000000000000
--- a/app-i18n/fcitx-rime-0.3.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/librime-1.0.0:= app-i18n/rime-data virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Chinese RIME input methods for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-rime
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/librime-1.0.0:= app-i18n/rime-data virtual/libintl
-SLOT=4
-SRC_URI=https://download.fcitx-im.org/fcitx-rime/fcitx-rime-0.3.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=07e68003d464267cbf3d2678bbf815ad
diff --git a/app-i18n/fcitx-rime-4.9999 b/app-i18n/fcitx-rime-4.9999
deleted file mode 100644
index ee4481d7521a..000000000000
--- a/app-i18n/fcitx-rime-4.9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/librime-1.0.0:= app-i18n/rime-data virtual/libintl configuration_tool? ( >=app-i18n/fcitx-qt5-1.1:4 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) virtual/pkgconfig configuration_tool? ( dev-qt/qtconcurrent:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Chinese RIME input methods for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-rime
-IUSE=+configuration_tool
-LICENSE=GPL-2
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/librime-1.0.0:= app-i18n/rime-data virtual/libintl configuration_tool? ( >=app-i18n/fcitx-qt5-1.1:4 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-SLOT=4
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2283526d293a9402278036795b07e5ca
diff --git a/app-i18n/fcitx-rime/Manifest b/app-i18n/fcitx-rime/Manifest
new file mode 100644
index 000000000000..51dcbe24a0ea
--- /dev/null
+++ b/app-i18n/fcitx-rime/Manifest
@@ -0,0 +1,4 @@
+DIST fcitx-rime-0.3.2.tar.xz 40960 BLAKE2B 1c9185dd9d2912e74b9916916fed09a01c30e0867d93fe94e04d5324883783dddbdca0f553d80aa19e2e59d2ec8fd2a50a7f89118c22cb09310296292a566760 SHA512 8c6d845b0899d9b8b9b41b895abd5c1b8916856b71f529aabd08d1c27a2b09bb5a9343912d088da460c2e22da0a3ce759a34fd13099a149bb8cd1ff4eafe29f1
+EBUILD fcitx-rime-0.3.2.ebuild 933 BLAKE2B e9840ab86bea7816d3fe0520035946aad7211a190c3a7d25629829a6d465cc4cddb2c4d13e26950aea51585632e5ba1d0b6001f509494828c31af50b2763eeb8 SHA512 1b129104f3e97c59e141221f43150e42496add2475dee89ee42cbf25baa707a5f714cd50b41f43a1186dd5ae38fddf399d973cc925cabe2e4be7c6f67a1a7c3d
+EBUILD fcitx-rime-4.9999.ebuild 1136 BLAKE2B 9da5484ab39db235ccfb150a6b47b8d9adae3f34dab468b2f8987cfb19fde3a68bc6cfcce33a518b289adc3027a7ab8650336077c066343da9590c2a3cdce353 SHA512 0578707d971620ace9b6a6b0ad5101a2b366c1131145db6df11db87ce9659af1f7ed4da6a3dbd694c1f3f09855a43b4a4aafab48c272743731425571028e5765
+MISC metadata.xml 633 BLAKE2B 9a5add83e197994f7b6c257f6297a25795c97c59c3d7232de6739ecb62a425f5d1f6c359034a71b0bfd7b8ac64e03f1a205f266226ee72fbda70d2439df48e6b SHA512 699528f389f754a6a49fad395d5c3678a62276f5ad455cc66e20f2268f301ec1f74f5ed3093224383d0a1415bbec6c784134a2c3f7991144be4949aa51cacbd3
diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
new file mode 100644
index 000000000000..675cba41e886
--- /dev/null
+++ b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-rime.git"
+fi
+
+DESCRIPTION="Chinese RIME input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-rime"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	>=app-i18n/librime-1.0.0:=
+	app-i18n/rime-data
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=()
+
+src_configure() {
+	local mycmakeargs=(
+		-DRIME_DATA_DIR="${EPREFIX}/usr/share/rime-data"
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
new file mode 100644
index 000000000000..b40865038567
--- /dev/null
+++ b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-rime.git"
+fi
+
+DESCRIPTION="Chinese RIME input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-rime"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS=""
+IUSE="+configuration_tool"
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	>=app-i18n/librime-1.0.0:=
+	app-i18n/rime-data
+	virtual/libintl
+	configuration_tool? (
+		>=app-i18n/fcitx-qt5-1.1:4
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	configuration_tool? ( dev-qt/qtconcurrent:5 )"
+
+DOCS=()
+
+src_configure() {
+	local mycmakeargs=(
+		-DRIME_DATA_DIR="${EPREFIX}/usr/share/rime-data"
+		-DENABLE_QT5GUI=$(usex configuration_tool)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/fcitx-rime/metadata.xml b/app-i18n/fcitx-rime/metadata.xml
new file mode 100644
index 000000000000..867246b6c0f5
--- /dev/null
+++ b/app-i18n/fcitx-rime/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<use>
+		<flag name="configuration_tool">Install configuration tool</flag>
+	</use>
+	<upstream>
+		<remote-id type="gitlab">fcitx/fcitx-rime</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/fcitx-sayura-0.1.2 b/app-i18n/fcitx-sayura-0.1.2
deleted file mode 100644
index 6f8b2c9a31f1..000000000000
--- a/app-i18n/fcitx-sayura-0.1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libiconv virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Sinhala Sayura input method for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-sayura
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libiconv virtual/libintl
-SLOT=4
-SRC_URI=https://download.fcitx-im.org/fcitx-sayura/fcitx-sayura-0.1.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a98274b0154c127fea9352047677ecfe
diff --git a/app-i18n/fcitx-sayura-4.9999 b/app-i18n/fcitx-sayura-4.9999
deleted file mode 100644
index 1e89036f6034..000000000000
--- a/app-i18n/fcitx-sayura-4.9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libiconv virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Sinhala Sayura input method for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-sayura
-LICENSE=GPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libiconv virtual/libintl
-SLOT=4
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=14c958473db91482bf925e235cb0b4c6
diff --git a/app-i18n/fcitx-sayura/Manifest b/app-i18n/fcitx-sayura/Manifest
new file mode 100644
index 000000000000..6c6c87c329c0
--- /dev/null
+++ b/app-i18n/fcitx-sayura/Manifest
@@ -0,0 +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
+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
new file mode 100644
index 000000000000..aaecf413d372
--- /dev/null
+++ b/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-sayura.git"
+fi
+
+DESCRIPTION="Sinhala Sayura input method for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-sayura"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	virtual/libiconv
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=()
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_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
new file mode 100644
index 000000000000..96a0b8ba5369
--- /dev/null
+++ b/app-i18n/fcitx-sayura/fcitx-sayura-4.9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-sayura.git"
+fi
+
+DESCRIPTION="Sinhala Sayura input method for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-sayura"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	virtual/libiconv
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=()
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/fcitx-sayura/metadata.xml b/app-i18n/fcitx-sayura/metadata.xml
new file mode 100644
index 000000000000..733b3cd2db79
--- /dev/null
+++ b/app-i18n/fcitx-sayura/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">fcitx/fcitx-sayura</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/fcitx-sunpinyin-0.4.2 b/app-i18n/fcitx-sunpinyin-0.4.2
deleted file mode 100644
index 5a374079c27a..000000000000
--- a/app-i18n/fcitx-sunpinyin-0.4.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/sunpinyin-2.0.4_alpha:= virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Chinese SunPinyin input method for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-sunpinyin
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/sunpinyin-2.0.4_alpha:= virtual/libintl
-SLOT=4
-SRC_URI=https://download.fcitx-im.org/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6a90d03ce1977a5abc8ce47a99e58039
diff --git a/app-i18n/fcitx-sunpinyin-4.9999 b/app-i18n/fcitx-sunpinyin-4.9999
deleted file mode 100644
index 43042a144cf1..000000000000
--- a/app-i18n/fcitx-sunpinyin-4.9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/sunpinyin-2.0.4_alpha:= virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Chinese SunPinyin input method for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-sunpinyin
-LICENSE=GPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/sunpinyin-2.0.4_alpha:= virtual/libintl
-SLOT=4
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f04a35d5efe844b6b4233c1ad2bc5069
diff --git a/app-i18n/fcitx-sunpinyin/Manifest b/app-i18n/fcitx-sunpinyin/Manifest
new file mode 100644
index 000000000000..a51dbcf30f96
--- /dev/null
+++ b/app-i18n/fcitx-sunpinyin/Manifest
@@ -0,0 +1,4 @@
+DIST fcitx-sunpinyin-0.4.2.tar.xz 42984 BLAKE2B 1f64d96d35c6f455be15a56eb065d97a988f671d40392a3ea3e96fc53b22cf048cff61f406d0e001cc7cfe531a8dc5508ef7862c17253b409330ac2d0af52f7c SHA512 8ade5d94e5227c0b72d2844c09c2699e4b8c66cecbd4107791168d27e15f68b28a4445bf42df7bd6fb44119ec42c5b574293bb417dcde8998578f0debd656a2a
+EBUILD fcitx-sunpinyin-0.4.2.ebuild 819 BLAKE2B 7baadf24c7cff9bbb02f84bc31310570a2fd58512162a1fa5afe7122c6f5dc0173bc5c3c2d2a88364792e953a8027e28b23ef4f3a00dffaf4593ed4101e3ccef SHA512 082ddcebc8c566e552169d284b4d09e7852987a14f91b45ce86c68c4fe3fd68a811f806eaff6e02b382f04a0cfeda6057f2ef8e11c81d64352081e1e478076d3
+EBUILD fcitx-sunpinyin-4.9999.ebuild 800 BLAKE2B 4d5869778c10cf2db509a9f81c953b75e16e5537c13066711a5e3c2402672551696d2dfc6eb3c3bf508b98d9b154614283b6a6e02880bfa09f9703814872cc96 SHA512 bbd9546a43e1b3bb10c8d28884802e0a54a43c619c935ab03b49f08c0dd7e1f854a1a36c426083d669c8395e3de2b4cd4565b29b4219f00bab126a83e9211982
+MISC metadata.xml 454 BLAKE2B fd16056f41c104254e96249893ac2beef5ec6ef94c0d65c80d1d364562121df909d380e246a6ee3c499b267bb40174d0158cd5f9e0ac6def6d6d94fecb62b3a5 SHA512 92a0e7101b6be5ed510436007748557a0302383fef4b00699bf02960d1d3c13d0fdaa87a173643e3f152b28426d617fafdd6a52c3b9e437fdbb685e028b8556d
diff --git a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
new file mode 100644
index 000000000000..9eed3f5a70f1
--- /dev/null
+++ b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-sunpinyin.git"
+fi
+
+DESCRIPTION="Chinese SunPinyin input method for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-sunpinyin"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	>=app-i18n/sunpinyin-2.0.4_alpha:=
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS)
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild
new file mode 100644
index 000000000000..5dcca8662924
--- /dev/null
+++ b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-sunpinyin.git"
+fi
+
+DESCRIPTION="Chinese SunPinyin input method for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-sunpinyin"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	>=app-i18n/sunpinyin-2.0.4_alpha:=
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS)
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/fcitx-sunpinyin/metadata.xml b/app-i18n/fcitx-sunpinyin/metadata.xml
new file mode 100644
index 000000000000..0b3b9ad6abdd
--- /dev/null
+++ b/app-i18n/fcitx-sunpinyin/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">fcitx/fcitx-sunpinyin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/fcitx-table-extra-0.3.8 b/app-i18n/fcitx-table-extra-0.3.8
deleted file mode 100644
index 203f1704a300..000000000000
--- a/app-i18n/fcitx-table-extra-0.3.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-i18n/fcitx-4.2.9:4[table] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Extra Chinese table input methods for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-table-extra
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4[table]
-SLOT=4
-SRC_URI=https://download.fcitx-im.org/fcitx-table-extra/fcitx-table-extra-0.3.8.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7480f46b1c7009a91d71fee9d5da716a
diff --git a/app-i18n/fcitx-table-extra-4.9999 b/app-i18n/fcitx-table-extra-4.9999
deleted file mode 100644
index 4db4a20236d6..000000000000
--- a/app-i18n/fcitx-table-extra-4.9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-i18n/fcitx-4.2.9:4[table] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Extra Chinese table input methods for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-table-extra
-LICENSE=GPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4[table]
-SLOT=4
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aacad16e7f8ef8f47cfa18d715ed6151
diff --git a/app-i18n/fcitx-table-extra/Manifest b/app-i18n/fcitx-table-extra/Manifest
new file mode 100644
index 000000000000..959643f2efc8
--- /dev/null
+++ b/app-i18n/fcitx-table-extra/Manifest
@@ -0,0 +1,4 @@
+DIST fcitx-table-extra-0.3.8.tar.xz 3700736 BLAKE2B b8ce4b3aa04eba8b594b86958bb83e348758c30688828a4834643cf7bdd62852c2ca89bc4f75f0cb1b16ce969b0454c58e3abadff9c78318dc0953e0905c75fa SHA512 454798e9bd25c630ce98e2daf7296e82ba5fbc98027171038a5a7b9ac3169c153302a6703d9416718ec3a0b76db6d732caf3f03c6e6005841c9d7798702542df
+EBUILD fcitx-table-extra-0.3.8.ebuild 780 BLAKE2B 53518ff05fedb94bfa1d29fd309be969d4c80e058a04c80d5e787579f94ecdd894c0dd116b8478cdbd0ddcb463d22dee879ea75bdcd00fdf19ccaece256f4208 SHA512 ef58a0c37f2cd142b2f72ce16d2f402bf34783445e50223d060130315da621ac91794b211135d14dcdf1ce71195208008ba2144945441bfab3b831f47d86a4e7
+EBUILD fcitx-table-extra-4.9999.ebuild 761 BLAKE2B bb577d020029b0e2c87883a60b768c866986313c01e9e48234eb4b767bb25955533f29026bc6f8cefc67c80a9acea8c74d7870638cb6fc7226eb10373b0be087 SHA512 e3247a4b041f08e0a3c61d68b485c647f55716b651aedc14cd27ae715a5fb93f56ab7bf04bcb9a18682c0edf70fb0405d3d208e63f17c088ab51cc6d0f2ccd4e
+MISC metadata.xml 456 BLAKE2B 78d966707f97ae5fbc5f83a323726f4fdc1e8344f031caf61a38e5ebc5f597bf075a132f9f97f761cce8c0313c83c77152f27babe069524f65f949be11ca1fa1 SHA512 f9e89b87bf3ca5d3478cc17f42f40a3aa78fa07dfa7bcac03e2b40d7a60de9321e0e255fb0a4fdab6e1742c7c22bbd992395a9ad1ad6f7ecebf606d706816df1
diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild
new file mode 100644
index 000000000000..a2516d917e26
--- /dev/null
+++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-table-extra.git"
+fi
+
+DESCRIPTION="Extra Chinese table input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-table-extra"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4[table]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS)
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild
new file mode 100644
index 000000000000..9a7d55beda2c
--- /dev/null
+++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-table-extra.git"
+fi
+
+DESCRIPTION="Extra Chinese table input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-table-extra"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4[table]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS)
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/fcitx-table-extra/metadata.xml b/app-i18n/fcitx-table-extra/metadata.xml
new file mode 100644
index 000000000000..4c163079a51f
--- /dev/null
+++ b/app-i18n/fcitx-table-extra/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">fcitx/fcitx-table-extra</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/fcitx-unikey-0.2.7 b/app-i18n/fcitx-unikey-0.2.7
deleted file mode 100644
index 7c9a8dea35d3..000000000000
--- a/app-i18n/fcitx-unikey-0.2.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libintl macro-editor? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtwidgets-5.7:5 ) sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Vietnamese Unikey input methods for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-unikey
-IUSE=+macro-editor
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2+ GPL-3+ LGPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libintl macro-editor? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtwidgets-5.7:5 )
-SLOT=4
-SRC_URI=https://download.fcitx-im.org/fcitx-unikey/fcitx-unikey-0.2.7.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=033aa5d6e4b2c9fe93aae6652f147385
diff --git a/app-i18n/fcitx-unikey-4.9999 b/app-i18n/fcitx-unikey-4.9999
deleted file mode 100644
index 9c237c81f958..000000000000
--- a/app-i18n/fcitx-unikey-4.9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libintl macro-editor? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtwidgets-5.7:5 ) sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Vietnamese Unikey input methods for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-unikey
-IUSE=+macro-editor
-LICENSE=GPL-2+ GPL-3+ LGPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libintl macro-editor? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtwidgets-5.7:5 )
-SLOT=4
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6482fea68c6acfed816a3e6a61b3e86e
diff --git a/app-i18n/fcitx-unikey/Manifest b/app-i18n/fcitx-unikey/Manifest
new file mode 100644
index 000000000000..ff137c4ec1d8
--- /dev/null
+++ b/app-i18n/fcitx-unikey/Manifest
@@ -0,0 +1,4 @@
+DIST fcitx-unikey-0.2.7.tar.xz 75204 BLAKE2B a0d70747a560b2493a3b7f7e06ff35f7e465bb4c4c8d22cb4db02f70a6298c49780fd0045874faeba1f20ad188a01a81fefc67a4f6ac9d6946d959f731a376a4 SHA512 1bb78e4f27f0cda1e3aa5a633be45e0a26d121d5b472b1325b0c028ff65ca156d23e7ffee0367badeac1dd21ba1743ee8a2c9c27c629ae0996e84e0062b67ad2
+EBUILD fcitx-unikey-0.2.7.ebuild 1049 BLAKE2B 24b568cee0b18cc4d9ad97a650ef5e552a5f6dd4af31d2dbe72f5457dd77108436b02a6b6e9b74b7806e1b1be09be9b33e7b55118c399d3a4880d06aa056ace6 SHA512 af52165f01a63702a40cfeca059c5068af5669b844c92138baf21c945f8bc9cdf2ed128b3ebe1a755c935f114b282c6509733eee313d76d8e453fb2aaa336bf6
+EBUILD fcitx-unikey-4.9999.ebuild 1030 BLAKE2B a3db834d78b8b53efc64a8279ac3977e94bf4e7d512768effc0ce30379cfbd225936d79a7514d35feba68b82a5a5a5d98fc580da73127a25d4b0fd92fe3dc30a SHA512 14ab05070cc7efa9ffc65ee0946d40258b0e1dcc12a023f37424a156221ad059a01255b1ad4d447f5794e4925110ba58a34a02ac2a5003f2b431e1261896d0e1
+MISC metadata.xml 522 BLAKE2B 09311ebf711ad2116d9c2554f848f6543271a7b03e55087a9370869d4623657c7ecb97aa3e70464be8117ea187923d79ee9b776251151e342047f05b8a117563 SHA512 f8ce2b6e53593d05676e34ea4cfa9451fb6f026c5fced25b3787e9f828518ca784dd8d2b00ea09793976bd7596a9af075e3af57828b286ac484dbfc2c95adf8c
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild
new file mode 100644
index 000000000000..df756e31e6e0
--- /dev/null
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-unikey.git"
+fi
+
+DESCRIPTION="Vietnamese Unikey input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-unikey"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+ GPL-3+ LGPL-2+"
+SLOT="4"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="+macro-editor"
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	virtual/libintl
+	macro-editor? (
+		>=app-i18n/fcitx-qt5-1.1:4
+		>=dev-qt/qtcore-5.7:5
+		>=dev-qt/qtgui-5.7:5
+		>=dev-qt/qtwidgets-5.7:5
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=()
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_QT=$(usex macro-editor)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild
new file mode 100644
index 000000000000..f7913c7825a9
--- /dev/null
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-unikey.git"
+fi
+
+DESCRIPTION="Vietnamese Unikey input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-unikey"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+ GPL-3+ LGPL-2+"
+SLOT="4"
+KEYWORDS=""
+IUSE="+macro-editor"
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	virtual/libintl
+	macro-editor? (
+		>=app-i18n/fcitx-qt5-1.1:4
+		>=dev-qt/qtcore-5.7:5
+		>=dev-qt/qtgui-5.7:5
+		>=dev-qt/qtwidgets-5.7:5
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=()
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_QT=$(usex macro-editor)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/fcitx-unikey/metadata.xml b/app-i18n/fcitx-unikey/metadata.xml
new file mode 100644
index 000000000000..92ad94a4b881
--- /dev/null
+++ b/app-i18n/fcitx-unikey/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<use>
+		<flag name="macro-editor">Install macro editor</flag>
+	</use>
+	<upstream>
+		<remote-id type="gitlab">fcitx/fcitx-unikey</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
new file mode 100644
index 000000000000..04f60b84c42b
--- /dev/null
+++ b/app-i18n/fcitx/Manifest
@@ -0,0 +1,9 @@
+DIST fcitx-4.2.9.6_dict.tar.xz 8738408 BLAKE2B 812256657ef8f6648a8a3de4bef4e423288ee3d91d493783eae2cb55b5b5964a791f3317af1aea0d877e01ea06491c34f6c594038d27713be3a6b35c93bc5545 SHA512 dc8308d1a4e9b7595da285ca6521f33027f5b8e6968bc28f751bd4f40116166cabbe1c05e29072afbe88473d2a9d6999124476260785e07f62a243df6e896bb0
+DIST fcitx-data-en_dict-20121020.tar.gz 630491 BLAKE2B 2df897b1c9fb3a2ce186ee590e5f3ccbc7930f047218bf0fefa317f74b3287fc0be9c393d3310fe07208379118ec4c46608a1c703ef37b3aee65b2d790cb7f0d SHA512 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
+DIST fcitx-data-pinyin.tar.gz 1608886 BLAKE2B 3b7e72559bb838b4f2245e6faf2d627df17e9383ef8fe382e10333c1a95d79409ec042caa7d77c9bcd956b1c5d5456dab9d82208cd89d90e2be759c76f56f3d1 SHA512 1ee19eed3ee58be6cd6562ec363fe3bf630fff5e8820b3bfdd6d4618fceb082695e888dec5366a3685d58706f720e19319d891c223227237aed12674ea982131
+DIST fcitx-data-py_stroke-20121124.tar.gz 445601 BLAKE2B 43b29b30da11b18196918e4df847406871eff75595b62608ad86b0ef6de83ec5e1b722645cabb809281075b393b5970e4d9580594caa73060c866c2d3cd988e7 SHA512 d80ff9a3549e07c7a6935e686785f9a076c58f1a782a832ae28ee65e2a213d67f089f450ce09bed87ec2a141c32b9c1fcb83c221ddcab436858fa9009f161fb3
+DIST fcitx-data-py_table-20121124.tar.gz 186822 BLAKE2B d696413f2e88f1ca87938d632e12997d14a31a66eaf011c6a7b3c0f607cf45f48e53644ea07d73dbbb0ad898dee6d5ff2d0e4fc2fdcae923acbc03d3d387aaeb SHA512 0fa72ce6820a316e9729bc0d7a08af5ca3468134de9ff1bf0c559a398846a7bcf7313a3609d943e6bab637d930cf45ad9acfe25a8d3df078a774b071a7296486
+DIST fcitx-data-table.tar.gz 4144686 BLAKE2B 696845bb234915a364d614d47cc3baf8421a12ca1778611b0843e52e651da98b5ed9f3e0c9895a829b67f1bcceb1f982a7f6606c8a2d383af8c4573a150c71ef SHA512 99e1d69c679355fcf3e117a1ef39b131cbd3af841387d2335757247d840b90ff6b7323e16fca98cf7a043033faf250d2e9c6d47b96845d18c278a0cf6f30fec9
+EBUILD fcitx-4.2.9.6.ebuild 4496 BLAKE2B b6bac936499ab6ee25b793ab38a20216b8f81b83b0514c5a3eabfd98bf8e96fad7616f0a9cfcce6686ccbd5ac5eb9b5c4a4222573d4b5d9c14b6f5e95b5088b9 SHA512 11e08f367df55805fc178dd9699506922094365646ae4bb68bc858da9c3f9d4043b741297e6002d9a74bf077f7c2828699933d7938b347fed16a4fcb10797270
+EBUILD fcitx-4.9999.ebuild 4471 BLAKE2B 6d7b590c69384e109731669cc510a516e76a6b7bd661238c7e8dcc50f159fc380dc6e99d59126552dfe161f59b91f96f4be082129751d565ac0c6d66c5260de4 SHA512 c593762d88126401d022eddf1a6c59f5dc480b7c97c02bb2b92a5e224de9fc76da41a7f8725c4fa996e4c425181047b5a04a1b5e21ae208ca60b7ff95643565c
+MISC metadata.xml 1139 BLAKE2B 3402416658db0bc853f3aaf8362cd37ac9454c8232cc94865a77f0414246f23542b3cc432daea8e25feb2837e89e3266c5bb266ec0118570bd855aa8493fcfc1 SHA512 eebc7e6f6e5baf897b0bba53075d2160512822c3f9f0b536c447b27fe7f9c23a6cce7f39e3bf0c78e6d2b959231df425b40af783b8d0b5e7a6137f8395c59301
diff --git a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
new file mode 100644
index 000000000000..98e30b8de8fa
--- /dev/null
+++ b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils xdg-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx.git"
+fi
+
+DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz
+		https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz
+		https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz
+		https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz
+		https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz"
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
+fi
+
+LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
+SLOT="4"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
+REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )"
+
+RDEPEND="dev-libs/glib:2
+	sys-apps/dbus
+	sys-apps/util-linux
+	virtual/libiconv
+	virtual/libintl
+	x11-libs/libxkbcommon
+	X? (
+		x11-libs/libX11
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrender
+		xml? (
+			x11-libs/libxkbfile
+			x11-misc/xkeyboard-config
+		)
+	)
+	cairo? (
+		x11-libs/cairo[X]
+		x11-libs/libXext
+		pango? ( x11-libs/pango )
+		!pango? ( media-libs/fontconfig )
+	)
+	enchant? ( app-text/enchant:0= )
+	gtk2? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	introspection? ( dev-libs/gobject-introspection )
+	lua? ( dev-lang/lua:= )
+	nls? ( sys-devel/gettext )
+	opencc? ( app-i18n/opencc:= )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+	)
+	xml? (
+		app-text/iso-codes
+		dev-libs/libxml2
+	)"
+DEPEND="${RDEPEND}
+	kde-frameworks/extra-cmake-modules:5
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS ChangeLog THANKS)
+
+src_prepare() {
+	if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+		ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz" src/im/pinyin/data/pinyin.tar.gz || die
+		ln -s "${DISTDIR}/fcitx-data-table.tar.gz" src/im/table/data/table.tar.gz || die
+		ln -s "${DISTDIR}/fcitx-data-py_stroke-20121124.tar.gz" src/module/pinyin-enhance/data/py_stroke-20121124.tar.gz || die
+		ln -s "${DISTDIR}/fcitx-data-py_table-20121124.tar.gz" src/module/pinyin-enhance/data/py_table-20121124.tar.gz || die
+		ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die
+	fi
+
+	# https://gitlab.com/fcitx/fcitx/issues/250
+	sed \
+		-e "/find_package(XkbFile REQUIRED)/i\\    if(ENABLE_X11)" \
+		-e "/find_package(XkbFile REQUIRED)/s/^/    /" \
+		-e "/find_package(XkbFile REQUIRED)/a\\        find_package(XKeyboardConfig REQUIRED)\n    endif(ENABLE_X11)" \
+		-e "/^find_package(XKeyboardConfig REQUIRED)/,+1d" \
+		-i CMakeLists.txt
+
+	cmake-utils_src_prepare
+	xdg_environment_reset
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DSYSCONFDIR="${EPREFIX}/etc"
+		-DENABLE_CAIRO=$(usex cairo)
+		-DENABLE_DEBUG=$(usex debug)
+		-DENABLE_ENCHANT=$(usex enchant)
+		-DENABLE_GETTEXT=$(usex nls)
+		-DENABLE_GIR=$(usex introspection)
+		-DENABLE_GTK2_IM_MODULE=$(usex gtk2)
+		-DENABLE_GTK3_IM_MODULE=$(usex gtk3)
+		-DENABLE_LIBXML2=$(usex xml)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_OPENCC=$(usex opencc)
+		-DENABLE_PANGO=$(usex pango)
+		-DENABLE_QT=$(usex qt4)
+		-DENABLE_QT_GUI=$(usex qt4)
+		-DENABLE_QT_IM_MODULE=$(usex qt4)
+		-DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
+		-DENABLE_STATIC=$(usex static-libs)
+		-DENABLE_TABLE=$(usex table)
+		-DENABLE_TEST=$(usex test)
+		-DENABLE_X11=$(usex X)
+		-DENABLE_XDGAUTOSTART=$(usex autostart)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	rm -r "${ED}usr/share/doc/${PN}"
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+
+	elog
+	elog "Quick Phrase Editor is provided by:"
+	elog "  app-i18n/fcitx-qt5:4"
+	elog
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+}
diff --git a/app-i18n/fcitx/fcitx-4.9999.ebuild b/app-i18n/fcitx/fcitx-4.9999.ebuild
new file mode 100644
index 000000000000..6a3c3d9e00b8
--- /dev/null
+++ b/app-i18n/fcitx/fcitx-4.9999.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils xdg-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx.git"
+fi
+
+DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz
+		https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz
+		https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz
+		https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz
+		https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz"
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
+fi
+
+LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
+SLOT="4"
+KEYWORDS=""
+IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
+REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )"
+
+RDEPEND="dev-libs/glib:2
+	sys-apps/dbus
+	sys-apps/util-linux
+	virtual/libiconv
+	virtual/libintl
+	x11-libs/libxkbcommon
+	X? (
+		x11-libs/libX11
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrender
+		xml? (
+			x11-libs/libxkbfile
+			x11-misc/xkeyboard-config
+		)
+	)
+	cairo? (
+		x11-libs/cairo[X]
+		x11-libs/libXext
+		pango? ( x11-libs/pango )
+		!pango? ( media-libs/fontconfig )
+	)
+	enchant? ( app-text/enchant:0= )
+	gtk2? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	introspection? ( dev-libs/gobject-introspection )
+	lua? ( dev-lang/lua:= )
+	nls? ( sys-devel/gettext )
+	opencc? ( app-i18n/opencc:= )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+	)
+	xml? (
+		app-text/iso-codes
+		dev-libs/libxml2
+	)"
+DEPEND="${RDEPEND}
+	kde-frameworks/extra-cmake-modules:5
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS ChangeLog THANKS)
+
+src_prepare() {
+	if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+		ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz" src/im/pinyin/data/pinyin.tar.gz || die
+		ln -s "${DISTDIR}/fcitx-data-table.tar.gz" src/im/table/data/table.tar.gz || die
+		ln -s "${DISTDIR}/fcitx-data-py_stroke-20121124.tar.gz" src/module/pinyin-enhance/data/py_stroke-20121124.tar.gz || die
+		ln -s "${DISTDIR}/fcitx-data-py_table-20121124.tar.gz" src/module/pinyin-enhance/data/py_table-20121124.tar.gz || die
+		ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die
+	fi
+
+	# https://gitlab.com/fcitx/fcitx/issues/250
+	sed \
+		-e "/find_package(XkbFile REQUIRED)/i\\    if(ENABLE_X11)" \
+		-e "/find_package(XkbFile REQUIRED)/s/^/    /" \
+		-e "/find_package(XkbFile REQUIRED)/a\\        find_package(XKeyboardConfig REQUIRED)\n    endif(ENABLE_X11)" \
+		-e "/^find_package(XKeyboardConfig REQUIRED)/,+1d" \
+		-i CMakeLists.txt
+
+	cmake-utils_src_prepare
+	xdg_environment_reset
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DSYSCONFDIR="${EPREFIX}/etc"
+		-DENABLE_CAIRO=$(usex cairo)
+		-DENABLE_DEBUG=$(usex debug)
+		-DENABLE_ENCHANT=$(usex enchant)
+		-DENABLE_GETTEXT=$(usex nls)
+		-DENABLE_GIR=$(usex introspection)
+		-DENABLE_GTK2_IM_MODULE=$(usex gtk2)
+		-DENABLE_GTK3_IM_MODULE=$(usex gtk3)
+		-DENABLE_LIBXML2=$(usex xml)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_OPENCC=$(usex opencc)
+		-DENABLE_PANGO=$(usex pango)
+		-DENABLE_QT=$(usex qt4)
+		-DENABLE_QT_GUI=$(usex qt4)
+		-DENABLE_QT_IM_MODULE=$(usex qt4)
+		-DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
+		-DENABLE_STATIC=$(usex static-libs)
+		-DENABLE_TABLE=$(usex table)
+		-DENABLE_TEST=$(usex test)
+		-DENABLE_X11=$(usex X)
+		-DENABLE_XDGAUTOSTART=$(usex autostart)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	rm -r "${ED}usr/share/doc/${PN}"
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+
+	elog
+	elog "Quick Phrase Editor is provided by:"
+	elog "  app-i18n/fcitx-qt5:4"
+	elog
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+}
diff --git a/app-i18n/fcitx/metadata.xml b/app-i18n/fcitx/metadata.xml
new file mode 100644
index 000000000000..7090f71a5172
--- /dev/null
+++ b/app-i18n/fcitx/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<use>
+		<flag name="autostart">Enable XDG-compatible autostart of Fcitx</flag>
+		<flag name="enchant">Enable Enchant backend (using <pkg>app-text/enchant</pkg>) for spelling hinting</flag>
+		<flag name="gtk2">Install input method module for GTK+ 2</flag>
+		<flag name="gtk3">Install input method module for GTK+ 3</flag>
+		<flag name="opencc">Enable OpenCC engine (using <pkg>app-i18n/opencc</pkg>) for converter between Simplified Chinese and Traditional Chinese</flag>
+		<flag name="pango">Enable support for <pkg>x11-libs/pango</pkg></flag>
+		<flag name="qt4">Install input method module for Qt 4</flag>
+		<flag name="table">Install table input methods for Simplified Chinese</flag>
+	</use>
+	<upstream>
+		<remote-id type="gitlab">fcitx/fcitx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/freewnn-1.1.1_alpha22 b/app-i18n/freewnn-1.1.1_alpha22
deleted file mode 100644
index 03a880320575..000000000000
--- a/app-i18n/freewnn-1.1.1_alpha22
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Network-Extensible Kana-to-Kanji Conversion System
-EAPI=6
-HOMEPAGE=http://freewnn.sourceforge.jp/ http://www.freewnn.org/
-IUSE=ipv6
-KEYWORDS=alpha amd64 ~arm64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/freewnn/59257/FreeWnn-1.1.1-a022.tar.bz2
-_md5_=95426fe3fdfa6bb05cf3bd4962497d19
diff --git a/app-i18n/freewnn-1.1.1_alpha23 b/app-i18n/freewnn-1.1.1_alpha23
deleted file mode 100644
index 3ea227f119cf..000000000000
--- a/app-i18n/freewnn-1.1.1_alpha23
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=uum? ( sys-libs/ncurses:= ) uum? ( virtual/pkgconfig )
-DESCRIPTION=Network-Extensible Kana-to-Kanji Conversion System
-EAPI=6
-HOMEPAGE=http://freewnn.sourceforge.jp/ http://www.freewnn.org/
-IUSE=ipv6 uum
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=uum? ( sys-libs/ncurses:= )
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/freewnn/63271/FreeWnn-1.1.1-a023.tar.bz2
-_md5_=cd3ba0f7e5b474a070bb8683ad20b72b
diff --git a/app-i18n/freewnn/Manifest b/app-i18n/freewnn/Manifest
new file mode 100644
index 000000000000..f3ce22b8f2e1
--- /dev/null
+++ b/app-i18n/freewnn/Manifest
@@ -0,0 +1,11 @@
+AUX freewnn-1.1.1_alpha22-parallel-build.patch 6089 BLAKE2B f73fad172a062d2f6eaac6e5d0d87487e2407c14f853d6cbb6d75c26266ad61cab5b1b20e25f5c123fc854b56746fea39a7747bd4244592a9bf9bd1adfedef01 SHA512 941344392312412fb4f5b42c51df1c58d1efc050e203d54894d4bcd921e884ac82fcf5a29a3a57aa4be88da57586dfa9674b8ea88dcb75e91efe83caaa78ac50
+AUX freewnn-Wformat-security.patch 3658 BLAKE2B 4bce67e8190ec4a6e6a4b8cee446b8beb492057cfedd49c06e631a5949e9ff20b35c4defe9ed0466dc2f0b5edb8a483f5886b8eda30a77435ee8614b0878d7f6 SHA512 7e01d516978eb024fe723a84c6c7cc8e138e7947ed3d4d5ec6e15b28783498e084cd2655ccd2ce7377c9837332ae1b0caec654c0f7f2bb9f78b9657f4cd00830
+AUX freewnn-uum-EUC-JP.patch 279 BLAKE2B a0fe740a49aabb72f8d9b0bcbae59e5841152c02ebb4bb27817c8621a4e6be2fd17b8a18c5104d94f8c7def90342682a015a98883856027901265a11d7d4aa4c SHA512 a065873fe70435a4364a111eed334ea574cd3178ffde947beabac5bb45e468a725f73c5b35c22b577127d03139a6386eebc815b85014048eaf59ca958687c96b
+AUX freewnn.confd-r1 16 BLAKE2B 2a2b2a93adf66e719f035900b0efa1f7ccf66912f8c5cddddb8e7b7c1e83c91136d4e747e1b96cad6a54fbbddc29a6b61fc37f7f01330909d27fc1f0cf978723 SHA512 3392644bb5404b83ee3bf3bceffaa769d1dce858fd2a8bd92b79101d0db863002a4f30205498a00777b25b7940fc8dbb41a0e0c4e20be0f6d61be50eb4ddf49e
+AUX freewnn.initd 283 BLAKE2B 363b8b99876aa0552f49a10bc973925d7d23900c24601e40ff2c99a3d6476c9b41c60465feb9e01e6fb17324957bb810d63eef52d97b49a61e0f48c96452db6e SHA512 81b5a6246d513f567710e2973bc8fffe86462e8afdee13e1a2aa9b6e5e8a852521a23fd5b20af536092b59f626a5e34be77409d63dcab005473dd11631b67111
+AUX freewnn.initd-r1 306 BLAKE2B 2c5eeede614062832ce9d799e228a7927793679aa129151b68c9f1392056c8faccda4ce3dff5b4dc0f9da5d1557c8799ca663c1b20d9c3b2208b72a26f78adc3 SHA512 306ad8dd6ae7060fc937f2ac2b266f385480961ed0c2074f1dcfc77fa82bb7a23042019672b47c32fc8d55079730ccda68c616c0f5411b0704db2c34d2caaf02
+DIST FreeWnn-1.1.1-a022.tar.bz2 3137954 BLAKE2B 1f3a920ef7ddb4cddaa95de4d60bccf20c8e6d207216e406cb7dc503411e932b4578ed1c3c302249a94e0ede1d948aa62f5ced804d0d142ed5e04dbbd6789277 SHA512 938c8bff69e2f43cce265a6a84822ae08b89725837f808addb66ba202dadafa60c213638f298d9efe1257fd96f7193fd711a3dacecd803289d925d8f6ea6eaf3
+DIST FreeWnn-1.1.1-a023.tar.bz2 3147378 BLAKE2B 63f3fbf37b53e5e6f32f83513d45aaf4915cbd33789ab8edfc93b22de1fbbe242e52e7bd40ce7ef22e24ae1f4ee151261c2041af9c78720875303b5d2b6c18a8 SHA512 f0b8c657f0441463c752314b7d2fd603b4df056b049d247ecd77ff8b2f2f837fed7e75ce89deabca7061d3126afd51bf301bcdd3ac429056f43bfc8e0c7c8385
+EBUILD freewnn-1.1.1_alpha22.ebuild 1095 BLAKE2B 02dd86ccb19c50c54adeecb72a6f5dd83826ff745d378ca4418aceadd0918e7c137533c5a6409343a55c98164d81b74947590a5ba20119b523bd6733d96511c9 SHA512 0118eb863795a57627c85b5ba18247296e8043c69f4088371d10ec1fde724a9704fa4d49d65233b958c4de26bc14c84bbd1c4322a289b606547c180235dede07
+EBUILD freewnn-1.1.1_alpha23.ebuild 1559 BLAKE2B 40ccc0185b58a2bc9fcea76b18d4c65a00b5a6e3288a3122237cdd8f64492cb7290d9237c2edb5564e0bf59657bd126a1e8d58a0559601439b9ba86edd022ce5 SHA512 026e644beb3802f78787b31ba6577ce89b9e376460e37eb5c7e0fd05d004a7fbd9f87b02ec589804094a172d0c33da30bbfe86ba8dd7c19efec87073eb9322b5
+MISC metadata.xml 379 BLAKE2B 7944902387626d8b50d6c99d570e5618d35d5b271141143b635a11808cf3ecf52be22e18304709f708d89b2b88673790379ea4129cc4bd3f303c94835c067023 SHA512 ccecd3e1a8245d6ae953997d87f6daa127eb1759f6f91b866c9cc778a11289e3f72ce671d4c62032210568a7a915387cbcb02bb7b7284d515bb20e4c02bd8a6b
diff --git a/app-i18n/freewnn/files/freewnn-1.1.1_alpha22-parallel-build.patch b/app-i18n/freewnn/files/freewnn-1.1.1_alpha22-parallel-build.patch
new file mode 100644
index 000000000000..058225c36ee5
--- /dev/null
+++ b/app-i18n/freewnn/files/freewnn-1.1.1_alpha22-parallel-build.patch
@@ -0,0 +1,318 @@
+Description: Fix potential race condition when building in parallel mode
+Origin: upstream, http://cvs.sourceforge.jp/cvs/view/freewnn/FreeWnn/Wnn/pubdicplus/Makefile.in?r1=1.7&r2=1.8&view=patch
+Bug-Debian: http://bugs.debian.org/724058
+
+--- a/Wnn/pubdicplus/Makefile.in	2010/02/22 17:06:54	1.7
++++ b/Wnn/pubdicplus/Makefile.in	2013/11/08 18:54:44	1.8
+@@ -1,5 +1,5 @@
+ #
+-#   $Id: Makefile.in,v 1.7 2010/02/22 17:06:54 aonoto Exp $
++#   $Id: Makefile.in,v 1.8 2013/11/08 18:54:44 aonoto Exp $
+ #
+ 
+ #
+@@ -10,7 +10,7 @@
+ #                 1987, 1988, 1989, 1990, 1991, 1992
+ # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
+ # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
+-# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2004, 2010
++# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2004, 2010, 2013
+ # 
+ # Maintainer:  FreeWnn Project
+ # 
+@@ -42,13 +42,12 @@
+            ATOF = $(WNNJUTILOBJ)/atof
+        WNNTOUCH = $(WNNJUTILOBJ)/wnntouch
+           HINSI = @HINSI_DATA@
+-       FZK_FLAG =
+ 
+ LINKS = Version bio.hd chimei.hd computer.hd fzk.attr fzk.con fzk.fzkattr fzk.jirattr  fzk.jircon fzk.master fzk.shuutan jinmei.hd kihon.hd koyuu.hd setsuji.hd special.hd special.u symbol.hd tankan.hd
+ 
+ WNNDICS = bio.u chimei.u computer.u jinmei.u kihon.u koyuu.u setsuji.u symbol.u tankan.u
+ 
+-FZK_SRC=          fzk.master          fzk.attr          fzk.jirattr          fzk.fzkattr          fzk.jircon          fzk.con          fzk.shuutan
++FZK_SRC=          fzk.master-.c          fzk.attr          fzk.jirattr          fzk.fzkattr          fzk.jircon          fzk.con          fzk.shuutan
+ 
+ DIC= 	bio.dic 	chimei.dic 	computer.dic 	jinmei.dic 	kihon.dic 	koyuu.dic 	setsuji.dic 	special.dic 	symbol.dic 	tankan.dic
+ 
+@@ -68,24 +67,14 @@
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: Version
+-
+ depend:: Version
+ 
+-clean::
+-	$(RM) Version
+-
+ bio.hd:  $(PUBDICPLUSSRC)/bio.hd
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: bio.hd
+-
+ depend:: bio.hd
+ 
+-clean::
+-	$(RM) bio.hd
+-
+ # bio.u:  $(PUBDICPLUSSRC)/bio.u
+ #	$(RM) $@
+ #	$(LN) $? $@
+@@ -101,13 +90,8 @@
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: chimei.hd
+-
+ depend:: chimei.hd
+ 
+-clean::
+-	$(RM) chimei.hd
+-
+ # chimei.u:  $(PUBDICPLUSSRC)/chimei.u
+ #	$(RM) $@
+ #	$(LN) $? $@
+@@ -123,13 +107,8 @@
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: computer.hd
+-
+ depend:: computer.hd
+ 
+-clean::
+-	$(RM) computer.hd
+-
+ # computer.u:  $(PUBDICPLUSSRC)/computer.u
+ #	$(RM) $@
+ #	$(LN) $? $@
+@@ -145,90 +124,50 @@
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: fzk.attr
+-
+ depend:: fzk.attr
+ 
+-clean::
+-	$(RM) fzk.attr
+-
+ fzk.con:  $(PUBDICPLUSSRC)/fzk.con
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: fzk.con
+-
+ depend:: fzk.con
+ 
+-clean::
+-	$(RM) fzk.con
+-
+ fzk.fzkattr:  $(PUBDICPLUSSRC)/fzk.fzkattr
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: fzk.fzkattr
+-
+ depend:: fzk.fzkattr
+ 
+-clean::
+-	$(RM) fzk.fzkattr
+-
+ fzk.jirattr:  $(PUBDICPLUSSRC)/fzk.jirattr
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: fzk.jirattr
+-
+ depend:: fzk.jirattr
+ 
+-clean::
+-	$(RM) fzk.jirattr
+-
+ fzk.jircon:  $(PUBDICPLUSSRC)/fzk.jircon
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: fzk.jircon
+-
+ depend:: fzk.jircon
+ 
+-clean::
+-	$(RM) fzk.jircon
+-
+ fzk.master:  $(PUBDICPLUSSRC)/fzk.master
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: fzk.master
+-
+ depend:: fzk.master
+ 
+-clean::
+-	$(RM) fzk.master
+-
+ fzk.shuutan:  $(PUBDICPLUSSRC)/fzk.shuutan
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: fzk.shuutan
+-
+ depend:: fzk.shuutan
+ 
+-clean::
+-	$(RM) fzk.shuutan
+-
+ jinmei.hd:  $(PUBDICPLUSSRC)/jinmei.hd
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: jinmei.hd
+-
+ depend:: jinmei.hd
+ 
+-clean::
+-	$(RM) jinmei.hd
+-
+ # jinmei.u:  $(PUBDICPLUSSRC)/jinmei.u
+ #	$(RM) $@
+ #	$(LN) $? $@
+@@ -244,13 +183,8 @@
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: kihon.hd
+-
+ depend:: kihon.hd
+ 
+-clean::
+-	$(RM) kihon.hd
+-
+ # kihon.u:  $(PUBDICPLUSSRC)/kihon.u
+ #	$(RM) $@
+ #	$(LN) $? $@
+@@ -266,13 +200,8 @@
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: koyuu.hd
+-
+ depend:: koyuu.hd
+ 
+-clean::
+-	$(RM) koyuu.hd
+-
+ # koyuu.u:  $(PUBDICPLUSSRC)/koyuu.u
+ #	$(RM) $@
+ #	$(LN) $? $@
+@@ -288,13 +217,8 @@
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: setsuji.hd
+-
+ depend:: setsuji.hd
+ 
+-clean::
+-	$(RM) setsuji.hd
+-
+ # setsuji.u:  $(PUBDICPLUSSRC)/setsuji.u
+ #	$(RM) $@
+ #	$(LN) $? $@
+@@ -310,35 +234,20 @@
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: special.hd
+-
+ depend:: special.hd
+ 
+-clean::
+-	$(RM) special.hd
+-
+ special.u:  $(PUBDICPLUSSRC)/special.u
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: special.u
+-
+ depend:: special.u
+ 
+-clean::
+-	$(RM) special.u
+-
+ symbol.hd:  $(PUBDICPLUSSRC)/symbol.hd
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: symbol.hd
+-
+ depend:: symbol.hd
+ 
+-clean::
+-	$(RM) symbol.hd
+-
+ # symbol.u:  $(PUBDICPLUSSRC)/symbol.u
+ #	$(RM) $@
+ #	$(LN) $? $@
+@@ -354,13 +263,8 @@
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-includes:: tankan.hd
+-
+ depend:: tankan.hd
+ 
+-clean::
+-	$(RM) tankan.hd
+-
+ # tankan.u:  $(PUBDICPLUSSRC)/tankan.u
+ #	$(RM) $@
+ #	$(LN) $? $@
+@@ -421,16 +325,14 @@
+ 	$(RM) $@
+ 	$(LN) $? $@
+ 
+-std.fzk: fzk.master-.c $(FZK_SRC)
+-	$(FZK_PP) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
++std.fsrc: $(FZK_SRC)
++	$(FZK_PP) fzk.master-.c > $@
++
++full.fsrc: $(FZK_SRC)
++	$(FZK_PP) -DKANSAI fzk.master-.c > $@
+ 
+-full.fzk: $(FZK_SRC)
+-	$(MAKE) FZK_FLAG=-DKANSAI std.fzk
+-	$(MV) std.fzk $@
+-
+-kougo.fzk: $(FZK_SRC)
+-	$(MAKE) FZK_FLAG=-DKOUGO std.fzk
+-	$(MV) std.fzk $@
++kougo.fsrc: $(FZK_SRC)
++	$(FZK_PP) -DKOUGO fzk.master-.c > $@
+ 
+ # additional rule from PubdicPlus/Makefile.in : by aono
+ pod.o: $(PUBDICPLUSSRC)/pod.c
+@@ -442,7 +344,7 @@
+ $(WNNDICS): pod $(PUBDICPLUSSRC)/pubdic.p
+ 	./pod $(PUBDICPLUSSRC)/pubdic.p -w -1 -k `basename $@ .u` > $@
+ 
+-.SUFFIXES: .hd .u .dic .more
++.SUFFIXES: .hd .u .dic .more .fsrc .fzk
+ 
+ .u.dic:
+ 	cat $*.hd $< | $(ATOD) -p $(VERSION) -P $(VERSION) -h $(HINSI) $@
+@@ -450,7 +352,10 @@
+ .hd.more:
+ 	$(ATOD) -h $(HINSI) $@ < $<
+ 
++.fsrc.fzk:
++	egrep -v '^(# |#line |#pragma |$$)' $< | $(ATOF) -h $(HINSI) $@
++
+ $(DIC): $(HINSI)
+ 
+ clean::
+-	$(RM) -f *.fzk *.dic *.more fzk.master-.c pod $(LINKS)
++	$(RM) -f *.fsrc *.dic *.more fzk.master-.c pod $(LINKS) $(FZKDATA)
diff --git a/app-i18n/freewnn/files/freewnn-Wformat-security.patch b/app-i18n/freewnn/files/freewnn-Wformat-security.patch
new file mode 100644
index 000000000000..b5b68314060d
--- /dev/null
+++ b/app-i18n/freewnn/files/freewnn-Wformat-security.patch
@@ -0,0 +1,143 @@
+--- a/Wnn/uum/jhlp.c
++++ b/Wnn/uum/jhlp.c
+@@ -1135,7 +1135,7 @@
+       else
+         {
+           signal (SIGCHLD, SIG_IGN);
+-          printf (MSG_GET (3));
++          printf ("%s", MSG_GET (3));
+           /*
+              printf("\r\n£õ£õ£í¤ò½ª¤ï¤ê¤Þ¤¹¡£\r\n");
+            */
+@@ -1212,8 +1212,8 @@
+ 
+   if ((buf = (unsigned char *) malloc (maxchg * 4)) == NULL)
+     {
+-      printf (MSG_GET (2));
+-      printf (MSG_GET (3));
++      printf ("%s", MSG_GET (2));
++      printf ("%s", MSG_GET (3));
+       /*
+          printf("malloc ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡££õ£õ£í¤ò½ª¤ï¤ê¤Þ¤¹¡£\r\n");
+        */
+--- a/Wnn/uum/jis_in.c
++++ b/Wnn/uum/jis_in.c
+@@ -64,7 +64,7 @@
+ 
+ completely_start:
+   throw_c (0);                  /* ¥â¡¼¥Éɽ¼¨¤Î¸å¤Ë½Ð¤¹ */
+-  printf (MSG_GET (6));
++  printf ("%s", MSG_GET (6));
+   /*
+      printf("JIS¥³¡¼¥É: ");
+    */
+--- a/Wnn/uum/jutil.c
++++ b/Wnn/uum/jutil.c
+@@ -489,7 +489,7 @@
+   /*
+      printf("Âþº£¡¢¼­½ñ¤òÆɤ߹þ¤ó¤Ç¤¤¤Þ¤¹¡£");
+    */
+-  printf (MSG_GET (60));
++  printf ("%s", MSG_GET (60));
+   flush ();
+ 
+   if ((id = jl_dic_add (bun_data_, fname, hfname, 0, prio, rdonly, hrdonly, NULL, NULL, yes_or_no_or_newline, print_msg1)) == -1 && wnn_errorno != -1)
+@@ -571,7 +571,7 @@
+   int x;
+   throw_c (0);
+   clr_line ();
+-  printf (string);
++  printf ("%s", string);
+   flush ();
+   for (;;)
+     {
+--- a/Wnn/uum/kensaku.c
++++ b/Wnn/uum/kensaku.c
+@@ -112,7 +112,7 @@
+       u_s_on ();
+       w_printf (kana_buf, maxlength - strlen (MSG_GET (27)) - 2);
+       u_s_off ();
+-      printf (MSG_GET (27));
++      printf ("%s", MSG_GET (27));
+       flush ();
+       keyin ();
+       return (NULL);
+--- a/Wnn/uum/kuten.c
++++ b/Wnn/uum/kuten.c
+@@ -63,7 +63,7 @@
+ 
+ completely_start:
+   throw_c (0);                  /* ¥â¡¼¥Éɽ¼¨¤Î¸å¤Ë½Ð¤¹ */
+-  printf (MSG_GET (7));
++  printf ("%s", MSG_GET (7));
+   /*
+      printf("¶èÅÀ : ");
+    */
+--- a/Wnn/uum/prologue.c
++++ b/Wnn/uum/prologue.c
+@@ -144,7 +144,7 @@
+       /*
+          fprintf(stderr,"½é´ü²½¤ÇmallocÉÔǽ¡£\n");
+        */
+-      fprintf (stderr, MSG_GET (2));
++      fprintf (stderr, "%s", MSG_GET (2));
+       return (-1);
+     }
+ 
+--- a/Wnn/uum/screen.c
++++ b/Wnn/uum/screen.c
+@@ -547,7 +547,7 @@
+ {
+   push_cursor ();
+   throw_c (0);
+-  printf (msg);
++  printf ("%s", msg);
+   pop_cursor ();
+   flush ();
+ }
+--- a/Wnn/uum/sdefine.h
++++ b/Wnn/uum/sdefine.h
+@@ -191,8 +191,8 @@
+ 
+ 
+ #define flush() fflush(stdout)
+-#define print_msg(X) {push_cursor();throw_c(0); clr_line();printf(X);flush();pop_cursor();}
+-#define print_msg_getc(X) {push_cursor();throw_c(0); clr_line();printf(X);flush();keyin();pop_cursor();}
++#define print_msg(X) {push_cursor();throw_c(0); clr_line();printf("%s", X);flush();pop_cursor();}
++#define print_msg_getc(X) {push_cursor();throw_c(0); clr_line();printf("%s", X);flush();keyin();pop_cursor();}
+ 
+ 
+ #define UNDER_LINE_MODE (0x02 | 0x08 | 0x20)
+--- a/Wnn/uum/select_ele.c
++++ b/Wnn/uum/select_ele.c
+@@ -224,7 +224,7 @@
+ 
+   throw_c (0);
+   clr_line ();
+-  printf (msg);
++  printf ("%s", msg);
+   for (k = dd[cc]; k < dd[cc + 1]; k++)
+     {
+       cp = findcp (k, cc);
+--- a/Wnn/uum/termio.c
++++ b/Wnn/uum/termio.c
+@@ -100,7 +100,7 @@
+ 
+   if ((strlen (Term_Name) > 2) && (strcmp (Term_Name + (strlen (Term_Name) - 2), "-j") == 0))
+     {
+-      fprintf (stderr, MSG_GET (4));
++      fprintf (stderr, "%s", MSG_GET (4));
+       /*
+          fprintf(stderr,"Uum:£õ£õ£í¤«¤é£õ£õ£í¤Ï¤ª¤³¤»¤Þ¤»¤ó¡£\n");
+        */
+--- a/Wnn/uum/wnnrc_op.c
++++ b/Wnn/uum/wnnrc_op.c
+@@ -754,7 +754,7 @@
+       return fp;
+     }
+ error:
+-  fprintf (stderr, MSG_GET (14));
++  fprintf (stderr, "%s", MSG_GET (14));
+ /*
+     fprintf(stderr , "uumrc ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó¡£");
+ */
diff --git a/app-i18n/freewnn/files/freewnn-uum-EUC-JP.patch b/app-i18n/freewnn/files/freewnn-uum-EUC-JP.patch
new file mode 100644
index 000000000000..919492d912c6
--- /dev/null
+++ b/app-i18n/freewnn/files/freewnn-uum-EUC-JP.patch
@@ -0,0 +1,13 @@
+--- a/Wnn/include/wnn_config.h
++++ b/Wnn/include/wnn_config.h
+@@ -149,8 +149,8 @@
+ #define TTY_KCODE J_EUJIS
+ #define PTY_KCODE J_EUJIS
+ # else /* !DGUX */
+-#define TTY_KCODE J_JIS
+-#define PTY_KCODE J_JIS
++#define TTY_KCODE J_EUJIS
++#define PTY_KCODE J_EUJIS
+ # endif
+ #endif
+ 
diff --git a/app-i18n/freewnn/files/freewnn.confd-r1 b/app-i18n/freewnn/files/freewnn.confd-r1
new file mode 100644
index 000000000000..c64e27196d50
--- /dev/null
+++ b/app-i18n/freewnn/files/freewnn.confd-r1
@@ -0,0 +1 @@
+FREEWNN_OPTS=""
diff --git a/app-i18n/freewnn/files/freewnn.initd b/app-i18n/freewnn/files/freewnn.initd
new file mode 100644
index 000000000000..ef4e20cf37c8
--- /dev/null
+++ b/app-i18n/freewnn/files/freewnn.initd
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/Wnn4/jserver"
+
+depend() {
+	use logger
+	need net
+}
+
+stop() {
+	ebegin "Stopping ${name:-${RC_SVCNAME}}"
+	/usr/bin/Wnn4/wnnkill
+	eend ${?}
+}
diff --git a/app-i18n/freewnn/files/freewnn.initd-r1 b/app-i18n/freewnn/files/freewnn.initd-r1
new file mode 100644
index 000000000000..57fd448f801c
--- /dev/null
+++ b/app-i18n/freewnn/files/freewnn.initd-r1
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/jserver"
+command_args="${FREEWNN_OPTS}"
+
+depend() {
+	use logger
+	need net
+}
+
+stop() {
+	ebegin "Stopping ${name:-${RC_SVCNAME}}"
+	/usr/sbin/wnnkill
+	eend ${?}
+}
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild
new file mode 100644
index 000000000000..f4d5668b35ee
--- /dev/null
+++ b/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+MY_P="FreeWnn-${PV/_alpha/-a0}"
+
+DESCRIPTION="Network-Extensible Kana-to-Kanji Conversion System"
+HOMEPAGE="http://freewnn.sourceforge.jp/ http://www.freewnn.org/"
+SRC_URI="mirror://sourceforge.jp/${PN}/59257/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="ipv6"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-parallel-build.patch
+	"${FILESDIR}"/${PN}-Wformat-security.patch
+)
+DOCS="ChangeLog* CONTRIBUTORS"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s/WNNOWNER = wnn/WNNOWNER = root/" \
+		-e "s/@INSTPGMFLAGS@//" \
+		makerule.mk.in
+
+	# bug #542534
+	sed -i \
+		-e "s/egrep -v/egrep -av/" \
+		PubdicPlus/Makefile.in \
+		Wnn/pubdicplus/Makefile.in \
+		cWnn/[ct]dic/Makefile.in \
+		kWnn/kdic/Makefile.in
+}
+
+src_configure() {
+	econf \
+		$(use_with ipv6) \
+		--disable-cWnn \
+		--disable-kWnn
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install.man
+	einstalldocs
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+}
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha23.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha23.ebuild
new file mode 100644
index 000000000000..e6dae1fef125
--- /dev/null
+++ b/app-i18n/freewnn/freewnn-1.1.1_alpha23.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+MY_P="FreeWnn-${PV/_alpha/-a0}"
+
+DESCRIPTION="Network-Extensible Kana-to-Kanji Conversion System"
+HOMEPAGE="http://freewnn.sourceforge.jp/ http://www.freewnn.org/"
+SRC_URI="mirror://sourceforge.jp/${PN}/63271/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 uum"
+
+RDEPEND="uum? ( sys-libs/ncurses:= )"
+DEPEND="${RDEPEND}
+	uum? ( virtual/pkgconfig )"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-uum-EUC-JP.patch
+	"${FILESDIR}"/${PN}-Wformat-security.patch
+)
+DOCS="ChangeLog* CONTRIBUTORS"
+
+src_prepare() {
+	sed -i \
+		-e "s/WNNOWNER = wnn/WNNOWNER = root/" \
+		-e "s|@mandir@/|@mandir@/ja/|" \
+		-e "s/@INSTPGMFLAGS@//" \
+		makerule.mk.in
+
+	# bug #542534
+	sed -i \
+		-e "s/egrep -v/egrep -av/" \
+		PubdicPlus/Makefile.in \
+		Wnn/pubdicplus/Makefile.in \
+		cWnn/[ct]dic/Makefile.in \
+		kWnn/kdic/Makefile.in
+
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable uum client) \
+		$(use_with ipv6) \
+		--disable-cWnn \
+		--disable-kWnn \
+		--disable-traditional-layout \
+		--with-term-libs="$(pkg-config --libs ncurses)"
+}
+
+src_compile() {
+	default
+
+	local m
+	for m in $(find Wnn/man -name "*.man"); do
+		iconv -f EUC-JP -t UTF-8 "${m}" > "${m}".UTF-8 || die
+		mv "${m}"{.UTF-8,} || die
+	done
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install.man
+	einstalldocs
+
+	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+}
diff --git a/app-i18n/freewnn/metadata.xml b/app-i18n/freewnn/metadata.xml
new file mode 100644
index 000000000000..00f1f852743c
--- /dev/null
+++ b/app-i18n/freewnn/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <use>
+    <flag name="uum">Build uum</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge-jp">freewnn</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/ibus-1.5.12 b/app-i18n/ibus-1.5.12
deleted file mode 100644
index df3392a446d3..000000000000
--- a/app-i18n/ibus-1.5.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare test
-DEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=+X gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) python? ( gtk? ( x11-libs/gtk+:3[introspection] ) )
-REQUIRED_USE=gtk2? ( gtk ) libnotify? ( gtk ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) gtk introspection ) test? ( gtk ) vala? ( introspection )
-SLOT=0
-SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.12/ibus-1.5.12.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4b0ee9b42b4c8f34d904e56499ef51bd
diff --git a/app-i18n/ibus-1.5.16 b/app-i18n/ibus-1.5.16
deleted file mode 100644
index 1f0d9ce71083..000000000000
--- a/app-i18n/ibus-1.5.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare test
-DEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) dev-util/intltool virtual/pkgconfig emoji? ( app-i18n/unicode-cldr app-i18n/unicode-emoji ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) python? ( gtk? ( x11-libs/gtk+:3[introspection] ) )
-REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) libnotify? ( gtk ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) gtk introspection ) test? ( gtk ) vala? ( introspection )
-SLOT=0
-SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.16/ibus-1.5.16.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6f3ac7af1be54e0273ceb6ce4870a069
diff --git a/app-i18n/ibus-1.5.17 b/app-i18n/ibus-1.5.17
deleted file mode 100644
index d2fd3e276b43..000000000000
--- a/app-i18n/ibus-1.5.17
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare test
-DEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) dev-util/intltool virtual/pkgconfig emoji? ( app-i18n/unicode-cldr app-i18n/unicode-emoji ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) python? ( gtk? ( x11-libs/gtk+:3[introspection] ) )
-REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) libnotify? ( gtk ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) gtk introspection ) test? ( gtk ) vala? ( introspection )
-SLOT=0
-SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.17/ibus-1.5.17.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b0c9965df52abffd8371ff55cd329fc8
diff --git a/app-i18n/ibus-1.5.18 b/app-i18n/ibus-1.5.18
deleted file mode 100644
index 9415111d8a08..000000000000
--- a/app-i18n/ibus-1.5.18
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare test
-DEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] ) dev-util/intltool virtual/pkgconfig emoji? ( app-i18n/unicode-cldr app-i18n/unicode-emoji ) nls? ( sys-devel/gettext ) unicode? ( app-i18n/unicode-data ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) python? ( gtk? ( x11-libs/gtk+:3[introspection] ) )
-REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) libnotify? ( gtk ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) gtk introspection ) test? ( gtk ) vala? ( introspection )
-SLOT=0
-SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.18/ibus-1.5.18.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=72c3bc189a5ab3b4e57a8c86f00051b8
diff --git a/app-i18n/ibus-anthy-1.5.10 b/app-i18n/ibus-anthy-1.5.10
deleted file mode 100644
index 137650bab441..000000000000
--- a/app-i18n/ibus-anthy-1.5.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-i18n/anthy app-i18n/ibus[python(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] nls? ( virtual/libintl ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4
-DESCRIPTION=Japanese Anthy engine for IBus
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=nls python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-i18n/anthy app-i18n/ibus[python(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] nls? ( virtual/libintl )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/ibus/ibus-anthy/releases/download/1.5.10/ibus-anthy-1.5.10.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5c75cf8878e70703df5f0975807d5338
diff --git a/app-i18n/ibus-anthy-1.5.9 b/app-i18n/ibus-anthy-1.5.9
deleted file mode 100644
index b2814ee2ac74..000000000000
--- a/app-i18n/ibus-anthy-1.5.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-i18n/anthy app-i18n/ibus[python(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] nls? ( virtual/libintl ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4
-DESCRIPTION=Japanese Anthy engine for IBus
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=nls python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-i18n/anthy app-i18n/ibus[python(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] nls? ( virtual/libintl )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/ibus/ibus-anthy/releases/download/1.5.9/ibus-anthy-1.5.9.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=912873a493eecf8deaa4da292dc9534b
diff --git a/app-i18n/ibus-anthy/Manifest b/app-i18n/ibus-anthy/Manifest
new file mode 100644
index 000000000000..ada310e0f54c
--- /dev/null
+++ b/app-i18n/ibus-anthy/Manifest
@@ -0,0 +1,5 @@
+DIST ibus-anthy-1.5.10.tar.gz 758528 BLAKE2B 39496f5c3a5f2038f3f81e09504e472a32da85f27701741cbe77b576afcd8685c4f2209aaf24ef84420cbeec1614b251d2903c1ea4e7175a1014f92615399847 SHA512 963b1dfba18259aad2296c10de35f9f321b0169d6f85afa058ed57b6894fe4e1d44514ffadeee3c3108aac77f54aa645096ddf4bdb353fafaedb83d27d8c5d47
+DIST ibus-anthy-1.5.9.tar.gz 765672 BLAKE2B 88a2b935bfe1007bdcbd70af358509da77533a67df4b6d0be218b5f9d5e1c0ca093e62618765f1e2d7c06c2127458319bbf482ce8598398b9562ecec8a258301 SHA512 2f57db784ddbd4ea57afba245dc532fe4ee8c9fea5fc7df9b3ca26600816ef4c0626b4ebdbbd976826c391890216af587863707caa26c3926a6278cc6b720ef6
+EBUILD ibus-anthy-1.5.10.ebuild 1246 BLAKE2B a74e0ad08aea1155f397ad8461c738526dfd03b2482d2739b222895c60d660047cf6b77ff37441fa41659b20bc244c594e4485e23a3d32613d5a8e4b2dee71c8 SHA512 6e1998200bcdf487b3d0a0db99e30e96a28e7d1451279eab89290b38731ad78d2129901b2e2cff1cdb2109a1427e522a2ffa5a8a390a31df61db510809392c4e
+EBUILD ibus-anthy-1.5.9.ebuild 1225 BLAKE2B 60341a7f797697006025b7f5d1488c6bf839042e30c5dc2c07f1b73c7e99d639d0d4d90017c6153675d958166cc37883931bcb86b3314c68f282fe39461f859e SHA512 55f267f26a55942fcfd96f3d5772188785e2dff48be09f8f898f16597a93e402e5ed364a3d031aef95c7c0345073a395b290475ef8521991bbdff15715e30609
+MISC metadata.xml 476 BLAKE2B 33f4115e9bafa5d3f491ea05b8395123c9cb6b844959df2ee8b2cc9609b8fd20d25cc870adc117c9e96e17f215c806d82ff138b01c2b02e2e63eb99d568ea626 SHA512 024c387b5eb01279f8803df81b1d7dc2b86969ffee5986bef75987c066cce48f7d1fe8ea35790be4fafbff2281850f2b03904f41e06bc37fc9d40537eca96c07
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.10.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.10.ebuild
new file mode 100644
index 000000000000..497c5293094f
--- /dev/null
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.10.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit gnome2-utils python-single-r1
+
+DESCRIPTION="Japanese Anthy engine for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/anthy
+	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+	gnome2_environment_reset
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--enable-private-png \
+		--with-layout=default \
+		--with-python=${EPYTHON}
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	python_optimize
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	if ! has_version app-dicts/kasumi; then
+		elog "app-dicts/kasumi is not required but probably useful for you."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild
new file mode 100644
index 000000000000..d87865637334
--- /dev/null
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit gnome2-utils python-single-r1
+
+DESCRIPTION="Japanese Anthy engine for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/anthy
+	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+	gnome2_environment_reset
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--enable-private-png \
+		--with-layout=default \
+		--with-python=${EPYTHON}
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	python_optimize
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	if ! has_version app-dicts/kasumi; then
+		elog "app-dicts/kasumi is not required but probably useful for you."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/ibus-anthy/metadata.xml b/app-i18n/ibus-anthy/metadata.xml
new file mode 100644
index 000000000000..384ad03f3758
--- /dev/null
+++ b/app-i18n/ibus-anthy/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <longdescription lang="en">
+    The Anthy engine for IBus. It provides Japanese input method from
+    <pkg>app-i18n/anthy</pkg>.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">ibus/ibus-anthy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/ibus-cangjie-2.4 b/app-i18n/ibus-cangjie-2.4
deleted file mode 100644
index da40f82baf15..000000000000
--- a/app-i18n/ibus-cangjie-2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-i18n/ibus-1.4.1 app-i18n/libcangjie dev-python/cangjie[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-util/intltool sys-devel/gettext >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=The IBus engine for users of the Cangjie and Quick input methods
-EAPI=5
-HOMEPAGE=http://cangjians.github.io
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=>=app-i18n/ibus-1.4.1 app-i18n/libcangjie dev-python/cangjie[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/libintl python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/Cangjians/ibus-cangjie/releases/download/v2.4/ibus-cangjie-2.4.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b3b7df6fc37237f35de6f5d8283f58c4
diff --git a/app-i18n/ibus-cangjie/Manifest b/app-i18n/ibus-cangjie/Manifest
new file mode 100644
index 000000000000..707258a0ee34
--- /dev/null
+++ b/app-i18n/ibus-cangjie/Manifest
@@ -0,0 +1,3 @@
+DIST ibus-cangjie-2.4.tar.xz 150616 BLAKE2B 2e59acc1b05ce0dc3dad26ba663440d067bf28a549e79ec9d127de414d715f5e376f426db5b415255eb63aa13677e59643889481f5e39c946399d4d4fe15a468 SHA512 cef9562fc4a5f3b78881c09b43e502f02322148e501022d3f80989caef4ca98ae26903e9a3dcc422feeba7712a8321c731ba229429e52fe919db5144aa0ead47
+EBUILD ibus-cangjie-2.4.ebuild 1076 BLAKE2B f712e22d0810a4fcf451d1ff00d55b894cffd4a34c9a1598a642c7d2bfa6aa9c8e1d7e8dafa52a459a91bda0a14e0e2723502322072eb9ca791c98019322f90f SHA512 4b6e6f7da94cea419fc6583df02e53f8057a555068b7eb97b5b075f50efaecd8ef4458a1c02479421a4800e5de3adc69b1d41678a77cab4a51fc77a5ef6a9acc
+MISC metadata.xml 331 BLAKE2B 51f11d81e4be33a58b3a32274cdefc59588c0eb488d8864ded4352fee4680a9d888a014fa5f7aa493819ead18d68baf2ce5b0ce19a665887653d16f2641342ff SHA512 d50524d308a7dae58c23a9b2e39e149d28dbe08d78dc96f53db98ebc96ef09e871792a9608108dff82dd1023b5bdc5998b4c8863a1f48be37f7c505d896ee62b
diff --git a/app-i18n/ibus-cangjie/ibus-cangjie-2.4.ebuild b/app-i18n/ibus-cangjie/ibus-cangjie-2.4.ebuild
new file mode 100644
index 000000000000..766065c32132
--- /dev/null
+++ b/app-i18n/ibus-cangjie/ibus-cangjie-2.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools-utils gnome2-utils python-r1 eutils
+
+DESCRIPTION="The IBus engine for users of the Cangjie and Quick input methods"
+HOMEPAGE="http://cangjians.github.io"
+SRC_URI="https://github.com/Cangjians/ibus-cangjie/releases/download/v${PV}/ibus-cangjie-${PV}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=app-i18n/ibus-1.4.1
+	app-i18n/libcangjie
+	dev-python/cangjie[${PYTHON_USEDEP}]
+	dev-util/intltool
+	sys-devel/gettext"
+
+RDEPEND=">=app-i18n/ibus-1.4.1
+	app-i18n/libcangjie
+	dev-python/cangjie[${PYTHON_USEDEP}]
+	virtual/libintl
+	${PYTHON_DEPS}"
+
+src_configure() {
+	python_foreach_impl autotools-utils_src_configure
+}
+
+src_compile() {
+	python_foreach_impl autotools-utils_src_compile
+}
+
+src_install() {
+	python_foreach_impl autotools-utils_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/ibus-cangjie/metadata.xml b/app-i18n/ibus-cangjie/metadata.xml
new file mode 100644
index 000000000000..9468326e6f9a
--- /dev/null
+++ b/app-i18n/ibus-cangjie/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">Cangjians/ibus-cangjie</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/ibus-chewing-1.5.1-r1 b/app-i18n/ibus-chewing-1.5.1-r1
deleted file mode 100644
index 603374312f9e..000000000000
--- a/app-i18n/ibus-chewing-1.5.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-i18n/ibus app-i18n/libchewing dev-libs/glib:2 dev-util/gob:2 x11-libs/gtk+:2 x11-libs/libX11 gconf? ( gnome-base/gconf ) nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Chinese Chewing engine for IBus
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=gconf nls test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/ibus app-i18n/libchewing dev-libs/glib:2 dev-util/gob:2 x11-libs/gtk+:2 x11-libs/libX11 gconf? ( gnome-base/gconf ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=https://github.com/definite/ibus-chewing/releases/download/1.5.1/ibus-chewing-1.5.1-Source.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cbe1f0eaf10f86798da8e0d4d62a169b
diff --git a/app-i18n/ibus-chewing-1.6.1 b/app-i18n/ibus-chewing-1.6.1
deleted file mode 100644
index 3ebfed4f1450..000000000000
--- a/app-i18n/ibus-chewing-1.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-i18n/ibus app-i18n/libchewing dev-libs/glib:2 dev-util/gob:2 x11-libs/gtk+:2 x11-libs/libX11 gconf? ( gnome-base/gconf ) nls? ( virtual/libintl ) dev-util/cmake-fedora virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Chinese Chewing engine for IBus
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=gconf nls test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/ibus app-i18n/libchewing dev-libs/glib:2 dev-util/gob:2 x11-libs/gtk+:2 x11-libs/libX11 gconf? ( gnome-base/gconf ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=https://github.com/definite/ibus-chewing/archive/1.6.1.tar.gz -> ibus-chewing-1.6.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=857eb588962e6b88b327a808bf4a103b
diff --git a/app-i18n/ibus-chewing/Manifest b/app-i18n/ibus-chewing/Manifest
new file mode 100644
index 000000000000..5141e8672853
--- /dev/null
+++ b/app-i18n/ibus-chewing/Manifest
@@ -0,0 +1,6 @@
+AUX ibus-chewing-test.patch 1700 BLAKE2B 6cc7fa0fe7bbdb49f89adc5e0f2509bfd34222d3d7ab16e39effe98e973582120bcb90e7d00e859121fd1c16f41df3ade9750ed879e88269230d4984109f64a4 SHA512 124042ccebc509116661dd732b4bbb237a3962518a273701da7d4a20ec0109a3f5b850380c712e457df947e146c189a2606976262915d3973211b70b7464c061
+DIST ibus-chewing-1.5.1-Source.tar.gz 177044 BLAKE2B b188c7ea2c12fd1ccf64a70355da0a6f8a47976f141c8a0a7edcc7a5ccd6b959f73cad2cd1137874f965967780691fe920b44b3141cc6fa4e631921f4c4a2582 SHA512 2db6def1fe8ca3bd71419a001909d285ee48ef84c2f65e14bacff9cd114676bed594f0c90217e1fdab67c995a7b05d675812e90e281371d8464722c31649c633
+DIST ibus-chewing-1.6.1.tar.gz 111103 BLAKE2B c9b22b0fe4b164d02a1782479e139e04e3113299fb3ccebdba24eaa9d15964eca34d381f45f0c313bb53bc0b8c7f7b649ff4c0179c712f6d880e3d92a9d02692 SHA512 b093db79c656433614b9f72719a2b0768a30c2fb6fa066eda1e79cc9932ce1836f7f1e5611612fb44f260fe80a9baa9e18fdc9754b285e8a5f12a87c376cbd39
+EBUILD ibus-chewing-1.5.1-r1.ebuild 1448 BLAKE2B 98a4011ecca1f227dea9b9ca54c8f70434136a395b71ea66ae13e482b5b7eba6dcc32952e7830bea6b8d32088e280ec20e4fbafd3b34812c1d48804f45259235 SHA512 1920f9e0d121ed7aac0ebb6d5bf709c80df35b7f11d06e02e63ad68b46aa30a08d955236b916ad88abd30b38834e1872a8bda0b81caaadb63a6c51e3856e9a10
+EBUILD ibus-chewing-1.6.1.ebuild 1428 BLAKE2B a8f80ddb66a61814ecfceccc538d8500ab2147e95433e23915f8120cf283ebbbb81968aa5f01b49720180ebca6327f4b51416d1d7a9365db6c3bb93d8c49fe05 SHA512 280a2b71c2cbebf818b694933de93ad0b3af6dd521848b05d2f074d58d51111ab1a51011017896b670e62987dbe1ecd2c24c6268d2cd199a8951ec0c3ec35abd
+MISC metadata.xml 584 BLAKE2B 1958617545888bfe66e4540285ca910d36dd7c7cef55f63577a762ab4b1164c0320de935c6e8dab5d31c09f89f89c919bf2800a6cae65c69b5c603c31d437f6f SHA512 ea88b32df0e2ecca5f472339a7602ddf65523cb186a7a372bfab762803db50020369b4cb1ba457bad3e364e3ef867c2ce2f0e485525b55693860aa2ecee595e9
diff --git a/app-i18n/ibus-chewing/files/ibus-chewing-test.patch b/app-i18n/ibus-chewing/files/ibus-chewing-test.patch
new file mode 100644
index 000000000000..abed91d377d3
--- /dev/null
+++ b/app-i18n/ibus-chewing/files/ibus-chewing-test.patch
@@ -0,0 +1,45 @@
+--- a/test/MakerDialogBackend-test.c
++++ b/test/MakerDialogBackend-test.c
+@@ -126,7 +126,7 @@
+ void backup_key_to_g_value(const gchar * key, GType gType, GValue * value)
+ {
+     g_value_init(value, gType);
+-    backend_command_get_key_value(key, value);
++    mkdg_backend_read(backend, value, QUOTE_ME(PROJECT_SCHEMA_SECTION), key, NULL);
+ }
+ 
+ void change_new_value_from_orig_value(GValue * newValue,
+@@ -169,7 +169,7 @@
+ {
+     GValue storedGValue = { 0 };
+     g_value_init(&storedGValue, G_VALUE_TYPE(newValue));
+-    backend_command_get_key_value(key, &storedGValue);
++    mkdg_backend_read(backend, &storedGValue, QUOTE_ME(PROJECT_SCHEMA_SECTION), key, NULL);
+     g_assert(mkdg_g_value_is_equal(newValue, &storedGValue));
+     g_value_unset(&storedGValue);
+ }
+@@ -219,7 +219,7 @@
+ #define GCONF_KEY "max-chi-symbol-len"
+     GValue origValue = { 0 };
+     g_value_init(&origValue, G_TYPE_BOOLEAN);
+-    backend_command_get_key_value(GCONF_KEY, &origValue);
++    mkdg_backend_read(backend, &origValue, QUOTE_ME(PROJECT_SCHEMA_SECTION), GCONF_KEY, NULL);
+ 
+     GValue newValue = { 0 };
+     g_value_init(&newValue, G_TYPE_BOOLEAN);
+@@ -229,13 +229,13 @@
+ 
+     GValue storedValue = { 0 };
+     g_value_init(&storedValue, G_TYPE_BOOLEAN);
+-    backend_command_get_key_value(GCONF_KEY, &storedValue);
++    mkdg_backend_read(backend, &storedValue, QUOTE_ME(PROJECT_SCHEMA_SECTION), GCONF_KEY, NULL);
+     g_assert(mkdg_g_value_is_equal(&newValue, &storedValue));
+ 
+     /*
+      * Restore the original value 
+      */
+-    backend_command_set_key_value(GCONF_KEY, &origValue);
++    mkdg_backend_write(backend, &origValue, QUOTE_ME(PROJECT_SCHEMA_SECTION), GCONF_KEY, NULL);
+ #undef GCONF_KEY
+ }
+ 
diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.5.1-r1.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..6e551a4ca242
--- /dev/null
+++ b/app-i18n/ibus-chewing/ibus-chewing-1.5.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake-utils gnome2-utils virtualx
+
+MY_P="${P}-Source"
+
+DESCRIPTION="Chinese Chewing engine for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/definite/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gconf nls"
+
+RDEPEND="app-i18n/ibus
+	app-i18n/libchewing
+	dev-libs/glib:2
+	dev-util/gob:2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	gconf? ( gnome-base/gconf )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-test.patch )
+DOCS=( AUTHORS ChangeLog README RELEASE-NOTES.txt USER-GUIDE )
+
+src_configure() {
+	local mycmakeargs=(
+		-DMANAGE_DEPENDENCY_PACKAGE_EXISTS_CMD=false
+		-DPRJ_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF}
+	)
+	use nls || mycmakeargs+=( -DMANAGE_GETTEXT_SUPPORT=0 )
+	cmake-utils_src_configure
+}
+
+src_test() {
+	"${EROOT}"${GLIB_COMPILE_SCHEMAS} --allow-any-name "${BUILD_DIR}"/bin || die
+
+	export GSETTINGS_BACKEND="memory"
+	export GSETTINGS_SCHEMA_DIR="${BUILD_DIR}/bin"
+	virtx cmake-utils_src_test
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.6.1.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.6.1.ebuild
new file mode 100644
index 000000000000..ea2e88eaa3f6
--- /dev/null
+++ b/app-i18n/ibus-chewing/ibus-chewing-1.6.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake-utils gnome2-utils virtualx
+
+DESCRIPTION="Chinese Chewing engine for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/definite/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gconf nls"
+
+RDEPEND="app-i18n/ibus
+	app-i18n/libchewing
+	dev-libs/glib:2
+	dev-util/gob:2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	gconf? ( gnome-base/gconf )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-util/cmake-fedora
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=( "${FILESDIR}"/${PN}-test.patch )
+DOCS=( AUTHORS ChangeLog README.md RELEASE-NOTES.txt USER-GUIDE )
+
+src_configure() {
+	local mycmakeargs=(
+		-DMANAGE_DEPENDENCY_PACKAGE_EXISTS_CMD=false
+		-DPRJ_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF}
+	)
+	use nls || mycmakeargs+=( -DMANAGE_GETTEXT_SUPPORT=0 )
+	cmake-utils_src_configure
+}
+
+src_test() {
+	"${EROOT}"${GLIB_COMPILE_SCHEMAS} --allow-any-name "${BUILD_DIR}"/bin || die
+
+	export GSETTINGS_BACKEND="memory"
+	export GSETTINGS_SCHEMA_DIR="${BUILD_DIR}/bin"
+	virtx cmake-utils_src_test
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus-chewing/metadata.xml b/app-i18n/ibus-chewing/metadata.xml
new file mode 100644
index 000000000000..e44e996ccd57
--- /dev/null
+++ b/app-i18n/ibus-chewing/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <longdescription lang="en">
+    The Chewing engine for IBus. It provides a Chinese input method from
+    <pkg>app-i18n/libchewing</pkg>.
+  </longdescription>
+  <use>
+    <flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="github">definite/ibus-chewing</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/ibus-fbterm-1.0.1 b/app-i18n/ibus-fbterm-1.0.1
deleted file mode 100644
index df67b9d16b76..000000000000
--- a/app-i18n/ibus-fbterm-1.0.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=app-i18n/ibus app-i18n/fbterm dev-libs/glib:2 virtual/pkgconfig
-DESCRIPTION=IBus client for FbTerm
-EAPI=6
-HOMEPAGE=https://github.com/fujiwarat/ibus-fbterm
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/ibus app-i18n/fbterm dev-libs/glib:2
-SLOT=0
-SRC_URI=https://github.com/fujiwarat/ibus-fbterm/releases/download/1.0.1/ibus-fbterm-1.0.1.tar.gz
-_md5_=f1d599ae6aea9ccc9d39d542986487be
diff --git a/app-i18n/ibus-fbterm/Manifest b/app-i18n/ibus-fbterm/Manifest
new file mode 100644
index 000000000000..aa787a46b093
--- /dev/null
+++ b/app-i18n/ibus-fbterm/Manifest
@@ -0,0 +1,3 @@
+DIST ibus-fbterm-1.0.1.tar.gz 244979 BLAKE2B f92836e0f3675ee18003b96a4518172d50b1d8bf3253459920c4fdb1dd8c432da21ca2e63fd1156f58751f9ba47d37c1b7c2b550c3e97e796acfe40e6b84ba14 SHA512 6900a37444f15820cf383dd928107fd900f1677d8da5b4cc318e97b1227d412e098e8d476194da77fd4968b296729dff79a9c51d289b82e3b9a9485a05754f04
+EBUILD ibus-fbterm-1.0.1.ebuild 443 BLAKE2B f8b1ac404fe0d72356a8fd6a838fecfaacd7061a054ed893d91bbb319a070d544b2a5a82630fdbc39f76eb141dc0e7b9249a9366105622ead96849892b4e059b SHA512 597127d164b9e9e6b1eb6d721e3c4a76e2d6225602ca7afbdd7820d303583791cb898b4258939ffc09471eff1b48cf49adcc5a662f6d049f22896b0aaa038a17
+MISC metadata.xml 330 BLAKE2B d0700d3b7765b3dfa8baa35f32147ef6e65b948f172cebcecde61896f0a71f3325e07f8e0c7472855479df40759597378e6a49a3e308c5f12334bd7e2a57c74f SHA512 03dc033bdc5c8ddb52d587457f1250984d46755764bbb628179b9899fe4a82b49ff277385c8855ca65eab744cd0107bee8a952c0775719822ab0002311ffe5d6
diff --git a/app-i18n/ibus-fbterm/ibus-fbterm-1.0.1.ebuild b/app-i18n/ibus-fbterm/ibus-fbterm-1.0.1.ebuild
new file mode 100644
index 000000000000..81fd871b7bf2
--- /dev/null
+++ b/app-i18n/ibus-fbterm/ibus-fbterm-1.0.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="IBus client for FbTerm"
+HOMEPAGE="https://github.com/fujiwarat/ibus-fbterm"
+SRC_URI="https://github.com/fujiwarat/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-i18n/ibus
+	app-i18n/fbterm
+	dev-libs/glib:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/app-i18n/ibus-fbterm/metadata.xml b/app-i18n/ibus-fbterm/metadata.xml
new file mode 100644
index 000000000000..884cfd6920fc
--- /dev/null
+++ b/app-i18n/ibus-fbterm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">fujiwarat/ibus-fbterm</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/ibus-handwrite-2.1.4-r1 b/app-i18n/ibus-handwrite-2.1.4-r1
deleted file mode 100644
index a6a4773e9efe..000000000000
--- a/app-i18n/ibus-handwrite-2.1.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=app-i18n/ibus x11-libs/gtk+:2 x11-libs/gtkglext nls? ( virtual/libintl ) zinnia? ( app-i18n/zinnia app-i18n/zinnia-tomoe ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Hand write recognition/input for IBus
-EAPI=6
-HOMEPAGE=https://github.com/microcai/ibus-handwrite
-IUSE=nls +zinnia
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=app-i18n/ibus x11-libs/gtk+:2 x11-libs/gtkglext nls? ( virtual/libintl ) zinnia? ( app-i18n/zinnia app-i18n/zinnia-tomoe )
-SLOT=0
-SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus-handwrite/ibus-handwrite-2.1.4.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=2d630539a41e26f7b347419312927461
diff --git a/app-i18n/ibus-handwrite-3.0.0 b/app-i18n/ibus-handwrite-3.0.0
deleted file mode 100644
index bf43447fafe6..000000000000
--- a/app-i18n/ibus-handwrite-3.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=app-i18n/ibus x11-libs/gtk+:3 x11-libs/gtkglext nls? ( virtual/libintl ) zinnia? ( app-i18n/zinnia app-i18n/zinnia-tomoe ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Hand write recognition/input for IBus
-EAPI=6
-HOMEPAGE=https://github.com/microcai/ibus-handwrite
-IUSE=nls +zinnia
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-i18n/ibus x11-libs/gtk+:3 x11-libs/gtkglext nls? ( virtual/libintl ) zinnia? ( app-i18n/zinnia app-i18n/zinnia-tomoe )
-SLOT=0
-SRC_URI=https://github.com/microcai/ibus-handwrite/releases/download/3.0/ibus-handwrite-3.0.0.tar.bz2
-_md5_=7907dbadfc39a258197e7b7f8b46093e
diff --git a/app-i18n/ibus-handwrite/Manifest b/app-i18n/ibus-handwrite/Manifest
new file mode 100644
index 000000000000..14b6ccdd8c5e
--- /dev/null
+++ b/app-i18n/ibus-handwrite/Manifest
@@ -0,0 +1,7 @@
+AUX ibus-handwrite-headers.patch 406 BLAKE2B cb683592e24d58d2fcd4718374e0d5e8cb51c6300f5123a3d9d43c34e24a3f3413dac5b256e6e7fb74494870d449ccc4a22fc5916a27407fe7c11af391ced5b3 SHA512 4629c68451d3b3ede478b03241d58c66f1a94be0caa05b4cf22d0287beb059c807e398457f0aaaccc6d0f85b9cb987153bae213d949e78afc2c66a6880baa7d7
+AUX ibus-handwrite-link.patch 194 BLAKE2B 6a39b000d1ad3b8e8e16acc1f049f493eb302f7154d0007eac40dc707591f7622417eca998d2f1aef3978a5377c25c32c56b9bf6360f83642fb2503a65633063 SHA512 52d376687473a4dac3f679eae8d68d6457669f0587fb9d4a141b40318060acf552c00cff1f048497699f0a7d3f33f2b0271ed727f2c747f5fa7539d2550fd8b1
+DIST ibus-handwrite-2.1.4.tar.bz2 237980 BLAKE2B 7f8fae383a779b2893e5e014b5dcbdcb48a7f541f04e6b829dffd008fa95b73eb3e1af395c29e68a9c80e7cfdc95928f0a360f84df62c1dc06a9431d1dcf4eec SHA512 fca7129edb7433e7ea6df1ce67b3f27285fe102cc029a7a1bdb8ba0402407bd81724d1b14667d342ef41491acff03e9c152b748e4fee5387f315d4673c2964e6
+DIST ibus-handwrite-3.0.0.tar.bz2 239452 BLAKE2B 379b283565efc16c75c1811e096f814a4a0f009ab469a7bc251f34889bd62c7158379a63b71529db942969a3444a6be42f3db3bc5787993f8e15f86a6a7ddb76 SHA512 ed9b2b35919f3e061230c7085c88e5ce80ee978ffa7f8391e74364e8d6152f0d88a08f91ec58b55fc7067e9fe45d03018760ccfca7b026f36211fa344d16c9b1
+EBUILD ibus-handwrite-2.1.4-r1.ebuild 910 BLAKE2B 32ca39689bc0db16936328edc36c82c4fb789f74e6823d2d81ead14c255d17da3ff515dc6c6706a9719027b5806f464ae5f38f304ec849d528778c6436b249cf SHA512 d40ca6abf5ae79c4edf80821c22fc67b834a854e68e0e8019c23a35b0c377061921ef96a919397427fb3e1219a6608b3eb426e3e03704370d04908e1d9e17179
+EBUILD ibus-handwrite-3.0.0.ebuild 794 BLAKE2B 6d7015cf64cea92740acea89fbf601b2c01208a7379fb69e482f2e94a5234f09cbbf9468568e2f10948f24293b2cf7dbc246ba2b36ea8f88eb8eae64a5302eab SHA512 3047b4d6131a5b7127823883a2e8851e0696a4e25a07e120124410a792f8a873165a7ecef499cf542bb822e20cc40fc8f72b1c0bc451a7180f5e426cee6d01ee
+MISC metadata.xml 334 BLAKE2B 229fb7df1c57b5810055e7a61a05a330eff00738b85c15a0b47b9d8e93a57b420cbe7bac0c163289f59441fd4252bffe7afd4b6451fc68fce18569187ce77fac SHA512 628e07c785b2e40e4885e4b59a8c8f7c264ed651490f7cc4e0ac253c6f263def9aa9fdb8a5edc41e56381335510a654b171ab05ff9b6006f3c4a77a004226227
diff --git a/app-i18n/ibus-handwrite/files/ibus-handwrite-headers.patch b/app-i18n/ibus-handwrite/files/ibus-handwrite-headers.patch
new file mode 100644
index 000000000000..f1cb4d574624
--- /dev/null
+++ b/app-i18n/ibus-handwrite/files/ibus-handwrite-headers.patch
@@ -0,0 +1,20 @@
+--- a/src/handrecog_lucykila.c
++++ b/src/handrecog_lucykila.c
+@@ -14,6 +14,7 @@
+ #include <sys/fcntl.h>
+ #include <sys/mman.h>
+ #include <math.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <glib.h>
+ 
+--- a/src/main.c
++++ b/src/main.c
+@@ -3,6 +3,7 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <ibus.h>
+ #include <locale.h>
+ #include <gtk/gtkgl.h>
diff --git a/app-i18n/ibus-handwrite/files/ibus-handwrite-link.patch b/app-i18n/ibus-handwrite/files/ibus-handwrite-link.patch
new file mode 100644
index 000000000000..1d8415fbaf8f
--- /dev/null
+++ b/app-i18n/ibus-handwrite/files/ibus-handwrite-link.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -80,6 +80,8 @@
+ 		AM_CONDITIONAL(WITH_ZINNIA,[false])		
+ ])
+ 
++AC_CHECK_LIB([m],[atan2])
++
+ # check ibus
+ PKG_CHECK_MODULES(IBUS, [
+     ibus-1.0 >= 1.3
diff --git a/app-i18n/ibus-handwrite/ibus-handwrite-2.1.4-r1.ebuild b/app-i18n/ibus-handwrite/ibus-handwrite-2.1.4-r1.ebuild
new file mode 100644
index 000000000000..6965a9cf27eb
--- /dev/null
+++ b/app-i18n/ibus-handwrite/ibus-handwrite-2.1.4-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+DESCRIPTION="Hand write recognition/input for IBus"
+HOMEPAGE="https://github.com/microcai/ibus-handwrite"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls +zinnia"
+
+RDEPEND="app-i18n/ibus
+	x11-libs/gtk+:2
+	x11-libs/gtkglext
+	nls? ( virtual/libintl )
+	zinnia? (
+		app-i18n/zinnia
+		app-i18n/zinnia-tomoe
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-headers.patch
+	"${FILESDIR}"/${PN}-link.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable zinnia) \
+		$(use_with zinnia zinnia-tomoe "${EPREFIX}"/usr/$(get_libdir)/zinnia/model/tomoe)
+}
diff --git a/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0.ebuild b/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0.ebuild
new file mode 100644
index 000000000000..25419a692eb1
--- /dev/null
+++ b/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Hand write recognition/input for IBus"
+HOMEPAGE="https://github.com/microcai/ibus-handwrite"
+SRC_URI="https://github.com/microcai/${PN}/releases/download/${PV%.0}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls +zinnia"
+
+RDEPEND="app-i18n/ibus
+	x11-libs/gtk+:3
+	x11-libs/gtkglext
+	nls? ( virtual/libintl )
+	zinnia? (
+		app-i18n/zinnia
+		app-i18n/zinnia-tomoe
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=( "${FILESDIR}"/${PN}-headers.patch )
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable zinnia) \
+		$(use_with zinnia zinnia-tomoe "${EPREFIX}"/usr/$(get_libdir)/zinnia/model/tomoe)
+}
diff --git a/app-i18n/ibus-handwrite/metadata.xml b/app-i18n/ibus-handwrite/metadata.xml
new file mode 100644
index 000000000000..23f5c6be388a
--- /dev/null
+++ b/app-i18n/ibus-handwrite/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <use>
+    <flag name="zinnia">Enable support for <pkg>app-i18n/zinnia</pkg></flag>
+  </use>
+</pkgmetadata>
diff --git a/app-i18n/ibus-hangul-1.5.0 b/app-i18n/ibus-hangul-1.5.0
deleted file mode 100644
index f5c015aad718..000000000000
--- a/app-i18n/ibus-hangul-1.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=>=app-i18n/ibus-1.4[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] =dev-python/pygobject-2*[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] =dev-python/pygtk-2*[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-i18n/libhangul-0.1 nls? ( virtual/libintl ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig nls? ( dev-util/intltool >=sys-devel/gettext-0.17 )
-DESCRIPTION=The Hangul engine for IBus input platform
-EAPI=5
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=nls python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-i18n/ibus-1.4[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] =dev-python/pygobject-2*[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] =dev-python/pygtk-2*[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-i18n/libhangul-0.1 nls? ( virtual/libintl ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/choehwanjin/ibus-hangul/releases/download/1.5.0/ibus-hangul-1.5.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b4869415fa4fca1ecc2ff303ebf4c71d
diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
new file mode 100644
index 000000000000..c3f9a139704e
--- /dev/null
+++ b/app-i18n/ibus-hangul/Manifest
@@ -0,0 +1,3 @@
+DIST ibus-hangul-1.5.0.tar.gz 505707 BLAKE2B 4dd630d7ed83ff4913e87c4d77f951845714697500a87ae337d898fe674d29e9421d5d506c2beb3acef859864d655f20d92f6a0cc5620f293a8a7623c4bd3158 SHA512 a9bef9ad887d1b41555af12e7589a9c4c69ddf4f61890907d90cbab6b9bf4cb6df4739c54d34ee1b2507486a1cb568f826bb4641e9ccee8ccfa11ff2d7e962bb
+EBUILD ibus-hangul-1.5.0.ebuild 935 BLAKE2B f0636e7f313db22213e2b6653f5ebdd958814b8b14f749419e46d55cf59a6fe8127fc5d6edb9439989b363db7c35d01eb13b55727c907ecd925d143c9443fcb5 SHA512 09b7c95e19af3dc76168b94d2a610eea1dcad3d72b4bb203cf2b785fdcc780e1b09e21118b1a7d6dd28c0932b83e9c28f977d15c220dc8e118585f577037cf87
+MISC metadata.xml 488 BLAKE2B 041bd1fd85e70d4c68feb85d9af3bc2d526f34852003568851d247c2f0ed70063cb77cbc3ba6bd14c7cd876ebc68840dbbedae4db64ea9897ef6b4c2cfb52fe1 SHA512 e46e56035a8bd336671564f460a30d5de6951ff53f6bd2567b4a17fb1fb661644caf4c4a40b7cd237cb57a19a71f174f243dea5e16eca490bda9116ce14ebd22
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.0.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.0.ebuild
new file mode 100644
index 000000000000..38435562f840
--- /dev/null
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="The Hangul engine for IBus input platform"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/choehwanjin/ibus-hangul/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+
+RDEPEND=">=app-i18n/ibus-1.4[python,${PYTHON_USEDEP}]
+	=dev-python/pygobject-2*[${PYTHON_USEDEP}]
+	=dev-python/pygtk-2*[${PYTHON_USEDEP}]
+	>=app-i18n/libhangul-0.1
+	nls? ( virtual/libintl )
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? (
+		dev-util/intltool
+		>=sys-devel/gettext-0.17
+		)"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	sed -ie "s:python:${EPYTHON}:" \
+		setup/ibus-setup-hangul.in || die
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
diff --git a/app-i18n/ibus-hangul/metadata.xml b/app-i18n/ibus-hangul/metadata.xml
new file mode 100644
index 000000000000..7f550752e704
--- /dev/null
+++ b/app-i18n/ibus-hangul/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<longdescription lang="en">The Hangul engine for IBus platform. It provides Korean input method from libhangul.</longdescription>
+	<upstream>
+		<remote-id type="google-code">ibus</remote-id>
+		<remote-id type="github">ibus/ibus</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/ibus-input-pad-1.4.99_pre20140916 b/app-i18n/ibus-input-pad-1.4.99_pre20140916
deleted file mode 100644
index b50b994d60ce..000000000000
--- a/app-i18n/ibus-input-pad-1.4.99_pre20140916
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=app-i18n/ibus dev-libs/glib:2 dev-libs/input-pad virtual/libintl x11-libs/gtk+:3 dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Input Pad for IBus
-EAPI=6
-HOMEPAGE=https://github.com/fujiwarat/input-pad/wiki
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/ibus dev-libs/glib:2 dev-libs/input-pad virtual/libintl x11-libs/gtk+:3
-SLOT=0
-SRC_URI=https://github.com/fujiwarat/ibus-input-pad/releases/download/1.4.99.20140916/ibus-input-pad-1.4.99.20140916.tar.gz
-_md5_=b4e34f3296bafd2302bb1bc8b7c7d334
diff --git a/app-i18n/ibus-input-pad/Manifest b/app-i18n/ibus-input-pad/Manifest
new file mode 100644
index 000000000000..97445bc32fe5
--- /dev/null
+++ b/app-i18n/ibus-input-pad/Manifest
@@ -0,0 +1,3 @@
+DIST ibus-input-pad-1.4.99.20140916.tar.gz 415453 BLAKE2B 43e9ac935bec1008d41aa3d71965e63e01c388cbf2d208520df8b6ebf99af6cd6c7d128612b9917234fa0958ff5c8d5edf99ca0e6f3f21da8da4e7b863b4774a SHA512 6b03dff097d06ff7b51393ce49c04faa169152c5b02d2cfbcbfab480a00920bdeb7f5e6ebfed19bdee792fe9b52e0aacda0ff629fccff24523f000d8915c56ba
+EBUILD ibus-input-pad-1.4.99_pre20140916.ebuild 587 BLAKE2B 098348e90a135beb49225a3dabc475212349bf18aea27239c0d0145bf4a5b8001aaafbd49e9cbb11563f1a6bdb2ccace84f88e7b3f18d27f3baf0f057cb4f73f SHA512 c0c64df8395e92c6f3806f4d9664c66088f194aee3217c90b0434e76b47af39d3283a9c1070cc6b361d78d5a4c6bc8bcb00720a988e9bf9993e22d40777bde5f
+MISC metadata.xml 484 BLAKE2B 47b64b57dbdb697f76843856756bbd865123c2e580ef37fa76df67cff774d9a337a5af1e7c4e2f6f8355190041d1fd3a235f5910b5bab65023c2031ec0a7136d SHA512 4adea61b092792b2ba2397d6bc8da3bc93909012daf00e1c134e51b4a75b197d29521b1325ad8e922e82aed8c74da691aeaabd3feac252c43c2d1aee15494f3e
diff --git a/app-i18n/ibus-input-pad/ibus-input-pad-1.4.99_pre20140916.ebuild b/app-i18n/ibus-input-pad/ibus-input-pad-1.4.99_pre20140916.ebuild
new file mode 100644
index 000000000000..2d075d8b0bee
--- /dev/null
+++ b/app-i18n/ibus-input-pad/ibus-input-pad-1.4.99_pre20140916.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+MY_P="${P/_pre/.}"
+MY_PV="${PV/_pre/.}"
+
+DESCRIPTION="Input Pad for IBus"
+HOMEPAGE="https://github.com/fujiwarat/input-pad/wiki"
+SRC_URI="https://github.com/fujiwarat/${PN}/releases/download/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-i18n/ibus
+	dev-libs/glib:2
+	dev-libs/input-pad
+	virtual/libintl
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+S="${WORKDIR}/${MY_P}"
diff --git a/app-i18n/ibus-input-pad/metadata.xml b/app-i18n/ibus-input-pad/metadata.xml
new file mode 100644
index 000000000000..bf5fd2c11dc7
--- /dev/null
+++ b/app-i18n/ibus-input-pad/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <longdescription lang="en">
+    The Input Pad engine for IBus. It provides an input pad from
+    <pkg>dev-libs/input-pad</pkg>.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">fujiwarat/ibus-input-pad</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/ibus-kkc-1.5.22 b/app-i18n/ibus-kkc-1.5.22
deleted file mode 100644
index bebaf7aa8e87..000000000000
--- a/app-i18n/ibus-kkc-1.5.22
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=app-i18n/ibus app-i18n/libkkc x11-libs/gtk+:3 nls? ( virtual/libintl ) || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Japanese Kana Kanji conversion engine for IBus
-EAPI=6
-HOMEPAGE=https://github.com/ueno/ibus-kkc
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-i18n/ibus app-i18n/libkkc x11-libs/gtk+:3 nls? ( virtual/libintl ) app-i18n/skk-jisyo
-SLOT=0
-SRC_URI=https://github.com/ueno/ibus-kkc/releases/download/v1.5.22/ibus-kkc-1.5.22.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e8b70d9131c94c73d2e58b96087f10d4
diff --git a/app-i18n/ibus-kkc/Manifest b/app-i18n/ibus-kkc/Manifest
new file mode 100644
index 000000000000..04a4aa1000db
--- /dev/null
+++ b/app-i18n/ibus-kkc/Manifest
@@ -0,0 +1,3 @@
+DIST ibus-kkc-1.5.22.tar.gz 518844 BLAKE2B eb3d562960729ff4967781ca3cc2797915c4c3e3b60281ca05483da3180575500fd5688c1481d03a909e8a108082159197e23b3a6c4df672b7d57ccc774783b3 SHA512 767a995cb97ca7cf5434f64094351c4fcf1d3de9f31da6f6642ccec2d199ddfb58e27f281b4dd3c63f44dc29cd46b36808ecd1aacfe0b1320d0688d567eb6fd4
+EBUILD ibus-kkc-1.5.22.ebuild 694 BLAKE2B ba1accb04e5bd10ebbee544e15e2865312d67338afef9a09cb321550ed7528a4439c96adcc2c20b377fb33ca37157847912c1a5939a7d90a987da91c96794568 SHA512 92d2c1c5587edb7a62bac7e86c53858dd77d4f273fa8db304fb8749671a0ca1c94bdfd8655724a3531754eae712981ff32596128ec2572dd20864977c2cbdb07
+MISC metadata.xml 491 BLAKE2B 86b5c844b54926689e60e44fa12a91a0daffaf6ff2a95586787df96d3926072b87316a86201b6b07351be39ace8bdc822c7084013d92f30a9eb1373141cf1463 SHA512 a8a9e0599c426f5c64660b503c8d3ddfe3b1573a3b547f1b6e7bffd8a581dfe41d5f81439ad7456b589d43a41511a9d8a26dff9b7b8b138aa033e7ad1f917d69
diff --git a/app-i18n/ibus-kkc/ibus-kkc-1.5.22.ebuild b/app-i18n/ibus-kkc/ibus-kkc-1.5.22.ebuild
new file mode 100644
index 000000000000..a2b21852753a
--- /dev/null
+++ b/app-i18n/ibus-kkc/ibus-kkc-1.5.22.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit vala
+
+DESCRIPTION="Japanese Kana Kanji conversion engine for IBus"
+HOMEPAGE="https://github.com/ueno/ibus-kkc"
+SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+CDEPEND="app-i18n/ibus
+	app-i18n/libkkc
+	x11-libs/gtk+:3
+	nls? ( virtual/libintl )"
+RDEPEND="${CDEPEND}
+	app-i18n/skk-jisyo"
+DEPEND="${CDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	vala_src_prepare
+	default
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
diff --git a/app-i18n/ibus-kkc/metadata.xml b/app-i18n/ibus-kkc/metadata.xml
new file mode 100644
index 000000000000..5516917a7bb0
--- /dev/null
+++ b/app-i18n/ibus-kkc/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <longdescription lang="en">
+    The Kana Kanji conversion engine for IBus. It provides Japanese input
+    method from <pkg>app-i18n/libkkc</pkg>.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">ueno/ibus-kkc</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/ibus-libpinyin-1.10.0 b/app-i18n/ibus-libpinyin-1.10.0
deleted file mode 100644
index a05c0bb70f77..000000000000
--- a/app-i18n/ibus-libpinyin-1.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure postinst postrm prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] ) python_single_target_python3_4? ( dev-lang/python:3.4[sqlite(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-i18n/ibus[python(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=app-i18n/libpinyin-2.1.0:= dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] boost? ( dev-libs/boost:= ) lua? ( dev-lang/lua:0 ) opencc? ( app-i18n/opencc:= ) virtual/libintl virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus
-EAPI=6
-HOMEPAGE=https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/
-IUSE=boost lua opencc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] ) python_single_target_python3_4? ( dev-lang/python:3.4[sqlite(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-i18n/ibus[python(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=app-i18n/libpinyin-2.1.0:= dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] boost? ( dev-libs/boost:= ) lua? ( dev-lang/lua:0 ) opencc? ( app-i18n/opencc:= )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/libpinyin/ibus-libpinyin/archive/1.10.0.tar.gz -> ibus-libpinyin-1.10.0.tar.gz boost? ( https://github.com/tsuna/boost.m4/raw/282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d/build-aux/boost.m4 -> boost.282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d.m4 )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=977b1ec5d1508f433d8cb0514ddefdcb
diff --git a/app-i18n/ibus-libpinyin-1.9.2 b/app-i18n/ibus-libpinyin-1.9.2
deleted file mode 100644
index 5e2e47c3c0e9..000000000000
--- a/app-i18n/ibus-libpinyin-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure postinst postrm prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] ) python_single_target_python3_4? ( dev-lang/python:3.4[sqlite(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-i18n/ibus[python(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=app-i18n/libpinyin-2.1.0:= dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] boost? ( dev-libs/boost:= ) lua? ( dev-lang/lua:0 ) opencc? ( app-i18n/opencc:= ) virtual/libintl virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=Intelligent Pinyin engine based on libpinyin for IBus
-EAPI=6
-HOMEPAGE=https://github.com/libpinyin/ibus-libpinyin
-IUSE=boost lua opencc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] ) python_single_target_python3_4? ( dev-lang/python:3.4[sqlite(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-i18n/ibus[python(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=app-i18n/libpinyin-2.1.0:= dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] boost? ( dev-libs/boost:= ) lua? ( dev-lang/lua:0 ) opencc? ( app-i18n/opencc:= )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/libpinyin/ibus-libpinyin/archive/1.9.2.tar.gz -> ibus-libpinyin-1.9.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bba3fd81208fd30939ea76ebfbc4c17b
diff --git a/app-i18n/ibus-libpinyin-1.9.3 b/app-i18n/ibus-libpinyin-1.9.3
deleted file mode 100644
index 68238e5941a3..000000000000
--- a/app-i18n/ibus-libpinyin-1.9.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] ) python_single_target_python3_4? ( dev-lang/python:3.4[sqlite(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-i18n/ibus[python(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=app-i18n/libpinyin-2.1.0:= dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] boost? ( dev-libs/boost:= ) lua? ( dev-lang/lua:0 ) opencc? ( app-i18n/opencc:= ) virtual/libintl virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus
-EAPI=6
-HOMEPAGE=https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/
-IUSE=boost lua opencc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] ) python_single_target_python3_4? ( dev-lang/python:3.4[sqlite(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-i18n/ibus[python(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=app-i18n/libpinyin-2.1.0:= dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] boost? ( dev-libs/boost:= ) lua? ( dev-lang/lua:0 ) opencc? ( app-i18n/opencc:= )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/libpinyin/ibus-libpinyin/archive/1.9.3.tar.gz -> ibus-libpinyin-1.9.3.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=1375116ea4fcf4f9d7f01cfe5cacf6ac
diff --git a/app-i18n/ibus-libpinyin-1.9.3-r1 b/app-i18n/ibus-libpinyin-1.9.3-r1
deleted file mode 100644
index f27e3cc182c1..000000000000
--- a/app-i18n/ibus-libpinyin-1.9.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] ) python_single_target_python3_4? ( dev-lang/python:3.4[sqlite(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-i18n/ibus[python(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=app-i18n/libpinyin-2.1.0:= dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] boost? ( dev-libs/boost:= ) lua? ( dev-lang/lua:0 ) opencc? ( app-i18n/opencc:= ) virtual/libintl virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus
-EAPI=6
-HOMEPAGE=https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/
-IUSE=boost lua opencc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] ) python_single_target_python3_4? ( dev-lang/python:3.4[sqlite(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-i18n/ibus[python(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=app-i18n/libpinyin-2.1.0:= dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] boost? ( dev-libs/boost:= ) lua? ( dev-lang/lua:0 ) opencc? ( app-i18n/opencc:= )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/libpinyin/ibus-libpinyin/archive/1.9.3.tar.gz -> ibus-libpinyin-1.9.3.tar.gz boost? ( https://github.com/tsuna/boost.m4/raw/282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d/build-aux/boost.m4 -> boost.282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d.m4 )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c8db89781c13eb225bee75f99a98b51d
diff --git a/app-i18n/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest
new file mode 100644
index 000000000000..75460e331c0a
--- /dev/null
+++ b/app-i18n/ibus-libpinyin/Manifest
@@ -0,0 +1,9 @@
+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.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 1511 BLAKE2B 87a7b8d544f724a07a1bd45d3fa9c20ccd6ac37ec3200981be1efc33fdba5885389ef71b0cbeabc36eb5dd3f626127ba7bf3cf63901b8615a0f3d899c6184e40 SHA512 f8217da8f687758bd412344689b0fcd5f0827fc07af0067dafca14554acfe32a4517910b58afbcbd59c29b6c170ea8c2e4a3f0600726c3bec3a619574a50cb97
+EBUILD ibus-libpinyin-1.9.2.ebuild 1175 BLAKE2B ae4cdcdf56038f16466c6487673c9cc3e445fe921965a67823b4b6f5766ec15952a116c2c01c75c42496262a5ad964b96f32f95258bb949115c2b17d1903c870 SHA512 d407d821b80e2fb2b114cc746ece7688c3e11643dd422523e2cc557ed1995f6fc11e4ce7381e5a93de678439e62d9bb0af5d9334d6b7480a874225f8c11ddbb3
+EBUILD ibus-libpinyin-1.9.3-r1.ebuild 1414 BLAKE2B 51bed33e4c13ade709bc8c31cefec8c7e85b6ae1d30f01021b228ad454bab98584116217fd807273bcd9ff9c0257d9268a3741100b71e5256427f7b5b550ffe8 SHA512 ae5d7b682dab09fed9cd7fc9a8c222237368c876df342f629828428ca16cdc220104ff48a6a9af0bba66ed75f59a2a090783c10c3eb279b8d338bb87b29fc793
+EBUILD ibus-libpinyin-1.9.3.ebuild 1072 BLAKE2B 154b20cc5d10220b8da08b7bf779591a41a0dcbc55e2187b402377949365acc7d183fd691440f4ca40f743be967e73ae14920f759cd1b55574e7c4ca13f1f8ad SHA512 070878cdf22d10fd5bd5fb0cfc5b973542c40f0456297f125f66935007f0f6c0dc0b54dca32e01d289681c80af25d3aff18f92c16e331dddecd68ee8d1daab3a
+MISC metadata.xml 807 BLAKE2B 864c61e2dac53fc0b95541bf79e8f27a183f879bab95574f7cf462bfe276c89c8a5d2b65c899f4734c487feff1113a20ee02debd48b4ff955a24ace70ed5006e SHA512 c92e0e2c47a1272285c3a36cfc18c739df2a69dc911a8849cdc9c517183309908fdae894e88ed7511645b1c90c3611670b046f1a2c7c48fd0ff7c79d2de0a5b0
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0.ebuild
new file mode 100644
index 000000000000..b7b9d91dd13f
--- /dev/null
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit autotools gnome2-utils python-single-r1
+
+BOOST_M4_GIT_VERSION=282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d
+
+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
+	boost? ( https://github.com/tsuna/boost.m4/raw/${BOOST_M4_GIT_VERSION}/build-aux/boost.m4 -> boost.${BOOST_M4_GIT_VERSION}.m4 )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost lua opencc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+	>=app-i18n/libpinyin-2.1.0:=
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	boost? ( dev-libs/boost:= )
+	lua? ( dev-lang/lua:0 )
+	opencc? ( app-i18n/opencc:= )"
+
+DEPEND="${RDEPEND}
+	virtual/libintl
+	virtual/pkgconfig"
+
+src_prepare() {
+	if use boost; then
+		cp "${DISTDIR}/boost.${BOOST_M4_GIT_VERSION}.m4" "m4/boost.m4" \
+			|| die "copying newer version of boost.m4 file failed"
+	fi
+	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-libpinyin/ibus-libpinyin-1.9.2.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.2.ebuild
new file mode 100644
index 000000000000..8afd7a79c0fa
--- /dev/null
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit autotools gnome2-utils python-single-r1
+
+DESCRIPTION="Intelligent Pinyin engine based on libpinyin for IBus"
+HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin"
+SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="boost lua opencc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+	>=app-i18n/libpinyin-2.1.0:=
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	boost? ( dev-libs/boost:= )
+	lua? ( dev-lang/lua:0 )
+	opencc? ( app-i18n/opencc:= )"
+
+DEPEND="${RDEPEND}
+	virtual/libintl
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	sed -i "s/python/${EPYTHON}/" setup/ibus-setup-libpinyin.in || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-english-input-mode \
+		$(use_enable boost) \
+		$(use_enable lua lua-extension) \
+		$(use_enable opencc)
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.3-r1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.3-r1.ebuild
new file mode 100644
index 000000000000..04c2251e7b30
--- /dev/null
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.3-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit autotools python-single-r1
+
+BOOST_M4_GIT_VERSION=282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d
+
+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
+	boost? ( https://github.com/tsuna/boost.m4/raw/${BOOST_M4_GIT_VERSION}/build-aux/boost.m4 -> boost.${BOOST_M4_GIT_VERSION}.m4 )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost lua opencc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+	>=app-i18n/libpinyin-2.1.0:=
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	boost? ( dev-libs/boost:= )
+	lua? ( dev-lang/lua:0 )
+	opencc? ( app-i18n/opencc:= )"
+
+DEPEND="${RDEPEND}
+	virtual/libintl
+	virtual/pkgconfig"
+
+src_prepare() {
+	if use boost; then
+		cp "${DISTDIR}/boost.${BOOST_M4_GIT_VERSION}.m4" "m4/boost.m4" \
+			|| die "copying newer version of boost.m4 file failed"
+	fi
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-english-input-mode \
+		$(use_enable boost) \
+		$(use_enable lua lua-extension) \
+		$(use_enable opencc)
+}
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.3.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.3.ebuild
new file mode 100644
index 000000000000..1ac7959b0afc
--- /dev/null
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit autotools 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}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+	>=app-i18n/libpinyin-2.1.0:=
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	boost? ( dev-libs/boost:= )
+	lua? ( dev-lang/lua:0 )
+	opencc? ( app-i18n/opencc:= )"
+
+DEPEND="${RDEPEND}
+	virtual/libintl
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-english-input-mode \
+		$(use_enable boost) \
+		$(use_enable lua lua-extension) \
+		$(use_enable opencc)
+}
diff --git a/app-i18n/ibus-libpinyin/metadata.xml b/app-i18n/ibus-libpinyin/metadata.xml
new file mode 100644
index 000000000000..7eb3bcc18ded
--- /dev/null
+++ b/app-i18n/ibus-libpinyin/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>graham.ramsey@gmail.com</email>
+    <name>Graham Ramsey</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <use>
+    <flag name="boost">Compile against <pkg>dev-libs/boost</pkg> libraries</flag>
+    <flag name="opencc">Enable support for <pkg>app-i18n/opencc</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="github">libpinyin/ibus-libpinyin</remote-id>
+    <remote-id type="sourceforge">libpinyin</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/ibus-m17n-1.3.2 b/app-i18n/ibus-m17n-1.3.2
deleted file mode 100644
index 13f800f0551b..000000000000
--- a/app-i18n/ibus-m17n-1.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=app-i18n/ibus dev-libs/m17n-lib gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) nls? ( virtual/libintl ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=M17N engine for IBus
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=gtk gtk2 nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/ibus dev-libs/m17n-lib gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) nls? ( virtual/libintl ) >=dev-db/m17n-db-1.7
-REQUIRED_USE=gtk2? ( gtk )
-SLOT=0
-SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/ibus-m17n-1.3.2.tar.gz
-_md5_=5207c3d646f18d7c1438225f2a20e0c4
diff --git a/app-i18n/ibus-m17n-1.3.4 b/app-i18n/ibus-m17n-1.3.4
deleted file mode 100644
index 6fc677c92b05..000000000000
--- a/app-i18n/ibus-m17n-1.3.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=app-i18n/ibus dev-libs/m17n-lib gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) nls? ( virtual/libintl ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=M17N engine for IBus
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=gtk gtk2 nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/ibus dev-libs/m17n-lib gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) nls? ( virtual/libintl ) >=dev-db/m17n-db-1.7
-REQUIRED_USE=gtk2? ( gtk )
-SLOT=0
-SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/ibus-m17n-1.3.4.tar.gz
-_md5_=f252f5f324797c85ab4509828069bacc
diff --git a/app-i18n/ibus-m17n/Manifest b/app-i18n/ibus-m17n/Manifest
new file mode 100644
index 000000000000..afdbed564acf
--- /dev/null
+++ b/app-i18n/ibus-m17n/Manifest
@@ -0,0 +1,5 @@
+DIST ibus-m17n-1.3.2.tar.gz 414324 BLAKE2B de477d8d0ec8e6498946799d2369755ec4b82856df7be91b426535290442dcffc43538b06b9e9aaffc6f1eae794a232b86935230bb3590f165a91bda9e4a1629 SHA512 6cbff2bf08043eb46d5e97c9303ebbb795c69b77c14d113c22fee2111eaee04ba8bc27bbd44b6640be02dd43f4b3711aba1b02fcbb350b8bca8d90dd20b4ba54
+DIST ibus-m17n-1.3.4.tar.gz 436687 BLAKE2B 66c1138101b1c3634ebeef4657ef9d4accb30e9db0047d7232d1c25a5d061e705fb1f1bd2800c951baadeddf999a4eb24a581d59e261df4fd68d23b29ef3c530 SHA512 9e9bc290b0f0d68558d408f6e69aa3bd9bb767db827a95839b576b58c7a5056dedcbd9b0bf1aab5e26ab21e601acd67a53404a5fd54b436efaf2a706489f25c4
+EBUILD ibus-m17n-1.3.2.ebuild 754 BLAKE2B adca146317671d3468f9f00a037deb7a9a3390b5ad1dd0828c0164d9cc57f08387fbcff645777ee17dd9d5fed8966c4422ed4c9a3b33d89cf42a6605ae30a518 SHA512 37eb35f1dfc5bdb06eff61e91c0ee319b0ecc2f670e8e7b9daf8eac381a4b67eb56b0bd1542581e7f0b67405fbe9c00ab51855bce9c76459ab4006b844c48eef
+EBUILD ibus-m17n-1.3.4.ebuild 756 BLAKE2B 6a17aecbbaa5d68a57378bc5b63e0e315779e0ce93670b4d0a18ae0d98ef2e94c41369915d20f683362295ab24bccfc93945654a1c6f18ee0c7ae32d2c9057cc SHA512 61dd652c11acdb6f0040fbfa2723b63014d1b408b88556d1ad73d3b2748d5cb780350040d4f8970824002a3cb8add59234349e75dc7eafd796254ade315ec782
+MISC metadata.xml 706 BLAKE2B 26b96ef11039182056e63f34f5bfa5f105e3eff9cd996aabaf0fde26bc650b51e1a176f700c7189cc568310c1ea6f8ef15c0316801526b3556142a0473731736 SHA512 b5da8f8cf77fe9028b052e0a546667342116e16c79ef044032443f30ff2814c5e534ee70b99419fbb509db2d4d755d570f8a8900a139594518eb7b6a5971b0f2
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild
new file mode 100644
index 000000000000..d6b31d987ab6
--- /dev/null
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="M17N engine for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="gtk gtk2 nls"
+
+CDEPEND="app-i18n/ibus
+	dev-libs/m17n-lib
+	gtk? (
+		gtk2? ( x11-libs/gtk+:2 )
+		!gtk2? ( x11-libs/gtk+:3 )
+	)
+	nls? ( virtual/libintl )"
+RDEPEND="${CDEPEND}
+	>=dev-db/m17n-db-1.7"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+REQUIRED_USE="gtk2? ( gtk )"
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with gtk gtk $(usex gtk2 2.0 3.0))
+}
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild
new file mode 100644
index 000000000000..b69cce49a38c
--- /dev/null
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="M17N engine for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk gtk2 nls"
+
+CDEPEND="app-i18n/ibus
+	dev-libs/m17n-lib
+	gtk? (
+		gtk2? ( x11-libs/gtk+:2 )
+		!gtk2? ( x11-libs/gtk+:3 )
+	)
+	nls? ( virtual/libintl )"
+RDEPEND="${CDEPEND}
+	>=dev-db/m17n-db-1.7"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+REQUIRED_USE="gtk2? ( gtk )"
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with gtk gtk $(usex gtk2 2.0 3.0))
+}
diff --git a/app-i18n/ibus-m17n/metadata.xml b/app-i18n/ibus-m17n/metadata.xml
new file mode 100644
index 000000000000..905cdaedd1a9
--- /dev/null
+++ b/app-i18n/ibus-m17n/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <longdescription lang="en">
+    The M17N engine for IBus. It allows input of many languages using the input
+    table maps from <pkg>dev-libs/m17n-lib</pkg>.
+  </longdescription>
+  <use>
+    <flag name="gtk2">
+      Build with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:ibus_project:ibus-m17n</remote-id>
+    <remote-id type="github">ibus/ibus-m17n</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/ibus-pinyin-1.5.0-r2 b/app-i18n/ibus-pinyin-1.5.0-r2
deleted file mode 100644
index 9e971b351fca..000000000000
--- a/app-i18n/ibus-pinyin-1.5.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-i18n/ibus[python(+),python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-i18n/pyzy dev-db/sqlite:3 dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] boost? ( dev-libs/boost ) lua? ( =dev-lang/lua-5.1*:= ) nls? ( virtual/libintl ) dev-util/intltool sys-devel/autoconf-archive virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Chinese Pinyin and Bopomofo engines for IBus
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=boost lua nls python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-i18n/ibus[python(+),python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-i18n/pyzy dev-db/sqlite:3 dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] boost? ( dev-libs/boost ) lua? ( =dev-lang/lua-5.1*:= ) nls? ( virtual/libintl )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/ibus-pinyin-1.5.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=7eb89904567c2688bdaa52eb390259d8
diff --git a/app-i18n/ibus-pinyin/Manifest b/app-i18n/ibus-pinyin/Manifest
new file mode 100644
index 000000000000..d3714ae5126a
--- /dev/null
+++ b/app-i18n/ibus-pinyin/Manifest
@@ -0,0 +1,5 @@
+AUX ibus-pinyin-1.5.0-content-type-method.patch 5534 BLAKE2B 658a4d099b02b344f38a9ef2fc2df0d2274dcd3b8071fac0aef0accbf7c21f0d4e98b9587d665b13195d7efc04bbf58218de84069a2c63eaa79156363061dd86 SHA512 3399052f0d12eb55554d5cc98637125e6648a56f3dc87eb2fadc63af3fb82bba915e820c51596d9106637f6a063100f217ad001422a61f8925db5c5b2024c976
+AUX ibus-pinyin-boost.patch 409 BLAKE2B 5fececc7f4ed6941d374799ccdb1d9d7deeeb7078bedc8d0085e12f8310c42d752c14168a7d07a88e9412fa9cbff5c5bdf4274202d2ed6b6e7f337a96c65c3f0 SHA512 8e4efe9b5d12d35672dd8891a49599bef6611aeb723e8fbc08197896e417cca1d55cf31a0bb1f3ec572db489b01aa36349eaf9238d1a693483d6e21bc10eab2e
+DIST ibus-pinyin-1.5.0.tar.gz 692516 BLAKE2B ae53eb79ea4e5336347d689814d8ef033551a9b432268e643927b28911da3d03701acb3f337d7781168461c1c53537f2271fc8f253d1e99a269f61ae5eb83b05 SHA512 b0cd849ee3154543747dde8994eec9aed01d67e0d9be308a2f0230cf22f0281cd8fcabd9763b24238547a37e54400bcd8e541937767b93f005d04302f0c00241
+EBUILD ibus-pinyin-1.5.0-r2.ebuild 1140 BLAKE2B de842fee994ea765f6f52922f282319b87fb6f4de9901eee34ddb3c8232431a7f389201508c22a298069ccb11f793e00be2af086a37195479164965f53483f77 SHA512 c86e6e49c9c153edf82790c0a3a79b521c9e076db136a97ac2b501e4b5d4321dcd1b787b79540836e620a1a8bb0b28c4610280ebd07d505fe9fa8bd2677cf8ef
+MISC metadata.xml 675 BLAKE2B 53ddd9a158adba18b4bbb56af1f1e75013c61ea23c245703489b677ed3a5eefd1fb0bba28b4269c5bff4ca6453ea5bb4027b0904f21ee89ecc2ca0d5c7041b52 SHA512 87c1743bc802f22de1d2441403b00eaee1a834730ee1b9f3c3ae62728fdc7073bbe01faec464042243ac7dea1ce11aca709bd5d836fca3c09ccb77c64ea27aea
diff --git a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-content-type-method.patch b/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-content-type-method.patch
new file mode 100644
index 000000000000..737046cfd7c6
--- /dev/null
+++ b/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-content-type-method.patch
@@ -0,0 +1,185 @@
+commit 97565d04e40634a1ab62790f718a8377754d2954
+Author: Peng Wu <alexepico@gmail.com>
+Date:   Wed Feb 19 10:57:40 2014 -0500
+
+    support setContentType method
+
+    ibus now supports setContentType method, if an application input some
+    password, the password will not be shown.
+
+    BUG=rhbz#1027029
+    R=Shawn.P.Huang@gmail.com
+
+    Review URL: https://codereview.appspot.com/22330043
+
+    Patch from Peng Wu <alexepico@gmail.com>.
+
+diff --git a/src/PYBopomofoEngine.cc b/src/PYBopomofoEngine.cc
+index 581c4cf..16d47b3 100644
+--- a/src/PYBopomofoEngine.cc
++++ b/src/PYBopomofoEngine.cc
+@@ -72,6 +72,9 @@ BopomofoEngine::processKeyEvent (guint keyval, guint keycode, guint modifiers)
+ {
+     gboolean retval = FALSE;
+ 
++    if (contentIsPassword())
++        return retval;
++
+     /* check Shift + Release hotkey,
+      * and then ignore other Release key event */
+     if (modifiers & IBUS_RELEASE_MASK) {
+@@ -139,6 +142,8 @@ BopomofoEngine::focusIn (void)
+ void
+ BopomofoEngine::focusOut (void)
+ {
++    Engine::focusOut();
++
+     reset ();
+ }
+ 
+diff --git a/src/PYEngine.cc b/src/PYEngine.cc
+index d9fa04a..553d13f 100644
+--- a/src/PYEngine.cc
++++ b/src/PYEngine.cc
+@@ -67,6 +67,12 @@ static gboolean ibus_pinyin_engine_process_key_event
+                                                  guint                   modifiers);
+ static void     ibus_pinyin_engine_focus_in     (IBusEngine             *engine);
+ static void     ibus_pinyin_engine_focus_out    (IBusEngine             *engine);
++#if IBUS_CHECK_VERSION (1, 5, 4)
++static void     ibus_pinyin_engine_set_content_type
++                                                (IBusEngine     *engine,
++                                                 guint           purpose,
++                                                 guint           hints);
++#endif
+ static void     ibus_pinyin_engine_reset        (IBusEngine             *engine);
+ static void     ibus_pinyin_engine_enable       (IBusEngine             *engine);
+ static void     ibus_pinyin_engine_disable      (IBusEngine             *engine);
+@@ -123,6 +129,10 @@ ibus_pinyin_engine_class_init (IBusPinyinEngineClass *klass)
+     engine_class->focus_in = ibus_pinyin_engine_focus_in;
+     engine_class->focus_out = ibus_pinyin_engine_focus_out;
+ 
++#if IBUS_CHECK_VERSION (1, 5, 4)
++    engine_class->set_content_type = ibus_pinyin_engine_set_content_type;
++#endif
++
+     engine_class->page_up = ibus_pinyin_engine_page_up;
+     engine_class->page_down = ibus_pinyin_engine_page_down;
+ 
+@@ -182,6 +192,17 @@ ibus_pinyin_engine_process_key_event (IBusEngine     *engine,
+     return pinyin->engine->processKeyEvent (keyval, keycode, modifiers);
+ }
+ 
++#if IBUS_CHECK_VERSION (1, 5, 4)
++static void
++ibus_pinyin_engine_set_content_type (IBusEngine     *engine,
++                                     guint purpose,
++                                     guint hints)
++{
++    IBusPinyinEngine *pinyin = (IBusPinyinEngine *) engine;
++    return pinyin->engine->setContentType (purpose, hints);
++}
++#endif
++
+ static void
+ ibus_pinyin_engine_property_activate (IBusEngine    *engine,
+                                       const gchar   *prop_name,
+@@ -220,6 +241,39 @@ FUNCTION(cursor_up,   cursorUp)
+ FUNCTION(cursor_down, cursorDown)
+ #undef FUNCTION
+ 
++Engine::Engine (IBusEngine *engine) : m_engine (engine)
++{
++#if IBUS_CHECK_VERSION (1, 5, 4)
++    m_input_purpose = IBUS_INPUT_PURPOSE_FREE_FORM;
++#endif
++}
++
++gboolean
++Engine::contentIsPassword()
++{
++#if IBUS_CHECK_VERSION (1, 5, 4)
++   return IBUS_INPUT_PURPOSE_PASSWORD == m_input_purpose;
++#else
++   return false;
++#endif
++}
++
++void
++Engine::focusOut (void)
++{
++#if IBUS_CHECK_VERSION (1, 5, 4)
++    m_input_purpose = IBUS_INPUT_PURPOSE_FREE_FORM;
++#endif
++}
++
++#if IBUS_CHECK_VERSION(1, 5, 4)
++void
++Engine::setContentType (guint purpose, guint hints)
++{
++    m_input_purpose = (IBusInputPurpose) purpose;
++}
++#endif
++
+ Engine::~Engine (void)
+ {
+ }
+diff --git a/src/PYEngine.h b/src/PYEngine.h
+index b74e6e8..21041b1 100644
+--- a/src/PYEngine.h
++++ b/src/PYEngine.h
+@@ -37,13 +37,18 @@ GType   ibus_pinyin_engine_get_type    (void);
+ 
+ class Engine {
+ public:
+-    Engine (IBusEngine *engine) : m_engine (engine) { }
++    Engine (IBusEngine *engine);
+     virtual ~Engine (void);
+ 
++    gboolean contentIsPassword();
++
+     // virtual functions
+     virtual gboolean processKeyEvent (guint keyval, guint keycode, guint modifiers) = 0;
+     virtual void focusIn (void) = 0;
+-    virtual void focusOut (void) = 0;
++    virtual void focusOut (void);
++#if IBUS_CHECK_VERSION (1, 5, 4)
++    virtual void setContentType (guint purpose, guint hints);
++#endif
+     virtual void reset (void) = 0;
+     virtual void enable (void) = 0;
+     virtual void disable (void) = 0;
+@@ -122,6 +127,11 @@ protected:
+ 
+ protected:
+     Pointer<IBusEngine>  m_engine;      // engine pointer
++
++#if IBUS_CHECK_VERSION (1, 5, 4)
++    IBusInputPurpose m_input_purpose;
++#endif
++
+ };
+ 
+ };
+diff --git a/src/PYPinyinEngine.cc b/src/PYPinyinEngine.cc
+index 7aea261..babaaed 100644
+--- a/src/PYPinyinEngine.cc
++++ b/src/PYPinyinEngine.cc
+@@ -82,6 +82,9 @@ PinyinEngine::processKeyEvent (guint keyval, guint keycode, guint modifiers)
+ {
+     gboolean retval = FALSE;
+ 
++    if (contentIsPassword())
++        return retval;
++
+     /* check Shift + Release hotkey,
+      * and then ignore other Release key event */
+     if (modifiers & IBUS_RELEASE_MASK) {
+@@ -195,6 +198,8 @@ PinyinEngine::focusIn (void)
+ void
+ PinyinEngine::focusOut (void)
+ {
++    Engine::focusOut ();
++
+     reset ();
+ }
+ 
diff --git a/app-i18n/ibus-pinyin/files/ibus-pinyin-boost.patch b/app-i18n/ibus-pinyin/files/ibus-pinyin-boost.patch
new file mode 100644
index 000000000000..124339e81bf2
--- /dev/null
+++ b/app-i18n/ibus-pinyin/files/ibus-pinyin-boost.patch
@@ -0,0 +1,15 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -93,9 +93,9 @@
+ )
+ if test x"$enable_boost" = x"yes"; then
+     # check boost
+-    BOOST_REQUIRE([1.39])
+-    BOOST_FIND_HEADER([boost/bind.hpp])
+-    BOOST_FIND_HEADER([boost/signals2.hpp])
++    AX_BOOST_BASE([1.39])
++    AC_CHECK_HEADERS([boost/bind.hpp])
++    AC_CHECK_HEADERS([boost/signals2.hpp])
+ fi
+ AM_CONDITIONAL(HAVE_BOOST, test x"$enable_boost" = x"yes")
+ 
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r2.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r2.ebuild
new file mode 100644
index 000000000000..2f8dba36e3c9
--- /dev/null
+++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Chinese Pinyin and Bopomofo engines for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="boost lua nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+	app-i18n/pyzy
+	dev-db/sqlite:3
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	boost? ( dev-libs/boost )
+	lua? ( =dev-lang/lua-5.1*:= )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-boost.patch
+	"${FILESDIR}"/${P}-content-type-method.patch
+)
+
+src_prepare() {
+	sed -i "s/python/${EPYTHON}/" setup/${PN/-/-setup-}.in
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable boost) \
+		$(use_enable lua lua-extension) \
+		$(use_enable nls)
+}
diff --git a/app-i18n/ibus-pinyin/metadata.xml b/app-i18n/ibus-pinyin/metadata.xml
new file mode 100644
index 000000000000..f82714b167fa
--- /dev/null
+++ b/app-i18n/ibus-pinyin/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>dlan@gentoo.org</email>
+    <name>Yixun Lan</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <longdescription lang="en">
+    The Pinyin engine for IBus. It provides Chinese input method from
+    <pkg>app-i18n/pyzy</pkg>.
+  </longdescription>
+  <use>
+    <flag name="boost">Enable support for <pkg>dev-libs/boost</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="github">ibus/ibus-pinyin</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/ibus-qt-1.3.3 b/app-i18n/ibus-qt-1.3.3
deleted file mode 100644
index 94e6eb8dd426..000000000000
--- a/app-i18n/ibus-qt-1.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-i18n/ibus dev-libs/icu:= dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 sys-apps/dbus x11-libs/libX11 virtual/pkgconfig doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Qt IBus library and Qt input method plugin
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=doc
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=app-i18n/ibus dev-libs/icu:= dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 sys-apps/dbus x11-libs/libX11
-SLOT=0
-SRC_URI=https://github.com/ibus/ibus-qt/archive/1.3.3.tar.gz -> ibus-qt-1.3.3.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=66cf905bfdc5d8f26912373bd24e5c9e
diff --git a/app-i18n/ibus-qt/Manifest b/app-i18n/ibus-qt/Manifest
new file mode 100644
index 000000000000..7362ac7d8c59
--- /dev/null
+++ b/app-i18n/ibus-qt/Manifest
@@ -0,0 +1,4 @@
+AUX ibus-qt-doc.patch 215 BLAKE2B 9895e1c72fac56052c6d7ef1bbf9702f5e89f4f9ef0afcb1682e41c51978aa1e8ff904039de0f1540177c44c071ef8e31791ce1312cba2b653e3df76797211cf SHA512 c6c46e8eb23bd9d6b21587f7f976a4bfc8f750e9135c8297224edf8ccfa3e97779144bcba661f4aa5a76226f59c1fc59da9e565a4b0b6d4285ac66f8ba0919c9
+DIST ibus-qt-1.3.3.tar.gz 141523 BLAKE2B 641ec53005ccb3b14646986bb0df4b091b88bcd4a181c82050d596f1840361d49451fcc1382d3fab1f54e463c9b0426b4f8bfd86b8f53224cb9c04dd298d5c87 SHA512 825a32fec51f10f466efd4255743a12ae98af63bacd07d5dc04e18fab6b830501b04491146c1f8bc92edd93dbf8eaeb68cf71062ffdbf25c2970d807b655c80a
+EBUILD ibus-qt-1.3.3.ebuild 989 BLAKE2B 9da6ca6e68818ad018b81ea5d831f0f22c11905c9c73764a4f0e29fd48aed35bdbc8acdd91f57c9a301f8b2f67dbf28e54c8b4077cb69da58d2843bd5db2a103 SHA512 af46f25f1e6ec3b0142bd88d53371541ba90404f6017fd64c9bd2e97f3f22f322c3e4f241675ca244ddd5f7282304b49977f9505a42653fecec5c6796089fd76
+MISC metadata.xml 427 BLAKE2B 9156e686bc1365dd3762c7550a07957a8b0320437c45a409e0127fb952bbc4c3cc0524437880cde421ff3e69fb232ddf16a65d2058da49c83f19fd1b74354372 SHA512 d8b71cd16b59609569170069a1cfd27bb09f5f6dce812e57550602fc5afc51eec23b9f646fe29145b0bdf3ae258868d4aead053444c290684696f344308a36ec
diff --git a/app-i18n/ibus-qt/files/ibus-qt-doc.patch b/app-i18n/ibus-qt/files/ibus-qt-doc.patch
new file mode 100644
index 000000000000..dbc1e9251369
--- /dev/null
+++ b/app-i18n/ibus-qt/files/ibus-qt-doc.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -77,7 +77,7 @@
+ pkg_check_modules(IBUS REQUIRED ibus-1.0>=1.3.7)
+ 
+ # check doxygen
+-find_package(Doxygen REQUIRED)
++find_package(Doxygen)
+ 
+ # =====
+ # Define variables
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild b/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
new file mode 100644
index 000000000000..0ed171d32907
--- /dev/null
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Qt IBus library and Qt input method plugin"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/ibus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="app-i18n/ibus
+	dev-libs/icu:=
+	dev-qt/qtcore:4
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+	sys-apps/dbus
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+PATCHES=( "${FILESDIR}"/${PN}-doc.patch )
+
+src_configure() {
+	append-cxxflags -std=c++14
+
+	local mycmakeargs=(
+		-DLIBDIR=$(get_libdir)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc; then
+		emake -C "${BUILD_DIR}" docs
+	fi
+}
+
+src_install() {
+	if use doc; then
+		HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	fi
+
+	cmake-utils_src_install
+}
diff --git a/app-i18n/ibus-qt/metadata.xml b/app-i18n/ibus-qt/metadata.xml
new file mode 100644
index 000000000000..4346ded0668a
--- /dev/null
+++ b/app-i18n/ibus-qt/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <longdescription lang="en">
+    The Qt client for IBus. It provides a Qt immodule.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">ibus/ibus-qt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/ibus-rime-0.9.9 b/app-i18n/ibus-rime-0.9.9
deleted file mode 100644
index 5ffecfabffc7..000000000000
--- a/app-i18n/ibus-rime-0.9.9
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=app-i18n/ibus app-i18n/librime x11-libs/libnotify dev-util/cmake
-DESCRIPTION=Rime Input Method Engine for IBus Framework
-EAPI=5
-HOMEPAGE=http://rime.im/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-i18n/ibus app-i18n/librime x11-libs/libnotify app-i18n/rime-data
-SLOT=0
-SRC_URI=https://rimeime.googlecode.com/files/ibus-rime-0.9.9.tar.gz
-_md5_=c9f542e6b11cb61447ab1c97fb57ff95
diff --git a/app-i18n/ibus-rime-1.1 b/app-i18n/ibus-rime-1.1
deleted file mode 100644
index aeb9cb1f00ed..000000000000
--- a/app-i18n/ibus-rime-1.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=app-i18n/ibus app-i18n/librime x11-libs/libnotify dev-util/cmake
-DESCRIPTION=Rime Input Method Engine for IBus Framework
-EAPI=5
-HOMEPAGE=http://rime.im/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-i18n/ibus app-i18n/librime x11-libs/libnotify app-i18n/rime-data
-SLOT=0
-SRC_URI=https://rimeime.googlecode.com/files/ibus-rime-1.1.tar.gz
-_md5_=4d1c52133423cd6073af75cb8fe58bd5
diff --git a/app-i18n/ibus-rime-1.2 b/app-i18n/ibus-rime-1.2
deleted file mode 100644
index f88c7c5f7279..000000000000
--- a/app-i18n/ibus-rime-1.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=app-i18n/ibus app-i18n/librime x11-libs/libnotify dev-util/cmake
-DESCRIPTION=Rime Input Method Engine for IBus Framework
-EAPI=5
-HOMEPAGE=http://rime.im/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-i18n/ibus app-i18n/librime x11-libs/libnotify app-i18n/rime-data
-SLOT=0
-SRC_URI=http://dl.bintray.com/lotem/rime/ibus-rime-1.2.tar.gz
-_md5_=5e659c3b29cf28482d012c39f0fee567
diff --git a/app-i18n/ibus-rime/Manifest b/app-i18n/ibus-rime/Manifest
new file mode 100644
index 000000000000..9f395f1ece7c
--- /dev/null
+++ b/app-i18n/ibus-rime/Manifest
@@ -0,0 +1,7 @@
+DIST ibus-rime-0.9.9.tar.gz 23912 BLAKE2B 894f4858e59e95792a713d6f05a64ec150381edd308c622c26cca806e8f990811f4218b13729ce5731959c2a289453b253f9b292a6400a3f53d681ebcffaac64 SHA512 b18e6f3ba6c97e3b55900d9c4cb70d58f24b202bf2ae894ca861af10ddb028c193d9ac97e609f3b4f0f183b212b74180a02e5d823f235b4c799733933a48afb7
+DIST ibus-rime-1.1.tar.gz 23418 BLAKE2B ae4abe0ab134c0ce3ac70da378c22d068bb329da22a8166ab60d5f0a316a88d937a241fb877f255d2be7847672ab20d9c7e11fa6724ff74f32e7e70350a2b475 SHA512 2510f9019045013f85af5b8401286b338b739fa0e908a3e30e1d59971a43c32212f388d367b51942292e236859feb1a70d7e7b8deb17eafd8b4f878cc7ba018f
+DIST ibus-rime-1.2.tar.gz 33396 BLAKE2B 39930ea31d40e622cd69d6f5a218729f460161dd9681e49bc35a1eb9b3875b6f5acbdaf36f7cf8200440bc27ed84a2f23ec1578b19a1fe6abbbc54c7078be11c SHA512 e1851781a6d069a79d04890b5b0aa2a706e611c08df3fcb99f883eeedd4dc4eefcac207f35b5cf1d856a41f0153ec3fbb040b4e6f610727384baa19b52a64155
+EBUILD ibus-rime-0.9.9.ebuild 633 BLAKE2B 2fb7f403c1ba22c284929ccbcbe7c71763efa08919bafcc64ca98e17757e4587e74a44c226e960fd2cb2f672331b8ce353f72fd1030585caf4ef6bb0a307da1f SHA512 460a3fe3cf16d743c0885504b3ad336533411d96cddad8e85925657710a936991dbe553609d82d131ee823516d106f6f4280dedae5d5d6c92b31fb4ed3fb6572
+EBUILD ibus-rime-1.1.ebuild 633 BLAKE2B 6afff9fd68329df81dd398d9d03e734cfbcb8bb226e18e13138656e3d0b8b8f82d17c184b8bea31a5d5530de5d56020832bbb20859ebe3c7db4c41bea13f634b SHA512 8fc8b74448abbb8a48a89e45fa8d1b5410105c15a3f771e5547fa95601c2b27125a1fd36691e8a2bdaf5c8356d5fe207dfef4bcab0a7b747274820c9a127049d
+EBUILD ibus-rime-1.2.ebuild 629 BLAKE2B 5b9123bb0c138f58ae83586e1b12c23eaff94bd68dc2afe8b17a40974266e6247f76008bdb91abf5e76f2b81185ccbd7cfe9a5616bdc4475ac99389ac62bcc35 SHA512 a9a177c70a874fcf27ca593f691aa87fd8cc21f0bf05bf52dd4479d86a280d5ab2ea65f250361613d0823a10895bac552877ad0e3cda32cac972ecb6e976d663
+MISC metadata.xml 601 BLAKE2B 95ae811151d2cd561bdeb0792404fb43a1c80b1be1c065e2ffbe797943bdfde926c56fed576bfde69bdba6aed29bc849a8c127ac6157b77311aec48fa623e01b SHA512 b99f85bda84da0fe35cda523709d24cea8065b72c57de666a615dcb0acec3b2745b6c06eb53a2cd63bdbc77c8abda232e9020b02965e6dde0f24211361efc34b
diff --git a/app-i18n/ibus-rime/ibus-rime-0.9.9.ebuild b/app-i18n/ibus-rime/ibus-rime-0.9.9.ebuild
new file mode 100644
index 000000000000..78e4ecd1c83a
--- /dev/null
+++ b/app-i18n/ibus-rime/ibus-rime-0.9.9.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Rime Input Method Engine for IBus Framework"
+HOMEPAGE="http://rime.im/"
+SRC_URI="https://rimeime.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="app-i18n/ibus
+	app-i18n/librime
+	x11-libs/libnotify"
+DEPEND="${COMMON_DEPEND}
+	dev-util/cmake"
+RDEPEND="${COMMON_DEPEND}
+	app-i18n/rime-data"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	sed -i -e "/^libexecdir/s:/lib:/libexec:" Makefile || die
+	sed -i -e "/exec/s:/usr/lib:/usr/libexec:" rime.xml || die
+}
diff --git a/app-i18n/ibus-rime/ibus-rime-1.1.ebuild b/app-i18n/ibus-rime/ibus-rime-1.1.ebuild
new file mode 100644
index 000000000000..c0a98b4c36a0
--- /dev/null
+++ b/app-i18n/ibus-rime/ibus-rime-1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Rime Input Method Engine for IBus Framework"
+HOMEPAGE="http://rime.im/"
+SRC_URI="https://rimeime.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="app-i18n/ibus
+	app-i18n/librime
+	x11-libs/libnotify"
+DEPEND="${COMMON_DEPEND}
+	dev-util/cmake"
+RDEPEND="${COMMON_DEPEND}
+	app-i18n/rime-data"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	sed -i -e "/^libexecdir/s:/lib:/libexec:" Makefile || die
+	sed -i -e "/exec/s:/usr/lib:/usr/libexec:" rime.xml || die
+}
diff --git a/app-i18n/ibus-rime/ibus-rime-1.2.ebuild b/app-i18n/ibus-rime/ibus-rime-1.2.ebuild
new file mode 100644
index 000000000000..81810d970e6a
--- /dev/null
+++ b/app-i18n/ibus-rime/ibus-rime-1.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Rime Input Method Engine for IBus Framework"
+HOMEPAGE="http://rime.im/"
+SRC_URI="http://dl.bintray.com/lotem/rime/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="app-i18n/ibus
+	app-i18n/librime
+	x11-libs/libnotify"
+DEPEND="${COMMON_DEPEND}
+	dev-util/cmake"
+RDEPEND="${COMMON_DEPEND}
+	app-i18n/rime-data"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	sed -i -e "/^libexecdir/s:/lib:/libexec:" Makefile || die
+	sed -i -e "/exec/s:/usr/lib:/usr/libexec:" rime.xml || die
+}
diff --git a/app-i18n/ibus-rime/metadata.xml b/app-i18n/ibus-rime/metadata.xml
new file mode 100644
index 000000000000..f0aced69ea0e
--- /dev/null
+++ b/app-i18n/ibus-rime/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>dlan@gentoo.org</email>
+    <name>Yixun Lan</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <maintainer>
+      <email>chen.sst@gmail.com</email>
+      <name>Gong Chen</name>
+    </maintainer>
+    <bugs-to>https://code.google.com/p/rimeime/issues/list</bugs-to>
+    <remote-id type="google-code">rimeime</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/ibus-skk-1.4.1-r1 b/app-i18n/ibus-skk-1.4.1-r1
deleted file mode 100644
index e94df4f01c24..000000000000
--- a/app-i18n/ibus-skk-1.4.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=app-i18n/ibus <=app-i18n/libskk-1.0.1 x11-libs/gtk+:3 nls? ( virtual/libintl ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Japanese SKK engine for IBus
-EAPI=5
-HOMEPAGE=https://github.com/ueno/ibus-skk
-IUSE=nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/ibus <=app-i18n/libskk-1.0.1 x11-libs/gtk+:3 nls? ( virtual/libintl ) app-i18n/skk-jisyo
-SLOT=0
-SRC_URI=mirror://github/ueno/ibus-skk/ibus-skk-1.4.1.tar.gz
-_md5_=e1687f7b15bda886d6562e724637e5ea
diff --git a/app-i18n/ibus-skk-1.4.2 b/app-i18n/ibus-skk-1.4.2
deleted file mode 100644
index cf9c86081656..000000000000
--- a/app-i18n/ibus-skk-1.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=app-i18n/ibus >=app-i18n/libskk-1.0.2 x11-libs/gtk+:3 nls? ( virtual/libintl ) || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Japanese SKK engine for IBus
-EAPI=6
-HOMEPAGE=https://github.com/ueno/ibus-skk
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/ibus >=app-i18n/libskk-1.0.2 x11-libs/gtk+:3 nls? ( virtual/libintl ) app-i18n/skk-jisyo
-SLOT=0
-SRC_URI=https://github.com/ueno/ibus-skk/releases/download/ibus-skk-1.4.2/ibus-skk-1.4.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=abebe1c7c8fa870108fd80226847f3d0
diff --git a/app-i18n/ibus-skk/Manifest b/app-i18n/ibus-skk/Manifest
new file mode 100644
index 000000000000..bacd74d6e5ae
--- /dev/null
+++ b/app-i18n/ibus-skk/Manifest
@@ -0,0 +1,5 @@
+DIST ibus-skk-1.4.1.tar.gz 478018 BLAKE2B 7e5cb7cf69b5a8949c462644ca7c871d8eccfff272d553986d687bc5ede02d4f35b5830d2a96823bf1d17ea17ec32b5eec59f75713d5a3bfc52424fc234ad5a7 SHA512 d8c0bf2c92fd96486ed10e9dcac861b4fc16e741fd96764671352e9e67226887ad6aa4b76c4891411029d3f5bf692de1162f996a294cecc9e5231e90ea0df5f0
+DIST ibus-skk-1.4.2.tar.gz 491882 BLAKE2B 999eb9f1b36406a8d665b2c929fcdef5e57bef5c6206075333435f46774445497d6d953bc695c22f6afa5700283c32a20c2d4e9227fd30e5552f5688cd524aab SHA512 cec7fbffaa78c406f3b9502bc64e2290fec579102a37ce61cb6424c3e06d159653f165b48e09f1256f38491bce6819460c6d226cd765ab150a8dfa80e2707fe1
+EBUILD ibus-skk-1.4.1-r1.ebuild 615 BLAKE2B 7a739e70f37df02499ff1efbc4a2074f5eb0c23662eea60d487e2ed0d73c32565258caf6a8a2c6400c216b64c0d7312a11538bcf7565b6f6f8bce955cebf6a5f SHA512 573ff5b1078f90f33cab2a021250352590cae460abbf86af793078fbe3c2ed483603aac9fa4dba7a3124c9501b34d16421512ae62a50362d32f83eb83655f937
+EBUILD ibus-skk-1.4.2.ebuild 682 BLAKE2B f314ea7ec040f6abf272a6e3b2bec66da61d150bcccf4e39d11cc4612e7f41d24a6e167340f7bc08a5eec6b47aadb47be31de1f4f9817f3f1c67152240ecd192 SHA512 18c68cf809833a68dc98e71461c008f6ae0ce987cb519a35cc275191693bf07e24cc910f4acf4322f40688ad17ec3815e65110e2c3b23ad88d81555342804bc2
+MISC metadata.xml 473 BLAKE2B 8902e2b4a2bffb4243bef33353868e2c4c75c3bf36efaac1572f17a265b7084f0c136a4bf77f123016c3fe3cead11463dc1de34a981284c36228667240759705 SHA512 dc943537d163c1197dae0d85ee91fec23eba4026f0bb91d3211cf7ef2cba414c6ab65eb69c74205af35e0620f89afa553927d70b4883590b4a06823e442ae771
diff --git a/app-i18n/ibus-skk/ibus-skk-1.4.1-r1.ebuild b/app-i18n/ibus-skk/ibus-skk-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..40c0d245e466
--- /dev/null
+++ b/app-i18n/ibus-skk/ibus-skk-1.4.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="Japanese SKK engine for IBus"
+HOMEPAGE="https://github.com/ueno/ibus-skk"
+SRC_URI="mirror://github/ueno/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+
+CDEPEND="app-i18n/ibus
+	<=app-i18n/libskk-1.0.1
+	x11-libs/gtk+:3
+	nls? ( virtual/libintl )"
+RDEPEND="${CDEPEND}
+	app-i18n/skk-jisyo"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+DOCS="ChangeLog NEWS README THANKS"
+
+src_configure() {
+	econf $(use_enable nls)
+}
diff --git a/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild b/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild
new file mode 100644
index 000000000000..fe548e75e5cf
--- /dev/null
+++ b/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit vala
+
+DESCRIPTION="Japanese SKK engine for IBus"
+HOMEPAGE="https://github.com/ueno/ibus-skk"
+SRC_URI="https://github.com/ueno/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+CDEPEND="app-i18n/ibus
+	>=app-i18n/libskk-1.0.2
+	x11-libs/gtk+:3
+	nls? ( virtual/libintl )"
+RDEPEND="${CDEPEND}
+	app-i18n/skk-jisyo"
+DEPEND="${CDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	vala_src_prepare
+	default
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
diff --git a/app-i18n/ibus-skk/metadata.xml b/app-i18n/ibus-skk/metadata.xml
new file mode 100644
index 000000000000..b37d0b9824e3
--- /dev/null
+++ b/app-i18n/ibus-skk/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <longdescription lang="en">
+    The SKK engine for IBus. It provides Japanese input method from
+    <pkg>app-i18n/libskk</pkg>.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">ueno/ibus-skk</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/ibus-sunpinyin-2.0.4_pre20130108-r2 b/app-i18n/ibus-sunpinyin-2.0.4_pre20130108-r2
deleted file mode 100644
index bf213c16fbd0..000000000000
--- a/app-i18n/ibus-sunpinyin-2.0.4_pre20130108-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-i18n/ibus[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ~app-i18n/sunpinyin-2.0.4_pre20130108:= nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) dev-util/scons[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=The SunPinYin IMEngine for IBus Framework
-EAPI=5
-HOMEPAGE=https://sunpinyin.googlecode.com/
-IUSE=+nls python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 CDDL
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-i18n/ibus[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ~app-i18n/sunpinyin-2.0.4_pre20130108:= nls? ( virtual/libintl )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jstein/dist/sunpinyin-2.0.4_pre20130108.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=afc67e92babde17612bb58c198760e56
diff --git a/app-i18n/ibus-sunpinyin/Manifest b/app-i18n/ibus-sunpinyin/Manifest
new file mode 100644
index 000000000000..1599e95fe5d7
--- /dev/null
+++ b/app-i18n/ibus-sunpinyin/Manifest
@@ -0,0 +1,3 @@
+DIST sunpinyin-2.0.4_pre20130108.tar.xz 964764 BLAKE2B 2c9d2e3fc02009ad10784c9408434c6806d1403026fb27629701650fe0e8a69c5580050846cf5c3b870215b8bfd68fe9c52d8bdaf83c41e523224463af9cf530 SHA512 7c1dd7db8b800e9d436746a560a16de2c6777576868f2e7e28f6dcb767b91ccd62b974f9d4ce6bd6ce80d30e1ee83887c3ee03c227e7e9fa59c01db4867465b2
+EBUILD ibus-sunpinyin-2.0.4_pre20130108-r2.ebuild 1080 BLAKE2B 4403780f922c47cdda854d49666869696e88b6641af9db951c62eef14fba97acf824761bee5485c1e1075ce43ae17bce1174a63d9d13d136bbc11d699a9d0b56 SHA512 e76aefc9199e00ced36d430bf40b82dcdd44de91786a6283f7712efd7fe0c505ba71b5744b427226b38555e989867ec57a918b0069112be83b2ecc7079922577
+MISC metadata.xml 313 BLAKE2B e3d71fcea434a51c92b8194791283c33981d3c4b44bda0df1e70b561517c228daebdc713327171192e1523b7ac2f91116a030bb729eb143606810e6ef5522ce4 SHA512 61d943d4f8b8ab912ced89b69be51ad2792ba67672e969f4e32fba373f7133181c1080ba9a2603e3f7623ebac42e32eb3e0e429d66846ab4c7e13afbc0b05974
diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20130108-r2.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20130108-r2.ebuild
new file mode 100644
index 000000000000..77a59d469623
--- /dev/null
+++ b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20130108-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="The SunPinYin IMEngine for IBus Framework"
+HOMEPAGE="https://sunpinyin.googlecode.com/"
+SRC_URI="https://dev.gentoo.org/~jstein/dist/sunpinyin-${PV}.tar.xz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+nls"
+
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/ibus[python,${PYTHON_USEDEP}]
+	~app-i18n/sunpinyin-${PV}:=
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_unpack() {
+	default
+	mv "${WORKDIR}/sunpinyin-${PV}" "${S}" || die
+}
+
+src_prepare() {
+	sed -i -e "s/python/${EPYTHON}/" wrapper/ibus/setup/ibus-setup-sunpinyin.in || die
+}
+
+src_configure() {
+	tc-export CXX
+	myesconsargs=(
+		--prefix="${EPREFIX}"/usr
+		--libexecdir="${EPREFIX}"/usr/libexec
+	)
+}
+
+src_compile() {
+	escons -C wrapper/ibus
+}
+
+src_install() {
+	escons -C wrapper/ibus --install-sandbox="${ED}" install
+}
diff --git a/app-i18n/ibus-sunpinyin/metadata.xml b/app-i18n/ibus-sunpinyin/metadata.xml
new file mode 100644
index 000000000000..583f6476f8be
--- /dev/null
+++ b/app-i18n/ibus-sunpinyin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">sunpinyin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/ibus-table-1.5.0-r1 b/app-i18n/ibus-table-1.5.0-r1
deleted file mode 100644
index 1871c8891c82..000000000000
--- a/app-i18n/ibus-table-1.5.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-i18n/ibus[python(+),python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/libiconv nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Tables engines for IBus
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=nls python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-i18n/ibus[python(+),python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/libiconv nls? ( virtual/libintl )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/ibus-table-1.5.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=0d09ab505281ec8c8dcead56cb97b0f6
diff --git a/app-i18n/ibus-table-1.9.18 b/app-i18n/ibus-table-1.9.18
deleted file mode 100644
index 1031c5032f3f..000000000000
--- a/app-i18n/ibus-table-1.9.18
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-i18n/ibus[python(+),python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] virtual/libiconv nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Tables engines for IBus
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=nls python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-i18n/ibus[python(+),python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] virtual/libiconv nls? ( virtual/libintl )
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/kaio/ibus-table/releases/download/1.9.18/ibus-table-1.9.18.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=59c421c616560e4335729be44be077d9
diff --git a/app-i18n/ibus-table-chinese-1.8.2 b/app-i18n/ibus-table-chinese-1.8.2
deleted file mode 100644
index 1546d6f5d535..000000000000
--- a/app-i18n/ibus-table-chinese-1.8.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-i18n/ibus-table dev-util/cmake-fedora sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Chinese tables for IBus-Table
-EAPI=6
-HOMEPAGE=https://github.com/definite/ibus-table-chinese
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-i18n/ibus-table
-SLOT=0
-SRC_URI=https://github.com/definite/ibus-table-chinese/archive/1.8.2.tar.gz -> ibus-table-chinese-1.8.2.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ff382bdd3974a4395184acbdefe79cd3
diff --git a/app-i18n/ibus-table-chinese/Manifest b/app-i18n/ibus-table-chinese/Manifest
new file mode 100644
index 000000000000..62c70f1808a2
--- /dev/null
+++ b/app-i18n/ibus-table-chinese/Manifest
@@ -0,0 +1,3 @@
+DIST ibus-table-chinese-1.8.2.tar.gz 10576111 BLAKE2B a80fa9c4780207efefba1118ee9dacc33dba4136b916a24971198b3325bf1b26f86cd4586db994db6dfaa85fffe087b021673d056b10df61c5f95ede4e967cd6 SHA512 30fd1c7ee8416cd62d8e26bc2646a667ac45c4579a7cb191c77e80fecccbc576c34f33ec0b5c55669c073a633298cfda1711e4b9d89a9ef8f6146acdc0167c1a
+EBUILD ibus-table-chinese-1.8.2.ebuild 747 BLAKE2B 529e69ecb824a1ae7d5f4b0e45236504690151e5d68c73564539232d9187200d91abcfea835e051bae12f77d9db398bd5bf2175fd2d516328b3a55710dcef87a SHA512 68e6bed7692488d771ecaf01dcd99a35452a4b9b709cc1565aead88a3728b23bdc34791dee695c1f4ef530ed171be2abad0cd429827f4527561d63fd7147f56f
+MISC metadata.xml 315 BLAKE2B a6f24959fcc2474a02a6dff5d81b54509c422cf333913b8120c8b93cad7f4261e58a5b480dcbb724559ec4562a7a43f1281ac772e7fa2e6e4c46393fa7bfde10 SHA512 ed671457e0df484fa4bcdc2673dee882b805fee5a912808d9b25ae1a201b443b7d5f29fa012f7fbb98e7195ede5f91583e907415b83279a9f034bbd65e4328fc
diff --git a/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.2.ebuild b/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.2.ebuild
new file mode 100644
index 000000000000..8d412b554c15
--- /dev/null
+++ b/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+CMAKE_IN_SOURCE_BUILD="1"
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake-utils
+
+DESCRIPTION="Chinese tables for IBus-Table"
+HOMEPAGE="https://github.com/definite/ibus-table-chinese"
+SRC_URI="https://github.com/definite/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-i18n/ibus-table"
+DEPEND="${RDEPEND}
+	dev-util/cmake-fedora"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_FEDORA_TMP_DIR="${T}"
+		-DDATA_DIR="${EPREFIX}"/usr/share
+		-DMANAGE_DEPENDENCY_PACKAGE_EXISTS_CMD=false
+		-DPRJ_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF}
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-i18n/ibus-table-chinese/metadata.xml b/app-i18n/ibus-table-chinese/metadata.xml
new file mode 100644
index 000000000000..d91706d7e8c4
--- /dev/null
+++ b/app-i18n/ibus-table-chinese/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">definite/ibus-table-chinese</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/ibus-table-extraphrase-1.3.9.20110826 b/app-i18n/ibus-table-extraphrase-1.3.9.20110826
deleted file mode 100644
index 5f13792d676e..000000000000
--- a/app-i18n/ibus-table-extraphrase-1.3.9.20110826
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=app-i18n/ibus-table virtual/pkgconfig
-DESCRIPTION=Chinese extra phrases for IBus-Table
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-i18n/ibus-table
-SLOT=0
-SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/ibus-table-extraphrase-1.3.9.20110826.tar.gz
-_md5_=4f84ea656c3f05c5c66c04ddf09eab9d
diff --git a/app-i18n/ibus-table-extraphrase/Manifest b/app-i18n/ibus-table-extraphrase/Manifest
new file mode 100644
index 000000000000..ca1fbcd94ead
--- /dev/null
+++ b/app-i18n/ibus-table-extraphrase/Manifest
@@ -0,0 +1,3 @@
+DIST ibus-table-extraphrase-1.3.9.20110826.tar.gz 2200447 BLAKE2B 4cdd2fc4e75bc33dc51a761b020b94d62a652c186bef1a3a595f1eb7c60a4274dd481be068c2cfcc1419b6a5fb446bea201fddfab5f1a91fee079a378cafff2a SHA512 5310cee7bd74455a732cd568a2a60887765588ef7fabdcd950f66fb2d5fab6dcdd059d2e460c0962117495c88656386a0c738dbd94f9ba553f3365fb3b42ce5d
+EBUILD ibus-table-extraphrase-1.3.9.20110826.ebuild 448 BLAKE2B 31f03293d52522c171f49955544353bbabd36af92884535d90317a39eb083c35cf877b2b24bbf2072c3917f20046778e8ccc6fabe6a2f915471ba662ab7ffcf5 SHA512 d75ff7a69949750e574043b9f3e055d6a1d7f6b2027dc68f7c77de1eec8f37be982bdcf7d114f8e403b88d566ce29dbf0de7b82be59b3b6e4c02823d9b72b14a
+MISC metadata.xml 369 BLAKE2B f4d4e1d55837f8325288d78edb27b890412cade1fe19b2494d1affb51a8a1b4e88d863f41f5d47d091895e93ae1b081288ffe4f59c5a33a1155cd8d13468f0ba SHA512 f6adb0429dd04c8aee77d85cfa2f006edd3253e21ae83eede4d6d1cfc8d70b0bcb9f5545f82e2c0e61935754757cf4d550e6f9c5ea1b0a00c71c80dd9c1504c0
diff --git a/app-i18n/ibus-table-extraphrase/ibus-table-extraphrase-1.3.9.20110826.ebuild b/app-i18n/ibus-table-extraphrase/ibus-table-extraphrase-1.3.9.20110826.ebuild
new file mode 100644
index 000000000000..bb2767a50861
--- /dev/null
+++ b/app-i18n/ibus-table-extraphrase/ibus-table-extraphrase-1.3.9.20110826.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Chinese extra phrases for IBus-Table"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-i18n/ibus-table"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/app-i18n/ibus-table-extraphrase/metadata.xml b/app-i18n/ibus-table-extraphrase/metadata.xml
new file mode 100644
index 000000000000..13ee2c91ec75
--- /dev/null
+++ b/app-i18n/ibus-table-extraphrase/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">ibus</remote-id>
+    <remote-id type="github">ibus/ibus</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/ibus-table-latin-1.2.0.20100305 b/app-i18n/ibus-table-latin-1.2.0.20100305
deleted file mode 100644
index 4a726a566b5c..000000000000
--- a/app-i18n/ibus-table-latin-1.2.0.20100305
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=app-i18n/ibus-table virtual/pkgconfig
-DESCRIPTION=Latin tables for IBus-Table
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-i18n/ibus-table
-SLOT=0
-SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/ibus-table-latin-1.2.0.20100305.tar.gz
-_md5_=fbe3f58773e4d70ad57f30e3f98d586f
diff --git a/app-i18n/ibus-table-latin/Manifest b/app-i18n/ibus-table-latin/Manifest
new file mode 100644
index 000000000000..42635fa38213
--- /dev/null
+++ b/app-i18n/ibus-table-latin/Manifest
@@ -0,0 +1,3 @@
+DIST ibus-table-latin-1.2.0.20100305.tar.gz 88608 BLAKE2B c65586844573dca0d927da38a13337a74c4cf95fd577cbb0bd209da246bc755b5790f147fdef3f25f9e182aaabc1096f1500a4dd28222ed2d06416608675c774 SHA512 103b176364f548e7aaf8b006354e82b1933fa791587de734f7d9474ad85b7f9918b0b85136eb391c07d8a8df9024f1013a5a604e30ad5f13db5647a9380eb2cf
+EBUILD ibus-table-latin-1.2.0.20100305.ebuild 439 BLAKE2B 4d0af00c6800557bed07a4ce558238b70fc77db35a4dee25b314577bcae62db7942f73692764860b91b867219fee53f71e34c195aa43687014b692ff822ab470 SHA512 81e5317fd629862acc24e4e130755383548601a46796e1eb64b1adffbbb9a42117f8fcb779ac9b4325cbefe36e98250c062737f7926592f3e21ba52a46c04330
+MISC metadata.xml 369 BLAKE2B f4d4e1d55837f8325288d78edb27b890412cade1fe19b2494d1affb51a8a1b4e88d863f41f5d47d091895e93ae1b081288ffe4f59c5a33a1155cd8d13468f0ba SHA512 f6adb0429dd04c8aee77d85cfa2f006edd3253e21ae83eede4d6d1cfc8d70b0bcb9f5545f82e2c0e61935754757cf4d550e6f9c5ea1b0a00c71c80dd9c1504c0
diff --git a/app-i18n/ibus-table-latin/ibus-table-latin-1.2.0.20100305.ebuild b/app-i18n/ibus-table-latin/ibus-table-latin-1.2.0.20100305.ebuild
new file mode 100644
index 000000000000..5b626b21e185
--- /dev/null
+++ b/app-i18n/ibus-table-latin/ibus-table-latin-1.2.0.20100305.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Latin tables for IBus-Table"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-i18n/ibus-table"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/app-i18n/ibus-table-latin/metadata.xml b/app-i18n/ibus-table-latin/metadata.xml
new file mode 100644
index 000000000000..13ee2c91ec75
--- /dev/null
+++ b/app-i18n/ibus-table-latin/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">ibus</remote-id>
+    <remote-id type="github">ibus/ibus</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/ibus-table-others-1.3.9 b/app-i18n/ibus-table-others-1.3.9
deleted file mode 100644
index 3b725ddcba17..000000000000
--- a/app-i18n/ibus-table-others-1.3.9
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=app-i18n/ibus-table !app-i18n/ibus-table-code !app-i18n/ibus-table-cyrillic !app-i18n/ibus-table-latin !app-i18n/ibus-table-tv virtual/pkgconfig
-DESCRIPTION=Various tables for IBus-Table
-EAPI=6
-HOMEPAGE=https://github.com/moebiuscurve/ibus-table-others
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-i18n/ibus-table !app-i18n/ibus-table-code !app-i18n/ibus-table-cyrillic !app-i18n/ibus-table-latin !app-i18n/ibus-table-tv
-SLOT=0
-SRC_URI=https://github.com/moebiuscurve/ibus-table-others/releases/download/1.3.9/ibus-table-others-1.3.9.tar.gz
-_md5_=a24f4bacda5e138d0b1a2f18e71a6f84
diff --git a/app-i18n/ibus-table-others/Manifest b/app-i18n/ibus-table-others/Manifest
new file mode 100644
index 000000000000..96350babc166
--- /dev/null
+++ b/app-i18n/ibus-table-others/Manifest
@@ -0,0 +1,3 @@
+DIST ibus-table-others-1.3.9.tar.gz 627253 BLAKE2B b4c72ead9364945a3f15a348aa14e0886ebc7c7fd35448d573540ffd9510139630ac22228229ee1a37687e01179a0ec880ce170e84a196b0defe5c059b662583 SHA512 4557ba981a00035226b6cbe0d97ae14df275d3e7c5c453097b85e433a524e00efeebe508621495e63d6ff9cdd590f9d54b51a143147b83e1e3748f05b03d2019
+EBUILD ibus-table-others-1.3.9.ebuild 545 BLAKE2B e0193a288ccdc97aed4e45ac3c589f351d1037d19987948773d029ce92068b221de6f83326a6b2c14bdc397e8d611005165242a41a6c43cc2e75217e0502beaf SHA512 0f021b7df750474f7fb0f0f79434f6a481a50a7e52453818e72ea6be7510a0936ab4a4da2c473975b2f4151701adb427f93f5e54ad01143de4bf60b314debdd1
+MISC metadata.xml 641 BLAKE2B f397b2ad570982358e1eb76c061492976b937ab66c83eabfdc31c6e618f65f869b4f8488dc9d3a81c0a48fb0d84bd6c13af2fadb343f76b6bb2c75bdcff876fa SHA512 775e9f2f353f8bb9ed2a0aa1c6c8dff98886c0e28f10c87136f2b67f5eef9eb0af3b5d49ea0b1eb4ae5e09b43fa0987b8195520db844e0d20d07f0593fbe6b96
diff --git a/app-i18n/ibus-table-others/ibus-table-others-1.3.9.ebuild b/app-i18n/ibus-table-others/ibus-table-others-1.3.9.ebuild
new file mode 100644
index 000000000000..ef774df954c8
--- /dev/null
+++ b/app-i18n/ibus-table-others/ibus-table-others-1.3.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Various tables for IBus-Table"
+HOMEPAGE="https://github.com/moebiuscurve/ibus-table-others"
+SRC_URI="https://github.com/moebiuscurve/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-i18n/ibus-table
+	!app-i18n/ibus-table-code
+	!app-i18n/ibus-table-cyrillic
+	!app-i18n/ibus-table-latin
+	!app-i18n/ibus-table-tv"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/app-i18n/ibus-table-others/metadata.xml b/app-i18n/ibus-table-others/metadata.xml
new file mode 100644
index 000000000000..1c7ec141883e
--- /dev/null
+++ b/app-i18n/ibus-table-others/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <longdescription lang="en">
+    ibus-table-others provides the following tables for IBus-Table:
+
+    * CNS11643
+    * Compose
+    * Emoji
+    * IPA-X-SAMPA
+    * LaTex
+    * Mathwriter
+    * RussianTraditional
+    * Thai
+    * Translit
+    * Ua-Translit
+    * Viqr
+    * Yawerty
+  </longdescription>
+  <upstream>
+    <remote-id type="github">moebiuscurve/ibus-table-others</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/ibus-table/Manifest b/app-i18n/ibus-table/Manifest
new file mode 100644
index 000000000000..35f32abfd51e
--- /dev/null
+++ b/app-i18n/ibus-table/Manifest
@@ -0,0 +1,5 @@
+DIST ibus-table-1.5.0.tar.gz 432844 BLAKE2B 183c50be5545d176e44da4b5fae914d838cf4f43024fe56a0ba1e9a699e7f94ea3fb95e20775f8a28963c7e5e320332f51c33c58dcb1ac9a6017d87b6b3d60e9 SHA512 2c52da1b4d6ae8aec29e97a8a413b388912cfcfd15860ba0e65c97b139b14f8a7d4087eb196d516abe731df03a2e4904666194414242da8cf1f3f0b54696248e
+DIST ibus-table-1.9.18.tar.gz 585309 BLAKE2B 42d7d130bd2695c1c1a7010c0bcf29c1ecaa3899c8ef8d24b11e10434771415bfd8b91723ef4c489721f0276d05dce08de3472c49632b9d30da5be1a53f82dc7 SHA512 3f28269be1987023402eb6075b8e68b3bbba3c572a94551d072281677fde5fa14f8f4186455f8f9156b252934580c7a3837555d0edb46c76f13c8b109e26aca2
+EBUILD ibus-table-1.5.0-r1.ebuild 909 BLAKE2B 444c1043917802ce157c42c7975218543c0e2a25f72f280c770aa11a60283325afe693ad37507606eb8d15115740ca59a98db36023bf3cddfc7c41b8c5cc9c7a SHA512 93de9941ae6fc3f7fc984faf14511692c3e0a73998bb725e54fa465b2c4f417a7e2c40f630c6de482dbe1131ad34c7675fca306ca4c9ef038d9fd9a821ac53c5
+EBUILD ibus-table-1.9.18.ebuild 890 BLAKE2B 3a3cad572585b34b3094cc54874c80325b9ecde715ea25673b133be9fc7734b967ef4447e08c7c6bae730600cd9045595e2c50b7096131b7da63cc4dc8a00dff SHA512 ec786ca8823a3c4cc8933f26aa3505f21b408115c1f3d92f958a2efcffe295094368aa198a50cbcf602f3d0185411a056fbba606d457aca46fe7849527495f69
+MISC metadata.xml 433 BLAKE2B f165f823d61ad57b3db2925cd9dc184b23111bc4f375477673a908a3556fb68a668ec7f6bcf69aa72c5aedc7f15f34695a0bddaa8d77e72c75f4b9da7b0dd4d2 SHA512 827cf106065bdc9e3eb26c098a8480f3865f93e7bf667981437e725af60ad4fda297ed5d43cd9332f3131544e0ebec03dc058c688382a2a80ef34947339fc855
diff --git a/app-i18n/ibus-table/ibus-table-1.5.0-r1.ebuild b/app-i18n/ibus-table/ibus-table-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..313b0d5d4716
--- /dev/null
+++ b/app-i18n/ibus-table/ibus-table-1.5.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit python-single-r1
+
+DESCRIPTION="Tables engines for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+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}]
+	virtual/libiconv
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	python_fix_shebang .
+
+	sed -i \
+		"s/python/${EPYTHON}/" \
+		engine/${PN}-createdb.in \
+		engine/${PN/-/-engine-}.in
+
+	default
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
diff --git a/app-i18n/ibus-table/ibus-table-1.9.18.ebuild b/app-i18n/ibus-table/ibus-table-1.9.18.ebuild
new file mode 100644
index 000000000000..114b81267db0
--- /dev/null
+++ b/app-i18n/ibus-table/ibus-table-1.9.18.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit python-single-r1
+
+DESCRIPTION="Tables engines for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/kaio/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+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}]
+	virtual/libiconv
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	python_fix_shebang .
+
+	sed -i \
+		"s/python/${EPYTHON}/" \
+		engine/${PN}-createdb.in \
+		engine/${PN/-/-engine-}.in
+
+	default
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
diff --git a/app-i18n/ibus-table/metadata.xml b/app-i18n/ibus-table/metadata.xml
new file mode 100644
index 000000000000..577d254feeb7
--- /dev/null
+++ b/app-i18n/ibus-table/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <longdescription lang="en">
+    A framework for table based input methods using IBus.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">kaio/ibus-table</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/ibus-tutcode-1.0.2-r1 b/app-i18n/ibus-tutcode-1.0.2-r1
deleted file mode 100644
index 7e8050acc02b..000000000000
--- a/app-i18n/ibus-tutcode-1.0.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=sys-devel/gettext-0.16.1 test? ( app-i18n/ibus )
-DESCRIPTION=a Japanese TUT-Code input engine for IBus
-EAPI=5
-HOMEPAGE=https://github.com/deton/ibus-tutcode/
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=sys-devel/gettext-0.16.1 app-i18n/ibus
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://github/deton/ibus-tutcode/ibus-tutcode-1.0.2.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9a4cc870fbd977de6f63a0cf1df122c4
diff --git a/app-i18n/ibus-tutcode/Manifest b/app-i18n/ibus-tutcode/Manifest
new file mode 100644
index 000000000000..5d5c2a9fa80a
--- /dev/null
+++ b/app-i18n/ibus-tutcode/Manifest
@@ -0,0 +1,3 @@
+DIST ibus-tutcode-1.0.2.tar.bz2 217894 BLAKE2B b1140e14845e99b1b6a908c7783eef210f928c9281fa924acebef80677ea2b0f6947015aa7c5d64f94ca0147737cb42dbc2c09e61df904505444da8cf93c50d9 SHA512 f7845323396d24a3097cf475c8fa40890b923434e551b8941a6f4cb4d84a4aed7d7b293295ba515603131a8e03a99d58b19dc3d81a7ee13d8d7d904edb5ece02
+EBUILD ibus-tutcode-1.0.2-r1.ebuild 718 BLAKE2B 09477de5f4a0008cfaaca923b0a6233e6af8ce843032b78d16e01ccf7e46e691835bcfafa36673e985281aadc9889f33dbbab9c96a9755efe70161ae6238dfe9 SHA512 1b80fb02a068cc127602ac33125912c519a7f14412c4f4b7a42d491961dba1e87c5435498a9be3040f76f39d85e2be9a2c8f12e27f445804987a02dc1744fe82
+MISC metadata.xml 408 BLAKE2B c9adbbde61f0d292e70da2b4148bffcc2290883cddee562e0ea6f248e0fe701ff83764c9c973450e6763158350a25e2dfe7bc95df340deb359def00cf4e8b15c SHA512 7ada81191429a8ebb16460376ea17c1035ed03265423aeaef1ff5a91abc6983f80e5b6c63d3b439e9b48fcb70513039da6564d7600e3ca6cc5af3cab495cad65
diff --git a/app-i18n/ibus-tutcode/ibus-tutcode-1.0.2-r1.ebuild b/app-i18n/ibus-tutcode/ibus-tutcode-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..b39c6bbfb76b
--- /dev/null
+++ b/app-i18n/ibus-tutcode/ibus-tutcode-1.0.2-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="a Japanese TUT-Code input engine for IBus"
+HOMEPAGE="https://github.com/deton/ibus-tutcode/"
+SRC_URI="mirror://github/deton/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="test"
+
+CDEPEND="${PYTHON_DEPS}
+	>=sys-devel/gettext-0.16.1"
+DEPEND="${CDEPEND}
+	test? ( app-i18n/ibus )"
+RDEPEND="${CDEPEND}
+	app-i18n/ibus"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_prepare() {
+	sed -i -e "s/python/${EPYTHON}/" engine/ibus-engine-tutcode.in || die
+}
+
+src_install() {
+	default
+	dodoc ${PN}.json.example
+}
diff --git a/app-i18n/ibus-tutcode/metadata.xml b/app-i18n/ibus-tutcode/metadata.xml
new file mode 100644
index 000000000000..07c7706e43ff
--- /dev/null
+++ b/app-i18n/ibus-tutcode/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>naota@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">deton/ibus-tutcode</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/ibus-typing-booster-1.5.38 b/app-i18n/ibus-typing-booster-1.5.38
deleted file mode 100644
index 8d814d3fcafa..000000000000
--- a/app-i18n/ibus-typing-booster-1.5.38
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=setup
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-i18n/ibus[python(+),python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/m17n-lib dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyxdg[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-db/m17n-db-1.7 sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Completion input method for IBus
-EAPI=6
-HOMEPAGE=https://mike-fabian.github.io/ibus-typing-booster
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-i18n/ibus[python(+),python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/m17n-lib dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyxdg[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-db/m17n-db-1.7
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/1.5.38/ibus-typing-booster-1.5.38.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=eca50e99a952761fb6b9e3c62a1fbc98
diff --git a/app-i18n/ibus-typing-booster-2.0.0 b/app-i18n/ibus-typing-booster-2.0.0
deleted file mode 100644
index d2f6d9d964e2..000000000000
--- a/app-i18n/ibus-typing-booster-2.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=setup
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-i18n/ibus[python(+),python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/m17n-lib dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyxdg[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-db/m17n-db-1.7 sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Completion input method for IBus
-EAPI=6
-HOMEPAGE=https://mike-fabian.github.io/ibus-typing-booster
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-i18n/ibus[python(+),python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/m17n-lib dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyxdg[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-db/m17n-db-1.7
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.0.0/ibus-typing-booster-2.0.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=eca50e99a952761fb6b9e3c62a1fbc98
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
new file mode 100644
index 000000000000..9d60cf325bdb
--- /dev/null
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -0,0 +1,5 @@
+DIST ibus-typing-booster-1.5.38.tar.gz 6408096 BLAKE2B a4559044a4cd06c5dcf69d77d5ec3d8163d564702ff88d3ed11b8c073f5272e2cfab446de548a29887b74767f4318db98fb898dc4d15488fd4c9963cea151009 SHA512 67b81a47501ae4e885d2a79b122799b78dcdd044ad8e36a140d4c6587a23072d08e3e025f755c191cee82c3ab81ea1a974a5a0f6438e7203ba2d63d7e1cd4eff
+DIST ibus-typing-booster-2.0.0.tar.gz 5689495 BLAKE2B a3ee39faf206c4681d10989d4e438cffc0b78d9339973523af61310482b3ec13c7935e9e49403a3359e0f32d087b72afb27ae7975dcd3abd427b9a0f5f0ba581 SHA512 140044be13b47590a0835bb4b8da7311cdb92e8134a88a7b999ea6f530298950c4f8ce9ff3462394e4b52de0c56e3072671da85c99b448a91f442fdc460c608b
+EBUILD ibus-typing-booster-1.5.38.ebuild 860 BLAKE2B 7b813a51e80a378e694d3b9d6c3268e7d32d497d9fd62fa78f5239dbe1025dc79ccbfa958d2fdfc7e73be9dbe8bbb75efa29e4a12e41ec679b2efafd94a8e065 SHA512 fa03b6fb55e7505dd13e4aaf830444ea8f25c19089901528c4646611193f8002a0e860f09ba0bc5ca44c5e5cacbde1c3002220ee7e323239ca7c580c5216be2e
+EBUILD ibus-typing-booster-2.0.0.ebuild 860 BLAKE2B 7b813a51e80a378e694d3b9d6c3268e7d32d497d9fd62fa78f5239dbe1025dc79ccbfa958d2fdfc7e73be9dbe8bbb75efa29e4a12e41ec679b2efafd94a8e065 SHA512 fa03b6fb55e7505dd13e4aaf830444ea8f25c19089901528c4646611193f8002a0e860f09ba0bc5ca44c5e5cacbde1c3002220ee7e323239ca7c580c5216be2e
+MISC metadata.xml 331 BLAKE2B 85b93b548e9cbef93b09e59ebf23c10b1cb4c392bcb6aeeab697cdaa775afa06874b5a6965ab09ffd8c937a0842699cdb27ad70c6146d5c37b516d82a92c80b2 SHA512 e0524c2ebad138f51a5d79d639e809196029a83f46dc331c2bd21d94417d5adf8d059f15694b484f4fcb107dff2aba7d3ad4c87a19accaccf75429bfa2c92b63
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-1.5.38.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-1.5.38.ebuild
new file mode 100644
index 000000000000..b4bb8048b30d
--- /dev/null
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-1.5.38.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit python-single-r1
+
+DESCRIPTION="Completion input method for IBus"
+HOMEPAGE="https://mike-fabian.github.io/ibus-typing-booster"
+SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND="${PYTHON_DEPS}
+	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+	dev-libs/m17n-lib
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=dev-db/m17n-db-1.7"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.0.0.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.0.0.ebuild
new file mode 100644
index 000000000000..b4bb8048b30d
--- /dev/null
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit python-single-r1
+
+DESCRIPTION="Completion input method for IBus"
+HOMEPAGE="https://mike-fabian.github.io/ibus-typing-booster"
+SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND="${PYTHON_DEPS}
+	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+	dev-libs/m17n-lib
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=dev-db/m17n-db-1.7"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
diff --git a/app-i18n/ibus-typing-booster/metadata.xml b/app-i18n/ibus-typing-booster/metadata.xml
new file mode 100644
index 000000000000..bd6b0e5b1eb3
--- /dev/null
+++ b/app-i18n/ibus-typing-booster/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <longdescription lang="en">
+    A completion input method for IBus.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-i18n/ibus-unikey-0.6.1-r2 b/app-i18n/ibus-unikey-0.6.1-r2
deleted file mode 100644
index 5fffb3fa25eb..000000000000
--- a/app-i18n/ibus-unikey-0.6.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=app-i18n/ibus x11-libs/libX11 gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) nls? ( virtual/libintl ) virtual/pkgconfig dev-util/intltool nls? ( sys-devel/gettext )
-DESCRIPTION=Vietnamese UniKey engine for IBus
-EAPI=6
-HOMEPAGE=https://github.com/mrlequoctuan/ibus-unikey
-IUSE=+gtk gtk2 nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-i18n/ibus x11-libs/libX11 gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) nls? ( virtual/libintl )
-REQUIRED_USE=gtk2? ( gtk )
-SLOT=0
-SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus-unikey/ibus-unikey-0.6.1.tar.gz https://dev.gentoo.org/~dlan/distfiles/ibus-unikey-0.6.1-gcc6.patch
-_md5_=791e5b3f76ae722ce88988059126ab6f
diff --git a/app-i18n/ibus-unikey/Manifest b/app-i18n/ibus-unikey/Manifest
new file mode 100644
index 000000000000..c127b9e4f4cb
--- /dev/null
+++ b/app-i18n/ibus-unikey/Manifest
@@ -0,0 +1,4 @@
+DIST ibus-unikey-0.6.1-gcc6.patch 31686 BLAKE2B 5d04ba5e66b1a128a04d23e73e20a8e6a269240a07604e71f3e232e0087f0a47d9a4ff6aeaa10a001c5be9b113d8cdc2a917ecc5084d576d6f918b4c699f2ab3 SHA512 9e1b172a904076ba817c7bab80cbbf7d736c078d3ea285cb946be23552ff0f571ca8e0187cac4e5bfecc2b0032512d6f09af4435056d6b653a3648d07356d9b2
+DIST ibus-unikey-0.6.1.tar.gz 516250 BLAKE2B edb5e46df983fe54ce84f778a23814ae946c6ace772d262a06f473013b84d87d3b1293e7faa62f070763ea837eccc08dfde51cf4b23353e84ac1ceca79a44d80 SHA512 f8d519802d9b304cdaebfcee3f9fef5f17756cde48aa48b9dd357d714e2eaaba0df8f91218b658fdd1d85343804e054b7987caff2734913b29dc76263c30d4e6
+EBUILD ibus-unikey-0.6.1-r2.ebuild 838 BLAKE2B 26ba780c17d18916dbf7ac754e07b8d34ecd6095d5d4915c3568357edc5308327c377ba95e06b58a8cf2db047f15ac4f9eb4e6eecc667c009e8b5eed7609ccec SHA512 6bdd0b11d6a2e858fbe9d047c1235f0bc780eae844d5bfbd0292288fe8c80cb6a8604e00c81f83547c6a22466a6567f61828851518be24a5001e1832fc95925d
+MISC metadata.xml 632 BLAKE2B 3bb7f9a27c64eef0190db987ddd8455ce6a749227b1f1c83643d4eefa24e751a25eaed69daa80518a8f9e4c4cc01fd2a8f9e2607c0988b65b65bcc625b951886 SHA512 e83ae38078b4b363272c0cd1b7c10d56665f709ee536f6f466fab6bd4b83876412c56558588f0b3a72c57facbdaa6ef8549ac1c1721fe4a78099b78a362fcfcc
diff --git a/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild b/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
new file mode 100644
index 000000000000..63c9b7f58158
--- /dev/null
+++ b/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Vietnamese UniKey engine for IBus"
+HOMEPAGE="https://github.com/mrlequoctuan/ibus-unikey"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~dlan/distfiles/${P}-gcc6.patch"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gtk gtk2 nls"
+REQUIRED_USE="gtk2? ( gtk )"
+
+RDEPEND="app-i18n/ibus
+	x11-libs/libX11
+	gtk? (
+		gtk2? ( x11-libs/gtk+:2 )
+		!gtk2? ( x11-libs/gtk+:3 )
+	)
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool
+	nls? ( sys-devel/gettext )"
+
+PATCHES=( "${DISTDIR}"/${P}-gcc6.patch )
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--with-gtk-version=$(usex gtk2 3 2)
+}
diff --git a/app-i18n/ibus-unikey/metadata.xml b/app-i18n/ibus-unikey/metadata.xml
new file mode 100644
index 000000000000..880cfde265eb
--- /dev/null
+++ b/app-i18n/ibus-unikey/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <longdescription lang="en">
+    The UniKey engine for IBus. It provides a Vietnamese input method using
+    UniKey. Support via forum at: http://forum.ubuntu-vn.com/viewforum.php?f=85
+  </longdescription>
+  <use>
+    <flag name="gtk2">Enable support for <pkg>x11-libs/gtk+</pkg>:2</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">mrlequoctuan/ibus-unikey</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
new file mode 100644
index 000000000000..c6650d90b9fe
--- /dev/null
+++ b/app-i18n/ibus/Manifest
@@ -0,0 +1,9 @@
+DIST ibus-1.5.12.tar.gz 2190284 BLAKE2B 57ac7f9e8e8f0419bad1bf3aa629282ef3c0188d29e98bc872e594955f69e0863020d600c674cabed56db156a85210b5b3c1fe137b135395a27d2535e4938164 SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81
+DIST ibus-1.5.16.tar.gz 2375719 BLAKE2B cf4cbd4556e43403c73da3cd2cb9f6da8e0baf5f90b3bc74f6d12c1bad057198ed828053dcbb3ddfd28c37d9011b6166e834385720aa827a68f594dbd4cf9298 SHA512 494ead69cf9c0111fd25fd1de27e796d89db4f08443afa1ec469f638469b25d8b19a59ea7ab0db0f3a130b9a89b3f2819667099ba38fc973d6efc61b367ce237
+DIST ibus-1.5.17.tar.gz 2522960 BLAKE2B a0d19eaae809549d678b42394e76107b8869232c90932bfaa5072621598e83db0569084e931c51c15b7179d9d8e0a2ce144b726229dae81a009665a5de87afc4 SHA512 8a7e4fabbcb2096e647b1fb7487c92882bd320a4d777f2765817378abec2e60cafd63364c881fefc2805ff2baa6b28b15ee0710587662a3e65eeb60ead19496c
+DIST ibus-1.5.18.tar.gz 2760121 BLAKE2B dfcf549362ac9ac0cb9adb9cedc3fd7146877a42e0e086ad7be18ccb6239868ed940d2c371d83c2e2706c7120702af0bcb0106da60889f0b3d5857b8929b9165 SHA512 34519c3464eaf2cac3320e1568fc76f4edb281afa70f335c015b828ff4e86b3224d77b95cdc0b2e76e42459c54b1044264ff226963fe739dd553ac7326d2f2d3
+EBUILD ibus-1.5.12.ebuild 3695 BLAKE2B b22d441277f55324c4d5ecc6d592f3057900a46e0f4bed4ccc90c14ec10890fa26bab18c5ded5649f9bb83c3485899bcea8e9d0fc80410e55199ad97b51f2009 SHA512 2593129b58c41301ea94f7b7761cc40e13f3b6458230478067d6a0a1c6a23ad8aa5f225d4203259ad54eb38d87b3bbac1a029a4de5282aee82147891b3c2b394
+EBUILD ibus-1.5.16.ebuild 3976 BLAKE2B 6bede6434d30b0fe6f07bb5f447b783dd0ac4a999d34afced1dd37039e949d1da06d3eadd1e08180bafdba274253d188099c3dd4747389a5f1fcc1009fbe3b04 SHA512 706833bf159c29c8045f686f2a11a4daa1672ab69c5925bc70952b3bacad641a61175c6898bec036fb7eb26b3d8b9fbf520ed2e9e5fcf32bac228992e6506e97
+EBUILD ibus-1.5.17.ebuild 4015 BLAKE2B 5112e3ca412d252307a5eb924ec66a69d60cef61aac7d9768fe9941a57eca109e89fb5a2c65abbec4a11bbc2d637cac627faba86f448245ead64ea7dfb3543df SHA512 3b3a1e0ab69c28c86ff92d6a5cbe4bed0b8b9c97e33b1e6fe776e091ae93b2bf451475c5e89f771042b2b42cd567d078c7823870f1986d3df7478776a7b498ca
+EBUILD ibus-1.5.18.ebuild 4277 BLAKE2B c2b16db2256a7503a631e336d83c8c719250808cc559e47a19c9a4cb5afd4dd7475398876275f0fcbd5c9625b3da9c5b1fb96c2f6d11dfc5fcdcdd7b1db854f9 SHA512 c6aee07fb6fcf380fe73b3c07bccd7d584865218652339bc6f347c09452e1fb8f4e89c62f6fc886d7dd8b931f59abe3da28ae72b610ea2be21ea8f8175c05b11
+MISC metadata.xml 942 BLAKE2B 9d8f0df17ae7c5c60892a8bf661c1f7325f4943e30d51667fe5e56f2c74f55e36c6f40cd6044435b9f046a88a267fa1b5d46f6cddc0cefa6b423554ff905e882 SHA512 5501b7ef3b46de30b69eabe28334556c979c99610f0a6051a254a7591de612d99ea9ee3c18c2f3869ae2046514df8cd555d801cc778bc1db111895256b7ab100
diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
new file mode 100644
index 000000000000..a8413c59fff3
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 gnome2-utils ltprune python-r1 vala virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="+X gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland"
+REQUIRED_USE="gtk2? ( gtk )
+	libnotify? ( gtk )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		gtk
+		introspection
+	)
+	test? ( gtk )
+	vala? ( introspection )"
+
+CDEPEND="app-text/iso-codes
+	dev-libs/glib:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		!gtk? ( x11-libs/gtk+:2 )
+	)
+	gconf? ( gnome-base/gconf:2 )
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXi
+		gtk2? ( x11-libs/gtk+:2 )
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	libnotify? ( x11-libs/libnotify )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${CDEPEND}
+	python? (
+		gtk? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+DEPEND="${CDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	vala_src_prepare --ignore-use
+	if ! use libnotify; then
+		touch ui/gtk3/panel.vala
+	fi
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
+	# fix for parallel install
+	sed -i \
+		-e "/^py2_compile/,/^$/d" \
+		-e "/^install-data-hook/,/^$/d" \
+		bindings/pygobject/Makefile.am
+	# require user interaction
+	sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
+	# fixed in 1.5.14+
+	sed -i "/def test_keymap/a\        self.skipTest('')" bindings/pygobject/test-override-ibus.py
+	sed -i "/[[:space:]]test-stress[[:space:]]/d" bus/Makefile.am
+	sed -i "/^TESTS += ibus-engine-switch/d" src/tests/Makefile.am
+
+	sed -i "/^bash_completion/d" tools/Makefile.am
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gtk setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	econf \
+		$(use_enable X xim) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk3) \
+		$(use_enable gtk ui) \
+		$(use_enable gtk2) \
+		$(use_enable introspection) \
+		$(use_enable libnotify) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		"${python_conf[@]}"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx emake -j1 check
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+
+	if use python; then
+		python_install() {
+			emake -C bindings/pygobject \
+				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
+				DESTDIR="${D}" \
+				install
+		}
+		python_foreach_impl python_install
+	fi
+
+	keepdir /usr/share/ibus/engine
+
+	newbashcomp tools/${PN}.bash ${PN}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
new file mode 100644
index 000000000000..4dcb90a62639
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 gnome2-utils ltprune python-r1 vala virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
+REQUIRED_USE="emoji? ( gtk )
+	gtk2? ( gtk )
+	kde? ( gtk )
+	libnotify? ( gtk )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		gtk
+		introspection
+	)
+	test? ( gtk )
+	vala? ( introspection )"
+
+CDEPEND="app-text/iso-codes
+	dev-libs/glib:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		!gtk? ( x11-libs/gtk+:2 )
+	)
+	gconf? ( gnome-base/gconf:2 )
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXi
+		gtk2? ( x11-libs/gtk+:2 )
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	kde? ( dev-qt/qtgui:5 )
+	libnotify? ( x11-libs/libnotify )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${CDEPEND}
+	python? (
+		gtk? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+DEPEND="${CDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	virtual/pkgconfig
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	vala_src_prepare --ignore-use
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala
+	fi
+	if ! use kde; then
+		touch ui/gtk3/panel.vala
+	fi
+	if ! use libnotify; then
+		touch ui/gtk3/panel.vala
+	fi
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
+	# fix for parallel install
+	sed -i \
+		-e "/^py2_compile/,/^$/d" \
+		-e "/^install-data-hook/,/^$/d" \
+		bindings/pygobject/Makefile.am
+	# require user interaction
+	sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
+
+	sed -i "/^bash_completion/d" tools/Makefile.am
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gtk setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	econf \
+		$(use_enable X xim) \
+		$(use_enable emoji emoji-dict) \
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk3) \
+		$(use_enable gtk ui) \
+		$(use_enable gtk2) \
+		$(use_enable introspection) \
+		$(use_enable kde appindicator) \
+		$(use_enable libnotify) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		"${python_conf[@]}"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx emake -j1 check
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+
+	if use python; then
+		python_install() {
+			emake -C bindings/pygobject \
+				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
+				DESTDIR="${D}" \
+				install
+		}
+		python_foreach_impl python_install
+	fi
+
+	keepdir /usr/share/ibus/engine
+
+	newbashcomp tools/${PN}.bash ${PN}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus/ibus-1.5.17.ebuild b/app-i18n/ibus/ibus-1.5.17.ebuild
new file mode 100644
index 000000000000..10bd3f700de7
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.17.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 gnome2-utils ltprune python-r1 vala virtualx xdg-utils
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
+REQUIRED_USE="emoji? ( gtk )
+	gtk2? ( gtk )
+	kde? ( gtk )
+	libnotify? ( gtk )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		gtk
+		introspection
+	)
+	test? ( gtk )
+	vala? ( introspection )"
+
+CDEPEND="app-text/iso-codes
+	dev-libs/glib:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		!gtk? ( x11-libs/gtk+:2 )
+	)
+	gconf? ( gnome-base/gconf:2 )
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXi
+		gtk2? ( x11-libs/gtk+:2 )
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	kde? ( dev-qt/qtgui:5 )
+	libnotify? ( x11-libs/libnotify )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${CDEPEND}
+	python? (
+		gtk? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+DEPEND="${CDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	virtual/pkgconfig
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	vala_src_prepare --ignore-use
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala
+	fi
+	if ! use kde; then
+		touch ui/gtk3/panel.vala
+	fi
+	if ! use libnotify; then
+		touch ui/gtk3/panel.vala
+	fi
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
+	# fix for parallel install
+	sed -i \
+		-e "/^py2_compile/,/^$/d" \
+		-e "/^install-data-hook/,/^$/d" \
+		bindings/pygobject/Makefile.am
+	# require user interaction
+	sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
+
+	sed -i "/^bash_completion/d" tools/Makefile.am
+
+	default
+	eautoreconf
+	xdg_environment_reset
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gtk setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	econf \
+		$(use_enable X xim) \
+		$(use_enable emoji emoji-dict) \
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk3) \
+		$(use_enable gtk ui) \
+		$(use_enable gtk2) \
+		$(use_enable introspection) \
+		$(use_enable kde appindicator) \
+		$(use_enable libnotify) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		"${python_conf[@]}"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx emake -j1 check
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+
+	if use python; then
+		python_install() {
+			emake -C bindings/pygobject \
+				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
+				DESTDIR="${D}" \
+				install
+		}
+		python_foreach_impl python_install
+	fi
+
+	keepdir /usr/share/ibus/engine
+
+	newbashcomp tools/${PN}.bash ${PN}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
new file mode 100644
index 000000000000..077b31aa412a
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+VALA_MIN_API_VERSION="0.34"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
+REQUIRED_USE="emoji? ( gtk )
+	gtk2? ( gtk )
+	kde? ( gtk )
+	libnotify? ( gtk )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		gtk
+		introspection
+	)
+	test? ( gtk )
+	vala? ( introspection )"
+
+CDEPEND="app-text/iso-codes
+	dev-libs/glib:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		!gtk? ( x11-libs/gtk+:2 )
+	)
+	gconf? ( gnome-base/gconf:2 )
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXi
+		gtk2? ( x11-libs/gtk+:2 )
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	kde? ( dev-qt/qtgui:5 )
+	libnotify? ( x11-libs/libnotify )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${CDEPEND}
+	python? (
+		gtk? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+DEPEND="${CDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	virtual/pkgconfig
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )
+	unicode? ( app-i18n/unicode-data )"
+
+src_prepare() {
+	vala_src_prepare --ignore-use
+	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala
+	fi
+	if ! use kde; then
+		touch ui/gtk3/panel.vala
+	fi
+	if ! use libnotify; then
+		touch ui/gtk3/panel.vala
+	fi
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
+	# fix for parallel install
+	sed -i \
+		-e "/^py2_compile/,/^$/d" \
+		-e "/^install-data-hook/,/^$/d" \
+		bindings/pygobject/Makefile.am
+	# require user interaction
+	sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
+
+	sed -i "/^bash_completion/d" tools/Makefile.am
+
+	default
+	eautoreconf
+	xdg_environment_reset
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gtk setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	econf \
+		$(use_enable X xim) \
+		$(use_enable emoji emoji-dict) \
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk3) \
+		$(use_enable gtk ui) \
+		$(use_enable gtk2) \
+		$(use_enable introspection) \
+		$(use_enable kde appindicator) \
+		$(use_enable libnotify) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable unicode unicode-dict) \
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		"${python_conf[@]}"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx emake -j1 check
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	if use python; then
+		python_install() {
+			emake -C bindings/pygobject \
+				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
+				DESTDIR="${D}" \
+				install
+		}
+		python_foreach_impl python_install
+	fi
+
+	keepdir /usr/share/ibus/engine
+
+	newbashcomp tools/${PN}.bash ${PN}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml
new file mode 100644
index 000000000000..3e5476424e4b
--- /dev/null
+++ b/app-i18n/ibus/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <longdescription lang="en">
+    IBus is a Intelligent Input Bus. It is a new input framework for Linux OS.
+    It provides full featured and user friendly input method user interface. It
+    also may help developers to develop input method easily.
+  </longdescription>
+  <use>
+    <flag name="emoji">Enable support for Emoji</flag>
+    <flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag>
+    <flag name="gtk2">Enable support for <pkg>x11-libs/gtk+</pkg>:2</flag>
+    <flag name="unicode">Enable support for Unicode choice</flag>
+  </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:ibus_project:ibus</remote-id>
+    <remote-id type="github">ibus/ibus</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/im-canna-0.3.2.2 b/app-i18n/im-canna-0.3.2.2
deleted file mode 100644
index afbc788f9e32..000000000000
--- a/app-i18n/im-canna-0.3.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst postrm
-DEPEND=app-i18n/canna x11-libs/gtk+:2 sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=Japanese Canna input method module for GTK+2
-EAPI=6
-HOMEPAGE=http://bonobo.gnome.gr.jp/~nakai/immodule/
-KEYWORDS=~amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/canna x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://bonobo.gnome.gr.jp/~nakai/immodule/im-canna-0.3.2.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7cfc7253da9e285ce1f722899adc802f
diff --git a/app-i18n/im-canna-0.3.2.2-r1 b/app-i18n/im-canna-0.3.2.2-r1
deleted file mode 100644
index 3390c9199698..000000000000
--- a/app-i18n/im-canna-0.3.2.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=app-i18n/canna x11-libs/gtk+:2 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=Japanese Canna input method module for GTK+2
-EAPI=6
-HOMEPAGE=http://bonobo.gnome.gr.jp/~nakai/immodule/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/canna x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://bonobo.gnome.gr.jp/~nakai/immodule/im-canna-0.3.2.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9a2992c882e96d839b8cd4377cda469b
diff --git a/app-i18n/im-canna/Manifest b/app-i18n/im-canna/Manifest
new file mode 100644
index 000000000000..b15fb209561b
--- /dev/null
+++ b/app-i18n/im-canna/Manifest
@@ -0,0 +1,5 @@
+AUX im-canna-gentoo.patch 912 BLAKE2B f0f8b62ac935b8f0356d96dc0dbfdbef990c1e38e4765ac0715a34749dffae1c57961a5b4e99b58e62bf966ab1b3ba21633fa7e9bf7065e800488605c3ec5e1a SHA512 5b9c98b3495bafcb9eb31d431abba0490817518c9804de6b09d6287d5e45540bc78d27d1be2496bcb1c6435db28666adc9b5b3967195399d57576aaf79da4ecc
+DIST im-canna-0.3.2.2.tar.gz 314633 BLAKE2B 971ab1d00645a0bd977a156abd6a1d3ad767505b5bd45792332a399685388b53b08e3133bc435adb7a7e27125fb1ad2d538f78af2420679c6d6d17878251b2ac SHA512 6ec4253038ca97e3e6319c024e4d11ca5418bf478280c4b19b81a9c628310a06bcd4ec35334d3a2bbdff0245bdfa660c1cdfd949ddd6b768d3b73d78648edc81
+EBUILD im-canna-0.3.2.2-r1.ebuild 770 BLAKE2B 0e61ae82678cf080a617fb2860b293fbb1d7374178f51272391fdf4edf955a13a4285d37ed4f23c75dabfbc16a4f3c78b4c590a8802608c04eb8e3849228bb67 SHA512 f3908c519bd345ff1d2ec54868c4ec53a6dde1269b3d65f38325e7104a4db1dfcc3becddaa6f4db2577505ce808e2292baf369ea5bf26191d18cb501d5ea8ffa
+EBUILD im-canna-0.3.2.2.ebuild 574 BLAKE2B 992152864f9e3da4b70efd9a6b690a52f1b835981941b9c9765e5eb8d68cc78a277413268be0b9cb2dd1f350726b169f766203511ac1a9c67be25b77b2274259 SHA512 e7a3cff5ef4b13d8348cb092b2eb50f67dc2f39a4e5757e383010019b488ce146d0380ac26a2e5af11c999a2c4c96939d8ccf5e708d6ba6048e11df597d483cf
+MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/im-canna/files/im-canna-gentoo.patch b/app-i18n/im-canna/files/im-canna-gentoo.patch
new file mode 100644
index 000000000000..959e8697eb82
--- /dev/null
+++ b/app-i18n/im-canna/files/im-canna-gentoo.patch
@@ -0,0 +1,35 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-moduledir = ${libdir}/gtk-2.0/2.4.0/immodules
++moduledir = ${libdir}/gtk-2.0/${GTK_BINARY_VERSION}/immodules
+ ## Makefile.am for gtk+/modules/input 
+ if PLATFORM_WIN32
+ no_undefined = -no-undefined
+@@ -6,11 +6,11 @@
+ 
+ SUBDIRS = po
+ 
+-INCLUDES = @GTK_DEP_CFLAGS@ -I/usr/include/canna -DIM_LOCALEDIR=\"${datadir}/locale\"
++INCLUDES = @GTK_DEP_CFLAGS@ -DIM_LOCALEDIR=\"${datadir}/locale\"
+ 
+ DEPS =
+ 
+-LDADDS = @GTK_DEP_LIBS@ -lcanna
++LDADDS = @GTK_DEP_LIBS@
+ 
+ EXTRA_DIST=	\
+ 	im-canna.spec \
+--- a/configure.in
++++ b/configure.in
+@@ -21,8 +21,10 @@
+ 
+ GTK_DEP_CFLAGS=`pkg-config gtk+-2.0 --cflags`
+ GTK_DEP_LIBS=`pkg-config gtk+-2.0 --libs`
++GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version`
+ AC_SUBST(GTK_DEP_CFLAGS)
+ AC_SUBST(GTK_DEP_LIBS)
++AC_SUBST(GTK_BINARY_VERSION)
+ 
+ LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
+ LT_CURRENT=2
diff --git a/app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild b/app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild
new file mode 100644
index 000000000000..673a3b973445
--- /dev/null
+++ b/app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools gnome2-utils ltprune
+
+DESCRIPTION="Japanese Canna input method module for GTK+2"
+HOMEPAGE="http://bonobo.gnome.gr.jp/~nakai/immodule/"
+SRC_URI="http://bonobo.gnome.gr.jp/~nakai/immodule/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="app-i18n/canna
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	gnome2_query_immodules_gtk2
+}
+
+pkg_postrm() {
+	gnome2_query_immodules_gtk2
+}
diff --git a/app-i18n/im-canna/im-canna-0.3.2.2.ebuild b/app-i18n/im-canna/im-canna-0.3.2.2.ebuild
new file mode 100644
index 000000000000..b979ded7fff9
--- /dev/null
+++ b/app-i18n/im-canna/im-canna-0.3.2.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit gnome2-utils
+
+DESCRIPTION="Japanese Canna input method module for GTK+2"
+HOMEPAGE="http://bonobo.gnome.gr.jp/~nakai/immodule/"
+SRC_URI="http://bonobo.gnome.gr.jp/~nakai/immodule/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
+
+RDEPEND="app-i18n/canna
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_postinst() {
+	gnome2_query_immodules_gtk2
+}
+
+pkg_postrm() {
+	gnome2_query_immodules_gtk2
+}
diff --git a/app-i18n/im-canna/metadata.xml b/app-i18n/im-canna/metadata.xml
new file mode 100644
index 000000000000..e1a49f498885
--- /dev/null
+++ b/app-i18n/im-canna/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-i18n/im-chooser-1.7.0 b/app-i18n/im-chooser-1.7.0
deleted file mode 100644
index 26a1d030d2d0..000000000000
--- a/app-i18n/im-chooser-1.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-i18n/imsettings virtual/libintl x11-libs/libSM gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) xfce? ( xfce-base/libxfce4util ) dev-util/intltool sys-devel/autoconf-archive sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Desktop Input Method configuration tool
-EAPI=6
-HOMEPAGE=https://pagure.io/im-chooser
-IUSE=gtk2 xfce
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/imsettings virtual/libintl x11-libs/libSM gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) xfce? ( xfce-base/libxfce4util )
-SLOT=0
-SRC_URI=https://releases.pagure.org/im-chooser/im-chooser-1.7.0.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3d9f954de47f1c26b8045b60090c2cd0
diff --git a/app-i18n/im-chooser/Manifest b/app-i18n/im-chooser/Manifest
new file mode 100644
index 000000000000..63e1b57b4116
--- /dev/null
+++ b/app-i18n/im-chooser/Manifest
@@ -0,0 +1,3 @@
+DIST im-chooser-1.7.0.tar.bz2 509630 BLAKE2B 4a7706509ceb19c7292a5c8cf80c8fa0b571819403f30f1fa3002927c69a83522b4de627b1d453db0ada8e662da3624edcb5f85eaf01dfa0187978f2a9b2095c SHA512 2a01488062b5a4dc1e4cd0815dda5a6bcef205dc50ed75d58836c5b46e3f86be79aac70eb5d6753e5f569ccc05015dd6d8de59029e94dc407cc613160d3ac61c
+EBUILD im-chooser-1.7.0.ebuild 957 BLAKE2B 301c28a35f468d52606cacb7d591c09b2957f87f4397500a523929c7a75dab4de8529be2cd0ab419bf95fa8b681f2aedde44e2597492f05b0c532f20188b3f53 SHA512 55150d632160d2e1b5078f741b5f6577a04e1fdf708eb167acb605f36ddea643c53b7c9a66403eae0c38665603c10a9c9d68e922211028185340e5616e951570
+MISC metadata.xml 625 BLAKE2B 2a4dcd082b262a87fc6fcdae1e406987b22ed12b789db5b4c7bfb46cf03d8d19d7741c2af0bfdb9125950fe28943fa0e3762f0e8df5c06995aa9536e16b78e35 SHA512 d06faf834ff8e1c5246473bb0a957cedc3d98a3ff1fc100414e40c276d5a8e67fda60635ee8fe48b35e96fcbfda9faa0a93d7c0fa1d5dd25c63dac2b3b4bea22
diff --git a/app-i18n/im-chooser/im-chooser-1.7.0.ebuild b/app-i18n/im-chooser/im-chooser-1.7.0.ebuild
new file mode 100644
index 000000000000..61443d0add9b
--- /dev/null
+++ b/app-i18n/im-chooser/im-chooser-1.7.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools ltprune
+
+DESCRIPTION="Desktop Input Method configuration tool"
+HOMEPAGE="https://pagure.io/im-chooser"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk2 xfce"
+
+RDEPEND="app-i18n/imsettings
+	virtual/libintl
+	x11-libs/libSM
+	gtk2? ( x11-libs/gtk+:2 )
+	!gtk2? ( x11-libs/gtk+:3 )
+	xfce? ( xfce-base/libxfce4util )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/autoconf-archive
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i \
+		-e "/PKG_CHECK_MODULES/s/\(gtk+-3\.0\)/$(usex !gtk2 '\1' _)/" \
+		-e "/PKG_CHECK_MODULES/s/\(libxfce4util-1\.0\)/$(usex xfce '\1' _)/" \
+		-e "/^GNOME_/d" \
+		-e "/^CFLAGS/s/\$WARN_CFLAGS/-Wall -Wmissing-prototypes/" \
+		configure.ac
+
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/app-i18n/im-chooser/metadata.xml b/app-i18n/im-chooser/metadata.xml
new file mode 100644
index 000000000000..434bdd89ac27
--- /dev/null
+++ b/app-i18n/im-chooser/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <longdescription lang="en">
+    IM Chooser is a GUI configuration tool for IMSettings to choose Input
+    Method you want to use or disable it entirely on the desktop.
+  </longdescription>
+  <use>
+    <flag name="gtk2">
+      Build with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3
+     </flag>
+    <flag name="xfce">Enable support for XFCE panel</flag>
+  </use>
+</pkgmetadata>
diff --git a/app-i18n/im-freewnn-0.0.2-r2 b/app-i18n/im-freewnn-0.0.2-r2
deleted file mode 100644
index 289b3be047f1..000000000000
--- a/app-i18n/im-freewnn-0.0.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=app-i18n/freewnn x11-libs/gtk+:2 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=Japanese FreeWnn input method module for GTK+2
-EAPI=6
-HOMEPAGE=http://bonobo.gnome.gr.jp/~nakai/immodule/
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/freewnn x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://bonobo.gnome.gr.jp/~nakai/immodule/im-freewnn-0.0.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ece45dc0b4cb95e3b042b0aa511a4bdc
diff --git a/app-i18n/im-freewnn-0.0.2-r3 b/app-i18n/im-freewnn-0.0.2-r3
deleted file mode 100644
index 93a6b416c1d4..000000000000
--- a/app-i18n/im-freewnn-0.0.2-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=app-i18n/freewnn x11-libs/gtk+:2 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=Japanese FreeWnn input method module for GTK+2
-EAPI=6
-HOMEPAGE=http://bonobo.gnome.gr.jp/~nakai/immodule/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/freewnn x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://bonobo.gnome.gr.jp/~nakai/immodule/im-freewnn-0.0.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8d5e529589872daf698c52071f8dd167
diff --git a/app-i18n/im-freewnn/Manifest b/app-i18n/im-freewnn/Manifest
new file mode 100644
index 000000000000..2131161ea5c0
--- /dev/null
+++ b/app-i18n/im-freewnn/Manifest
@@ -0,0 +1,8 @@
+AUX im-freewnn-0.0.2-as-needed.patch 905 BLAKE2B 6d3d88b57bb7b2e0fe812e69509a31537eb15f979c9e9530a73b9e5b1d599573895e6716debd2bb6032bafeabfd8afeafbeaa8b0db875c312bc07a044742b6fe SHA512 38472c17123784f2a76d25a2d3accea7aa3e7317b3581e1e86b3ba4d71abdd0fc721d14a2c9f8869ab522185357b25b82a3ebf49ca0d3eb07aa6581278aefa1f
+AUX im-freewnn-gentoo.patch 2426 BLAKE2B cf395d08d18424e182645e06fc14e9c0cf9a2f676b5a9ee67c8d740eb9c7c89eb49e969d84a8c5215318735d6e5c8c34ac377a414dfcdb6db5279b3b81168f67 SHA512 aebad875ff118a7d9b4b3ba2facafcb369527621cfc9be82bb21d07b8eb0d390d46f598f83dc49eddf9de00a9c1d8cef2fe1f550f6c1bf06219ce6be56633655
+AUX im-freewnn-headers.patch 511 BLAKE2B 13ed6574b9a6aa29db8a20c9b2deff0b0374ad298d2a6ed433bc2ad45823e03de46817f64c57c6f1ba5eb7064611e777b11b11b39444b20b23618650a5535814 SHA512 ae209226010483d0b4a4ec10888d29d6b71002bb9457519b83a56cfb958da9e47740530e23baf2f35453f60902b359443f10e331e4a5b96eff386b78f80ad856
+AUX im-freewnn-wnnenvrc.patch 367 BLAKE2B 5225eceff814d61c2f864b5f8316bb0e902eca4c5d606f724a0bf3ad12b3ce0f0a54af28c4112378a47f2fac3028d9d2fca362f40a20d62d95f656130043dc67 SHA512 0a8e506944d537084a6cd6efe7c0e7583781220e38fb17f164ba7b01290bbe59a4db04a95d2d72299dbd5bc2d9ff2af036d00101c6ced1b593a0a20b98531df7
+DIST im-freewnn-0.0.2.tar.gz 322963 BLAKE2B c089688a52c86cc8c0050987a17d294365e29ef33e70258efaad719876d079e997a7255b86a8b23b6c3bb2c779702e6dd8d6eb9825943f9a7034757ac27e5e51 SHA512 c942d320433d0b1ff15fc1566eff183f5761ce14cb0575834f4ee80504be6d286068203c22ffea81345dab3db11a873f0a559b3d38ba8505f4966f9532a06358
+EBUILD im-freewnn-0.0.2-r2.ebuild 878 BLAKE2B a3707432d6ba6a6333dc10331d644b0f33c169256f5c33be41b2d11b693de00251da6871eb716e312befbe0c78b8b533d8a3384f3be1945981bc4ec858763dcc SHA512 4e1e23279fa65a206e0c5b23aef2fe41b448651f616d6df180ed47c7cb501c73865b6e7c91516c6d7204a84652394c5a8aa88d814079b71f347f2460fc9437c2
+EBUILD im-freewnn-0.0.2-r3.ebuild 880 BLAKE2B df2099671864019b883c0e8eb795d0c295c1d407fee85256ef68e446bc22d588ab7ec0f1027eef31d97fe5a340e63b3f8e32366ee057af1efdb66a52f8587407 SHA512 e8dcfc8acd4166b14644e61a7ca5b363bc2a03b8fb1cba26eb5f3433ac8ec64baa9a96487041eab7e9a9248fc9684b3b65349f2840f918fc2ba159eb3c1590b4
+MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/im-freewnn/files/im-freewnn-0.0.2-as-needed.patch b/app-i18n/im-freewnn/files/im-freewnn-0.0.2-as-needed.patch
new file mode 100644
index 000000000000..859ea779817a
--- /dev/null
+++ b/app-i18n/im-freewnn/files/im-freewnn-0.0.2-as-needed.patch
@@ -0,0 +1,35 @@
+--- im-freewnn-0.0.2.orig/Makefile.am	2004-08-04 07:05:06.000000000 +0200
++++ im-freewnn-0.0.2/Makefile.am	2009-12-29 20:34:54.420539767 +0100
+@@ -10,8 +10,6 @@
+ 
+ DEPS =
+ 
+-LDADDS = @GTK_DEP_LIBS@ -lcrypt
+-
+ EXTRA_DIST=	\
+ 	im-freewnn.spec
+ 
+@@ -38,7 +36,7 @@
+ 		candwin.h \
+ 		candwin.c
+ 
+-im_freewnn_la_LIBADD = $(LDADDS) -lcrypt
++im_freewnn_la_LIBADD = @LIBS@ @GTK_DEP_LIBS@ -lcrypt
+ 
+ module_LTLIBRARIES =				\
+ 	im-freewnn.la
+--- im-freewnn-0.0.2.orig/configure.in	2004-08-05 08:04:36.000000000 +0200
++++ im-freewnn-0.0.2/configure.in	2009-12-29 20:36:31.562539161 +0100
+@@ -48,11 +48,8 @@
+ AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
+ 
+ dnl FreeWnn check
+-ldflags_backup="$LDFLAGS"
+-LDFLAGS="$LDFLAGS -lcrypt"
+ AC_CHECK_HEADER(wnn/jlib.h,,)
+-AC_CHECK_LIB(wnn, jl_open_lang,,)
+-LDFLAGS="$ldflags_backup"
++AC_CHECK_LIB([wnn], [jl_open_lang], , ,[-lcrypt])
+ 
+ AC_OUTPUT([
+ Makefile
diff --git a/app-i18n/im-freewnn/files/im-freewnn-gentoo.patch b/app-i18n/im-freewnn/files/im-freewnn-gentoo.patch
new file mode 100644
index 000000000000..90e042fc4193
--- /dev/null
+++ b/app-i18n/im-freewnn/files/im-freewnn-gentoo.patch
@@ -0,0 +1,112 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-moduledir = ${libdir}/gtk-2.0/2.4.0/immodules
++moduledir = ${libdir}/gtk-2.0/${GTK_BINARY_VERSION}/immodules
+ ## Makefile.am for gtk+/modules/input 
+ if PLATFORM_WIN32
+ no_undefined = -no-undefined
+@@ -6,11 +6,11 @@
+ 
+ SUBDIRS = po
+ 
+-INCLUDES = @GTK_DEP_CFLAGS@ -I/usr/include/wnn -DIM_LOCALEDIR=\"${datadir}/locale\"
++INCLUDES = @GTK_DEP_CFLAGS@ -DIM_LOCALEDIR=\"${datadir}/locale\"
+ 
+ DEPS =
+ 
+-LDADDS = @GTK_DEP_LIBS@ -lcrypt
++LDADDS = @GTK_DEP_LIBS@
+ 
+ EXTRA_DIST=	\
+ 	im-freewnn.spec
+@@ -38,7 +38,7 @@
+ 		candwin.h \
+ 		candwin.c
+ 
+-im_freewnn_la_LIBADD = $(LDADDS) -lcrypt
++im_freewnn_la_LIBADD = $(LDADDS)
+ 
+ module_LTLIBRARIES =				\
+ 	im-freewnn.la
+--- a/configure.in
++++ b/configure.in
+@@ -21,8 +21,10 @@
+ 
+ GTK_DEP_CFLAGS=`pkg-config gtk+-2.0 --cflags`
+ GTK_DEP_LIBS=`pkg-config gtk+-2.0 --libs`
++GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version`
+ AC_SUBST(GTK_DEP_CFLAGS)
+ AC_SUBST(GTK_DEP_LIBS)
++AC_SUBST(GTK_BINARY_VERSION)
+ 
+ LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
+ LT_CURRENT=2
+@@ -48,11 +50,9 @@
+ AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
+ 
+ dnl FreeWnn check
+-ldflags_backup="$LDFLAGS"
+-LDFLAGS="$LDFLAGS -lcrypt"
+ AC_CHECK_HEADER(wnn/jlib.h,,)
++AC_CHECK_LIB(crypt, crypt,,)
+ AC_CHECK_LIB(wnn, jl_open_lang,,)
+-LDFLAGS="$ldflags_backup"
+ 
+ AC_OUTPUT([
+ Makefile
+--- a/freewnn-modewin.h
++++ b/freewnn-modewin.h
+@@ -23,7 +23,7 @@
+ 
+ #include <gtk/gtk.h>
+ 
+-#include <jllib.h>
++#include <wnn/jllib.h>
+ 
+ #include "freewnn-register-win.h"
+ #include "freewnn-config.h"
+--- a/freewnn-register-win.c
++++ b/freewnn-register-win.c
+@@ -18,7 +18,7 @@
+  *
+  */
+ 
+-#include <jllib.h>
++#include <wnn/jllib.h>
+ #include <gtk/gtk.h>
+ 
+ #include <gdk/gdkkeysyms.h>
+--- a/freewnn-register-win.h
++++ b/freewnn-register-win.h
+@@ -22,7 +22,7 @@
+ #define _FREEWNN_REGIST_WIN
+ 
+ #include <gtk/gtk.h>
+-#include <jllib.h>
++#include <wnn/jllib.h>
+ 
+ typedef struct _FreeWnnRegisterWin FreeWnnRegisterWin;
+ 
+--- a/freewnn-utils.h
++++ b/freewnn-utils.h
+@@ -18,7 +18,7 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
+-#include <jllib.h>
++#include <wnn/jllib.h>
+ #include <glib.h>
+ 
+ w_char* char2wchar(unsigned char* str);
+--- a/im-freewnn.h
++++ b/im-freewnn.h
+@@ -26,7 +26,7 @@
+ 
+ #include <gtk/gtk.h>
+ #include <gtk/gtkimmodule.h>
+-#include <jllib.h>
++#include <wnn/jllib.h>
+ 
+ #include "freewnn-modewin.h"
+ #include "freewnn-utils.h"
diff --git a/app-i18n/im-freewnn/files/im-freewnn-headers.patch b/app-i18n/im-freewnn/files/im-freewnn-headers.patch
new file mode 100644
index 000000000000..290aee97bd89
--- /dev/null
+++ b/app-i18n/im-freewnn/files/im-freewnn-headers.patch
@@ -0,0 +1,30 @@
+--- a/freewnn-utils.c
++++ b/freewnn-utils.c
+@@ -18,6 +18,9 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
++#include <stdlib.h>
++#include <string.h>
++
+ #include "freewnn-utils.h"
+ #include "kata2hkata.h"
+ 
+--- a/im-freewnn.c
++++ b/im-freewnn.c
+@@ -26,6 +26,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #include <string.h>
+ #include "keytable.h"
+@@ -33,6 +34,7 @@
+ #include <gdk/gdkkeysyms.h>
+ 
+ #include "im-freewnn-intl.h"
++#include "freewnn-utils-ui.h"
+ #include "convtable.h"
+ #include "im-freewnn.h"
+ 
diff --git a/app-i18n/im-freewnn/files/im-freewnn-wnnenvrc.patch b/app-i18n/im-freewnn/files/im-freewnn-wnnenvrc.patch
new file mode 100644
index 000000000000..6b3c70769907
--- /dev/null
+++ b/app-i18n/im-freewnn/files/im-freewnn-wnnenvrc.patch
@@ -0,0 +1,11 @@
+--- a/im-freewnn.c
++++ b/im-freewnn.c
+@@ -236,7 +236,7 @@
+     return;
+   }
+ 
+-  jl_set_env_wnnrc(wenv, "/etc/FreeWnn/ja/wnnenvrc", printConfirm, printError);
++  jl_set_env_wnnrc(wenv, "@GENTOO_PORTAGE_EPREFIX@/usr/lib/wnn/ja_JP/wnnenvrc", printConfirm, printError);
+ 
+   cf->modewin = freewnn_modewin_new(cf->wnnbuf, &cf->functable);
+   cf->candwin = candwin_new();
diff --git a/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild b/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild
new file mode 100644
index 000000000000..04bc5f5a3e3d
--- /dev/null
+++ b/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools gnome2-utils ltprune prefix
+
+DESCRIPTION="Japanese FreeWnn input method module for GTK+2"
+HOMEPAGE="http://bonobo.gnome.gr.jp/~nakai/immodule/"
+SRC_URI="http://bonobo.gnome.gr.jp/~nakai/immodule/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND="app-i18n/freewnn
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-as-needed.patch
+	"${FILESDIR}"/${PN}-headers.patch
+	"${FILESDIR}"/${PN}-wnnenvrc.patch
+)
+
+src_prepare() {
+	default
+	eprefixify ${PN}.c
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	gnome2_query_immodules_gtk2
+}
+
+pkg_postrm() {
+	gnome2_query_immodules_gtk2
+}
diff --git a/app-i18n/im-freewnn/im-freewnn-0.0.2-r3.ebuild b/app-i18n/im-freewnn/im-freewnn-0.0.2-r3.ebuild
new file mode 100644
index 000000000000..9057c74300c3
--- /dev/null
+++ b/app-i18n/im-freewnn/im-freewnn-0.0.2-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools gnome2-utils ltprune prefix
+
+DESCRIPTION="Japanese FreeWnn input method module for GTK+2"
+HOMEPAGE="http://bonobo.gnome.gr.jp/~nakai/immodule/"
+SRC_URI="http://bonobo.gnome.gr.jp/~nakai/immodule/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="app-i18n/freewnn
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-headers.patch
+	"${FILESDIR}"/${PN}-wnnenvrc.patch
+)
+
+src_prepare() {
+	default
+	eprefixify ${PN}.c
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	gnome2_query_immodules_gtk2
+}
+
+pkg_postrm() {
+	gnome2_query_immodules_gtk2
+}
diff --git a/app-i18n/im-freewnn/metadata.xml b/app-i18n/im-freewnn/metadata.xml
new file mode 100644
index 000000000000..e1a49f498885
--- /dev/null
+++ b/app-i18n/im-freewnn/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-i18n/imhangul-2.1.0 b/app-i18n/imhangul-2.1.0
deleted file mode 100644
index 49bfd4cc992a..000000000000
--- a/app-i18n/imhangul-2.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=app-i18n/libhangul-0.0.12 >=x11-libs/gtk+-2.2:2 virtual/libintl virtual/pkgconfig sys-devel/gettext >=sys-apps/sed-4
-DESCRIPTION=Gtk+-2.0 Hangul Input Modules
-EAPI=6
-HOMEPAGE=https://code.google.com/p/imhangul/
-KEYWORDS=amd64 ppc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=app-i18n/libhangul-0.0.12 >=x11-libs/gtk+-2.2:2 virtual/libintl
-SLOT=0
-SRC_URI=https://imhangul.googlecode.com/files/imhangul-2.1.0.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=531959cf9ed6c278bb869311f8ba8645
diff --git a/app-i18n/imhangul-3.1.1 b/app-i18n/imhangul-3.1.1
deleted file mode 100644
index 250e46be52ec..000000000000
--- a/app-i18n/imhangul-3.1.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=app-i18n/libhangul-0.0.12 x11-libs/gtk+:3 virtual/libintl virtual/pkgconfig sys-devel/gettext
-DESCRIPTION=Gtk+-3.0 Hangul Input Modules
-EAPI=6
-HOMEPAGE=https://code.google.com/p/imhangul/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=app-i18n/libhangul-0.0.12 x11-libs/gtk+:3 virtual/libintl
-SLOT=3
-SRC_URI=https://imhangul.googlecode.com/files/imhangul-3.1.1.tar.bz2
-_md5_=a7eab4743800b9f4a59008b4e9da26e7
diff --git a/app-i18n/imhangul/Manifest b/app-i18n/imhangul/Manifest
new file mode 100644
index 000000000000..644b0b252bbc
--- /dev/null
+++ b/app-i18n/imhangul/Manifest
@@ -0,0 +1,14 @@
+AUX xinput-imhangul2 52 BLAKE2B 5eba0898cc59fc0d3da0081fa3f84edfbf4140a2900b71ae7714b67628fc0b31ec9ab7ab693d9802bb2350b10a2193d364201f5720d7c598312f85e08e97239f SHA512 b6e383a74375c3c5293a9fc26056fc4bad036326a87cf1a64cfb4f63092b283faf3d2c741b9fc23c8835efac1a190acb8916af5130a95412fa7403596d45682d
+AUX xinput-imhangul2y 61 BLAKE2B 07aa4129abf0f97b111760264bceb6736f9d35c85bbbb78ef95955adeb18018f84c3579b69ddbb7b8d4843c17f320bf8d9078a69b60146f182cf0d64ece4a519 SHA512 ae92eb341b22a61eb16736f4b0532d5ce00b8ac4b25baa0ddf10870cc6174306c88b5450dfa2778f442ec551e55b79b5085e95748d11e06c81c5f1601dab6bee
+AUX xinput-imhangul32 67 BLAKE2B f0b891bbc9ccd8ddfb128c205d847ad9f3b6847223bf528f6ddf68335fb9c43bc5986ac7bbc495df70d12410eaf67a10f2c8f1f38558f21f7d5ef112c9e7a721 SHA512 2bb2501ca6e05702b13f80154be662265932a60112805b6166a33c1fc6fa23d9c7865c9be578102eba9800e06d2e1b69ddf63a7521e4ce3129ee46ad191998c3
+AUX xinput-imhangul39 57 BLAKE2B b998d139ec2bef25e7184db045ac262e322f54d3b257fc6ad724d72fda65537950d91b6e04f98d1e0c3833fe2174a6a473d9152c791d886b057f241ecb3cce49 SHA512 efdaf9260d12f24f62218e4ba12a81cd36dd125acc0d138ceafea8c3da64d7dcc95bf4a156471db726097d7a91a595f6e8be888687125c3c2cbcacec1b1cc8bf
+AUX xinput-imhangul3f 59 BLAKE2B ebf84f16252a167db040d296ef02cb7551c68425635bee05baca1ccd49bb2024922d2c6767252363361ffd8fb28861078596f42f9352dbc737471adc4b4a3c6a SHA512 2e958bc9f39af365795a7927a2338af03be7550dcac10ed63d2910da861c4bb238e786f5ac449283d009ac2ed67fda463f76ed3ca23f36ccd58b44475e94d096
+AUX xinput-imhangul3s 61 BLAKE2B 52bd0edf0939fbb9175da1596d369ab9917d93a09ebfd4c171ff4db35058351b29a5f323fa9d4b0d3bd01075deedd9ebf57dabbd14e2401f7233e6faedddd414 SHA512 1faff86b65185c8bf1cdaa8a27c0f98d27fecd9415cb43c63698913898171e0a3b310a3f5528650d98dbc87afa31ae82e48ee34f3ee8823e9dbdbe3aa1d4eb2f
+AUX xinput-imhangul3y 61 BLAKE2B bc4e3c683e3ddc2f3174ddc7c1be36a8479d4584feef20402d0ed5721338cb7bc4bb0878ff4b890b929e66d4cad073a08955714d5178814b6ae67ed9b869a6f5 SHA512 b5340313cfe8d0ce0405b0cfbdcfde5192ede2cadf7006888526b1b4d98e257abdb276cae4b98b0caf40d5563f4f950e98e2fa0c1432b6efe36c9df11e7a92eb
+AUX xinput-imhangulahn 53 BLAKE2B ed7e3dcf8c5108b833186f1acdaeb34c04d4d6682a3e747f1ce2bafc2e8e98d788610c8372257583e8e5031bd78ca5ef32a013b72fae34a36aca130e808d3e6d SHA512 3ac9858111de532b483c8fb209f2517651e821ecf4aa704118d9f227a9ab090ae85cbb5572e14e6a04dc49b938fdcf103604ab1c2370df257174f94be2de55d9
+AUX xinput-imhangulro 50 BLAKE2B 01b0a4e625348fc9221b2f52d10288befbbf71774e3406005df4365695c1d996643b3369703f9e8ce64d699f88ee616ae2a48fa24f0c648bf2bc28a9625a84fd SHA512 5d1f588fcda77e6d96cfa955f0057edf614fe01290c9541eae61f8be85a7da80a29246bd2c777f517ce544c094a01d13d73d91368be7296aae9639698add90c4
+DIST imhangul-2.1.0.tar.bz2 268205 BLAKE2B c45cc3e0919c695466f7d09c20c3ee5ae827865b6c3093746f8435bfb3f18da0cf94bc4225829dbafb2f13fcd1da0ec4a696adb966bff90285c769eb36232c4b SHA512 ea4621c4e0e5ed1786e644b577bc0c9f3dbbf296f938ddb2ab04923d8147e01123e10e09a61484e30c3ab0ff51d86da80a93bce583eceee207eab90c27df5f8e
+DIST imhangul-3.1.1.tar.bz2 288236 BLAKE2B bb762481c98d8e4d3e1f32629802320fbdd6ec2388e9d7e9f1838fbbcb05f247549dc2baa68e6f4ec626f32b1911b5dfa89810e64c9e826cb1887400bbe11e71 SHA512 a27fb34a826ceccb16e4c8a422f5571c7c6a4c253cd2a55c1025b0c22500a380a35a8703e9f0f6300fdc92544e1d7b59e33f11e059b85754b1619698e0f74d89
+EBUILD imhangul-2.1.0.ebuild 2012 BLAKE2B 7ede0699e7810052d29de951a577a301fd2dc9e759b3a2ea5f681065dd6c25e0067fa3dd94214bdd4514d6abb612c19769c7a1a3cb4d48937a24f7e1394bf9c4 SHA512 cae04c16e0bbdfe53b1854d1a0e4fca5619e614abeb491c7bb7e035c9a2417a2343c4e3d59e56a4f535b3cad31f7770485f8f18dbe898382723b535059b1feb3
+EBUILD imhangul-3.1.1.ebuild 1701 BLAKE2B b27eb4b7843dfe27b3e553b348214cb760f1e34464d7f3a2c6d31aed969e4443ebebdbfadb6671c3df9f8abf9cfd88bb23b93b831bb1c2c899630e757b30cfb9 SHA512 783af5ebba46190fa5539f243c020d273d21ac57d44f68863e16f61387468830fd2a2657b033eca2c1dc3691ee1babc75271bcc68ec295b5cdf309aea21b1ced
+MISC metadata.xml 312 BLAKE2B 9e2c42462595f69a26248c0f4dd74565c43fc91ebb919aa9208f534dff815e9f41eb30bba9edac267c390d88770b7a2774bd4046de1418c712dd4698d7058b5d SHA512 ea7923a669ff35a1d8067bc6fa5d443db7cc77c9ac78ef7eae002e080d3fa308afb0cfd20027e2021a4ec4a6eac5f3fe1647b049b795c671da1fb4d64fd45e94
diff --git a/app-i18n/imhangul/files/xinput-imhangul2 b/app-i18n/imhangul/files/xinput-imhangul2
new file mode 100644
index 000000000000..099b880344b7
--- /dev/null
+++ b/app-i18n/imhangul/files/xinput-imhangul2
@@ -0,0 +1,2 @@
+SHORT_DESC="Hangul Dubeolsik"
+GTK_IM_MODULE=hangul2
diff --git a/app-i18n/imhangul/files/xinput-imhangul2y b/app-i18n/imhangul/files/xinput-imhangul2y
new file mode 100644
index 000000000000..f622cb8d246c
--- /dev/null
+++ b/app-i18n/imhangul/files/xinput-imhangul2y
@@ -0,0 +1,2 @@
+SHORT_DESC="Hangul Dubeolsik Yetgeul"
+GTK_IM_MODULE=hangul2y
diff --git a/app-i18n/imhangul/files/xinput-imhangul32 b/app-i18n/imhangul/files/xinput-imhangul32
new file mode 100644
index 000000000000..6a903e2cd707
--- /dev/null
+++ b/app-i18n/imhangul/files/xinput-imhangul32
@@ -0,0 +1,2 @@
+SHORT_DESC="Hangul Sebeolsik Dubeol Layout"
+GTK_IM_MODULE=hangul32
diff --git a/app-i18n/imhangul/files/xinput-imhangul39 b/app-i18n/imhangul/files/xinput-imhangul39
new file mode 100644
index 000000000000..b5438d01c572
--- /dev/null
+++ b/app-i18n/imhangul/files/xinput-imhangul39
@@ -0,0 +1,2 @@
+SHORT_DESC="Hangul Sebeolsik 390"
+GTK_IM_MODULE=hangul39
diff --git a/app-i18n/imhangul/files/xinput-imhangul3f b/app-i18n/imhangul/files/xinput-imhangul3f
new file mode 100644
index 000000000000..e0c703272ce3
--- /dev/null
+++ b/app-i18n/imhangul/files/xinput-imhangul3f
@@ -0,0 +1,2 @@
+SHORT_DESC="Hangul Sebeolsik Final"
+GTK_IM_MODULE=hangul3f
diff --git a/app-i18n/imhangul/files/xinput-imhangul3s b/app-i18n/imhangul/files/xinput-imhangul3s
new file mode 100644
index 000000000000..0ce1079ff76a
--- /dev/null
+++ b/app-i18n/imhangul/files/xinput-imhangul3s
@@ -0,0 +1,2 @@
+SHORT_DESC="Hangul Sebeolsik Noshift"
+GTK_IM_MODULE=hangul3s
diff --git a/app-i18n/imhangul/files/xinput-imhangul3y b/app-i18n/imhangul/files/xinput-imhangul3y
new file mode 100644
index 000000000000..922e9025e884
--- /dev/null
+++ b/app-i18n/imhangul/files/xinput-imhangul3y
@@ -0,0 +1,2 @@
+SHORT_DESC="Hangul Sebeolsik Yetgeul"
+GTK_IM_MODULE=hangul3y
diff --git a/app-i18n/imhangul/files/xinput-imhangulahn b/app-i18n/imhangul/files/xinput-imhangulahn
new file mode 100644
index 000000000000..1dd23b661920
--- /dev/null
+++ b/app-i18n/imhangul/files/xinput-imhangulahn
@@ -0,0 +1,2 @@
+SHORT_DESC="Hangul Ahnmatae"
+GTK_IM_MODULE=hangulahn
diff --git a/app-i18n/imhangul/files/xinput-imhangulro b/app-i18n/imhangul/files/xinput-imhangulro
new file mode 100644
index 000000000000..7cfcfaeb8d81
--- /dev/null
+++ b/app-i18n/imhangul/files/xinput-imhangulro
@@ -0,0 +1,2 @@
+SHORT_DESC="Hangul Romaja"
+GTK_IM_MODULE=hangulro
diff --git a/app-i18n/imhangul/imhangul-2.1.0.ebuild b/app-i18n/imhangul/imhangul-2.1.0.ebuild
new file mode 100644
index 000000000000..5503848cb8b8
--- /dev/null
+++ b/app-i18n/imhangul/imhangul-2.1.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils multilib readme.gentoo-r1
+
+DESCRIPTION="Gtk+-2.0 Hangul Input Modules"
+HOMEPAGE="https://code.google.com/p/imhangul/"
+SRC_URI="https://imhangul.googlecode.com/files/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="
+	>=app-i18n/libhangul-0.0.12
+	>=x11-libs/gtk+-2.2:2
+	virtual/libintl
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+If you want to use one of the module as a default input method,
+
+export GTK_IM_MODULE=hangul2  # 2 input type
+export GTK_IM_MODULE=hangul3f # 3 input type
+"
+
+get_gtk_confdir() {
+	# bug #366889
+	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
+		GTK2_CONFDIR="${GTK2_CONFDIR:=${EPREFIX}/etc/gtk-2.0/$(get_abi_CHOST)}"
+	else
+		GTK2_CONFDIR="${GTK2_CONFDIR:=${EPREFIX}/etc/gtk-2.0}"
+	fi
+	echo ${GTK2_CONFDIR}
+}
+
+src_prepare() {
+	default
+	gnome2_environment_reset
+	gnome2_disable_deprecation_warning
+}
+
+src_configure() {
+	econf \
+		--with-gtk-im-module-dir="${EPREFIX}/usr/$(get_libdir)/gtk-2.0/immodules" \
+		--with-gtk-im-module-file="$(get_gtk_confdir)"
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+
+	insinto /etc/X11/xinit/xinput.d
+	newins "${FILESDIR}/xinput-imhangul2" imhangul2.conf
+	newins "${FILESDIR}/xinput-imhangul2y" imhangul2y.conf
+	newins "${FILESDIR}/xinput-imhangul32" imhangul32.conf
+	newins "${FILESDIR}/xinput-imhangul39" imhangul39.conf
+	newins "${FILESDIR}/xinput-imhangul3f" imhangul3f.conf
+	newins "${FILESDIR}/xinput-imhangul3s" imhangul3s.conf
+	newins "${FILESDIR}/xinput-imhangul3y" imhangul3y.conf
+	newins "${FILESDIR}/xinput-imhangulahn" imhangulahn.conf
+	newins "${FILESDIR}/xinput-imhangulro" imhangulro.conf
+
+	dodoc imhangul.conf
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_query_immodules_gtk2
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	gnome2_query_immodules_gtk2
+}
diff --git a/app-i18n/imhangul/imhangul-3.1.1.ebuild b/app-i18n/imhangul/imhangul-3.1.1.ebuild
new file mode 100644
index 000000000000..1cebdc2d5fc8
--- /dev/null
+++ b/app-i18n/imhangul/imhangul-3.1.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Gtk+-3.0 Hangul Input Modules"
+HOMEPAGE="https://code.google.com/p/imhangul/"
+SRC_URI="https://imhangul.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="3"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/libhangul-0.0.12
+	x11-libs/gtk+:3
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	default
+
+	# Drop DEPRECATED flags, bug #387825
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' Makefile.am Makefile.in || die
+}
+
+src_configure() {
+	econf --with-gtk-im-module-dir="${EPREFIX}/usr/$(get_libdir)/gtk-3.0/$(pkg-config gtk+-3.0 --variable=gtk_binary_version)/immodules"
+}
+
+src_install() {
+	default
+	dodoc imhangul.conf
+
+	insinto /etc/X11/xinit/xinput.d
+	newins "${FILESDIR}/xinput-imhangul2" imhangul2.conf
+	newins "${FILESDIR}/xinput-imhangul2y" imhangul2y.conf
+	newins "${FILESDIR}/xinput-imhangul32" imhangul32.conf
+	newins "${FILESDIR}/xinput-imhangul39" imhangul39.conf
+	newins "${FILESDIR}/xinput-imhangul3f" imhangul3f.conf
+	newins "${FILESDIR}/xinput-imhangul3s" imhangul3s.conf
+	newins "${FILESDIR}/xinput-imhangul3y" imhangul3y.conf
+	newins "${FILESDIR}/xinput-imhangulahn" imhangulahn.conf
+	newins "${FILESDIR}/xinput-imhangulro" imhangulro.conf
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_query_immodules_gtk3
+	elog ""
+	elog "If you want to use one of the module as a default input method, "
+	elog ""
+	elog "export GTK_IM_MODULE=hangul2  # 2 input type"
+	elog "export GTK_IM_MODULE=hangul3f # 3 input type"
+	elog ""
+}
+
+pkg_postrm() {
+	gnome2_query_immodules_gtk3
+}
diff --git a/app-i18n/imhangul/metadata.xml b/app-i18n/imhangul/metadata.xml
new file mode 100644
index 000000000000..da6b3414b7d8
--- /dev/null
+++ b/app-i18n/imhangul/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">imhangul</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/imsettings-1.7.2 b/app-i18n/imsettings-1.7.2
deleted file mode 100644
index e807caa12b27..000000000000
--- a/app-i18n/imsettings-1.7.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/glib:2 sys-apps/dbus virtual/libintl x11-libs/libX11 x11-libs/libgxim x11-libs/libnotify gconf? ( gnome-base/gconf ) gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) xfconf? ( xfce-base/xfconf ) dev-util/intltool sys-devel/autoconf-archive sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Delivery framework for general Input Method configuration
-EAPI=6
-HOMEPAGE=https://tagoh.bitbucket.io/imsettings
-IUSE=gconf gtk2 qt5 +introspection static-libs xfconf
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib:2 sys-apps/dbus virtual/libintl x11-libs/libX11 x11-libs/libgxim x11-libs/libnotify gconf? ( gnome-base/gconf ) gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) xfconf? ( xfce-base/xfconf )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://bitbucket.org/tagoh/imsettings/downloads/imsettings-1.7.2.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=118ca0587cc40d0c02576ae25d099e81
diff --git a/app-i18n/imsettings/Manifest b/app-i18n/imsettings/Manifest
new file mode 100644
index 000000000000..7f1be53aa5a2
--- /dev/null
+++ b/app-i18n/imsettings/Manifest
@@ -0,0 +1,3 @@
+DIST imsettings-1.7.2.tar.bz2 595754 BLAKE2B 9964ab7ca842a7e1b9e9c61434275b55d6a58e271dd12058195573aa65c623d5152a04bc893b3ac4d983c4798bd6f4e8cdb486577be45ec43db6600f72c8cc3b SHA512 b28d67705d3d6a0ec95babaca616f750b73cdac5e01ed61e25a6527fd7f816a14654cd7233eca56d7427b9395e7ad75757b95cd7bd55c56bbdc145a3f8bfe1f0
+EBUILD imsettings-1.7.2.ebuild 1770 BLAKE2B d78b7c6e84254ca09b26782499bd0fd043575d60705a760628b60ea02aa306ec26dfd0c7fb7e6dd911ccef5e12cc91905b8a77f9ddaade1c16f46f479ea1e6ed SHA512 c091b4a0eb1949c45422f3eb11483b66db365172e1e380cb864bc6ed90e75e599ae743d72ec416518780420c988eded857d4dbd4c1a688fda3089181d5a4fd9c
+MISC metadata.xml 618 BLAKE2B c16dbfede5fb6a394335483488c6bc195020c4161278088f7f44d82506f5e4b6e8afac64747098b703200b83b6ee8d7f18b790b5b2cb79e71647e0e6025e8820 SHA512 029b4a98d5fb139a0f504161627461e227b58a712d578aeba4da9deb2c5ae04a78a83a1cf42c0966315d6c43db860f64ac7f6a38a22ae3e4d87b2960fde14301
diff --git a/app-i18n/imsettings/imsettings-1.7.2.ebuild b/app-i18n/imsettings/imsettings-1.7.2.ebuild
new file mode 100644
index 000000000000..bc89ae3d0896
--- /dev/null
+++ b/app-i18n/imsettings/imsettings-1.7.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools ltprune xdg-utils
+
+DESCRIPTION="Delivery framework for general Input Method configuration"
+HOMEPAGE="https://tagoh.bitbucket.io/imsettings"
+SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gconf gtk2 qt5 +introspection static-libs xfconf"
+RESTRICT="test"
+
+RDEPEND="dev-libs/glib:2
+	sys-apps/dbus
+	virtual/libintl
+	x11-libs/libX11
+	x11-libs/libgxim
+	x11-libs/libnotify
+	gconf? ( gnome-base/gconf )
+	gtk2? ( x11-libs/gtk+:2 )
+	!gtk2? ( x11-libs/gtk+:3 )
+	introspection? ( dev-libs/gobject-introspection )
+	xfconf? ( xfce-base/xfconf )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/autoconf-archive
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+MY_XINPUTSH="90-xinput"
+
+src_prepare() {
+	sed -i \
+		-e "/PKG_CHECK_MODULES/s/\(gconf-2\.0\)/$(usex gconf '\1' _)/" \
+		-e "/PKG_CHECK_MODULES/s/\(gtk+-2\.0\)/$(usex gtk2 '\1' _)/" \
+		-e "/PKG_CHECK_MODULES/s/\(gtk+-3\.0\)/$(usex !gtk2 '\1' _)/" \
+		-e "/PKG_CHECK_MODULES/s/\(check\)/_/" \
+		-e "/PKG_CHECK_MODULES/s/\(libxfconf-0\)/$(usex xfconf '\1' _)/" \
+		-e "s/use_qt=\"yes\"/use_qt=\"$(usex qt5)\"/" \
+		-e "/^GNOME_/d" \
+		-e "/^CFLAGS/s/\$WARN_CFLAGS/-Wall -Wmissing-prototypes/" \
+		configure.ac
+
+	default
+	eautoreconf
+	xdg_environment_reset
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--with-xinputsh=${MY_XINPUTSH}
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+
+	fperms 0755 /etc/X11/xinit/xinitrc.d/${MY_XINPUTSH}
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EPREFIX}"/etc/X11/xinit/xinputrc ]]; then
+		ln -sf xinput.d/xcompose.conf "${EPREFIX}"/etc/X11/xinit/xinputrc
+	fi
+}
diff --git a/app-i18n/imsettings/metadata.xml b/app-i18n/imsettings/metadata.xml
new file mode 100644
index 000000000000..094115428fb1
--- /dev/null
+++ b/app-i18n/imsettings/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <use>
+    <flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag>
+    <flag name="gtk2">
+      Build with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3
+     </flag>
+    <flag name="xfconf">Enable support for <pkg>xfce-base/xfconf</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="bitbucket">tagoh/imsettings</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/jfbterm-0.4.7-r4 b/app-i18n/jfbterm-0.4.7-r4
deleted file mode 100644
index 9178162b0833..000000000000
--- a/app-i18n/jfbterm-0.4.7-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses:0 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The J Framebuffer Terminal/Multilingual Enhancement with UTF-8 support
-EAPI=6
-HOMEPAGE=http://jfbterm.sourceforge.jp/
-IUSE=debug
-KEYWORDS=amd64 ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=media-fonts/unifont media-fonts/font-misc-misc media-fonts/intlfonts
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/jfbterm/13501/jfbterm-0.4.7.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e7549e908ef7da62778c54eef5105357
diff --git a/app-i18n/jfbterm/Manifest b/app-i18n/jfbterm/Manifest
new file mode 100644
index 000000000000..404525fd6be9
--- /dev/null
+++ b/app-i18n/jfbterm/Manifest
@@ -0,0 +1,7 @@
+AUX jfbterm-0.4.7-gentoo.patch 8279 BLAKE2B 47e7e75c13b42d5b62090857c0db22f2ec59eb626551793d93a5cf24898d66c01ffb515c6071014bd4e7f41f62ecb3957cf759686dddfad97e89cae8394853ef SHA512 42a709594300bd35d29bd86691ffe81895bdbc694e1618e1938520147612d2549a7242867fece1083eaf938109f008e2c1539ad70c335216f3aaa3806ab37293
+AUX jfbterm-0.4.7-no-kernel-headers.patch 522 BLAKE2B 73537d38256f2d3be7b0a82919f0930295a78d1acb61394e28d1f84e443010156df2a7751969efef7a5e909b558476d7dec108123e18f3ea0e37c18cef7373e4 SHA512 95c40607ee9e2c3d89b35fb36cbf2c72b1bc7b65f82858fa1c34c39f26b9dd599be342c14dc85504d7c48ecc6b4cdad76ab06cabec9ca008dea889fc891e2c4d
+AUX jfbterm-0.4.7-sigchld-debian.patch 455 BLAKE2B becf439bb5adefa40b36c8cc6a918c0ccd3925854f69048831762e3b3b2d38d780c844e856e1d705ce8ae4b66a8f8849e314b3daa5dc027d974d6f30c8817408 SHA512 b03667158fdc157a44a1ff093ba4f80e5ddc4e6054e61879bea77fdfb17715be536d83044f3aa8bf4e03b5d73fd7a091f7d4b4f7d73e5d1349da78ce8d84d542
+AUX jfbterm-0.4.7-wrong-inline-gcc5.patch 813 BLAKE2B 0af239eece0d36dd2754ef009707da1dfccc88dd5f7c73fbe740acb3d4b43bdd625e89f7573092ceee759d80e3038d355126d4fd32029d619108f378ce80f57d SHA512 f698efc9deebe91cde0a38b6a9a5a08f7f65d14d043e920fc48a5ebb94d2d59a04032a8f1ec0cdb68ae262d6dfb20e9d1da209866cdfba6ec9ac8a8e881ae725
+DIST jfbterm-0.4.7.tar.gz 104592 BLAKE2B 3432af1598f77db4edac3be962acd086dd215e3a261ffbca3462cb8632012f6b1920c73b4590eaed4a8016a18018a80645fdaee31cca69317b4a82ffda0cbc72 SHA512 267dc777c2a296731ac7e5fb89381891e26ac119be63c8889b0e194246a3ac03b1c4b50f7d9254221c2ab201a126da46d312946845ddaad82fcc718a76472dcc
+EBUILD jfbterm-0.4.7-r4.ebuild 1083 BLAKE2B 48d8ae78775b759220c12e571b612023267d8ccd0ec05d1096155047344de14ef4630592ccaee9ca2e3d7eee0ec94d6d95863e927060eebc66b9e00b2400c5b2 SHA512 9b2fb3bd864334919113c3cd7e726bc25ae7ee6f18cd0fcba0abcab21cb866eea146fac6d4957c9d7adb7abfcf20dc3f1939e0a1f10d5c9a96cbc7dfe7a3c292
+MISC metadata.xml 656 BLAKE2B 6d64597548095f7bd1bbd619ae4cda06594c2e37ec7978d6d0ca5f458572d70831eb906a4beef83f5e81b1338a7879d8d959a4a19a3a1f8d73f9c81abdff22c4 SHA512 4f0d181b60132e8030e4596c78121eb54362da35a33135fbd3458aa61aaaa6a085a2c0700735497e428eb3c35dada3db327adc7c10fbe1301187f7aeca83f7f9
diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch b/app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch
new file mode 100644
index 000000000000..8dc8bc097b05
--- /dev/null
+++ b/app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch
@@ -0,0 +1,144 @@
+diff -Naur jfbterm-0.4.7.orig/fbcommon.c jfbterm-0.4.7/fbcommon.c
+--- jfbterm-0.4.7.orig/fbcommon.c	2003-09-03 00:23:17.000000000 +0900
++++ jfbterm-0.4.7/fbcommon.c	2007-08-18 10:55:30.000000000 +0900
+@@ -46,7 +46,6 @@
+ #endif
+ #include <linux/vt.h>
+ #include <linux/fb.h>
+-#include <asm/page.h>
+ 
+ #include "mytypes.h"
+ #include "fbcommon.h"
+@@ -475,6 +474,9 @@
+ 			perror("ioctl FBIOGET_CON2FBMAP");
+ 			c2m.framebuffer = 0;
+ 		}
++		if (-1 == c2m.framebuffer) {
++			c2m.framebuffer = 0;
++		}
+ 		close(fd);
+ 		snprintf(fbdn, 15, "/dev/fb%d", c2m.framebuffer);
+ 	}
+diff -Naur jfbterm-0.4.7.orig/jfbterm.conf.sample jfbterm-0.4.7/jfbterm.conf.sample
+--- jfbterm-0.4.7.orig/jfbterm.conf.sample	2003-09-16 00:16:35.000000000 +0900
++++ jfbterm-0.4.7/jfbterm.conf.sample	2007-08-18 10:19:00.000000000 +0900
+@@ -19,29 +19,29 @@
+ #	Absolute path or relative path to PWD
+ #
+ ###############################################################################
+-fontset : iso646-1973irv,pcf,L,/usr/X11R6/lib/X11/fonts/misc/8x16.pcf.gz
++fontset : iso646-1973irv,pcf,L,/usr/share/fonts/misc/8x16.pcf.gz
+ +fontset: ansix3.4-1968,alias,L,iso646-1973irv
+-+fontset: jisc6226-1978,pcf,L,/usr/X11R6/lib/X11/fonts/misc/jiskan16.pcf.gz
+++fontset: jisc6226-1978,pcf,L,/usr/share/fonts/misc/jiskan16.pcf.gz
+ +fontset: jisx0208-1983,alias,L,jisc6226-1978
+-+fontset: jisc6220-1969roman,pcf,L,/usr/X11R6/lib/X11/fonts/misc/a18rk.pcf.gz
+++fontset: jisc6220-1969roman,pcf,L,/usr/share/fonts/intlfonts/a18rk.pcf.gz
+ +fontset: jisc6220-1969kana,alias,R,jisc6220-1969roman
+-+fontset: jisx0212-1990,pcf,L,/usr/X11R6/lib/X11/fonts/misc/jksp16.pcf.gz
+-+fontset: gb2312-80,pcf,L,/usr/X11R6/lib/X11/fonts/misc/gb16fs.pcf.gz
+-+fontset: ksc5601-1987,pcf,L,/usr/X11R6/lib/X11/fonts/misc/hanglg16.pcf.gz
+-+fontset: iso8859.1-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x16.pcf.gz
+-+fontset: iso8859.2-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt2-16-etl.pcf.gz
+-+fontset: iso8859.3-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt3-16-etl.pcf.gz
+-+fontset: iso8859.4-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt4-16-etl.pcf.gz
+-+fontset: iso8859.5-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/cyr16-etl.pcf.gz
+-+fontset: iso8859.7-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/grk16-etl.pcf.gz
+-+fontset: iso8859.8-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/heb16-etl.pcf.gz
+-+fontset: iso8859.9-1989,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt5-16-etl.pcf.gz
+-+fontset: iso8859.10-1992,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-10.pcf.gz
+-+fontset: iso8859.13-1998,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-13.pcf.gz
+-+fontset: iso8859.14-1998,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-14.pcf.gz
+-+fontset: iso8859.15-1999,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-15.pcf.gz
+++fontset: jisx0212-1990,pcf,L,/usr/share/fonts/intlfonts/jksp16.pcf.gz
+++fontset: gb2312-80,pcf,L,/usr/share/fonts/misc/gb16fs.pcf.gz
+++fontset: ksc5601-1987,pcf,L,/usr/share/fonts/misc/hanglg16.pcf.gz
+++fontset: iso8859.1-1987,pcf,R,/usr/share/fonts/misc/8x16.pcf.gz
+++fontset: iso8859.2-1987,pcf,R,/usr/share/fonts/intlfonts/lt2-16-etl.pcf.gz
+++fontset: iso8859.3-1988,pcf,R,/usr/share/fonts/intlfonts/lt3-16-etl.pcf.gz
+++fontset: iso8859.4-1988,pcf,R,/usr/share/fonts/intlfonts/lt4-16-etl.pcf.gz
+++fontset: iso8859.5-1988,pcf,R,/usr/share/fonts/intlfonts/cyr16-etl.pcf.gz
+++fontset: iso8859.7-1987,pcf,R,/usr/share/fonts/intlfonts/grk16-etl.pcf.gz
+++fontset: iso8859.8-1988,pcf,R,/usr/share/fonts/intlfonts/heb16-etl.pcf.gz
+++fontset: iso8859.9-1989,pcf,R,/usr/share/fonts/intlfonts/lt5-16-etl.pcf.gz
+++fontset: iso8859.10-1992,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-10.pcf.gz
+++fontset: iso8859.13-1998,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-13.pcf.gz
+++fontset: iso8859.14-1998,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-14.pcf.gz
+++fontset: iso8859.15-1999,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-15.pcf.gz
+ +fontset: vt100-graphics,pcf,L,/usr/share/fonts/jfbterm/vt100-graphics.pcf.gz
+-+fontset: iso10646.1,pcf,U,/usr/X11R6/lib/X11/fonts/misc/unifont.pcf.gz
+++fontset: iso10646.1,pcf,U,/usr/share/fonts/unifont/unifont.pcf.gz
+ 
+ 
+ ###############################################################################
+diff -Naur jfbterm-0.4.7.orig/jfbterm.conf.sample.ja jfbterm-0.4.7/jfbterm.conf.sample.ja
+--- jfbterm-0.4.7.orig/jfbterm.conf.sample.ja	2003-09-16 00:16:35.000000000 +0900
++++ jfbterm-0.4.7/jfbterm.conf.sample.ja	2007-08-18 10:19:11.000000000 +0900
+@@ -25,29 +25,29 @@
+ #	ÀäÂХѥ¹ or PWD¤«¤é¤ÎÁêÂХѥ¹
+ #
+ ################################################################################
+-fontset : iso646-1973irv,pcf,L,/usr/X11R6/lib/X11/fonts/misc/8x16.pcf.gz
++fontset : iso646-1973irv,pcf,L,/usr/share/fonts/misc/8x16.pcf.gz
+ +fontset: ansix3.4-1968,alias,L,iso646-1973irv
+-+fontset: jisc6226-1978,pcf,L,/usr/X11R6/lib/X11/fonts/misc/jiskan16.pcf.gz
+++fontset: jisc6226-1978,pcf,L,/usr/share/fonts/misc/jiskan16.pcf.gz
+ +fontset: jisx0208-1983,alias,L,jisc6226-1978
+-+fontset: jisc6220-1969roman,pcf,L,/usr/X11R6/lib/X11/fonts/misc/a18rk.pcf.gz
+++fontset: jisc6220-1969roman,pcf,L,/usr/share/fonts/intlfonts/a18rk.pcf.gz
+ +fontset: jisc6220-1969kana,alias,R,jisc6220-1969roman
+-+fontset: jisx0212-1990,pcf,L,/usr/X11R6/lib/X11/fonts/misc/jksp16.pcf.gz
+-+fontset: gb2312-80,pcf,L,/usr/X11R6/lib/X11/fonts/misc/gb16fs.pcf.gz
+-+fontset: ksc5601-1987,pcf,L,/usr/X11R6/lib/X11/fonts/misc/hanglg16.pcf.gz
+-+fontset: iso8859.1-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x16.pcf.gz
+-+fontset: iso8859.2-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt2-16-etl.pcf.gz
+-+fontset: iso8859.3-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt3-16-etl.pcf.gz
+-+fontset: iso8859.4-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt4-16-etl.pcf.gz
+-+fontset: iso8859.5-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/cyr16-etl.pcf.gz
+-+fontset: iso8859.7-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/grk16-etl.pcf.gz
+-+fontset: iso8859.8-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/heb16-etl.pcf.gz
+-+fontset: iso8859.9-1989,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt5-16-etl.pcf.gz
+-+fontset: iso8859.10-1992,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-10.pcf.gz
+-+fontset: iso8859.13-1998,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-13.pcf.gz
+-+fontset: iso8859.14-1998,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-14.pcf.gz
+-+fontset: iso8859.15-1999,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-15.pcf.gz
+++fontset: jisx0212-1990,pcf,L,/usr/share/fonts/intlfonts/jksp16.pcf.gz
+++fontset: gb2312-80,pcf,L,/usr/share/fonts/misc/gb16fs.pcf.gz
+++fontset: ksc5601-1987,pcf,L,/usr/share/fonts/misc/hanglg16.pcf.gz
+++fontset: iso8859.1-1987,pcf,R,/usr/share/fonts/misc/8x16.pcf.gz
+++fontset: iso8859.2-1987,pcf,R,/usr/share/fonts/intlfonts/lt2-16-etl.pcf.gz
+++fontset: iso8859.3-1987,pcf,R,/usr/share/fonts/intlfonts/lt3-16-etl.pcf.gz
+++fontset: iso8859.4-1988,pcf,R,/usr/share/fonts/intlfonts/lt4-16-etl.pcf.gz
+++fontset: iso8859.5-1988,pcf,R,/usr/share/fonts/intlfonts/cyr16-etl.pcf.gz
+++fontset: iso8859.7-1987,pcf,R,/usr/share/fonts/intlfonts/grk16-etl.pcf.gz
+++fontset: iso8859.8-1988,pcf,R,/usr/share/fonts/intlfonts/heb16-etl.pcf.gz
+++fontset: iso8859.9-1989,pcf,R,/usr/share/fonts/intlfonts/lt5-16-etl.pcf.gz
+++fontset: iso8859.10-1992,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-10.pcf.gz
+++fontset: iso8859.13-1998,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-13.pcf.gz
+++fontset: iso8859.14-1998,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-14.pcf.gz
+++fontset: iso8859.15-1999,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-15.pcf.gz
+ +fontset: vt100-graphics,pcf,L,/usr/share/fonts/jfbterm/vt100-graphics.pcf.gz
+-+fontset: iso10646.1,pcf,L,/usr/X11R6/lib/X11/fonts/misc/unifont.pcf.gz
+++fontset: iso10646.1,pcf,L,/usr/share/fonts/unifont/unifont.pcf.gz
+ 
+ ################################################################################
+ #
+diff -Naur jfbterm-0.4.7.orig/util.h jfbterm-0.4.7/util.h
+--- jfbterm-0.4.7.orig/util.h	2003-09-16 00:45:31.000000000 +0900
++++ jfbterm-0.4.7/util.h	2007-08-18 08:48:49.000000000 +0900
+@@ -31,6 +31,7 @@
+ 
+ #include <sys/types.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ 
+ void util_privilege_init();
+ void util_privilege_on();
+@@ -49,4 +50,7 @@
+ 
+ int util_search_string(const char* s, const char** array);
+ 
++#define PAGE_SIZE (sysconf(_SC_PAGESIZE))
++#define PAGE_MASK (~(PAGE_SIZE-1))
++
+ #endif /* INCLUDE_UTIL_H */
diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-no-kernel-headers.patch b/app-i18n/jfbterm/files/jfbterm-0.4.7-no-kernel-headers.patch
new file mode 100644
index 000000000000..06c6e6033488
--- /dev/null
+++ b/app-i18n/jfbterm/files/jfbterm-0.4.7-no-kernel-headers.patch
@@ -0,0 +1,17 @@
+Remove usage of kernel headers, deprecated since linux-headers-2.6.18.
+Patch by Shunichi Fuji <palgowr@gmail.com>.
+
+See bug #156306
+
+--- jfbterm-0.4.7.orig/fbdpsp.c	2003-08-30 03:48:16.000000000 +0900
++++ jfbterm-0.4.7/fbdpsp.c	2006-11-27 01:22:20.000000000 +0900
+@@ -827,8 +827,7 @@
+ 
+ #ifdef JFB_VGA16FB
+ 
+-#include <asm/io.h>
+-#include <asm/system.h>
++#include <sys/io.h>
+ 
+ #define GRAPHICS_ADDR_REG 0x3ce         /* Graphics address register. */
+ #define GRAPHICS_DATA_REG 0x3cf         /* Graphics data register. */
diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-sigchld-debian.patch b/app-i18n/jfbterm/files/jfbterm-0.4.7-sigchld-debian.patch
new file mode 100644
index 000000000000..2e8036400770
--- /dev/null
+++ b/app-i18n/jfbterm/files/jfbterm-0.4.7-sigchld-debian.patch
@@ -0,0 +1,22 @@
+--- jfbterm-0.4.7.orig/main.c
++++ jfbterm-0.4.7/main.c
+@@ -184,7 +184,7 @@
+ 	p->gExecShellArgv = NULL;
+ 	p->gConfFile = FILE_JFBTERM_CONF;
+ 	p->gConfEncoding = NULL;
+-
++	signal(SIGCHLD, sigchld);
+ 	atexit(tapp_final_at_exit);
+ }
+ 
+--- jfbterm-0.4.7.orig/term.h
++++ jfbterm-0.4.7/term.h
+@@ -44,7 +44,7 @@
+ } TTerm;
+ 
+ void tterm_start(TTerm* p, const char* tn, const char* en);
+-
++void sigchld(int sig);
+ extern TTerm gTerm;
+ 
+ #endif /* INCLUDE_TERM_H */
diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-wrong-inline-gcc5.patch b/app-i18n/jfbterm/files/jfbterm-0.4.7-wrong-inline-gcc5.patch
new file mode 100644
index 000000000000..974ccbc41307
--- /dev/null
+++ b/app-i18n/jfbterm/files/jfbterm-0.4.7-wrong-inline-gcc5.patch
@@ -0,0 +1,24 @@
+Source: http://pkgs.fedoraproject.org/cgit/rpms/jfbterm.git/plain/jfbterm-0.4.7-wrong-inline-gcc5.patch
+
+--- jfbterm-0.4.7/pen.c.inline_gcc5	2003-08-30 03:48:16.000000000 +0900
++++ jfbterm-0.4.7/pen.c	2015-02-09 10:36:47.182751545 +0900
+@@ -62,7 +62,7 @@
+ 	p->attr = q->attr;
+ }
+ 
+-inline void tpen_off_all_attribute(TPen* p)
++void tpen_off_all_attribute(TPen* p)
+ {
+ 	p->bcol = 0;
+ 	p->fcol = 7;
+--- jfbterm-0.4.7/pen.h.inline_gcc5	2002-07-17 01:21:23.000000000 +0900
++++ jfbterm-0.4.7/pen.h	2015-02-09 10:36:52.058705503 +0900
+@@ -58,7 +58,7 @@
+ void tpen_init(TPen* p);
+ void tpen_final(TPen* p);
+ void tpen_copy(TPen* p, TPen* q);
+-inline void tpen_off_all_attribute(TPen* p);
++void tpen_off_all_attribute(TPen* p);
+ void tpen_higlight(TPen* p);
+ void tpen_dehiglight(TPen* p);
+ void tpen_underline(TPen* p);
diff --git a/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild b/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild
new file mode 100644
index 000000000000..93989a66a5ad
--- /dev/null
+++ b/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="The J Framebuffer Terminal/Multilingual Enhancement with UTF-8 support"
+HOMEPAGE="http://jfbterm.sourceforge.jp/"
+SRC_URI="mirror://sourceforge.jp/${PN}/13501/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE="debug"
+
+DEPEND="sys-libs/ncurses:0"
+RDEPEND="
+	media-fonts/unifont
+	media-fonts/font-misc-misc
+	media-fonts/intlfonts"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-sigchld-debian.patch
+	"${FILESDIR}"/${P}-no-kernel-headers.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-wrong-inline-gcc5.patch
+)
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_install() {
+	dodir /etc /usr/share/fonts/jfbterm
+	default
+
+	mv "${ED%/}"/etc/jfbterm.conf{.sample,} || die
+
+	doman jfbterm.1 jfbterm.conf.5
+
+	# install example config files
+	docinto examples
+	dodoc jfbterm.conf.sample*
+	docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/app-i18n/jfbterm/metadata.xml b/app-i18n/jfbterm/metadata.xml
new file mode 100644
index 000000000000..5393e0d29361
--- /dev/null
+++ b/app-i18n/jfbterm/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<longdescription lang="en">
+		JFBTERM/ME takes advantages of framebuffer device that is supported
+		since linux kernel 2.2.x (at least on ix86 architecture) and make it
+		enable to display multilingual text on console. Is is developed on
+		ix86 architecture, and it will works on other architectures such as
+		linux/ppc.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge-jp">jfbterm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/kakasi-2.3.4-r1 b/app-i18n/kakasi-2.3.4-r1
deleted file mode 100644
index 039f9317843f..000000000000
--- a/app-i18n/kakasi-2.3.4-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Converts Japanese text between kanji, kana, and romaji
-EAPI=5
-HOMEPAGE=http://kakasi.namazu.org/
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://kakasi.namazu.org/stable/kakasi-2.3.4.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=f18afdd73b9cc1a430576f7d9e892db6
diff --git a/app-i18n/kakasi/Manifest b/app-i18n/kakasi/Manifest
new file mode 100644
index 000000000000..ec9bc305c59e
--- /dev/null
+++ b/app-i18n/kakasi/Manifest
@@ -0,0 +1,3 @@
+DIST kakasi-2.3.4.tar.gz 1099258 BLAKE2B e3644e8688082df393ab3b1dc356b682b3ea4a66c46d33c3e3c65ffd882a357600ec99f017e72bea491ad7779cbbaa044479101322a14baccc5385edc20a7b22 SHA512 33fa17251ba00163f6d9df208f18c88ff2dfa9891320f1d00fc0c72686bbcc59cf3ccbfb76fa66dfb135a6e942ef4d5d907edc3f1ca9d380c5b7a7d4df090a66
+EBUILD kakasi-2.3.4-r1.ebuild 673 BLAKE2B f780cce1dd53eacc82af91c07491253c5e247146354b5c0a65583bc8d45d93ab82daec72ab256e47da0001cc90201f35c3f1937ac5e600378482c8a7f92b7ac6 SHA512 576985a2f42108834561487fc7b9cc3f5a3b31081568ba942ed828910b3b548df450248b8fe6692a8de8e6cceadec8081dc0394a9b12a81e0a04f3730055d485
+MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-i18n/kakasi/kakasi-2.3.4-r1.ebuild b/app-i18n/kakasi/kakasi-2.3.4-r1.ebuild
new file mode 100644
index 000000000000..85a0155e3f52
--- /dev/null
+++ b/app-i18n/kakasi/kakasi-2.3.4-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Converts Japanese text between kanji, kana, and romaji"
+HOMEPAGE="http://kakasi.namazu.org/"
+SRC_URI="http://kakasi.namazu.org/stable/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doman doc/kakasi.1
+	dodoc AUTHORS ChangeLog NEWS ONEWS README README-ja THANKS TODO
+	dodoc doc/ChangeLog.lib doc/JISYO doc/README.lib
+}
diff --git a/app-i18n/kakasi/metadata.xml b/app-i18n/kakasi/metadata.xml
new file mode 100644
index 000000000000..c921b96adf6c
--- /dev/null
+++ b/app-i18n/kakasi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-i18n/kanjipad-2.0.0 b/app-i18n/kanjipad-2.0.0
deleted file mode 100644
index bb6e553f3d7f..000000000000
--- a/app-i18n/kanjipad-2.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/gtk+:2 dev-libs/glib:2 virtual/pkgconfig
-DESCRIPTION=Japanese handwriting recognition tool
-EAPI=6
-HOMEPAGE=https://fishsoup.net/software/kanjipad/
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 dev-libs/glib:2
-SLOT=0
-SRC_URI=https://fishsoup.net/software/kanjipad/kanjipad-2.0.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8a17b0083fcf760760b1164b40b92c77
diff --git a/app-i18n/kanjipad/Manifest b/app-i18n/kanjipad/Manifest
new file mode 100644
index 000000000000..e9463a954026
--- /dev/null
+++ b/app-i18n/kanjipad/Manifest
@@ -0,0 +1,5 @@
+AUX kanjipad-2.0.0-cflags.patch 613 BLAKE2B bae1e330b7256a81b0ed3bf79fd3a778e55ce8c21fe6a63bed07ed90d33383ff0c4b8edb5eb0f11e930d498ee302886fe8127162de5c4d9f4f9f7c1868c92aa0 SHA512 2164e5ff2202cd4314ee2d8dcc98f6d428748c3c62251c89daae83466a4a4b59bb08655d1bd98a5725569e680f1cfc25f3cd971919d3ffa20c78d38dd895b402
+AUX kanjipad-2.0.0-underlinking.patch 449 BLAKE2B 2ff743dc0bf407a499b181295e747c1327361dcf5f0ab63f91544ddce5aa73bbe16b1acfe85c1b4aa28ae88268f32d5b52e87947686bca10301c21b30413852e SHA512 78c510337dfe2ed1bff81bbdd6195b6e76e97aac4b1a634b8cf29590eac9d70ddf7b720ad9fe6cfcb9c01e3697d3c6def382d8693902369a2be9531440daf95c
+DIST kanjipad-2.0.0.tar.gz 75930 BLAKE2B 032031a30ed294d2e1951e0cc123b599db2f34fe7ad7714200107644167e69b57e292ec1fd0af30bb354516a9eb27bbff5aeb4055319c98a690ed53ee002cc96 SHA512 66a38597358f97a9b43c3d1f4a9d6cf583b6158350131bae3b4d47edb167877def8eff4dde666c41549accb54c7256e08403985bb06d56758050a46d5b471ef6
+EBUILD kanjipad-2.0.0.ebuild 878 BLAKE2B cddc79498081d19e7b086ee4be2f6d3aafc41511d6395a4dd18f103bdd58f0b4dfc6bebe4a8fc5644e037d0fadef56dd6b2eb0aa33dae94c64ea6acc5e86691f SHA512 3a25a5ed9e2cfc17701fc58ae4ac9c8d51bf2804635c7bb045d585bd6d385c12d51ee34ad06bcb1a73b555c24d8b5eec60e133d18a23b7eebd4e312476c0a1c1
+MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-i18n/kanjipad/files/kanjipad-2.0.0-cflags.patch b/app-i18n/kanjipad/files/kanjipad-2.0.0-cflags.patch
new file mode 100644
index 000000000000..b1a6786bf17a
--- /dev/null
+++ b/app-i18n/kanjipad/files/kanjipad-2.0.0-cflags.patch
@@ -0,0 +1,19 @@
+diff --git a/Makefile b/Makefile
+index 4869923..0f7509c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,4 @@
+-OPTIMIZE=-g -Wall
++OPTIMIZE=-Wall
+ #OPTIMIZE=-O2 
+ 
+ GTKINC=$(shell pkg-config --cflags gtk+-2.0) -DG_DISABLE_DEPRECATED  -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
+@@ -26,7 +26,7 @@ PACKAGE = kanjipad
+ VERSION = 2.0.0
+ 
+ OBJS = kpengine.o scoring.o util.o
+-CFLAGS = $(OPTIMIZE) $(GTKINC) -DFOR_PILOT_COMPAT -DKP_LIBDIR=\"$(LIBDIR)\" -DBINDIR=\"$(BINDIR)\"
++CFLAGS += $(OPTIMIZE) $(GTKINC) -DFOR_PILOT_COMPAT -DKP_LIBDIR=\"$(LIBDIR)\" -DBINDIR=\"$(BINDIR)\"
+ 
+ all: kpengine kanjipad jdata.dat
+ 
diff --git a/app-i18n/kanjipad/files/kanjipad-2.0.0-underlinking.patch b/app-i18n/kanjipad/files/kanjipad-2.0.0-underlinking.patch
new file mode 100644
index 000000000000..26fbcd765119
--- /dev/null
+++ b/app-i18n/kanjipad/files/kanjipad-2.0.0-underlinking.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 7e67d30..5bf53ba 100644
+--- a/Makefile
++++ b/Makefile
+@@ -40,7 +40,7 @@ kpengine: $(OBJS)
+ 	$(CC) -o kpengine $(OBJS) $(GLIBLIBS) $(LDFLAGS)
+ 
+ kanjipad: kanjipad.o padarea.o
+-	$(CC) -o kanjipad kanjipad.o padarea.o $(GTKLIBS) $(LDFLAGS)
++	$(CC) -o kanjipad kanjipad.o padarea.o -lm $(GTKLIBS) $(LDFLAGS)
+ 
+ jdata.dat: jstroke/strokedata.h conv_jdata.pl
+ 	perl conv_jdata.pl < jstroke/strokedata.h > jdata.dat
diff --git a/app-i18n/kanjipad/kanjipad-2.0.0.ebuild b/app-i18n/kanjipad/kanjipad-2.0.0.ebuild
new file mode 100644
index 000000000000..82d47a93e351
--- /dev/null
+++ b/app-i18n/kanjipad/kanjipad-2.0.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Japanese handwriting recognition tool"
+HOMEPAGE="https://fishsoup.net/software/kanjipad/"
+SRC_URI="https://fishsoup.net/software/kanjipad/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	dev-libs/glib:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog README TODO jstroke/README-kanjipad )
+
+PATCHES=(
+	"${FILESDIR}/${P}-cflags.patch"
+	"${FILESDIR}/${P}-underlinking.patch"
+)
+
+src_prepare() {
+	default
+	perl -i -pe "s|PREFIX=/usr/local|PREFIX=/usr|;
+		s|-DG.*DISABLE_DEPRECATED||g" Makefile || die "Fixing Makefile failed"
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin kanjipad kpengine
+	insinto /usr/share/kanjipad
+	doins jdata.dat
+	einstalldocs
+}
diff --git a/app-i18n/kanjipad/metadata.xml b/app-i18n/kanjipad/metadata.xml
new file mode 100644
index 000000000000..c921b96adf6c
--- /dev/null
+++ b/app-i18n/kanjipad/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-i18n/kcc-1.0 b/app-i18n/kcc-1.0
deleted file mode 100644
index 1c46665772b1..000000000000
--- a/app-i18n/kcc-1.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=A Kanji code converter
-EAPI=4
-HOMEPAGE=http://www2s.biglobe.ne.jp/~Nori/ruby/
-KEYWORDS=~amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=ftp://ftp.jp.freebsd.org/pub/FreeBSD/ports/distfiles/kcc.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cbab9c5e06878788ef553719524680e1
diff --git a/app-i18n/kcc/Manifest b/app-i18n/kcc/Manifest
new file mode 100644
index 000000000000..e1a351a221f4
--- /dev/null
+++ b/app-i18n/kcc/Manifest
@@ -0,0 +1,5 @@
+AUX kcc-exit.diff 161 BLAKE2B 48570ac2b258a9567e9dad4075a248f5a4d685225e4f676322a3430ef43764b95d5d36fac5f68ba6de1537b59d6750be8111ea79407019debf9f3928f069427e SHA512 8ee69339db13935d54562189e86941384dc5c01caa30e4efba11e783690b863a1210a5e841ab8a5ac907af9002ac6debd3516a6928f15777a8b31c2089907214
+AUX kcc-gcc3-gentoo.diff 1026 BLAKE2B e7db744d0ce7b34e5686f5e5d256eb16def94cdf83aaeac1d21a77831c7b21df3852b50313af79a570a2fe21ca24dbcdc545d9f9afa498cbb78a9a867261f5c6 SHA512 59c57ee4c34e27b8a0558896e5a94b21f976351e0cd372bc9bd85ac83757276eecdcabd81e4fb02b6f2513e06542d63bcf656140d5407a0e2804f04d5ab55303
+DIST kcc.tar.gz 18869 BLAKE2B 122e6e749a0cc6a63244d32d735a23ea3bdc6ce81e90674d4aa8c6460b57c631e504490454710601a3e057c413d5579495533320f37820d4c3afd9053325c1dc SHA512 2ec1645bb7edbe49c6845cd6e6794568bd48efec367d2d9628ddb8a72d2b5edd590be101f4d9c8856764ae85c9aad7b0adf69601b78fddffdc23235b96f65145
+EBUILD kcc-1.0.ebuild 719 BLAKE2B 12e16f98ff4a63dba5f5f1258f42d7f489fb7ed20b1d67bb8113d8796ba624655369ced9152ed31cb35a14219e2c29fa8bd658e8088e4a8e1a3aa3b5f5acb87d SHA512 be0ae39180e876b6b7a64f5e45e82d88ab8e5276f6662954b807c5082169982344b096c79f08fc820f25717438a6e0bbfba4f32f690fd2df27b62dde904e9450
+MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/kcc/files/kcc-exit.diff b/app-i18n/kcc/files/kcc-exit.diff
new file mode 100644
index 000000000000..478977a88256
--- /dev/null
+++ b/app-i18n/kcc/files/kcc-exit.diff
@@ -0,0 +1,10 @@
+--- a/kcc.c
++++ b/kcc.c
+@@ -27,6 +27,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
diff --git a/app-i18n/kcc/files/kcc-gcc3-gentoo.diff b/app-i18n/kcc/files/kcc-gcc3-gentoo.diff
new file mode 100644
index 000000000000..88f08e20161d
--- /dev/null
+++ b/app-i18n/kcc/files/kcc-gcc3-gentoo.diff
@@ -0,0 +1,47 @@
+--- a/kcc.c
++++ b/kcc.c
+@@ -134,7 +134,11 @@
+ extern unsigned short hiragana[];
+ unsigned short *kanatbl = katakana;
+ 
++#ifdef __STDC__
++void error(char *format, ...);
++#else
+ void error();
++#endif
+ 
+ /**********************************************************************
+  *                                                                    *
+@@ -364,14 +368,30 @@
+     NAME
+ 	error - print formatted error message on stderr and die
+  ---------------------------------------------------------------------*/
++#ifdef __STDC__
++#include <stdarg.h>
++#else
+ #include <varargs.h>
++#endif
+ 
+-void error(va_alist)
+-    va_dcl
++void
++#ifdef __STDC__
++error(char *format, ...)
++#else
++error(va_alist) va_dcl
++#endif
+ {
+     va_list args;
+ 
++#ifdef __STDC__
++    va_start(args, format);
++#else
++    char *format;
++
+     va_start(args);
++    /* extract the fixed argument */
++    format = va_arg(args, char *);
++#endif
+     fprintf(stderr, "%s: ", progname);
+     vfprintf(stderr, va_arg(args, char *), args);
+     putc('\n', stderr);
diff --git a/app-i18n/kcc/kcc-1.0.ebuild b/app-i18n/kcc/kcc-1.0.ebuild
new file mode 100644
index 000000000000..bcb220713949
--- /dev/null
+++ b/app-i18n/kcc/kcc-1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A Kanji code converter"
+HOMEPAGE="http://www2s.biglobe.ne.jp/~Nori/ruby/"
+SRC_URI="ftp://ftp.jp.freebsd.org/pub/FreeBSD/ports/distfiles/${PN}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-gcc3-gentoo.diff"
+	epatch "${FILESDIR}/${PN}-exit.diff"
+	sed -i "s:\(-o kcc\):\$(LDFLAGS) \1:" Makefile
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin kcc
+	dodoc README
+	cp -f kcc.jman kcc.1 || die
+	doman -i18n=ja kcc.1
+}
diff --git a/app-i18n/kcc/metadata.xml b/app-i18n/kcc/metadata.xml
new file mode 100644
index 000000000000..e1a49f498885
--- /dev/null
+++ b/app-i18n/kcc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-i18n/kcm-fcitx-0.5.5 b/app-i18n/kcm-fcitx-0.5.5
deleted file mode 100644
index af97963ade05..000000000000
--- a/app-i18n/kcm-fcitx-0.5.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/fcitx-qt5-1.1:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knewstuff:5 kde-frameworks/kwidgetsaddons:5 virtual/libintl x11-libs/libX11 x11-libs/libxkbfile !app-i18n/kcm-fcitx:4[-minimal(-)] kde-frameworks/extra-cmake-modules:5 sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=KDE configuration module for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/kcm-fcitx
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/fcitx-qt5-1.1:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knewstuff:5 kde-frameworks/kwidgetsaddons:5 virtual/libintl x11-libs/libX11 x11-libs/libxkbfile !app-i18n/kcm-fcitx:4[-minimal(-)]
-SLOT=4-plasma5
-SRC_URI=https://download.fcitx-im.org/kcm-fcitx/kcm-fcitx-0.5.5.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6289fc09e49ed277a4e307d4b295e2f3
diff --git a/app-i18n/kcm-fcitx-4.5.9999 b/app-i18n/kcm-fcitx-4.5.9999
deleted file mode 100644
index 2c02ef1064fb..000000000000
--- a/app-i18n/kcm-fcitx-4.5.9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/fcitx-qt5-1.1:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knewstuff:5 kde-frameworks/kwidgetsaddons:5 virtual/libintl x11-libs/libX11 x11-libs/libxkbfile !app-i18n/kcm-fcitx:4[-minimal(-)] kde-frameworks/extra-cmake-modules:5 sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=KDE configuration module for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/kcm-fcitx
-LICENSE=GPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/fcitx-qt5-1.1:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knewstuff:5 kde-frameworks/kwidgetsaddons:5 virtual/libintl x11-libs/libX11 x11-libs/libxkbfile !app-i18n/kcm-fcitx:4[-minimal(-)]
-SLOT=4-plasma5
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e868ac963a7548a474ef0c7fd0deda95
diff --git a/app-i18n/kcm-fcitx/Manifest b/app-i18n/kcm-fcitx/Manifest
new file mode 100644
index 000000000000..0a65d04f79ce
--- /dev/null
+++ b/app-i18n/kcm-fcitx/Manifest
@@ -0,0 +1,4 @@
+DIST kcm-fcitx-0.5.5.tar.xz 63364 BLAKE2B e3b185468a4587c510e47bee4d7260d5d9ed27032174e3928ed3f008a68e8a4b9d124bda14a75348d65c41ddff2e39bb91d8a4f3663a81788850e5fb33740c8a SHA512 e6a7bcad10003a956389ee266cf6d2f3730dafafcdd0bb43de328397749775e5cd305f16fdca2365e246c903677dba042da81a6dfd873aa1be74174e2b0b372e
+EBUILD kcm-fcitx-0.5.5.ebuild 1203 BLAKE2B b6422b0196812806f1b7716cdb8f2e1fece5305b7e8eebe4734490060fd5fbd6eb271c3a377a91e60b9a6a7b93a329e7ea9ca246d63d2761d9345ec9e826b898 SHA512 234436e87f098dfb7d68bb3b4d65373973ae715d747808af111bf74717228d220ebf6262e5fa688f8a44a28bc94f315d4ce0a4ee5b49450e56769374fafd2c89
+EBUILD kcm-fcitx-4.5.9999.ebuild 1194 BLAKE2B 37affb25294a9496c252d3c1621bf73db21dd0758a2c39dbfd8bb6d700f9be4764c22d63583441a08ad2faed705ac72637c9661431666ded5d08c585ace63c77 SHA512 62907b0aeaa297a759d2d55c1073451af6023572f86f9ed9007bddc46830e2a757e71bbf0994a5750a14cee0df05a649cfdad964f89c06db2b1052c45e9b9ea6
+MISC metadata.xml 448 BLAKE2B e993e02967a27e6b0dbe9e55b6dd458bae6c06c1b31d07c7aeea6ab634591818f1b330b77d8c8977ac0c634fa9df63fe62e574088bff36c81e23d08c275f289e SHA512 384cdfaff47be5264ff02defb5a2f572efc752c63b370bd9ede3cd2bd61ad1d734a9c878263d1e418887635475504a3992069670702497cb92eb0bde0d2ab08b
diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
new file mode 100644
index 000000000000..e9d8466014b5
--- /dev/null
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/kcm-fcitx.git"
+fi
+
+DESCRIPTION="KDE configuration module for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/kcm-fcitx"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4-plasma5"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	>=app-i18n/fcitx-qt5-1.1:4
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	kde-frameworks/kconfigwidgets:5
+	kde-frameworks/kcoreaddons:5
+	kde-frameworks/ki18n:5
+	kde-frameworks/kio:5
+	kde-frameworks/kitemviews:5
+	kde-frameworks/knewstuff:5
+	kde-frameworks/kwidgetsaddons:5
+	virtual/libintl
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	!${CATEGORY}/${PN}:4[-minimal(-)]"
+DEPEND="${RDEPEND}
+	kde-frameworks/extra-cmake-modules:5
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDE_INSTALL_USE_QT_SYS_PATHS=yes
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
new file mode 100644
index 000000000000..c0dd64f9323d
--- /dev/null
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/fcitx/kcm-fcitx.git"
+fi
+
+DESCRIPTION="KDE configuration module for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/kcm-fcitx"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4-plasma5"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	>=app-i18n/fcitx-qt5-1.1:4
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	kde-frameworks/kconfigwidgets:5
+	kde-frameworks/kcoreaddons:5
+	kde-frameworks/ki18n:5
+	kde-frameworks/kio:5
+	kde-frameworks/kitemviews:5
+	kde-frameworks/knewstuff:5
+	kde-frameworks/kwidgetsaddons:5
+	virtual/libintl
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	!${CATEGORY}/${PN}:4[-minimal(-)]"
+DEPEND="${RDEPEND}
+	kde-frameworks/extra-cmake-modules:5
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDE_INSTALL_USE_QT_SYS_PATHS=yes
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/app-i18n/kcm-fcitx/metadata.xml b/app-i18n/kcm-fcitx/metadata.xml
new file mode 100644
index 000000000000..0b3021abdac5
--- /dev/null
+++ b/app-i18n/kcm-fcitx/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">fcitx/kcm-fcitx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/kde-l10n-scripts-9999 b/app-i18n/kde-l10n-scripts-9999
deleted file mode 100644
index d06c562258e4..000000000000
--- a/app-i18n/kde-l10n-scripts-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=prepare unpack
-DEPEND=app-crypt/md5deep app-i18n/pology app-shells/bash:* dev-vcs/subversion kde-apps/poxml >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Set of scripts to manage KDE translation files
-EAPI=6
-HOMEPAGE=https://github.com/vpelcak/kde-scripts
-LICENSE=LGPL-3
-RDEPEND=app-crypt/md5deep app-i18n/pology app-shells/bash:* dev-vcs/subversion kde-apps/poxml
-SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b
-_md5_=dae0efd5dc4fd33744993772faaca262
diff --git a/app-i18n/kde-l10n-scripts/Manifest b/app-i18n/kde-l10n-scripts/Manifest
new file mode 100644
index 000000000000..3d9983f0f1f7
--- /dev/null
+++ b/app-i18n/kde-l10n-scripts/Manifest
@@ -0,0 +1,2 @@
+EBUILD kde-l10n-scripts-9999.ebuild 619 BLAKE2B 1ce275421516e2b8e3662a2d9d61634a6bb2874863970ab8ffbcddc5b95b5c54d93f24e7403625997c2bc996ac1177bcd45b0203a2e4323e38f244ba96af5aba SHA512 f4a241d412869b834694c2cc9599cb9c52f80a56da59f1e775655542d94699afceb05657e8fe0d8208fd56f54a586ec1021fd41f6a053f640f011ac9cb422a26
+MISC metadata.xml 343 BLAKE2B ce85098ac5406810060066b49389decf383630311cadc863522e3b4025ab78d4d72af01c234ef48ddfd001813801f6f955385a61d37371f1e3e4584f5a1a7e33 SHA512 1b6e2b61708576ec63383b7479170fdddafdb5aa30f5f947c55df99c9cb365b51e0c271f78243a38699e87d770d911591a908c4337f8760d8f340219cb1f9268
diff --git a/app-i18n/kde-l10n-scripts/kde-l10n-scripts-9999.ebuild b/app-i18n/kde-l10n-scripts/kde-l10n-scripts-9999.ebuild
new file mode 100644
index 000000000000..4eca71e19ee6
--- /dev/null
+++ b/app-i18n/kde-l10n-scripts/kde-l10n-scripts-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Set of scripts to manage KDE translation files"
+HOMEPAGE="https://github.com/vpelcak/kde-scripts"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/vpelcak/kde-scripts.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	app-crypt/md5deep
+	app-i18n/pology
+	app-shells/bash:*
+	dev-vcs/subversion
+	kde-apps/poxml
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:/usr/local:${EPREFIX}/usr:" \
+		Makefile || die
+}
diff --git a/app-i18n/kde-l10n-scripts/metadata.xml b/app-i18n/kde-l10n-scripts/metadata.xml
new file mode 100644
index 000000000000..cf6e8a9090b6
--- /dev/null
+++ b/app-i18n/kde-l10n-scripts/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">vpelcak/kde-scripts</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/kinput2-3.1-r2 b/app-i18n/kinput2-3.1-r2
deleted file mode 100644
index b64af2560b69..000000000000
--- a/app-i18n/kinput2-3.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt !freewnn? ( app-i18n/canna ) freewnn? ( app-i18n/freewnn ) x11-misc/gccmakedep x11-misc/imake
-DESCRIPTION=A Japanese input server which supports the XIM protocol
-EAPI=6
-HOMEPAGE=http://www.nec.co.jp/canna
-IUSE=freewnn
-KEYWORDS=amd64 ppc ppc64 sparc x86
-LICENSE=HPND
-RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt !freewnn? ( app-i18n/canna ) freewnn? ( app-i18n/freewnn )
-SLOT=0
-SRC_URI=ftp://ftp.sra.co.jp/pub/x11/kinput2/kinput2-v3.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=57058f99f61d55f223e269591d7eec29
diff --git a/app-i18n/kinput2/Manifest b/app-i18n/kinput2/Manifest
new file mode 100644
index 000000000000..43051274f8ca
--- /dev/null
+++ b/app-i18n/kinput2/Manifest
@@ -0,0 +1,9 @@
+AUX kinput2-gentoo.patch 2900 BLAKE2B ead35f38fe2aeacdfc9f3b04e72591b0143785b8be74d4be099ab59bc205c0914a15315ff18457dcecf371cbc503bdbfa85c357ddf02e06e2b1f9c543961617b SHA512 22c38c2b344b18f545501e5e351f0952d2b317d05e87ba0630a9fba235e5111e3e269c42388a7495153f6a36a0277798039a35c1968889697b8e97e4e4e5bd4e
+AUX kinput2-headers.patch 2090 BLAKE2B b8c4e443dbf2b6c34020ef93b197c67c7ef67035a9014f47b3ddb0b8736fa149363f1745b789f922c45b370eb1e757c3623255790ec73767d7d30ff5b9dbaa98 SHA512 5f4839155d7d11784716c4c786b09184b04d68deaebd99fa2f446258017a893ad52e23f3df91a8827bfc8d4c238494ffdef9135c0959e7a2377947b96e5b4f7c
+AUX kinput2-ppc.patch 181 BLAKE2B 422c35f38af1e497b2ad012d4b184d4d61bddcd880a6f77052b7cb8d55e32a2ed78e49e4c09abdca35b3477567efdf1224bcc35c769622ad685db4d5bf20c085 SHA512 e5b5e851792668a8f4f15e45dcbf24336310f36c2be5a565dfffd25b58fadef04b92124fc2955342ed05ab467e8bff8fbf9d561a3553d7059155007df877dcde
+AUX kinput2-segfault.patch 240 BLAKE2B e8815bf5a3ca6b19fac492e51dea7faa98d3acacbd02f13cb816355c5f69a65f5618cc59e69b41d39eb32bc52bcc80f0b280ccfa52402e2dc2c96111335071f4 SHA512 c3441925e867edcc5060e79e0f999c0cfe60930d87ad8d51cb4120253dd9ab6ccfac7de0c04e3d7043100026bc67962bba81a507b037901c115a7559916eb1c5
+AUX kinput2-wnn.patch 1726 BLAKE2B 034b74ce8de370d2088dbd77ac61f3268c5b28537619985ed1ad6896d011ddff31c1b9523f38681e8461b935b01239697606f3106cad521e5d1dc55922f1d760 SHA512 a8ea7756ca893b0bdd7d491c8e2a4187c5d34b084c567449597b8fa1d9fb9ae4437bedba9d771a7b88a3e621573ce6650243dfa5ff396bebb653cbf4b6f5712b
+AUX xinput-kinput2 121 BLAKE2B 34d40a7874ee79faff6f602bb32d705efdeac28a3d0a2bf89c68ba8f6e771eacc5878faf8347de171e813384e3bfdb113dcba7229ce1b5ecf6b1a293a6516b00 SHA512 09aaae3bebb062db82e8440977f58b9324e53262c6a9c95a276d305e87a2f9c0f9775077bd05c6ea069cceb6e45cb4efc4a6c412da7501b2b01825bc26799ec5
+DIST kinput2-v3.1.tar.gz 512177 BLAKE2B d67ca132fe3054d862c80b03b4665cdc5f4089745d848f6af9309b5896e0931182bdeefc621fad1cb8f1fd3686b07106cd6df5e703b3623f926cf83d637fa5df SHA512 5950f7294fa2bf915e6591290a3deb2c95f27706f3a180a084d14fbc008f3cf363b155b29c8103a8b999e44ae98182ff35bcfda85725b2c565f3e37f54788731
+EBUILD kinput2-3.1-r2.ebuild 1602 BLAKE2B fb1af03451d193f4a253946c72dda53ebd7c1d556e09b334b55d6d166d45362d596b740a41a094863918cfabf719731b54b0a5e7a04cec69f2a8b4f5f2ad7123 SHA512 6a4d1b8e7f2dd97cbfcf67186e11b05c5867c97ebad98ae1264b54a2b46bc2abae15bb15b69b27bfa5c2ffa049968408e0574dceafa97a66cbd1fd395bd868b7
+MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/kinput2/files/kinput2-gentoo.patch b/app-i18n/kinput2/files/kinput2-gentoo.patch
new file mode 100644
index 000000000000..2c22723b3851
--- /dev/null
+++ b/app-i18n/kinput2/files/kinput2-gentoo.patch
@@ -0,0 +1,99 @@
+--- a/Kinput2.conf
++++ b/Kinput2.conf
+@@ -17,8 +17,8 @@
+ 
+ /* #define UseWnn */	/* define if you are going to use Wnn (v4, v6 or v7) */
+ /* #define UseWnn6 */	/* define if you are going to use Wnn6 or above */
+-#define UseCanna	/* define if you are going to use Canna */
+-#define UseSj3		/* define if you are going to use Sj3 */
++/* #define UseCanna */	/* define if you are going to use Canna */
++/* #define UseSj3 */	/* define if you are going to use Sj3 */
+ /* #define UseAtok */	/* define if you are going to use Atok */
+ 
+ 
+@@ -34,7 +34,7 @@
+  * You have to define WnnLibDir if Wnn4 configuration files
+  * are not installed in /usr/local/lib/wnn (which is the default).
+  */
+-/* #define WnnLibDir /some/peculiar/directory/wnn */
++#define WnnLibDir $(EPREFIX)/usr/lib/wnn 
+ 
+ /* for convenience.. */
+ #if defined(UseWnn6) && !defined(UseWnn)
+@@ -52,17 +52,17 @@
+  * WnnLibDir above.
+  */
+ XCOMM use installed header files
+-XCOMM WNNINCDIR = /usr/X11R6/include/wnn
++WNNINCDIR = $(EPREFIX)/usr/include/wnn
+ XCOMM use installed library
+-XCOMM WNNLIB = -lwnn
++WNNLIB = -lwnn
+ 
+ /*
+  * Or, use library in the source tree..
+  */
+ XCOMM use library in the source tree
+-WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn
+-WNNINCDIR = $(WNNSRC)/include
+-WNNLIB = $(WNNSRC)/jlib/libwnn.a
++XCOMM WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn
++XCOMM WNNINCDIR = $(WNNSRC)/include
++XCOMM WNNLIB = $(WNNSRC)/jlib/libwnn.a
+ 
+ 
+ XCOMM Canna configuration
+@@ -78,17 +78,17 @@
+  * If you have already installed Canna header files and libraries..
+  */
+ XCOMM use installed headers/libraries
+-XCOMM CANNAINSTDIR = /usr/local/canna
+-XCOMM CANNASRC = $(CANNAINSTDIR)/include
+-XCOMM CANNALIB = -lcanna16
++CANNAINSTDIR = $(EPREFIX)/usr
++CANNASRC = $(CANNAINSTDIR)/include
++CANNALIB = -lcanna16
+ 
+ /*
+  * If you have compiled Canna that came with X11R6 (contrib/programs/Canna),
+  * but not installed yet..
+  */
+ XCOMM use headers/libraries in the source tree
+-CANNASRC = $(CONTRIBSRC)/programs/Canna32
+-CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
++XCOMM CANNASRC = $(CONTRIBSRC)/programs/Canna32
++XCOMM CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
+ 
+ 
+ XCOMM SJ3 configuration
+@@ -100,7 +100,7 @@
+  *		   definition files are to be installed
+  */
+ 
+-SJ3DEF_DIR = $(LIBDIR)/sj3def
++XCOMM SJ3DEF_DIR = $(LIBDIR)/sj3def
+ 
+ /*
+  * If you have installed SJ3 library and header file,
+@@ -117,8 +117,8 @@
+  * Use compiled library in the source tree..
+  */
+ XCOMM use library in the source tree
+-SJ3SRC = $(CONTRIBSRC)/programs/sj3
+-SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a
++XCOMM SJ3SRC = $(CONTRIBSRC)/programs/sj3
++XCOMM SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a
+ 
+ 
+ XCOMM Atok configuration
+@@ -133,8 +133,8 @@
+  */
+ XCOMM use installed headers/libraries
+ XCOMM ATOKINCDIR = /usr/include/atok
+-XCOMM ATOKLIBDIR = /usr/jp/lib
+-ATOKLIB = -latok12n -latok12util
++XCOMM ATOKLIBDIR = /var/lib/atok
++XCOMM ATOKLIB = -latok12n -latok12util
+ 
+ 
+ /**
diff --git a/app-i18n/kinput2/files/kinput2-headers.patch b/app-i18n/kinput2/files/kinput2-headers.patch
new file mode 100644
index 000000000000..0075f710e9b6
--- /dev/null
+++ b/app-i18n/kinput2/files/kinput2-headers.patch
@@ -0,0 +1,101 @@
+--- a/cmd/kinput2.c
++++ b/cmd/kinput2.c
+@@ -25,6 +25,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <signal.h>
+ #include <X11/Intrinsic.h>
+ #include <X11/StringDefs.h>
+--- a/lib/Canna.c
++++ b/lib/Canna.c
+@@ -50,6 +50,7 @@
+ static char *rcsid = "$Id: Canna.c,v 1.55 1999/05/25 08:13:03 ishisone Exp $";
+ #endif
+ 
++#include <stdlib.h>
+ #include <X11/IntrinsicP.h>
+ #include <X11/StringDefs.h>
+ #include <X11/Xmu/Atoms.h>
+--- a/lib/CcWnn.c
++++ b/lib/CcWnn.c
+@@ -2754,6 +2754,7 @@
+     wchar wbuf[1024];
+     int wlen;
+     int len;
++    extern int convJWStoCT();
+ 
+     TRACE(("CcWnn:saveYomiAndKanji()\n"));
+ 
+--- a/lib/ConvCtrl.c
++++ b/lib/ConvCtrl.c
+@@ -18,6 +18,7 @@
+  * Author:  Makoto Ishisone, Software Research Associates, Inc., Japan
+  */
+ 
++#include <stdio.h>
+ #include <X11/IntrinsicP.h>
+ #include <X11/StringDefs.h>
+ #include <X11/Xmu/CharSet.h>
+--- a/lib/KIProto.c
++++ b/lib/KIProto.c
+@@ -18,6 +18,7 @@
+  * Author:  Makoto Ishisone, Software Research Associates, Inc., Japan
+  */
+ 
++#include <stdio.h>
+ #include <X11/IntrinsicP.h>
+ #include <X11/StringDefs.h>
+ #include <X11/Xatom.h>
+--- a/lib/XimpProto.c
++++ b/lib/XimpProto.c
+@@ -18,6 +18,7 @@
+  * Author:  Makoto Ishisone, Software Research Associates, Inc., Japan
+  */
+ 
++#include <stdio.h>
+ #include <X11/Xos.h>
+ #include <X11/IntrinsicP.h>
+ 
+--- a/lib/cconv.c
++++ b/lib/cconv.c
+@@ -604,6 +604,7 @@
+ #endif
+ 
+ #include	<stdio.h>
++#include	<stdlib.h>
+ #include	<X11/Xlib.h>
+ #include	<X11/keysym.h>
+ #include	<X11/Xutil.h>
+--- a/lib/ctext.c
++++ b/lib/ctext.c
+@@ -71,6 +71,8 @@
+ static char *rcsid = "$Id: ctext.c,v 2.6 1999/03/10 08:55:15 ishisone Exp $";
+ #endif
+ 
++#include <string.h>
++
+ typedef unsigned short	wchar;
+ 
+ #define NULL	0
+--- a/lib/ioecall.c
++++ b/lib/ioecall.c
+@@ -23,6 +23,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xfuncproto.h>
+ #include "IOECall.h"
+--- a/lib/wnnlib.c
++++ b/lib/wnnlib.c
+@@ -578,6 +578,7 @@
+ #ifdef DEBUG_WNNLIB
+ #include	<stdio.h>
+ #endif
++#include	<stdlib.h>
+ #include	"wnnlib.h"
+ #include	"WStr.h"
+ #include	<string.h>
diff --git a/app-i18n/kinput2/files/kinput2-ppc.patch b/app-i18n/kinput2/files/kinput2-ppc.patch
new file mode 100644
index 000000000000..897b154eb5ac
--- /dev/null
+++ b/app-i18n/kinput2/files/kinput2-ppc.patch
@@ -0,0 +1,11 @@
+--- a/cmd/kinput2.c
++++ b/cmd/kinput2.c
+@@ -644,3 +644,8 @@
+     return n;
+ }
+ #endif
++
++#if defined(linux) && defined(PPC)
++/* avoid nusty gcc bug */
++void _XtInherit() {}
++#endif
diff --git a/app-i18n/kinput2/files/kinput2-segfault.patch b/app-i18n/kinput2/files/kinput2-segfault.patch
new file mode 100644
index 000000000000..9b3a83163b4f
--- /dev/null
+++ b/app-i18n/kinput2/files/kinput2-segfault.patch
@@ -0,0 +1,12 @@
+--- a/lib/imlib/imconv.c
++++ b/lib/imlib/imconv.c
+@@ -591,6 +591,9 @@
+ 	}
+     }
+     IMFinishRequest(conn, offset);
++    #ifdef STATUS_SYNC
++	IMFlush(conn);
++    #endif /* STATUS_SYNC */
+ }
+ 
+ /*- preeditCaret: do actual preedit caret -*/
diff --git a/app-i18n/kinput2/files/kinput2-wnn.patch b/app-i18n/kinput2/files/kinput2-wnn.patch
new file mode 100644
index 000000000000..4e7001938fb2
--- /dev/null
+++ b/app-i18n/kinput2/files/kinput2-wnn.patch
@@ -0,0 +1,51 @@
+--- a/lib/cconv.c
++++ b/lib/cconv.c
+@@ -790,7 +790,7 @@
+ static int parseLine(uchar *, uchar **, int);
+ static FILE *openfile(char *);
+ static int doinclude(uchar *, Files *, void (*)());
+-static uchar *getline(uchar *, int, Files *, void (*)());
++static uchar *getLine(uchar *, int, Files *, void (*)());
+ static int readRuleFile(ccRule, char *);
+ static int registMode(ccRule, int, uchar **);
+ static int newMode(ccRule, Files *, _strbufRec *, _funcbufRec *,
+@@ -1035,8 +1035,8 @@
+ 	return 0;
+ }
+ 
+-/* getline -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */
+-static uchar *getline(line, linesize, files, efunc)
++/* getLine -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */
++static uchar *getLine(line, linesize, files, efunc)
+ uchar *line;
+ int linesize;
+ Files *files;
+@@ -1100,7 +1100,7 @@
+ 	rule->nmode = 0;
+ 	rule->initialmode = -1;
+ 
+-	while (getline(line, sizeof(line), &files, efunc)) {
++	while (getLine(line, sizeof(line), &files, efunc)) {
+ 		(void)Strcpy(tmp, line);
+ 		if ((argc = parseLine(tmp, argv, 20)) == 0)
+ 			continue;
+@@ -1269,7 +1269,7 @@
+ 	cdbuf.cdbuf = NULL;
+ 
+ 	/* $B%k!<%k$rFI$s$G%9%H%"$9$k(B */
+-	while (getline(line, sizeof(line), files, efunc)) {
++	while (getLine(line, sizeof(line), files, efunc)) {
+ 		/* '#' $B$G;O$^$k9T$O%3%a%s%H(B */
+ 		if (*line == '\0' || *line == '\n' || *line == '#')
+ 			continue;
+--- a/lib/wnnlib.c
++++ b/lib/wnnlib.c
+@@ -1367,7 +1367,7 @@
+ 
+ 	/* $BJQ49J8;zNs$ND9$5$N%A%'%C%/(B */
+ 	clp = buf->clauseInfo + cl;
+-	len = jl_kanji_len(buf->wnn, cl);
++	len = jl_kanji_len(buf->wnn, cl, -1);
+ 	diff = len - ((clp + 1)->dispp - clp->dispp);
+ 	newlen = (buf->displayEnd - buf->displayBuf) + diff;
+ 	if (newlen > buf->bufferSize) {
diff --git a/app-i18n/kinput2/files/xinput-kinput2 b/app-i18n/kinput2/files/xinput-kinput2
new file mode 100644
index 000000000000..dcb3b63330ac
--- /dev/null
+++ b/app-i18n/kinput2/files/xinput-kinput2
@@ -0,0 +1,5 @@
+XIM=kinput2
+XIM_PROGRAM="@EPREFIX@/usr/bin/kinput2"
+XIM_ARGS="-@SERVER@ +kinput -xim"
+GTK_IM_MODULE=xim
+QT_IM_MODULE=xim
diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
new file mode 100644
index 000000000000..78b586f2ec09
--- /dev/null
+++ b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="A Japanese input server which supports the XIM protocol"
+HOMEPAGE="http://www.nec.co.jp/canna"
+SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE="freewnn"
+
+RDEPEND="x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	!freewnn? ( app-i18n/canna )
+	freewnn? ( app-i18n/freewnn )"
+DEPEND="${RDEPEND}
+	x11-misc/gccmakedep
+	x11-misc/imake"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-headers.patch
+	"${FILESDIR}"/${PN}-ppc.patch
+	"${FILESDIR}"/${PN}-segfault.patch
+	"${FILESDIR}"/${PN}-wnn.patch
+)
+DOCS=( README NEWS doc/. )
+
+src_prepare() {
+	default
+
+	sed -i "s|^/\* \(#define Use$(usex freewnn Wnn Canna)\) \*/|\1|" ${PN^k}.conf
+}
+
+src_configure() {
+	xmkmf -a || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults"
+}
+
+src_install() {
+	emake \
+		XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" \
+		DESTDIR="${D}" \
+		install
+	einstalldocs
+	newman cmd/${PN}.man ${PN}.1
+
+	rm -rf "${ED}"/usr/$(get_libdir)/X11
+
+	insinto /etc/X11/xinit/xinput.d
+	sed \
+		-e "s:@EPREFIX@:${EPREFIX}:g" \
+		-e "s:@SERVER@:$(usex freewnn wnn canna):g" \
+		"${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
+	doins "${T}"/${PN}.conf
+}
diff --git a/app-i18n/kinput2/metadata.xml b/app-i18n/kinput2/metadata.xml
new file mode 100644
index 000000000000..e1a49f498885
--- /dev/null
+++ b/app-i18n/kinput2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-i18n/libcangjie-1.1 b/app-i18n/libcangjie-1.1
deleted file mode 100644
index 6aa0381903fd..000000000000
--- a/app-i18n/libcangjie-1.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=dev-db/sqlite:3=
-DESCRIPTION=The library implementing the Cangjie input method
-EAPI=5
-HOMEPAGE=http://cangjians.github.io
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=dev-db/sqlite:3=
-SLOT=0
-SRC_URI=http://cangjians.github.io/downloads/libcangjie/libcangjie-1.1.tar.xz
-_md5_=73fab33039c15da05a283e7e75ce391c
diff --git a/app-i18n/libcangjie-1.3 b/app-i18n/libcangjie-1.3
deleted file mode 100644
index 0a54bb60d2bb..000000000000
--- a/app-i18n/libcangjie-1.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=dev-db/sqlite:3=
-DESCRIPTION=The library implementing the Cangjie input method
-EAPI=5
-HOMEPAGE=http://cangjians.github.io
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3+
-RDEPEND=dev-db/sqlite:3=
-SLOT=0
-SRC_URI=https://github.com/Cangjians/libcangjie/releases/download/v1.3/libcangjie-1.3.tar.xz
-_md5_=49facf05435583c0371fca2c131fe88c
diff --git a/app-i18n/libcangjie/Manifest b/app-i18n/libcangjie/Manifest
new file mode 100644
index 000000000000..37c3e99ad70c
--- /dev/null
+++ b/app-i18n/libcangjie/Manifest
@@ -0,0 +1,5 @@
+DIST libcangjie-1.1.tar.xz 573924 BLAKE2B d8d8543e2ab8717deb732a60668a8c66b0769177f4f954572d936b18d13c16cdc6355f82c7ee3bf1b7674fe1ff93f822a6ada381b6942fa15a47ff7b64f0bf78 SHA512 99c2dd055830bbaf6e2ef26cc285dd3edec780561af0799b450cc2fa44c8590217bbf38cd3d087c01cca1b467c7fff722c548b83fcb7c9177cd7c681a22f2901
+DIST libcangjie-1.3.tar.xz 575240 BLAKE2B c7e3129a6dd9690223e46f20a7bf06148ed279880461faf031a6542a09e0b21f6740767a8e6fd43acb79175deef437c385df3448e672ebfb0b9f72701afb66a3 SHA512 216ad965cb265d700cc94e6b7892dd9a7d814eba364b7700870b7e704d17d8dc75be4c7af0a7a7fc0088a32e389e62822a05d089f1df714c5ffd347ece8b9f35
+EBUILD libcangjie-1.1.ebuild 399 BLAKE2B e2f7ab8e57e5e6135563e166670383c5bb28796d18dfcf6ad1cb56b431c420f790984e5494efee5fcf9186b021867919f92ac2a5339d2aeb6f042bfb3db9b06c SHA512 53ef35b0ff56bffbbb6b29081a4d7a107149556a2f58ba84b99fc3416625834a9942e231c87ac9dc9c6c82e760a06a02aa2ce5fb9dca7ed70a60bcaa8a3fc1bf
+EBUILD libcangjie-1.3.ebuild 414 BLAKE2B ca1f4c833b3b33164f18078b6ac20e38606904c8328d4da9054575b9de97296d69dcadcd4bae1ffe550ebd2e6a2243c66a40438d3ea87a29484af201adcf018b SHA512 86efcbbfa7a070d09d0d7f72a0d3ea1cbfc652bdc60d76dbbc586f25fadf305d66fb1096ed76d883e9674ceb27c70d4050f01a562888c45a270897584dce3ebe
+MISC metadata.xml 329 BLAKE2B 54240b7439d7878368a995c57453fc5b77141c82aed47899d0615de5bc53aa7c97c7aea2b35acef40d4688975194cdf1fb1c27a538838c76b2380a125d5d652f SHA512 8dbaa10ab3789d09c97c20a39c57c8cc3d5b2ff9b90003352c6b07e250c1fae8f5418780da3edab9b7d23a8febb1d77d5e9fb1f48e6a4e612b65387482570c00
diff --git a/app-i18n/libcangjie/libcangjie-1.1.ebuild b/app-i18n/libcangjie/libcangjie-1.1.ebuild
new file mode 100644
index 000000000000..22b48cbbb884
--- /dev/null
+++ b/app-i18n/libcangjie/libcangjie-1.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The library implementing the Cangjie input method"
+HOMEPAGE="http://cangjians.github.io"
+SRC_URI="http://cangjians.github.io/downloads/libcangjie/libcangjie-${PV}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-db/sqlite:3="
+
+RDEPEND="${DEPEND}"
diff --git a/app-i18n/libcangjie/libcangjie-1.3.ebuild b/app-i18n/libcangjie/libcangjie-1.3.ebuild
new file mode 100644
index 000000000000..72eb18b96607
--- /dev/null
+++ b/app-i18n/libcangjie/libcangjie-1.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The library implementing the Cangjie input method"
+HOMEPAGE="http://cangjians.github.io"
+SRC_URI="https://github.com/Cangjians/libcangjie/releases/download/v${PV}/libcangjie-${PV}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="dev-db/sqlite:3="
+
+RDEPEND="${DEPEND}"
diff --git a/app-i18n/libcangjie/metadata.xml b/app-i18n/libcangjie/metadata.xml
new file mode 100644
index 000000000000..bc30147a7b04
--- /dev/null
+++ b/app-i18n/libcangjie/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">Cangjians/libcangjie</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/libchewing-0.5.1 b/app-i18n/libchewing-0.5.1
deleted file mode 100644
index 6a26f1c93a59..000000000000
--- a/app-i18n/libchewing-0.5.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-db/sqlite:3 test? ( sys-libs/ncurses[unicode] )
-DESCRIPTION=Intelligent phonetic (Zhuyin/Bopomofo) input method library
-EAPI=6
-HOMEPAGE=http://chewing.im/ https://github.com/chewing/libchewing
-IUSE=static-libs test
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-db/sqlite:3
-SLOT=0/3
-SRC_URI=https://github.com/chewing/libchewing/releases/download/v0.5.1/libchewing-0.5.1.tar.bz2
-_md5_=2373b585020293fc65d170d3018e03c6
diff --git a/app-i18n/libchewing-9999 b/app-i18n/libchewing-9999
deleted file mode 100644
index 2c054898748c..000000000000
--- a/app-i18n/libchewing-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare test unpack
-DEPEND=dev-db/sqlite:3 test? ( sys-libs/ncurses[unicode] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Intelligent phonetic (Zhuyin/Bopomofo) input method library
-EAPI=6
-HOMEPAGE=http://chewing.im/ https://github.com/chewing/libchewing
-IUSE=static-libs test
-LICENSE=LGPL-2.1
-RDEPEND=dev-db/sqlite:3
-SLOT=0/3
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8dda17f9cf5e55c6c89d89e2074e935d
diff --git a/app-i18n/libchewing/Manifest b/app-i18n/libchewing/Manifest
new file mode 100644
index 000000000000..4e2d2eff234b
--- /dev/null
+++ b/app-i18n/libchewing/Manifest
@@ -0,0 +1,4 @@
+DIST libchewing-0.5.1.tar.bz2 3141084 BLAKE2B 28f9e803c8815c0e1b1a1134becffe12f92c1ae24b4b6d4163769d898861fec024db8332befe7130487a72fc20859b6292837e9d68ab1b6477de4cf4f789f2ee SHA512 a6551661bb5e56bba59730b93b373db56af7d42f2ab4881fbfff8727689dd2604d42d2e5c0b04820df66a431dfb5fcb73cc5c9b538615da76198ee3635501c1f
+EBUILD libchewing-0.5.1.ebuild 1133 BLAKE2B 69e6ebe58d26ab7f69e3c76c096af888d1726fb218fb34b12fadfbcdc19d498f3b17c1c34ca4dff2a11db59e4011e62c24cb79c6136a0235b09bfe9c62123a62 SHA512 c34891aecf91306810278c0ad7e21d34da6a1dd93195fc23b23e871f3dfd9791c0da317fac2c96d2ea63898c1e82e94fe7837a75b7eede5923f4be3b563e52e8
+EBUILD libchewing-9999.ebuild 1102 BLAKE2B 20874411d7bbae1684458fc28a83af4b20620409612c5401982e28c070761da991000f5a144f8a71e8967d6afabc788da0b1eae8803d2033785e5559b394410f SHA512 a6b0d950c98c5635e87557f3b7a59b38363345111ade7679f2f8d289c61fe15accc7e771e911a205dfe4934b1ca63839ef45c7b55a839e0f738df0c8130388ab
+MISC metadata.xml 327 BLAKE2B 3f9b234590aef775dc0ae62f4eef42cc1e363e04c3dabc2464eee9cfb44ec0b1fc4fe9b233f781c15784b3a699537d67e884ee7f1648a62b3a863480a5e831cd SHA512 c9ab28ab34d940a30e97b989fd96904d2e0816e4b1bc5b843b082d64d6cd476335d9402640e71f2cf8f57f44dcae9af66d5e07075b189fa74f21faba40d819e3
diff --git a/app-i18n/libchewing/libchewing-0.5.1.ebuild b/app-i18n/libchewing/libchewing-0.5.1.ebuild
new file mode 100644
index 000000000000..1d3529dc744e
--- /dev/null
+++ b/app-i18n/libchewing/libchewing-0.5.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit autotools git-r3
+
+	EGIT_REPO_URI="https://github.com/chewing/libchewing"
+fi
+
+DESCRIPTION="Intelligent phonetic (Zhuyin/Bopomofo) input method library"
+HOMEPAGE="http://chewing.im/ https://github.com/chewing/libchewing"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/chewing/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/3"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+IUSE="static-libs test"
+
+RDEPEND="dev-db/sqlite:3"
+DEPEND="${RDEPEND}
+	test? ( sys-libs/ncurses[unicode] )"
+
+src_prepare() {
+	default
+
+	if [[ "${PV}" == "9999" ]]; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	# libchewing.a is required for building of tests.
+	econf \
+		--with-sqlite3 \
+		$(if use static-libs || use test; then echo --enable-static; else echo --disable-static; fi)
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+	use static-libs || find "${D}" -name "*.a" -delete || die
+}
diff --git a/app-i18n/libchewing/libchewing-9999.ebuild b/app-i18n/libchewing/libchewing-9999.ebuild
new file mode 100644
index 000000000000..3dbd6c51e6fe
--- /dev/null
+++ b/app-i18n/libchewing/libchewing-9999.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit autotools git-r3
+
+	EGIT_REPO_URI="https://github.com/chewing/libchewing"
+fi
+
+DESCRIPTION="Intelligent phonetic (Zhuyin/Bopomofo) input method library"
+HOMEPAGE="http://chewing.im/ https://github.com/chewing/libchewing"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/chewing/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/3"
+KEYWORDS=""
+IUSE="static-libs test"
+
+RDEPEND="dev-db/sqlite:3"
+DEPEND="${RDEPEND}
+	test? ( sys-libs/ncurses[unicode] )"
+
+src_prepare() {
+	default
+
+	if [[ "${PV}" == "9999" ]]; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	# libchewing.a is required for building of tests.
+	econf \
+		--with-sqlite3 \
+		$(if use static-libs || use test; then echo --enable-static; else echo --disable-static; fi)
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+	use static-libs || find "${D}" -name "*.a" -delete || die
+}
diff --git a/app-i18n/libchewing/metadata.xml b/app-i18n/libchewing/metadata.xml
new file mode 100644
index 000000000000..baa53a1242c5
--- /dev/null
+++ b/app-i18n/libchewing/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">chewing/libchewing</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/libhangul-0.1.0 b/app-i18n/libhangul-0.1.0
deleted file mode 100644
index 6fede1b46497..000000000000
--- a/app-i18n/libhangul-0.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install test
-DEPEND=virtual/libiconv nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check )
-DESCRIPTION=Library for hangul input method logic, hanja dictionary
-EAPI=6
-HOMEPAGE=https://github.com/choehwanjin/libhangul
-IUSE=nls static-libs test
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=virtual/libiconv nls? ( virtual/libintl )
-SLOT=0/1
-SRC_URI=https://libhangul.googlecode.com/files/libhangul-0.1.0.tar.gz
-_md5_=6e46444416fafce43166ce0e73d43376
diff --git a/app-i18n/libhangul/Manifest b/app-i18n/libhangul/Manifest
new file mode 100644
index 000000000000..242d005f6308
--- /dev/null
+++ b/app-i18n/libhangul/Manifest
@@ -0,0 +1,3 @@
+DIST libhangul-0.1.0.tar.gz 2899845 BLAKE2B 5d6f4f9d6dfc32b8d6c6c0219b6e25b9c483555dbe623e5d284043d15eb24b4c7044003bcfd4c55b1ff6ab4b3b0c28037a8497f79fc9b733eb7de8952fee3ed0 SHA512 cf84850bf7a41e743457300513c5efdf7b3e18d168f4fdc324aaa8e1be78743752fcb98385764f94c707777ab82cc9444e076808e61fdbd915c9c0d7ea93c534
+EBUILD libhangul-0.1.0.ebuild 763 BLAKE2B 5767897f26c2066f5d7ab363892f120431ff900882e07c3ae36b58a6601b79c8dfdd6a242ec8a80c68ae3ff48c31fb9278847e2de32d2474aab1e9c6342429fe SHA512 9f3af29d02e41436881622c12f80ffebc7ac7d52ea0cf43dd6c6ec8498bbccc7d2fbe1cdfb0895508fb0ba83d9fed92d3050babdc6440ff7ae02294f365a4915
+MISC metadata.xml 320 BLAKE2B a8ae66d28b67c2350f5e94aff3c617c2dd48846c1edb7f6e552334db16c840463a5bb20096f852864a34f0f5423e45e9b8c486c222a438b96756fd62c2ac0799 SHA512 ede9ccfc8a3f5d9082a04a60ee48b19b285cc96e21301e95f4e43d10f7f2630a79cda06a0dd8d6670b6308bd74c035f8e51c95e684b2bf4f68a79a86e57a045a
diff --git a/app-i18n/libhangul/libhangul-0.1.0.ebuild b/app-i18n/libhangul/libhangul-0.1.0.ebuild
new file mode 100644
index 000000000000..f8ec424da315
--- /dev/null
+++ b/app-i18n/libhangul/libhangul-0.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Library for hangul input method logic, hanja dictionary"
+HOMEPAGE="https://github.com/choehwanjin/libhangul"
+SRC_URI="https://libhangul.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="nls static-libs test"
+
+RDEPEND="virtual/libiconv
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( dev-libs/check )"
+
+DOCS=(AUTHORS ChangeLog NEWS)
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
+
+src_test() {
+	emake -C test check
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/app-i18n/libhangul/metadata.xml b/app-i18n/libhangul/metadata.xml
new file mode 100644
index 000000000000..8e75964217ff
--- /dev/null
+++ b/app-i18n/libhangul/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">choehwanjin/libhangul</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/libkkc-0.3.5 b/app-i18n/libkkc-0.3.5
deleted file mode 100644
index 83754d5cd13c..000000000000
--- a/app-i18n/libkkc-0.3.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 dev-libs/marisa[python(+)] introspection? ( dev-libs/gobject-introspection ) nls? ( virtual/libintl ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Japanese Kana Kanji conversion input method library
-EAPI=6
-HOMEPAGE=https://github.com/ueno/libkkc
-IUSE=+introspection nls static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 dev-libs/marisa[python(+)] introspection? ( dev-libs/gobject-introspection ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=https://github.com/ueno/libkkc/releases/download/v0.3.5/libkkc-0.3.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e2bbbe45ca5b9dd5d947772d5792c78e
diff --git a/app-i18n/libkkc/Manifest b/app-i18n/libkkc/Manifest
new file mode 100644
index 000000000000..57e9a2ce05bc
--- /dev/null
+++ b/app-i18n/libkkc/Manifest
@@ -0,0 +1,3 @@
+DIST libkkc-0.3.5.tar.gz 1424282 BLAKE2B 5c1664f85b15e4f7b82d07c21ee29b82bea0d8f534b2f866c9604e38b5578b323c3252ae76a325ec269d82c972c9155bb42ca9c765bc47e13825edabfd974ca5 SHA512 f611c3104a22ad38af29746870849d8937b6af2a7fee0952cc25f36ef845b5617a192df7ca63ff2a507384f7a6a13c9c1b4fa3b9a34f3f041bee8793d04b9236
+EBUILD libkkc-0.3.5.ebuild 992 BLAKE2B 8d07a03565922a6b07c8048749f1e32369fb3de07ed6d617c4910cf41fbf051bf282432fe88f12a44f66daa961f2111a46c701ae04544c7b4e1e861993e811a1 SHA512 19fed635f96b73fa7ba478ad78af73e60d5d5d41943584eaa208c4829cf2d5d0e8b853043f9294ce7b38fe68461ea64db2091a0767c2b16320bc615cafcd2b02
+MISC metadata.xml 320 BLAKE2B 32f31ada16f19171c1b3347b4ef63e1894a8f5449dba822ce14b6be5a28636acdf0a9d6ad2808f946cb0d58a384ef40abdd65193156c1b31210949be4e55ca9e SHA512 83a16f6a6b7ecbfbb75a77f38b1de0f9b856e4d4c856f157e4d2d8863f830655b78d1969344383d7d3c12df6a4b3e4d1962be4d8bdc8a77ad9a7c204a111504e
diff --git a/app-i18n/libkkc/libkkc-0.3.5.ebuild b/app-i18n/libkkc/libkkc-0.3.5.ebuild
new file mode 100644
index 000000000000..05430798a652
--- /dev/null
+++ b/app-i18n/libkkc/libkkc-0.3.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ltprune python-any-r1 vala xdg-utils
+
+DESCRIPTION="Japanese Kana Kanji conversion input method library"
+HOMEPAGE="https://github.com/ueno/libkkc"
+SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection nls static-libs"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libgee:0.8
+	dev-libs/marisa[python(+)]
+	introspection? ( dev-libs/gobject-introspection )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(vala_depend)
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	vala_src_prepare
+	default
+	xdg_environment_reset
+}
+
+src_configure() {
+	econf \
+		$(use_enable introspection) \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/app-i18n/libkkc/metadata.xml b/app-i18n/libkkc/metadata.xml
new file mode 100644
index 000000000000..4d9edd9a3b5f
--- /dev/null
+++ b/app-i18n/libkkc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ueno/libkkc</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/libpinyin-2.1.0 b/app-i18n/libpinyin-2.1.0
deleted file mode 100644
index b6219572533a..000000000000
--- a/app-i18n/libpinyin-2.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/glib:2 sys-libs/db:= virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library to deal with pinyin
-EAPI=6
-HOMEPAGE=https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/
-KEYWORDS=amd64 ~arm64 ppc ppc64 x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 sys-libs/db:=
-SLOT=0/13
-SRC_URI=https://github.com/libpinyin/libpinyin/archive/2.1.0.tar.gz -> libpinyin-2.1.0.tar.gz mirror://sourceforge/libpinyin/models/model14.text.tar.gz -> libpinyin-model14.text.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=980bce95eccb23125b2d821e34307ed1
diff --git a/app-i18n/libpinyin-2.1.91 b/app-i18n/libpinyin-2.1.91
deleted file mode 100644
index d304aeb4dc54..000000000000
--- a/app-i18n/libpinyin-2.1.91
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/glib:2 sys-libs/db:= virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao
-EAPI=6
-HOMEPAGE=https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 sys-libs/db:=
-SLOT=0/13
-SRC_URI=https://github.com/libpinyin/libpinyin/archive/2.1.91.tar.gz -> libpinyin-2.1.91.tar.gz mirror://sourceforge/libpinyin/models/model15.text.tar.gz -> libpinyin-model15.text.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8c13e4bce2941a38a4b7e8c0689c64a5
diff --git a/app-i18n/libpinyin-2.2.0 b/app-i18n/libpinyin-2.2.0
deleted file mode 100644
index 1ce4619afb9c..000000000000
--- a/app-i18n/libpinyin-2.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/glib:2 sys-libs/db:= virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao
-EAPI=6
-HOMEPAGE=https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 sys-libs/db:=
-SLOT=0/13
-SRC_URI=https://github.com/libpinyin/libpinyin/archive/2.2.0.tar.gz -> libpinyin-2.2.0.tar.gz mirror://sourceforge/libpinyin/models/model15.text.tar.gz -> libpinyin-model15.text.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8c13e4bce2941a38a4b7e8c0689c64a5
diff --git a/app-i18n/libpinyin-9999 b/app-i18n/libpinyin-9999
deleted file mode 100644
index 76d0aa5c436e..000000000000
--- a/app-i18n/libpinyin-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/glib:2 sys-libs/db:= virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao
-EAPI=6
-HOMEPAGE=https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 sys-libs/db:=
-SLOT=0/13
-SRC_URI=mirror://sourceforge/libpinyin/models/model15.text.tar.gz -> libpinyin-model15.text.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=2eeb230e407139ae0ee45c2b1b2605b6
diff --git a/app-i18n/libpinyin/Manifest b/app-i18n/libpinyin/Manifest
new file mode 100644
index 000000000000..84d4a60b204e
--- /dev/null
+++ b/app-i18n/libpinyin/Manifest
@@ -0,0 +1,10 @@
+DIST libpinyin-2.1.0.tar.gz 246219 BLAKE2B cae5b41faeb2e0eedc2ae2c098b2db04b22e36d0bd9fd222a4516f71ab9b3e8ade7fa96e0d6d898e197bf91c1cb6a0b98a9fff97e7be31bb4f901400c87bfea7 SHA512 e6aa3998ac466cb155750b574140dd43673bfeb4f13d1b88c4892b61bb773aee84610dd67ad17871961d51a48067c535eab33a6fb6c9ac28179a9958c4e9b518
+DIST libpinyin-2.1.91.tar.gz 256045 BLAKE2B 148a2617cbe335ebda5b9fb26f63f7c75f06d2dfd3fb950f60b4db37762a5bb3a91459dba0759abd33fbc01d38fe26d7cce92dfaaa2c6e45c80552f0bbeb3d27 SHA512 568b263726a022bdca52fd54c7583a36a31385a8f19bb5c5903918a6036c5499ef8c8bb91ebb2db877449ec5177d2d4e4f0a20e7bb528534361ba1405dd1fd92
+DIST libpinyin-2.2.0.tar.gz 256221 BLAKE2B 72c0dc42ca6e63852c92975b871706d24c1066cb9bb37faf9ff0ccde9773308e1a29c7587f00ab337c52a1f957c8e67d6241bdff13a50d9dbf73c3b4e530d2be SHA512 7327e6726acaf984492fdecb5ed04f81624da261aeac3cbea9a8ea5540d84f39ca8d41ec8835b509da97b9de5837534885e4ba5f4041ce9c7252c8a438480598
+DIST libpinyin-model14.text.tar.gz 19361973 BLAKE2B 702f0c2cb0c8157758f8c46e7b47221475f2a96a5e4f6181b5dee605bd72002827431f017a913275b4e9cf6b4b07bccec4b9a5b7960a9b2c42ffba4631c57ed6 SHA512 792d3cf7ab7fdea701737cea66d18f697015f19d18b6d26273db2da0ae28291f38b3d8a5717f595da63fbe573921c552bdce10c4bec9a0834947dfec92265da9
+DIST libpinyin-model15.text.tar.gz 19361973 BLAKE2B 3d24321db407e28c1adf49373dd9bacafe0e89409511c0656d7b9a85f1d1ac8693249088dd99beef069576f4a8d0d5db3fd47f98822b32aa3098315cf2660d22 SHA512 d3f5b42f6ea6b22570b5ba67cf23d94a3fee2d7d894191ebc11eb72edc162c72b90b2fe10b312bfd8d77d110654ee5dc00c21b25fb8b7c3f905d4088c9895ac1
+EBUILD libpinyin-2.1.0.ebuild 1336 BLAKE2B 278b7906485b7cbc0f4b3d2ae89af99a074cd9ad9a773521e3df1eeb869b8035e6a971cb8745fde6a659455b467a7bb63b29cc45cb883edd7906839dfcbabc60 SHA512 2c750d9f7dba999d155f0a1f587a12aab7fc4f0356ce2a241b8a884539732d3ed310ce5b7ada5226b519e18a8335cc7f9fb9bca41700c60049bb2c291af545ae
+EBUILD libpinyin-2.1.91.ebuild 1395 BLAKE2B e14ab61ce077f41ddefbf6d28231d9af8a4f1ecc5435ac46536a7c8c3c3af799c6bf7ebbcfe10c26a35a354f89ec9595e90d88d8393e265004cceff57c0bd67c SHA512 62eb6b628fa4dd91a89ebbf1c6d894b646015f7a445d4f96283ebf14a80ffad4b6fc17cf7f81848f482c2a9c595221f73d5208a0805fb15ceac7ce07d29ff0a0
+EBUILD libpinyin-2.2.0.ebuild 1395 BLAKE2B e14ab61ce077f41ddefbf6d28231d9af8a4f1ecc5435ac46536a7c8c3c3af799c6bf7ebbcfe10c26a35a354f89ec9595e90d88d8393e265004cceff57c0bd67c SHA512 62eb6b628fa4dd91a89ebbf1c6d894b646015f7a445d4f96283ebf14a80ffad4b6fc17cf7f81848f482c2a9c595221f73d5208a0805fb15ceac7ce07d29ff0a0
+EBUILD libpinyin-9999.ebuild 1365 BLAKE2B 5f01c5204f4d9ee246c43636fdf77f73a9001d64412c783d713c47e192fcbdbf6c3f9726a424e6f632450f46215188793d454de4bc7e0497d430b97857d3b718 SHA512 a65a580228b8f0024366c4462aee347182b233d736231234bd8ecb5bfc2d6733860019ce3be354f0e830259bcd8b253705b1eb382f8914c42d72e911ec6650fa
+MISC metadata.xml 384 BLAKE2B b3f62b356f505bb69731e6f56d43a080e509b578da0762be6ccc112ed1262446034b82d89cbdcca87d502c006319fd11cb4069804b8d8c12f4263a15bbf4f525 SHA512 4317a502e82b23aa2c66d406148eab83996139b4522f999884559b7b6d15709ded6779dc64aeedc657a1be3cd1337281c9e1297ae22dc6b227aef419dc707518
diff --git a/app-i18n/libpinyin/libpinyin-2.1.0.ebuild b/app-i18n/libpinyin/libpinyin-2.1.0.ebuild
new file mode 100644
index 000000000000..949814bc8171
--- /dev/null
+++ b/app-i18n/libpinyin/libpinyin-2.1.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/libpinyin/libpinyin"
+fi
+
+LIBPINYIN_MODEL_VERSION="14"
+
+DESCRIPTION="Library to deal with pinyin"
+HOMEPAGE="https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/13"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	sys-libs/db:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.gz
+	fi
+}
+
+src_prepare() {
+	default
+
+	ln -s "${DISTDIR}/${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" "data/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" || die
+	sed -e "/^\twget .*\/model${LIBPINYIN_MODEL_VERSION}\.text\.tar\.gz$/d" -i data/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/app-i18n/libpinyin/libpinyin-2.1.91.ebuild b/app-i18n/libpinyin/libpinyin-2.1.91.ebuild
new file mode 100644
index 000000000000..0529ee397abe
--- /dev/null
+++ b/app-i18n/libpinyin/libpinyin-2.1.91.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/libpinyin/libpinyin"
+fi
+
+LIBPINYIN_MODEL_VERSION="15"
+
+DESCRIPTION="Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao"
+HOMEPAGE="https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/13"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	sys-libs/db:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.gz
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -e "/^\twget .*\/model${LIBPINYIN_MODEL_VERSION}\.text\.tar\.gz$/d" -i data/Makefile.am || die
+	ln -s "${DISTDIR}/${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" "data/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-libzhuyin \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/app-i18n/libpinyin/libpinyin-2.2.0.ebuild b/app-i18n/libpinyin/libpinyin-2.2.0.ebuild
new file mode 100644
index 000000000000..0529ee397abe
--- /dev/null
+++ b/app-i18n/libpinyin/libpinyin-2.2.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/libpinyin/libpinyin"
+fi
+
+LIBPINYIN_MODEL_VERSION="15"
+
+DESCRIPTION="Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao"
+HOMEPAGE="https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/13"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	sys-libs/db:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.gz
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -e "/^\twget .*\/model${LIBPINYIN_MODEL_VERSION}\.text\.tar\.gz$/d" -i data/Makefile.am || die
+	ln -s "${DISTDIR}/${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" "data/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-libzhuyin \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/app-i18n/libpinyin/libpinyin-9999.ebuild b/app-i18n/libpinyin/libpinyin-9999.ebuild
new file mode 100644
index 000000000000..20abcddac60e
--- /dev/null
+++ b/app-i18n/libpinyin/libpinyin-9999.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/libpinyin/libpinyin"
+fi
+
+LIBPINYIN_MODEL_VERSION="15"
+
+DESCRIPTION="Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao"
+HOMEPAGE="https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/13"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	sys-libs/db:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.gz
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -e "/^\twget .*\/model${LIBPINYIN_MODEL_VERSION}\.text\.tar\.gz$/d" -i data/Makefile.am || die
+	ln -s "${DISTDIR}/${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" "data/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-libzhuyin \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/app-i18n/libpinyin/metadata.xml b/app-i18n/libpinyin/metadata.xml
new file mode 100644
index 000000000000..a46185d494b6
--- /dev/null
+++ b/app-i18n/libpinyin/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">libpinyin/libpinyin</remote-id>
+    <remote-id type="sourceforge">libpinyin</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/librime-1.2.9 b/app-i18n/librime-1.2.9
deleted file mode 100644
index 5ab8978bc559..000000000000
--- a/app-i18n/librime-1.2.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-i18n/opencc:= dev-cpp/glog:= >=dev-cpp/yaml-cpp-0.5.0:= >=dev-libs/boost-1.46.0:=[threads] dev-libs/leveldb:= dev-libs/marisa:= x11-base/xorg-proto test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Rime Input Method Engine library
-EAPI=6
-HOMEPAGE=http://rime.im/ https://github.com/rime/librime
-IUSE=static-libs test
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-3
-RDEPEND=app-i18n/opencc:= dev-cpp/glog:= >=dev-cpp/yaml-cpp-0.5.0:= >=dev-libs/boost-1.46.0:=[threads] dev-libs/leveldb:= dev-libs/marisa:=
-SLOT=0/1
-SRC_URI=https://github.com/rime/librime/archive/rime-1.2.9.tar.gz -> librime-1.2.9.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f56db7db105c062bfed79ce368dd381d
diff --git a/app-i18n/librime/Manifest b/app-i18n/librime/Manifest
new file mode 100644
index 000000000000..9edf620ec981
--- /dev/null
+++ b/app-i18n/librime/Manifest
@@ -0,0 +1,3 @@
+DIST librime-1.2.9.tar.gz 5516609 BLAKE2B 7b05fedb093f7595c7bf7f4893624b35b0cdde1816c9c99f9ed5d408c8fd21d34a361d16b94c43b3e5e23b10945f075711762f08ca30abee35849a332ecfee2d SHA512 2266ef96ad21ec5981b4ca5371d4e16eefed545ffbde07093ae0d0be070a64f9869baa09b6bdcee2522438e08c72a842a7e0b225a6ca1b661708a80cf3aba83a
+EBUILD librime-1.2.9.ebuild 895 BLAKE2B 07b6892c4f14fb61e21849fcf337460d1042a7f78708905db97623f6b5d4dcc8d28c0f6456fbb7055e4dffa297b42c581c9a8c08d9ae6d30b09b7972f6f4476f SHA512 27e10fae37861e123e955f9342449204a091116f1324382b778fcb78f4940a6585cf5896a7df9af2d7d31d16eb41430be7054f99df44230e844d7c377df8942c
+MISC metadata.xml 532 BLAKE2B 200096c7c818b877dd156ab1456309ae4e42a8bf78075d8aeee30a79f09bbf57c6053a41369102becf87aaf3ea4481a0bf6edf1dee258f650661b61c65a9aaee SHA512 83904c4885a57569f4e74483bd5efed886ca1fd6708c1e7146ce4893bcbdd66efa82dfd4e563c7b888603e23566de21e928772a597dd2e6fc75d00793c788800
diff --git a/app-i18n/librime/librime-1.2.9.ebuild b/app-i18n/librime/librime-1.2.9.ebuild
new file mode 100644
index 000000000000..e897af759e35
--- /dev/null
+++ b/app-i18n/librime/librime-1.2.9.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils vcs-snapshot
+
+DESCRIPTION="Rime Input Method Engine library"
+HOMEPAGE="http://rime.im/ https://github.com/rime/librime"
+SRC_URI="https://github.com/rime/${PN}/archive/rime-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/1"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="static-libs test"
+
+RDEPEND="app-i18n/opencc:=
+	dev-cpp/glog:=
+	>=dev-cpp/yaml-cpp-0.5.0:=
+	>=dev-libs/boost-1.46.0:=[threads]
+	dev-libs/leveldb:=
+	dev-libs/marisa:="
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	test? ( dev-cpp/gtest )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBOOST_USE_CXX11=ON
+		-DBUILD_DATA=OFF
+		-DBUILD_SEPARATE_LIBS=OFF
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DBUILD_STATIC=$(usex static-libs)
+		-DBUILD_TEST=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/app-i18n/librime/metadata.xml b/app-i18n/librime/metadata.xml
new file mode 100644
index 000000000000..1ef87e42d3d5
--- /dev/null
+++ b/app-i18n/librime/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>dlan@gentoo.org</email>
+    <name>Yixun Lan</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <maintainer>
+      <email>chen.sst@gmail.com</email>
+      <name>Gong Chen</name>
+    </maintainer>
+    <remote-id type="github">rime/librime</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/libskk-1.0.1 b/app-i18n/libskk-1.0.1
deleted file mode 100644
index 2d47b6cb3d65..000000000000
--- a/app-i18n/libskk-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0 introspection? ( dev-libs/gobject-introspection ) nls? ( virtual/libintl ) || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=GObject-based library to deal with Japanese kana-to-kanji conversion method
-EAPI=6
-HOMEPAGE=https://github.com/ueno/libskk
-IUSE=+introspection nls static-libs test
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0 introspection? ( dev-libs/gobject-introspection ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=https://bitbucket.org/libskk/libskk/downloads/libskk-1.0.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=f978fd405668e09f6586f2ab6041ae38
diff --git a/app-i18n/libskk-1.0.2 b/app-i18n/libskk-1.0.2
deleted file mode 100644
index 6a9a85e4a79d..000000000000
--- a/app-i18n/libskk-1.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 introspection? ( dev-libs/gobject-introspection ) nls? ( virtual/libintl ) || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=GObject-based library to deal with Japanese kana-to-kanji conversion method
-EAPI=6
-HOMEPAGE=https://github.com/ueno/libskk
-IUSE=+introspection nls static-libs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 introspection? ( dev-libs/gobject-introspection ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=https://github.com/ueno/libskk/releases/download/1.0.2/libskk-1.0.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=4288c1d347291ec80c7d86bbec374b58
diff --git a/app-i18n/libskk/Manifest b/app-i18n/libskk/Manifest
new file mode 100644
index 000000000000..202f8d51ede9
--- /dev/null
+++ b/app-i18n/libskk/Manifest
@@ -0,0 +1,5 @@
+DIST libskk-1.0.1.tar.gz 860453 BLAKE2B 95f386e34f479548c7b4a37c3d70d16e27fd238a83e09c9dfc539ec9c3cc1466bea6a1d694e9b1027d66955053b2af1719a96ea4b5a37f61fda82118250576cf SHA512 17dc7c0361083c08c29267b4fe2d066b079e5156728f461717044f99579ec2674b56c960d2be5a42a2dffb693106d2d3d78ec8cb833e8f189d48e421a25d91b0
+DIST libskk-1.0.2.tar.gz 867572 BLAKE2B 32f599e83bf7ced796d2f37f6f4bf5e45f47c90e144784b7b3e082866cc619a26e3aca4f16051685baa4d8ac54b0462930193f978bc1e8220b378679269c5833 SHA512 f8fff94b216c18f66bf1004ee068f8d737177f1b70ac36d054d9a68ce02ba9b8d1b7b4127d9a330f64054b2fe06f352070c750a3562d4be36fecf20cb854e6c0
+EBUILD libskk-1.0.1.ebuild 961 BLAKE2B 8fe2f6b546c554fd711ac6c40aef4a2ebdef29c009496afe0539fa95d3fafa76e80b6d7b400dc53b73312eb9bd90a85a310d88d4c9ab8d2db9c034367a8c4cdb SHA512 4ecdb60279c8ab8f7d90c19085a96b42892efad51879e841a0a54282ccba5dedd82b74ba5ce088ef25d23d8a51a7af16b51a4fe810be34d988516b46c1a7a141
+EBUILD libskk-1.0.2.ebuild 975 BLAKE2B f1af68240054e34cdf6c0c686f8c2c946d70b8fe8810837b9e5041155f3482f4f36d3f0c6827e186008be5756ca36576f7f8310e0e0de03759cc47e3a4611476 SHA512 04828d59aaa7b088bb1b2b567befc32abb937cd0b41a8c3e54114d67d68fa9d08940e501bb933897c510b39b92f00072f6649e259209fb83fa6b40468ba31db8
+MISC metadata.xml 320 BLAKE2B d8aac0823caa1962d5f1219492766ddec90fc92728b0f9f6f802d8f98d4d1c4cce00d3f6e688faf43729e8872f981582d9bbd586fcdc1cbf82aa7d54cd759d78 SHA512 a62e6d05067067cbcae666b635047834bca3c4ca7a4b217ffb20ace08fb05ba8917d8f413319a0ebe14d54c9fdf803c247644da9b22764335f5e9fc41529f67d
diff --git a/app-i18n/libskk/libskk-1.0.1.ebuild b/app-i18n/libskk/libskk-1.0.1.ebuild
new file mode 100644
index 000000000000..9dfbf773269b
--- /dev/null
+++ b/app-i18n/libskk/libskk-1.0.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ltprune vala virtualx
+
+DESCRIPTION="GObject-based library to deal with Japanese kana-to-kanji conversion method"
+HOMEPAGE="https://github.com/ueno/libskk"
+SRC_URI="https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+introspection nls static-libs"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libgee:0
+	introspection? ( dev-libs/gobject-introspection )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	vala_src_prepare
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable introspection) \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
+
+src_test() {
+	export GSETTINGS_BACKEND="memory"
+	virtx emake check
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/app-i18n/libskk/libskk-1.0.2.ebuild b/app-i18n/libskk/libskk-1.0.2.ebuild
new file mode 100644
index 000000000000..c2a5d159fe18
--- /dev/null
+++ b/app-i18n/libskk/libskk-1.0.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ltprune vala virtualx
+
+DESCRIPTION="GObject-based library to deal with Japanese kana-to-kanji conversion method"
+HOMEPAGE="https://github.com/ueno/libskk"
+SRC_URI="https://github.com/ueno/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection nls static-libs"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libgee:0.8
+	introspection? ( dev-libs/gobject-introspection )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	vala_src_prepare
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable introspection) \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
+
+src_test() {
+	export GSETTINGS_BACKEND="memory"
+	virtx emake check
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/app-i18n/libskk/metadata.xml b/app-i18n/libskk/metadata.xml
new file mode 100644
index 000000000000..47d519fd6058
--- /dev/null
+++ b/app-i18n/libskk/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ueno/libskk</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/libtabe-0.2.6 b/app-i18n/libtabe-0.2.6
deleted file mode 100644
index 5e04c157ca30..000000000000
--- a/app-i18n/libtabe-0.2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=sys-libs/db-4.5 x11-libs/libX11 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Libtabe provides bimsphone support for xcin-2.5+
-EAPI=0
-HOMEPAGE=https://packages.qa.debian.org/libt/libtabe.html
-IUSE=debug
-KEYWORDS=~amd64 ppc x86
-LICENSE=BSD
-RDEPEND=>=sys-libs/db-4.5 x11-libs/libX11
-SLOT=0
-SRC_URI=mirror://debian/pool/main/libt/libtabe/libtabe_0.2.6.orig.tar.gz mirror://debian/pool/main/libt/libtabe/libtabe_0.2.6-1.1.diff.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3030b0eefdb84d74ac47794ab5c76f05
diff --git a/app-i18n/libtabe-0.2.6.1.2 b/app-i18n/libtabe-0.2.6.1.2
deleted file mode 100644
index 4831da2b75e0..000000000000
--- a/app-i18n/libtabe-0.2.6.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=sys-libs/db-4.5 x11-libs/libX11 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Libtabe provides bimsphone support for xcin-2.5+
-EAPI=0
-HOMEPAGE=https://packages.qa.debian.org/libt/libtabe.html
-IUSE=debug
-KEYWORDS=amd64 ~ppc x86
-LICENSE=BSD
-RDEPEND=>=sys-libs/db-4.5 x11-libs/libX11
-SLOT=0
-SRC_URI=mirror://debian/pool/main/libt/libtabe/libtabe_0.2.6.orig.tar.gz mirror://debian/pool/main/libt/libtabe/libtabe_0.2.6-1.2.diff.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9d8fb7baec9cd27e07eb77992f89d186
diff --git a/app-i18n/libtabe/Manifest b/app-i18n/libtabe/Manifest
new file mode 100644
index 000000000000..7c041377cbae
--- /dev/null
+++ b/app-i18n/libtabe/Manifest
@@ -0,0 +1,8 @@
+AUX libtabe-0.2.6-fabs.patch 1024 BLAKE2B 4b96a84c5f05323586e7a81112ebbaae7ec4cd0e6e91c9f1886d98450c7c9ca15d2b432bbeb97e7ae0af5024264f07843e6ef98cfa83763d80780645d8038444 SHA512 05d2962925ac19bd0f56078cb7fcb2808d31f80db7738bfe291e349bf69395f5d795ca2d6176550eab81b914e261e127d185ee60aca63917b5742608bda6e265
+AUX libtabe-0.2.6-ldflags.patch 2026 BLAKE2B 5902556cc1e28fb7baca2c6fbd0d7315124efa81cb9ecf960a8f40147d5c76204d09e168be0fed5b16c2d3e660d82579d5ce6e90d5cb01c55a5dafb76ef48fe7 SHA512 c7aebc251a287d0026f8b78649b30e7551e925ae936033d7af365c74416db6e350dc026f1550d3c84feb50916be661b14060b41534642531ac7871a1a0e5f233
+DIST libtabe_0.2.6-1.1.diff.gz 74149 BLAKE2B cbd5ba77d41ef147a339c6456bf42fb16b31a6928ab858338b52960ec3c8a4aa24af194d9c2eb92f64738af4f3289b889efb76ce792225823dc3d8e8f4ce8837 SHA512 001a08d69d93f0092c8a54c11a88afab850de1383febeda68c1a6b2a2b1447d01c929de47c7d947e390706d0bec6b8825b8fe11fc6c8a40d6d047b644009b6e2
+DIST libtabe_0.2.6-1.2.diff.gz 74362 BLAKE2B d09e91bad9e9e3240cdc261140012977f318436af420564692152a8b7a99cd7c427433a6180c1f9490995b43cd95200318ffb5dab68fc18561d7ced58fd00bd6 SHA512 011a76f3c8a1c13a6cfd0e96eb41557a8bfbf1aca8cb79daee0f0941b920d25614df5e0479368bf7075cb511851cab4c9113b30656d55b4d29128eb7312d0ef1
+DIST libtabe_0.2.6.orig.tar.gz 1792199 BLAKE2B fec2259678a57b144eccf49ba459d2930f89f871873b3547040fd570a0f8510bc84e27609b1ca2d82596d5a025f0bd7251870655f4a83758be806f75db5abb48 SHA512 88f1cb279ccf487de5d0f8a1e9eede8d5ca16e4507b59db0b66241d0cdae609ed0b04093a82eabe0569f885aa397c1d5fa3f0ae3c3270a348ce045d73e01fbc7
+EBUILD libtabe-0.2.6.1.2.ebuild 1438 BLAKE2B 35ea812b928286aafb537e27764564a749de41ea0d967cdcd7bdaac503575f66cb6f7287241946ad49f0799540352eb09f0926c501e57d12034e9be103e75cf5 SHA512 418ef8f4f12a20d588e18fbb224804cc20b0d0ca1dc368d0a0d37b8566b9055f05381849df31ee19f79073953a00c11f14d9d2720b3d8e233f3f3ee2b8be32b6
+EBUILD libtabe-0.2.6.ebuild 1097 BLAKE2B beba2fc5ac62c9ecd35974d0fddb4a566570b4717569a053c2d6a797dbeb05b977593045805d6f527a3383d81630881d5ba6d807960ed948fe342b77372d5be8 SHA512 69192cbe9f460f991fd483a5ab62edca21ccf2a047165b47bbf68950b715840160135fd4551c77fbd1759eb484dcfb5550238b109d4351096fe49afad17f85ce
+MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-i18n/libtabe/files/libtabe-0.2.6-fabs.patch b/app-i18n/libtabe/files/libtabe-0.2.6-fabs.patch
new file mode 100644
index 000000000000..79964602e754
--- /dev/null
+++ b/app-i18n/libtabe/files/libtabe-0.2.6-fabs.patch
@@ -0,0 +1,24 @@
+ * QA Notice: Package has poor programming practices which may compile
+ *            fine but exhibit random runtime failures.
+ * 	tabe_tsi.c:385: warning: incompatible implicit declaration of built-in function ‘fabs’
+ *	tabe_tsi.c:437: warning: incompatible implicit declaration of built-in function ‘fabs’
+ *	tabe_tsi.c:496: warning: incompatible implicit declaration of built-in function ‘fabs’
+ * Please do not file a Gentoo bug and instead report the above QA
+ * issues directly to the upstream developers of this software.
+ * Homepage: https://packages.qa.debian.org/libt/libtabe.html
+
+diff -NrU5 libtabe-0.2.6.orig.really/src/tabe_tsi.c libtabe-0.2.6.orig/src/tabe_tsi.c
+--- libtabe-0.2.6.orig.really/src/tabe_tsi.c	2008-04-20 01:35:56.000000000 +0200
++++ libtabe-0.2.6.orig/src/tabe_tsi.c	2008-04-20 01:36:46.000000000 +0200
+@@ -12,10 +12,11 @@
+ #endif
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <math.h>
+ 
+ #include "tabe.h"
+ 
+ struct TsiInfo *
+ tabeTsiInfoNew(char *str)
diff --git a/app-i18n/libtabe/files/libtabe-0.2.6-ldflags.patch b/app-i18n/libtabe/files/libtabe-0.2.6-ldflags.patch
new file mode 100644
index 000000000000..0f51b19b71f2
--- /dev/null
+++ b/app-i18n/libtabe/files/libtabe-0.2.6-ldflags.patch
@@ -0,0 +1,57 @@
+diff --git a/src/Makefile.in b/src/Makefile.in
+index ada3dca..6acd71c 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -10,7 +10,7 @@ CPPFLAGS        = @CPPFLAGS@
+ DEFS            = @DEFS@
+ RANLIB          = @RANLIB@
+ LN_S            = @LN_S@
+-LDFLAGS	        = @with_db_lib@
++LDFLAGS	        = @with_db_lib@ @LDFLAGS@
+ INC	        = @with_db_inc@
+ INSTALL         = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -55,7 +55,7 @@ all: $(LIBNAME) @build_supports@
+ 
+ $(LIBNAME): $(LIBOBJS)
+ 	$(LIBTOOL) --mode=link $(CC) -o $@ $(LIBOBJS) -rpath $(libdir) \
+-		-version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER)
++		-version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER) $(LDFLAGS)
+ 
+ bims:
+ 	(cd supports/bims; $(MAKE))
+diff --git a/src/supports/bims/Makefile.in b/src/supports/bims/Makefile.in
+index dc2534d..0e3041b 100644
+--- a/src/supports/bims/Makefile.in
++++ b/src/supports/bims/Makefile.in
+@@ -10,7 +10,7 @@ CPPFLAGS        = @CPPFLAGS@
+ DEFS            = @DEFS@
+ RANLIB          = @RANLIB@
+ LN_S            = @LN_S@
+-LDFLAGS         = @with_db_lib@
++LDFLAGS         = @with_db_lib@ @LDFLAGS@
+ INC             = -I../..
+ INSTALL         = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -45,7 +45,7 @@ all: $(LIBNAME)
+ 
+ $(LIBNAME): $(LIBOBJS)
+ 	$(LIBTOOL) --mode=link $(CC) -o $@ $(LIBOBJS) -rpath $(libdir) \
+-		-version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER)
++		-version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER) $(LDFLAGS)
+ 
+ bims.lo: bims.c bims.h
+ 	$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(DEFS) $(INC) -o $@ bims.c
+diff --git a/util/Makefile.in b/util/Makefile.in
+index cb82736..16425d1 100644
+--- a/util/Makefile.in
++++ b/util/Makefile.in
+@@ -10,7 +10,7 @@ CPPFLAGS        = @CPPFLAGS@
+ DEFS            = @DEFS@
+ RANLIB          = @RANLIB@
+ LN_S            = @LN_S@
+-LDFLAGS         = ../src/libtabe.la @with_db_lib@
++LDFLAGS         = ../src/libtabe.la @with_db_lib@ @LDFLAGS@
+ INC             = -I../src @with_db_inc@
+ INSTALL		= @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild b/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild
new file mode 100644
index 000000000000..3f33549ccf4b
--- /dev/null
+++ b/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+WANT_AUTOMAKE=1.11
+
+inherit eutils libtool autotools multilib versionator
+
+DEBIAN_PV=$(replace_version_separator 3 '-')
+DEBIAN_PATCH=${PN}_${DEBIAN_PV}.diff
+ORIG_PV=${DEBIAN_PV%-*}
+ORIG_P=${PN}-${ORIG_PV}
+
+DESCRIPTION="Libtabe provides bimsphone support for xcin-2.5+"
+HOMEPAGE="https://packages.qa.debian.org/libt/libtabe.html"
+SRC_URI="mirror://debian/pool/main/${PN:0:4}/${PN}/${PN}_${ORIG_PV}.orig.tar.gz
+	mirror://debian/pool/main/${PN:0:4}/libtabe/${DEBIAN_PATCH}.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="debug"
+
+DEPEND=">=sys-libs/db-4.5
+	x11-libs/libX11"
+
+S=${WORKDIR}/${ORIG_P}.orig
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}"/${DEBIAN_PATCH}
+	epatch "${FILESDIR}"/${ORIG_P}-fabs.patch
+	epatch "${FILESDIR}"/${ORIG_P}-ldflags.patch
+
+	ln -s script/configure.in . || die
+	eautoreconf
+}
+
+src_compile() {
+	myconf="--with-db-inc=/usr/include
+		--with-db-lib=/usr/$(get_libdir)
+		--with-db-bin=/usr/bin
+		--with-db-name=db
+		--enable-shared
+		--disable-static
+		$(use_enable debug)"
+
+	econf ${myconf}
+
+	# We execute this serially because the Makefiles don't handle
+	# proper cross-directory references.
+	for dir in src util tsi-src; do
+		emake -C ${dir} || die "make failed"
+	done
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc doc/* || die
+}
diff --git a/app-i18n/libtabe/libtabe-0.2.6.ebuild b/app-i18n/libtabe/libtabe-0.2.6.ebuild
new file mode 100644
index 000000000000..21639e688efb
--- /dev/null
+++ b/app-i18n/libtabe/libtabe-0.2.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils libtool autotools multilib
+
+DESCRIPTION="Libtabe provides bimsphone support for xcin-2.5+"
+HOMEPAGE="https://packages.qa.debian.org/libt/libtabe.html"
+SRC_URI="mirror://debian/pool/main/libt/libtabe/${P/-/_}.orig.tar.gz
+	mirror://debian/pool/main/libt/libtabe/${P/-/_}-1.1.diff.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE="debug"
+
+DEPEND=">=sys-libs/db-4.5
+	x11-libs/libX11"
+
+S=${WORKDIR}/${P}.orig
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}"/${P/-/_}-1.1.diff
+	epatch "${FILESDIR}"/${P}-fabs.patch
+	rm -f configure
+	elibtoolize
+	cd script
+	eautoreconf
+	cp script/* ./
+	cp configure ../
+	cd ..
+}
+
+src_compile() {
+	myconf="--with-db-inc=/usr/include
+		--with-db-lib=/usr/$(get_libdir)
+		--with-db-bin=/usr/bin
+		--with-db-name=db
+		--enable-shared
+		--disable-static
+		$(use_enable debug)"
+
+	econf ${myconf}
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc doc/*
+}
diff --git a/app-i18n/libtabe/metadata.xml b/app-i18n/libtabe/metadata.xml
new file mode 100644
index 000000000000..c921b96adf6c
--- /dev/null
+++ b/app-i18n/libtabe/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-i18n/man-pages-da-0.1.2 b/app-i18n/man-pages-da-0.1.2
deleted file mode 100644
index 7557d3b600a4..000000000000
--- a/app-i18n/man-pages-da-0.1.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=A somewhat comprehensive collection of Danish Linux man pages
-EAPI=4
-HOMEPAGE=http://www.sslug.dk/locale/man-sider/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=freedist
-RDEPEND=virtual/man
-SLOT=0
-SRC_URI=http://www.sslug.dk/locale/man-sider/manpages-da-0.1.2.tar.gz
-_md5_=3d081b690244bf6d7a8d125e2d63f036
diff --git a/app-i18n/man-pages-da/Manifest b/app-i18n/man-pages-da/Manifest
new file mode 100644
index 000000000000..695bd7b9cfe7
--- /dev/null
+++ b/app-i18n/man-pages-da/Manifest
@@ -0,0 +1,3 @@
+DIST manpages-da-0.1.2.tar.gz 8962 BLAKE2B 27a0ee206f137b818019ee74fb4091a9b30e526c16a40f763f4070c9fe5932ef48d50f06c2443c377c86af78c3f7f50a9275db258863bfb800f93c703c86e623 SHA512 7642908f5952f54c0db6af6886b6592e10889d8734776d8d42fe923b084ef85732820d40a095936e6f1bf48d9430b401afeb28202e530b5a48e4a3447ed5c4c6
+EBUILD man-pages-da-0.1.2.ebuild 619 BLAKE2B 470f5d20e7c51d9f25d8f3ef8cfa3813ff350d16c7f51cf4573e5c65bee0b4029cf3577827913da3bc2756d708ea2ac3459895ef21777d21f8f93ddae3233f09 SHA512 73f2dcbb0d6b2616a604b50c6d70ad6cd92972b97f17ce83d8dc8308e5d8d3a511e0f0ece10788d7149320a3134a8f828fb21f509b5d7dbe77ab34e66e52f9c1
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-i18n/man-pages-da/man-pages-da-0.1.2.ebuild b/app-i18n/man-pages-da/man-pages-da-0.1.2.ebuild
new file mode 100644
index 000000000000..17ec81920617
--- /dev/null
+++ b/app-i18n/man-pages-da/man-pages-da-0.1.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="A somewhat comprehensive collection of Danish Linux man pages"
+HOMEPAGE="http://www.sslug.dk/locale/man-sider/"
+SRC_URI="http://www.sslug.dk/locale/man-sider/manpages-da-${PV}.tar.gz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+RDEPEND="virtual/man"
+
+S=${WORKDIR}/manpages-da-${PV}
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr/share/man
+	emake install-data PREFIX="${D}"/usr/share
+	dodoc AUTHORS ChangeLog
+}
diff --git a/app-i18n/man-pages-da/metadata.xml b/app-i18n/man-pages-da/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-i18n/man-pages-da/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-i18n/man-pages-de-1.15 b/app-i18n/man-pages-de-1.15
deleted file mode 100644
index aeff57e2acd0..000000000000
--- a/app-i18n/man-pages-de-1.15
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-text/po4a >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A somewhat comprehensive collection of Linux german man page translations
-EAPI=6
-HOMEPAGE=https://alioth.debian.org/projects/manpages-de/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-3+ man-pages GPL-2+ GPL-2 BSD
-RDEPEND=virtual/man
-SLOT=0
-SRC_URI=https://manpages-de.alioth.debian.org/downloads/manpages-de-1.15.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=4657650b2de2851afda7571f1212a25e
diff --git a/app-i18n/man-pages-de-1.21 b/app-i18n/man-pages-de-1.21
deleted file mode 100644
index 466975e8ca7e..000000000000
--- a/app-i18n/man-pages-de-1.21
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-text/po4a >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A somewhat comprehensive collection of Linux german man page translations
-EAPI=6
-HOMEPAGE=https://alioth.debian.org/projects/manpages-de/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-3+ man-pages GPL-2+ GPL-2 BSD
-RDEPEND=virtual/man
-SLOT=0
-SRC_URI=https://manpages-de.alioth.debian.org/downloads/manpages-de-1.21.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=80e2de93ad5f3c19e072e216f20a6fac
diff --git a/app-i18n/man-pages-de-2.3 b/app-i18n/man-pages-de-2.3
deleted file mode 100644
index 4392388ee0dd..000000000000
--- a/app-i18n/man-pages-de-2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-text/po4a >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A somewhat comprehensive collection of Linux german man page translations
-EAPI=6
-HOMEPAGE=https://alioth.debian.org/projects/manpages-de/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-3+ man-pages GPL-2+ GPL-2 BSD
-RDEPEND=virtual/man
-SLOT=0
-SRC_URI=https://manpages-de.alioth.debian.org/downloads/manpages-de-2.3.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=fd4a3d51e009ecb87f66770eaac555ec
diff --git a/app-i18n/man-pages-de/Manifest b/app-i18n/man-pages-de/Manifest
new file mode 100644
index 000000000000..ca5bf5a1b456
--- /dev/null
+++ b/app-i18n/man-pages-de/Manifest
@@ -0,0 +1,8 @@
+AUX man-pages-de-1.3-bzip2.patch 604 BLAKE2B 0569a8303e3e28ecbdeaaab04f9ce7a84fb7309485bf7e82da1cbb3aabe0e1987e3a192a27d793cb32bcb36fd8f4dd06ef5940c90ce32e92f3cc783b0387c5aa SHA512 ab07f650572e97cd4bcc31d438d601be182c98998086be9d875b0193a9c7ebe0add85e2cb14867082f70b009acfdd102fe743af02a947f3f41111594c7082932
+DIST manpages-de-1.15.tar.xz 1529576 BLAKE2B 600d9c186ffa46fd1db110c3889abc44bb6ccb6847ed8385c461c7fa696f5a9e8a65233d1290ae9d1e9eb26694e8769aa35983f07205a0e7e57c9b0c14c7d7bc SHA512 d1f1b9f60c4713d6be650e21b7664ff594dbd542b53148c00d1a2269413d39615dd76be4c4095eeb72e2598b94af134ca5d128b85d9520a1ac404364b8a53948
+DIST manpages-de-1.21.tar.xz 1585600 BLAKE2B f2364e0b5fc1ca8ce8f5eb7fa5987d1bc68b1f8f2c1a26240d5cabd03eb5bb094f0d63274c7208059a766498f5f20ca7ccab72a9d4847057aae3b7d6697018e7 SHA512 24cc36e8e9c2efb8cd2a0c374a3f5da96f6645a306082cc28aae5933081f7de24bac03652f690a2becd32a23a93c17ddd9029190c299dda95eeb25f49b327fac
+DIST manpages-de-2.3.tar.xz 7016372 BLAKE2B 3b89049d11bfd539e9114de38198f610145972068c9cec1da1b6398fb1d3e846b112ca0336891c1782a6fb142f397ac472ad78be0596503377318bfe65ec68d2 SHA512 abc3574c4a315d86b4fcccb25d617851c1ff43844fc7b1b92d7849a098280a96ab73d4986047fe6bb18e8f11d391182370eff9db476e0dd2021d0725b4e945eb
+EBUILD man-pages-de-1.15.ebuild 1289 BLAKE2B 2aa0d95614a5cb2d22a63c661befd01b789e6c7e322a48c013d5b408058235141bf0db7680f81da0016b8f03d246b8de6cc6ac0528cbbfc3aad4fba11bc475d1 SHA512 7f090cb1bef72e48034e98f5868378f47683575dde6668177871b12e1d06bf46cdfffb7b03877d19e57c925cb5c6cb599f766710743d150a79e36ea4f5258f57
+EBUILD man-pages-de-1.21.ebuild 1252 BLAKE2B 49503d85ab5a60b5dc5475f11d4ddc042abb3883665336450179a2247279ee0171037f7937195467e4d7b25dd8671f7a676171c7ad983f9134c7430689139df1 SHA512 2158482fb6541e0391b3c916da51fbc1bd5e67c8a283cc0a795e6e68462eb3c1ce343b8fc9161199a8bf56632505f0c1fd39e4527dffdbb61e5797286d1ae6b9
+EBUILD man-pages-de-2.3.ebuild 1356 BLAKE2B 99e0104647b0f1d80125a744b33a0e846cdf8f3d3acc846908376cebfaa1648aceb4a570116e035765164cbabb360ae7b995c522355aba97ed84530eadb90b12 SHA512 6a6081d2116fd0d756e22b8f1ab6d905ab57b9bbef6f7f084df50afe1afbd1187f16c79d800bcf00f9ab8cf3ea3869dd527fa885c0ebad8b0b3d6074d0d919e9
+MISC metadata.xml 369 BLAKE2B 41170815bcde0a65831b0453eee7b99359594bc67d345e31d1228d6b5def740d73087b96473511a8249528ac16a80b0eeee91791f9d4f113cb5caed918b40552 SHA512 e36208b3689927021e51ad2348ba3f5a5598b9657ffd7156d928dc817b90ed91a57d43605eb8a3e2fde1caf04349ba76b68ebc7ead1061ecca66280095179658
diff --git a/app-i18n/man-pages-de/files/man-pages-de-1.3-bzip2.patch b/app-i18n/man-pages-de/files/man-pages-de-1.3-bzip2.patch
new file mode 100644
index 000000000000..09a569c23498
--- /dev/null
+++ b/app-i18n/man-pages-de/files/man-pages-de-1.3-bzip2.patch
@@ -0,0 +1,19 @@
+--- a/po/generate-manpage.sh
++++ b/po/generate-manpage.sh
+@@ -38,6 +38,16 @@
+ 		original="$uncompressed_manpage"
+ 	fi
+ fi
++# Try a bzip'ed version
++if [ ! -f "$original" ]; then
++	original=/usr/share/man/man$section/$manpage.bz2
++	if [ -f "$original" ]; then
++		# The manpage exists, but needs to be decompressed
++		uncompressed_manpage=`mktemp`
++		bzip2 -d -c "$original" > "$uncompressed_manpage"
++		original="$uncompressed_manpage"
++	fi
++fi
+ # Cannot generate manpage if the original could not be found
+ if [ ! -f "$original" ]; then
+ 	echo "The original manpage for $manpage could not be found." >&2
diff --git a/app-i18n/man-pages-de/man-pages-de-1.15.ebuild b/app-i18n/man-pages-de/man-pages-de-1.15.ebuild
new file mode 100644
index 000000000000..49370f0b46bd
--- /dev/null
+++ b/app-i18n/man-pages-de/man-pages-de-1.15.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_P="${PN/-/}-${PV}"
+
+DESCRIPTION="A somewhat comprehensive collection of Linux german man page translations"
+HOMEPAGE="https://alioth.debian.org/projects/manpages-de/"
+SRC_URI="https://manpages-de.alioth.debian.org/downloads/${MY_P}.tar.xz"
+
+LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+RDEPEND="virtual/man"
+DEPEND="app-text/po4a"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3-bzip2.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# Use the same compression as every other manpage
+	local PORTAGE_COMPRESS_LOCAL=${PORTAGE_COMPRESS-bzip2}
+	if [[ ${PORTAGE_COMPRESS+set} == "set" ]] ; then
+		PORTAGE_COMPRESS_LOCAL="#"
+	fi
+	if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
+		case ${PORTAGE_COMPRESS_LOCAL} in
+			bzip2|gzip)  local PORTAGE_COMPRESS_FLAGS_LOCAL="-9"
+			;;
+		esac
+	fi
+	sed -i -e "s/gzip --best/${PORTAGE_COMPRESS_LOCAL} ${PORTAGE_COMPRESS_FLAGS_LOCAL}/"\
+		po/man{1,2,3,4,5,6,7,8}/Makefile.in po/common.mk || die
+	eautoreconf
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake mandir="${ED}"/usr/share/man install
+	dodoc CHANGES README
+}
diff --git a/app-i18n/man-pages-de/man-pages-de-1.21.ebuild b/app-i18n/man-pages-de/man-pages-de-1.21.ebuild
new file mode 100644
index 000000000000..99357591bc93
--- /dev/null
+++ b/app-i18n/man-pages-de/man-pages-de-1.21.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_P="${PN/-/}-${PV}"
+
+DESCRIPTION="A somewhat comprehensive collection of Linux german man page translations"
+HOMEPAGE="https://alioth.debian.org/projects/manpages-de/"
+SRC_URI="https://manpages-de.alioth.debian.org/downloads/${MY_P}.tar.xz"
+
+LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/man"
+DEPEND="app-text/po4a"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# Use the same compression as every other manpage
+	local PORTAGE_COMPRESS_LOCAL=${PORTAGE_COMPRESS-bzip2}
+	if [[ ${PORTAGE_COMPRESS+set} == "set" ]] ; then
+		PORTAGE_COMPRESS_LOCAL="#"
+	fi
+	if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
+		case ${PORTAGE_COMPRESS_LOCAL} in
+			bzip2|gzip)  local PORTAGE_COMPRESS_FLAGS_LOCAL="-9"
+			;;
+		esac
+	fi
+	sed -i -e "s/gzip --best/${PORTAGE_COMPRESS_LOCAL} ${PORTAGE_COMPRESS_FLAGS_LOCAL}/"\
+		po/man{1,2,3,4,5,6,7,8}/Makefile.in po/common.mk || die
+	eautoreconf
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake mandir="${ED}"/usr/share/man install
+	dodoc CHANGES README
+}
diff --git a/app-i18n/man-pages-de/man-pages-de-2.3.ebuild b/app-i18n/man-pages-de/man-pages-de-2.3.ebuild
new file mode 100644
index 000000000000..0b4510bd50ca
--- /dev/null
+++ b/app-i18n/man-pages-de/man-pages-de-2.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_P="${PN/-/}-${PV}"
+
+DESCRIPTION="A somewhat comprehensive collection of Linux german man page translations"
+HOMEPAGE="https://alioth.debian.org/projects/manpages-de/"
+SRC_URI="https://manpages-de.alioth.debian.org/downloads/${MY_P}.tar.xz"
+
+LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/man"
+DEPEND="app-text/po4a"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# sys-apps/shadow has it's own translated man-page for this
+	rm upstream/primary/man1/groups.1 po/primary/man1/groups.1.po || die
+
+	# Use the same compression as every other manpage
+	local PORTAGE_COMPRESS_LOCAL=${PORTAGE_COMPRESS-bzip2}
+	if [[ ${PORTAGE_COMPRESS+set} == "set" ]] ; then
+		PORTAGE_COMPRESS_LOCAL="#"
+	fi
+	if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
+		case ${PORTAGE_COMPRESS_LOCAL} in
+			bzip2|gzip)  local PORTAGE_COMPRESS_FLAGS_LOCAL="-9"
+			;;
+		esac
+	fi
+	sed -i -e "s/gzip --best/${PORTAGE_COMPRESS_LOCAL} ${PORTAGE_COMPRESS_FLAGS_LOCAL}/"\
+		po/Makefile.in || die
+	eautoreconf
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake mandir="${ED}"/usr/share/man install
+	dodoc CHANGES.md README.md
+}
diff --git a/app-i18n/man-pages-de/metadata.xml b/app-i18n/man-pages-de/metadata.xml
new file mode 100644
index 000000000000..71052039f476
--- /dev/null
+++ b/app-i18n/man-pages-de/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bureau@jonglieren-jena.de</email>
+		<name>Markus Oehme</name>
+	</maintainer>
+<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-i18n/man-pages-fr-3.40.1 b/app-i18n/man-pages-fr-3.40.1
deleted file mode 100644
index d41e78d2a8ba..000000000000
--- a/app-i18n/man-pages-fr-3.40.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A somewhat comprehensive collection of french Linux man pages
-EAPI=5
-HOMEPAGE=https://traduc.org/perkamon
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
-LICENSE=man-pages GPL-1+ GPL-2+ GPL-2 BSD BSD-2 MIT rc LDP-1 public-domain
-RDEPEND=virtual/man
-SLOT=0
-SRC_URI=https://alioth.debian.org/frs/download.php/3722/man-pages-fr-3.40.1.tar.bz2
-_md5_=1b1735b6fc7566b08e8e38e5b8a09eab
diff --git a/app-i18n/man-pages-fr-3.70 b/app-i18n/man-pages-fr-3.70
deleted file mode 100644
index 0e1e2ce2192b..000000000000
--- a/app-i18n/man-pages-fr-3.70
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A somewhat comprehensive collection of french Linux man pages
-EAPI=6
-HOMEPAGE=https://traduc.org/perkamon
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD FDL-1.1 FDL-1.2 GPL-2 GPL-2+
-RDEPEND=virtual/man
-SLOT=0
-SRC_URI=https://alioth.debian.org/frs/download.php/file/4119/man-pages-fr-3.70-1.tar.xz
-_md5_=d1568ecfa0bf68b65eb7459c85b31297
diff --git a/app-i18n/man-pages-fr/Manifest b/app-i18n/man-pages-fr/Manifest
new file mode 100644
index 000000000000..9b6ea9b655f7
--- /dev/null
+++ b/app-i18n/man-pages-fr/Manifest
@@ -0,0 +1,5 @@
+DIST man-pages-fr-3.40.1.tar.bz2 1136351 BLAKE2B ed175105dbcccc6c1fd8e888d5c015e91d166949821ff4441aa62e9bb002a0b79c493bba7b9a247103201c9f6a12f9d2a8618a00930669196a02e99dc9bb2cfa SHA512 58027da7b78a442a84448ed6d7c6c89ccbe97fd811afb26a9c6580da2e15b86f7fae4c876d773f7ceca1fbe92c265693eae01b76ad4795b52c0298ba25ac1330
+DIST man-pages-fr-3.70-1.tar.xz 1143156 BLAKE2B 09a86733caf03246e530e898688d0f93ef401a74cc66eb1f5ee05ded5dee0be45fc27fcbcf458f2c5a3286a6655c7b7302eb1b2759be6e0205e69db95ce989dc SHA512 7bb6991b2278c898d67d465ebe434dc3a969e9ec5c962ed6b6fdb41e66121a1924573f529d310adf30cd8494515888627b3226f26b906452a8882c4851c290d8
+EBUILD man-pages-fr-3.40.1.ebuild 618 BLAKE2B fcdd2fdc153a9ff981c7fda20389413b017e26081a17fe2bff26743538fc25d797f73e33c2cddeb3871834715b8fef598a43b5b79204202969808772fd4d0a76 SHA512 b3b1066de261417d929656f4004758a28d5f0866b29da89e361c2f3934b7ba0fabde514fa6a0d4dbc2fac4e8649a8b91c75093f5af32de3b7cbf87cd0560e7ba
+EBUILD man-pages-fr-3.70.ebuild 599 BLAKE2B 948aa31261c8d499ce0e67b3b640cddc414e8288983ed51e0a8f6bec2cfbcbfd288d65a1edface963fcfa4d7dfdf83e064d6b47680de1c82b0f5c3586abfb925 SHA512 af5795905c6ad7125ab80435af15742591d6307d49a1fa88a856eb9b34b976b1bf4da58ab055bbca9c86c7a5cfbb25b310251a6245523af4c917c0388c3f3f26
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-i18n/man-pages-fr/man-pages-fr-3.40.1.ebuild b/app-i18n/man-pages-fr/man-pages-fr-3.40.1.ebuild
new file mode 100644
index 000000000000..dc423e147e4f
--- /dev/null
+++ b/app-i18n/man-pages-fr/man-pages-fr-3.40.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A somewhat comprehensive collection of french Linux man pages"
+HOMEPAGE="https://traduc.org/perkamon"
+SRC_URI="https://alioth.debian.org/frs/download.php/3722/${P}.tar.bz2"
+
+LICENSE="man-pages GPL-1+ GPL-2+ GPL-2 BSD BSD-2 MIT rc LDP-1 public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="virtual/man"
+DEPEND=""
+
+S="${WORKDIR}/fr"
+
+src_install() {
+	dodoc README.fr
+	doman -i18n=fr man*/*
+}
diff --git a/app-i18n/man-pages-fr/man-pages-fr-3.70.ebuild b/app-i18n/man-pages-fr/man-pages-fr-3.70.ebuild
new file mode 100644
index 000000000000..9b8632e36abf
--- /dev/null
+++ b/app-i18n/man-pages-fr/man-pages-fr-3.70.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A somewhat comprehensive collection of french Linux man pages"
+HOMEPAGE="https://traduc.org/perkamon"
+SRC_URI="https://alioth.debian.org/frs/download.php/file/4119/${P}-1.tar.xz"
+
+LICENSE="BSD FDL-1.1 FDL-1.2 GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="virtual/man"
+DEPEND=""
+
+S="${WORKDIR}/fr"
+
+src_install() {
+	dodoc README.fr
+	doman -i18n=fr man*/*
+}
diff --git a/app-i18n/man-pages-fr/metadata.xml b/app-i18n/man-pages-fr/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-i18n/man-pages-fr/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-i18n/man-pages-it-2.80-r1 b/app-i18n/man-pages-it-2.80-r1
deleted file mode 100644
index d9e2d301b2fe..000000000000
--- a/app-i18n/man-pages-it-2.80-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=A somewhat comprehensive collection of Italian Linux man pages
-EAPI=5
-HOMEPAGE=http://it.tldp.org/man/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=man-pages GPL-2+ BSD MIT FDL-1.1+ public-domain man-pages-posix
-RDEPEND=virtual/man
-SLOT=0
-SRC_URI=ftp://ftp.pluto.it/pub/pluto/ildp/man/man-pages-it-2.80.tar.gz
-_md5_=7a964ad5233c978c8a18ae0e057bcbf5
diff --git a/app-i18n/man-pages-it-4.00 b/app-i18n/man-pages-it-4.00
deleted file mode 100644
index 1fec8c47cdc8..000000000000
--- a/app-i18n/man-pages-it-4.00
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=A somewhat comprehensive collection of Italian Linux man pages
-EAPI=5
-HOMEPAGE=http://it.tldp.org/man/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=man-pages GPL-2+ BSD MIT FDL-1.1+ public-domain man-pages-posix
-RDEPEND=virtual/man
-SLOT=0
-SRC_URI=ftp://ftp.pluto.it/pub/pluto/ildp/man/man-pages-it-4.00.tar.xz
-_md5_=4feea08f9ad69ea3e3064849b2be7ce5
diff --git a/app-i18n/man-pages-it/Manifest b/app-i18n/man-pages-it/Manifest
new file mode 100644
index 000000000000..ebe3ce789f0b
--- /dev/null
+++ b/app-i18n/man-pages-it/Manifest
@@ -0,0 +1,5 @@
+DIST man-pages-it-2.80.tar.gz 1789480 BLAKE2B 664121e6a6d8e73200546431ea97d0b8c751eaeed87e958ff0b0a822c651c7e489b05a7e26de23a889a4f1ab6fc21524bb81fab21f0331eedb4102d40cecfeb1 SHA512 81cee1b4d0c818b83830355ba1347df7a309b87ebfe3169db7763b22de8638273eacf377d0b9127aa1e748c8fd427eb268dda6d6c4b543c6d3788edda86980ef
+DIST man-pages-it-4.00.tar.xz 349192 BLAKE2B 90f25e7abfd64d0f175c2596bc9203626d9e7e53218d579081d17aa01665be20ffa721e33379107814a57715a35f480bb1833a2d3965f4b86b3247bf70e9162c SHA512 6392b42254eba42bd76f3aef3b6206396a817019df61462e44bd0f7dc519768cb1b1107726c45e402a0cf27e6f2ca8c8912363bd9bec7562b10e8fd5dcc60ffe
+EBUILD man-pages-it-2.80-r1.ebuild 719 BLAKE2B 731599ffa82862ffb559abb582c806a656f6b944b35ea68ea384e6e6bdcd89cd1ada2aa981e572354065de74b928177676a8e8d5bba0f8e360feb399215518e3 SHA512 63361bfbe5770c970332fcb43df2ee706a6ea06a098562eda2b55de9d6eef893e6dec1ee17c25678060599e1440b0f9032a5ba910364cf6ec8f46a29434f7cc1
+EBUILD man-pages-it-4.00.ebuild 725 BLAKE2B 3599abd3bff72c8083c12b0fa0a4585bed607b1e1392820ec633407c3fc3ee879ee93a34691aaa4cd3d5a6de0875720bff381938faebe18e80c3bda6bf7ab2cc SHA512 7c0cea795a609daa7c28e853131238de2b4aef497d6c3f07da23ecd21e99b5c4becee02c2d168d02b9b975a5aae1994605d3d4a4f2b90174054f006c9c1d445d
+MISC metadata.xml 421 BLAKE2B a703dcd3047685aa6aa2a276d88a4a2f7a804bfcdf9d2980af1cf243b5f002361e8ed0b78961baab773fc20d46a6f860c8c912b39dc8a821d7ff4dcc7b317de5 SHA512 0c58ae5b97148e94d374bba03e0a65a2462b5f0d750c4df4e52ebd0cfac649fe4f35011429423ef20a20391cf4d69c206eb8bfa3d4ddd060265427b6d96aa095
diff --git a/app-i18n/man-pages-it/man-pages-it-2.80-r1.ebuild b/app-i18n/man-pages-it/man-pages-it-2.80-r1.ebuild
new file mode 100644
index 000000000000..2a3c4dbf7b29
--- /dev/null
+++ b/app-i18n/man-pages-it/man-pages-it-2.80-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A somewhat comprehensive collection of Italian Linux man pages"
+HOMEPAGE="http://it.tldp.org/man/"
+SRC_URI="ftp://ftp.pluto.it/pub/pluto/ildp/man/${P}.tar.gz"
+
+LICENSE="man-pages GPL-2+ BSD MIT FDL-1.1+ public-domain man-pages-posix"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+RDEPEND="virtual/man"
+
+src_prepare() {
+	# bug 480970
+	rm man5/{dpkg.cfg,deb,deb-control}.5 || die
+}
+
+src_compile() { :; } # emake does bad things here
+
+src_install() {
+	doman -i18n=it man*/*
+
+	dodoc description readme CHANGELOG HOWTOHELP POSIX-COPYRIGHT
+}
diff --git a/app-i18n/man-pages-it/man-pages-it-4.00.ebuild b/app-i18n/man-pages-it/man-pages-it-4.00.ebuild
new file mode 100644
index 000000000000..162f6b988e84
--- /dev/null
+++ b/app-i18n/man-pages-it/man-pages-it-4.00.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A somewhat comprehensive collection of Italian Linux man pages"
+HOMEPAGE="http://it.tldp.org/man/"
+SRC_URI="ftp://ftp.pluto.it/pub/pluto/ildp/man/${P}.tar.xz"
+
+LICENSE="man-pages GPL-2+ BSD MIT FDL-1.1+ public-domain man-pages-posix"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/man"
+
+src_compile() { :; } # emake does bad things here
+
+src_install() {
+	doman -i18n=it man-pages/man[1-9]/* binutils/man[1-9]/* inetutils/man[1-9]/* \
+		util-linux/man[1-9]/* misc/man[1-9]/*
+
+	dodoc description README CHANGELOG
+}
diff --git a/app-i18n/man-pages-it/metadata.xml b/app-i18n/man-pages-it/metadata.xml
new file mode 100644
index 000000000000..2caf37121cff
--- /dev/null
+++ b/app-i18n/man-pages-it/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<maintainer status="active">
+			<email>giulio@pluto.it</email>
+			<name>Giulio Daprelà</name>
+		</maintainer>
+	</upstream>
+	<longdescription lang="en">
+		A somewhat comprehensive collection of Italian Linux man pages.
+	</longdescription>
+</pkgmetadata>
+
diff --git a/app-i18n/man-pages-ja-20171215 b/app-i18n/man-pages-ja-20171215
deleted file mode 100644
index 7e948dc7d195..000000000000
--- a/app-i18n/man-pages-ja-20171215
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=A collection of manual pages translated into Japanese
-EAPI=6
-HOMEPAGE=http://linuxjm.osdn.jp/ https://github.com/hattya/portage-man-pages-ja
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual
-RDEPEND=virtual/man
-SLOT=0
-SRC_URI=http://linuxjm.osdn.jp/man-pages-ja-20171215.tar.gz https://dev.gentoo.org/~hattya/distfiles/portage-man-pages-ja-20060415.tar.gz
-_md5_=336d4ad280ef2b4f7be2303bc896f602
diff --git a/app-i18n/man-pages-ja-20180315 b/app-i18n/man-pages-ja-20180315
deleted file mode 100644
index ec9a7771ff33..000000000000
--- a/app-i18n/man-pages-ja-20180315
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=A collection of manual pages translated into Japanese
-EAPI=6
-HOMEPAGE=http://linuxjm.osdn.jp/ https://github.com/hattya/portage-man-pages-ja
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual
-RDEPEND=virtual/man
-SLOT=0
-SRC_URI=http://linuxjm.osdn.jp/man-pages-ja-20180315.tar.gz https://dev.gentoo.org/~hattya/distfiles/portage-man-pages-ja-20060415.tar.gz
-_md5_=4c0f200c0b0b4bacf700c368b44e5b07
diff --git a/app-i18n/man-pages-ja/Manifest b/app-i18n/man-pages-ja/Manifest
new file mode 100644
index 000000000000..3f96f9e99387
--- /dev/null
+++ b/app-i18n/man-pages-ja/Manifest
@@ -0,0 +1,6 @@
+DIST man-pages-ja-20171215.tar.gz 4802604 BLAKE2B 24ded9e82f20df322fa7e96a05806f37f26796475f64e2b075a60b60762e4b331c96e82e0582896da323a643070779204fb50eb8e68156ba2e74a1a41649f10e SHA512 8cef4489e3210c2e30fd880c1639aaf314005c7f3987001677cd869924275cbf9df27fdc855cba9d887e5a185da72779167227a68a080d370b233bcd4eca4d30
+DIST man-pages-ja-20180315.tar.gz 4808885 BLAKE2B 961cb265d2a5034368ac5766555440019e3f80710644f9ca6389e9932391f806ab37803b198d4f3619ad2a3fb34a91092b7c50c8f5c69dd1a909268c739fb931 SHA512 5cc8d247f24aeeb5f9ef9b89f214f7d74cf3d1db8f46140cb307f8398bde785c13041ec2947173d3a79121285afb3a5b383d3bff972eba017e88d17d722c173a
+DIST portage-man-pages-ja-20060415.tar.gz 67347 BLAKE2B 77be89a79be1d4fc3c09cd7c74cd8ccfd18649cdf0121daec008b21114c5a77618a88f4abed266599b944aa5bf11fe55c5b6e89fbba51ebe2a548eb85d9a2c6d SHA512 37364cdcb27b460663bdae31fea1ac653317ba4d928a5325c51814eb1677d7d9fb9bcc55cf64d63a8e6daaefa34d8604e0efe3582308957397cad31325a6eaad
+EBUILD man-pages-ja-20171215.ebuild 2026 BLAKE2B 8206aff3e0fc7188882b4541efdffc7829aa124ffd7718c855340a901a9d67b08c58d7bc8557eb3f0a28d52b25accf77e7af8ad4bfc827e41d63bddf79697a03 SHA512 6b22c156fc08bddbb7f372965062c528183a1540455e5bb3d50beb9f25b6155766996040df2cb5479242461573d9bff9274a8f2ab0ac9c3f4afb72d65f38235b
+EBUILD man-pages-ja-20180315.ebuild 2036 BLAKE2B 75358ed3c4ef602079350d41614df056fd6783176030fd892e5692a95eb193735b802a08175902ec37dc567667120982e329c0e5fb1a3d6782bfd2ce445bdc23 SHA512 dccbb2386ffeed2d6ca228efb68017b7e208f273cb13130a5ffeada0aa658e1cb40bdbabcf9697d68e1841547a6cf83faf91783c8c816f4d5251d23dc180198f
+MISC metadata.xml 674 BLAKE2B 52381f36a78ec6aaf9855e9828d0f6e25f46c78d9049f90c604ef6ddd339e56831731c5e2a6c25731725767763cc37e9ece2a6d862500ed3de63c9501d305fa7 SHA512 4930172347182e65fa0fa30e2fcef5bfc391e6fb1dfefaa872ebe609c9583b58a5d8a62bfbddaf8b8ecf2a80ec30752c71fb658dfd4569a4493bc9eeff6de2b3
diff --git a/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
new file mode 100644
index 000000000000..c6dec00c02ab
--- /dev/null
+++ b/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+GENTOO_MAN_P="portage-${PN}-20060415"
+
+DESCRIPTION="A collection of manual pages translated into Japanese"
+HOMEPAGE="http://linuxjm.osdn.jp/ https://github.com/hattya/portage-man-pages-ja"
+SRC_URI="http://linuxjm.osdn.jp/${P}.tar.gz
+	https://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz"
+
+LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="virtual/man"
+
+src_prepare() {
+
+	sed -i -e "/^\(man\|shadow\)/s:Y:N:" script/pkgs.list || die
+
+	# remove man pages that are provided by other packages.
+	# - sys-apps/shadow +nls
+	rm -f manual/*/man1/{chfn,chsh,newgrp,su,passwd,groups}.1 || die
+	rm -f manual/*/man8/{vigr,vipw}.8 || die
+	# - app-arch/rpm +nls
+	rm -rf manual/rpm || die
+
+	for f in manual/*/man8/ld{,-linux}.so.8 ; do
+		mv ${f} ${f/.so.8/.so.ja.8} || die
+	done
+	mv "${WORKDIR}"/${GENTOO_MAN_P}/portage/g-cpan.pl{,.ja}.1 || die
+
+	eapply_user
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+
+	local x y z pkg
+
+	for x in $(tac script/pkgs.list | grep -v '^[#].*'); do
+		if [[ -z "$pkg" ]]; then
+			pkg=$x
+			continue
+		fi
+
+		if [[ "$x" == "N" ]]; then
+			pkg=
+			continue
+		fi
+
+		einfo "install $pkg"
+
+		for y in $(ls -d manual/$pkg/man* 2>/dev/null); do
+			doman -i18n=ja $y/*
+		done
+
+		pkg=
+	done
+
+	dodoc README
+
+	cd "${WORKDIR}"/${GENTOO_MAN_P}
+
+	for x in *; do
+		if [ -d "$x" ]; then
+			einfo "install $x"
+
+			for z in $(for y in $x/*.[1-9]; do echo ${y##*.}; done | sort | uniq); do
+				doman -i18n=ja $x/*.$z
+			done
+		fi
+	done
+
+	newdoc ChangeLog ChangeLog.GentooJP
+
+}
+
+pkg_postinst() {
+
+	echo
+	elog "JM (Japanese Manual) project has used utf8 encoding"
+	elog "since 2012/04."
+	elog "You need to set appropriate LANG variables to use"
+	elog "Japanese manpages."
+	elog "e.g."
+	elog "\tLANG=\"ja_JP.utf8\""
+	elog "\texport LANG"
+	echo
+
+}
diff --git a/app-i18n/man-pages-ja/man-pages-ja-20180315.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20180315.ebuild
new file mode 100644
index 000000000000..9f26bd6e50f6
--- /dev/null
+++ b/app-i18n/man-pages-ja/man-pages-ja-20180315.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+GENTOO_MAN_P="portage-${PN}-20060415"
+
+DESCRIPTION="A collection of manual pages translated into Japanese"
+HOMEPAGE="http://linuxjm.osdn.jp/ https://github.com/hattya/portage-man-pages-ja"
+SRC_URI="http://linuxjm.osdn.jp/${P}.tar.gz
+	https://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz"
+
+LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/man"
+
+src_prepare() {
+
+	sed -i -e "/^\(man\|shadow\)/s:Y:N:" script/pkgs.list || die
+
+	# remove man pages that are provided by other packages.
+	# - sys-apps/shadow +nls
+	rm -f manual/*/man1/{chfn,chsh,newgrp,su,passwd,groups}.1 || die
+	rm -f manual/*/man8/{vigr,vipw}.8 || die
+	# - app-arch/rpm +nls
+	rm -rf manual/rpm || die
+
+	for f in manual/*/man8/ld{,-linux}.so.8 ; do
+		mv ${f} ${f/.so.8/.so.ja.8} || die
+	done
+	mv "${WORKDIR}"/${GENTOO_MAN_P}/portage/g-cpan.pl{,.ja}.1 || die
+
+	eapply_user
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+
+	local x y z pkg
+
+	for x in $(tac script/pkgs.list | grep -v '^[#].*'); do
+		if [[ -z "$pkg" ]]; then
+			pkg=$x
+			continue
+		fi
+
+		if [[ "$x" == "N" ]]; then
+			pkg=
+			continue
+		fi
+
+		einfo "install $pkg"
+
+		for y in $(ls -d manual/$pkg/man* 2>/dev/null); do
+			doman -i18n=ja $y/*
+		done
+
+		pkg=
+	done
+
+	dodoc README
+
+	cd "${WORKDIR}"/${GENTOO_MAN_P}
+
+	for x in *; do
+		if [ -d "$x" ]; then
+			einfo "install $x"
+
+			for z in $(for y in $x/*.[1-9]; do echo ${y##*.}; done | sort | uniq); do
+				doman -i18n=ja $x/*.$z
+			done
+		fi
+	done
+
+	newdoc ChangeLog ChangeLog.GentooJP
+
+}
+
+pkg_postinst() {
+
+	echo
+	elog "JM (Japanese Manual) project has used utf8 encoding"
+	elog "since 2012/04."
+	elog "You need to set appropriate LANG variables to use"
+	elog "Japanese manpages."
+	elog "e.g."
+	elog "\tLANG=\"ja_JP.utf8\""
+	elog "\texport LANG"
+	echo
+
+}
diff --git a/app-i18n/man-pages-ja/metadata.xml b/app-i18n/man-pages-ja/metadata.xml
new file mode 100644
index 000000000000..77b309c35972
--- /dev/null
+++ b/app-i18n/man-pages-ja/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <longdescription>
+    Japanese translation of portage/gentoolkit man pages are contributed by
+    Gentoo Linux User Group Japan and maintained by that mailing list
+    (gentoojp-docs@ml.gentoo.gr.jp). All questions and comments should be
+    posted to that list with regard to man pages translation for
+    portage/gentoolkit.
+  </longdescription>
+  <upstream>
+    <remote-id type="sourceforge-jp">linuxjm</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/man-pages-nl-0.13.3 b/app-i18n/man-pages-nl-0.13.3
deleted file mode 100644
index 1b69d4b6e933..000000000000
--- a/app-i18n/man-pages-nl-0.13.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A somewhat comprehensive collection of Dutch Linux man pages
-EAPI=6
-HOMEPAGE=http://doc.nl.linux.org/MANPAGE/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=man-pages GPL-2+ GPL-2 BSD LDP-1
-RDEPEND=virtual/man
-SLOT=0
-SRC_URI=ftp://ftp.nl.linux.org/pub/DOC-NL/manpages-nl/manpages-nl-0.13.3.tar.gz
-_md5_=85c89c5daceac4104bb41ccd89b97969
diff --git a/app-i18n/man-pages-nl/Manifest b/app-i18n/man-pages-nl/Manifest
new file mode 100644
index 000000000000..847ff44409e2
--- /dev/null
+++ b/app-i18n/man-pages-nl/Manifest
@@ -0,0 +1,3 @@
+DIST manpages-nl-0.13.3.tar.gz 303975 BLAKE2B 645447f850f9b6621e190629892b5caef566e718052cea226584cf0ce6990bb8155080f19ceb45f86aee22b09730d3e1167a5ed02ebdf725867a48cdc6df03bd SHA512 2fe12911105366e3355a46f7da988ccb888ada5f20760a4651dd34a7dcb354e85796ca70f54c06b921dd7fffc7b5c9141b4a09b0a53bff383540621652e59591
+EBUILD man-pages-nl-0.13.3.ebuild 514 BLAKE2B fc8f9cb61cf3210476d93853df13a714f264e8820b13af3d3c3c751ef1694206d869d7f4814cb559b338403e52bc3318f3929e40f23e6314898af8a3de3f0d0c SHA512 493ffd385e9ec8e951e4210f9ddd1fc768545a14d67ca038eda814ea2d6049e14eec26c3f84f38a3f2fe418ccded87c791fa5e42d7f189e216639dc04be67389
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-i18n/man-pages-nl/man-pages-nl-0.13.3.ebuild b/app-i18n/man-pages-nl/man-pages-nl-0.13.3.ebuild
new file mode 100644
index 000000000000..b6aaeecd964f
--- /dev/null
+++ b/app-i18n/man-pages-nl/man-pages-nl-0.13.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A somewhat comprehensive collection of Dutch Linux man pages"
+HOMEPAGE="http://doc.nl.linux.org/MANPAGE/"
+SRC_URI="ftp://ftp.nl.linux.org/pub/DOC-NL/manpages-nl/manpages-nl-${PV}.tar.gz"
+
+LICENSE="man-pages GPL-2+ GPL-2 BSD LDP-1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+RDEPEND="virtual/man"
+
+S=${WORKDIR}/manpages-nl-${PV}
diff --git a/app-i18n/man-pages-nl/metadata.xml b/app-i18n/man-pages-nl/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-i18n/man-pages-nl/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-i18n/man-pages-pl-0.6 b/app-i18n/man-pages-pl-0.6
deleted file mode 100644
index 0d958836b149..000000000000
--- a/app-i18n/man-pages-pl-0.6
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=A collection of Polish translations of Linux manual pages
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/manpages-pl/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/manpages-pl/manpages-pl-0.6.tar.bz2
-_md5_=ac2fc24ee5246caea7a0345138e9e4fc
diff --git a/app-i18n/man-pages-pl-0.7 b/app-i18n/man-pages-pl-0.7
deleted file mode 100644
index cd07c820df47..000000000000
--- a/app-i18n/man-pages-pl-0.7
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=A collection of Polish translations of Linux manual pages
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/manpages-pl/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/manpages-pl/manpages-pl-0.7.tar.bz2
-_md5_=5fae68eaff82a62669e2f43b3648ea6e
diff --git a/app-i18n/man-pages-pl-0_pre20070628-r2 b/app-i18n/man-pages-pl-0_pre20070628-r2
deleted file mode 100644
index 8fc8ec21880a..000000000000
--- a/app-i18n/man-pages-pl-0_pre20070628-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A collection of Polish translations of Linux manual pages
-EAPI=4
-HOMEPAGE=http://www.batnet.pl/ptm/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.batnet.pl/ptm/man-PL28-06-2007.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e3596181d4e46cc93fc5e324815f0cd5
diff --git a/app-i18n/man-pages-pl/Manifest b/app-i18n/man-pages-pl/Manifest
new file mode 100644
index 000000000000..37c9cdb3cd09
--- /dev/null
+++ b/app-i18n/man-pages-pl/Manifest
@@ -0,0 +1,7 @@
+DIST man-PL28-06-2007.tar.gz 3436680 BLAKE2B 2f86479fa37ddf8653b3b5252485df10384c7204e7c4642ea8cda7f61d203edd5d1a473d183c1e27064ff6cadd314a546b78c63ec9f57d8f5b94875f0e259333 SHA512 cc5de191b5dc7963018db8c2e7094b8e4e6db0dc0afefaa3a36e73a0bc70a3889d68ce78c4a900862dc5590a00bf57a3897050ed25c45d2f6f33765858cc4c8b
+DIST manpages-pl-0.6.tar.bz2 3513993 BLAKE2B 3447da36b9f49b726286575d858ce74043c6a4d3954ed0329dd06a5ba796c873dc7fcfb6f905998c4b1776eeb5f5f5069236d97b4429a0d75786703857a8f0b5 SHA512 ff1841ae4e1d01af46f6f3e28ad1543d3f46ce9580665a9b4a538e96e87f77ec5b36ad26c7dc38ac816dd3c864643d47e0f809c8382e56d0c1418209849eeffa
+DIST manpages-pl-0.7.tar.bz2 3791061 BLAKE2B 81809280c78ecafc67c59a5353a589c119fe6b590c9d655dae4accb5247a178df9f3f186822834f3426b0d41ed9ab83f335204eb654acf2cf5a472dd7ca4cafb SHA512 79293e1bbfbaed5f97e63cb86fc1b445ea960fdee96567899ba9f6836d4188e0d80d4788180c29fdca3d358359b6fd3768c195857657819534942ece2c43694b
+EBUILD man-pages-pl-0.6.ebuild 662 BLAKE2B 9d630bedb4b0694f754dc97ca23f44186581c221d9cc2105bd9b29acb7e66f5cba5a42829b5774962f039a64b35ba648b95f6717dd265f72b7366cc66e8065d4 SHA512 77aeaabfb8d23d76ffb005b37c1165fec78e89ba5038f3cc08375f7dc664d4c82069a009270bf606968f905a862183f40e0e70aba53b581282a7115067cea055
+EBUILD man-pages-pl-0.7.ebuild 738 BLAKE2B da7b9f9b6cf45d839d854585e1202f67c5a1e28a63037fd8bb79808c5c3ea208124fd5905ba256fec38fb76300b9c525fa70559958eff7a1a5b579ba7a6b875c SHA512 91eecb04dab7d1d7d98ee55035afc0091d987e264bf22173f8134f8fde342122542ab2bed5b0f468cb2e31639d8a8ef70835640d06f409dbf1af6fdcbf62a408
+EBUILD man-pages-pl-0_pre20070628-r2.ebuild 1188 BLAKE2B 8579e466cb9020b2debbba6cc69e78329ca83c479665b2bd6b62ff6df68de3c8fbdb2ad17a33906e38c3362bda4640a41b54b64112c4b1a5d7263a2c9b97e25b SHA512 8403f9b302ca681e6b53afd7afa3f83c7e8ac01e72d7424b74b4eb74103229eae5c83fdb846a159f7db68151d664ddaba7c461d19e29a4f671ce988199bbea07
+MISC metadata.xml 447 BLAKE2B e8f0a2348cf7a9937b9aeaf647ed1da769201f131b377f965ac3965ee0d86a5fec00b61b804f4145e0c31c274a850481f756c8510e6ed49a951d533a94a427ce SHA512 ce47231649316f102bc2b2318d51b548efd9159b3c2df9edfc0e17dda5710cac2a39c1cd86961d842f627c4b6b83fcf32da0b6194518109b7fd69355ec337f54
diff --git a/app-i18n/man-pages-pl/man-pages-pl-0.6.ebuild b/app-i18n/man-pages-pl/man-pages-pl-0.6.ebuild
new file mode 100644
index 000000000000..b957174175b5
--- /dev/null
+++ b/app-i18n/man-pages-pl/man-pages-pl-0.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A collection of Polish translations of Linux manual pages"
+HOMEPAGE="https://sourceforge.net/projects/manpages-pl/"
+SRC_URI="mirror://sourceforge/manpages-pl/manpages-pl-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+DOCS=( AUTHORS README )
+
+S="${WORKDIR}/manpages-pl-${PV}"
+
+src_prepare() {
+	epatch_user
+	#mans provided by other packages
+	mans="generated/man1/groups.1 po/man1/groups.1.po"
+
+	for man in ${mans}; do
+		rm ${man} || die
+	done
+}
diff --git a/app-i18n/man-pages-pl/man-pages-pl-0.7.ebuild b/app-i18n/man-pages-pl/man-pages-pl-0.7.ebuild
new file mode 100644
index 000000000000..5e35393fd84b
--- /dev/null
+++ b/app-i18n/man-pages-pl/man-pages-pl-0.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PKG=manpages-pl-${PV}
+
+DESCRIPTION="A collection of Polish translations of Linux manual pages"
+HOMEPAGE="https://sourceforge.net/projects/manpages-pl/"
+SRC_URI="mirror://sourceforge/manpages-pl/${MY_PKG}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+DOCS=( AUTHORS README )
+
+S="${WORKDIR}/${MY_PKG}"
+
+src_prepare() {
+	default
+
+	#mans provided by other packages
+	rm generated/man1/groups.1 po/man1/groups.1.po || die "Failed to clean up duplicates from build directory!"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" COMPRESSOR=:
+}
diff --git a/app-i18n/man-pages-pl/man-pages-pl-0_pre20070628-r2.ebuild b/app-i18n/man-pages-pl/man-pages-pl-0_pre20070628-r2.ebuild
new file mode 100644
index 000000000000..06ebc4399c2e
--- /dev/null
+++ b/app-i18n/man-pages-pl/man-pages-pl-0_pre20070628-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools
+
+DESCRIPTION="A collection of Polish translations of Linux manual pages"
+HOMEPAGE="http://www.batnet.pl/ptm/"
+SRC_URI="http://www.batnet.pl/ptm/man-PL28-06-2007.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+DOCS=(AUTHORS ChangeLog FAQ NEWS README TODO)
+
+S="${WORKDIR}/pl_PL"
+
+src_prepare() {
+	# missing manpages
+	sed -i -e '/\tpasswd.1/ d' man1/Makefile.am || die
+
+	# manpages provided by other packages
+	mans="gendiff.1 groups.1 apropos.1 man.1 su.1 newgrp.1 whatis.1 gpasswd.1 chsh.1 \
+			chfn.1 limits.5 login.1 expiry.1 porttime.5 lastlog.8 faillog.8 logoutd.8 \
+			rpm.8 rpmdeps.8 rpmbuild.8 rpmcache.8 rpmgraph.8 rpm2cpio.8 evim.1 vim.1 \
+			vimdiff.1 vimtutor.1 ex.1 rview.1 rvim.1 view.1 suauth.5 mc.1"
+	# bug #375623:
+	mans="${mans} manpath.5 catman.8 mandb.8 zsoelim.1 manpath.1"
+	# bug #403379:
+	mans="${mans} shadow.3"
+	for page in ${mans} ; do
+		sed -i -e "/\\t${page}/d; \$s,\\\,,;" man${page: -1}/Makefile.am || die
+	done
+
+	eautoreconf
+}
diff --git a/app-i18n/man-pages-pl/metadata.xml b/app-i18n/man-pages-pl/metadata.xml
new file mode 100644
index 000000000000..0023617aeee6
--- /dev/null
+++ b/app-i18n/man-pages-pl/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>yoshi3@autograf.pl</email>
+		<name>Marcin Kowalski</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">manpages-pl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/man-pages-ru-4.08.2329.2329.20170422 b/app-i18n/man-pages-ru-4.08.2329.2329.20170422
deleted file mode 100644
index 771c5e0e5be7..000000000000
--- a/app-i18n/man-pages-ru-4.08.2329.2329.20170422
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A collection of Russian translations of Linux manual pages
-EAPI=6
-HOMEPAGE=http://man-pages-ru.sourceforge.net/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
-LICENSE=FDL-1.3
-RDEPEND=virtual/man
-SLOT=0
-SRC_URI=mirror://sourceforge/man-pages-ru/man-pages-ru_4.08-2329-2329-20170422.tar.bz2
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=50ff22f9f6da27396aecbd742efd22d4
diff --git a/app-i18n/man-pages-ru/Manifest b/app-i18n/man-pages-ru/Manifest
new file mode 100644
index 000000000000..d19a22c64a72
--- /dev/null
+++ b/app-i18n/man-pages-ru/Manifest
@@ -0,0 +1,3 @@
+DIST man-pages-ru_4.08-2329-2329-20170422.tar.bz2 1543256 BLAKE2B ea17641041c6f9168255d4b15d4a85fb50ec3273e1118a57fe4de2f2fe8849011b414975d451f44a5f99acc55ad571b8544043d13fdb3f935281ab9006714760 SHA512 4cfb9b67118d0b3ed44d7ec2f5cbd3e711e738225fe528e7a80c9503bc9136bbf81423772ce9e25abd46f172b90dcee931ebfec26ed79a6bf6d36cc0287af51f
+EBUILD man-pages-ru-4.08.2329.2329.20170422.ebuild 669 BLAKE2B 4bc7476722301274cbe6ed5489e61cae6ae6d0f6bd074e31dd635f357a30392c9600d06c49a99661e31eb16b5a2a6b3786fb1a4b0a0768cd3cb144981798f2d7 SHA512 35201a3994ee6354ac8f435a99387725ffc06fa8f9c5af3acebb3fc82b78a74de14358cda3777f795fbebf92693699d12db6156e7b5fe2574bd9648e2dc3be9d
+MISC metadata.xml 436 BLAKE2B 7e17e7dc25a13db3594b5a5e630e41ff08012b530736bcbb5f5a1cd302e705cf30025bf93afb31f3de631e01e9588a037d9213651f0ad358fd3a87ffb727ca3e SHA512 1f7c55f697fe501f62c9cde15f0f82cedf7cf62251efba961c4e236ec99974fe7345fd77a48d92eee9472fe519e7c4ea040fda5df31d743f2eddf09644ae81a5
diff --git a/app-i18n/man-pages-ru/man-pages-ru-4.08.2329.2329.20170422.ebuild b/app-i18n/man-pages-ru/man-pages-ru-4.08.2329.2329.20170422.ebuild
new file mode 100644
index 000000000000..ec58b1873370
--- /dev/null
+++ b/app-i18n/man-pages-ru/man-pages-ru-4.08.2329.2329.20170422.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+MY_PV="$(replace_version_separator 1 . $(replace_all_version_separators -))"
+
+DESCRIPTION="A collection of Russian translations of Linux manual pages"
+HOMEPAGE="http://man-pages-ru.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}.tar.bz2"
+
+LICENSE="FDL-1.3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND="virtual/man"
+
+S="${WORKDIR}/${PN}_${MY_PV}"
+
+src_install() {
+	insinto /usr/share/man/ru
+	doins -r man*
+	dodoc README
+}
diff --git a/app-i18n/man-pages-ru/metadata.xml b/app-i18n/man-pages-ru/metadata.xml
new file mode 100644
index 000000000000..d38c2811a3aa
--- /dev/null
+++ b/app-i18n/man-pages-ru/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">man-pages-ru</remote-id>
+		<maintainer>
+			<email>azamat.hackimov@gmail.com</email>
+			<name>Azamat Hackimov</name>
+		</maintainer>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/man-pages-zh_CN-1.5 b/app-i18n/man-pages-zh_CN-1.5
deleted file mode 100644
index 96c8d6cb07ab..000000000000
--- a/app-i18n/man-pages-zh_CN-1.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=A somewhat comprehensive collection of Chinese Linux man pages
-EAPI=5
-HOMEPAGE=http://cmpp.linuxforum.net/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
-LICENSE=FDL-1.2
-RDEPEND=virtual/man
-SLOT=0
-SRC_URI=http://download.sf.linuxforum.net/cmpp/man-pages-zh_CN-1.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c9660ee27e7c3f6b49c2ed18971e1edc
diff --git a/app-i18n/man-pages-zh_CN-1.6.3.2 b/app-i18n/man-pages-zh_CN-1.6.3.2
deleted file mode 100644
index 342c89a70240..000000000000
--- a/app-i18n/man-pages-zh_CN-1.6.3.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=A somewhat comprehensive collection of Chinese Linux man pages
-EAPI=6
-HOMEPAGE=https://github.com/man-pages-zh/manpages-zh
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=FDL-1.2
-RDEPEND=virtual/man
-SLOT=0
-SRC_URI=https://github.com/man-pages-zh/manpages-zh/archive/v1.6.3.2.tar.gz -> man-pages-zh_CN-1.6.3.2.tar.gz
-_md5_=29cf44298bd28c2a3361751f8c379d04
diff --git a/app-i18n/man-pages-zh_CN/Manifest b/app-i18n/man-pages-zh_CN/Manifest
new file mode 100644
index 000000000000..1e198de5cc12
--- /dev/null
+++ b/app-i18n/man-pages-zh_CN/Manifest
@@ -0,0 +1,5 @@
+DIST man-pages-zh_CN-1.5.tar.gz 3762338 BLAKE2B c2c740e6ae6f6e0cb26af7bca4e9d5ce75b20eb535362030565c8ed794c984ac8d1c7fe0ee354f58cbb37bc2dba1067afc33dbe4af07257938b0137156b43790 SHA512 799eac7e6c64dd9bb647bf490457bc6ece76870d261606e33f48df977762b66f778fb5afe3608443be100e516988c700ddb53de2a226e7b29d32348fa240ce91
+DIST man-pages-zh_CN-1.6.3.2.tar.gz 1845997 BLAKE2B 3af6859593e4b2a52ef3ce93f2d18fe0f102e63cee3c7035de04ab4d8b8ac491ceff284b1a2f01a5e4dcdc4869c2a9768ff7dfde48b9e89813a2e558bf7b259e SHA512 61171406482a24c3dfd1b6303af3d7fb086466d5f05d5799f50488beb78c91c5d1bcf574aab669b71fa0f027691a0be1a1d254d08f823ff4bd8bf976e0c83dff
+EBUILD man-pages-zh_CN-1.5.ebuild 643 BLAKE2B ec1026616838e311022ba6f1792b29e7e2529d869aade168aa7384995ba4ade5d7d97d4f2d7b18fc6e825289f999575ee618733ab0c0d7a7ca6a9b31ef36c7b7 SHA512 2311e3c84969eb1a5654b5e5f1eabf6c6331ffec4d566e3035f36946c830104171f65da7c5b2564e37f0dff3c72581cf94d44a979370cb2f223a06696fcea12b
+EBUILD man-pages-zh_CN-1.6.3.2.ebuild 840 BLAKE2B 3c3d0bcb492e4abb5a4a789d6250be66ee945a95932fd7eb5f85a3e64e162f1ad833d1c99258fb961d78557e446ab9a12e9b92e1f84e5af2472d0d2063c50ced SHA512 f8e426425001fda818a94c310286c248ce0c5ca13e67b2ebc7abd5a9c9704c1f89ba06c98d0d70a2218b87e42e8be3e5889924d26c0f35ae64f4c9e876fcb088
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.5.ebuild b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.5.ebuild
new file mode 100644
index 000000000000..c1d639ba7f7f
--- /dev/null
+++ b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A somewhat comprehensive collection of Chinese Linux man pages"
+HOMEPAGE="http://cmpp.linuxforum.net/"
+SRC_URI="http://download.sf.linuxforum.net/cmpp/${P}.tar.gz"
+
+LICENSE="FDL-1.2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="virtual/man"
+
+src_prepare() {
+	ecvs_clean
+}
+
+src_configure() { :; }
+
+src_compile() {
+	emake u8
+}
+
+src_install() {
+	emake install-u8 DESTDIR="${ED}"/usr/share
+	dodoc README* DOCS/*
+}
diff --git a/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild
new file mode 100644
index 000000000000..571125909774
--- /dev/null
+++ b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A somewhat comprehensive collection of Chinese Linux man pages"
+HOMEPAGE="https://github.com/man-pages-zh/manpages-zh"
+MY_PN="manpages-zh"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="https://github.com/man-pages-zh/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="FDL-1.2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="virtual/man"
+
+src_prepare() {
+	# remove man pages that are provided by other packages.
+	rm src/man1/groups.1 || die
+
+	eapply_user
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	doman -i18n=zh_CN src/man?/*.[1-9]*
+	dodoc README.md AUTHORS ChangeLog NEWS
+}
diff --git a/app-i18n/man-pages-zh_CN/metadata.xml b/app-i18n/man-pages-zh_CN/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-i18n/man-pages-zh_CN/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-i18n/mecab-skkserv-0.03 b/app-i18n/mecab-skkserv-0.03
deleted file mode 100644
index 646079d77647..000000000000
--- a/app-i18n/mecab-skkserv-0.03
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-text/mecab >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=mecab-skkserv is a Kana-Kanji conversion server using MeCab
-EAPI=6
-HOMEPAGE=http://chasen.org/~taku/software/mecab-skkserv/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 ipadic
-RDEPEND=app-text/mecab sys-apps/xinetd
-SLOT=0
-SRC_URI=http://chasen.org/~taku/software/mecab-skkserv/mecab-skkserv-0.03.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=663028a2166389c0befb20fbd816663c
diff --git a/app-i18n/mecab-skkserv/Manifest b/app-i18n/mecab-skkserv/Manifest
new file mode 100644
index 000000000000..9a85987e5c6a
--- /dev/null
+++ b/app-i18n/mecab-skkserv/Manifest
@@ -0,0 +1,7 @@
+AUX mecab-skkserv-cflags.patch 312 BLAKE2B 015a99b1645a278f59a959db91d52fe15608ebea7ab87edecfff4e56276d594849ed70db9bbfd4d45a0f77d425ed77d69e2475eec0c62e59b4dd0a1e1cc810c2 SHA512 7b3ae93eab4d0a13701c590d7cfd033fb3d34aa085beb59224bcd60823829c87674e0ee8edff2f8d73c204c56be668673e6dabd3ac5f60da34afae927bcc1106
+AUX mecab-skkserv-dicrc.patch 146 BLAKE2B 7bf9969ad1d16f8f8a3cd1a8efaa970795ae3658f58fde4335732c0dd352b281fe9765bb09276cc72df0fbd3ccdf44c91e083b96e5cff71cb9d37e73d70f5ea5 SHA512 9c96b2c71e8c06c1a7e12c5c4952a9202d06943aebb1e96b63d00084f77822af657745dbf2c926358739723444a99be86537d638d3eea5728b4392a22471314d
+AUX mecab-skkserv-getopt.patch 347 BLAKE2B 02332389fb70107d58e45fcb57e8a0883e29bb795e48731d84be74289b6b49fb6e52a75bc0e0bbacc37c7b2e17dc685ee07fe62527b0ad2deb8f632a06331257 SHA512 0edd393e1ed32f1a31778eec668d1f4ec5fd598251473af4e9ba74db71a67298927d973f552d589359dbb29c70f89f9d8e7fdb3e154608199614bf84aa9d438c
+AUX mecab-skkserv.xinetd 238 BLAKE2B cfb09ee995755129def89310cb16c512f030cbc3166bc67fffcb43c7031bc55bb7e582c2076853de5f32c809d4322363a681f085d943839ed387c31b1303a8aa SHA512 181ab3fb6abe4f4d7555db674881430d6149561459dbaca6fbc5081bfcba2154670e54a383dafd4b3339ed8f412a32d93f3c9024841c3b28c8c00808b5a5f366
+DIST mecab-skkserv-0.03.tar.gz 5398452 BLAKE2B 89327edb34a66e0acc42942bee09d835c5ca7d5834513d818914dbff1c74b838c964f2ddf79a4684dba551a4f0fda0d12f63086f7fac4b68dcddf89831aff44f SHA512 268621035391ec780b8aa04980d668afc83410853d25f06b4578dba3d4e3803ebfea42aabde1325fd80edad7524a4658480e40a00c6bfec1f04310a8d47bb2c9
+EBUILD mecab-skkserv-0.03.ebuild 823 BLAKE2B d381c7df93dd59a2a72fd5919d18ab1e3c35dfb316c3fe9968ff5ccb8f38e9eecb72ab3faf3a6942178c1676378db44b5c1374478f8f52cf2d786f616a89439e SHA512 66d8b8f387fa031891893f59f244c68200c2d0036758f87c67206f7471d158d52f3b0a24f3498fa4815aa515486f2605ba1010188a8b8e3c07cfec5e46402af8
+MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/mecab-skkserv/files/mecab-skkserv-cflags.patch b/app-i18n/mecab-skkserv/files/mecab-skkserv-cflags.patch
new file mode 100644
index 000000000000..4dcb1abc326e
--- /dev/null
+++ b/app-i18n/mecab-skkserv/files/mecab-skkserv-cflags.patch
@@ -0,0 +1,13 @@
+--- a/configure.in
++++ b/configure.in
+@@ -19,8 +19,8 @@ AC_CHECK_FUNCS(getopt)
+ AC_CHECK_FUNCS(getopt_long)
+ 
+ if test -n "$GCC"; then
+-   CFLAGS="-O3  -Wno-deprecated -Wall"
+-   CXXFLAGS="-O3 -Wno-deprecated -Wall"
++   CFLAGS+=" -Wno-deprecated -Wall"
++   CXXFLAGS+=" -Wno-deprecated -Wall"
+ fi
+ 
+ AC_ARG_WITH(
diff --git a/app-i18n/mecab-skkserv/files/mecab-skkserv-dicrc.patch b/app-i18n/mecab-skkserv/files/mecab-skkserv-dicrc.patch
new file mode 100644
index 000000000000..db7637775a45
--- /dev/null
+++ b/app-i18n/mecab-skkserv/files/mecab-skkserv-dicrc.patch
@@ -0,0 +1,7 @@
+--- a/dicrc
++++ b/dicrc
+@@ -2,3 +2,4 @@ bos-feature = BOS/EOS
+ node-format-ime = %H
+ unk-format-ime = %M
+ eos-format-ime  = \n
++cost-factor = 700
diff --git a/app-i18n/mecab-skkserv/files/mecab-skkserv-getopt.patch b/app-i18n/mecab-skkserv/files/mecab-skkserv-getopt.patch
new file mode 100644
index 000000000000..24b5017a28b3
--- /dev/null
+++ b/app-i18n/mecab-skkserv/files/mecab-skkserv-getopt.patch
@@ -0,0 +1,19 @@
+--- a/mecab-skkserv.cpp
++++ b/mecab-skkserv.cpp
+@@ -33,15 +33,9 @@
+ #include <stdexcept>
+ #include <set>
+ 
+-#ifdef HAVE_GETOPT_H
+-#include <getopt.h>
+-#endif
+-
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+-#endif
+-
+-#if defined HAVE_GETOPT_H && defined HAVE_GETOPT_LONG
++#elif defined(HAVE_GETOPT_H)
+ #include <getopt.h>
+ #else
+ #include "getopt.h"
diff --git a/app-i18n/mecab-skkserv/files/mecab-skkserv.xinetd b/app-i18n/mecab-skkserv/files/mecab-skkserv.xinetd
new file mode 100644
index 000000000000..f5d14c3a6ce3
--- /dev/null
+++ b/app-i18n/mecab-skkserv/files/mecab-skkserv.xinetd
@@ -0,0 +1,11 @@
+service skkserv
+{
+	disable         = yes
+	socket_type     = stream
+	wait            = no
+	user            = nobody
+	server          = /usr/bin/mecab-skkserv
+	only_from       = 127.0.0.1
+	log_on_failure += USERID
+	port            = 1178
+}
diff --git a/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild b/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild
new file mode 100644
index 000000000000..3f49e98dfc96
--- /dev/null
+++ b/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+DESCRIPTION="mecab-skkserv is a Kana-Kanji conversion server using MeCab"
+HOMEPAGE="http://chasen.org/~taku/software/mecab-skkserv/"
+SRC_URI="http://chasen.org/~taku/software/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 ipadic"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-text/mecab"
+RDEPEND="${DEPEND}
+	sys-apps/xinetd"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-cflags.patch
+	"${FILESDIR}"/${PN}-dicrc.patch
+	"${FILESDIR}"/${PN}-getopt.patch
+)
+HTML_DOCS=( index.html ${PN}.css )
+
+src_prepare() {
+	sed -i "/^dictdir/s:lib:$(get_libdir):" Makefile.am
+
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/${PN}.xinetd ${PN}
+}
diff --git a/app-i18n/mecab-skkserv/metadata.xml b/app-i18n/mecab-skkserv/metadata.xml
new file mode 100644
index 000000000000..e1a49f498885
--- /dev/null
+++ b/app-i18n/mecab-skkserv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-i18n/metadata.xml b/app-i18n/metadata.xml
new file mode 100644
index 000000000000..44756a003f77
--- /dev/null
+++ b/app-i18n/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The app-i18n category contains internationalisation-related packages.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie app-i18n enthält Programme im Zusammenhang mit Internationalisierung.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría app-i18n contiene paquetes para Internacionalización.
+	</longdescription>
+	<longdescription lang="ja">
+		app-i18nカテゴリ��国際化関連パッケージ���れ��。
+	</longdescription>
+	<longdescription lang="nl">
+		De app-i18n categorie bevat applicaties om te internationaliseren (vertalen).
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm app-i18n chứa các gói liên quan đến
+		quốc tế hoá (i18n).
+	</longdescription>
+	<longdescription lang="it">
+		La categoria app-i18n contiene pacchetti per l'internazionalizzazione.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria app-i18n contém pacotes para internacionalização.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria app-i18n zawiera pakiety zawierające tłumaczenia różnych
+		składników systemu na różne języki.
+	</longdescription>
+</catmetadata>
+
diff --git a/app-i18n/mozc-2.23.2815.102 b/app-i18n/mozc-2.23.2815.102
deleted file mode 100644
index aa763db19432..000000000000
--- a/app-i18n/mozc-2.23.2815.102
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-libs/protobuf-3.0.0:= emacs? ( virtual/emacs ) fcitx4? ( app-i18n/fcitx:4 ) gui? ( app-i18n/zinnia dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 handwriting-tegaki? ( app-i18n/tegaki-zinnia-japanese ) handwriting-tomoe? ( app-i18n/zinnia-tomoe ) ) ibus? ( >=app-i18n/ibus-1.4.1 dev-libs/glib:2 x11-libs/libxcb ) renderer? ( dev-libs/glib:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/gyp dev-util/ninja virtual/pkgconfig test? ( >=dev-cpp/gtest-1.8.0 dev-libs/jsoncpp )
-DESCRIPTION=Mozc - Japanese input method editor
-EAPI=6
-HOMEPAGE=https://github.com/google/mozc
-IUSE=debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=BSD BSD-2 ipadic public-domain unicode
-RDEPEND=>=dev-libs/protobuf-3.0.0:= emacs? ( virtual/emacs ) fcitx4? ( app-i18n/fcitx:4 ) gui? ( app-i18n/zinnia dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 handwriting-tegaki? ( app-i18n/tegaki-zinnia-japanese ) handwriting-tomoe? ( app-i18n/zinnia-tomoe ) ) ibus? ( >=app-i18n/ibus-1.4.1 dev-libs/glib:2 x11-libs/libxcb ) renderer? ( dev-libs/glib:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango )
-REQUIRED_USE=|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )
-SLOT=0
-SRC_URI=https://github.com/google/mozc/archive/afb03ddfe72dde4cf2409863a3bfea160f7a66d8.tar.gz -> mozc-2.23.2815.102.tar.gz https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/e5b3425575734c323e1d947009dd74709437b684.tar.gz -> japanese-usage-dictionary-20120416091336.tar.gz fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-2.23.2815.102.1.patch )
-_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=cf71561ab1f84c8c7e5d8a5fb2380e24
diff --git a/app-i18n/mozc-9999 b/app-i18n/mozc-9999
deleted file mode 100644
index 66b3af93f07f..000000000000
--- a/app-i18n/mozc-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-libs/protobuf-3.0.0:= emacs? ( virtual/emacs ) fcitx4? ( app-i18n/fcitx:4 ) gui? ( app-i18n/zinnia dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 handwriting-tegaki? ( app-i18n/tegaki-zinnia-japanese ) handwriting-tomoe? ( app-i18n/zinnia-tomoe ) ) ibus? ( >=app-i18n/ibus-1.4.1 dev-libs/glib:2 x11-libs/libxcb ) renderer? ( dev-libs/glib:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/gyp dev-util/ninja virtual/pkgconfig test? ( >=dev-cpp/gtest-1.8.0 dev-libs/jsoncpp ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Mozc - Japanese input method editor
-EAPI=6
-HOMEPAGE=https://github.com/google/mozc
-IUSE=debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test
-LICENSE=BSD BSD-2 ipadic public-domain unicode
-RDEPEND=>=dev-libs/protobuf-3.0.0:= emacs? ( virtual/emacs ) fcitx4? ( app-i18n/fcitx:4 ) gui? ( app-i18n/zinnia dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 handwriting-tegaki? ( app-i18n/tegaki-zinnia-japanese ) handwriting-tomoe? ( app-i18n/zinnia-tomoe ) ) ibus? ( >=app-i18n/ibus-1.4.1 dev-libs/glib:2 x11-libs/libxcb ) renderer? ( dev-libs/glib:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango )
-REQUIRED_USE=|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )
-SLOT=0
-_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c1b2d7a9e13da354a52e7e386f62527b
diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
new file mode 100644
index 000000000000..4b2844394a75
--- /dev/null
+++ b/app-i18n/mozc/Manifest
@@ -0,0 +1,11 @@
+AUX 50mozc-gentoo.el 121 BLAKE2B 0cad49e4a5a04d1cbdcd063cfd5a06c14bf4bab47890bbc089d8bba9889abb5197bea2cfb912f638052f912d7aca51a7e71b743b4742fd90b9d5ab5a60779fe5 SHA512 2d67a6723374872717ab7132f02f4030f00ddecabb8a1fc20c9d69d64406dc2ba2a1109734378fae7b4718a8ae9601beff4b6f27cb43a280fa2e0f946da70685
+AUX mozc-2.20.2673.102-tests_build.patch 1037 BLAKE2B 8f3c0b3361371a994957a89f5b86020902262de65aef75f82e58fcfcea211b8a8d3c8418898781ac1de2a2c9bdc73ffc4cf68102122a22691d9592d5a02e6c62 SHA512 d99ee7edbb406e123b26ec186933608b42d36193b7bfe67232810c0fbd7a92bd8cfff26dc45eae4f020e82e9a8370cf2033c750250455585b6b3d88cc8c973ef
+AUX mozc-2.20.2673.102-tests_skipping.patch 2086 BLAKE2B a104d6a83b02b49e1208be1b39699b90ad419d8befa29ed0366f7cbc454fe9ce27361f21897a5c74dadfc2d9eb31a30d7237e20db8c1fb205b8e71b40f4a0e57 SHA512 4a2e5a35c5e65ebeb737f656d6efb313c660c2c7cf62abd5d9295fd16e2dffde21d069cd74fd0cfd2454cd7f7c9d136dfbadbf79832db8441c619ff37c7e4b0e
+AUX mozc-2.23.2815.102-gcc-8.patch 496 BLAKE2B 318fcda19cf4f7e95920b5df4f5638621bcae992891941fa6f220d4dac1b2eac0faeda7a857a587baed41b361608f20c4bbda0d9a69a60b823572482c6789f46 SHA512 9c2b0e9695f4cd050f0d5f35d0e23f22715b9c6e5607629c7dc023560a5191bd755497fe6fe5306789c00e68d5bd9b7179d5515c982967788fca432134b71cad
+AUX mozc-2.23.2815.102-system_libraries.patch 9064 BLAKE2B 0cdf732a1bbf16d4af1d6dee81aacf3f3cb1f1c00c6aeb0fc12dac9dcd8611124e388e5fc721eb9b9472e073515d7457b182ee7cfe466b83bf319d572ae55240 SHA512 2d5b06e855f8c1889367b9b672e3ec81a037bc592872e28319e0180a0dcd177cdff817775a1a0f74ebf48e0b7558cf3b67953120411be753c662c43f409b05ce
+DIST fcitx-mozc-2.23.2815.102.1.patch 295112 BLAKE2B 709b84f6eaed16da38a173f40ae7cccff362fd167e6deb4090ae8a9ec522ac8e11ccff3c9ef6433907249af8c9eb4b7be12d2c05564cabd45c25e26764286ed3 SHA512 e0d4645df919838f0fe31a97bf6dd759c222a696f68133f7584d2c771f70734ea634a25bebb03a756221000d3552423207ee5163d75778dbf480b6e267ba4cd0
+DIST japanese-usage-dictionary-20120416091336.tar.gz 71051 BLAKE2B 08eecf0aa021e27a2813f58c2d37f1cec760448f6ae086ae7468b8a11575c6ef9f72f656cb4d53e0179b8a7b00f2d91ff51a0ad7825e078dcbac0810f1d8b3e1 SHA512 b7e997a979b6d50e49b9af5dc830ea4df0532f6ab1321b9ef14983f65bb54f1b2967375c82e07957ae7693ebbf43c9b56ecea6bfea8dd1fdaee444bd549d83a7
+DIST mozc-2.23.2815.102.tar.gz 47739041 BLAKE2B 045a8a4a07e09cf923b67824111cdf672febc30256a6aef951ae779a3f582b3860042750d766120e376898c63be5b4baea870798a192cee34b0d48647e1ec5e6 SHA512 a3face616ca89990bca52371dcc8003604ebe0e9633116a64550add070152b1bc4d9b21e9f102c5afa6f8b1aa11d8dbc4bafbcebfaf4a12a934f085f245d548f
+EBUILD mozc-2.23.2815.102.ebuild 9372 BLAKE2B 41e035e68e63f9306b821d9730fe7a327da3d8371e3b5260854a95e6a6058aeea847ff7dd125c0e2c40810bd270eebee1a473b23dc402419ab8dd8b3af609e91 SHA512 b2941a9bd7433af0ccb07276aac42c8039d605aa323500274eed340057bc692542cfed7dbc9129328b691e7e1919ced561f3194e50e96b0eae131646904c0abc
+EBUILD mozc-9999.ebuild 9212 BLAKE2B 94f5437f7b87ddb8afc9bb8ba5001c1ec416108536cb91a7ad206d85e45a0e4278fc02d3616eba1dd97361595fd2a23d265a1142a3e4d64f333551c10aaf0157 SHA512 a3efe0ce36f0f3bd2453f87005b8923a9123a47272a3b3ee80719da430459e2d35b3c05972b9c44ca611dc8ef4d1ef836e39deff10785f96aeee570217c93c9d
+MISC metadata.xml 1127 BLAKE2B 55c44374c1d0c03845435544fb8bcd254bfa59faa54e773110fe2a9bcfba0f6863a1f5c167e3ca7d2a1108e566ae4d7d4155a1a1994bef006bbde906265fffe1 SHA512 8d1ee79d5e359c746627cc10ddae170088dd1be8a69379f60969e588c0c6141fea80ebcba0183a91e786116e8937c14e76888c9232526244aab584ed4ef27a54
diff --git a/app-i18n/mozc/files/50mozc-gentoo.el b/app-i18n/mozc/files/50mozc-gentoo.el
new file mode 100644
index 000000000000..121c62249eb7
--- /dev/null
+++ b/app-i18n/mozc/files/50mozc-gentoo.el
@@ -0,0 +1,4 @@
+;;; app-i18n/ibus-mozc site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'mozc-mode "mozc" nil t)
diff --git a/app-i18n/mozc/files/mozc-2.20.2673.102-tests_build.patch b/app-i18n/mozc/files/mozc-2.20.2673.102-tests_build.patch
new file mode 100644
index 000000000000..b8b4477437f8
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.20.2673.102-tests_build.patch
@@ -0,0 +1,27 @@
+--- /src/net/json_util_test.cc
++++ /src/net/json_util_test.cc
+@@ -784,13 +784,13 @@
+   for (size_t i = 0; i <  arraysize(kNumS32ValueKeys); ++i) {
+     {
+       Json::Value json_value;
+-      json_value[kNumS32ValueKeys[i]] = -2147483649ll;
++      json_value[kNumS32ValueKeys[i]] = static_cast<Json::Value::Int64>(-2147483649ll);
+       TestMsg msg;
+       EXPECT_FALSE(JsonUtil::JsonValueToProtobufMessage(json_value, &msg));
+     }
+     {
+       Json::Value json_value;
+-      json_value[kNumS32ValueKeys[i]] = 2147483648ull;
++      json_value[kNumS32ValueKeys[i]] = static_cast<Json::Value::UInt64>(2147483648ull);
+       TestMsg msg;
+       EXPECT_FALSE(JsonUtil::JsonValueToProtobufMessage(json_value, &msg));
+     }
+@@ -805,7 +805,7 @@
+     }
+     {
+       Json::Value json_value;
+-      json_value[kNumU32ValueKeys[i]] = 4294967296ull;
++      json_value[kNumU32ValueKeys[i]] = static_cast<Json::Value::UInt64>(4294967296ull);
+       TestMsg msg;
+       EXPECT_FALSE(JsonUtil::JsonValueToProtobufMessage(json_value, &msg));
+     }
diff --git a/app-i18n/mozc/files/mozc-2.20.2673.102-tests_skipping.patch b/app-i18n/mozc/files/mozc-2.20.2673.102-tests_skipping.patch
new file mode 100644
index 000000000000..28c5486de50d
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.20.2673.102-tests_skipping.patch
@@ -0,0 +1,70 @@
+Disable test leaving mozc_server orphan process.
+
+--- /src/unix/ibus/mozc_engine_test.cc
++++ /src/unix/ibus/mozc_engine_test.cc
+@@ -41,65 +41,5 @@
+ namespace mozc {
+ namespace ibus {
+ 
+-class LaunchToolTest : public testing::Test {
+- public:
+-  LaunchToolTest() {
+-    g_type_init();
+-  }
+-
+- protected:
+-  virtual void SetUp() {
+-    mozc_engine_.reset(new MozcEngine());
+-
+-    mock_ = new client::ClientMock();
+-    mock_->ClearFunctionCounter();
+-    mozc_engine_->client_.reset(mock_);
+-  }
+-
+-  virtual void TearDown() {
+-    mozc_engine_.reset();
+-  }
+-
+-  client::ClientMock* mock_;
+-  unique_ptr<MozcEngine> mozc_engine_;
+-
+- private:
+-  DISALLOW_COPY_AND_ASSIGN(LaunchToolTest);
+-};
+-
+-TEST_F(LaunchToolTest, LaunchToolTest) {
+-  commands::Output output;
+-
+-  // Launch config dialog
+-  mock_->ClearFunctionCounter();
+-  mock_->SetBoolFunctionReturn("LaunchToolWithProtoBuf", true);
+-  output.set_launch_tool_mode(commands::Output::CONFIG_DIALOG);
+-  EXPECT_TRUE(mozc_engine_->LaunchTool(output));
+-
+-  // Launch dictionary tool
+-  mock_->ClearFunctionCounter();
+-  mock_->SetBoolFunctionReturn("LaunchToolWithProtoBuf", true);
+-  output.set_launch_tool_mode(commands::Output::DICTIONARY_TOOL);
+-  EXPECT_TRUE(mozc_engine_->LaunchTool(output));
+-
+-  // Launch word register dialog
+-  mock_->ClearFunctionCounter();
+-  mock_->SetBoolFunctionReturn("LaunchToolWithProtoBuf", true);
+-  output.set_launch_tool_mode(commands::Output::WORD_REGISTER_DIALOG);
+-  EXPECT_TRUE(mozc_engine_->LaunchTool(output));
+-
+-  // Launch no tool(means do nothing)
+-  mock_->ClearFunctionCounter();
+-  mock_->SetBoolFunctionReturn("LaunchToolWithProtoBuf", false);
+-  output.set_launch_tool_mode(commands::Output::NO_TOOL);
+-  EXPECT_FALSE(mozc_engine_->LaunchTool(output));
+-
+-  // Something occurring in client::Client::LaunchTool
+-  mock_->ClearFunctionCounter();
+-  mock_->SetBoolFunctionReturn("LaunchToolWithProtoBuf", false);
+-  output.set_launch_tool_mode(commands::Output::CONFIG_DIALOG);
+-  EXPECT_FALSE(mozc_engine_->LaunchTool(output));
+-}
+-
+ }  // namespace ibus
+ }  // namespace mozc
diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-gcc-8.patch b/app-i18n/mozc/files/mozc-2.23.2815.102-gcc-8.patch
new file mode 100644
index 000000000000..07514048e7a4
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.23.2815.102-gcc-8.patch
@@ -0,0 +1,22 @@
+https://github.com/google/mozc/issues/441
+
+--- /src/prediction/zero_query_dict.h
++++ /src/prediction/zero_query_dict.h
+@@ -147,6 +147,17 @@
+       return iter;
+     }
+ 
++    iterator &operator--() {
++      ptr_ -= kTokenByteSize;
++      return *this;
++    }
++
++    iterator operator--(int) {
++      const iterator tmp(ptr_, string_array_);
++      ptr_ -= kTokenByteSize;
++      return tmp;
++    }
++
+     iterator &operator-=(ptrdiff_t n) {
+       ptr_ -= n * kTokenByteSize;
+       return *this;
diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-system_libraries.patch b/app-i18n/mozc/files/mozc-2.23.2815.102-system_libraries.patch
new file mode 100644
index 000000000000..064b910c7026
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.23.2815.102-system_libraries.patch
@@ -0,0 +1,274 @@
+--- /src/gyp/defines.gypi
++++ /src/gyp/defines.gypi
+@@ -71,6 +71,12 @@
+     # use_libibus represents if ibus library is used or not.
+     # This option is only for Linux.
+     'use_libibus%': '0',
++
++    # use_libgtest represents if gtest library is used or not.
++    'use_libgtest%': '0',
++
++    # use_libjsoncpp represents if jsoncpp library is used or not.
++    'use_libjsoncpp%': '0',
+   },
+   'target_defaults': {
+     'defines': [
+--- /src/net/jsoncpp.gyp
++++ /src/net/jsoncpp.gyp
+@@ -31,32 +31,57 @@
+   'targets': [
+     {
+       'target_name': 'jsoncpp',
+-      'type': 'static_library',
+-      'variables': {
+-        'jsoncpp_root': '<(third_party_dir)/jsoncpp',
+-        'jsoncpp_srcs': [
+-          '<(jsoncpp_root)/src/lib_json/json_reader.cpp',
+-          '<(jsoncpp_root)/src/lib_json/json_value.cpp',
+-          '<(jsoncpp_root)/src/lib_json/json_writer.cpp',
+-        ],
+-        'jsoncpp_include_dirs': ['<(jsoncpp_root)/include'],
+-        'jsoncpp_additional_macros': ['JSON_USE_EXCEPTION=0'],
+-      },
+-      'defines': [
+-        '<@(jsoncpp_additional_macros)',
++      'conditions': [
++        ['use_libjsoncpp==1', {
++          'type': 'none',
++          'variables': {
++            'jsoncpp_additional_macros': ['JSON_USE_EXCEPTION=0'],
++          },
++          'all_dependent_settings': {
++            'defines': [
++              '<@(jsoncpp_additional_macros)',
++            ],
++            'cflags': [
++              '<!@(pkg-config --cflags jsoncpp)',
++            ],
++            'link_settings': {
++              'libraries': [
++                '<!@(pkg-config --libs-only-l jsoncpp)',
++              ],
++              'ldflags': [
++                '<!@(pkg-config --libs-only-L jsoncpp)',
++              ],
++            }
++          },
++        }, {
++          'type': 'static_library',
++          'variables': {
++            'jsoncpp_root': '<(third_party_dir)/jsoncpp',
++            'jsoncpp_srcs': [
++              '<(jsoncpp_root)/src/lib_json/json_reader.cpp',
++              '<(jsoncpp_root)/src/lib_json/json_value.cpp',
++              '<(jsoncpp_root)/src/lib_json/json_writer.cpp',
++            ],
++            'jsoncpp_include_dirs': ['<(jsoncpp_root)/include'],
++            'jsoncpp_additional_macros': ['JSON_USE_EXCEPTION=0'],
++          },
++          'defines': [
++            '<@(jsoncpp_additional_macros)',
++          ],
++          'sources': [
++            '<@(jsoncpp_srcs)',
++            'jsoncpp.h',
++          ],
++          'include_dirs': [
++            '<@(jsoncpp_include_dirs)',
++          ],
++          'all_dependent_settings': {
++            'defines': [
++              '<@(jsoncpp_additional_macros)',
++            ],
++          },
++        }],
+       ],
+-      'sources': [
+-        '<@(jsoncpp_srcs)',
+-        'jsoncpp.h',
+-      ],
+-      'include_dirs': [
+-        '<@(jsoncpp_include_dirs)',
+-      ],
+-      'all_dependent_settings': {
+-        'defines': [
+-          '<@(jsoncpp_additional_macros)',
+-        ],
+-      },
+     },
+   ],
+ }
+--- /src/net/jsoncpp.h
++++ /src/net/jsoncpp.h
+@@ -35,7 +35,7 @@
+ // Mozc basically disables C++ exception.
+ #define JSON_USE_EXCEPTION 0
+ #endif  // !JSON_USE_EXCEPTION
+-#include "third_party/jsoncpp/include/json/json.h"
++#include <json/json.h>
+ #define MOZC_JSONCPP_JSON_H_INCLUDED
+ #endif  // !MOZC_JSONCPP_JSON_H_INCLUDED
+ 
+--- /src/testing/testing.gyp
++++ /src/testing/testing.gyp
+@@ -53,66 +53,101 @@
+   'targets': [
+     {
+       'target_name': 'testing',
+-      'type': 'static_library',
+-      'variables': {
+-        'gtest_defines': [
+-          'GTEST_LANG_CXX11=1',
+-          'GTEST_HAS_TR1_TUPLE=0',  # disable tr1 tuple in favor of C++11 tuple.
+-        ],
+-        'gtest_dir': '<(third_party_dir)/gtest/googletest',
+-        'gmock_dir': '<(third_party_dir)/gtest/googlemock',
+-        'conditions': [
+-          ['_toolset=="target" and target_platform=="Android"', {
+-            'gtest_defines': [
+-              'GTEST_HAS_RTTI=0',  # Android NDKr7 requires this.
+-              'GTEST_HAS_CLONE=0',
+-              'GTEST_HAS_GLOBAL_WSTRING=0',
+-              'GTEST_HAS_POSIX_RE=0',
+-              'GTEST_HAS_STD_WSTRING=0',
+-              'GTEST_OS_LINUX=1',
+-              'GTEST_OS_LINUX_ANDROID=1',
+-            ],
+-          }],
+-        ],
+-      },
+-      'sources': [
+-        '<(gmock_dir)/src/gmock-cardinalities.cc',
+-        '<(gmock_dir)/src/gmock-internal-utils.cc',
+-        '<(gmock_dir)/src/gmock-matchers.cc',
+-        '<(gmock_dir)/src/gmock-spec-builders.cc',
+-        '<(gmock_dir)/src/gmock.cc',
+-        '<(gtest_dir)/src/gtest-death-test.cc',
+-        '<(gtest_dir)/src/gtest-filepath.cc',
+-        '<(gtest_dir)/src/gtest-port.cc',
+-        '<(gtest_dir)/src/gtest-printers.cc',
+-        '<(gtest_dir)/src/gtest-test-part.cc',
+-        '<(gtest_dir)/src/gtest-typed-test.cc',
+-        '<(gtest_dir)/src/gtest.cc',
+-      ],
+-      'include_dirs': [
+-        '<(gmock_dir)',
+-        '<(gmock_dir)/include',
+-        '<(gtest_dir)',
+-        '<(gtest_dir)/include',
+-      ],
+-      'defines': [
+-        '<@(gtest_defines)',
+-      ],
+-      'all_dependent_settings': {
+-        'defines': [
+-          '<@(gtest_defines)',
+-        ],
+-        'include_dirs': [
+-          '<(gmock_dir)/include',
+-          '<(gtest_dir)/include',
+-        ],
+-      },
+       'conditions': [
+-        ['(_toolset=="target" and compiler_target=="clang") or '
+-         '(_toolset=="host" and compiler_host=="clang")', {
+-          'cflags': [
+-            '-Wno-missing-field-initializers',
+-            '-Wno-unused-private-field',
++        ['use_libgtest==1', {
++          'type': 'none',
++          'variables': {
++            'gtest_defines': [
++              'GTEST_LANG_CXX11=1',
++              'GTEST_HAS_TR1_TUPLE=0',  # disable tr1 tuple in favor of C++11 tuple.
++            ],
++            'conditions': [
++              ['_toolset=="target" and target_platform=="Android"', {
++                'gtest_defines': [
++                  'GTEST_HAS_RTTI=0',  # Android NDKr7 requires this.
++                  'GTEST_HAS_CLONE=0',
++                  'GTEST_HAS_GLOBAL_WSTRING=0',
++                  'GTEST_HAS_POSIX_RE=0',
++                  'GTEST_HAS_STD_WSTRING=0',
++                  'GTEST_OS_LINUX=1',
++                  'GTEST_OS_LINUX_ANDROID=1',
++                ],
++              }],
++            ],
++          },
++          'all_dependent_settings': {
++            'defines': [
++              '<@(gtest_defines)',
++            ],
++            'link_settings': {
++              'libraries': [
++                '-lgmock -lgtest',
++              ],
++            },
++          },
++        }, {
++          'type': 'static_library',
++          'variables': {
++            'gtest_defines': [
++              'GTEST_LANG_CXX11=1',
++              'GTEST_HAS_TR1_TUPLE=0',  # disable tr1 tuple in favor of C++11 tuple.
++            ],
++            'gtest_dir': '<(third_party_dir)/gtest/googletest',
++            'gmock_dir': '<(third_party_dir)/gtest/googlemock',
++            'conditions': [
++              ['_toolset=="target" and target_platform=="Android"', {
++                'gtest_defines': [
++                  'GTEST_HAS_RTTI=0',  # Android NDKr7 requires this.
++                  'GTEST_HAS_CLONE=0',
++                  'GTEST_HAS_GLOBAL_WSTRING=0',
++                  'GTEST_HAS_POSIX_RE=0',
++                  'GTEST_HAS_STD_WSTRING=0',
++                  'GTEST_OS_LINUX=1',
++                  'GTEST_OS_LINUX_ANDROID=1',
++                ],
++              }],
++            ],
++          },
++          'sources': [
++            '<(gmock_dir)/src/gmock-cardinalities.cc',
++            '<(gmock_dir)/src/gmock-internal-utils.cc',
++            '<(gmock_dir)/src/gmock-matchers.cc',
++            '<(gmock_dir)/src/gmock-spec-builders.cc',
++            '<(gmock_dir)/src/gmock.cc',
++            '<(gtest_dir)/src/gtest-death-test.cc',
++            '<(gtest_dir)/src/gtest-filepath.cc',
++            '<(gtest_dir)/src/gtest-port.cc',
++            '<(gtest_dir)/src/gtest-printers.cc',
++            '<(gtest_dir)/src/gtest-test-part.cc',
++            '<(gtest_dir)/src/gtest-typed-test.cc',
++            '<(gtest_dir)/src/gtest.cc',
++          ],
++          'include_dirs': [
++            '<(gmock_dir)',
++            '<(gmock_dir)/include',
++            '<(gtest_dir)',
++            '<(gtest_dir)/include',
++          ],
++          'defines': [
++            '<@(gtest_defines)',
++          ],
++          'all_dependent_settings': {
++            'defines': [
++              '<@(gtest_defines)',
++            ],
++            'include_dirs': [
++              '<(gmock_dir)/include',
++              '<(gtest_dir)/include',
++            ],
++          },
++          'conditions': [
++            ['(_toolset=="target" and compiler_target=="clang") or '
++             '(_toolset=="host" and compiler_host=="clang")', {
++              'cflags': [
++                '-Wno-missing-field-initializers',
++                '-Wno-unused-private-field',
++              ],
++            }],
+           ],
+         }],
+       ],
diff --git a/app-i18n/mozc/metadata.xml b/app-i18n/mozc/metadata.xml
new file mode 100644
index 000000000000..5b85ef8a79d9
--- /dev/null
+++ b/app-i18n/mozc/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<longdescription lang="en">
+		Mozc is a subset of Google Japanese Input (Google 日本語入力) released in open-source form.
+	</longdescription>
+	<use>
+		<flag name="fcitx4">Enable support for <pkg>app-i18n/fcitx</pkg> 4</flag>
+		<flag name="gui">Install graphical user interface tool (mozc_tool)</flag>
+		<flag name="handwriting-tegaki">Use handwriting recognition model from <pkg>app-i18n/tegaki-zinnia-japanese</pkg></flag>
+		<flag name="handwriting-tomoe">Use handwriting recognition model from <pkg>app-i18n/zinnia-tomoe</pkg></flag>
+		<flag name="ibus">Enable support for <pkg>app-i18n/ibus</pkg></flag>
+		<flag name="renderer">Enable native candidate window</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">google/mozc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
new file mode 100644
index 000000000000..73baeb4cc28b
--- /dev/null
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@@ -0,0 +1,323 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=(python2_7)
+
+inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/google/mozc"
+	EGIT_SUBMODULES=(src/third_party/japanese_usage_dictionary)
+else
+	MOZC_GIT_REVISION="afb03ddfe72dde4cf2409863a3bfea160f7a66d8"
+	JAPANESE_USAGE_DICTIONARY_GIT_REVISION="e5b3425575734c323e1d947009dd74709437b684"
+	JAPANESE_USAGE_DICTIONARY_DATE="20120416091336"
+	FCITX_PATCH_VERSION="2.23.2815.102.1"
+fi
+
+DESCRIPTION="Mozc - Japanese input method editor"
+HOMEPAGE="https://github.com/google/mozc"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${P}.tar.gz
+		https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
+		fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${FCITX_PATCH_VERSION}.patch )"
+fi
+
+# Mozc: BSD
+# src/data/dictionary_oss: ipadic, public-domain
+# src/data/unicode: unicode
+# japanese-usage-dictionary: BSD-2
+LICENSE="BSD BSD-2 ipadic public-domain unicode"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 x86"
+IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
+REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
+
+RDEPEND=">=dev-libs/protobuf-3.0.0:=
+	emacs? ( virtual/emacs )
+	fcitx4? ( app-i18n/fcitx:4 )
+	gui? (
+		app-i18n/zinnia
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		handwriting-tegaki? ( app-i18n/tegaki-zinnia-japanese )
+		handwriting-tomoe? ( app-i18n/zinnia-tomoe )
+	)
+	ibus? (
+		>=app-i18n/ibus-1.4.1
+		dev-libs/glib:2
+		x11-libs/libxcb
+	)
+	renderer? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		x11-libs/gtk+:2
+		x11-libs/pango
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/gyp
+	dev-util/ninja
+	virtual/pkgconfig
+	test? (
+		>=dev-cpp/gtest-1.8.0
+		dev-libs/jsoncpp
+	)"
+
+S="${WORKDIR}/${P}/src"
+
+SITEFILE="50${PN}-gentoo.el"
+
+execute() {
+	einfo "$@"
+	"$@"
+}
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		git-r3_src_unpack
+
+		if use fcitx4; then
+			local EGIT_SUBMODULES=()
+			git-r3_fetch https://gitlab.com/fcitx/mozc.git refs/heads/fcitx
+			git-r3_checkout https://gitlab.com/fcitx/mozc.git "${WORKDIR}/fcitx-mozc"
+		fi
+	else
+		unpack ${P}.tar.gz
+		mv mozc-${MOZC_GIT_REVISION} ${P} || die
+
+		unpack japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
+		cp -p japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}/usage_dict.txt ${P}/src/third_party/japanese_usage_dictionary || die
+	fi
+}
+
+src_prepare() {
+	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-system_libraries.patch"
+	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-gcc-8.patch"
+	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
+	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
+
+	if use fcitx4; then
+		if [[ "${PV}" == "9999" ]]; then
+			cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die
+		else
+			eapply -p2 "${DISTDIR}/fcitx-mozc-${FCITX_PATCH_VERSION}.patch"
+		fi
+	fi
+
+	eapply_user
+
+	sed \
+		-e "s/def GypMain(options, unused_args):/def GypMain(options, gyp_args):/" \
+		-e "s/RunOrDie(gyp_command + gyp_options)/RunOrDie(gyp_command + gyp_options + gyp_args)/" \
+		-e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
+		-i build_mozc.py || die
+
+	sed \
+		-e "s/'release_extra_cflags%': \['-O2'\]/'release_extra_cflags%': []/" \
+		-e "s/'debug_extra_cflags%': \['-O0', '-g'\]/'debug_extra_cflags%': []/" \
+		-i gyp/common.gypi || die
+
+	local ar=($(tc-getAR))
+	local cc=($(tc-getCC))
+	local cxx=($(tc-getCXX))
+	local ld=($(tc-getLD))
+	local nm=($(tc-getNM))
+	local readelf=($(tc-getPROG READELF readelf))
+
+	# Use absolute paths. Non-absolute paths are mishandled by GYP.
+	ar[0]=$(type -P ${ar[0]})
+	cc[0]=$(type -P ${cc[0]})
+	cxx[0]=$(type -P ${cxx[0]})
+	ld[0]=$(type -P ${ld[0]})
+	nm[0]=$(type -P ${nm[0]})
+	readelf[0]=$(type -P ${readelf[0]})
+
+	sed \
+		-e "s:<!(which ar):${ar[@]}:" \
+		-e "s:<!(which clang):${cc[@]}:" \
+		-e "s:<!(which clang++):${cxx[@]}:" \
+		-e "s:<!(which ld):${ld[@]}:" \
+		-e "s:<!(which nm):${nm[@]}:" \
+		-e "s:<!(which readelf):${readelf[@]}:" \
+		-i gyp/common.gypi || die
+}
+
+src_configure() {
+	if use debug; then
+		BUILD_TYPE="Debug"
+	else
+		BUILD_TYPE="Release"
+	fi
+
+	local gyp_arguments=()
+
+	if tc-is-gcc; then
+		gyp_arguments+=(-D compiler_host=gcc -D compiler_target=gcc)
+	elif tc-is-clang; then
+		gyp_arguments+=(-D compiler_host=clang -D compiler_target=clang)
+	else
+		gyp_arguments+=(-D compiler_host=unknown -D compiler_target=unknown)
+	fi
+
+	gyp_arguments+=(-D use_fcitx=$(usex fcitx4 YES NO))
+	gyp_arguments+=(-D use_fcitx5=NO)
+	gyp_arguments+=(-D use_libgtest=$(usex test 1 0))
+	gyp_arguments+=(-D use_libibus=$(usex ibus 1 0))
+	gyp_arguments+=(-D use_libjsoncpp=$(usex test 1 0))
+	gyp_arguments+=(-D use_libprotobuf=1)
+	gyp_arguments+=(-D use_libzinnia=$(usex gui 1 0))
+	gyp_arguments+=(-D enable_gtk_renderer=$(usex renderer 1 0))
+
+	gyp_arguments+=(-D server_dir="${EPREFIX}/usr/libexec/mozc")
+	gyp_arguments+=(-D document_dir="${EPREFIX}/usr/libexec/mozc/documents")
+
+	if use handwriting-tegaki; then
+		gyp_arguments+=(-D zinnia_model_file="${EPREFIX}/usr/share/tegaki/models/zinnia/handwriting-ja.model")
+	elif use handwriting-tomoe; then
+		gyp_arguments+=(-D zinnia_model_file="${EPREFIX}/usr/$(get_libdir)/zinnia/model/tomoe/handwriting-ja.model")
+	fi
+
+	if use ibus; then
+		gyp_arguments+=(-D ibus_mozc_path="${EPREFIX}/usr/libexec/ibus-engine-mozc")
+		gyp_arguments+=(-D ibus_mozc_icon_path="${EPREFIX}/usr/share/ibus-mozc/product_icon.png")
+	fi
+
+	unset AR CC CXX LD NM READELF
+
+	execute "${PYTHON}" build_mozc.py gyp \
+		--gypdir="${EPREFIX}/usr/bin" \
+		--server_dir="${EPREFIX}/usr/libexec/mozc" \
+		--verbose \
+		$(usex gui "" --noqt) \
+		-- "${gyp_arguments[@]}" || die "Configuration failed"
+}
+
+src_compile() {
+	local targets=(server/server.gyp:mozc_server)
+	if use emacs; then
+		targets+=(unix/emacs/emacs.gyp:mozc_emacs_helper)
+	fi
+	if use fcitx4; then
+		targets+=(unix/fcitx/fcitx.gyp:fcitx-mozc)
+	fi
+	if use gui; then
+		targets+=(gui/gui.gyp:mozc_tool)
+	fi
+	if use ibus; then
+		targets+=(unix/ibus/ibus.gyp:ibus_mozc)
+	fi
+	if use renderer; then
+		targets+=(renderer/renderer.gyp:mozc_renderer)
+	fi
+	if use test; then
+		targets+=(gyp/tests.gyp:unittests)
+	fi
+
+	execute "${PYTHON}" build_mozc.py build -c ${BUILD_TYPE} -v "${targets[@]}" || die "Building failed"
+
+	if use emacs; then
+		elisp-compile unix/emacs/*.el
+	fi
+}
+
+src_test() {
+	execute "${PYTHON}" build_mozc.py runtests -c ${BUILD_TYPE} --test_jobs 1 || die "Testing failed"
+}
+
+src_install() {
+	exeinto /usr/libexec/mozc
+	doexe out_linux/${BUILD_TYPE}/mozc_server
+
+	if use gui; then
+		doexe out_linux/${BUILD_TYPE}/mozc_tool
+	fi
+
+	if use renderer; then
+		doexe out_linux/${BUILD_TYPE}/mozc_renderer
+	fi
+
+	insinto /usr/libexec/mozc/documents
+	doins data/installer/credits_en.html
+
+	if use emacs; then
+		dobin out_linux/${BUILD_TYPE}/mozc_emacs_helper
+		elisp-install ${PN} unix/emacs/*.{el,elc}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN}
+	fi
+
+	if use fcitx4; then
+		exeinto /usr/$(get_libdir)/fcitx
+		doexe out_linux/${BUILD_TYPE}/fcitx-mozc.so
+
+		insinto /usr/share/fcitx/addon
+		doins unix/fcitx/fcitx-mozc.conf
+
+		insinto /usr/share/fcitx/inputmethod
+		doins unix/fcitx/mozc.conf
+
+		insinto /usr/share/fcitx/mozc/icon
+		newins data/images/product_icon_32bpp-128.png mozc.png
+		local image
+		for image in data/images/unix/ui-*.png; do
+			newins "${image}" "mozc-${image#data/images/unix/ui-}"
+		done
+
+		local locale mo_file
+		for mo_file in out_linux/${BUILD_TYPE}/gen/unix/fcitx/po/*.mo; do
+			locale="${mo_file##*/}"
+			locale="${locale%.mo}"
+			insinto /usr/share/locale/${locale}/LC_MESSAGES
+			newins "${mo_file}" fcitx-mozc.mo
+		done
+	fi
+
+	if use ibus; then
+		exeinto /usr/libexec
+		newexe out_linux/${BUILD_TYPE}/ibus_mozc ibus-engine-mozc
+
+		insinto /usr/share/ibus/component
+		doins out_linux/${BUILD_TYPE}/gen/unix/ibus/mozc.xml
+
+		insinto /usr/share/ibus-mozc
+		newins data/images/unix/ime_product_icon_opensource-32.png product_icon.png
+		local image
+		for image in data/images/unix/ui-*.png; do
+			newins "${image}" "${image#data/images/unix/ui-}"
+		done
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elisp-site-regen
+
+		elog "USAGE IN EMACS"
+		elog
+		elog "mozc-mode is minor mode to input Japanese text using Mozc server."
+		elog "mozc-mode can be used via LEIM (Library of Emacs Input Method)."
+		elog
+		elog "In order to use mozc-mode by default, the following settings should be added to"
+		elog "Emacs init file (~/.emacs.d/init.el or ~/.emacs):"
+		elog
+		elog "  (require 'mozc)"
+		elog "  (set-language-environment \"Japanese\")"
+		elog "  (setq default-input-method \"japanese-mozc\")"
+		elog
+		elog "With the above settings, typing C-\\ (which is bound to \"toggle-input-method\""
+		elog "by default) will enable mozc-mode."
+		elog
+		elog "Alternatively, at run time, after loading mozc.el, mozc-mode can be activated by"
+		elog "calling \"set-input-method\" and entering \"japanese-mozc\"."
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
new file mode 100644
index 000000000000..b51359f01fb3
--- /dev/null
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -0,0 +1,322 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=(python2_7)
+
+inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/google/mozc"
+	EGIT_SUBMODULES=(src/third_party/japanese_usage_dictionary)
+else
+	MOZC_GIT_REVISION=""
+	JAPANESE_USAGE_DICTIONARY_GIT_REVISION=""
+	JAPANESE_USAGE_DICTIONARY_DATE=""
+	FCITX_PATCH_VERSION=""
+fi
+
+DESCRIPTION="Mozc - Japanese input method editor"
+HOMEPAGE="https://github.com/google/mozc"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${P}.tar.gz
+		https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
+		fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${FCITX_PATCH_VERSION}.patch )"
+fi
+
+# Mozc: BSD
+# src/data/dictionary_oss: ipadic, public-domain
+# src/data/unicode: unicode
+# japanese-usage-dictionary: BSD-2
+LICENSE="BSD BSD-2 ipadic public-domain unicode"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
+REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
+
+RDEPEND=">=dev-libs/protobuf-3.0.0:=
+	emacs? ( virtual/emacs )
+	fcitx4? ( app-i18n/fcitx:4 )
+	gui? (
+		app-i18n/zinnia
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		handwriting-tegaki? ( app-i18n/tegaki-zinnia-japanese )
+		handwriting-tomoe? ( app-i18n/zinnia-tomoe )
+	)
+	ibus? (
+		>=app-i18n/ibus-1.4.1
+		dev-libs/glib:2
+		x11-libs/libxcb
+	)
+	renderer? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		x11-libs/gtk+:2
+		x11-libs/pango
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/gyp
+	dev-util/ninja
+	virtual/pkgconfig
+	test? (
+		>=dev-cpp/gtest-1.8.0
+		dev-libs/jsoncpp
+	)"
+
+S="${WORKDIR}/${P}/src"
+
+SITEFILE="50${PN}-gentoo.el"
+
+execute() {
+	einfo "$@"
+	"$@"
+}
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		git-r3_src_unpack
+
+		if use fcitx4; then
+			local EGIT_SUBMODULES=()
+			git-r3_fetch https://gitlab.com/fcitx/mozc.git refs/heads/fcitx
+			git-r3_checkout https://gitlab.com/fcitx/mozc.git "${WORKDIR}/fcitx-mozc"
+		fi
+	else
+		unpack ${P}.tar.gz
+		mv mozc-${MOZC_GIT_REVISION} ${P} || die
+
+		unpack japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
+		cp -p japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}/usage_dict.txt ${P}/src/third_party/japanese_usage_dictionary || die
+	fi
+}
+
+src_prepare() {
+	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-system_libraries.patch"
+	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-gcc-8.patch"
+	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
+	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
+
+	if use fcitx4; then
+		if [[ "${PV}" == "9999" ]]; then
+			cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die
+		else
+			eapply -p2 "${DISTDIR}/fcitx-mozc-${FCITX_PATCH_VERSION}.patch"
+		fi
+	fi
+
+	eapply_user
+
+	sed \
+		-e "s/def GypMain(options, unused_args):/def GypMain(options, gyp_args):/" \
+		-e "s/RunOrDie(gyp_command + gyp_options)/RunOrDie(gyp_command + gyp_options + gyp_args)/" \
+		-e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
+		-i build_mozc.py || die
+
+	sed \
+		-e "s/'release_extra_cflags%': \['-O2'\]/'release_extra_cflags%': []/" \
+		-e "s/'debug_extra_cflags%': \['-O0', '-g'\]/'debug_extra_cflags%': []/" \
+		-i gyp/common.gypi || die
+
+	local ar=($(tc-getAR))
+	local cc=($(tc-getCC))
+	local cxx=($(tc-getCXX))
+	local ld=($(tc-getLD))
+	local nm=($(tc-getNM))
+	local readelf=($(tc-getPROG READELF readelf))
+
+	# Use absolute paths. Non-absolute paths are mishandled by GYP.
+	ar[0]=$(type -P ${ar[0]})
+	cc[0]=$(type -P ${cc[0]})
+	cxx[0]=$(type -P ${cxx[0]})
+	ld[0]=$(type -P ${ld[0]})
+	nm[0]=$(type -P ${nm[0]})
+	readelf[0]=$(type -P ${readelf[0]})
+
+	sed \
+		-e "s:<!(which ar):${ar[@]}:" \
+		-e "s:<!(which clang):${cc[@]}:" \
+		-e "s:<!(which clang++):${cxx[@]}:" \
+		-e "s:<!(which ld):${ld[@]}:" \
+		-e "s:<!(which nm):${nm[@]}:" \
+		-e "s:<!(which readelf):${readelf[@]}:" \
+		-i gyp/common.gypi || die
+}
+
+src_configure() {
+	if use debug; then
+		BUILD_TYPE="Debug"
+	else
+		BUILD_TYPE="Release"
+	fi
+
+	local gyp_arguments=()
+
+	if tc-is-gcc; then
+		gyp_arguments+=(-D compiler_host=gcc -D compiler_target=gcc)
+	elif tc-is-clang; then
+		gyp_arguments+=(-D compiler_host=clang -D compiler_target=clang)
+	else
+		gyp_arguments+=(-D compiler_host=unknown -D compiler_target=unknown)
+	fi
+
+	gyp_arguments+=(-D use_fcitx=$(usex fcitx4 YES NO))
+	gyp_arguments+=(-D use_libgtest=$(usex test 1 0))
+	gyp_arguments+=(-D use_libibus=$(usex ibus 1 0))
+	gyp_arguments+=(-D use_libjsoncpp=$(usex test 1 0))
+	gyp_arguments+=(-D use_libprotobuf=1)
+	gyp_arguments+=(-D use_libzinnia=$(usex gui 1 0))
+	gyp_arguments+=(-D enable_gtk_renderer=$(usex renderer 1 0))
+
+	gyp_arguments+=(-D server_dir="${EPREFIX}/usr/libexec/mozc")
+	gyp_arguments+=(-D document_dir="${EPREFIX}/usr/libexec/mozc/documents")
+
+	if use handwriting-tegaki; then
+		gyp_arguments+=(-D zinnia_model_file="${EPREFIX}/usr/share/tegaki/models/zinnia/handwriting-ja.model")
+	elif use handwriting-tomoe; then
+		gyp_arguments+=(-D zinnia_model_file="${EPREFIX}/usr/$(get_libdir)/zinnia/model/tomoe/handwriting-ja.model")
+	fi
+
+	if use ibus; then
+		gyp_arguments+=(-D ibus_mozc_path="${EPREFIX}/usr/libexec/ibus-engine-mozc")
+		gyp_arguments+=(-D ibus_mozc_icon_path="${EPREFIX}/usr/share/ibus-mozc/product_icon.png")
+	fi
+
+	unset AR CC CXX LD NM READELF
+
+	execute "${PYTHON}" build_mozc.py gyp \
+		--gypdir="${EPREFIX}/usr/bin" \
+		--server_dir="${EPREFIX}/usr/libexec/mozc" \
+		--verbose \
+		$(usex gui "" --noqt) \
+		-- "${gyp_arguments[@]}" || die "Configuration failed"
+}
+
+src_compile() {
+	local targets=(server/server.gyp:mozc_server)
+	if use emacs; then
+		targets+=(unix/emacs/emacs.gyp:mozc_emacs_helper)
+	fi
+	if use fcitx4; then
+		targets+=(unix/fcitx/fcitx.gyp:fcitx-mozc)
+	fi
+	if use gui; then
+		targets+=(gui/gui.gyp:mozc_tool)
+	fi
+	if use ibus; then
+		targets+=(unix/ibus/ibus.gyp:ibus_mozc)
+	fi
+	if use renderer; then
+		targets+=(renderer/renderer.gyp:mozc_renderer)
+	fi
+	if use test; then
+		targets+=(gyp/tests.gyp:unittests)
+	fi
+
+	execute "${PYTHON}" build_mozc.py build -c ${BUILD_TYPE} -v "${targets[@]}" || die "Building failed"
+
+	if use emacs; then
+		elisp-compile unix/emacs/*.el
+	fi
+}
+
+src_test() {
+	execute "${PYTHON}" build_mozc.py runtests -c ${BUILD_TYPE} --test_jobs 1 || die "Testing failed"
+}
+
+src_install() {
+	exeinto /usr/libexec/mozc
+	doexe out_linux/${BUILD_TYPE}/mozc_server
+
+	if use gui; then
+		doexe out_linux/${BUILD_TYPE}/mozc_tool
+	fi
+
+	if use renderer; then
+		doexe out_linux/${BUILD_TYPE}/mozc_renderer
+	fi
+
+	insinto /usr/libexec/mozc/documents
+	doins data/installer/credits_en.html
+
+	if use emacs; then
+		dobin out_linux/${BUILD_TYPE}/mozc_emacs_helper
+		elisp-install ${PN} unix/emacs/*.{el,elc}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN}
+	fi
+
+	if use fcitx4; then
+		exeinto /usr/$(get_libdir)/fcitx
+		doexe out_linux/${BUILD_TYPE}/fcitx-mozc.so
+
+		insinto /usr/share/fcitx/addon
+		doins unix/fcitx/fcitx-mozc.conf
+
+		insinto /usr/share/fcitx/inputmethod
+		doins unix/fcitx/mozc.conf
+
+		insinto /usr/share/fcitx/mozc/icon
+		newins data/images/product_icon_32bpp-128.png mozc.png
+		local image
+		for image in data/images/unix/ui-*.png; do
+			newins "${image}" "mozc-${image#data/images/unix/ui-}"
+		done
+
+		local locale mo_file
+		for mo_file in out_linux/${BUILD_TYPE}/gen/unix/fcitx/po/*.mo; do
+			locale="${mo_file##*/}"
+			locale="${locale%.mo}"
+			insinto /usr/share/locale/${locale}/LC_MESSAGES
+			newins "${mo_file}" fcitx-mozc.mo
+		done
+	fi
+
+	if use ibus; then
+		exeinto /usr/libexec
+		newexe out_linux/${BUILD_TYPE}/ibus_mozc ibus-engine-mozc
+
+		insinto /usr/share/ibus/component
+		doins out_linux/${BUILD_TYPE}/gen/unix/ibus/mozc.xml
+
+		insinto /usr/share/ibus-mozc
+		newins data/images/unix/ime_product_icon_opensource-32.png product_icon.png
+		local image
+		for image in data/images/unix/ui-*.png; do
+			newins "${image}" "${image#data/images/unix/ui-}"
+		done
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elisp-site-regen
+
+		elog "USAGE IN EMACS"
+		elog
+		elog "mozc-mode is minor mode to input Japanese text using Mozc server."
+		elog "mozc-mode can be used via LEIM (Library of Emacs Input Method)."
+		elog
+		elog "In order to use mozc-mode by default, the following settings should be added to"
+		elog "Emacs init file (~/.emacs.d/init.el or ~/.emacs):"
+		elog
+		elog "  (require 'mozc)"
+		elog "  (set-language-environment \"Japanese\")"
+		elog "  (setq default-input-method \"japanese-mozc\")"
+		elog
+		elog "With the above settings, typing C-\\ (which is bound to \"toggle-input-method\""
+		elog "by default) will enable mozc-mode."
+		elog
+		elog "Alternatively, at run time, after loading mozc.el, mozc-mode can be activated by"
+		elog "calling \"set-input-method\" and entering \"japanese-mozc\"."
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/app-i18n/multiskkserv-20100128 b/app-i18n/multiskkserv-20100128
deleted file mode 100644
index e0c4c5c7ed3d..000000000000
--- a/app-i18n/multiskkserv-20100128
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=|| ( dev-db/tinycdb dev-db/cdb ) test? ( app-i18n/nkf ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=SKK server that handles multiple dictionaries
-EAPI=6
-HOMEPAGE=http://www3.big.or.jp/~sian/linux/products/
-IUSE=test
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/skk-jisyo[cdb]
-SLOT=0
-SRC_URI=http://www3.big.or.jp/~sian/linux/products/multiskkserv-20100128.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9295f2bbfa27cdaafce10f547d8a9f9d
diff --git a/app-i18n/multiskkserv/Manifest b/app-i18n/multiskkserv/Manifest
new file mode 100644
index 000000000000..640c203176d5
--- /dev/null
+++ b/app-i18n/multiskkserv/Manifest
@@ -0,0 +1,6 @@
+AUX multiskkserv-cdb.patch 1525 BLAKE2B b771d405c3a15013e011bb89cc5ccafbebed269e3ac89ef653a3b07bf5913aef53e7740569d9453a16903fa64075b2498349bf125fe1918d47c61d7c963f242a SHA512 d063be9d8eaa44caf15dce002effde12119d32799974db3ce82a293bd5264bb594865863a26f3f498c7d532f6b48b02db832526a1f277578def7e82cee0594dd
+AUX multiskkserv.confd 230 BLAKE2B af91367b448db6815176cad5ada7207efdb2b775e60fc6cfd213e8fdf03b743fcff554f551d6013a269554cbd218efc74d4777fb411b85a3e267ef646c9c982a SHA512 3751257be6a4ee994b7dff2293b0c724cdfef7006db18b970f5a0e23fb1620d0fd76ebce80bd6ac6c2623bf2f8759f99e26b4087b7ecc83f1b3fdd1de877ce13
+AUX multiskkserv.initd 305 BLAKE2B 04a1fe5303e2e7b25f51d53e9668f4f216be9d4954452bd643bd11d74d4373732281bc621b33b83bff4c9ebd3adcc3ab146fdb526f3cb009c7fb7634b53ebcac SHA512 eae9fcbfe18baec133ad0ee624a758cec1ceeb0134e11a4fe2b10099877b0f5bf96032704683521e5c874442595212950ab5164dc689ea523cec9213b7c2bec2
+DIST multiskkserv-20100128.tar.xz 250004 BLAKE2B e2182155869b36c7eaccb04fc41ffb71f88eb89e387754a61f4a0b3c2b1658f15908e3190cfad7d16d62e7897e8a8796124ce41260f7fddbdd641efc180630f4 SHA512 27409600f549317dd2e2fcd0f0a35406a5d445c74e0ba266ed3c19cec849b6d508a30edd65bf72931b0222f003d934a802e5c3c979d5b52ab30da473cabbf5a5
+EBUILD multiskkserv-20100128.ebuild 761 BLAKE2B 1c6a56c31daf17cbf4f435fee2ac3c0d9900905933deb6479316128356ca092e16b6c81f73c3d688cadc6848f8a4bc694c0bfa066c98c068398b383cb505862d SHA512 aa89987538dfb61cd328c8a1c880bdb4876a0b567c41050de5fa6450036dd954c996c9ba88fb30b9d82269c2a09174f9b31501a42a4c66abd01ac305a1578269
+MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/multiskkserv/files/multiskkserv-cdb.patch b/app-i18n/multiskkserv/files/multiskkserv-cdb.patch
new file mode 100644
index 000000000000..c6f0da50309e
--- /dev/null
+++ b/app-i18n/multiskkserv/files/multiskkserv-cdb.patch
@@ -0,0 +1,52 @@
+--- a/configure.in
++++ b/configure.in
+@@ -126,19 +126,38 @@
+       fi
+     done
+   else
+-    if test -d "$with_cdb" -a -f "$with_cdb/cdb.h"; then
+-      CDB_DIR="$with_cdb"
+-      CDB_INCLUDES="-I$with_cdb"
+-      available_cdb="yes"
+-      for j in cdb.a buffer.a unix.a byte.a alloc.a; do
+-        if test -f "$with_cdb/$j"; then
+-          LIBADD_CDB="$LIBADD_CDB $with_cdb/$j"
++    for i in include include/cdb; do
++      if test -f "$with_cdb/$i/cdb.h"; then
++        CDB_DIR="$with_cdb"
++        CDB_INCLUDES="-I$with_cdb/$i"
++        available_cdb="yes"
++        if test -f "$with_cdb/$i/uint32.h"; then
++          for l in lib64 lib32 lib; do
++            for a in cdb.a alloc.a buffer.a byte.a unix.a; do
++              if test -f "$with_cdb/$l/$a"; then
++                LIBADD_CDB="$LIBADD_CDB $with_cdb/$l/$a"
++              else
++                LIBADD_CDB=""
++                available_cdb="no"
++                break
++              fi
++            done
++            if test "$available_cdb" = "yes"; then
++              break
++            fi
++          done
+         else
+-          available_cdb="no"
+-	  break
++          save_LIBS="$LIBS"
++          AC_CHECK_LIB(cdb, cdb_init)
++          LIBS="$save_LIBS"
++          LIBADD_CDB="-lcdb"
++          AC_DEFINE(USE_TINYCDB, 1, [Use tinycdb])
+         fi
+-      done
+-    fi
++      fi
++      if test "$available_cdb" = "yes"; then
++        break
++      fi
++    done
+   fi
+   if test "$available_cdb" = "yes"; then
+     AC_MSG_RESULT([cdb found, path: $CDB_DIR])
diff --git a/app-i18n/multiskkserv/files/multiskkserv.confd b/app-i18n/multiskkserv/files/multiskkserv.confd
new file mode 100644
index 000000000000..eaaa90def3f8
--- /dev/null
+++ b/app-i18n/multiskkserv/files/multiskkserv.confd
@@ -0,0 +1,10 @@
+# Config file for /etc/init.d/multiskkserv
+
+# define which SKK-JISYO to use (you may define multiple files)
+#
+# Example:
+#
+# SKKJISYO_CDB="SKK-JISYO.L.cdb SKK-JISYO.JIS2.cdb SKK-JISYO.jinmei.cdb"
+#
+
+SKKJISYO_CDB="SKK-JISYO.L.cdb"
diff --git a/app-i18n/multiskkserv/files/multiskkserv.initd b/app-i18n/multiskkserv/files/multiskkserv.initd
new file mode 100644
index 000000000000..31c447da9d5d
--- /dev/null
+++ b/app-i18n/multiskkserv/files/multiskkserv.initd
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/${RC_SVCNAME}"
+command_args="-r /usr/share/skk ${SKKJISYO_CDB}"
+command_background="true"
+pidfile="${pidfile:-/run/${RC_SVCNAME}.pid}"
+
+depend() {
+	need net
+}
diff --git a/app-i18n/multiskkserv/metadata.xml b/app-i18n/multiskkserv/metadata.xml
new file mode 100644
index 000000000000..e1a49f498885
--- /dev/null
+++ b/app-i18n/multiskkserv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-i18n/multiskkserv/multiskkserv-20100128.ebuild b/app-i18n/multiskkserv/multiskkserv-20100128.ebuild
new file mode 100644
index 000000000000..7ffc4e22f888
--- /dev/null
+++ b/app-i18n/multiskkserv/multiskkserv-20100128.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+DESCRIPTION="SKK server that handles multiple dictionaries"
+HOMEPAGE="http://www3.big.or.jp/~sian/linux/products/"
+SRC_URI="http://www3.big.or.jp/~sian/linux/products/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="test"
+
+DEPEND="|| (
+		dev-db/tinycdb
+		dev-db/cdb
+	)
+	test? ( app-i18n/nkf )"
+RDEPEND="app-i18n/skk-jisyo[cdb]"
+
+PATCHES=( "${FILESDIR}"/${PN}-cdb.patch )
+
+src_prepare() {
+	default
+	mv configure.{in,ac}
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-cdb="${EPREFIX}"/usr
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-i18n/nabi-0.99.11 b/app-i18n/nabi-0.99.11
deleted file mode 100644
index 925047ca0de4..000000000000
--- a/app-i18n/nabi-0.99.11
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=>=app-i18n/libhangul-0.1.0 dev-libs/glib:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.4:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango virtual/libintl virtual/pkgconfig sys-devel/gettext
-DESCRIPTION=Simple Hanguk X Input Method
-EAPI=5
-HOMEPAGE=https://code.google.com/p/nabi/
-IUSE=debug nls
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-i18n/libhangul-0.1.0 dev-libs/glib:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.4:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango virtual/libintl
-SLOT=0
-SRC_URI=https://nabi.googlecode.com/files/nabi-0.99.11.tar.gz
-_md5_=c387f820ca18fe34fc458c8e72b57dc2
diff --git a/app-i18n/nabi-1.0.0 b/app-i18n/nabi-1.0.0
deleted file mode 100644
index 8fd138b0bd33..000000000000
--- a/app-i18n/nabi-1.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=app-i18n/libhangul-0.1.0 dev-libs/glib:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.4:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango virtual/libintl virtual/pkgconfig sys-devel/gettext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Simple Hanguk X Input Method
-EAPI=6
-HOMEPAGE=https://github.com/choehwanjin/nabi
-IUSE=debug nls
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-i18n/libhangul-0.1.0 dev-libs/glib:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.4:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango virtual/libintl
-SLOT=0
-SRC_URI=https://github.com/choehwanjin/nabi/archive/nabi-1.0.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=1d8ece0814397eb31389ea056a9316e1
diff --git a/app-i18n/nabi/Manifest b/app-i18n/nabi/Manifest
new file mode 100644
index 000000000000..c40509740c91
--- /dev/null
+++ b/app-i18n/nabi/Manifest
@@ -0,0 +1,6 @@
+AUX xinput-nabi 140 BLAKE2B 20aecc9cabb55c5848d1c853d7d41ba39447ef7b01c7c874dd0a17ab1b515310d5c20a8a52499d88be84efec5486ec229625235611d2723c6c5e66e6d1e8519a SHA512 53321a39f5ebfb96986ae225f3c3b47344885d4c07271a6b7defd9f2164564651bbdd6e58676e443806f15f51ef7588aea59a6c3ef52678b7f9f1b5f3edcc4d8
+DIST nabi-0.99.11.tar.gz 840845 BLAKE2B f1119fa1a2b079b54d9b275347d25b26eaebcd262eaf8ca8071838e1509deceb4df4b0908a354616195ba11bd2e1d994b917cbc965385bd6d9292c1bf1c24dd0 SHA512 0cc2a1e04241a13207226db6c2db811b32ca0cc41c28905122126d6193d6a83c575960aca0f4da0574e399a11b96e7b8c250b6f6245cc8ff3de37c2ea761b834
+DIST nabi-1.0.0.tar.gz 926638 BLAKE2B 4757d09846c6e450b6ecf07188f32fc31f13f5e1235a2f31679d6a70f39dabeea2aac36db16bf98b2cbc7155b9ccca1008cb1423b4bdbcba25117cb0cfa69c68 SHA512 afd621f3ba2743db429625cdf468abad97c20d91af90f01dea14a75d4a4bc7ea3770b37387acf7da8306b92cb3fbb51d74930459f7e42d137062f01d737ede94
+EBUILD nabi-0.99.11.ebuild 1055 BLAKE2B 1f9efe360a4be5292920b962bc3507e3ea25b349f18ea143a8c992a59e2139f34b7c99d1330ecaad688c337caeb0f0cfc12543ef9de486ac709965a6aa42d05c SHA512 f444e645e99c65b905d8d4780b5826535f882d1153e226a74ec12458cce390eca0abe978a46ae91bb95c979b728da700fa6ff7c7e3abb369631f9c1eeb5c5612
+EBUILD nabi-1.0.0.ebuild 1147 BLAKE2B 92bac853dc01353ae3219091678e48cf041cd0ad934e0e2e9a230bff5d71d133e034470977dbe7d44e0a439960205eab5e13e59de6c8183fa41c937d841a5fea SHA512 ad1ef398222a837d46e8db9d94cdbefa6fc3819f7ef863de06aed12d618e703ec913987b3db4e6de018ee3967c5b141f9cc04f40ef450553478c872d7b550c7f
+MISC metadata.xml 325 BLAKE2B e63b13aa21013822befd598d1c728621f69cc439fbeedcb7ec06c1a1d8af9a663dc5d417847df443532434a9d290121ce812659315e218a28bafa2f5516ee451 SHA512 83cebe62b9ad595a0d02c9f3d47483dbc7a17224a082e607b41f80749e5e7abb4f9c5b57b77eb1720aa1d9d833b40691169639e1d57e6930be3da37d8e9f104f
diff --git a/app-i18n/nabi/files/xinput-nabi b/app-i18n/nabi/files/xinput-nabi
new file mode 100644
index 000000000000..f5dc6e4aaafe
--- /dev/null
+++ b/app-i18n/nabi/files/xinput-nabi
@@ -0,0 +1,6 @@
+XIM=nabi
+XIM_PROGRAM="@EPREFIX@/usr/bin/nabi"
+GTK_IM_MODULE=xim
+QT_IM_MODULE=xim
+SHORT_DESC="nabi"
+ICON="@EPREFIX@/usr/share/nabi/nabi.png"
diff --git a/app-i18n/nabi/metadata.xml b/app-i18n/nabi/metadata.xml
new file mode 100644
index 000000000000..d811e857b5bb
--- /dev/null
+++ b/app-i18n/nabi/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">choehwanjin/nabi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/nabi/nabi-0.99.11.ebuild b/app-i18n/nabi/nabi-0.99.11.ebuild
new file mode 100644
index 000000000000..0c6dd59203a9
--- /dev/null
+++ b/app-i18n/nabi/nabi-0.99.11.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Simple Hanguk X Input Method"
+HOMEPAGE="https://code.google.com/p/nabi/"
+SRC_URI="https://nabi.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug nls"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=app-i18n/libhangul-0.1.0
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.4:2
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/pango
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+DOCS=( AUTHORS ChangeLog ChangeLog.0 NEWS README TODO )
+
+src_configure() {
+	local myconf=
+
+	# Broken configure: --disable-debug also enables debug
+	use debug && \
+		myconf="${myconf} --enable-debug"
+
+	econf ${myconf}
+}
+
+src_install() {
+	default
+
+	insinto /etc/X11/xinit/xinput.d
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" "${FILESDIR}/xinput-${PN}" | newins - "${PN}.conf"
+}
+
+pkg_postinst() {
+	elog "You MUST add environment variable..."
+	elog
+	elog "export XMODIFIERS=\"@im=nabi\""
+	elog
+}
diff --git a/app-i18n/nabi/nabi-1.0.0.ebuild b/app-i18n/nabi/nabi-1.0.0.ebuild
new file mode 100644
index 000000000000..b9c453f52723
--- /dev/null
+++ b/app-i18n/nabi/nabi-1.0.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Simple Hanguk X Input Method"
+HOMEPAGE="https://github.com/choehwanjin/nabi"
+SRC_URI="https://github.com/choehwanjin/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug nls"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=app-i18n/libhangul-0.1.0
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.4:2
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/pango
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+DOCS=( AUTHORS ChangeLog.0 NEWS README TODO )
+
+S="${WORKDIR}"/${PN}-${P}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=
+
+	# Broken configure: --disable-debug also enables debug
+	use debug && \
+		myconf="${myconf} --enable-debug"
+
+	econf ${myconf}
+}
+
+src_install() {
+	default
+
+	insinto /etc/X11/xinit/xinput.d
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" "${FILESDIR}/xinput-${PN}" | newins - "${PN}.conf"
+}
+
+pkg_postinst() {
+	elog "You MUST add environment variable..."
+	elog
+	elog "export XMODIFIERS=\"@im=nabi\""
+	elog
+}
diff --git a/app-i18n/nkf-2.1.3 b/app-i18n/nkf-2.1.3
deleted file mode 100644
index d29f720b5bc7..000000000000
--- a/app-i18n/nkf-2.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/perl:=[-build(-)]
-DESCRIPTION=Network Kanji code conversion Filter with UTF-8/16 support
-EAPI=5
-HOMEPAGE=http://sourceforge.jp/projects/nkf/
-IUSE=perl python l10n_ja python_targets_python2_7
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-macos
-LICENSE=ZLIB
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/perl:=[-build(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/nkf/59912/nkf-2.1.3.tar.gz python? ( https://dev.gentoo.org/~naota/files/NKF_python20090602.tgz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8efb8e062191a20650321d414c4f3f90
diff --git a/app-i18n/nkf-2.1.3-r1 b/app-i18n/nkf-2.1.3-r1
deleted file mode 100644
index c093976048a6..000000000000
--- a/app-i18n/nkf-2.1.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/perl:=[-build(-)]
-DESCRIPTION=Network Kanji code conversion Filter with UTF-8/16 support
-EAPI=5
-HOMEPAGE=http://sourceforge.jp/projects/nkf/
-IUSE=perl python l10n_ja python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-macos
-LICENSE=ZLIB
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/perl:=[-build(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/nkf/59912/nkf-2.1.3.tar.gz l10n_ja? ( https://dev.gentoo.org/~naota/files/nkf.1j ) python? ( https://dev.gentoo.org/~naota/files/NKF_python20090602.tgz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=20fc64b12f9e15516059f510f0c7b63a
diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
new file mode 100644
index 000000000000..24a420f5b121
--- /dev/null
+++ b/app-i18n/nkf/Manifest
@@ -0,0 +1,7 @@
+AUX nkf-2.1.3-strip.patch 328 BLAKE2B 8cf9585ce7285ab5227bb5ace9d92fa559e5cee377b665e76792bd0d921ab8c638a60bdab1510879dbbc2dc4ac131fcd7e9d6ef7f525a02d44cbcbaa6b5a3db1 SHA512 a23bf0164bcf765f3b846a564c55bd783362e6f84b6f582d4d84b5ec8b711ca07d23d104ef5de2e84de5d6754b064034736ecadc5ceab6bda9ad59f00f2f527d
+DIST NKF_python20090602.tgz 2318 BLAKE2B 54399912fce0f4486e4051825319294a214089a59fa9b40e93bdc77859e79e5586abf2d197511cb158b094663993a692c981885e9db8fe260a5a746771168509 SHA512 3baee969daaba43e7ddee0d3b6d3d73ed67cfb0a3c3cbdabcdcda9fa1e61ccf374cd686ee096d031c3c48541c6be6daacf82e3b05885de63b88344d137c306d9
+DIST nkf-2.1.3.tar.gz 195020 BLAKE2B 7ffd2acdc16d98cfe1e7a73ff5999756a1c46e5dbbbf349d296f11526c077c42a64b1657d3a6bf8bee1326768ec06fe9d2aea02e5f8ba02e77626bb1316d1484 SHA512 e40798d4084657b545bdaa9904229b0a424a9be076c16993b97d206c3e82490c45288eaab417c6eea70b770f89530f90e98e1a659f8f7e4b928eea4396d1e738
+DIST nkf.1j 24160 BLAKE2B 1d461dbacfb6e5ee358d7ea162582da5042a03f02448791c4ed33a10e9eb6e5907220db8d70aea691e3908252daffcbacdaab1b9fe52b0e4e25f7b590e5bca72 SHA512 4680dfb59ceb9db5031ecefeca808e34202c841309d5b634cdd7aa89ee97118701ddeddb0ae18a2cf791987929dc9c5a528275cb1f63b1742eac2197ac9c1416
+EBUILD nkf-2.1.3-r1.ebuild 1555 BLAKE2B 00cdbe4640317471c98c918f467c44fd1c079550294ca78d6d369823422d484de72d71003d6c2c223d0f361116e9a0aba002b18e9463991e9f0d6968fbd2acf9 SHA512 873a402d6cd444119fc3cc806a97e0f057343b26c724b38076168c416cdb3f9ee5d65fe50ae475469f8d55ae51fe5a45a7487f42277513c4b25dbd3202ecc5e0
+EBUILD nkf-2.1.3.ebuild 1424 BLAKE2B d672889f8d8b195d9a1ed1e655fdf5fc6d5a0fd8e2cb835cd145f09fd1c736c20f6f5feb901559cdd2028d0ed3d8c212689649c34d86616eb897875e84c9873f SHA512 c3055e5c093fade5bf12ef16b46fb6f6a9c8b74c60d98a7e5c0e8b9e6beb68ae8fb9f11fa9e00afaf304945adc7133f06bfc05772ab2eb667c1f2b2a443da13b
+MISC metadata.xml 310 BLAKE2B 5db509d8ef0ebd0727be43314f12d877a704ff9eb8b9cde61733c4dbad8196780c07c9de484f29786116e7fe9267ca3f6be9f727be9f4fa34e582b23fa586594 SHA512 2db03c97fb76c37b779c7f6e467c03b2bc08d2642090cc27a99ae07296edcde04924e37c8a3e6cb23d61552e8cf4bee273e5c17077fac0ae0ea3458aaa81eacd
diff --git a/app-i18n/nkf/files/nkf-2.1.3-strip.patch b/app-i18n/nkf/files/nkf-2.1.3-strip.patch
new file mode 100644
index 000000000000..5cfac8820f82
--- /dev/null
+++ b/app-i18n/nkf/files/nkf-2.1.3-strip.patch
@@ -0,0 +1,9 @@
+--- a/NKF.python/setup.py
++++ b/NKF.python/setup.py
+@@ -8,5 +8,4 @@
+        author="Matsumoto Tadashi",
+        author_email="ma2@city.plala.jp",
+        ext_modules = [
+-               Extension("nkf", ["NKF_python.c"],
+-                         extra_link_args = ['-s'])])
++               Extension("nkf", ["NKF_python.c"])])
diff --git a/app-i18n/nkf/metadata.xml b/app-i18n/nkf/metadata.xml
new file mode 100644
index 000000000000..a74bb9c23ebc
--- /dev/null
+++ b/app-i18n/nkf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge-jp">nkf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/nkf/nkf-2.1.3-r1.ebuild b/app-i18n/nkf/nkf-2.1.3-r1.ebuild
new file mode 100644
index 000000000000..240a559e772a
--- /dev/null
+++ b/app-i18n/nkf/nkf-2.1.3-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+inherit eutils distutils-r1 perl-module toolchain-funcs
+
+DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
+HOMEPAGE="http://sourceforge.jp/projects/nkf/"
+SRC_URI="mirror://sourceforge.jp/nkf/59912/${P}.tar.gz
+	l10n_ja? ( https://dev.gentoo.org/~naota/files/nkf.1j )
+	python? ( https://dev.gentoo.org/~naota/files/NKF_python20090602.tgz )"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-macos"
+IUSE="perl python l10n_ja"
+
+src_prepare() {
+	sed -i \
+		-e '/^CFLAGS/{s|-g -O2||;s|=|+=|;}' \
+		-e '/-o nkf/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
+		Makefile || die
+
+	if use l10n_ja; then
+		cp "${DISTDIR}"/nkf.1j "${S}" || die
+	fi
+
+	if use python; then
+		mv "${WORKDIR}/NKF.python" "${S}" || die
+		epatch "${FILESDIR}"/${P}-strip.patch
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" nkf || die
+	if use perl; then
+		cd "${S}/NKF.mod"
+		perl-module_src_compile
+	fi
+	if use python; then
+		cd "${S}/NKF.python"
+		distutils-r1_src_compile
+	fi
+}
+
+src_test() {
+	emake test || die
+	if use perl; then
+		cd "${S}/NKF.mod"
+		perl-module_src_test
+	fi
+}
+
+src_install() {
+	dobin nkf || die
+	doman nkf.1
+
+	if use l10n_ja; then
+		./nkf -e nkf.1j > nkf.1
+		doman -i18n=ja nkf.1
+	fi
+	dodoc nkf.doc
+
+	if use perl; then
+		cd "${S}/NKF.mod"
+		perl-module_src_install
+	fi
+	if use python; then
+		cd "${S}/NKF.python"
+		distutils-r1_src_install
+	fi
+}
diff --git a/app-i18n/nkf/nkf-2.1.3.ebuild b/app-i18n/nkf/nkf-2.1.3.ebuild
new file mode 100644
index 000000000000..4c6a6142c01b
--- /dev/null
+++ b/app-i18n/nkf/nkf-2.1.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+inherit eutils distutils-r1 perl-module toolchain-funcs
+
+DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
+HOMEPAGE="http://sourceforge.jp/projects/nkf/"
+SRC_URI="mirror://sourceforge.jp/nkf/59912/${P}.tar.gz
+	python? ( https://dev.gentoo.org/~naota/files/NKF_python20090602.tgz )"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-macos"
+IUSE="perl python l10n_ja"
+
+src_prepare() {
+	sed -i \
+		-e '/^CFLAGS/{s|-g -O2||;s|=|+=|;}' \
+		-e '/-o nkf/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
+		Makefile || die
+
+	if use python; then
+		mv "${WORKDIR}/NKF.python" "${S}" || die
+		epatch "${FILESDIR}"/${P}-strip.patch
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" nkf || die
+	if use perl; then
+		cd "${S}/NKF.mod"
+		perl-module_src_compile
+	fi
+	if use python; then
+		cd "${S}/NKF.python"
+		distutils-r1_src_compile
+	fi
+}
+
+src_test() {
+	emake test || die
+	if use perl; then
+		cd "${S}/NKF.mod"
+		perl-module_src_test
+	fi
+}
+
+src_install() {
+	dobin nkf || die
+	doman nkf.1
+
+	if use l10n_ja; then
+		./nkf -e nkf.1j > nkf.1
+		doman -i18n=ja nkf.1
+	fi
+	dodoc nkf.doc
+
+	if use perl; then
+		cd "${S}/NKF.mod"
+		perl-module_src_install
+	fi
+	if use python; then
+		cd "${S}/NKF.python"
+		distutils-r1_src_install
+	fi
+}
diff --git a/app-i18n/opencc-1.0.5 b/app-i18n/opencc-1.0.5
deleted file mode 100644
index 992d155a13c4..000000000000
--- a/app-i18n/opencc-1.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Libraries for conversion between Traditional and Simplified Chinese
-EAPI=6
-HOMEPAGE=https://github.com/BYVoid/OpenCC
-IUSE=doc test
-KEYWORDS=amd64 hppa ppc ppc64 x86
-LICENSE=Apache-2.0
-SLOT=0/2
-SRC_URI=https://github.com/BYVoid/OpenCC/archive/ver.1.0.5.tar.gz -> opencc-1.0.5.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ce02d42ae115179839356c5ca41ec4de
diff --git a/app-i18n/opencc-9999 b/app-i18n/opencc-9999
deleted file mode 100644
index 2fd084bd2174..000000000000
--- a/app-i18n/opencc-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Libraries for conversion between Traditional and Simplified Chinese
-EAPI=6
-HOMEPAGE=https://github.com/BYVoid/OpenCC
-IUSE=doc test
-LICENSE=Apache-2.0
-SLOT=0/2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=037cba180239e999ecc2a1f4205eb017
diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest
new file mode 100644
index 000000000000..1cac514ef514
--- /dev/null
+++ b/app-i18n/opencc/Manifest
@@ -0,0 +1,5 @@
+AUX opencc-test.patch 202 BLAKE2B 1dd3bc35c1f8644cd4f27ce8a5b5dea3b0ef2750612f112d7dc6de658634ad5151972b80c7b2ede9f41ea98ac7a2d29eaeb961132c862f66dd160dc2dd522a6d SHA512 5318058587b41fb7021ffce64d4b999b1beed294ce4c00137fb4b0396dd2cb471af789bceb8a8076b1d4ec2226d3c3fdf8b3d3d6a1f5d80936cf2407b8bdd3ec
+DIST opencc-1.0.5.tar.gz 1598354 BLAKE2B a66b32b96dab543d8401960ff0548a4e3f9414606513941426eacf105bca0755a7b364c68b7eb996ef82444e52f849d2f8151353a14fb97a358ad1463fbea2d3 SHA512 3fbefbafe5c3c2491032158577ab97b5a3edf6ea98a03a7250deba082b72c3112ad4a3396d1a469936ec32e1d141f0a2236001c2891ac9c793add2b082596cc1
+EBUILD opencc-1.0.5.ebuild 951 BLAKE2B 5754abcfea97a56100601ae189e2274542976063ab0ee943f227c67e98381dde4bfe1e153f6d9474eb79be2edbc8c73b220826589489f5c612751feb9314b240 SHA512 065cf96608de11939d91a30c5d1c6358c64066cd3a3c858d2c4ecc4aef2a4b77a83554e072e0f05234331818b7a4662dd32dfe114735023dd6ff0f44686aba8c
+EBUILD opencc-9999.ebuild 927 BLAKE2B 00d77822d6157ce7f0c29c6db267b76571a49c7ee80c8cbce464df499b23b42e99fb2e92795895cef2cb7485be3a9ec96c8db3d2148a7f19cefcb3e338913364 SHA512 868b831de1cc47afe1b471848df50eb036c8f29701839a3ca3767aba8e42b10a227dd9dc33ee726331a890ef3938ef71af444582f1f2d16c785158f7b36e5eb6
+MISC metadata.xml 491 BLAKE2B ec523a795afb6ae99cc5835e3df9fe07916aac4bf8552254f3bacbb9e1764a3ba5a79eddcabd8f34417544709a10a0bd34e6133a01b9b7a15156a9d282316d86 SHA512 303cf35b932c5d5a1fdd1a25b2c71a65a4aab761fe3c66d72439d691255a5edd1b943287afe8b4c53ab62531a012dafb5f416471a172f5b487557684dc6655df
diff --git a/app-i18n/opencc/files/opencc-test.patch b/app-i18n/opencc/files/opencc-test.patch
new file mode 100644
index 000000000000..dd6e91b984d2
--- /dev/null
+++ b/app-i18n/opencc/files/opencc-test.patch
@@ -0,0 +1,11 @@
+--- a/src/PhraseExtractTest.cpp
++++ b/src/PhraseExtractTest.cpp
+@@ -16,6 +16,8 @@
+  * limitations under the License.
+  */
+ 
++#include <cmath>
++
+ #include "PhraseExtract.hpp"
+ #include "TestUtils.hpp"
+ 
diff --git a/app-i18n/opencc/metadata.xml b/app-i18n/opencc/metadata.xml
new file mode 100644
index 000000000000..377bdc587a2d
--- /dev/null
+++ b/app-i18n/opencc/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <longdescription lang="en">
+    OpenCC is a library for converting characters and phrases between
+    Traditional Chinese and Simplified Chinese.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">BYVoid/OpenCC</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/opencc/opencc-1.0.5.ebuild b/app-i18n/opencc/opencc-1.0.5.ebuild
new file mode 100644
index 000000000000..ba948e2bf80d
--- /dev/null
+++ b/app-i18n/opencc/opencc-1.0.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/BYVoid/OpenCC"
+else
+	inherit vcs-snapshot
+
+	SRC_URI="https://github.com/BYVoid/${PN^^[oc]}/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Libraries for conversion between Traditional and Simplified Chinese"
+HOMEPAGE="https://github.com/BYVoid/OpenCC"
+
+LICENSE="Apache-2.0"
+SLOT="0/2"
+KEYWORDS="amd64 hppa ppc ppc64 x86"
+IUSE="doc test"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+DOCS="AUTHORS *.md"
+PATCHES=( "${FILESDIR}"/${PN}-test.patch )
+
+src_prepare() {
+	sed -i "s|\${DIR_SHARE_OPENCC}/doc|share/doc/${PF}|" doc/CMakeLists.txt
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_SHARED_LIBS=ON
+		-DENABLE_GTEST=$(usex test)
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-i18n/opencc/opencc-9999.ebuild b/app-i18n/opencc/opencc-9999.ebuild
new file mode 100644
index 000000000000..9ec1cbd5d8b7
--- /dev/null
+++ b/app-i18n/opencc/opencc-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/BYVoid/OpenCC"
+else
+	inherit vcs-snapshot
+
+	SRC_URI="https://github.com/BYVoid/${PN^^[oc]}/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Libraries for conversion between Traditional and Simplified Chinese"
+HOMEPAGE="https://github.com/BYVoid/OpenCC"
+
+LICENSE="Apache-2.0"
+SLOT="0/2"
+KEYWORDS=""
+IUSE="doc test"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+DOCS="AUTHORS *.md"
+PATCHES=( "${FILESDIR}"/${PN}-test.patch )
+
+src_prepare() {
+	sed -i "s|\${DIR_SHARE_OPENCC}/doc|share/doc/${PF}|" doc/CMakeLists.txt
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_SHARED_LIBS=ON
+		-DENABLE_GTEST=$(usex test)
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-i18n/poedit-2.0.6 b/app-i18n/poedit-2.0.6
deleted file mode 100644
index 7a2869432080..000000000000
--- a/app-i18n/poedit-2.0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=app-text/gtkspell:3 x11-libs/gtk+:3 >=dev-cpp/lucene++-3.0.5 dev-libs/boost:=[nls] dev-libs/icu:= >=x11-libs/wxGTK-3.0.3:3.0-gtk3[X] virtual/pkgconfig >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GUI gettext translations editor
-EAPI=6
-HOMEPAGE=https://poedit.net
-KEYWORDS=amd64 ~hppa ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=app-text/gtkspell:3 x11-libs/gtk+:3 >=dev-cpp/lucene++-3.0.5 dev-libs/boost:=[nls] dev-libs/icu:= >=x11-libs/wxGTK-3.0.3:3.0-gtk3[X]
-SLOT=0
-SRC_URI=https://github.com/vslavik/poedit/releases/download/v2.0.6-oss/poedit-2.0.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ea0ef9e158036a6440007734d6ffd36f
diff --git a/app-i18n/poedit-2.0.7 b/app-i18n/poedit-2.0.7
deleted file mode 100644
index cc20ada99b68..000000000000
--- a/app-i18n/poedit-2.0.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=app-text/gtkspell:3 x11-libs/gtk+:3 >=dev-cpp/lucene++-3.0.5 dev-libs/boost:=[nls] dev-libs/icu:= >=x11-libs/wxGTK-3.0.3:3.0-gtk3[X] virtual/pkgconfig >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GUI gettext translations editor
-EAPI=6
-HOMEPAGE=https://poedit.net
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=app-text/gtkspell:3 x11-libs/gtk+:3 >=dev-cpp/lucene++-3.0.5 dev-libs/boost:=[nls] dev-libs/icu:= >=x11-libs/wxGTK-3.0.3:3.0-gtk3[X]
-SLOT=0
-SRC_URI=https://github.com/vslavik/poedit/releases/download/v2.0.7-oss/poedit-2.0.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8264b1f8ac7e70e65aa42f66e3ef3bdb
diff --git a/app-i18n/poedit/Manifest b/app-i18n/poedit/Manifest
new file mode 100644
index 000000000000..7fed2b472343
--- /dev/null
+++ b/app-i18n/poedit/Manifest
@@ -0,0 +1,5 @@
+DIST poedit-2.0.6.tar.gz 2511777 BLAKE2B f28e8940310e80ee15fc70f10492e061097f88b62938f8a85194170fd107100c739dbfd1c1cf12516e6fe3d2a9b282986a4368615cf8fcb2ac889075fe64cc6b SHA512 e7beceeb4cd9e4e0269666d634e48622f175a7788219288ba6349a5b15f8360a929018480372e3eecb664d7d2e3093d6788640651696323d6dda0f0780aa5cd2
+DIST poedit-2.0.7.tar.gz 2558220 BLAKE2B e4a958e516a5c4b56331b6f9f37d9fa627072a4a161f17b9e809df86af7ab86130c704b9f41d081a86dbc2dc3b24acf62615e843b73f78874c42730bd46f9b55 SHA512 7b8b41b5f55252b1845c452edbdad56dc841c507c4fb7a24267bd2af8490610f5f3eb72f31ed4d062fdaef939ef4ecd9c30ddc85a5dad3a792ac5857567dac71
+EBUILD poedit-2.0.6.ebuild 1273 BLAKE2B 9f2a627317290fb4ac7acb8b80f29297ec20c2a8c31b8f38bf995f461e7518bc767d49fed66c5953d2dbe4ffbe5dd1c981189601aaed8516ce7059aa372f9f7c SHA512 97cbb993e0b2583277d2ba88accf36e4bcf4b113d95b87140d80b3c07b705a0f38eb85721b81e1aced2b27e24ec6905308a916d3caa6b2ab7ad494957adcc0a5
+EBUILD poedit-2.0.7.ebuild 1278 BLAKE2B 345e579a3447a333c4633cee6f1742f64082549aeef84dcbcb32407e219a7edd68aeef53d883ae6269a464b6e6a41cd124d6403fce8645c7f95c44a55da34ada SHA512 c1b7cddd4c5051e142bf1e663cf4df22543f16168ab4413fcba9a56ec9c1ef5ec507d462dd46e773bd92d89e1a9c51ebe0d9ed536cc4b111cfd6314f67993e84
+MISC metadata.xml 391 BLAKE2B 9ad2108cfd16183f871c18a04008364439226a905d824253b50e0f4d91ea437a915d2d83164bfcd6a7a2733fbd5db1291b9ef59f86736e5716509ea8b3575c02 SHA512 703b2a9a442d99d59f033561093bc9027cd52c0a98eb1e0cc253c3fcfbcf1987fac8c244061edfe87ea84dde192fe098ed02c6b1cdc3bb6754f42a72ac2ddd3f
diff --git a/app-i18n/poedit/metadata.xml b/app-i18n/poedit/metadata.xml
new file mode 100644
index 000000000000..ce23bed0e6f5
--- /dev/null
+++ b/app-i18n/poedit/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>wxwidgets@gentoo.org</email>
+		<name>Gentoo wxWidgets Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">vslavik/poedit</remote-id>
+		<remote-id type="sourceforge">poedit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/poedit/poedit-2.0.6.ebuild b/app-i18n/poedit/poedit-2.0.6.ebuild
new file mode 100644
index 000000000000..abf88a2c2dec
--- /dev/null
+++ b/app-i18n/poedit/poedit-2.0.6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER=3.0-gtk3
+
+PLOCALES="an ar az be be@latin bg bs ca ckb co cs da de el en_GB es et eu fa fi fr ga gl he hr hu hy id is it ja ka kab kk ko lt lv ms nb nl oc pa pl pt_BR pt_PT ro ru sk sl sq sr sv tg th tr uk uz vi zh_CN zh_TW"
+
+inherit gnome2-utils l10n wxwidgets xdg
+
+DESCRIPTION="GUI gettext translations editor"
+HOMEPAGE="https://poedit.net"
+SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND="
+	app-text/gtkspell:3
+	x11-libs/gtk+:3
+	>=dev-cpp/lucene++-3.0.5
+	dev-libs/boost:=[nls]
+	dev-libs/icu:=
+	>=x11-libs/wxGTK-3.0.3:${WX_GTK_VER}[X]
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	my_rm_loc() {
+		sed -i -e "/^POEDIT_LINGUAS = /s: ${1}::" locales/Makefile.in || die
+		rm "locales/${1}.mo" || die
+	}
+	l10n_find_plocales_changes 'locales' '' '.mo'
+	l10n_for_each_disabled_locale_do my_rm_loc
+
+	setup-wxwidgets
+	xdg_src_prepare
+}
+
+src_configure() {
+	econf --without-cpprest --without-cld2
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/poedit/poedit-2.0.7.ebuild b/app-i18n/poedit/poedit-2.0.7.ebuild
new file mode 100644
index 000000000000..b5857296a23e
--- /dev/null
+++ b/app-i18n/poedit/poedit-2.0.7.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER=3.0-gtk3
+
+PLOCALES="an ar az be be@latin bg bs ca ckb co cs da de el en_GB es et eu fa fi fr ga gl he hr hu hy id is it ja ka kab kk ko lt lv ms nb nl oc pa pl pt_BR pt_PT ro ru sk sl sq sr sv tg th tr uk uz vi zh_CN zh_TW"
+
+inherit gnome2-utils l10n wxwidgets xdg
+
+DESCRIPTION="GUI gettext translations editor"
+HOMEPAGE="https://poedit.net"
+SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	app-text/gtkspell:3
+	x11-libs/gtk+:3
+	>=dev-cpp/lucene++-3.0.5
+	dev-libs/boost:=[nls]
+	dev-libs/icu:=
+	>=x11-libs/wxGTK-3.0.3:${WX_GTK_VER}[X]
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	my_rm_loc() {
+		sed -i -e "/^POEDIT_LINGUAS = /s: ${1}::" locales/Makefile.in || die
+		rm "locales/${1}.mo" || die
+	}
+	l10n_find_plocales_changes 'locales' '' '.mo'
+	l10n_for_each_disabled_locale_do my_rm_loc
+
+	setup-wxwidgets
+	xdg_src_prepare
+}
+
+src_configure() {
+	econf --without-cpprest --without-cld2
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/pology-0.12 b/app-i18n/pology-0.12
deleted file mode 100644
index 004d786f3b1a..000000000000
--- a/app-i18n/pology-0.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/libxslt dev-libs/libxml2 dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-devel/gettext python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-python/epydoc[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A framework for custom processing of PO files
-EAPI=6
-HOMEPAGE=http://pology.nedohodnik.net
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libxslt dev-libs/libxml2 dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-devel/gettext python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://pology.nedohodnik.net//release/pology-0.12.tar.bz2
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9d3978f96a05d6c75c55d92adaa985b9
diff --git a/app-i18n/pology-9999 b/app-i18n/pology-9999
deleted file mode 100644
index 8879f9dea623..000000000000
--- a/app-i18n/pology-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-libs/libxslt dev-libs/libxml2 dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-devel/gettext python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-python/epydoc[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-devel/make >=dev-util/cmake-3.9.6 || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
-DESCRIPTION=A framework for custom processing of PO files
-EAPI=6
-HOMEPAGE=http://pology.nedohodnik.net
-IUSE=python_targets_python2_7
-LICENSE=GPL-3
-RDEPEND=dev-libs/libxslt dev-libs/libxml2 dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-devel/gettext python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=efd598db3def9a4d768869fcbe7f9625
diff --git a/app-i18n/pology/Manifest b/app-i18n/pology/Manifest
new file mode 100644
index 000000000000..23c4b1abc77e
--- /dev/null
+++ b/app-i18n/pology/Manifest
@@ -0,0 +1,4 @@
+DIST pology-0.12.tar.bz2 1773467 BLAKE2B 7725b6dcb10c0f14533ee31a3d75c78e4fbd12d79ce21017b16d339a880cb73c47c8801e54f5ca0c49d8f364a12179caf6f4100b6eee5b5c47638f61d47a30d0 SHA512 2e23d1dd0c38cc17826908734adf46fb30c30d58f906fc223e2e9251791dad43d02840ae4eca55e04682af574df45a553ccd83faf85a785a1446f645e4222b4f
+EBUILD pology-0.12.ebuild 1518 BLAKE2B 3a06c328587ff66ea3b6de85296e3545c2c51c1fd4fd2487bd0984da799661053b631acfef42e2dcaf40b97313cc96871c8152ecfc265c8d9e234383078c58e0 SHA512 6b2a457f20c3e4fb8300af4b0aff6f502abe0cc405c5faec1111fe62183d9e75d489a9f9467061c8d553ed5777e10b719332a6da5d751b5c993249a525ec37ea
+EBUILD pology-9999.ebuild 1520 BLAKE2B 363e87934d6b2664dcc076611232df108638601ecd925c9df580d30009cc9954b37b41cabcc49ac2a5656eb0c1f42b949fd5c0adcd59b519cd666301739ad8d9 SHA512 17b869529d4dda2adb335a4e1be4999ffcc173c7eed73e88d4889b479a31fe53ca389176114b7f3bc538a9e501c91170f3fca7afceb5724acf1f854ccba186b0
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-i18n/pology/metadata.xml b/app-i18n/pology/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/app-i18n/pology/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-i18n/pology/pology-0.12.ebuild b/app-i18n/pology/pology-0.12.ebuild
new file mode 100644
index 000000000000..f30202d5f5e6
--- /dev/null
+++ b/app-i18n/pology/pology-0.12.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/l10n-support/pology"
+PYTHON_COMPAT=( python2_7 )
+
+[[ ${PV} == 9999 ]] && VCS_ECLASS="subversion"
+
+inherit python-single-r1 cmake-utils bash-completion-r1 ${VCS_ECLASS}
+unset VCS_ECLASS
+
+DESCRIPTION="A framework for custom processing of PO files"
+HOMEPAGE="http://pology.nedohodnik.net"
+[[ ${PV} == 9999 ]] || SRC_URI="http://pology.nedohodnik.net//release/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libxslt
+	dev-libs/libxml2
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	sys-devel/gettext
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.5
+	dev-python/epydoc[${PYTHON_USEDEP}]
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Magic on python parsing makes it impossible to make it parallel safe
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	python_fix_shebang .
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dosym ../../../pology/syntax/kate/synder.xml /usr/share/apps/katepart/syntax/synder.xml
+
+	newbashcomp "${ED}"/usr/share/pology/completion/bash/pology posieve
+	bashcomp_alias {posieve,poediff}{,.py}
+
+	einfo "You should also consider following packages to install:"
+	einfo "    app-text/aspell"
+	einfo "    app-text/hunspell"
+	einfo "    dev-vcs/git"
+	einfo "    dev-vcs/subversion"
+	einfo "    sci-misc/apertium"
+}
diff --git a/app-i18n/pology/pology-9999.ebuild b/app-i18n/pology/pology-9999.ebuild
new file mode 100644
index 000000000000..a1c06c9a1711
--- /dev/null
+++ b/app-i18n/pology/pology-9999.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/l10n-support/pology"
+PYTHON_COMPAT=( python2_7 )
+
+[[ ${PV} == 9999 ]] && VCS_ECLASS="subversion"
+
+inherit python-single-r1 cmake-utils bash-completion-r1 ${VCS_ECLASS}
+unset VCS_ECLASS
+
+DESCRIPTION="A framework for custom processing of PO files"
+HOMEPAGE="http://pology.nedohodnik.net"
+[[ ${PV} == 9999 ]] || SRC_URI="http://pology.nedohodnik.net//release/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libxslt
+	dev-libs/libxml2
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	sys-devel/gettext
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.5
+	dev-python/epydoc[${PYTHON_USEDEP}]
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Magic on python parsing makes it impossible to make it parallel safe
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	python_fix_shebang .
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dosym ../../../pology/syntax/kate/synder.xml /usr/share/apps/katepart/syntax/synder.xml
+
+	newbashcomp "${ED}"/usr/share/pology/completion/bash/pology posieve
+	bashcomp_alias {posieve,poediff}{,.py}
+
+	einfo "You should also consider following packages to install:"
+	einfo "    app-text/aspell"
+	einfo "    app-text/hunspell"
+	einfo "    dev-vcs/git"
+	einfo "    dev-vcs/subversion"
+	einfo "    sci-misc/apertium"
+}
diff --git a/app-i18n/pyzy-0.1.0-r2 b/app-i18n/pyzy-0.1.0-r2
deleted file mode 100644
index 852ab16af77a..000000000000
--- a/app-i18n/pyzy-0.1.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-db/sqlite:3 dev-libs/glib:2 sys-apps/util-linux boost? ( dev-libs/boost ) opencc? ( app-i18n/opencc:= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) sys-devel/autoconf-archive doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The Chinese PinYin and Bopomofo conversion library
-EAPI=6
-HOMEPAGE=https://github.com/pyzy/pyzy
-IUSE=boost doc opencc
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 sys-apps/util-linux boost? ( dev-libs/boost ) opencc? ( app-i18n/opencc:= )
-SLOT=0
-SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/pyzy/pyzy-0.1.0.tar.gz https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/pyzy/pyzy-database-1.0.0.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=40de24f505572574f9bc4e9bf565fd42
diff --git a/app-i18n/pyzy/Manifest b/app-i18n/pyzy/Manifest
new file mode 100644
index 000000000000..36cc16d55eb4
--- /dev/null
+++ b/app-i18n/pyzy/Manifest
@@ -0,0 +1,7 @@
+AUX pyzy-boost.patch 411 BLAKE2B e56c6b1a79a9ef30096403c5ec445d52eecb7df8f979d6cdaac06fed4439e1280433964f76cacd8c38994f2cbd75f7e8ff31a89f15b724a94435edd4750f079b SHA512 3cb8a0cf43f1fc53949fc8a69c95fcd04b49121d676530da39da6aa70a4916a2f0a6974056b1ee461d2804a28fdb7bb6a9780e5f5e217a4ffa8716b6f2060882
+AUX pyzy-db.patch 359 BLAKE2B 78a99578169984ade022edd5df52eede1041d5e9f55464e1cbff6f8ca6885d68e0cc639f6c0e351d347492a178d635128ea8cce99be60440a27eadd513f547d0 SHA512 794366e0304e92b55bca70eb11a4373eb29e272c2db27db3259b5ca84e8164427ffaacb1fdb15fc0d2a4c6c9d36408f0bf8b35ee5ccba9a9746ae13c7032cfdb
+AUX pyzy-opencc-1.0.0.patch 1712 BLAKE2B 67befcfa21dd1f1ba6543e93eacbd857f0d28a4e14940128710d5fff30f4041748d04addb2990d3e9b08f8533bc58fea67c8d3201054a12f8155f2c0275e2bd3 SHA512 4455229fb9c271e5f2a08292b34daf0cb2969a21af52cf116fadb15764cc82a4e557a9672d253af9a3968a8e907c92d8fd4542e2225a2f09fafe9592c58e7713
+DIST pyzy-0.1.0.tar.gz 1571946 BLAKE2B 2a09dab87ddc9ca9a1e2c7b71dd66fb8d75a9a0932fd87d94392e64bc6a940ce8d3d89ed09f9b3ae0da1a76275ec580033c745c7cfb85724be1f7732cb52d3b9 SHA512 42477152ffd6a2f7ce0e8f920d98e9dc9c7fc32fe9e93a2a4de75c791e70d0f08c30eca0244dc2b87981f6bfc4e635234d62720aa19358c8f80a84e0c371c662
+DIST pyzy-database-1.0.0.tar.bz2 9977983 BLAKE2B 86f9ee48d584f33ada1ee5380efdaefd85750290caada320c4c9a21206b8fb50fe6a43b931fb41a8c3bc24853bb7843e23d1778b40e6eae68fa4ec383f2b4dcc SHA512 5a7248870407f7f92c418ada49a275062325f2eb33a7eb4b91492e4b706ae70ba931b04377a758ce429fa64cd22e8bee2ac4279d4f205bbce406248eda1decf7
+EBUILD pyzy-0.1.0-r2.ebuild 1272 BLAKE2B ff8885974ae0dcfeeecf721e7647ae9d10f3f2163833505c7e72d7a2fc55bb6d8e927bad973be7bd125ebc60fd0427505b37c85d02ae506ad1d165ffc8400882 SHA512 28c9aecc4ce1d935d84188195ec5cbf59d73b4fd42421d5d8adc54f28f85e83d050c5a91419a03e05b5e7f3f9654e2ba01e97b946d8e1c43d20e54bdc11715a4
+MISC metadata.xml 649 BLAKE2B cab621c7a04f8b7672825ecf49fc56c251afef71dcbb7d6c728815b7b56f8bf5c77650ddb91c704dd2b5aaf89d3d55c7e83bd9f7510d164fef13db118177c81d SHA512 46c86fc066ea686db8497ff7dc76361a865a24215b49d2924521235c5bf88f9b029c25597f1bd19399f965052c6b324ded0a2d287cdd29518a2f46cc6614c4a4
diff --git a/app-i18n/pyzy/files/pyzy-boost.patch b/app-i18n/pyzy/files/pyzy-boost.patch
new file mode 100644
index 000000000000..34acacfbc9ba
--- /dev/null
+++ b/app-i18n/pyzy/files/pyzy-boost.patch
@@ -0,0 +1,15 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -143,9 +143,9 @@
+ )
+ if test x"$enable_boost" = x"yes"; then
+     # check boost
+-    BOOST_REQUIRE([1.39])
+-    BOOST_FIND_HEADER([boost/bind.hpp])
+-    BOOST_FIND_HEADER([boost/signals2.hpp])
++    AX_BOOST_BASE([1.39])
++    AC_CHECK_HEADERS([boost/bind.hpp])
++    AC_CHECK_HEADERS([boost/signals2.hpp])
+ fi
+ AM_CONDITIONAL(HAVE_BOOST, test x"$enable_boost" = x"yes")
+ 
diff --git a/app-i18n/pyzy/files/pyzy-db.patch b/app-i18n/pyzy/files/pyzy-db.patch
new file mode 100644
index 000000000000..44d0ac6bf456
--- /dev/null
+++ b/app-i18n/pyzy/files/pyzy-db.patch
@@ -0,0 +1,17 @@
+--- a/data/db/open-phrase/Makefile.am
++++ b/data/db/open-phrase/Makefile.am
+@@ -30,13 +30,10 @@
+ DBTAR = pyzy-database-$(DBVER).tar.bz2
+ 
+ $(DBTAR):
+-	$(AM_V_GEN) \
+-	wget http://pyzy.googlecode.com/files/$(DBTAR) || \
+-	( $(RM) $@; exit 1)
++	touch $@
+ 
+ stamp-db: $(DBTAR)
+ 	$(AM_V_GEN) \
+-	tar jxfm $(DBTAR); \
+ 	mv db/main.db db/$(db_file); \
+ 	touch $@
+ 
diff --git a/app-i18n/pyzy/files/pyzy-opencc-1.0.0.patch b/app-i18n/pyzy/files/pyzy-opencc-1.0.0.patch
new file mode 100644
index 000000000000..1e23e8b6e5db
--- /dev/null
+++ b/app-i18n/pyzy/files/pyzy-opencc-1.0.0.patch
@@ -0,0 +1,56 @@
+https://github.com/pyzy/pyzy/pull/1
+
+Author: Hillwood Yang <hillwood@opensuse.org>
+
+--- a/src/SimpTradConverter.cc
++++ b/src/SimpTradConverter.cc
+@@ -4,6 +4,7 @@
+  *
+  * Copyright (c) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
+  * Copyright (c) 2010 BYVoid <byvoid1@gmail.com>
++ * Copyright (c) 2015 Hillwood Yang <hillwood@opensuse.org>
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -40,7 +41,6 @@ namespace PyZy {
+ #ifdef HAVE_OPENCC
+ 
+ class opencc {
+-    static const int BUFFER_SIZE = 64;
+ public:
+     opencc (void)
+     {
+@@ -55,29 +55,13 @@ public:
+ 
+     void convert (const char *in, String &out)
+     {
+-        long n_char;
+-        unichar *in_ucs4 = g_utf8_to_ucs4_fast (in, -1, &n_char);
+-
+-        ucs4_t *pinbuf = (ucs4_t *)in_ucs4;
+-        size_t inbuf_left = n_char;
+-        while (inbuf_left != 0) {
+-            ucs4_t *poutbuf = (ucs4_t *)m_buffer;
+-            size_t outbuf_left = BUFFER_SIZE;
+-            size_t retval = opencc_convert(m_od, &pinbuf, &inbuf_left, &poutbuf, &outbuf_left);
+-            if (retval == (size_t) -1) {
+-                /* append left chars in pinbuf */
+-                g_warning ("opencc_convert return failed");
+-                out << (unichar *) pinbuf;
+-                break;
+-            }
+-            *poutbuf = L'\0';
+-            out << m_buffer;
+-        }
+-        g_free (in_ucs4);
++        char * converted = opencc_convert_utf8 (m_od, in, -1);
++        g_assert (converted != NULL);
++        out = converted;
++        opencc_convert_utf8_free (converted);
+     }
+ private:
+     opencc_t m_od;
+-    unichar m_buffer[BUFFER_SIZE + 1];
+ };
+ 
+ void
diff --git a/app-i18n/pyzy/metadata.xml b/app-i18n/pyzy/metadata.xml
new file mode 100644
index 000000000000..f6afd400fc25
--- /dev/null
+++ b/app-i18n/pyzy/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>dlan@gentoo.org</email>
+    <name>Yixun Lan</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <use>
+    <flag name="boost">Enable support for <pkg>dev-libs/boost</pkg></flag>
+    <flag name="doc">Generate API documentation</flag>
+    <flag name="opencc">Enable support for <pkg>app-i18n/opencc</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="github">pyzy/pyzy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/pyzy/pyzy-0.1.0-r2.ebuild b/app-i18n/pyzy/pyzy-0.1.0-r2.ebuild
new file mode 100644
index 000000000000..2c736e2414ad
--- /dev/null
+++ b/app-i18n/pyzy/pyzy-0.1.0-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools ltprune python-any-r1
+
+PYZY_DB="${PN}-database-1.0.0"
+
+DESCRIPTION="The Chinese PinYin and Bopomofo conversion library"
+HOMEPAGE="https://github.com/pyzy/pyzy"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz
+	https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${PYZY_DB}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="boost doc opencc"
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/glib:2
+	sys-apps/util-linux
+	boost? ( dev-libs/boost )
+	opencc? ( app-i18n/opencc:= )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	sys-devel/autoconf-archive
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-boost.patch
+	"${FILESDIR}"/${PN}-db.patch
+	"${FILESDIR}"/${PN}-opencc-1.0.0.patch
+)
+
+src_prepare() {
+	mv "${WORKDIR}"/db data/db/open-phrase || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable boost) \
+		$(use_enable opencc) \
+		--enable-db-open-phrase \
+		DOXYGEN=$(usex doc doxygen true)
+}
+
+src_install() {
+	if use doc; then
+		HTML_DOCS=( docs/html/. )
+	fi
+
+	default
+	prune_libtool_files
+}
diff --git a/app-i18n/qimhangul-0.2.0 b/app-i18n/qimhangul-0.2.0
deleted file mode 100644
index c5b2765c176e..000000000000
--- a/app-i18n/qimhangul-0.2.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=app-i18n/libhangul-0.0.12 dev-qt/qtgui:4
-DESCRIPTION=a qt-based imhangul
-EAPI=5
-HOMEPAGE=https://code.google.com/p/qimhangul/
-KEYWORDS=amd64
-LICENSE=LGPL-3
-RDEPEND=>=app-i18n/libhangul-0.0.12 dev-qt/qtgui:4
-SLOT=0
-SRC_URI=https://qimhangul.googlecode.com/files/qimhangul-0.2.0.tar.gz
-_md5_=7ad337ff0860bff7846b7e119167e902
diff --git a/app-i18n/qimhangul/Manifest b/app-i18n/qimhangul/Manifest
new file mode 100644
index 000000000000..cdec7698ae1a
--- /dev/null
+++ b/app-i18n/qimhangul/Manifest
@@ -0,0 +1,3 @@
+DIST qimhangul-0.2.0.tar.gz 336566 BLAKE2B ecc5f2cd5f2f2815590e80e38c2e3f022c2a3fad6be8bee36abcc7284c5dc621be8987459576e05d962d74c7e3abe3df60dca73fe6c3468e82153fc47549a1ee SHA512 0871dddf48211841be36facde39cd215c247a5b89c1167baadd33b839eff084b7c39185804e1e62a7acc001178b56751d4f0301e327e1e0709b4340b7a003d0e
+EBUILD qimhangul-0.2.0.ebuild 385 BLAKE2B 27979f7759b484fd8dd44a77939c60426c5a2659c1d1027f57cb5f02b76bae600f578da126b0172f23ba9d7e2506a39f6167c4da941286c2750198ee9a209e81 SHA512 d578c43c201eaf8e892578b6d1a57d337ed651479a147ae97ac3d0f45d8b9eb8dc8a122994df4e78a57e38b302f7710539ed826761876729d8493a737756ce80
+MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-i18n/qimhangul/metadata.xml b/app-i18n/qimhangul/metadata.xml
new file mode 100644
index 000000000000..c921b96adf6c
--- /dev/null
+++ b/app-i18n/qimhangul/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-i18n/qimhangul/qimhangul-0.2.0.ebuild b/app-i18n/qimhangul/qimhangul-0.2.0.ebuild
new file mode 100644
index 000000000000..44a23c251b42
--- /dev/null
+++ b/app-i18n/qimhangul/qimhangul-0.2.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="a qt-based imhangul"
+HOMEPAGE="https://code.google.com/p/qimhangul/"
+SRC_URI="https://qimhangul.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND=">=app-i18n/libhangul-0.0.12
+	dev-qt/qtgui:4"
+RDEPEND="${DEPEND}"
diff --git a/app-i18n/qkc-1.00 b/app-i18n/qkc-1.00
deleted file mode 100644
index b9c4bb50b5c3..000000000000
--- a/app-i18n/qkc-1.00
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/unzip
-DESCRIPTION=Quick KANJI code Converter
-EAPI=4
-HOMEPAGE=http://hp.vector.co.jp/authors/VA000501/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=freedist
-SLOT=0
-SRC_URI=http://hp.vector.co.jp/authors/VA000501/qkcc100.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9de08a665a33c16787f64b2cd03e808e
diff --git a/app-i18n/qkc/Manifest b/app-i18n/qkc/Manifest
new file mode 100644
index 000000000000..ca7db723eb40
--- /dev/null
+++ b/app-i18n/qkc/Manifest
@@ -0,0 +1,3 @@
+DIST qkcc100.zip 36308 BLAKE2B 3291a7159a63f62c045230e045c6749f6d44ee5173270f1e994c770c14c0381c279c7452acd6861932a8227f13b1e4e8888e9f49654b3a59c93fb9069bfb09aa SHA512 a03f12625c1205d1220c70e2c3bd8f4ef281a3f0f6317ad7a0221624ba6461a7f9fbbb1da68048fc2bb3b071895dfb13aaa630e780fd49eddb0b6c528ce2e4a0
+EBUILD qkc-1.00.ebuild 656 BLAKE2B a4428c649d1357c7582e6703f2f497517419cea1d69cc9524681b3e88a47105369964ed7ede35a1877ed524611c3237ce31dbdbe41c1619163613e0df25c0bbe SHA512 45b7646486e43cd18dc45c02415e030757b054c35e3b85f9d71f03d7dfc99c335468052fcb48d1e69d29ace3f59e6d2d20ee5c2c8e27c218a5d9235f7ad189d5
+MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/qkc/metadata.xml b/app-i18n/qkc/metadata.xml
new file mode 100644
index 000000000000..e1a49f498885
--- /dev/null
+++ b/app-i18n/qkc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-i18n/qkc/qkc-1.00.ebuild b/app-i18n/qkc/qkc-1.00.ebuild
new file mode 100644
index 000000000000..214c07afe506
--- /dev/null
+++ b/app-i18n/qkc/qkc-1.00.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+MY_P="${PN}c${PV/./}"
+
+DESCRIPTION="Quick KANJI code Converter"
+HOMEPAGE="http://hp.vector.co.jp/authors/VA000501/"
+SRC_URI="http://hp.vector.co.jp/authors/VA000501/${MY_P}.zip"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+S="${WORKDIR}"
+
+src_prepare() {
+	sed -i "/^LFLAGS/s:$: \${LDFLAGS}:" Makefile
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin qkc
+	dodoc qkc.doc
+	doman -i18n=ja qkc.1
+}
diff --git a/app-i18n/rime-data-0.35 b/app-i18n/rime-data-0.35
deleted file mode 100644
index 208ae05d6b87..000000000000
--- a/app-i18n/rime-data-0.35
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=app-i18n/librime
-DESCRIPTION=Data resources for Rime Input Method Engine
-EAPI=6
-HOMEPAGE=http://rime.im/ https://github.com/rime/brise
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-3
-RDEPEND=app-i18n/librime
-SLOT=0
-SRC_URI=https://dl.bintray.com/lotem/rime/brise-0.35.tar.gz
-_md5_=fcdbfd387836c545e5c36ddc663026ea
diff --git a/app-i18n/rime-data/Manifest b/app-i18n/rime-data/Manifest
new file mode 100644
index 000000000000..589c2e5137dd
--- /dev/null
+++ b/app-i18n/rime-data/Manifest
@@ -0,0 +1,3 @@
+DIST brise-0.35.tar.gz 6707277 BLAKE2B 610ea2e58800676b88bc79ce7075ed5fa8ec041f2ee34e3dfbcbfa642f84413d8b188af8e49de56d815eac2e5188d18287749976aa4e28ba5c7c7dfc6dece30a SHA512 1a2a3ddba9be7089a1b82ce446a3e5dc93a13fff121f861aa1acbdea950f490c9367866902a056296e17de5076a59a54741ceb3a59a9c0ec58b6b7c54f519f3d
+EBUILD rime-data-0.35.ebuild 466 BLAKE2B df930eae62f7258d15426082066c072c38134052dbdbf6e991ad9c347d02340be9a5368af8143529950a1659f62726caaec825dbe95b9511460896e6f8c6f07e SHA512 3f0511d823119f5f17cb57910d7ed739b4dd4333b82d50e00d3343efbb07a8aab92d50ad1e1d38c154f95318f0c4e6a38bbab44ff6f965fb7c21000653e4152a
+MISC metadata.xml 530 BLAKE2B e2e632708080487ab2499dfccb257e01c173a68bcf818b5bb448461584eeadcef507b8d890598b2352da68e61fc80d366663162cbb9cd9374fcdc1fbd3655c50 SHA512 3d5960ae6ccf23726f4213a0fb0f5ea2d43d2cf15e75499ef5cd19fc9deb1d5bda621c5571a77f50a99bc91ea8bd64339de53ee6a5ab2ef13ee6b30ed454d9e7
diff --git a/app-i18n/rime-data/metadata.xml b/app-i18n/rime-data/metadata.xml
new file mode 100644
index 000000000000..c91a76f3d447
--- /dev/null
+++ b/app-i18n/rime-data/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>dlan@gentoo.org</email>
+    <name>Yixun Lan</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <maintainer>
+      <email>chen.sst@gmail.com</email>
+      <name>Gong Chen</name>
+    </maintainer>
+    <remote-id type="github">rime/brise</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/rime-data/rime-data-0.35.ebuild b/app-i18n/rime-data/rime-data-0.35.ebuild
new file mode 100644
index 000000000000..d047cace41e2
--- /dev/null
+++ b/app-i18n/rime-data/rime-data-0.35.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+MY_PN="brise"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Data resources for Rime Input Method Engine"
+HOMEPAGE="http://rime.im/ https://github.com/rime/brise"
+SRC_URI="https://dl.bintray.com/lotem/rime/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+DEPEND="app-i18n/librime"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}"
diff --git a/app-i18n/scim-1.4.17 b/app-i18n/scim-1.4.17
deleted file mode 100644
index 93eb6496b4bd..000000000000
--- a/app-i18n/scim-1.4.17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=x11-libs/libX11 dev-libs/glib:2 gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) >=dev-libs/atk-1 >=x11-libs/pango-1 doc? ( app-doc/doxygen >=app-text/docbook-xsl-stylesheets-1.73.1 ) dev-lang/perl virtual/pkgconfig >=dev-util/intltool-0.33 sys-devel/libtool >=sys-apps/sed-4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Smart Common Input Method (SCIM) is an Input Method (IM) development platform
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/scim
-IUSE=doc gtk3 qt4
-KEYWORDS=alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 dev-libs/glib:2 gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) >=dev-libs/atk-1 >=x11-libs/pango-1
-SLOT=0
-SRC_URI=mirror://sourceforge/scim/scim-1.4.17.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4c3878901cbd68fdb97ca53d3b98cace
diff --git a/app-i18n/scim-1.4.18 b/app-i18n/scim-1.4.18
deleted file mode 100644
index 3963af7bfd83..000000000000
--- a/app-i18n/scim-1.4.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=x11-libs/libX11 dev-libs/glib:2 gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) >=dev-libs/atk-1 >=x11-libs/pango-1 doc? ( app-doc/doxygen >=app-text/docbook-xsl-stylesheets-1.73.1 ) dev-lang/perl virtual/pkgconfig >=dev-util/intltool-0.33 sys-devel/libtool >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=Smart Common Input Method (SCIM) is an Input Method (IM) development platform
-EAPI=6
-HOMEPAGE=https://github.com/scim-im/scim
-IUSE=doc gtk3 qt4
-KEYWORDS=~alpha amd64 arm ~hppa ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 dev-libs/glib:2 gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) >=dev-libs/atk-1 >=x11-libs/pango-1
-SLOT=0
-SRC_URI=https://github.com/scim-im/scim/archive/1.4.18.tar.gz -> scim-1.4.18.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c468b47e842a93a36ccf9adeafe3fa35
diff --git a/app-i18n/scim-anthy-1.2.7-r1 b/app-i18n/scim-anthy-1.2.7-r1
deleted file mode 100644
index af6d2a874ffb..000000000000
--- a/app-i18n/scim-anthy-1.2.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-i18n/scim-1.2[gtk3=] >=app-i18n/anthy-5900 nls? ( virtual/libintl ) gtk3? ( x11-libs/gtk+:3 ) nls? ( sys-devel/gettext ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Japanese input method Anthy IMEngine for SCIM
-EAPI=5
-HOMEPAGE=http://scim-imengine.sourceforge.jp/index.cgi?cmd=view;name=SCIMAnthy
-IUSE=+gtk3 nls kasumi
-KEYWORDS=alpha amd64 ~arm ppc sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=app-i18n/scim-1.2[gtk3=] >=app-i18n/anthy-5900 nls? ( virtual/libintl ) gtk3? ( x11-libs/gtk+:3 ) kasumi? ( app-dicts/kasumi )
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/scim-imengine/37309/scim-anthy-1.2.7.tar.gz gtk3? ( https://dev.gentoo.org/~heroxbd/scim-anthy-1.2.7-patches.tar.xz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=80ed63b6de4dcabd7ba443183c72713d
diff --git a/app-i18n/scim-anthy/Manifest b/app-i18n/scim-anthy/Manifest
new file mode 100644
index 000000000000..9f4798285aff
--- /dev/null
+++ b/app-i18n/scim-anthy/Manifest
@@ -0,0 +1,4 @@
+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 1035 BLAKE2B 818e88c8c0f9c0b9a01c02565e5911675d33631aa7cc90b2f5e6c6e9fc3db668605c20d707557512946dc3ffa294cca8174bd566bc6bd4bb2df169e1522b1406 SHA512 da6d7f66f8e565a3bdfa28963227092880a063cfcf911bdedd338539e21dcf7813e5e71e679084ea8bf595edb77b54512d9b9fb70943e2df594791e412503891
+MISC metadata.xml 505 BLAKE2B 811e271383ea3c8f7f3ef772c8b97a395682e3f40c948d6ac09e9aed18b96e7ad0943a4e11e5e2f9fdd5615d86aaf3e5977975d02e5f6c2342d1fee3b563d3f4 SHA512 85aba6ffa284906fc8732242f5efe3563483930dd625871d670840c558f99e04e509080d0ff804746db8d5a3da9210680bab223dd78bcae79cc2ebcde622114b
diff --git a/app-i18n/scim-anthy/metadata.xml b/app-i18n/scim-anthy/metadata.xml
new file mode 100644
index 000000000000..410ff4768471
--- /dev/null
+++ b/app-i18n/scim-anthy/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<use>
+		<flag name="kasumi">Use Anthy dictionary maintenance tool (<pkg>app-dicts/kasumi</pkg>)</flag>
+		<flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge-jp">scim-imengine</remote-id>
+	</upstream>
+</pkgmetadata>
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
new file mode 100644
index 000000000000..d309c2f3be9e
--- /dev/null
+++ b/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Japanese input method Anthy IMEngine for SCIM"
+HOMEPAGE="http://scim-imengine.sourceforge.jp/index.cgi?cmd=view;name=SCIMAnthy"
+SRC_URI="mirror://sourceforge.jp/scim-imengine/37309/${P}.tar.gz
+	gtk3?	( https://dev.gentoo.org/~heroxbd/${P}-patches.tar.xz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ppc sparc x86 ~x86-fbsd"
+IUSE="+gtk3 nls kasumi"
+
+DEPEND=">=app-i18n/scim-1.2[gtk3=]
+	>=app-i18n/anthy-5900
+	nls? ( virtual/libintl )
+	gtk3? ( x11-libs/gtk+:3 )"
+RDEPEND="${DEPEND}
+	kasumi? ( app-dicts/kasumi )"
+DEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+src_prepare() {
+	if use gtk3; then
+		EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" epatch
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--disable-static \
+		--disable-dependency-tracking
+}
+
+src_install() {
+	default
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/app-i18n/scim-bridge-0.4.16-r3 b/app-i18n/scim-bridge-0.4.16-r3
deleted file mode 100644
index 039ddac28620..000000000000
--- a/app-i18n/scim-bridge-0.4.16-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=app-i18n/scim-1.4.6 gtk? ( >=x11-libs/gtk+-2.2:2 >=x11-libs/pango-1.1 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 >=x11-libs/pango-1.1 ) virtual/pkgconfig dev-util/intltool doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=Yet another IM-client of SCIM
-EAPI=6
-HOMEPAGE=http://www.scim-im.org/projects/scim_bridge
-IUSE=doc gtk qt4
-KEYWORDS=~amd64 ~hppa ~ppc64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=app-i18n/scim-1.4.6 gtk? ( >=x11-libs/gtk+-2.2:2 >=x11-libs/pango-1.1 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 >=x11-libs/pango-1.1 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/scim/scim-bridge-0.4.16.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=00e4a2bbd17f845f1bdbb62131d87b6a
diff --git a/app-i18n/scim-bridge/Manifest b/app-i18n/scim-bridge/Manifest
new file mode 100644
index 000000000000..992252c8c30a
--- /dev/null
+++ b/app-i18n/scim-bridge/Manifest
@@ -0,0 +1,8 @@
+AUX scim-bridge-0.4.15.2-gcc43.patch 375 BLAKE2B dec088c01d926d2d1765628dfb01c06595d4d5f13cfc3128ed3441a1865bb1039a643c05785cf3ae88223eddba584744256f881c27f639ab1abf80af75212615 SHA512 53745d5edccc6ef2dacedb3eb3ed6a1c79a33b414a5298d089afe1c3b2061f29da559431e3ea92efb94bef2efbece2a73109c7d471ebcf9c62df7ea1bc3f6276
+AUX scim-bridge-0.4.15.2-qt4.patch 2146 BLAKE2B 2dafb645ad58c2a09d7e43c437e78f1d9dfc2a67068cdae2d22ba25f08e69e3954d79ae5376afe98309b470a1909fa4f6ebc1df0fc9a51ada6ff3c6f56f8172c SHA512 66991d3757b85126045dbf13cc2943a11c90aa05b4eeaec255b5f1f17148b85d01718d665678a19403935215c79646b5c77ad244509e213351b14ba47b852cc2
+AUX scim-bridge-0.4.16+gcc-4.4.patch 382 BLAKE2B 1b65d8c24dccd10b165a4716897b9442fd3e41c3d0984e8edea4564e1656551b418fded83df5483c26d94c4e0586a6036be3f39b764c4544e0e3e2a93eec1f73 SHA512 5b0bf2aee53d2e59e9b60e6b5db71dc8ff2b1337ebaf176cdb36bbe1aeb7bf7c28f57c8968a8551c1cddeae9057bc7b2b3864439b7422286f2652f5467aa87de
+AUX scim-bridge-0.4.16+gcc-4.7.patch 774 BLAKE2B 61b84631e8972558dba145b7c36108a726028755665720aa82e2dd9c76477536cb332c4c4d62e3555050bee898d8139a1294ce29a6c0482dbcf63ad0cb196576 SHA512 3349b93e71fdb4e6942253877ed1d84c59a099f5c3fd7d6148c780c6a8af65bb47431dde0a84995dab66bc864872130690b1ee89ee1e2db2c50591f94095c35a
+AUX scim-bridge-0.4.16-configure.ac.patch 5693 BLAKE2B bfa3fd40f07872ace34bf8fca2d3fb012e173660aab3a976c69dd2648003d79acf86b1d6da4c4a14b44e92d256f775fca44bf25b7c21beefb9c95ea545300454 SHA512 64fac34fc9d6982d61542af815ae6da5172d5e5208b938a386ad8fa67bd8988829e8c45412a47b9fef0c8b91b52d4f90b269266e49fb867a671cea1dc4581408
+DIST scim-bridge-0.4.16.tar.gz 508870 BLAKE2B 136a8e84b89a58852ff88a2ef632084f1f18c436fc96cd9192d4510b5e6a4adcb51a5a6f314f8c5e6a333b18ec36e2e154db161e1eb65cef0f3cd28fe47c8241 SHA512 8d40a931738f6130ab2fdc4e8dec70143874c53d5720a0403603b57c9f80d7c0a4802609e0446684fa5cba1758e78e5f333d01787527934ed7a19c9727fd66a6
+EBUILD scim-bridge-0.4.16-r3.ebuild 1866 BLAKE2B 9e908a927c3f65e945227a3893c1e17e6be00a936324f119757f0dc2b2656c258a663397c565eb994171d635dc0dad2e54f3d966245388fe5cb31c74963103a1 SHA512 d9d7d1c84a49d606480b2a610a8ddfa80b3758dc6d6f25fdf384f0c27d2b67dc44f507f4096dafa7cdbafdbf7de7b9e1192d9ecdd65d64b1320a188d80a8d7bb
+MISC metadata.xml 308 BLAKE2B 1bdcfa2996c5ba60e52eddb6446bbc6978ebee7f1f2f4658c44438b886a89cf46a3fddea53c479151e5e023e5681dca5f01264a26ca108c895ac6758f01d6430 SHA512 9f18bf632f3eff9a6498145c2b4c04d51bb119c67351216ab757cd3cea2364c60bef683769218c0596ef6bd29235e51df6a64f9ab1234665fc2191e18fc51cc7
diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-gcc43.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-gcc43.patch
new file mode 100644
index 000000000000..1db7769424f5
--- /dev/null
+++ b/app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-gcc43.patch
@@ -0,0 +1,10 @@
+--- scim-bridge-0.4.15.orig/client-common/scim-bridge-client-output.c	2008-11-02 15:44:34.000000000 +0900
++++ scim-bridge-0.4.15/client-common/scim-bridge-client-output.c	2009-01-25 15:10:22.000000000 +0900
+@@ -20,6 +20,7 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <alloca.h>
+ 
+ #include "scim-bridge-debug.h"
+ #include "scim-bridge-output.h"
diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-qt4.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-qt4.patch
new file mode 100644
index 000000000000..606117cfbf01
--- /dev/null
+++ b/app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-qt4.patch
@@ -0,0 +1,58 @@
+diff -Naur scim-bridge-0.4.15.orig/client-qt/qt4/Makefile.am scim-bridge-0.4.15/client-qt/qt4/Makefile.am
+--- scim-bridge-0.4.15.orig/client-qt/qt4/Makefile.am	2009-01-18 01:57:40.000000000 +0900
++++ scim-bridge-0.4.15/client-qt/qt4/Makefile.am	2009-01-25 14:58:09.000000000 +0900
+@@ -24,7 +24,7 @@
+ 
+ noinst_HEADERS = ../scim-bridge-client-qt.h ../scim-bridge-client-imcontext-qt.h ../scim-bridge-client-key-event-utility-qt.h ../scim-bridge-client-common-qt.h
+ 
+-moduledir = @QT4_PREFIX@/plugins/inputmethods
++moduledir = @QT4_LIBDIR@/plugins/inputmethods
+ module_LTLIBRARIES = im-scim-bridge.la
+ 
+ im_scim_bridge_la_SOURCES = ../im-scim-bridge-qt.cpp \
+diff -Naur scim-bridge-0.4.15.orig/client-qt/scim-bridge-client-imcontext-qt.cpp scim-bridge-0.4.15/client-qt/scim-bridge-client-imcontext-qt.cpp
+--- scim-bridge-0.4.15.orig/client-qt/scim-bridge-client-imcontext-qt.cpp	2008-11-02 15:44:46.000000000 +0900
++++ scim-bridge-0.4.15/client-qt/scim-bridge-client-imcontext-qt.cpp	2009-01-25 15:04:34.000000000 +0900
+@@ -219,6 +219,12 @@
+ void ScimBridgeClientIMContextImpl::setFocusWidget (QWidget *widget)
+ {
+     scim_bridge_pdebugln (4, "ScimBridgeClientIMContextImpl::setFocusWidget ()");
++
++    if (focused_imcontext != NULL) {
++        focused_imcontext->focus_out ();
++        focused_imcontext = NULL;
++    }
++
+     QInputContext::setFocusWidget (widget);
+     focus_in ();
+     update ();
+@@ -442,8 +448,15 @@
+         }
+     }
+ 
++#ifdef QT4
++    if (preedit_shown) {
++        set_preedit_shown (false);
++        update_preedit ();
++    }
++#else
+     set_preedit_shown (false);
+     update_preedit ();
++#endif
+ 
+     focused_imcontext = NULL;
+ }
+diff -Naur scim-bridge-0.4.15.orig/configure.ac scim-bridge-0.4.15/configure.ac
+--- scim-bridge-0.4.15.orig/configure.ac	2009-01-18 02:24:32.000000000 +0900
++++ scim-bridge-0.4.15/configure.ac	2009-01-25 14:58:06.000000000 +0900
+@@ -105,6 +105,10 @@
+     QT4_PREFIX=`$PKG_CONFIG --variable=prefix QtCore`
+   fi
+   AC_SUBST(QT4_PREFIX)
++  if test -z "$QT4_LIBDIR"; then
++    QT4_LIBDIR=`$PKG_CONFIG --variable=libdir QtCore`
++  fi
++  AC_SUBST(QT4_LIBDIR)
+   enable_qt4_immodule="yes";
+ fi
+ 
diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.16+gcc-4.4.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.16+gcc-4.4.patch
new file mode 100644
index 000000000000..11415931fdbc
--- /dev/null
+++ b/app-i18n/scim-bridge/files/scim-bridge-0.4.16+gcc-4.4.patch
@@ -0,0 +1,12 @@
+Index: scim-bridge-0.4.16/agent/scim-bridge-agent-application.cpp
+===================================================================
+--- scim-bridge-0.4.16.orig/agent/scim-bridge-agent-application.cpp
++++ scim-bridge-0.4.16/agent/scim-bridge-agent-application.cpp
+@@ -24,6 +24,7 @@
+ #include <unistd.h>
+ 
+ #include <iostream>
++#include <cstdio>
+ 
+ #include "scim-bridge-agent.h"
+ 
diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.16+gcc-4.7.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.16+gcc-4.7.patch
new file mode 100644
index 000000000000..99899d8c4b37
--- /dev/null
+++ b/app-i18n/scim-bridge/files/scim-bridge-0.4.16+gcc-4.7.patch
@@ -0,0 +1,24 @@
+diff --git a/agent/utils/scim-bridge-agent-panel-client.cpp b/agent/utils/scim-bridge-agent-panel-client.cpp
+index 07cb14b..62fd3b3 100644
+--- a/agent/utils/scim-bridge-agent-panel-client.cpp
++++ b/agent/utils/scim-bridge-agent-panel-client.cpp
+@@ -24,6 +24,7 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <unistd.h>
+ 
+ #define Uses_SCIM_CONFIG_PATH
+ 
+diff --git a/agent/scim-bridge-agent-signal-listener.cpp b/agent/scim-bridge-agent-signal-listener.cpp
+index 433dc15..c9eff47 100644
+--- a/agent/scim-bridge-agent-signal-listener.cpp
++++ b/agent/scim-bridge-agent-signal-listener.cpp
+@@ -22,6 +22,7 @@
+ #include <signal.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <unistd.h>
+ 
+ #include <sys/socket.h>
+ #include <sys/types.h>
diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.16-configure.ac.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.16-configure.ac.patch
new file mode 100644
index 000000000000..9f8f43114899
--- /dev/null
+++ b/app-i18n/scim-bridge/files/scim-bridge-0.4.16-configure.ac.patch
@@ -0,0 +1,164 @@
+--- a/configure.ac.orig	2009-11-27 21:07:46.000000000 +0800
++++ b/configure.ac	2009-11-27 21:33:17.000000000 +0800
+@@ -55,63 +55,6 @@
+ AM_CONDITIONAL(HAVE_DOCBOOK, test x$DOCBOOK_XSL != xno)
+ AM_CONDITIONAL(BUILD_MANUAL, test x$XSLTPROC != xno -a x$DOCBOOK_XSL != xno)
+ 
+-# Check if we should build scim-bridge-gtk-immodule
+-PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.4.0 pango >= 1.1.0 gdk-pixbuf-2.0 >= 2.4.0],
+-			[SCIM_BRIDGE_HAS_GTK2=yes],
+-			[SCIM_BRIDGE_HAS_GTK2=no])
+-
+-SCIM_BRIDGE_HAS_GTK2_2=no
+-if test "$SCIM_BRIDGE_HAS_GTK2" = "yes"; then
+-  if $PKG_CONFIG --exists "gtk+-2.0 >= 2.2" ; then
+-    SCIM_BRIDGE_HAS_GTK2_2=yes
+-    GTK_VERSION=2.2.0
+-    AC_DEFINE(GDK_MULTIHEAD_SAFE,1,[Force use of GDK's multihead-safe APIs.])
+-  fi
+-  if $PKG_CONFIG --exists "gtk+-2.0 >= 2.3.5" ; then
+-    SCIM_BRIDGE_HAS_GTK2_4=yes
+-    GTK_VERSION=2.3.5
+-    AC_DEFINE(HAVE_GTK_DRAW_INSERTION_CURSOR,1,[Have gtk_draw_insertion_cursor ().])
+-  fi
+-  GTK_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
+-  GTK_LIBDIR=`$PKG_CONFIG --variable=libdir gtk+-2.0`
+-  if test -z "$GTK_LIBDIR)"; then
+-    GTK_LIBDIR="$libdir"
+-  fi
+-  AC_SUBST(GTK_LIBDIR)
+-  AC_SUBST(GTK_VERSION)
+-  AC_SUBST(GTK_BINARY_VERSION)
+-  enable_gtk2_immodule="yes";
+-fi
+-
+-# Check if we should build scim-bridge-qt-immodule
+-PKG_CHECK_MODULES(QT3, [qt-mt >= 3.3],
+-			[SCIM_BRIDGE_HAS_QT3=yes],
+-			[SCIM_BRIDGE_HAS_QT3=no])
+-
+-if test "$SCIM_BRIDGE_HAS_QT3" = "yes"; then
+-  if test -z "$QT3_PREFIX"; then
+-    QT3_PREFIX=`$PKG_CONFIG --variable=prefix qt-mt`
+-  fi
+-  AC_SUBST(QT3_PREFIX)
+-  enable_qt3_immodule="yes";
+-fi
+-
+-PKG_CHECK_MODULES(QT4, [QtGui >= 4.0, QtCore >= 4.0],
+-			[SCIM_BRIDGE_HAS_QT4=yes],
+-			[SCIM_BRIDGE_HAS_QT4=no])
+-
+-if test "$SCIM_BRIDGE_HAS_QT4" = "yes"; then
+-  if test -z "$QT4_PREFIX"; then
+-    QT4_PREFIX=`$PKG_CONFIG --variable=prefix QtCore`
+-  fi
+-  AC_SUBST(QT4_PREFIX)
+-  if test -z "$QT4_LIBDIR"; then
+-    QT4_LIBDIR=`$PKG_CONFIG --variable=libdir QtCore`
+-  fi
+-  AC_SUBST(QT4_LIBDIR)
+-  enable_qt4_immodule="yes";
+-fi
+-
+ ###########################################################
+ ##             Definiation of compile args.              ##
+ ###########################################################
+@@ -132,13 +75,16 @@
+        	      enable_agent=yes)
+ 
+ AC_ARG_ENABLE(gtk2-immodule,
+-	      [AS_HELP_STRING([--enable-gtk2-immodule], [build GTK2 IM module])], , )
++	      [AS_HELP_STRING([--enable-gtk2-immodule], [build GTK2 IM module [default=yes]])], ,
++	      enable_gtk2_immodule=yes)
+ 
+ AC_ARG_ENABLE(qt3-immodule,
+-	      [AS_HELP_STRING([--enable-qt3-immodule], [build Qt3 IM module])], , )
++	      [AS_HELP_STRING([--enable-qt3-immodule], [build Qt3 IM module [default=yes]])], ,
++	      enable_qt3_immodule=yes)
+ 
+ AC_ARG_ENABLE(qt4-immodule,
+-	      [AS_HELP_STRING([--enable-qt4-immodule], [build Qt4 IM module])], , )
++	      [AS_HELP_STRING([--enable-qt4-immodule], [build Qt4 IM module [default=yes]])], ,
++	      enable_qt4_immodule=yes)
+ 
+ if test "$enable_debug" = "yes"; then
+   AC_DEFINE(ENABLE_DEBUG,1,[Define this to enable the debug facility in libscim])
+@@ -175,7 +121,33 @@
+ if test "$enable_gtk2_immodule" = "yes"; then
+   SCIM_BRIDGE_BUILD_GTK2_IMMODULE=1
+   SCIM_BRIDGE_BUILD_IMMODULE=1
+-  if test "$SCIM_BRIDGE_HAS_GTK2" = "no" ; then
++
++  # Check if we should build scim-bridge-gtk-immodule
++  PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.4.0 pango >= 1.1.0 gdk-pixbuf-2.0 >= 2.4.0],
++  			[SCIM_BRIDGE_HAS_GTK2=yes],
++  			[SCIM_BRIDGE_HAS_GTK2=no])
++  
++  SCIM_BRIDGE_HAS_GTK2_2=no
++  if test "$SCIM_BRIDGE_HAS_GTK2" = "yes"; then
++    if $PKG_CONFIG --exists "gtk+-2.0 >= 2.2" ; then
++      SCIM_BRIDGE_HAS_GTK2_2=yes
++      GTK_VERSION=2.2.0
++      AC_DEFINE(GDK_MULTIHEAD_SAFE,1,[Force use of GDK's multihead-safe APIs.])
++    fi
++    if $PKG_CONFIG --exists "gtk+-2.0 >= 2.3.5" ; then
++      SCIM_BRIDGE_HAS_GTK2_4=yes
++      GTK_VERSION=2.3.5
++      AC_DEFINE(HAVE_GTK_DRAW_INSERTION_CURSOR,1,[Have gtk_draw_insertion_cursor ().])
++    fi
++    GTK_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
++    GTK_LIBDIR=`$PKG_CONFIG --variable=libdir gtk+-2.0`
++    if test -z "$GTK_LIBDIR)"; then
++      GTK_LIBDIR="$libdir"
++    fi
++    AC_SUBST(GTK_LIBDIR)
++    AC_SUBST(GTK_VERSION)
++    AC_SUBST(GTK_BINARY_VERSION)
++  else
+      AC_MSG_ERROR([Gtk >= 2.2 can not be found!])
+   fi
+   enable_immodule=yes
+@@ -187,7 +159,18 @@
+ if test "$enable_qt3_immodule" = "yes"; then
+   SCIM_BRIDGE_BUILD_QT3_IMMODULE=1
+   SCIM_BRIDGE_BUILD_IMMODULE=1
+-  if test "$SCIM_BRIDGE_HAS_QT3" = "no"; then
++
++  # Check if we should build scim-bridge-qt-immodule
++  PKG_CHECK_MODULES(QT3, [qt-mt >= 3.3],
++  			[SCIM_BRIDGE_HAS_QT3=yes],
++  			[SCIM_BRIDGE_HAS_QT3=no])
++  
++  if test "$SCIM_BRIDGE_HAS_QT3" = "yes"; then
++    if test -z "$QT3_PREFIX"; then
++      QT3_PREFIX=`$PKG_CONFIG --variable=prefix qt-mt`
++    fi
++    AC_SUBST(QT3_PREFIX)
++  else
+     AC_MSG_ERROR([qt >= 3.3 can not be found!])
+   fi
+   enable_immodule=yes
+@@ -199,7 +182,21 @@
+ if test "$enable_qt4_immodule" = "yes"; then
+   SCIM_BRIDGE_BUILD_QT4_IMMODULE=1
+   SCIM_BRIDGE_BUILD_IMMODULE=1
+-  if test "$SCIM_BRIDGE_HAS_QT4" = "no"; then
++
++  PKG_CHECK_MODULES(QT4, [QtGui >= 4.0, QtCore >= 4.0],
++  			[SCIM_BRIDGE_HAS_QT4=yes],
++  			[SCIM_BRIDGE_HAS_QT4=no])
++  
++  if test "$SCIM_BRIDGE_HAS_QT4" = "yes"; then
++    if test -z "$QT4_PREFIX"; then
++      QT4_PREFIX=`$PKG_CONFIG --variable=prefix QtCore`
++    fi
++    AC_SUBST(QT4_PREFIX)
++    if test -z "$QT4_LIBDIR"; then
++      QT4_LIBDIR=`$PKG_CONFIG --variable=libdir QtCore`
++    fi
++    AC_SUBST(QT4_LIBDIR)
++  else
+     AC_MSG_ERROR([qt >= 4.0 can not be found!])
+   fi
+   enable_immodule=yes
diff --git a/app-i18n/scim-bridge/metadata.xml b/app-i18n/scim-bridge/metadata.xml
new file mode 100644
index 000000000000..01855eefe13f
--- /dev/null
+++ b/app-i18n/scim-bridge/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">scim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/scim-bridge/scim-bridge-0.4.16-r3.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.16-r3.ebuild
new file mode 100644
index 000000000000..2f7cc8cc7862
--- /dev/null
+++ b/app-i18n/scim-bridge/scim-bridge-0.4.16-r3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils gnome2-utils multilib readme.gentoo-r1
+
+DESCRIPTION="Yet another IM-client of SCIM"
+HOMEPAGE="http://www.scim-im.org/projects/scim_bridge"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+IUSE="doc gtk qt4"
+
+RESTRICT="test"
+
+RDEPEND="
+	>=app-i18n/scim-1.4.6
+	gtk? (
+		>=x11-libs/gtk+-2.2:2
+		>=x11-libs/pango-1.1
+	)
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qtcore:4
+		>=x11-libs/pango-1.1
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool
+	doc? ( app-doc/doxygen )
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+If you would like to use ${PN} as default instead of scim, set
+$ export GTK_IM_MODULE=scim-bridge
+$ export QT_IM_MODULE=scim-bridge
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.4.15.2-qt4.patch"
+	"${FILESDIR}/${PN}-0.4.15.2-gcc43.patch"
+	"${FILESDIR}/${P}+gcc-4.4.patch"
+	"${FILESDIR}/${P}+gcc-4.7.patch"
+	"${FILESDIR}/${P}-configure.ac.patch" #280887
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+	# '--disable-*-immodule' are b0rked, bug #280887
+
+	if use gtk ; then
+		myconf="${myconf} --enable-gtk2-immodule=yes"
+	else
+		myconf="${myconf} --enable-gtk2-immodule=no"
+	fi
+
+	# Qt3 is no longer supported, bug 283429
+	myconf="${myconf} --enable-qt3-immodule=no"
+
+	if use qt4 ; then
+		myconf="${myconf} --enable-qt4-immodule=yes"
+		export QT_SELECT="4"
+	else
+		myconf="${myconf} --enable-qt4-immodule=no"
+	fi
+
+	econf \
+		--disable-static \
+		$(use_enable doc documents) \
+		${myconf}
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	use gtk && gnome2_query_immodules_gtk2
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk2
+}
diff --git a/app-i18n/scim-hangul-0.4.0 b/app-i18n/scim-hangul-0.4.0
deleted file mode 100644
index 553ef7137633..000000000000
--- a/app-i18n/scim-hangul-0.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=>=app-i18n/scim-0.99.8 >=app-i18n/libhangul-0.0.4 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Hangul IMEngine for SCIM ported from imhangul
-EAPI=6
-HOMEPAGE=http://www.scim-im.org/
-IUSE=nls
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=app-i18n/scim-0.99.8 >=app-i18n/libhangul-0.0.4 nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/scim/scim-hangul-0.4.0.tar.gz
-_md5_=98a0cd78a792fd33b38b32cdb6b129a8
diff --git a/app-i18n/scim-hangul/Manifest b/app-i18n/scim-hangul/Manifest
new file mode 100644
index 000000000000..548aa8186b93
--- /dev/null
+++ b/app-i18n/scim-hangul/Manifest
@@ -0,0 +1,6 @@
+AUX scim-hangul-0.3.2+gcc-4.3.patch 883 BLAKE2B c891bb3865510bff80e28f4f770ea4f173d414b18c6c81cbd3b92f870774f4118e1f37ca68e94a83f128f5620d16ab77abfd03b237723def6828b353713a6bb0 SHA512 f7b65475af23667110219182ec9ba235da83d27603028c8f7655c39ffe36307762e3791d3630602c1cf0b56e87300f45562426e199f39845e39832d88fa7258a
+AUX scim-hangul-0.3.2+gcc-4.7.patch 318 BLAKE2B 379fd21d1ce405ffac797053f0011c2b81eb4567fe4e027be5678778316ccd5c025733c281c28955fbb6f2985e6c260df2a5f953867b7096c2827c92d02a2c83 SHA512 b07a6dadf8e206fad812e184f506d034628eccf76de00729f3c8b68eb20bfc48a881a26ed78fbfa87e16dbd7164778eebe03fc7d45297462311a5386ea72da38
+AUX scim-hangul-0.4.0+gtk.patch 438 BLAKE2B 4d76932fbd56d53eac9e0667774fa29fd884cce70a898b1f1f7f7c944766d8707d17ff73ef6f6d57923e532d554a5f66a92e32d46b71ac411f7cf3c6f189e7f1 SHA512 9e3ea01bbb73fab8a66ae52a81c976a67e6c47588f14194dfdee3acda3d493c38106344eea21584d350ebbd5eeb0dedd9ab6d08c16893e8f290d845c8d2281b1
+DIST scim-hangul-0.4.0.tar.gz 456953 BLAKE2B c7c2a320d03c4f15ad048b4e036a6dcd1f34044cb82e9a8fd18be8808e3f1be6f6f198e963982d1c6b742e614da5b3b2b3e2086ea8bbe19b4118f5493ae0188c SHA512 2f0285268deac35763c67487a40b718bf846d63634701a2a68d85109f686421f2c935b1f2998487b1f017c1a5e5bf453c56933ab4984f7464e1613d7e0b3131b
+EBUILD scim-hangul-0.4.0.ebuild 1065 BLAKE2B ca093b848f5bc563c59f6df461222ccdd18c3dedce18213ee9726da8f94b13a13c398123c2bc5b89c8df12a2830865f3eb33e82783ed19b33fe97a235faca074 SHA512 198f1a4f5032d6eec5132fb48b7fe934d01d2628b4c0fb55693ed53d261da22fb714a94f3a599aaa2e9c9c8a296ed0d48f0933b04960fe0485971ce3a3e25699
+MISC metadata.xml 308 BLAKE2B 1bdcfa2996c5ba60e52eddb6446bbc6978ebee7f1f2f4658c44438b886a89cf46a3fddea53c479151e5e023e5681dca5f01264a26ca108c895ac6758f01d6430 SHA512 9f18bf632f3eff9a6498145c2b4c04d51bb119c67351216ab757cd3cea2364c60bef683769218c0596ef6bd29235e51df6a64f9ab1234665fc2191e18fc51cc7
diff --git a/app-i18n/scim-hangul/files/scim-hangul-0.3.2+gcc-4.3.patch b/app-i18n/scim-hangul/files/scim-hangul-0.3.2+gcc-4.3.patch
new file mode 100644
index 000000000000..b7698793ac8e
--- /dev/null
+++ b/app-i18n/scim-hangul/files/scim-hangul-0.3.2+gcc-4.3.patch
@@ -0,0 +1,23 @@
+diff -up scim-hangul-0.3.2/src/scim_hangul_imengine.cpp.gcc43~ scim-hangul-0.3.2/src/scim_hangul_imengine.cpp
+--- scim-hangul-0.3.2/src/scim_hangul_imengine.cpp.gcc43~	2008-01-13 08:01:34.000000000 +0000
++++ scim-hangul-0.3.2/src/scim_hangul_imengine.cpp	2008-01-13 08:01:34.000000000 +0000
+@@ -29,6 +29,7 @@
+ #define Uses_SCIM_LOOKUP_TABLE
+ #define Uses_SCIM_CONFIG_BASE
+ 
++#include <cstring>
+ #ifdef HAVE_CONFIG_H
+   #include <config.h>
+ #endif
+diff -up scim-hangul-0.3.2/src/scim_hangul_imengine_setup.cpp.gcc43~ scim-hangul-0.3.2/src/scim_hangul_imengine_setup.cpp
+--- scim-hangul-0.3.2/src/scim_hangul_imengine_setup.cpp.gcc43~	2008-01-13 08:01:37.000000000 +0000
++++ scim-hangul-0.3.2/src/scim_hangul_imengine_setup.cpp	2008-01-13 08:01:37.000000000 +0000
+@@ -28,7 +28,8 @@
+ 
+ #define Uses_SCIM_CONFIG_BASE
+ 
++#include <cstring>
+ #include <gtk/gtk.h>
+ 
+ #ifdef HAVE_CONFIG_H
+ 
diff --git a/app-i18n/scim-hangul/files/scim-hangul-0.3.2+gcc-4.7.patch b/app-i18n/scim-hangul/files/scim-hangul-0.3.2+gcc-4.7.patch
new file mode 100644
index 000000000000..918de9e11367
--- /dev/null
+++ b/app-i18n/scim-hangul/files/scim-hangul-0.3.2+gcc-4.7.patch
@@ -0,0 +1,12 @@
+diff --git a/src/scim_hangul_imengine.cpp b/src/scim_hangul_imengine.cpp
+index 7d70654..d678902 100644
+--- a/src/scim_hangul_imengine.cpp
++++ b/src/scim_hangul_imengine.cpp
+@@ -30,6 +30,7 @@
+ #define Uses_SCIM_CONFIG_BASE
+ 
+ #include <cstring>
++#include <unistd.h>
+ #ifdef HAVE_CONFIG_H
+   #include <config.h>
+ #endif
diff --git a/app-i18n/scim-hangul/files/scim-hangul-0.4.0+gtk.patch b/app-i18n/scim-hangul/files/scim-hangul-0.4.0+gtk.patch
new file mode 100644
index 000000000000..82d9f8ee10b2
--- /dev/null
+++ b/app-i18n/scim-hangul/files/scim-hangul-0.4.0+gtk.patch
@@ -0,0 +1,11 @@
+--- a/src/scim_hangul_imengine_setup.cpp
++++ b/src/scim_hangul_imengine_setup.cpp
+@@ -346,7 +346,7 @@
+     for (i = 0; i < n; i++) {
+ 	const char* name = hangul_ic_get_keyboard_name(i);
+ #if GTK_CHECK_VERSION(2, 24, 0)
+-	gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(combo_box), NULL, name);
++	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box), name);
+ #else
+ 	gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), name);
+ #endif
diff --git a/app-i18n/scim-hangul/metadata.xml b/app-i18n/scim-hangul/metadata.xml
new file mode 100644
index 000000000000..01855eefe13f
--- /dev/null
+++ b/app-i18n/scim-hangul/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">scim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild b/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild
new file mode 100644
index 000000000000..aa37d7ea868e
--- /dev/null
+++ b/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Hangul IMEngine for SCIM ported from imhangul"
+HOMEPAGE="http://www.scim-im.org/"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="nls"
+
+RDEPEND="
+	>=app-i18n/scim-0.99.8
+	>=app-i18n/libhangul-0.0.4
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.2+gcc-4.3.patch
+	"${FILESDIR}"/${PN}-0.3.2+gcc-4.7.patch
+	"${FILESDIR}"/${PN}-0.4.0+gtk.patch
+)
+
+src_configure() {
+	econf \
+		--disable-skim-support \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+	dodoc ChangeLog*
+
+	# plugin module, no point in .la files
+	find "${D}" -name '*.la' -delete || die
+}
+
+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
+}
diff --git a/app-i18n/scim-input-pad-0.1.3 b/app-i18n/scim-input-pad-0.1.3
deleted file mode 100644
index f20427789abc..000000000000
--- a/app-i18n/scim-input-pad-0.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=app-i18n/scim-1.2.0 >=x11-libs/gtk+-2.6.0:2 >=dev-util/intltool-0.33 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Input pad for SCIM used to input symbols and special characters
-EAPI=4
-HOMEPAGE=http://www.scim-im.org/
-IUSE=nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-i18n/scim-1.2.0 >=x11-libs/gtk+-2.6.0:2
-SLOT=0
-SRC_URI=mirror://sourceforge/scim/scim-input-pad-0.1.3.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=56c384ab042c414522205630376db274
diff --git a/app-i18n/scim-input-pad-0.1.3.1 b/app-i18n/scim-input-pad-0.1.3.1
deleted file mode 100644
index e6c5fa44fd02..000000000000
--- a/app-i18n/scim-input-pad-0.1.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=app-i18n/scim-1.2.0 >=x11-libs/gtk+-2.6.0:2 >=dev-util/intltool-0.33 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Input pad for SCIM used to input symbols and special characters
-EAPI=4
-HOMEPAGE=http://www.scim-im.org/
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-i18n/scim-1.2.0 >=x11-libs/gtk+-2.6.0:2
-SLOT=0
-SRC_URI=mirror://sourceforge/scim/scim-input-pad-0.1.3.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=73112d605bd3de48a78e007c3c0173ba
diff --git a/app-i18n/scim-input-pad/Manifest b/app-i18n/scim-input-pad/Manifest
new file mode 100644
index 000000000000..be8d44d301de
--- /dev/null
+++ b/app-i18n/scim-input-pad/Manifest
@@ -0,0 +1,5 @@
+DIST scim-input-pad-0.1.3.1.tar.gz 591478 BLAKE2B a89a4d5717f89125e9ae3a9f360e8746cd5eb8a41646e886aa3f9c341f9dbd3e36453ea071896002ae182476cccfb8114323ec6e2b363f7d1ca151e697f510bb SHA512 864a254814c0afa04c10143a6b0de4a927ff8612e01bed3776d09a910cfb12899c17245a89a0386f4fac59ebdaae9e6fb9dc9ff5981f72dbec952a9da52a413d
+DIST scim-input-pad-0.1.3.tar.gz 1362611 BLAKE2B a9defe7b70a11b39a405c8e490030bc31b8372b3a7636f7215d5d5a4e1920aff38a810ab5d02ce0d987cd8280b09483e7a77a670de6f26d305ee47d87c1c6c8d SHA512 2a7f52c92feb5f882827f8a7240da6dc347be0f34c5b378ee8c26aba39b925d56caff3145ef237c4e0604d65179b755124b8b40c507666b2f76d12715de1103c
+EBUILD scim-input-pad-0.1.3.1.ebuild 1430 BLAKE2B 7ebe9f9befec656076aa16d8102deab79a5db044b757e5536d387b95a755a4dd2ff7cd998b81e722de062fb0d9dea202186e6c486c14fc26ab39cba1e2d9c4bf SHA512 e535da4a1bf6b9433dea1d2248cb06f211ea80c69fb6fca35f261bea239c4e17e4e0cf4ac3dbe3c02f0fce60a365e9f74a5f02a7f9d1a144c75fefe2c3e7955c
+EBUILD scim-input-pad-0.1.3.ebuild 1428 BLAKE2B 2b5504f609b9e05af6126ec3a2cf768459da80bbd0cdde120c7a2dce80cda3c1692a2dfe9ded0f2e9bffb9bf692120575f9aeed89a0305418b92824d5fa7dc2e SHA512 2311dd1ed29c84b043ae2bb26306c30eda4b7e280540934ab2257792215b8949dd578e588cdcdf25a4e088a1ce592b9d5c5be30fdb51038f882c12ac275bad81
+MISC metadata.xml 1730 BLAKE2B 694fbd77ffc1d75bbf3726dfb0c0e9225e5e313f52af6212992b2b27378a0fd41fc2b470fb1169ade9b6d6a83a153615d9a4330053f56cccde4e86c9dad14ab2 SHA512 5e6fa898e9267551b94352919a0cffba74784cc70a84a5c22543c3d0c12ab2185e8b226a333813afedd839c9d05c46939c553bf8a2288fd191b1c6fc08b70edb
diff --git a/app-i18n/scim-input-pad/metadata.xml b/app-i18n/scim-input-pad/metadata.xml
new file mode 100644
index 000000000000..cd1750246e4d
--- /dev/null
+++ b/app-i18n/scim-input-pad/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<longdescription lang="en">
+		The Smart Common Input Method (SCIM) input pad is a tool used to
+		input special characters, in an easy way. You select the text
+		zone you wish to write in, and just click on the wanted character
+		in the right multilevel tabbed table, from the SCIM Input Pad
+		interface. By default, there is special characters from Japanese
+		(including kana), Chinese, Korean, Latin, braille, mathematics
+		and a lot of other miscellaneous symbols such as arrows, box
+		elements, etc. You may also add new characters (see
+		documentation).
+	</longdescription>
+	<longdescription lang="fr">
+		L'outils SCIM (Smart Common Input Method, "méthode commune et
+		intelligente de saisie de caractères", en français) Input Pad
+		("tableau d'entrée de caractère", en français), est utilisé pour
+		saisir divers symboles de façon simple. Vous n'avez qu'à
+		sélectionner la zone de texte dans laquelle vous souhaitez
+		écrire, et à cliquer sur le caractère désiré, dans le tableau à
+		onglets multi-niveaux, de l'interface de SCIM Input Pad. Par
+		défaut, sont disponibles des caractères spéciaux provenant du
+		japonais (kana y compris), du chinois, du coréen, du latin, du
+		braille, des mathématiques, et beaucoup d'autres symboles divers
+		comme des flèches, des éléments de boîtes, etc. Vous pouvez
+		également rajouter de nouveaux caractères (cf. documentation).
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">scim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/scim-input-pad/scim-input-pad-0.1.3.1.ebuild b/app-i18n/scim-input-pad/scim-input-pad-0.1.3.1.ebuild
new file mode 100644
index 000000000000..eca4971b084b
--- /dev/null
+++ b/app-i18n/scim-input-pad/scim-input-pad-0.1.3.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit autotools
+
+DESCRIPTION="Input pad for SCIM used to input symbols and special characters"
+HOMEPAGE="http://www.scim-im.org/"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND=">=app-i18n/scim-1.2.0
+	>=x11-libs/gtk+-2.6.0:2"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.33
+	virtual/pkgconfig"
+
+src_prepare() {
+	rm "${S}"/m4/intltool.m4 || die
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable nls) || die "Error: econf failed!"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Error: install failed!"
+	dodoc ChangeLog README
+}
+
+pkg_postinst() {
+
+	elog
+	elog "The SCIM input pad should be startable from the SCIM (and Skim)"
+	elog "systray icon right click menu. You will have to restart SCIM"
+	elog "(or Skim) in order for the menu entry to appear (you may simply"
+	elog "restart your X server). If you want to use it immediately, just"
+	elog "start the SCIM input pad, using the 'scim-input-pad' command."
+	elog
+	elog "To use, select the text zone you wish to write in, and just"
+	elog "click on the wanted character in the right multilevel tabbed"
+	elog "table, from the SCIM Input Pad interface."
+	elog
+	elog "To add new characters to the tables, see the documentation"
+	elog "(README file in /usr/share/doc/${PF})."
+	elog
+
+}
diff --git a/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild b/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild
new file mode 100644
index 000000000000..e04e0f9ae465
--- /dev/null
+++ b/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit autotools
+
+DESCRIPTION="Input pad for SCIM used to input symbols and special characters"
+HOMEPAGE="http://www.scim-im.org/"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+
+RDEPEND=">=app-i18n/scim-1.2.0
+	>=x11-libs/gtk+-2.6.0:2"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.33
+	virtual/pkgconfig"
+
+src_prepare() {
+	rm "${S}"/m4/intltool.m4 || die
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable nls) || die "Error: econf failed!"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Error: install failed!"
+	dodoc ChangeLog README
+}
+
+pkg_postinst() {
+
+	elog
+	elog "The SCIM input pad should be startable from the SCIM (and Skim)"
+	elog "systray icon right click menu. You will have to restart SCIM"
+	elog "(or Skim) in order for the menu entry to appear (you may simply"
+	elog "restart your X server). If you want to use it immediately, just"
+	elog "start the SCIM input pad, using the 'scim-input-pad' command."
+	elog
+	elog "To use, select the text zone you wish to write in, and just"
+	elog "click on the wanted character in the right multilevel tabbed"
+	elog "table, from the SCIM Input Pad interface."
+	elog
+	elog "To add new characters to the tables, see the documentation"
+	elog "(README file in /usr/share/doc/${PF})."
+	elog
+
+}
diff --git a/app-i18n/scim-m17n-0.2.3 b/app-i18n/scim-m17n-0.2.3
deleted file mode 100644
index c0f2c34c780b..000000000000
--- a/app-i18n/scim-m17n-0.2.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DEPEND=>=app-i18n/scim-1.4 >=dev-libs/m17n-lib-1.2.0 virtual/pkgconfig
-DESCRIPTION=An input module for Smart Common Input Method (SCIM) which uses m17n as backend
-EAPI=6
-HOMEPAGE=http://www.scim-im.org/projects/imengines
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-i18n/scim-1.4 >=dev-libs/m17n-lib-1.2.0
-SLOT=0
-SRC_URI=mirror://sourceforge/scim/scim-m17n-0.2.3.tar.gz
-_md5_=c8df4b905b973dde7cfa5a27af6e6fdd
diff --git a/app-i18n/scim-m17n/Manifest b/app-i18n/scim-m17n/Manifest
new file mode 100644
index 000000000000..38cc186bbe4b
--- /dev/null
+++ b/app-i18n/scim-m17n/Manifest
@@ -0,0 +1,3 @@
+DIST scim-m17n-0.2.3.tar.gz 355801 BLAKE2B e6dbfd74ffdac4af4a1dea335a41eded6a499637e772dcb33295c4e5e25e2b04ba420b04ec7029bd6638ea22f74fc9a06f63a48114df7683486581686a733dd3 SHA512 c54be4c8c331d5621dcfa6c0c6f302231071dbbaf3ef7aee4117fe2c2616d58e184d3bae720dce27d5cb6567064add6979630090c72f9350391ca9c3e9c404f3
+EBUILD scim-m17n-0.2.3.ebuild 761 BLAKE2B 976228f44e64bc4e0bab402e472787959303c458233cb5d820d232e43b907a01223311942719ee92705dd8542bb9f3829a0a377b1aaf4c53523719f4d7f04e81 SHA512 181b4e6b73fd032478c38f461b1ed782f23712eacea793313411bb66b182eafa7d69ec87822d449a46a70e023accea8095c168ae0aed62466b58c30fae4a9c84
+MISC metadata.xml 308 BLAKE2B 1bdcfa2996c5ba60e52eddb6446bbc6978ebee7f1f2f4658c44438b886a89cf46a3fddea53c479151e5e023e5681dca5f01264a26ca108c895ac6758f01d6430 SHA512 9f18bf632f3eff9a6498145c2b4c04d51bb119c67351216ab757cd3cea2364c60bef683769218c0596ef6bd29235e51df6a64f9ab1234665fc2191e18fc51cc7
diff --git a/app-i18n/scim-m17n/metadata.xml b/app-i18n/scim-m17n/metadata.xml
new file mode 100644
index 000000000000..01855eefe13f
--- /dev/null
+++ b/app-i18n/scim-m17n/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">scim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/scim-m17n/scim-m17n-0.2.3.ebuild b/app-i18n/scim-m17n/scim-m17n-0.2.3.ebuild
new file mode 100644
index 000000000000..87039f7d14aa
--- /dev/null
+++ b/app-i18n/scim-m17n/scim-m17n-0.2.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="An input module for Smart Common Input Method (SCIM) which uses m17n as backend"
+HOMEPAGE="http://www.scim-im.org/projects/imengines"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/scim-1.4
+	>=dev-libs/m17n-lib-1.2.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+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 "export GTK_IM_MODULE=\"scim\""
+	elog
+}
diff --git a/app-i18n/scim-pinyin-0.5.92 b/app-i18n/scim-pinyin-0.5.92
deleted file mode 100644
index 692d2c01fd7b..000000000000
--- a/app-i18n/scim-pinyin-0.5.92
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/libXt || ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 ) nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422
-DESCRIPTION=Smart Common Input Method (SCIM) Smart Pinyin Input Method
-EAPI=4
-HOMEPAGE=http://www.scim-im.org/
-IUSE=nls
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXt || ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/scim/scim-pinyin-0.5.92.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=74fbb18d010d3cae7ece0ebd70f05ed8
diff --git a/app-i18n/scim-pinyin/Manifest b/app-i18n/scim-pinyin/Manifest
new file mode 100644
index 000000000000..273a2f93c51d
--- /dev/null
+++ b/app-i18n/scim-pinyin/Manifest
@@ -0,0 +1,4 @@
+AUX scim-pinyin-0.5.91-fixconfigure.patch 1313 BLAKE2B 6ab4742b4c857064d07402411b81041e3a5f8cc998876df7421f1b7bab97905e572fe793fdecb91325a34c0f4e774d8d115dbc3ea23db63aa518e0d84240ebb7 SHA512 9d4dd0c259d8171c8a3b171e68eded4670aacd27902ee8373fe7aff36d088b3cec5570783b9588357ea475321b5267ff635b865a57e7fd3a9b1245e86710decb
+DIST scim-pinyin-0.5.92.tar.gz 4769203 BLAKE2B 413a196d175536a044bdf4922bf1f3de6051f7e3cb61131153cab6c15e2301e373bfdd037d3e70c2893f66c29f955696e94bb9c75d1e686ca549d26716de0c47 SHA512 6af20b925c45ca355e12eeb59285e3327c2195038078a0e1741870395dc5a8f7dae60b8c9cd77919fbad94c27e123b9e58439f7011277439f9914d1a543a805f
+EBUILD scim-pinyin-0.5.92.ebuild 845 BLAKE2B 8b9ea8806e578c7a66ef65001d192233d8c1150508f7de7d027b32082c4955d2945eb81174a361f48c835a8ead8d16fc47dd8b57f9956705fef409602efe16c8 SHA512 d5a80f917eb810b87e31894404170eec5f87788c831cd6c8c80d369e7558ee9b44d4f4b0095c1eb378bb4848fb0288c9b2b138a4949bcabc35b9446cc22c6762
+MISC metadata.xml 308 BLAKE2B 1bdcfa2996c5ba60e52eddb6446bbc6978ebee7f1f2f4658c44438b886a89cf46a3fddea53c479151e5e023e5681dca5f01264a26ca108c895ac6758f01d6430 SHA512 9f18bf632f3eff9a6498145c2b4c04d51bb119c67351216ab757cd3cea2364c60bef683769218c0596ef6bd29235e51df6a64f9ab1234665fc2191e18fc51cc7
diff --git a/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-fixconfigure.patch b/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-fixconfigure.patch
new file mode 100644
index 000000000000..e91b084f3211
--- /dev/null
+++ b/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-fixconfigure.patch
@@ -0,0 +1,33 @@
+Index: scim-pinyin-0.5.91/configure.ac
+===================================================================
+--- scim-pinyin-0.5.91.orig/configure.ac
++++ scim-pinyin-0.5.91/configure.ac
+@@ -73,11 +73,7 @@ AC_ARG_ENABLE(debug,
+ 	      enable_debug=no)
+ 
+ AC_ARG_ENABLE(skim-support,
+-              [  --disable-skim-support  Enable skim Setup UI],
+-              skim_support=no,
+-              skim_support=yes)
+-
+-AM_CONDITIONAL(SCIM_BUILD_SKIM_SETUP, [test "$skim_support" = "yes"])
++              [  --disable-skim-support  Enable skim Setup UI])
+ 
+ if test "$enable_debug" = "yes"; then
+   AC_DEFINE(ENABLE_DEBUG,1,[Define this to enable the debug facility in libscim])
+@@ -126,7 +122,7 @@ AC_CONFIG_FILES([Makefile
+                  po/Makefile.in
+                  scim-pinyin.spec])
+ 
+-if test "$skim_support" = "yes"; then
++if test "x$enable_skim_support" != "xno"; then
+ REQUIRED_SKIM_VERSION=1.2.1
+ dnl skim probably has been installed under prefix=$KDEDIR, so add it to search path of pkgconfig
+ kde_libsuffix=`kde-config --libsuffix`
+@@ -155,5 +151,6 @@ PKG_CHECK_MODULES(SCIM_KDEUTILS,[scim_kd
+ fi
+ 
+ AM_CONDITIONAL(SCIM_PINYIN_ENABLE_SKIM_SUPPORT, [test "$HAS_KDEUTILS" = "yes"])
++AM_CONDITIONAL(SCIM_BUILD_SKIM_SETUP, [test "$HAS_SKIM" = "yes"])
+ AC_SUBST(SCIM_PINYIN_ENABLE_SKIM_SUPPORT)
+ AC_OUTPUT
diff --git a/app-i18n/scim-pinyin/metadata.xml b/app-i18n/scim-pinyin/metadata.xml
new file mode 100644
index 000000000000..01855eefe13f
--- /dev/null
+++ b/app-i18n/scim-pinyin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">scim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/scim-pinyin/scim-pinyin-0.5.92.ebuild b/app-i18n/scim-pinyin/scim-pinyin-0.5.92.ebuild
new file mode 100644
index 000000000000..c881bd636a93
--- /dev/null
+++ b/app-i18n/scim-pinyin/scim-pinyin-0.5.92.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools-utils
+
+DESCRIPTION="Smart Common Input Method (SCIM) Smart Pinyin Input Method"
+HOMEPAGE="http://www.scim-im.org/"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="nls"
+
+RDEPEND="x11-libs/libXt
+	|| ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+AUTOTOOLS_AUTORECONF=1
+PATCHES=(
+	"${FILESDIR}/${PN}-0.5.91-fixconfigure.patch"
+)
+DOCS=( AUTHORS NEWS README ChangeLog )
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable nls)
+		--disable-skim-support
+		--without-arts
+		--disable-static
+		--disable-depedency-tracking
+	)
+	autotools-utils_src_configure
+}
diff --git a/app-i18n/scim-sayura-0.3.3 b/app-i18n/scim-sayura-0.3.3
deleted file mode 100644
index 01bb7acb4a3d..000000000000
--- a/app-i18n/scim-sayura-0.3.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=app-i18n/scim-0.99.8 virtual/pkgconfig
-DESCRIPTION=Sayura Sinhala input method for SCIM
-EAPI=6
-HOMEPAGE=http://www.sayura.net/im/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-i18n/scim-0.99.8
-SLOT=0
-SRC_URI=http://www.sayura.net/im/scim-sayura-0.3.3.tar.gz
-_md5_=8c68e5a64bc03d197371f046b40b9987
diff --git a/app-i18n/scim-sayura/Manifest b/app-i18n/scim-sayura/Manifest
new file mode 100644
index 000000000000..f90b0a399a21
--- /dev/null
+++ b/app-i18n/scim-sayura/Manifest
@@ -0,0 +1,4 @@
+AUX scim-sayura-0.3.3-gcc45.patch 353 BLAKE2B f2576aff8d65beec5ad0751f7f2cb22142a25a890081ee634606725a6eedf811f14e89d85d74bf968c4fed6b3264da45c5dd2832da252db12370eab7a1fcc98b SHA512 2f4c3ce88dc9b21eb59bff14cb16ae36ed60b0b0a75638bb2080e9bfbeab986857a6f7095f5ab4c4f065f168faaa870ba115922c9b8d28222da821d7dcd5d554
+DIST scim-sayura-0.3.3.tar.gz 380147 BLAKE2B 12e1968e0b581c20fe12fe306c0f01cc5ddff15b5d3bc01cf43efb3538747cd29ef223583b2b8a3fb890f2108536f5cae328dca4a4e666a56e5b7d666b9e8bf3 SHA512 bf97b8d82e0e193a94698dfe7d3c9b1256e928a2082dc0ca6be328ed56409a05d38ba04254617b3800116514c1c8fdbfca869f2aa3f2f005505a4e873d2b90bb
+EBUILD scim-sayura-0.3.3.ebuild 672 BLAKE2B 7d626a06c6ffac07427fafa803d52c7cdd99d3aa559396ef06ee7a9c25d2d8c793be6fcea18e07778885bbe18ea381ba83d446fef7c4f89500b81cb798b86b2b SHA512 65aae4dc4677101745f67c32e0b30a509806c04e9d787868093a434db6be04eda55b4316a6c283a4ac0f3fb603bed19d061b85e9b22376b1af8742131b4e95f9
+MISC metadata.xml 341 BLAKE2B 6f2f812f898b78c0198bd500116b4f0664ac37ee511e57dfb9c36abd9f5386171594aa7da706c5f93d4f98de2fad9630f94eac2e785c64918c865076360150b7 SHA512 93333f168a51bc5b932b06f436c6254d56da5b7de8cc3127e5641a74488a01aaa650d01a018970da8202a7432d8dab8f73d0786802634bc9b131f90219ee2eef
diff --git a/app-i18n/scim-sayura/files/scim-sayura-0.3.3-gcc45.patch b/app-i18n/scim-sayura/files/scim-sayura-0.3.3-gcc45.patch
new file mode 100644
index 000000000000..d80f654b6f67
--- /dev/null
+++ b/app-i18n/scim-sayura/files/scim-sayura-0.3.3-gcc45.patch
@@ -0,0 +1,15 @@
+Fixing build with gcc 4.5
+
+http://bugs.gentoo.org/show_bug.cgi?id=320879
+
+--- a/src/scim_sinhala_imengine.cpp
++++ b/src/scim_sinhala_imengine.cpp
+@@ -233,7 +233,7 @@
+ 
+ void SinhalaInstance::backspace()
+ {
+-	KeyEvent e = scim::KeyEvent::KeyEvent(SCIM_KEY_BackSpace, 0);
++	KeyEvent e = scim::KeyEvent(SCIM_KEY_BackSpace, 0);
+ 	forward_key_event(e);
+ }
+ 
diff --git a/app-i18n/scim-sayura/metadata.xml b/app-i18n/scim-sayura/metadata.xml
new file mode 100644
index 000000000000..948a4b76fa5f
--- /dev/null
+++ b/app-i18n/scim-sayura/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
+<longdescription lang="en">
+This package provides the Sayura Sinhala input method for SCIM.
+</longdescription>
+</pkgmetadata>
diff --git a/app-i18n/scim-sayura/scim-sayura-0.3.3.ebuild b/app-i18n/scim-sayura/scim-sayura-0.3.3.ebuild
new file mode 100644
index 000000000000..f04f5993a8e9
--- /dev/null
+++ b/app-i18n/scim-sayura/scim-sayura-0.3.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Sayura Sinhala input method for SCIM"
+HOMEPAGE="http://www.sayura.net/im/"
+SRC_URI="http://www.sayura.net/im/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=app-i18n/scim-0.99.8"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/scim-sayura-0.3.3-gcc45.patch )
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	HTML_DOCS=( doc/{index.html,style.css} )
+	default
+
+	use doc && dodoc doc/sayura.pdf
+
+	# plugin module, no point in .la files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-i18n/scim-sunpinyin-2.0.3-r2 b/app-i18n/scim-sunpinyin-2.0.3-r2
deleted file mode 100644
index be19775098c6..000000000000
--- a/app-i18n/scim-sunpinyin-2.0.3-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-i18n/scim ~app-i18n/sunpinyin-2.0.3 x11-libs/gtk+:2 dev-util/scons[python_targets_python2_7]
-DESCRIPTION=The SunPinyin IMEngine for Smart Common Input Method (SCIM)
-EAPI=5
-HOMEPAGE=https://sunpinyin.googlecode.com
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 CDDL
-RDEPEND=app-i18n/scim ~app-i18n/sunpinyin-2.0.3 x11-libs/gtk+:2
-SLOT=0
-SRC_URI=https://sunpinyin.googlecode.com/files/scim-sunpinyin-2.0.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e945298f55a362947ecc1e049078457d
diff --git a/app-i18n/scim-sunpinyin/Manifest b/app-i18n/scim-sunpinyin/Manifest
new file mode 100644
index 000000000000..dd92a2ab18c2
--- /dev/null
+++ b/app-i18n/scim-sunpinyin/Manifest
@@ -0,0 +1,4 @@
+AUX scim-sunpinyin-2.0.3-force-switch.patch 947 BLAKE2B 0abc3eaa4f217ad33af87a7b2fa3d0c2bab90ea8540d61faa915fd0c673dbf49905d661da1128330aef16b84925fb9da2a25f75342c233fd364151625da09501 SHA512 8a3600507534dda5854465569127a7863fcbcd318542d319e814634e8fea10f7105469717e7141f831385c5e64a910aee0d442d7eb663e0cb46e9c6b9464ca7f
+DIST scim-sunpinyin-2.0.3.tar.gz 33072 BLAKE2B 06d9bff2eb35b06a49f6be60c8cd5d257f6ca724f03acc01b29b01fd32c2d95bab87c4737448a448a42a58d070f6b254bcf52e6d0c8b98ff10718d2265e43509 SHA512 f983d40972c5792a4a27fdf699cffc7f6882c84060cfe3e260cdc3f587743b0f71339ccdb7067b393f88a69b74d999fba70c4d9bc8016b9b217b3c11667a2986
+EBUILD scim-sunpinyin-2.0.3-r2.ebuild 639 BLAKE2B 8641ce645f95d0ccf073d47edcd0a182295676f614d905b7b3233ea8ec093621a621b6b55b59649755d017c1fe684a96cd0df3577b585e1036d83e1ed8dfd933 SHA512 868c215144512f3e91b05fb94d23bf9b81163fed23b79e9f0c782e3e50c8c0f5f22a7468206006c093a5677f65a4b01f86b74da7d4f3b4d96359110b83a910f8
+MISC metadata.xml 313 BLAKE2B e3d71fcea434a51c92b8194791283c33981d3c4b44bda0df1e70b561517c228daebdc713327171192e1523b7ac2f91116a030bb729eb143606810e6ef5522ce4 SHA512 61d943d4f8b8ab912ced89b69be51ad2792ba67672e969f4e32fba373f7133181c1080ba9a2603e3f7623ebac42e32eb3e0e429d66846ab4c7e13afbc0b05974
diff --git a/app-i18n/scim-sunpinyin/files/scim-sunpinyin-2.0.3-force-switch.patch b/app-i18n/scim-sunpinyin/files/scim-sunpinyin-2.0.3-force-switch.patch
new file mode 100644
index 000000000000..a0089ac11502
--- /dev/null
+++ b/app-i18n/scim-sunpinyin/files/scim-sunpinyin-2.0.3-force-switch.patch
@@ -0,0 +1,34 @@
+diff --git a/wrapper/scim/SConstruct b/wrapper/scim/SConstruct
+index 7739300..ef7c69b 100644
+--- a/wrapper/scim/SConstruct
++++ b/wrapper/scim/SConstruct
+@@ -3,7 +3,7 @@ import SCons.Tool.textfile
+ 
+ locales = []
+ 
+-cflags = '-O2 -g -pipe'
++cflags = '-O2 -g -pipe '
+ version = '2.0.3'
+ 
+ AddOption('--prefix', dest='prefix', metavar='DIR',
+@@ -51,9 +51,6 @@ if GetOption('datadir') is not None:
+ 
+ opts.Save('configure.conf', env)
+ 
+-if GetOption('rpath') is not None:
+-    env.Append(LINKFLAGS='-Wl,-R -Wl,%s' % GetOption('rpath'))
+-
+ envvar = [('CC', 'CC'),
+           ('CXX', 'CXX'),
+           ('CFLAGS', 'CFLAGS'),
+@@ -75,6 +72,10 @@ extra_cflags += ' -Isrc'
+ env.Append(CFLAGS=extra_cflags)
+ env.Append(CXXFLAGS=extra_cflags)
+ env.Replace(SHLIBPREFIX = '')
++
++if GetOption('rpath') is not None:
++    env.Append(LINKFLAGS=' -Wl,-R -Wl,%s' % GetOption('rpath'))
++
+ #
+ #==============================configure================================
+ #
diff --git a/app-i18n/scim-sunpinyin/metadata.xml b/app-i18n/scim-sunpinyin/metadata.xml
new file mode 100644
index 000000000000..583f6476f8be
--- /dev/null
+++ b/app-i18n/scim-sunpinyin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">sunpinyin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3-r2.ebuild b/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3-r2.ebuild
new file mode 100644
index 000000000000..0f2475440219
--- /dev/null
+++ b/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils scons-utils
+
+DESCRIPTION="The SunPinyin IMEngine for Smart Common Input Method (SCIM)"
+HOMEPAGE="https://sunpinyin.googlecode.com"
+SRC_URI="${HOMEPAGE}/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-i18n/scim
+	~app-i18n/sunpinyin-2.0.3
+	x11-libs/gtk+:2 "
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-force-switch.patch"
+}
+
+src_compile() {
+	escons --prefix="/usr"
+}
+
+src_install() {
+	escons --prefix="/usr" --install-sandbox="${D}" install
+}
diff --git a/app-i18n/scim-tables-0.5.13 b/app-i18n/scim-tables-0.5.13
deleted file mode 100644
index 233ddeb8665a..000000000000
--- a/app-i18n/scim-tables-0.5.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=>=app-i18n/scim-1.4.7-r2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Smart Common Input Method (SCIM) Generic Table Input Method Server
-EAPI=0
-HOMEPAGE=http://www.scim-im.org/
-IUSE=nls
-KEYWORDS=amd64 ~arm ppc x86
-LICENSE=GPL-2
-RDEPEND=>=app-i18n/scim-1.4.7-r2 nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/scim/scim-tables-0.5.13.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dd6d637a92209677e8e2b43c6b61f95f
diff --git a/app-i18n/scim-tables/Manifest b/app-i18n/scim-tables/Manifest
new file mode 100644
index 000000000000..aaa45566728f
--- /dev/null
+++ b/app-i18n/scim-tables/Manifest
@@ -0,0 +1,5 @@
+AUX scim-tables-0.5.12-automake.patch 356 BLAKE2B bce5fcef77970e3504048389968a11e00bcdac1049425b99b75d5f5081c7966eb2c38f6c98aebd3512bfae78cca7b4171f916099ef77f40dfb59e7e3865350cf SHA512 020b32250566092c784727d316acb800013d1c4f7bbd970503e4033bd9006e523079f2b906c7b0db67501d6e441b98500d6da40bdf37b2749f6611c6f6523df9
+AUX scim-tables-0.5.8+gcc-4.3.patch 462 BLAKE2B 181974c195ce3a5d53ac4f95a067adbca82e60b44f664b6caec4f0052f46d02bceccf6aa102f6dc771b1bdc6186fa27c58a550f2cc11cd61cd304b9c4cf5bcf5 SHA512 450b5ca11d1f9b776edae027e8b9af1e24511c145e5df83e344b236be434f7ac7bb7fb24c304dc3e6b2e25ce38a4933acf09140b50f66eed3b734daf9d6c30f6
+DIST scim-tables-0.5.13.tar.gz 6716275 BLAKE2B 8b7932f38baab64d9e1db6e9f76e3d7425f3b1ff071c358b8f2a7d8b2602d3304248e97389f2423ebc12b37edf43c114f73e6bace3907547af44963e03317878 SHA512 400aa99acef83b82e6422398f41bf65e51b7e703adc3e87cdef03793d84983e600f9e6201fda6f9c54e97f35c44da72a657ce15caef09ef490c44ad19c3a9e33
+EBUILD scim-tables-0.5.13.ebuild 1487 BLAKE2B f64a6c7dc8e20a245e3e203b301c309721150114c43475c5d39a954d2e52b755dc6b32ca9cc7fbcb57f4252780804106cbdb986a3374f6de4eedb36d4ba79368 SHA512 5d0c37f6eeeed593601d070bd57ed63d257d575114ec146ee8c48f97fc466cc118a828154bdd66cd2be1c134173bf63e965f1200188676e528776f50e3835840
+MISC metadata.xml 308 BLAKE2B 1bdcfa2996c5ba60e52eddb6446bbc6978ebee7f1f2f4658c44438b886a89cf46a3fddea53c479151e5e023e5681dca5f01264a26ca108c895ac6758f01d6430 SHA512 9f18bf632f3eff9a6498145c2b4c04d51bb119c67351216ab757cd3cea2364c60bef683769218c0596ef6bd29235e51df6a64f9ab1234665fc2191e18fc51cc7
diff --git a/app-i18n/scim-tables/files/scim-tables-0.5.12-automake.patch b/app-i18n/scim-tables/files/scim-tables-0.5.12-automake.patch
new file mode 100644
index 000000000000..7f5ea31ca187
--- /dev/null
+++ b/app-i18n/scim-tables/files/scim-tables-0.5.12-automake.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 78f75f9..ee82dda 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,7 +7,7 @@ AC_DEFINE_UNQUOTED(SCIM_TABLES_VERSION, "$PACKAGE_VERSION", [The release version
+ 
+ # Init automake stuff
+ AM_INIT_AUTOMAKE
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ 
+ # Init gettext
+ AM_GNU_GETTEXT([external])
diff --git a/app-i18n/scim-tables/files/scim-tables-0.5.8+gcc-4.3.patch b/app-i18n/scim-tables/files/scim-tables-0.5.8+gcc-4.3.patch
new file mode 100644
index 000000000000..96e5c820813e
--- /dev/null
+++ b/app-i18n/scim-tables/files/scim-tables-0.5.8+gcc-4.3.patch
@@ -0,0 +1,11 @@
+ diff -up scim-tables-0.5.8/src/scim_generic_table.h.gcc43~ scim-tables-0.5.8/src/scim_generic_table.h
+--- scim-tables-0.5.8/src/scim_generic_table.h.gcc43~	2008-01-13 08:03:06.000000000 +0000
++++ scim-tables-0.5.8/src/scim_generic_table.h	2008-01-13 08:03:06.000000000 +0000
+@@ -24,6 +24,7 @@
+  * $Id: scim_generic_table.h,v 1.7 2006/08/23 10:25:32 suzhe Exp $
+  */
+ 
++#include <cstring>
+ #if !defined (__SCIM_GENERIC_TABLE_H)
+ #define __SCIM_GENERIC_TABLE_H
+ 
diff --git a/app-i18n/scim-tables/metadata.xml b/app-i18n/scim-tables/metadata.xml
new file mode 100644
index 000000000000..01855eefe13f
--- /dev/null
+++ b/app-i18n/scim-tables/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">scim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/scim-tables/scim-tables-0.5.13.ebuild b/app-i18n/scim-tables/scim-tables-0.5.13.ebuild
new file mode 100644
index 000000000000..530fd551b64c
--- /dev/null
+++ b/app-i18n/scim-tables/scim-tables-0.5.13.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit autotools base eutils
+
+DESCRIPTION="Smart Common Input Method (SCIM) Generic Table Input Method Server"
+HOMEPAGE="http://www.scim-im.org/"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86"
+IUSE="nls"
+LANGS="am ar bn gu hi ja kn ko ml ne pa ru ta te th uk vi zh"
+
+RDEPEND=">=app-i18n/scim-1.4.7-r2
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.5.8+gcc-4.3.patch"
+	"${FILESDIR}"/${PN}-0.5.12-automake.patch
+	)
+
+pkg_setup() {
+	elog "Not all languages are going to be compiled."
+	elog "Please set LINGUAS to your preferred language(s)."
+	elog "Supported LINGUAS values are:"
+	elog "${LANGS}"
+}
+
+src_unpack() {
+	base_src_unpack
+
+	strip-linguas ${LANGS}
+	local use_languages="additional ${LINGUAS}"
+	elog "Languages being compiled are: ${use_languages}"
+
+	cd "${S}"
+	sed -i -e "/^SUBDIRS/s/.*/SUBDIRS = ${use_languages}/g" \
+			tables/Makefile.{am,in} || die "sed ${m} failed"
+
+	AT_NO_RECURSIVE=yes AT_M4DIR=${S}/m4 eautoreconf
+}
+
+src_compile() {
+	econf \
+		--disable-skim-support \
+		$(use_enable nls) \
+		--disable-static \
+		--disable-dependency-tracking \
+		--without-arts || die "econf failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc README ChangeLog AUTHORS
+}
diff --git a/app-i18n/scim-tomoe-0.6.0-r3 b/app-i18n/scim-tomoe-0.6.0-r3
deleted file mode 100644
index 4208f7002d10..000000000000
--- a/app-i18n/scim-tomoe-0.6.0-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=app-i18n/scim-1.2.0 >=app-i18n/tomoe-gtk-0.6.0 >=x11-libs/gtk+-2.4:2 virtual/pkgconfig >=dev-util/intltool-0.35.0
-DESCRIPTION=Japanese input method Tomoe IMEngine for SCIM
-EAPI=6
-HOMEPAGE=http://tomoe.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=app-i18n/scim-1.2.0 >=app-i18n/tomoe-gtk-0.6.0 >=x11-libs/gtk+-2.4:2
-SLOT=0
-SRC_URI=mirror://sourceforge/tomoe/scim-tomoe-0.6.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d23e371c58c05e38da599eea3baeb344
diff --git a/app-i18n/scim-tomoe/Manifest b/app-i18n/scim-tomoe/Manifest
new file mode 100644
index 000000000000..7b5945ce5bd1
--- /dev/null
+++ b/app-i18n/scim-tomoe/Manifest
@@ -0,0 +1,4 @@
+AUX scim-tomoe-0.6.0-gcc43.patch 445 BLAKE2B 7a6f48120398dd661a647914e9097dc69807a2c0d18ba9c56517c48df2a67dd7406cb13dea283ff5b9b8c64a19dcff4548453f0c47cb37f890cef0cf7a1794a8 SHA512 a27202fdf5be0d77d473674475ee99d2b0d1a6eba51ccc45c4c7dc6c3a9c3d1042ed3b25ae15a04fcff885aad7b84c42cac7462fcc739bf12076e675b413fafa
+DIST scim-tomoe-0.6.0.tar.gz 385126 BLAKE2B e211c97caab5221d80541cbc795d3559b9843df4fb03bc559a20dc34b510288aefde87251c35c0a123501192d8f4ffb9209fa3c6c74acbbba75ae3321dd58fe9 SHA512 d70a8838f8c82c76a8e3592ad712997189873cbc4ec7ebeba5d43d6583e24acf318299433c9342ee004c4ae4741cca7e0b88e4642cf46c43f967a47ec5ac9d4f
+EBUILD scim-tomoe-0.6.0-r3.ebuild 644 BLAKE2B adb72e7b638641c3b01236f3cab93340b356bfec4cd0fd32f1db8fb21d59fb39f599e9843bc2ccc1b68fb03f32772282ac142284a26c1185231348df8fb51bf2 SHA512 99f9c7a8c24cce85a0236115dd9d85a03046440c2f0d062d15e93d6358532e16e0cec50e37819e8487d3c79f6bf6ba136f1f12bdd6dccff11c96da88729cd11e
+MISC metadata.xml 309 BLAKE2B f8126911d309ca51f6e56437d2c219026c2e50d854b62c44afc5e211cff957d1776b0fef17a64da072033c5df308c6015786feb49344be3c8c4c57074d028d36 SHA512 7d9c17a3c4279406d23064447a7370658c494bbc5eab2a05f048f58ac3e136804ad65dc2fafbfc132b1f82ca6a651f6fe34beb68ea370b5a0eb1a3f6c98d3c2d
diff --git a/app-i18n/scim-tomoe/files/scim-tomoe-0.6.0-gcc43.patch b/app-i18n/scim-tomoe/files/scim-tomoe-0.6.0-gcc43.patch
new file mode 100644
index 000000000000..5464debb0198
--- /dev/null
+++ b/app-i18n/scim-tomoe/files/scim-tomoe-0.6.0-gcc43.patch
@@ -0,0 +1,11 @@
+diff -Naur scim-tomoe-0.6.0.orig/src/scim_tomoe_prefs_widget.cpp scim-tomoe-0.6.0/src/scim_tomoe_prefs_widget.cpp
+--- scim-tomoe-0.6.0.orig/src/scim_tomoe_prefs_widget.cpp	2007-05-07 16:49:15.000000000 +0900
++++ scim-tomoe-0.6.0/src/scim_tomoe_prefs_widget.cpp	2008-09-24 00:57:47.000000000 +0900
+@@ -22,6 +22,7 @@
+ #endif
+ 
+ #include <glib/gi18n-lib.h>
++#include <cstring>
+ 
+ #include "scim_tomoe_prefs_widget.h"
+ #include "scim_tomoe_prefs.h"
diff --git a/app-i18n/scim-tomoe/metadata.xml b/app-i18n/scim-tomoe/metadata.xml
new file mode 100644
index 000000000000..f01b1e07af44
--- /dev/null
+++ b/app-i18n/scim-tomoe/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tomoe</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r3.ebuild b/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r3.ebuild
new file mode 100644
index 000000000000..dde8e4a9a8a7
--- /dev/null
+++ b/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Japanese input method Tomoe IMEngine for SCIM"
+HOMEPAGE="http://tomoe.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=app-i18n/scim-1.2.0
+	>=app-i18n/tomoe-gtk-0.6.0
+	>=x11-libs/gtk+-2.4:2
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=dev-util/intltool-0.35.0
+"
+
+PATCHES=( "${FILESDIR}"/${P}-gcc43.patch )
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
diff --git a/app-i18n/scim-uim-0.2.0-r2 b/app-i18n/scim-uim-0.2.0-r2
deleted file mode 100644
index 368b25a6a2f5..000000000000
--- a/app-i18n/scim-uim-0.2.0-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=>=app-i18n/uim-1.5.0 >=app-i18n/scim-1.4.0 virtual/pkgconfig
-DESCRIPTION=An input module for Smart Common Input Method (SCIM) which uses uim as backend
-EAPI=6
-HOMEPAGE=http://www.scim-im.org/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=app-i18n/uim-1.5.0 >=app-i18n/scim-1.4.0
-SLOT=0
-SRC_URI=mirror://sourceforge/scim/scim-uim-0.2.0.tar.gz
-_md5_=e5f2027a5b8adeee3760cf701645204a
diff --git a/app-i18n/scim-uim/Manifest b/app-i18n/scim-uim/Manifest
new file mode 100644
index 000000000000..e1b93d03341a
--- /dev/null
+++ b/app-i18n/scim-uim/Manifest
@@ -0,0 +1,5 @@
+AUX scim-uim-0.2.0-gcc43.patch 420 BLAKE2B 491828a4fa94ed7f0343b449b35e911666dd9abe8627264caa79f9d20605bd9a075e7165b367fee4669db0d4178c385fc4d4937491dd5bc5c31af1af2ab5cd6f SHA512 8baec8863a00d1a870f9c557340f089f51e991acec994a3445bc378f95b226aeb46018ba11b8dc605b90ab35f7923bfc029fa40e1e01e17caba1e3ca99e07c09
+AUX scim-uim-0.2.0-uim-1.5.patch 367 BLAKE2B e73cefa76abb64816265ee870c44d39966606624c649d97c09d5e5cf5494af34f49c9770ad103f7af2afa8eedc662098565c68a12fc70b0fc936e384a19035d8 SHA512 2c68a8fa1e5d99e624145ce9a85aeb1a286e4a4afe33d92c32c13ad3e14060afa8f730d58146d9a2b134b9565172a909138742357b640ba000a7129e5e65e485
+DIST scim-uim-0.2.0.tar.gz 344389 BLAKE2B da0cd29036cf3fd4a94ca0f5c9e72566ccb37c4d64019645b9ea04d9859d33d1614d8cf786ca67a0d2c474b79b13d7d100ddf815b982ba414ac950306ae00448 SHA512 18df8de8ebc02289e21bf54c921b5425f67ef3c379b3c3e4392431dc3b1d9d7f12a25bcbcaaddd264913bacf61ba2be9339845700f541c22f73981e99824c6e9
+EBUILD scim-uim-0.2.0-r2.ebuild 931 BLAKE2B df9a4bb7d1b155f9e1baba29a78e3879616b25e5222afc5d938768f0ac94bd07cfb603bc87695e8c87e4d91a825b6aa94a8da66991001db045d7f7a3c526930e SHA512 533313a1588e72431a6e759f21eddcffde6c7eccc142e8ef4ca651b8124ad2817ca917e78984f96f3057ee2bd401f6c0a70960b08e9cbca57055a3249283e60f
+MISC metadata.xml 308 BLAKE2B 1bdcfa2996c5ba60e52eddb6446bbc6978ebee7f1f2f4658c44438b886a89cf46a3fddea53c479151e5e023e5681dca5f01264a26ca108c895ac6758f01d6430 SHA512 9f18bf632f3eff9a6498145c2b4c04d51bb119c67351216ab757cd3cea2364c60bef683769218c0596ef6bd29235e51df6a64f9ab1234665fc2191e18fc51cc7
diff --git a/app-i18n/scim-uim/files/scim-uim-0.2.0-gcc43.patch b/app-i18n/scim-uim/files/scim-uim-0.2.0-gcc43.patch
new file mode 100644
index 000000000000..a956dd29e56b
--- /dev/null
+++ b/app-i18n/scim-uim/files/scim-uim-0.2.0-gcc43.patch
@@ -0,0 +1,11 @@
+diff -Naur scim-uim-0.2.0.orig/src/scim_uim_imengine.cpp scim-uim-0.2.0/src/scim_uim_imengine.cpp
+--- scim-uim-0.2.0.orig/src/scim_uim_imengine.cpp	2007-04-10 14:43:59.000000000 +0900
++++ scim-uim-0.2.0/src/scim_uim_imengine.cpp	2008-11-02 19:00:55.000000000 +0900
+@@ -32,6 +32,7 @@
+   #include <config.h>
+ #endif
+ 
++#include <cstring>
+ #include <scim.h>
+ #include "scim_uim_imengine.h"
+ #include <uim/uim-compat-scm.h>
diff --git a/app-i18n/scim-uim/files/scim-uim-0.2.0-uim-1.5.patch b/app-i18n/scim-uim/files/scim-uim-0.2.0-uim-1.5.patch
new file mode 100644
index 000000000000..d186b441bb8d
--- /dev/null
+++ b/app-i18n/scim-uim/files/scim-uim-0.2.0-uim-1.5.patch
@@ -0,0 +1,12 @@
+--- scim-uim-0.2.0/src/scim_uim_imengine.cpp
++++ scim-uim-0.2.0/src/scim_uim_imengine.cpp
+@@ -35,7 +35,8 @@
+ #include <cstring>
+ #include <scim.h>
+ #include "scim_uim_imengine.h"
+-#include <uim/uim-compat-scm.h>
++#include <uim/uim-scm.h>
++#include <uim/uim-util.h>
+
+ #define scim_module_init uim_LTX_scim_module_init
+ #define scim_module_exit uim_LTX_scim_module_exit
\ No newline at end of file
diff --git a/app-i18n/scim-uim/metadata.xml b/app-i18n/scim-uim/metadata.xml
new file mode 100644
index 000000000000..01855eefe13f
--- /dev/null
+++ b/app-i18n/scim-uim/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">scim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/scim-uim/scim-uim-0.2.0-r2.ebuild b/app-i18n/scim-uim/scim-uim-0.2.0-r2.ebuild
new file mode 100644
index 000000000000..8b9fe22e0718
--- /dev/null
+++ b/app-i18n/scim-uim/scim-uim-0.2.0-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="An input module for Smart Common Input Method (SCIM) which uses uim as backend"
+HOMEPAGE="http://www.scim-im.org/"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="
+	>=app-i18n/uim-1.5.0
+	>=app-i18n/scim-1.4.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-uim-1.5.patch
+)
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	# plugin module, no point in .la files
+	find "${D}" -name '*.la' -delete || die
+}
+
+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
+}
diff --git a/app-i18n/scim-wijesekera-0.3.3-r1 b/app-i18n/scim-wijesekera-0.3.3-r1
deleted file mode 100644
index a0bbe016f386..000000000000
--- a/app-i18n/scim-wijesekera-0.3.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-i18n/scim-0.99.8[-gtk3] virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Wijesekara keyboard for Sinhala input using scim
-EAPI=6
-HOMEPAGE=http://sinhala.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-i18n/scim-0.99.8[-gtk3]
-SLOT=0
-SRC_URI=http://sinhala.sourceforge.net/files/scim-wijesekera-0.3.3.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=1292bc2519c1ad58543996fde6499e25
diff --git a/app-i18n/scim-wijesekera/Manifest b/app-i18n/scim-wijesekera/Manifest
new file mode 100644
index 000000000000..b83d79bae010
--- /dev/null
+++ b/app-i18n/scim-wijesekera/Manifest
@@ -0,0 +1,4 @@
+AUX scim-wijesekera-0.3.3-gcc43.patch 949 BLAKE2B d65f15add07ccceab709a3a47681274a6897aef008926646c40b4b6ed6c5a732870f66129d9fbc067bb7f1235140d43ac50f7e462faf6b05abcda64645a487fe SHA512 0719231165e2647b7fbfec9b39e98b2665bb8e7bdf708937afdb917df8762cc0a1b226bb60177367ea5019e8962fa5bc6fc4cc2d883a0bcc7049a29bf64aa974
+DIST scim-wijesekera-0.3.3.tar.gz 193023 BLAKE2B 6d8b4757e851a9e17b074c0bdda03e01b32a547a29d9755f82eb8828f8accf830a44aac8cc71ba6c6b18c7649a9a6e3009108e2fdc27992e9dc8d84d99a0c201 SHA512 98bfbb7a3cf499c7980c06504083744f46ce352b27e8e80362190359e8bfa88472a5510568f3753503c7d409d1730e7d1ae1162e3d43a5475e466c334b0a91fc
+EBUILD scim-wijesekera-0.3.3-r1.ebuild 677 BLAKE2B 0eca6f938b54be2bc23308326fcb5b6a5c2f37eb699113dcc8d941f049ac94fdb6d6e284e24aaa001378763b3523a59b11a154abd0437e34a6bedcd5e64f2223 SHA512 df5322f2bceff7ece47c3daa63149e46a39c55d46838bbf0870a38125b9e4cac01eb3c697c008903bb8c1b2e3b28ab0190d423537f72e66b93456e894e02e5dc
+MISC metadata.xml 311 BLAKE2B afb6ee7bcdfdd6a60d60c65ff2796f3ae1be7aed807252c8a38e9ca364fe07a82730c354da96cddd357e046316aa6c9e3e85a848bf3fe0a9a873a45be9ede313 SHA512 f28f06e7380cddb887dc480bfd1c975a5aecf7fe3a9349547f058141cfc66f212e51728627638342958785843cdd668a9d35dc9c3b13963d4ea6c0ff91739a0a
diff --git a/app-i18n/scim-wijesekera/files/scim-wijesekera-0.3.3-gcc43.patch b/app-i18n/scim-wijesekera/files/scim-wijesekera-0.3.3-gcc43.patch
new file mode 100644
index 000000000000..1fa083fd7c8d
--- /dev/null
+++ b/app-i18n/scim-wijesekera/files/scim-wijesekera-0.3.3-gcc43.patch
@@ -0,0 +1,22 @@
+diff -Naur scim-wijesekera-0.3.3.orig/src/scim_wijesekera_imengine.cpp scim-wijesekera-0.3.3/src/scim_wijesekera_imengine.cpp
+--- scim-wijesekera-0.3.3.orig/src/scim_wijesekera_imengine.cpp	2008-04-26 17:45:15.000000000 +0900
++++ scim-wijesekera-0.3.3/src/scim_wijesekera_imengine.cpp	2008-12-29 01:07:23.000000000 +0900
+@@ -33,6 +33,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <cstring>
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+diff -Naur scim-wijesekera-0.3.3.orig/src/scim_wijesekera_imengine_setup.cpp scim-wijesekera-0.3.3/src/scim_wijesekera_imengine_setup.cpp
+--- scim-wijesekera-0.3.3.orig/src/scim_wijesekera_imengine_setup.cpp	2008-04-26 17:45:15.000000000 +0900
++++ scim-wijesekera-0.3.3/src/scim_wijesekera_imengine_setup.cpp	2008-12-29 01:07:03.000000000 +0900
+@@ -30,6 +30,7 @@
+ #ifdef HAVE_CONFIG_H
+   #include <config.h>
+ #endif
++#include <cstring>
+ 
+ #include <scim.h>
+ #include <gtk/scimkeyselection.h>
diff --git a/app-i18n/scim-wijesekera/metadata.xml b/app-i18n/scim-wijesekera/metadata.xml
new file mode 100644
index 000000000000..91d1f3a02de3
--- /dev/null
+++ b/app-i18n/scim-wijesekera/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">sinhala</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/scim-wijesekera/scim-wijesekera-0.3.3-r1.ebuild b/app-i18n/scim-wijesekera/scim-wijesekera-0.3.3-r1.ebuild
new file mode 100644
index 000000000000..28914bc279f6
--- /dev/null
+++ b/app-i18n/scim-wijesekera/scim-wijesekera-0.3.3-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Wijesekara keyboard for Sinhala input using scim"
+HOMEPAGE="http://sinhala.sourceforge.net/"
+SRC_URI="http://sinhala.sourceforge.net/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/scim-0.99.8[-gtk3]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-gcc43.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	# plugin module, no point in .la files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-i18n/scim-wnn-0.2.4 b/app-i18n/scim-wnn-0.2.4
deleted file mode 100644
index 85a32e355165..000000000000
--- a/app-i18n/scim-wnn-0.2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DEPEND=|| ( >=app-i18n/scim-1.0 >=app-i18n/scim-cvs-1.0 ) dev-libs/wnn7sdk freewnn? ( app-i18n/freewnn ) >=sys-apps/sed-4
-DESCRIPTION=Japanese input method Wnn IMEngine for SCIM
-EAPI=0
-HOMEPAGE=http://nop.net-p.org/modules/pukiwiki/index.php?%5B%5Bscim-wnn%5D%5D
-IUSE=freewnn
-KEYWORDS=x86
-LICENSE=GPL-2
-RDEPEND=|| ( >=app-i18n/scim-1.0 >=app-i18n/scim-cvs-1.0 ) dev-libs/wnn7sdk freewnn? ( app-i18n/freewnn )
-SLOT=0
-SRC_URI=http://nop.net-p.org/files/scim-wnn/scim-wnn-0.2.4.tar.gz
-_md5_=6d10efb4dbd544ee2aa9885f60c0c837
diff --git a/app-i18n/scim-wnn-1.0.0-r1 b/app-i18n/scim-wnn-1.0.0-r1
deleted file mode 100644
index 65e0fb5d3d72..000000000000
--- a/app-i18n/scim-wnn-1.0.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst prepare
-DEPEND=>=app-i18n/scim-1.4[-gtk3] dev-libs/wnn7sdk freewnn? ( app-i18n/freewnn ) virtual/pkgconfig
-DESCRIPTION=Japanese input method Wnn IMEngine for SCIM
-EAPI=7
-HOMEPAGE=http://nop.net-p.org/modules/pukiwiki/index.php?%5B%5Bscim-wnn%5D%5D
-IUSE=+freewnn
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-i18n/scim-1.4[-gtk3] dev-libs/wnn7sdk freewnn? ( app-i18n/freewnn )
-SLOT=0
-SRC_URI=http://nop.net-p.org/files/scim-wnn/scim-wnn-1.0.0.tar.gz
-_md5_=d3b2aac80af256c46a4746b6c2d4dd99
diff --git a/app-i18n/scim-wnn/Manifest b/app-i18n/scim-wnn/Manifest
new file mode 100644
index 000000000000..ae09f3263fc5
--- /dev/null
+++ b/app-i18n/scim-wnn/Manifest
@@ -0,0 +1,6 @@
+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 1169 BLAKE2B f7e4ba321726b7e5b282d064e8f7f9133d8d0227abec576b2fd2f0e7eb61b57dbff62fb6a39bb77bab8af5b60aa1dc887f9d5efb829ebad8081cce90c298735d SHA512 e2cbc08dd873618cbfa3ea5abdf621e572c0527ee3f1be79444913dd2ab0adc20e7a244142bc97016fee359acb5884f7b6bc4e45fac3a0728bdd34ae4ac6e167
+EBUILD scim-wnn-1.0.0-r1.ebuild 1294 BLAKE2B a45289044f747df470478dbc86dfd5069e6de318e46989a1a7c04a605766bb01cb3d420ffd58adce8b54985b25719d985edce258fc404fcfda25535c0a774087 SHA512 47943b231a0bdf9e23088883d5f854d5e9345a5210d53634228d293c56b7958a6419d32d8df027fde10bd3e81f10311f8272fd518067db4a928389d78cd550e0
+MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-i18n/scim-wnn/files/scim-wnn-1.0.0-gcc43.patch b/app-i18n/scim-wnn/files/scim-wnn-1.0.0-gcc43.patch
new file mode 100644
index 000000000000..489f2d9064e2
--- /dev/null
+++ b/app-i18n/scim-wnn/files/scim-wnn-1.0.0-gcc43.patch
@@ -0,0 +1,22 @@
+diff -Naur scim-wnn-1.0.0.orig/src/scim_wnn_imengine_setup.cpp scim-wnn-1.0.0/src/scim_wnn_imengine_setup.cpp
+--- scim-wnn-1.0.0.orig/src/scim_wnn_imengine_setup.cpp	2006-03-28 12:07:31.000000000 +0900
++++ scim-wnn-1.0.0/src/scim_wnn_imengine_setup.cpp	2009-12-08 19:32:27.000000000 +0900
+@@ -26,6 +26,7 @@
+ 
+ #define Uses_SCIM_CONFIG_BASE
+ 
++#include <cstring>
+ #include <gtk/gtk.h>
+ 
+ #ifdef HAVE_CONFIG_H
+diff -Naur scim-wnn-1.0.0.orig/src/wnnconversion.cpp scim-wnn-1.0.0/src/wnnconversion.cpp
+--- scim-wnn-1.0.0.orig/src/wnnconversion.cpp	2006-03-28 11:34:46.000000000 +0900
++++ scim-wnn-1.0.0/src/wnnconversion.cpp	2009-12-08 19:50:26.000000000 +0900
+@@ -17,6 +17,7 @@
+  *   Free Software Foundation, Inc.,                                       *
+  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+  ***************************************************************************/
++#include <cstring>
+ #include "wnnconversion.h"
+ #include <scim_wnn_def.h>
+ 
diff --git a/app-i18n/scim-wnn/metadata.xml b/app-i18n/scim-wnn/metadata.xml
new file mode 100644
index 000000000000..c921b96adf6c
--- /dev/null
+++ b/app-i18n/scim-wnn/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-i18n/scim-wnn/scim-wnn-0.2.4.ebuild b/app-i18n/scim-wnn/scim-wnn-0.2.4.ebuild
new file mode 100644
index 000000000000..1ce3211f149e
--- /dev/null
+++ b/app-i18n/scim-wnn/scim-wnn-0.2.4.ebuild
@@ -0,0 +1,48 @@
+# 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 >=app-i18n/scim-cvs-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-wnn/scim-wnn-1.0.0-r1.ebuild b/app-i18n/scim-wnn/scim-wnn-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..afcdc2175d98
--- /dev/null
+++ b/app-i18n/scim-wnn/scim-wnn-1.0.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="~amd64 ~x86"
+IUSE="+freewnn"
+
+RDEPEND=">=app-i18n/scim-1.4[-gtk3]
+	dev-libs/wnn7sdk
+	freewnn? ( app-i18n/freewnn )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	# bug #295733
+	"${FILESDIR}/${P}-gcc43.patch"
+)
+
+src_prepare() {
+	default
+	# bug #140794
+	sed -i -e 's:$LDFLAGS conftest.$ac_ext $LIBS:conftest.$ac_ext $LIBS $LDFLAGS:g' \
+		configure || die "ldflags sed failed"
+
+#	sed -i -e "s:/usr/lib/wnn7:/usr/$(get_libdir)/wnn:g" \
+	sed -i -e "s:/usr/lib/wnn7:/usr/lib/wnn:g" \
+		src/scim_wnn_def.h src/wnnconversion.cpp || die "sed failed"
+}
+
+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
new file mode 100644
index 000000000000..488017e0ab8a
--- /dev/null
+++ b/app-i18n/scim/Manifest
@@ -0,0 +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 2650 BLAKE2B 4a6c0f271a6e924844d1de7cba6309f8a0d6a71d0b880ab96226aedb1bc21cbe15c7d919b9d1176bb7f36aaeae3c6c75ff095f2faae00eadaa1ba9060451af1d SHA512 c551d6e3a75da6f16c6bc82d9bbb2ad2d1def41949daa7bff782afb9e8e697de79b7ee14d904398137b2495d51ad9d25af65e57c8bb366f6a06eecd1b04909a6
+EBUILD scim-1.4.18.ebuild 2664 BLAKE2B e13c1ff0034b09803a7332f593c04330635dc22fe0cbc0619100f61523596b744ae877c8d204043cf27985a9424eed2150086fb5cb4f8593cc25fb795427e0af SHA512 d571c9ff88ca85f1d7d4f2729237e76f87694ab7f56c049e1bb004f9ee869f8f8122ba183e8e2513c258be0250bacb5a7afb78e44fda4224b80e0b5b4250c7da
+MISC metadata.xml 399 BLAKE2B 35834cd16ccba6bf71752ae33d56e8a70391517ba09f83526d402b3aec5fc5d9c13513e090bb014cad67658c905c1dbbe396cc0c9dfc6f1e7c32c4c09a81d777 SHA512 3bbbad26a22cc5222316cf769f638a0e181ea94d8cee39058bcbd1a08e61dd0096441721190323ddb285c504dc061027e4c4185f8bee1d4d0b4b197903f3be0e
diff --git a/app-i18n/scim/files/xinput-scim b/app-i18n/scim/files/xinput-scim
new file mode 100644
index 000000000000..1d2ef452cbc6
--- /dev/null
+++ b/app-i18n/scim/files/xinput-scim
@@ -0,0 +1,9 @@
+XIM=SCIM
+XIM_PROGRAM="@EPREFIX@/usr/bin/scim"
+XIM_ARGS="-d --no-socket"
+GTK_IM_MODULE=scim
+QT_IM_MODULE=scim
+PREFERENCE_PROGRAM="@EPREFIX@/usr/bin/scim-setup"
+SHORT_DESC="SCIM"
+LONG_DESC="Smart Common Input Method platform"
+ICON=scim-setup
diff --git a/app-i18n/scim/metadata.xml b/app-i18n/scim/metadata.xml
new file mode 100644
index 000000000000..9115a5e98acc
--- /dev/null
+++ b/app-i18n/scim/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<use>
+		<flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">scim-im/scim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/scim/scim-1.4.17.ebuild b/app-i18n/scim/scim-1.4.17.ebuild
new file mode 100644
index 000000000000..86a88efe10bb
--- /dev/null
+++ b/app-i18n/scim/scim-1.4.17.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic multilib gnome2-utils autotools qmake-utils
+
+DESCRIPTION="Smart Common Input Method (SCIM) is an Input Method (IM) development platform"
+HOMEPAGE="https://sourceforge.net/projects/scim"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="doc gtk3 qt4"
+
+RDEPEND="x11-libs/libX11
+	dev-libs/glib:2
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	>=dev-libs/atk-1
+	>=x11-libs/pango-1"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen
+		>=app-text/docbook-xsl-stylesheets-1.73.1 )
+	dev-lang/perl
+	virtual/pkgconfig
+	>=dev-util/intltool-0.33
+	sys-devel/libtool"
+DOCS=(
+	README
+	AUTHORS
+	ChangeLog
+	docs/developers
+	docs/scim.cfg
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# bug #83625
+	filter-flags -fvisibility-inlines-hidden -fvisibility=hidden
+	econf $(use_with doc doxygen) \
+		--enable-ld-version-script \
+		$(usex gtk3 --with-gtk-version={3,2}) \
+		--disable-qt3-immodule \
+		$(use_enable qt4 qt4-immodule) \
+		--with-qt4-moc="$(qt4_get_bindir)/moc"
+}
+
+src_compile() {
+	default
+	use doc && emake docs
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${S}/docs/html/" )
+	default
+
+	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-${PN}" > "${T}/${PN}.conf" || die
+	insinto /etc/X11/xinit/xinput.d
+	doins "${T}/${PN}.conf"
+}
+
+pkg_postinst() {
+	elog
+	elog "To use SCIM with both GTK 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 "export GTK_IM_MODULE=\"scim\""
+	elog "export QT_IM_MODULE=\"scim\""
+	elog
+	elog "where 'your_language' can be zh_CN, zh_TW, ja_JP.eucJP or any other"
+	elog "UTF-8 locale such as en_US.UTF-8 or ja_JP.UTF-8"
+	elog
+	elog "To use Chinese input methods:"
+	elog "	# emerge app-i18n/scim-tables app-i18n/scim-pinyin"
+	elog "To use Korean input methods:"
+	elog "	# emerge app-i18n/scim-hangul"
+	elog "To use Japanese input methods:"
+	elog "	# emerge app-i18n/scim-anthy"
+	elog "To use various input methods (more than 30 languages):"
+	elog "	# emerge app-i18n/scim-m17n"
+	elog
+	elog "Please modify ${EPREFIX}/etc/scim/global and add your UTF-8 locale to"
+	elog "/SupportedUnicodeLocales entry."
+	elog
+	ewarn
+	ewarn "If you upgraded from scim-1.2.x or scim-1.0.x, you should remerge all SCIM modules."
+	ewarn
+
+	gnome2_query_immodules_gtk2
+}
+
+pkg_postrm() {
+	gnome2_query_immodules_gtk2
+}
diff --git a/app-i18n/scim/scim-1.4.18.ebuild b/app-i18n/scim/scim-1.4.18.ebuild
new file mode 100644
index 000000000000..cf10edfec8e1
--- /dev/null
+++ b/app-i18n/scim/scim-1.4.18.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools flag-o-matic gnome2-utils qmake-utils
+
+DESCRIPTION="Smart Common Input Method (SCIM) is an Input Method (IM) development platform"
+HOMEPAGE="https://github.com/scim-im/scim"
+SRC_URI="https://github.com/scim-im/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="doc gtk3 qt4"
+
+RDEPEND="x11-libs/libX11
+	dev-libs/glib:2
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	>=dev-libs/atk-1
+	>=x11-libs/pango-1"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen
+		>=app-text/docbook-xsl-stylesheets-1.73.1 )
+	dev-lang/perl
+	virtual/pkgconfig
+	>=dev-util/intltool-0.33
+	sys-devel/libtool"
+DOCS=(
+	README
+	AUTHORS
+	ChangeLog
+	docs/developers
+	docs/scim.cfg
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# bug #83625
+	filter-flags -fvisibility-inlines-hidden -fvisibility=hidden
+	econf $(use_with doc doxygen) \
+		--enable-ld-version-script \
+		$(usex gtk3 --with-gtk-version={3,2}) \
+		--disable-qt3-immodule \
+		$(use_enable qt4 qt4-immodule) \
+		--with-qt4-moc="$(qt4_get_bindir)/moc"
+}
+
+src_compile() {
+	default
+	use doc && emake docs
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${S}/docs/html/" )
+	default
+
+	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-${PN}" > "${T}/${PN}.conf" || die
+	insinto /etc/X11/xinit/xinput.d
+	doins "${T}/${PN}.conf"
+}
+
+pkg_postinst() {
+	elog
+	elog "To use SCIM with both GTK 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 "export GTK_IM_MODULE=\"scim\""
+	elog "export QT_IM_MODULE=\"scim\""
+	elog
+	elog "where 'your_language' can be zh_CN, zh_TW, ja_JP.eucJP or any other"
+	elog "UTF-8 locale such as en_US.UTF-8 or ja_JP.UTF-8"
+	elog
+	elog "To use Chinese input methods:"
+	elog "	# emerge app-i18n/scim-tables app-i18n/scim-pinyin"
+	elog "To use Korean input methods:"
+	elog "	# emerge app-i18n/scim-hangul"
+	elog "To use Japanese input methods:"
+	elog "	# emerge app-i18n/scim-anthy"
+	elog "To use various input methods (more than 30 languages):"
+	elog "	# emerge app-i18n/scim-m17n"
+	elog
+	elog "Please modify ${EPREFIX}/etc/scim/global and add your UTF-8 locale to"
+	elog "/SupportedUnicodeLocales entry."
+	elog
+	ewarn
+	ewarn "If you upgraded from scim-1.2.x or scim-1.0.x, you should remerge all SCIM modules."
+	ewarn
+
+	gnome2_query_immodules_gtk2
+}
+
+pkg_postrm() {
+	gnome2_query_immodules_gtk2
+}
diff --git a/app-i18n/skk-jisyo-201605 b/app-i18n/skk-jisyo-201605
deleted file mode 100644
index c086af0021e3..000000000000
--- a/app-i18n/skk-jisyo-201605
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=virtual/awk cdb? ( || ( dev-db/tinycdb dev-db/cdb ) )
-DESCRIPTION=Jisyo (dictionary) files for the SKK Japanese-input software
-EAPI=6
-HOMEPAGE=http://openlab.ring.gr.jp/skk/dic.html
-IUSE=cdb
-KEYWORDS=amd64 arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=GPL-2 freedist public-domain
-SLOT=0
-SRC_URI=mirror://gentoo/skk-jisyo-201605.tar.xz https://dev.gentoo.org/~hattya/distfiles/skk-jisyo-201605.tar.xz
-_md5_=9e47687315760aff02feef860e25c8a7
diff --git a/app-i18n/skk-jisyo-201805 b/app-i18n/skk-jisyo-201805
deleted file mode 100644
index 5ac1371bf58e..000000000000
--- a/app-i18n/skk-jisyo-201805
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=virtual/awk cdb? ( || ( dev-db/tinycdb dev-db/cdb ) )
-DESCRIPTION=Jisyo (dictionary) files for the SKK Japanese-input software
-EAPI=6
-HOMEPAGE=http://openlab.ring.gr.jp/skk/dic.html
-IUSE=cdb
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=GPL-2 freedist public-domain
-SLOT=0
-SRC_URI=mirror://gentoo/skk-jisyo-201805.tar.xz https://dev.gentoo.org/~hattya/distfiles/skk-jisyo-201805.tar.xz
-_md5_=6ef8d02cffbb5e431fb2e8a6db851e7e
diff --git a/app-i18n/skk-jisyo-999999 b/app-i18n/skk-jisyo-999999
deleted file mode 100644
index 42f5c9358a43..000000000000
--- a/app-i18n/skk-jisyo-999999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=|| ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 ) virtual/rubygems app-i18n/skktools virtual/awk cdb? ( || ( dev-db/tinycdb dev-db/cdb ) ) dev-vcs/cvs
-DESCRIPTION=Jisyo (dictionary) files for the SKK Japanese-input software
-EAPI=6
-HOMEPAGE=http://openlab.ring.gr.jp/skk/dic.html
-IUSE=cdb ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
-LICENSE=GPL-2 freedist public-domain
-SLOT=0
-_eclasses_=cvs	c57fc648b829862b38ad2a8b8c1c02e8	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=673836aad561e0469bf45402c9b2d14d
diff --git a/app-i18n/skk-jisyo/Manifest b/app-i18n/skk-jisyo/Manifest
new file mode 100644
index 000000000000..b9fc41ae432d
--- /dev/null
+++ b/app-i18n/skk-jisyo/Manifest
@@ -0,0 +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 1713 BLAKE2B aad56ab0ade442ae3da013fb5e6d1171be36a04c2b2c87ffb18a849193dc4e6a8738246a937e27b60369dd11aefdc8388f29e6284db9a4d96b3567f0d2e73c7d SHA512 c80ad23b025afcbc8af327cfa2c26872097057f41a9cc9e74152e190afd81ae11247782c97468207b080b3f76aa73fc76c8e01c3cf673416bcd8ef9bdd0222e7
+MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/skk-jisyo/metadata.xml b/app-i18n/skk-jisyo/metadata.xml
new file mode 100644
index 000000000000..e1a49f498885
--- /dev/null
+++ b/app-i18n/skk-jisyo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-i18n/skk-jisyo/skk-jisyo-201605.ebuild b/app-i18n/skk-jisyo/skk-jisyo-201605.ebuild
new file mode 100644
index 000000000000..098f596c803f
--- /dev/null
+++ b/app-i18n/skk-jisyo/skk-jisyo-201605.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+MY_PN=${PN^^}
+
+DESCRIPTION="Jisyo (dictionary) files for the SKK Japanese-input software"
+HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~hattya/distfiles/${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"
+IUSE="cdb"
+
+DEPEND="virtual/awk
+	cdb? (
+		|| (
+			dev-db/tinycdb
+			dev-db/cdb
+		)
+	)"
+RDEPEND=""
+
+DOCS=( ChangeLog{,.{1..3}} READMEs/committers.txt edict_doc.txt zipcode/README.ja )
+
+src_prepare() {
+	rm -f ${MY_PN}.{wrong*,noregist,not_wrong,hukugougo,notes,requested,pubdic+}
+
+	default
+}
+
+cdb_make() {
+	cdbmake "${1}" "${1}.tmp"
+}
+
+tinycdb_make() {
+	cdb -c "${1}"
+}
+
+src_compile() {
+	if use cdb; then
+		local cdbmake=cdb_make f
+		if has_version dev-db/tinycdb; then
+			cdbmake=tinycdb_make
+		fi
+		for f in {,zipcode/}${MY_PN}.*; do
+			LC_ALL=C awk '
+				/^[^;]/ {
+					s = substr($0, index($0, " ") + 1)
+					print "+" length($1) "," length(s) ":" $1 "->" s
+				}
+				END {
+					print ""
+				}
+			' ${f} | ${cdbmake} ${f}.cdb || die
+		done
+	fi
+}
+
+src_install() {
+	insinto /usr/share/skk
+	doins {,zipcode/}${MY_PN}.*
+}
diff --git a/app-i18n/skk-jisyo/skk-jisyo-201805.ebuild b/app-i18n/skk-jisyo/skk-jisyo-201805.ebuild
new file mode 100644
index 000000000000..097ef29ed4cb
--- /dev/null
+++ b/app-i18n/skk-jisyo/skk-jisyo-201805.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+MY_PN=${PN^^}
+
+DESCRIPTION="Jisyo (dictionary) files for the SKK Japanese-input software"
+HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~hattya/distfiles/${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"
+IUSE="cdb"
+
+DEPEND="virtual/awk
+	cdb? (
+		|| (
+			dev-db/tinycdb
+			dev-db/cdb
+		)
+	)"
+RDEPEND=""
+
+DOCS=( ChangeLog{,.{1..3}} READMEs/committers.txt edict_doc.txt zipcode/README.ja )
+
+src_prepare() {
+	rm -f ${MY_PN}.{wrong*,noregist,not_wrong,hukugougo,notes,requested,pubdic+}
+
+	default
+}
+
+cdb_make() {
+	cdbmake "${1}" "${1}.tmp"
+}
+
+tinycdb_make() {
+	cdb -c "${1}"
+}
+
+src_compile() {
+	if use cdb; then
+		local cdbmake=cdb_make f
+		if has_version dev-db/tinycdb; then
+			cdbmake=tinycdb_make
+		fi
+		for f in {,zipcode/}${MY_PN}.*; do
+			LC_ALL=C awk '
+				/^[^;]/ {
+					s = substr($0, index($0, " ") + 1)
+					print "+" length($1) "," length(s) ":" $1 "->" s
+				}
+				END {
+					print ""
+				}
+			' ${f} | ${cdbmake} ${f}.cdb || die
+		done
+	fi
+}
+
+src_install() {
+	insinto /usr/share/skk
+	doins {,zipcode/}${MY_PN}.*
+}
diff --git a/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild b/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
new file mode 100644
index 000000000000..a8d31cb7d6ca
--- /dev/null
+++ b/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+inherit cvs ruby-single
+
+MY_PN=${PN^^}
+
+DESCRIPTION="Jisyo (dictionary) files for the SKK Japanese-input software"
+HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html"
+ECVS_SERVER="openlab.jp:/circus/cvsroot"
+ECVS_MODULE="skk/dic"
+ECVS_USER="guest"
+ECVS_PASS="guest"
+
+LICENSE="GPL-2 freedist public-domain"
+SLOT="0"
+KEYWORDS=""
+IUSE="cdb ${USE_RUBY//ruby/ruby_targets_ruby}"
+
+DEPEND="${RUBY_DEPS}
+	app-i18n/skktools
+	virtual/awk
+	cdb? (
+		|| (
+			dev-db/tinycdb
+			dev-db/cdb
+		)
+	)"
+RDEPEND=""
+S="${WORKDIR}/${ECVS_MODULE}"
+
+DOCS=( ChangeLog{,.{1..3}} READMEs/committers.txt edict_doc.txt zipcode/README.ja )
+
+SKKTOOLS_DIR="${EPREFIX}/usr/share/skktools/convert2skk"
+
+src_prepare() {
+	rm -f ${MY_PN}.{wrong*,noregist,not_wrong,hukugougo,notes,requested,pubdic+}
+
+	default
+}
+
+cdb_make() {
+	cdbmake "${1}" "${1}.tmp"
+}
+
+tinycdb_make() {
+	cdb -c "${1}"
+}
+
+src_compile() {
+	local ctdic="${MY_PN}.china_taiwan" ruby
+	mv ${ctdic}{.header,}
+	for ruby in ${RUBY_TARGETS_PREFERENCE}; do
+		if use ruby_targets_${ruby}; then
+			${ruby} ${SKKTOOLS_DIR}/ctdicconv.rb csv/${ctdic##*.}.csv | skkdic-expr2 >> ${ctdic}
+			break
+		fi
+	done
+
+	if use cdb; then
+		local cdbmake=cdb_make f
+		if has_version dev-db/tinycdb; then
+			cdbmake=tinycdb_make
+		fi
+		for f in {,zipcode/}${MY_PN}.*; do
+			LC_ALL=C awk '
+				/^[^;]/ {
+					s = substr($0, index($0, " ") + 1)
+					print "+" length($1) "," length(s) ":" $1 "->" s
+				}
+				END {
+					print ""
+				}
+			' ${f} | ${cdbmake} ${f}.cdb || die
+		done
+	fi
+}
+
+src_install() {
+	insinto /usr/share/skk
+	doins {,zipcode/}${MY_PN}.*
+}
diff --git a/app-i18n/skkfep-0.87-r1 b/app-i18n/skkfep-0.87-r1
deleted file mode 100644
index 7319f3dd403f..000000000000
--- a/app-i18n/skkfep-0.87-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-apps/sed sys-libs/ncurses:= virtual/awk
-DESCRIPTION=A SKK-like Japanese input method for console
-EAPI=6
-HOMEPAGE=http://aitoweb.world.coocan.jp/soft.html
-KEYWORDS=~amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:= app-i18n/skk-jisyo
-SLOT=0
-SRC_URI=http://aitoweb.world.coocan.jp/skkfep/skkfep-0.87.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=f430e7818983dffee7af3a01fd200fba
diff --git a/app-i18n/skkfep/Manifest b/app-i18n/skkfep/Manifest
new file mode 100644
index 000000000000..155fb50fd51d
--- /dev/null
+++ b/app-i18n/skkfep/Manifest
@@ -0,0 +1,6 @@
+AUX skkfep-annotation.patch 540 BLAKE2B af0332372b17175124477c494a2f09d0bb688a635d4cf137abf026eb2229466b1424ffe9a0422aafcaeefa02cf944253f4de2ebcf910916bfd51813f9e25aa75 SHA512 a92f0d90af2ac7c9a6b2349b60401aa2cc45a6b9a997c63cb8fc9fbd5355281db9b630e98db08205b9d944a603152661928bca02cd0e4d75aa3de32b8e7ff55a
+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
+MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/skkfep/files/skkfep-annotation.patch b/app-i18n/skkfep/files/skkfep-annotation.patch
new file mode 100644
index 000000000000..8145c2b069e0
--- /dev/null
+++ b/app-i18n/skkfep/files/skkfep-annotation.patch
@@ -0,0 +1,29 @@
+--- a/kkconv.c
++++ b/kkconv.c
+@@ -645,6 +645,7 @@
+ char c;
+ {
+ 	int l;
++	char *p;
+ 	DicList dlist;
+ 
+ 	kanjiSelectionEffect(0);
+@@ -653,7 +654,17 @@
+ 		if (OkuriInput)
+ 			l += strlen(OkuriBuf);
+ 		csrLeft(l);
+-		writeShells(CurrentCand->candword);
++		p= strrchr(CurrentCand->candword,';');
++		if (p != NULL) {
++			erase(l);
++			csrLeft(l);
++			l -= strlen(p);
++			*p = '\0';
++			writeShells(CurrentCand->candword);
++			*p = ';';
++		} else {
++			writeShells(CurrentCand->candword);
++		}
+ 		if (OkuriInput) {
+ 			writeShells(OkuriBuf);
+ 		}
diff --git a/app-i18n/skkfep/files/skkfep-gentoo.patch b/app-i18n/skkfep/files/skkfep-gentoo.patch
new file mode 100644
index 000000000000..2afe3537361e
--- /dev/null
+++ b/app-i18n/skkfep/files/skkfep-gentoo.patch
@@ -0,0 +1,75 @@
+--- a/Makefile
++++ b/Makefile
+@@ -2,16 +2,16 @@
+ # Makefile for skkfep
+ #
+ all: genMakefile
+-	make -f genMakefile all
++	$(MAKE) -f genMakefile all
+ 
+ skkfep: genMakefile
+-	make -f genMakefile skkfep
++	$(MAKE) -f genMakefile skkfep
+ 
+ simpledic: genMakefile
+-	make -f genMakefile simpledic
++	$(MAKE) -f genMakefile simpledic
+ 
+ clean: genMakefile
+-	make -f genMakefile clean
++	$(MAKE) -f genMakefile clean
+ 	rm -f genMakefile
+ 
+ genMakefile: protoMakefile config.h
+--- a/config.h
++++ b/config.h
+@@ -14,7 +14,7 @@
+ #define DEFAULT_KANAKEY "^j"
+ 
+ /* By Y. Kaneko */
+-/*#define KUTOUTEN        /* "."->maru, ","->ten */
++#define KUTOUTEN        /* "."->maru, ","->ten */
+ 
+ #define KANJIBS			/* do/don't shuft-out BS code in JIS mode */
+ #define KANJIBS_DEFAULT	0	/* 0 -> shift out / 1 -> don't shift out  */
+@@ -28,4 +28,4 @@
+ 
+ #define NATIVECODE	euc	/* EUC Kanji code */
+ 
+-#define SKK_SERVER_HOST	"ei5nazha"	/* SKK server host */
++#define SKK_SERVER_HOST	"localhost"	/* SKK server host */
+--- a/configs/linux.h
++++ b/configs/linux.h
+@@ -10,3 +10,12 @@
+ #define NO_VFORK
+ 
+ #define HAVE_SETREUID
++#define HAVE_BSD_OPENPTY
++
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
++
++#if makefile_parameter
++SYSLIBS=-lutil
++#endif
+--- a/protoMakefile
++++ b/protoMakefile
+@@ -1,5 +1,5 @@
+ CFLAGS=$(SYSINCLUDE) $(SYSDEFINE) $(DEFINE) $(OPTIMIZE)
+-LIBS  =$(SYSLIBS) $(EXTRALIBS) -ltermcap
++LIBS  =$(SYSLIBS) $(EXTRALIBS) $(LDFLAGS) -lncurses
+ 
+ OBJS=fep.o connsh.o readwrite.o terms.o stty.o keybind.o romkan.o etc.o\
+ 	kkconv.o keymap.o version.o
+--- a/stty.c
++++ b/stty.c
+@@ -306,7 +306,7 @@
+ {
+ 	int cpid;
+ /* #ifdef _AIX */
+-#if defined(_AIX) || defined(NECEWS) || defined(SOLARIS2)
++#if defined(_AIX) || defined(NECEWS) || defined(SOLARIS2) || defined(LINUX)
+ 	int statusp;
+ 	reset_tty_without_close();
+ 	cpid = wait(&statusp);
diff --git a/app-i18n/skkfep/files/skkfep-system-dic.patch b/app-i18n/skkfep/files/skkfep-system-dic.patch
new file mode 100644
index 000000000000..ba57a2a41f0b
--- /dev/null
+++ b/app-i18n/skkfep/files/skkfep-system-dic.patch
@@ -0,0 +1,13 @@
+--- a/kkconv.c
++++ b/kkconv.c
+@@ -660,7 +660,9 @@
+ 		flushOut(l);
+ #ifdef USE_SERVER
+ 		if (!CandFromServer) {
+-			selectCand(FirstCandEntry,CurrentCand);
++			if (FirstCandEntry != NULL) {
++				selectCand(FirstCandEntry,CurrentCand);
++			}
+ 		}
+ 		else if (NetLearnMode != LearnOff) {
+ 			if (CurrentCand->dicitem == NULL) {
diff --git a/app-i18n/skkfep/metadata.xml b/app-i18n/skkfep/metadata.xml
new file mode 100644
index 000000000000..e1a49f498885
--- /dev/null
+++ b/app-i18n/skkfep/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-i18n/skkfep/skkfep-0.87-r1.ebuild b/app-i18n/skkfep/skkfep-0.87-r1.ebuild
new file mode 100644
index 000000000000..a74c53e6af37
--- /dev/null
+++ b/app-i18n/skkfep/skkfep-0.87-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+DESCRIPTION="A SKK-like Japanese input method for console"
+HOMEPAGE="http://aitoweb.world.coocan.jp/soft.html"
+SRC_URI="http://aitoweb.world.coocan.jp/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
+
+DEPEND="sys-apps/sed
+	sys-libs/ncurses:=
+	virtual/awk"
+RDEPEND="sys-libs/ncurses:=
+	app-i18n/skk-jisyo"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-system-dic.patch
+	"${FILESDIR}"/${PN}-annotation.patch
+)
+DOCS=( README HISTORY TODO )
+
+src_prepare() {
+	sed -i "/SYSTEM_DIC_NAME/a#define SYSTEM_DIC_NAME \"${EPREFIX}/usr/share/skk/SKK-JISYO.L\"" config.h
+
+	default
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		OPTIMIZE="${CFLAGS}"
+}
+
+src_install() {
+	dobin skkfep escmode
+	doman skkfep.1
+	einstalldocs
+}
diff --git a/app-i18n/skkserv-9.6-r3 b/app-i18n/skkserv-9.6-r3
deleted file mode 100644
index bd85218425ea..000000000000
--- a/app-i18n/skkserv-9.6-r3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-i18n/skk-jisyo
-DESCRIPTION=Dictionary server for the SKK Japanese-input software
-EAPI=6
-HOMEPAGE=http://openlab.ring.gr.jp/skk/
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://openlab.ring.gr.jp/skk/maintrunk/museum/skk9.6mu.tar.gz
-_md5_=f5b25020ffded539b3a63fa80ff47992
diff --git a/app-i18n/skkserv/Manifest b/app-i18n/skkserv/Manifest
new file mode 100644
index 000000000000..d2a7b6015fe0
--- /dev/null
+++ b/app-i18n/skkserv/Manifest
@@ -0,0 +1,7 @@
+AUX skkserv-headers.patch 401 BLAKE2B 476ceb08bf4870928f4d7123093288a1d2ff45625351da747b21aca0aae61197b0c7b781e49e6d0635c6c866576465c8e756200ca5c6f3b17a8720f14b2cec5c SHA512 cdddc6cab2f5735441627b5238e8fdbb0e65e17f6f8d62b743669f4fc9cd9f514417f7218095f1ffbf52dc78ef0c05fcdbe484bb49460bc00f4ae3e5a6cb6104
+AUX skkserv-segfault.patch 435 BLAKE2B dd980871b53a711719f41573cca1a19fa9c22b13a42566f888333ee5481be0af325d74028964a5e7ad53608bfbf915be0576bb2714b309200ec2de7b233f5e6f SHA512 4bf7b18a73fbba7e4f2c3bb05bc4db42a637d385cd5e199ea4095007d69eba2171c2bf32224d49df595c08815621968a564c0306b854f2a4bf84a17dcb452cad
+AUX skkserv-suffix.patch 331 BLAKE2B 5ed7c11c36acf38612e4b0a3326501e8075bb13ea4029c5000608c17c3ad8f166f91f323a8ce7f7e932ea5fe818ee7f00579f953550cb5b09b779c9d1afb27ae SHA512 57529bcffd3be4574f73b70f65479e0b9783c62d25f8835e499abf8981e2367a7b7d04333925382b958738bdf7610761953b49545b7b17e00ec6eb27540741e3
+AUX skkserv.initd 383 BLAKE2B 52fc323d4ac037fcd23c87c381bf283c64be2502941ab0b5687ea8bf88f612cfcf38ab5edf06a175fe038ac3264da3046b628347c2c7dd977fefcecbbee13c6d SHA512 db3cebf4157e5b680101082cc4d04252a6932660b26aec1366c3fe62c4abc59e4f9f8d395e4664d2e9b44f5f40e8bc6e2c49d0c688685d2b887a7a285047a05e
+DIST skk9.6mu.tar.gz 744381 BLAKE2B e631373e632dc55c07a8fbb608869bd868fcad55bc53e2b8fa26ab568afd5f20c449935126fe4de5a78a5169fba0042d670efea28a5c5cd3da124e07d4335605 SHA512 971982ce51142d92b62497da209fb69a8a1c028307f62ec6e81ea45894b597d6bb17b8966032a508531520868a0e3d89e515540d3f8030fe049a7750157b7a33
+EBUILD skkserv-9.6-r3.ebuild 704 BLAKE2B d19c0254b0dc737f6a340acb8b2b55f909fc4d5d5769e4bd08b1841686497ffe63389cb611b4c326f750b0a7fa0218560de8dfff3ead5590bae5679d1fba6d67 SHA512 1ec079d158c709b700026f7cadf1b746cc8b16e92249ac2ee94a82f8265da42968c308fa4eeaa483f4c0d94f7715d1447eb9306048cd48391aff81053513de72
+MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/skkserv/files/skkserv-headers.patch b/app-i18n/skkserv/files/skkserv-headers.patch
new file mode 100644
index 000000000000..923f49948e8b
--- /dev/null
+++ b/app-i18n/skkserv/files/skkserv-headers.patch
@@ -0,0 +1,19 @@
+--- a/skkserv/skkserv.h
++++ b/skkserv/skkserv.h
+@@ -37,6 +37,8 @@
+ /* Necessary for SunOS 3.x and maybe other old systems */
+ 
+ #include	<stdio.h>
++#include	<stdlib.h>
++#include	<string.h>
+ 
+ #include	<sys/types.h>
+ #ifdef HAVE_SYS_IOCTL_H
+@@ -44,6 +46,7 @@
+ #endif
+ #include	<sys/socket.h>
+ #include	<netinet/in.h>
++#include	<arpa/inet.h>
+ #include	<netdb.h>
+ #include	<signal.h>
+ #include	<errno.h>
diff --git a/app-i18n/skkserv/files/skkserv-segfault.patch b/app-i18n/skkserv/files/skkserv-segfault.patch
new file mode 100644
index 000000000000..4c35a44d975a
--- /dev/null
+++ b/app-i18n/skkserv/files/skkserv-segfault.patch
@@ -0,0 +1,15 @@
+--- a/skkserv/skkserv.c
++++ b/skkserv/skkserv.c
+@@ -723,7 +723,11 @@
+     fprintf(errout, "%s:cannot get hostname, or too long hostname\n", pgmnm);
+     exit(1);
+   }
+-  hentry = gethostbyname(hname);
++  if ((hentry = gethostbyname(hname)) == NULL
++       && (hentry = gethostbyname("localhost")) == NULL) {
++    perror("gethostbyname");
++    exit(1);
++  }
+ #ifdef NO_ADDR_LIST
+   strcat(hname, ":");
+   strcat(hname, hentry->h_addr);
diff --git a/app-i18n/skkserv/files/skkserv-suffix.patch b/app-i18n/skkserv/files/skkserv-suffix.patch
new file mode 100644
index 000000000000..0e1f862fd148
--- /dev/null
+++ b/app-i18n/skkserv/files/skkserv-suffix.patch
@@ -0,0 +1,13 @@
+--- a/skkserv/skkserv.c
++++ a/skkserv/skkserv.c
+@@ -382,6 +382,10 @@
+   code = KANA_END;
+ 
+   while ((c = fgetc(jisho)) != EOF) {
++    if (c == '>') {
++      fgets(buf, BUFSIZE, jisho);
++      continue;
++    }
+     target = ((c & 0xff)<< 8) | (fgetc(jisho) & 0xff);
+     if (target == STRMARK) {
+       fgets(buf, BUFSIZE, jisho);
diff --git a/app-i18n/skkserv/files/skkserv.initd b/app-i18n/skkserv/files/skkserv.initd
new file mode 100644
index 000000000000..0721205b355a
--- /dev/null
+++ b/app-i18n/skkserv/files/skkserv.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+description_reload="Reload the SKK-JISYO.L"
+
+command="/usr/sbin/${RC_SVCNAME}"
+
+depend() {
+	need net
+}
+
+reload() {
+	ebegin "Reloading ${name:-${RC_SVCNAME}}"
+	start-stop-daemon --signal INT --name "${command}"
+	eend ${?}
+}
diff --git a/app-i18n/skkserv/metadata.xml b/app-i18n/skkserv/metadata.xml
new file mode 100644
index 000000000000..e1a49f498885
--- /dev/null
+++ b/app-i18n/skkserv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-i18n/skkserv/skkserv-9.6-r3.ebuild b/app-i18n/skkserv/skkserv-9.6-r3.ebuild
new file mode 100644
index 000000000000..b5710e975fdd
--- /dev/null
+++ b/app-i18n/skkserv/skkserv-9.6-r3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+MY_P="skk${PV}mu"
+
+DESCRIPTION="Dictionary server for the SKK Japanese-input software"
+HOMEPAGE="http://openlab.ring.gr.jp/skk/"
+SRC_URI="http://openlab.ring.gr.jp/skk/maintrunk/museum/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="app-i18n/skk-jisyo"
+S="${WORKDIR}/skk-${PV}mu"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-segfault.patch
+	"${FILESDIR}"/${PN}-headers.patch
+	"${FILESDIR}"/${PN}-suffix.patch
+)
+
+src_compile() {
+	emake -C ${PN}
+}
+
+src_install() {
+	dosbin ${PN}/${PN}
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+}
diff --git a/app-i18n/skktools-1.3.3_p20150901 b/app-i18n/skktools-1.3.3_p20150901
deleted file mode 100644
index 7a3159b41c29..000000000000
--- a/app-i18n/skktools-1.3.3_p20150901
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm unpack
-DEPEND=dev-libs/glib:2 sys-libs/gdbm emacs? ( virtual/emacs ) virtual/pkgconfig
-DESCRIPTION=SKK utilities to manage dictionaries
-EAPI=6
-HOMEPAGE=http://openlab.jp/skk/
-IUSE=emacs
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 sys-libs/gdbm emacs? ( virtual/emacs )
-SLOT=0
-SRC_URI=https://github.com/skk-dev/skktools/archive/28e36bac97dc8ed089bac409bef15f1831b6adde.tar.gz -> skktools-1.3.3_p20150901.tar.gz
-_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=703bc8c6db7e43abe774efa9997d4da8
diff --git a/app-i18n/skktools-1.3.3_p20170305 b/app-i18n/skktools-1.3.3_p20170305
deleted file mode 100644
index cde19045dafa..000000000000
--- a/app-i18n/skktools-1.3.3_p20170305
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm unpack
-DEPEND=dev-libs/glib:2 sys-libs/gdbm emacs? ( virtual/emacs ) virtual/pkgconfig
-DESCRIPTION=SKK utilities to manage dictionaries
-EAPI=6
-HOMEPAGE=http://openlab.jp/skk/
-IUSE=emacs
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 sys-libs/gdbm emacs? ( virtual/emacs )
-SLOT=0
-SRC_URI=https://github.com/skk-dev/skktools/archive/e14d98e734d2fdff611385c7df65826e94d929db.tar.gz -> skktools-1.3.3_p20170305.tar.gz
-_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=7a8f3122d9ac37aa47baacd1e708c7f4
diff --git a/app-i18n/skktools/Manifest b/app-i18n/skktools/Manifest
new file mode 100644
index 000000000000..ed62008efd9a
--- /dev/null
+++ b/app-i18n/skktools/Manifest
@@ -0,0 +1,6 @@
+AUX 50skktools-gentoo.el 91 BLAKE2B 290cc5542c31bd9c3cd0095162928c80548db2800fc0a6293a8d6cc65caf3f567be725c17a3592f66554a90bd8f86f13641cf3c51dbf6331fc5d5ccce55e9f55 SHA512 f4376f1146586604bc9ef1ea080e5df79f721a245b89ae76dfa2aee38876e38edb804f9201d9eb751a879d017ed929fa18d1b38b307879fa607d086a404d0612
+DIST skktools-1.3.3_p20150901.tar.gz 483005 BLAKE2B 6db22c59276aee007ed4a457b8b66750d792596855ddfdd98310b14741cd20fe8594672626022dafc17c31d06f3292026e6bba35ea1fa001f4a224e7439eb082 SHA512 dbb15068239158c31a706da2fd5afcb8514d088854bdd4f0d05bb8b9e10947cbdce584ff3698571d601e3b357a1ba11b4608f0457615062016862ac89fb91b83
+DIST skktools-1.3.3_p20170305.tar.gz 483715 BLAKE2B 0de2cb906e8433f66e706f0aa4dd8c4900343b48bfb9bb24aee4927f583650f54132c2a3bb607c17cefb0f0e686bcf8a0f4bd6ac07b6a9a71c0bd870eda587a7 SHA512 f6e9041fecf8c28a84c3996ca120371528c034eeca3695cb224b4cf225e8dab9e69969d7fb955112cd1e9c1e80c2ba8e2aef4f0eb81f55374dd626402482c235
+EBUILD skktools-1.3.3_p20150901.ebuild 1197 BLAKE2B 1e0c6fd56c3b9eaaa51bafc14d53e8ff461cafcfc6aedf2229cffadbba6c8c64586733e052867dba0f3eb2e1ba8e70876de48d917ef8ea4f6d71b486a9befb3f SHA512 d4488f9affe3f2e4fe0125b486db5700ab22c490c25ebab9618720a1f78ee1b72c05e7e6f2394add4c3b61453f92b79bd4cb44740f43363c299e45bf88420c08
+EBUILD skktools-1.3.3_p20170305.ebuild 1199 BLAKE2B 2050af6201a54ba5e96e3b5b153f0bd624666ef3c8e71df996cbf636c0a8793dc6bdeac0ca171c2a2bccbdcafdd52195ed72d72dfc212131094ec45bc6c192cd SHA512 51410c23d7efb2f2cef0d71f6844e6fc28f07eaec4c45441994bdbd0268f1d7ffe48486ed5d7e365bb772a1a93c800b7edefeea71dd91b3f2828245e5ba0f15d
+MISC metadata.xml 325 BLAKE2B 2d57ed82902d3daf56c670eb02e451104a56374c00f64ffcabc34b85b1bd3666c982624424f7a3e1da5f79a40c336ac16f7b1d62ddf81f2465b790fa3cdfba8f SHA512 aff23e906c8b6f0dbdc293aa4138b51497d32760f0c77307e11d9f7797bffd0d1363e0d8dd5639f8b9838838737afd05dab5d6e0a4f9c8596effdfef733af75b
diff --git a/app-i18n/skktools/files/50skktools-gentoo.el b/app-i18n/skktools/files/50skktools-gentoo.el
new file mode 100644
index 000000000000..38b3fef99ca9
--- /dev/null
+++ b/app-i18n/skktools/files/50skktools-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'skk-convert-jisyo-to-xml "skk-xml" nil t)
diff --git a/app-i18n/skktools/metadata.xml b/app-i18n/skktools/metadata.xml
new file mode 100644
index 000000000000..32b1de9c163c
--- /dev/null
+++ b/app-i18n/skktools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">skk-dev/skktools</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/skktools/skktools-1.3.3_p20150901.ebuild b/app-i18n/skktools/skktools-1.3.3_p20150901.ebuild
new file mode 100644
index 000000000000..3ed4d6a6582c
--- /dev/null
+++ b/app-i18n/skktools/skktools-1.3.3_p20150901.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit elisp-common vcs-snapshot
+
+EGIT_COMMIT="28e36bac97dc8ed089bac409bef15f1831b6adde"
+
+DESCRIPTION="SKK utilities to manage dictionaries"
+HOMEPAGE="http://openlab.jp/skk/"
+SRC_URI="https://github.com/skk-dev/skktools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="emacs"
+
+RDEPEND="dev-libs/glib:2
+	sys-libs/gdbm
+	emacs? ( virtual/emacs )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_configure() {
+	econf --with-gdbm
+}
+
+src_compile() {
+	default
+
+	if use emacs; then
+		elisp-compile *.el
+	fi
+}
+
+src_install() {
+	default
+	dodoc READMEs/*
+
+	local d
+	for d in convert2skk filters; do
+		newdoc ${d}/README.md README.${d}
+		rm -f ${d}/README.md
+	done
+
+	insinto /usr/share/${PN}
+	doins *.awk *.scm
+	rm -rf convert2skk/obsolete
+	doins -r convert2skk filters
+
+	if use emacs; then
+		elisp-install ${PN} *.el{,c}
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/app-i18n/skktools/skktools-1.3.3_p20170305.ebuild b/app-i18n/skktools/skktools-1.3.3_p20170305.ebuild
new file mode 100644
index 000000000000..0e1c1f93783d
--- /dev/null
+++ b/app-i18n/skktools/skktools-1.3.3_p20170305.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit elisp-common vcs-snapshot
+
+EGIT_COMMIT="e14d98e734d2fdff611385c7df65826e94d929db"
+
+DESCRIPTION="SKK utilities to manage dictionaries"
+HOMEPAGE="http://openlab.jp/skk/"
+SRC_URI="https://github.com/skk-dev/skktools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="emacs"
+
+RDEPEND="dev-libs/glib:2
+	sys-libs/gdbm
+	emacs? ( virtual/emacs )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_configure() {
+	econf --with-gdbm
+}
+
+src_compile() {
+	default
+
+	if use emacs; then
+		elisp-compile *.el
+	fi
+}
+
+src_install() {
+	default
+	dodoc READMEs/*
+
+	local d
+	for d in convert2skk filters; do
+		newdoc ${d}/README.md README.${d}
+		rm -f ${d}/README.md
+	done
+
+	insinto /usr/share/${PN}
+	doins *.awk *.scm
+	rm -rf convert2skk/obsolete
+	doins -r convert2skk filters
+
+	if use emacs; then
+		elisp-install ${PN} *.el{,c}
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/app-i18n/sunpinyin-2.0.3-r2 b/app-i18n/sunpinyin-2.0.3-r2
deleted file mode 100644
index 9c8e1009aa98..000000000000
--- a/app-i18n/sunpinyin-2.0.3-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=dev-db/sqlite:3 virtual/pkgconfig dev-util/scons[python_targets_python2_7]
-DESCRIPTION=SunPinyin is a SLM (Statistical Language Model) based IME
-EAPI=6
-HOMEPAGE=https://sunpinyin.googlecode.com
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1 CDDL
-RDEPEND=dev-db/sqlite:3
-SLOT=0
-SRC_URI=https://sunpinyin.googlecode.com/files/sunpinyin-2.0.3.tar.gz https://open-gram.googlecode.com/files/dict.utf8.tar.bz2 https://open-gram.googlecode.com/files/lm_sc.t3g.arpa.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=2bc2feae2591f1a3d75b15a6557db977
diff --git a/app-i18n/sunpinyin-2.0.4_pre20130108-r1 b/app-i18n/sunpinyin-2.0.4_pre20130108-r1
deleted file mode 100644
index ba3e19179587..000000000000
--- a/app-i18n/sunpinyin-2.0.4_pre20130108-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-db/sqlite:3 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/scons[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
-DESCRIPTION=A Statistical Language Model based Chinese input method library
-EAPI=5
-HOMEPAGE=https://github.com/sunpinyin/sunpinyin
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=LGPL-2.1 CDDL
-PDEPEND=app-i18n/sunpinyin-data
-RDEPEND=dev-db/sqlite:3
-SLOT=0/3
-SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/sunpinyin-2.0.4_pre20130108.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a7c3d933ec98bb16ed0f40a6ef77efa4
diff --git a/app-i18n/sunpinyin-data-20121025 b/app-i18n/sunpinyin-data-20121025
deleted file mode 100644
index a55aeee46758..000000000000
--- a/app-i18n/sunpinyin-data-20121025
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=app-i18n/sunpinyin-2.0.4_pre20130108
-DESCRIPTION=Data sets for Sunpinyin
-EAPI=5
-HOMEPAGE=https://open-gram.googlecode.com/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-i18n/sunpinyin-2.0.4_pre20130108
-SLOT=0
-SRC_URI=https://open-gram.googlecode.com/files/dict.utf8-20120830.tar.bz2 https://open-gram.googlecode.com/files/lm_sc.t3g.arpa-20121025.tar.bz2
-_md5_=336d71b67754c47137f5c68285c38ccd
diff --git a/app-i18n/sunpinyin-data-20130220 b/app-i18n/sunpinyin-data-20130220
deleted file mode 100644
index 169d896c0429..000000000000
--- a/app-i18n/sunpinyin-data-20130220
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=app-i18n/sunpinyin-2.0.4_pre20130108
-DESCRIPTION=Data sets for Sunpinyin
-EAPI=5
-HOMEPAGE=https://open-gram.googlecode.com/
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-i18n/sunpinyin-2.0.4_pre20130108
-SLOT=0
-SRC_URI=https://open-gram.googlecode.com/files/dict.utf8-20130220.tar.bz2 https://open-gram.googlecode.com/files/lm_sc.t3g.arpa-20121025.tar.bz2
-_md5_=131352b6881617936496c5ac38045a95
diff --git a/app-i18n/sunpinyin-data/Manifest b/app-i18n/sunpinyin-data/Manifest
new file mode 100644
index 000000000000..46562c393ffc
--- /dev/null
+++ b/app-i18n/sunpinyin-data/Manifest
@@ -0,0 +1,7 @@
+AUX SLM-inst.mk 1847 BLAKE2B aab982dc7c1f93db8c4ac9b77b793fbe4304ab70d62d3c18741e87c91dc6fd876e0f9a8f346b1e621f7ce11669eb335dcd9082894130f4d7b0c1c4c5812df588 SHA512 fcbc2e7f18d02dc7ae13ceb9926018d8e83ff955eacae69d664842a84cc4aac2c6f9070e1a33ca6b9b68b4d3ca3ef1ec2e8863f82a8eea1183e7b02d5b665470
+DIST dict.utf8-20120830.tar.bz2 652472 BLAKE2B bd31553027e25261e2d69a4f1a82d2c1f18b424f16f1b62a817151892b0d012be7cf1f2b7f7fbbfda98dbc40c21186eaccdca2453d139f0e50aaf3d793d64671 SHA512 4400bc2a54cbf828e1d34f8240d8915a29171d6def125fecf4aa13b442dc2442d9ea591e4451cf030d22d974fbdba09adde4112c08acae9ae023823311ae8535
+DIST dict.utf8-20130220.tar.bz2 652859 BLAKE2B 9e0cdefc0db519b0e12dd2cb2621ef500e0ed5a0ff9a0eea76d6f64eac1cdb455f2d3c8a806fe7aa8c50cbc369c0ef6d937fdf01fecbc349773b12375bb419f3 SHA512 d58ec106959a7713e452df2fe2fa5a5f66e82bd67eeeee8740cd3eeedf30af8d14a90dae224ed2931dffd85b0327c704927409bde0247452d79cf40c5bc7cff8
+DIST lm_sc.t3g.arpa-20121025.tar.bz2 36262281 BLAKE2B 55d8820228986f9a7b3d567ebca7bf37079e3d05f9b062814116702957e4447c5283ac9034b6a9171a9696df01398bb29ea55a2a1ded3a952e48f14a697d8698 SHA512 3159dd3700382cfa617ba025ce542660580f3057e0dd6bbb92947902495db08e4454c1d09d01a55c90653444513d125dd034e944b060a9d8e009c3633b106d97
+EBUILD sunpinyin-data-20121025.ebuild 910 BLAKE2B dbf1f2e6a9f4b3a8dc3497eaa3dc0f29f0d47c65231c5cab27ae896d4cd981acacdd5f03ba8765cb13cd05aa0e72b330205f97cc4f4aa11c9c2a042437666738 SHA512 6fcf7bc0d142f966c42c0ea54627d677649db74b1c93e6630ab708438cf22a29f33cd8d4f88fe154c6712d647880deaf5a5cac197ebea2376b810b36a9df8d7c
+EBUILD sunpinyin-data-20130220.ebuild 906 BLAKE2B 705fa18d72412168875820721be68a59f59ff63fca0759cb6fc8cc35c5ea263e44b862f8ec03a5f4c1810f5563a5f01831629ca156460c0daaf328c0c60c4a34 SHA512 8786ad78957d1e23896af0c68d83a1a1eab158b59a60a158be32a88942e453178e626fa74f0464b61f6dc504c5c9ff428c8b35f0b5a2a86f77671197da23b4b8
+MISC metadata.xml 323 BLAKE2B cb36295be070944db054e52bd199f502dd1136e35d27e7eb9a0caac66798393c12d19fa9b7a421c9e3561023474a01d0788da1a333b34f15fc576862272955ee SHA512 b91630bdda4510f930c9b114a77859e6350c16cfd41c8b585895d4f40a9d8d7ce4a02dd6f46be41ecc7ba6ad2ce6846b143d1745ac9e1385821e403419df9a39
diff --git a/app-i18n/sunpinyin-data/files/SLM-inst.mk b/app-i18n/sunpinyin-data/files/SLM-inst.mk
new file mode 100644
index 000000000000..9216a941ad1c
--- /dev/null
+++ b/app-i18n/sunpinyin-data/files/SLM-inst.mk
@@ -0,0 +1,62 @@
+#!/usr/bin/make -f
+# -*- mode: makefile; indent-tabs-mode: t -*- vim:noet:ts=4
+# Sample Makefile for lexicon generation and installation.
+
+# Little endian platforms: alpha amd64 arm hurd-i386 i386 ia64 mipsel sh3 sh4
+# Big endian platforms: hppa m68k mips powerpc ppc64 sparc s390
+ifndef ENDIANNESS
+	ENDIANNESS = le
+endif
+
+DICT_FILE = dict.utf8
+
+SLM_TARGET = lm_sc
+TSLM2_TEXT_FILE = ${SLM_TARGET}.t2g.arpa
+TSLM2_ORIG_FILE = ${SLM_TARGET}.t2g.orig
+TSLM2_DIST_FILE = ${SLM_TARGET}.t2g
+TSLM3_TEXT_FILE = ${SLM_TARGET}.t3g.arpa
+TSLM3_ORIG_FILE = ${SLM_TARGET}.t3g.orig
+TSLM3_DIST_FILE = ${SLM_TARGET}.t3g
+
+PYTRIE_FILE = pydict_sc.bin
+PYTRIE_LOG_FILE = pydict_sc.log
+
+SYSTEM_DATA_DIR = ${DESTDIR}/usr/share/sunpinyin
+
+all: slm3_dist
+install: slm3_install
+
+tslm2_orig: ${TSLM2_ORIG_FILE}
+${TSLM2_ORIG_FILE}: ${DICT_FILE} ${TSLM2_TEXT_FILE}
+	tslmpack ${TSLM2_TEXT_FILE} ${DICT_FILE} $@
+
+tslm2_dist: ${TSLM2_DIST_FILE}
+${TSLM2_DIST_FILE}: ${TSLM2_ORIG_FILE}
+	tslmendian -e ${ENDIANNESS} -i $^ -o $@
+
+lexicon2: ${DICT_FILE} ${TSLM2_ORIG_FILE}
+	genpyt -e ${ENDIANNESS} -i ${DICT_FILE} -s ${TSLM2_ORIG_FILE} \
+		-l ${PYTRIE_LOG_FILE} -o ${PYTRIE_FILE}
+
+tslm3_orig: ${TSLM3_ORIG_FILE}
+${TSLM3_ORIG_FILE}: ${DICT_FILE} ${TSLM3_TEXT_FILE}
+	tslmpack ${TSLM3_TEXT_FILE} ${DICT_FILE} $@
+
+tslm3_dist: ${TSLM3_DIST_FILE}
+${TSLM3_DIST_FILE}: ${TSLM3_ORIG_FILE}
+	tslmendian -e ${ENDIANNESS} -i $^ -o $@
+
+lexicon3: ${DICT_FILE} ${TSLM3_ORIG_FILE}
+	genpyt -e ${ENDIANNESS} -i ${DICT_FILE} -s ${TSLM3_ORIG_FILE} \
+		-l ${PYTRIE_LOG_FILE} -o ${PYTRIE_FILE}
+
+slm2_dist: ${TSLM2_DIST_FILE} lexicon2
+slm2_install: ${TSLM2_DIST_FILE} ${PYTRIE_FILE}
+	install -d ${SYSTEM_DATA_DIR}
+	install -Dm644 $^ ${SYSTEM_DATA_DIR}
+
+slm3_dist: ${TSLM3_DIST_FILE} lexicon3
+slm3_install: ${TSLM3_DIST_FILE} ${PYTRIE_FILE}
+	install -d ${SYSTEM_DATA_DIR}
+	install -Dm644 $^ ${SYSTEM_DATA_DIR}
+
diff --git a/app-i18n/sunpinyin-data/metadata.xml b/app-i18n/sunpinyin-data/metadata.xml
new file mode 100644
index 000000000000..11bbcd490ca1
--- /dev/null
+++ b/app-i18n/sunpinyin-data/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">sunpinyin</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20121025.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20121025.ebuild
new file mode 100644
index 000000000000..fa390bb7a465
--- /dev/null
+++ b/app-i18n/sunpinyin-data/sunpinyin-data-20121025.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DICT_VERSION="20120830"
+LM_VERSION="${PV}"
+
+DESCRIPTION="Data sets for Sunpinyin"
+HOMEPAGE="https://open-gram.googlecode.com/"
+SRC_URI="https://open-gram.googlecode.com/files/dict.utf8-${DICT_VERSION}.tar.bz2
+	https://open-gram.googlecode.com/files/lm_sc.t3g.arpa-${LM_VERSION}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=">=app-i18n/sunpinyin-2.0.4_pre20130108"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	default
+	mkdir "${S}" || die
+	mv "${WORKDIR}"/dict.utf8 "${S}" || die
+	mv "${WORKDIR}"/lm_sc.t3g.arpa "${S}" || die
+	cp "${FILESDIR}"/SLM-inst.mk "${S}"/Makefile || die
+}
+
+src_compile() {
+	# we don't have any big-endian architectures keyworded yet, so hardcode
+	emake ENDIANNESS=le
+}
+
+src_install() {
+	emake ENDIANNESS=le DESTDIR="${D}" install
+}
diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild
new file mode 100644
index 000000000000..9b450e30a2e9
--- /dev/null
+++ b/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DICT_VERSION="${PV}"
+LM_VERSION="20121025"
+
+DESCRIPTION="Data sets for Sunpinyin"
+HOMEPAGE="https://open-gram.googlecode.com/"
+SRC_URI="https://open-gram.googlecode.com/files/dict.utf8-${DICT_VERSION}.tar.bz2
+	https://open-gram.googlecode.com/files/lm_sc.t3g.arpa-${LM_VERSION}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+DEPEND=">=app-i18n/sunpinyin-2.0.4_pre20130108"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	default
+	mkdir "${S}" || die
+	mv "${WORKDIR}"/dict.utf8 "${S}" || die
+	mv "${WORKDIR}"/lm_sc.t3g.arpa "${S}" || die
+	cp "${FILESDIR}"/SLM-inst.mk "${S}"/Makefile || die
+}
+
+src_compile() {
+	# we don't have any big-endian architectures keyworded yet, so hardcode
+	emake ENDIANNESS=le
+}
+
+src_install() {
+	emake ENDIANNESS=le DESTDIR="${D}" install
+}
diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest
new file mode 100644
index 000000000000..aa88043cc401
--- /dev/null
+++ b/app-i18n/sunpinyin/Manifest
@@ -0,0 +1,11 @@
+AUX sunpinyin-2.0.3-force-switch.patch 1046 BLAKE2B 786ff56100b308cbcd0bc7bb4a16d7e5691e0dae5778639f9b3d04f4eae531b44164262256443b62e191f72a4aa85a039c08cc0608b97796f76e7ae0f074f45c SHA512 abae0d760ecb93c6317483f3b14ee21670f1a42799ffc15a5dcfcf7f0838f0809731953bf6377a52a9647ace8172025bff5049859ac55db989d9f61904fa38ae
+AUX sunpinyin-2.0.3-gcc-4.7.patch 1275 BLAKE2B 9dc9fbc1b63f59fcdd853a8c99e9bfbf021540672729991cab67ea67b82e9d530963b33a34ce378af7309d9b749e0a831b6d1cd0393f3a7c182ca29d9411b27c SHA512 48d7e5ab52395467f3b282b73bb3ca5b2cd27c76ac1b454c0e248a9cfb13d8d628fbdf93b82a57404109d288c46d70456bb4aaf4f2899e3dd6e047140cdfc7c0
+AUX sunpinyin-2.0.4-pod2man.patch 469 BLAKE2B 5fab9d9a4cdb88189dfe0b8146f42effa9a48df8ce98e510a85c2cd55b92260803fb2350d921fa2a7e2a49e61ffbe82d2873397426c29ace1a50ba5c1d2c25b5 SHA512 1cc36f21dd11c802365fd770e7eefb324a3200e6570d7b585179778c8385dc694b214ad1339ac266f0adfa9d1f1ebca87b7847544069e25cfb563b0cb5bd8172
+AUX sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch 1010 BLAKE2B 3d34ca402e1504880e1abea8e2afc5fd5e342762020c450300ce01301f60d2c8cc527fdecb420eadf682fc1e086fef15b085518618c3803195d3afe4fd147d98 SHA512 8aaba439c49fac48c9523471bdbbac52feb594f61da6e3ba3747e3e6a08498817f06a8af8bcaa35d6b25ce0d31af3faac24faa57e15e3cae446f37dac5a30337
+DIST dict.utf8.tar.bz2 1598995 BLAKE2B 4cb990b6bbb440218c6af695369bdccf97b820da9aa10d118043a7bda1c602e53d0c63c4a460db2c64530e69ac1d98619e1a2efa2113a292063b422fc1b3d32c SHA512 04ec55e4af4b58d29b1141a824b5c3de5dbaaab0133d88e477d9183db738fc63543b4004bf071e611c6ea0d4b4c161b73849a64ab75f4df5bb5116d7f52d8e34
+DIST lm_sc.t3g.arpa.tar.bz2 25098718 BLAKE2B a7cd87d4e786a7dfe854b33c5c70019075ec99b02fd6cb33f91f89babdd2b255b6d157fff30c22b5372e74908483b814cc9698fd84caa3e56c61e76a59dbea04 SHA512 1e5e577c92df2f230b6b5962298ef7c215f6069b53e8e2dd4c5ad3eb54f999fc239b0924b4ab031af59c3194da15d6317ea2860f158e805b5cf0126666eaad98
+DIST sunpinyin-2.0.3.tar.gz 169394 BLAKE2B d93472c0c208da2a7aab99b1d514fa01acf67e69bdddc2c0e15f40af7a2abaf8860f8e792c2bd286bd1ec3a24124b0284d28295115c8dff1051f5df3c2314bb7 SHA512 25f1fc4b8f550663861f2c7426832924676f83e1f201689fde51b04ca78704b46dbbf2b92736234d5e1a729ba1bb23bd1f3a0394f6b8b54cb0df57b9bb7ece1d
+DIST sunpinyin-2.0.4_pre20130108.tar.xz 964764 BLAKE2B 2c9d2e3fc02009ad10784c9408434c6806d1403026fb27629701650fe0e8a69c5580050846cf5c3b870215b8bfd68fe9c52d8bdaf83c41e523224463af9cf530 SHA512 7c1dd7db8b800e9d436746a560a16de2c6777576868f2e7e28f6dcb767b91ccd62b974f9d4ce6bd6ce80d30e1ee83887c3ee03c227e7e9fa59c01db4867465b2
+EBUILD sunpinyin-2.0.3-r2.ebuild 1608 BLAKE2B cd4e7cbbb893e1dc9867e9c0d88628a2264ec60759550409e6c8437224495124749b3efeeb75c7ca5177bafff2121655376b3f7087e00f59b99c19e3b61cf5b6 SHA512 e4e06b77ac463074ea01211e754e7a3a90e4c0d7026b7bb321d18f79105d7bfca635e5a82e06f956ceb0b4d8febe5a1497cbbc8ec48ef2c994f1b00d90f66a57
+EBUILD sunpinyin-2.0.4_pre20130108-r1.ebuild 1057 BLAKE2B 0bd5fe2b7ac7af8b635bd45c3a28c7f79f8a4212830b939501c9c94dc67972ce3b6333beb937e57c2886aba33cd8ad86b916a26d1ea1c7d4881846c97d597e3f SHA512 594ea06940263db5afa0cb87631074417a05999863b0d64793b6567732bf4ebf37b8c7f02c14ab3f91e18755f7b6bebce325d1d0578c191d5f70d2af75ca5a36
+MISC metadata.xml 328 BLAKE2B 61db20b9475140020b99ef82cc8949db01b996bbe043b4aa68bd7bd6cb67c56286ce0e00c8dd1a039798b23a8921621260286231f1d87a079ef13a4a764b8049 SHA512 c67333df77b03f92845334d6b738c172cc2e1935b5df4cad2d7bc983c08cda59f1427588ab8d054cd40b7fdc52c0adcb516d74c7de4bb320f85979a6a3297628
diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch
new file mode 100644
index 000000000000..f2f6b389ba09
--- /dev/null
+++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch
@@ -0,0 +1,30 @@
+diff --git a/SConstruct b/SConstruct
+index 68cd365..9bb6ebc 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -180,12 +180,6 @@ libdir = env['LIBDIR']
+ libdatadir = env['LIBDATADIR'] + '/sunpinyin/data'
+ headersdir = env['PREFIX'] + '/include/sunpinyin-2.0'
+ 
+-if GetOS() != 'Darwin':
+-    env.Append(LINKFLAGS=['-Wl,-soname=libsunpinyin.so.%d' % abi_major])
+-
+-if GetOption('rpath') is not None and GetOS() != 'Darwin':
+-    env.Append(LINKFLAGS='-Wl,-R -Wl,%s' % GetOption('rpath'))
+-
+ # pass through environmental variables
+ envvar = [('CC', 'CC'),
+           ('CXX', 'CXX'),
+@@ -202,6 +196,12 @@ extra_cflags=' -DHAVE_CONFIG_H -DSUNPINYIN_DATA_DIR=\'"%s"\'' % libdatadir
+ env.Append(CFLAGS=extra_cflags)
+ env.Append(CXXFLAGS=extra_cflags)
+ 
++if GetOS() != 'Darwin':
++    env.Append(LINKFLAGS=' -Wl,-soname=libsunpinyin.so.%d' % abi_major)
++
++if GetOption('rpath') is not None and GetOS() != 'Darwin':
++    env.Append(LINKFLAGS=' -Wl,-R -Wl,%s' % GetOption('rpath'))
++
+ #
+ #==============================configure================================
+ #
diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.3-gcc-4.7.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.3-gcc-4.7.patch
new file mode 100644
index 000000000000..c523449ef514
--- /dev/null
+++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.3-gcc-4.7.patch
@@ -0,0 +1,49 @@
+From 3d35aa0370d9c7bd455098caa9ba22ebe1f82968 Mon Sep 17 00:00:00 2001
+From: Yong Sun <mail@yongsun.me>
+Date: Wed, 4 Apr 2012 18:41:39 +0800
+Subject: [PATCH] Integrated patch from YunQiang Su, fixed FTBFS with gcc-4.7
+
+---
+ SConstruct        |    3 ++-
+ src/portability.h |    5 ++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 97abf47..354fd19 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -313,7 +313,8 @@ def DoConfigure():
+     conf.CheckCHeader('sys/param.h')
+     conf.CheckCHeader('sys/stat.h')
+     conf.CheckCHeader('sys/types.h')
+-    conf.CheckCHeader('unistd.h')
++    if conf.CheckCHeader('unistd.h'):
++        conf.Define('DHAVE_UNISTD_H', 1)
+     conf.CheckCHeader('wchar.h')
+ 
+     # add essential package requirements
+diff --git a/src/portability.h b/src/portability.h
+index 949d4f2..cf43bd0 100644
+--- a/src/portability.h
++++ b/src/portability.h
+@@ -44,15 +44,14 @@
+ #include <string>
+ #include <cstring>
+ 
+-#if defined(sun)
++#if defined(HAVE_UNISTD_H)
+ #include <unistd.h>
+ #ifdef __cplusplus
+ #include <algorithm>
+ #else
+ #include <sys/ddi.h>
+ #endif //__cpluscplus
+-#endif //defined(sun)
+-
++#endif //defined(HAVE_UNISTD_H)
+ 
+ #ifndef HOST_OS_GNUC_2
+     #if defined(DEBUG) && !defined(NDEBUG)
+-- 
+1.7.8.5
+
diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch
new file mode 100644
index 000000000000..54831df21220
--- /dev/null
+++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch
@@ -0,0 +1,17 @@
+From: Guo Yixuan <culu.gyx@gmail.com>
+Bug: https://code.google.com/archive/p/sunpinyin/issues/327
+Gentoo-Bug: 553796
+
+diff --git a/man/SConscript b/man/SConscript
+index f3ebd03..e1551eb 100644
+--- a/man/SConscript
++++ b/man/SConscript
+@@ -1,7 +1,7 @@
+ import os
+ Import('env')
+ 
+-pod2man = Builder(action = 'pod2man < $SOURCE > $TARGET')
++pod2man = Builder(action = 'pod2man $SOURCE $TARGET')
+ env.Append(BUILDERS = {'Man': pod2man})
+ 
+ env.Man('mmseg.1', 'mmseg.pod')
diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch
new file mode 100644
index 000000000000..77fe2831c7d8
--- /dev/null
+++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch
@@ -0,0 +1,17 @@
+--- sunpinyin-2.0.4_pre20130108/src/slm/tslmpack/common.h.old	2016-09-20 02:54:15.046257131 -0400
++++ sunpinyin-2.0.4_pre20130108/src/slm/tslmpack/common.h	2016-09-20 02:55:48.041124978 -0400
+@@ -53,10 +53,10 @@
+ typedef std::map<float, int> RealIndexMap;  // map real values to their indices
+ typedef std::map<std::string, unsigned int> TLexicon; // map word to wid
+ 
+-#define EffectivePr(a)  (float((usingLogPr) ? ((a) / log(2.0)) : (-log2((a)))))
+-#define OriginalPr(b)   (float((usingLogPr) ? ((b) * log(2.0)) : (exp2(-(b)))))
+-#define EffectiveBow(a) (float((usingLogPr) ? (exp(-(a))) : ((a))))
+-#define OriginalBow(b)  (float((usingLogPr) ? (-log((b))) : ((b))))
++#define EffectivePr(a)  (float((usingLogPr) ? ((a) / logf(2.0f)) : (-log2f((a)))))
++#define OriginalPr(b)   (float((usingLogPr) ? ((b) * logf(2.0f)) : (exp2f(-(b)))))
++#define EffectiveBow(a) (float((usingLogPr) ? (expf(-(a))) : ((a))))
++#define OriginalBow(b)  (float((usingLogPr) ? (-logf((b))) : ((b))))
+ 
+ #endif //_SLM_PACK_COMMON_H
+ 
diff --git a/app-i18n/sunpinyin/metadata.xml b/app-i18n/sunpinyin/metadata.xml
new file mode 100644
index 000000000000..da2c1e97edca
--- /dev/null
+++ b/app-i18n/sunpinyin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">sunpinyin/sunpinyin</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild
new file mode 100644
index 000000000000..8ef0101da1e5
--- /dev/null
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit scons-utils toolchain-funcs
+
+DESCRIPTION="SunPinyin is a SLM (Statistical Language Model) based IME"
+HOMEPAGE="https://sunpinyin.googlecode.com"
+SRC_URI="${HOMEPAGE}/files/${P}.tar.gz
+		https://open-gram.googlecode.com/files/dict.utf8.tar.bz2
+		https://open-gram.googlecode.com/files/lm_sc.t3g.arpa.tar.bz2"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="dev-db/sqlite:3"
+DEPEND="${RDEPEND}
+		virtual/pkgconfig"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	ln -s "${DISTDIR}/dict.utf8.tar.bz2" "${S}/raw/" || die "dict file not found"
+	ln -s "${DISTDIR}/lm_sc.t3g.arpa.tar.bz2" "${S}/raw/" || die "dict file not found"
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${P}-force-switch.patch"
+	eapply "${FILESDIR}/${P}-gcc-4.7.patch"
+	default
+}
+
+src_configure() {
+	tc-export CXX
+	myesconsargs=(
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--libdatadir="${EPREFIX}"/usr/lib
+	)
+}
+
+src_compile() {
+	escons || die
+}
+
+src_install() {
+	escons --install-sandbox="${ED}" install || die
+}
+
+pkg_postinst() {
+	elog ""
+	elog "If you have already installed former version of ${PN}"
+	elog "and any wrapper, please remerge the wrapper to make it work with"
+	elog "the new version."
+	elog ""
+	elog "To use any wrapper for ${PN}, please merge any of the following"
+	elog "packages: "
+	elog "emerge app-i18n/fcitx-sunpinyin"
+	elog "emerge app-i18n/ibus-sunpinyin"
+	elog "emerge app-i18n/scim-sunpinyin"
+	elog "emerge app-i18n/xsunpinyin"
+	elog ""
+}
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild
new file mode 100644
index 000000000000..84ef8dcc2cb4
--- /dev/null
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit eutils multilib python-any-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="A Statistical Language Model based Chinese input method library"
+HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
+SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0/3"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND="dev-db/sqlite:3"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+PDEPEND="app-i18n/sunpinyin-data"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.0.4-pod2man.patch
+	epatch "${FILESDIR}"/${P}-gcc6-use-float.patch
+	epatch_user
+}
+
+src_configure() {
+	tc-export CXX
+	myesconsargs=(
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+	)
+}
+
+src_compile() {
+	escons
+}
+
+src_install() {
+	escons --install-sandbox="${D}" install
+	rm -rf "${D}"/usr/share/doc/${PN} || die
+	dodoc doc/{README,SLM-inst.mk,SLM-train.mk}
+}
diff --git a/app-i18n/tagainijisho-1.0.3-r1 b/app-i18n/tagainijisho-1.0.3-r1
deleted file mode 100644
index 562611aca911..000000000000
--- a/app-i18n/tagainijisho-1.0.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 >=dev-db/sqlite-3.11:3 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Open-source Japanese dictionary and kanji lookup tool
-EAPI=5
-HOMEPAGE=https://www.tagaini.net/
-IUSE=l10n_ar l10n_cs l10n_de l10n_es l10n_fa l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_nb l10n_nl l10n_pl l10n_pt l10n_ru l10n_sv l10n_th l10n_tr l10n_vi
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ public-domain
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 >=dev-db/sqlite-3.11:3
-SLOT=0
-SRC_URI=https://github.com/Gnurou/tagainijisho/releases/download/1.0.3/tagainijisho-1.0.3.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=26aa96ede0e3ca622fd66c7cedb6b8b2
diff --git a/app-i18n/tagainijisho-1.2.0_pre20180610092832 b/app-i18n/tagainijisho-1.2.0_pre20180610092832
deleted file mode 100644
index ef140f388c17..000000000000
--- a/app-i18n/tagainijisho-1.2.0_pre20180610092832
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-db/sqlite-3.12:3 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Open-source Japanese dictionary and kanji lookup tool
-EAPI=6
-HOMEPAGE=https://www.tagaini.net/ https://github.com/Gnurou/tagainijisho
-IUSE=l10n_ar l10n_cs l10n_de l10n_es l10n_fa l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_nb l10n_nl l10n_pl l10n_pt l10n_ru l10n_sv l10n_th l10n_tr l10n_uk l10n_vi l10n_zh
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ public-domain
-RDEPEND=>=dev-db/sqlite-3.12:3 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://github.com/Gnurou/tagainijisho/archive/dde2ad85dc6dc47ac7862e728878a7c8d9d4faf6.tar.gz -> tagainijisho-1.2.0_pre20180610092832.tar.gz https://home.apache.org/~arfrever/distfiles/JMdict-2018-06-12.gz https://home.apache.org/~arfrever/distfiles/kanjidic2-2018-06-12.xml.gz https://github.com/KanjiVG/kanjivg/releases/download/r20160426/kanjivg-20160426.xml.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4cf57fd404a12047094fd49c3fcbf08e
diff --git a/app-i18n/tagainijisho-9999 b/app-i18n/tagainijisho-9999
deleted file mode 100644
index 43909f5155d4..000000000000
--- a/app-i18n/tagainijisho-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-db/sqlite-3.12:3 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Open-source Japanese dictionary and kanji lookup tool
-EAPI=6
-HOMEPAGE=https://www.tagaini.net/ https://github.com/Gnurou/tagainijisho
-IUSE=l10n_ar l10n_cs l10n_de l10n_es l10n_fa l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_nb l10n_nl l10n_pl l10n_pt l10n_ru l10n_sv l10n_th l10n_tr l10n_uk l10n_vi l10n_zh
-LICENSE=GPL-3+ public-domain
-RDEPEND=>=dev-db/sqlite-3.12:3 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://github.com/KanjiVG/kanjivg/releases/download/r20160426/kanjivg-20160426.xml.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e89d99ed5b560b4b7298f55f1633ef47
diff --git a/app-i18n/tagainijisho/Manifest b/app-i18n/tagainijisho/Manifest
new file mode 100644
index 000000000000..1c1312af0ca7
--- /dev/null
+++ b/app-i18n/tagainijisho/Manifest
@@ -0,0 +1,10 @@
+AUX tagainijisho-1.0.3-sqlite.patch 425 BLAKE2B 0d14c8619933ca9218ccae185c21d57453b95ec96d7ce7fcd64b0596fd6746df8f9f5d98429c799a9e5a00795875ca7ea0d029b0a888969681f13a2ba0800498 SHA512 aca8593bc860f3bb640134e49898106414ff57b1cd6a39be5371151ed32e8bdb45a0747535f5f0d4710367919cf329fc2c308df38731b3c94be16f4992d7d174
+DIST JMdict-2018-06-12.gz 18306650 BLAKE2B 3ddb29bf631567717085912b1fa21c701e6183c94907f64121daedf358303df09a754bcdf51f24f0d7c95bf1bfe4ea13779f5e3532bd19a3f99a33751259a893 SHA512 cd8e0a737ccd1ccbe7c53ab0affb5d4ca068656966c75f0abbc184ffcdc69d8a1dbe0f096a16f0b59ecaed40371a29e566ee5076a7e80e3f51796e32798bed3e
+DIST kanjidic2-2018-06-12.xml.gz 1482391 BLAKE2B c6f1d18f17b2107937fe07b77d6aa297d156d9c250cdc480000aeb7f8c9cd27a94e2cce1df80e4612d1bcadc94d92d5d013cfc8d923c5ceaba9ed5b0a692ae78 SHA512 700aba18e18ab271dbc583f1a1cc16dd7209e4aa48417201f0b51723d35f5aedcff299ed1503cb743151abce37c94c0facbab09dd0a46126131bb54f2004aa23
+DIST kanjivg-20160426.xml.gz 3587660 BLAKE2B c85291f3671f0980186e8deb296cfa743322df438d6f09fd69a4f5a30c3db6f097d6ff0a817b88c5c9a2c8d4a40c90b31c0a54cb71d681849b557ee364707c48 SHA512 1d35a8cc5d4947f6bedfc71a2f08e2d1fda832d7a02588c00953e1746812b0e51d4d1c39dff49999b4f65ec850788359f6e0d1465f0e688b1bf753c4c67b3c54
+DIST tagainijisho-1.0.3.tar.gz 24816175 BLAKE2B fbe9e671675b2a938aa13aaae87af7f076f4f20c6024d90fa70f2c86f5e1964998d83047b69473e4f9a43e46eacde6b61bc6620b5cfb13c1b4d12a3b1317a280 SHA512 3afd75cc27e8701d93df54a2244b83090770cc80ac20ab8fb843d2ab925ab575f73d731a2ce736179fb7361af68e94694ec91f813d186c87e730368c41535c53
+DIST tagainijisho-1.2.0_pre20180610092832.tar.gz 3634107 BLAKE2B f5cb75f45fced30c64f615147c3eb7e4d473e81dd734517710bcfdf390d1a34a1780196b6dbbb7a6d297df0bb8d73933d09a76eb6b8dd13d1c0759c562e81695 SHA512 3b17ff6972e3cfd35f4f9e8c575153a4c2021a66a238f631616452a16a151d604106586d438cdc574211bff54118d89e492f9460da4b25fef88a2354b0bd8555
+EBUILD tagainijisho-1.0.3-r1.ebuild 1751 BLAKE2B 98b42350d471ef3f42ee092b6a2952e6eda8347efb229447666a00bbc0f195e1d366de08857864d4e7df18558a7202abfcffcb16b7f59ba20bbba3124eb908bf SHA512 2d664fc8ab217d57fabde412368b368fd02b1e04918fe3aa7d6f348035bc29583956c07d295549b32b1d0abc60cdd572b16efa74e0184e9f6861cf40ea584161
+EBUILD tagainijisho-1.2.0_pre20180610092832.ebuild 6180 BLAKE2B ac53048f5508366e943275fdf19ce7dfc7e5ccc4d228608d57828098911a5219ac89b0f4f5450cfba87dadd06fcde209438834e4264286b257cf98dba6e26bad SHA512 8ed6439eae16cea8e714fe8a5de659286414bbaffccc6b3c9a0c79d33a36534039b6a56a5e8fa936556a9264c2e4b164841ced3c3805f21da82928621198baab
+EBUILD tagainijisho-9999.ebuild 6109 BLAKE2B 0d10127700103382266b6606877e92de3205bac43a795a93bb30ed1c4d89c9f6bf2612a51e4e3bf3d92e611f3b1d1959c56cf2f5f34214220a80eb21fe72a5c6 SHA512 55c11b49c483b7654539a5627e44ee65111569be3fdc45c10f0db4600e09c0eef02c2f800337449f77a53b1c51ce01790d3c18b41945499d518b4f5a28883d32
+MISC metadata.xml 1133 BLAKE2B 863fcd0cbb85b715cf7666210c74a9e88423b0e982b3e05b4333036b607e4d2cf73b35dc6b8f5e549a35a6d8e2cc107f110f3500762d49065bd1ed2097dd6338 SHA512 cde2818f44f02091ac994ca049a25b90519b62b669b7923a52043df23a0de7f3e1f657d3080e574048556dbacd5521995addd35267ec9d1357360f473222cef7
diff --git a/app-i18n/tagainijisho/files/tagainijisho-1.0.3-sqlite.patch b/app-i18n/tagainijisho/files/tagainijisho-1.0.3-sqlite.patch
new file mode 100644
index 000000000000..bf1d443395b6
--- /dev/null
+++ b/app-i18n/tagainijisho/files/tagainijisho-1.0.3-sqlite.patch
@@ -0,0 +1,15 @@
+https://github.com/Gnurou/tagainijisho/issues/163
+
+--- src/sqlite/sqlite3ext.cc
++++ src/sqlite/sqlite3ext.cc
+@@ -118,6 +118,10 @@
+ 	sqlite3_stmt *pStmt;
+ 	const char *zSql = "SELECT fts3_tokenizer(?, ?)";
+ 
++#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
++	sqlite3_db_config(db, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL);
++#endif
++
+ 	rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
+ 	if( rc!=SQLITE_OK ){
+ 		return rc;
diff --git a/app-i18n/tagainijisho/metadata.xml b/app-i18n/tagainijisho/metadata.xml
new file mode 100644
index 000000000000..09f1cc4ec3ad
--- /dev/null
+++ b/app-i18n/tagainijisho/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>calchan@gentoo.org</email>
+    <name>Denis Dupeyron</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>arfrever.fta@gmail.com</email>
+    <name>Arfrever Frehtes Taifersar Arahesis</name>
+  </maintainer>
+  <longdescription>
+Tagaini Jisho is a free, open-source Japanese dictionary and kanji lookup tool
+that is available for Windows, MacOS X and Linux and aims at becoming your
+Japanese study assistant. It allows you to quickly search for entries and mark
+those that you wish to study, along with tags and personal notes. It also let
+you train entries you are studying and follows your progression in remembering
+them. Finally, it makes it easy to review entries you did not remember by
+listing them on screen or printing them on a small booklet.
+
+Tagaini Jisho also features complete stroke order animations for more than 6000
+kanji.
+</longdescription>
+  <upstream>
+    <remote-id type="github">Gnurou/tagainijisho</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild b/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..b89dc7ed279b
--- /dev/null
+++ b/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Open-source Japanese dictionary and kanji lookup tool"
+HOMEPAGE="https://www.tagaini.net/"
+SRC_URI="https://github.com/Gnurou/tagainijisho/releases/download/${PV}/${P}.tar.gz"
+LICENSE="GPL-3+ public-domain"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	>=dev-db/sqlite-3.11:3"
+RDEPEND="${DEPEND}"
+
+pkg_langs=( ar cs de es fa fi fr hu id it nb nl pl pt ru sv th tr vi )
+IUSE+=" ${pkg_langs[@]/#/l10n_}"
+
+PATCHES=( "${FILESDIR}"/${P}-sqlite.patch )
+
+src_configure() {
+	# GUI linguae
+	# en is not optional, and build fails if none other then en is set, so adding ja as non-optional too
+	# linguae undeclared in IUSE will trigger an error, which is a handy check
+	local lang use_lang
+	for lang in i18n/*.ts; do
+		lang=${lang#i18n/tagainijisho_}
+		lang=${lang%.ts}
+		case ${lang} in
+			fa_IR|fi_FI) use_lang=${lang%%_*} ;; # use generic tags instead
+			*) 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
+	# here too, linguae undeclared in IUSE will trigger an error
+	local cmake_langs
+	for lang in $(sed -e 's/;/ /g' -ne '/set(DICT_LANG ".*")/s/.*"\(.*\)".*/\1/p' CMakeLists.txt); do
+		if use l10n_${lang}; then
+			cmake_langs+=";${lang}"
+		fi
+	done
+	mycmakeargs=( -DDICT_LANG="${cmake_langs};" )
+
+	cmake-utils_src_configure
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20180610092832.ebuild b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20180610092832.ebuild
new file mode 100644
index 000000000000..41902e9a643c
--- /dev/null
+++ b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20180610092832.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/Gnurou/tagainijisho"
+elif [[ "${PV}" == *_pre* ]]; then
+	inherit vcs-snapshot
+
+	TAGAINIJISHO_GIT_REVISION="dde2ad85dc6dc47ac7862e728878a7c8d9d4faf6"
+fi
+if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then
+	JMDICT_DATE="2018-06-12"
+	KANJIDIC2_DATE="2018-06-12"
+	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 -> ${P}.tar.gz"
+else
+	SRC_URI="https://github.com/Gnurou/${PN}/releases/download/${PV}/${P}.tar.gz"
+fi
+if [[ "${PV}" == *_pre* ]]; 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
+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=""
+
+RDEPEND=">=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"
+
+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
+
+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
+	else
+		unpack ${P}.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
+	elif [[ "${PV}" == *_pre* ]]; then
+		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() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/tagainijisho/tagainijisho-9999.ebuild b/app-i18n/tagainijisho/tagainijisho-9999.ebuild
new file mode 100644
index 000000000000..11c02a413f1c
--- /dev/null
+++ b/app-i18n/tagainijisho/tagainijisho-9999.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/Gnurou/tagainijisho"
+elif [[ "${PV}" == *_pre* ]]; then
+	inherit vcs-snapshot
+
+	TAGAINIJISHO_GIT_REVISION=""
+fi
+if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then
+	JMDICT_DATE=""
+	KANJIDIC2_DATE=""
+	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 -> ${P}.tar.gz"
+else
+	SRC_URI="https://github.com/Gnurou/${PN}/releases/download/${PV}/${P}.tar.gz"
+fi
+if [[ "${PV}" == *_pre* ]]; 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
+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=""
+IUSE=""
+
+RDEPEND=">=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"
+
+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
+
+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
+	else
+		unpack ${P}.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
+	elif [[ "${PV}" == *_pre* ]]; then
+		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() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/tegaki-zinnia-japanese-0.3 b/app-i18n/tegaki-zinnia-japanese-0.3
deleted file mode 100644
index 6c983f1cf364..000000000000
--- a/app-i18n/tegaki-zinnia-japanese-0.3
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile prepare
-DESCRIPTION=Handwriting model data of Japanese
-EAPI=5
-HOMEPAGE=http://tegaki.org/
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=LGPL-2
-SLOT=0
-SRC_URI=http://www.tegaki.org/releases/0.3/models/tegaki-zinnia-japanese-0.3.zip
-_md5_=04f038721ae8a8646175edfaeeb319d2
diff --git a/app-i18n/tegaki-zinnia-japanese/Manifest b/app-i18n/tegaki-zinnia-japanese/Manifest
new file mode 100644
index 000000000000..919bc2c2c75a
--- /dev/null
+++ b/app-i18n/tegaki-zinnia-japanese/Manifest
@@ -0,0 +1,3 @@
+DIST tegaki-zinnia-japanese-0.3.zip 18134281 BLAKE2B 006fb90656444afb2ca824a534947f1ba16502cba8035977b93150ae242e476170eebfc02d069f04d3fbda24773a602f69bea91eb88019cfe58ab71171b19331 SHA512 fd11f94c8b5446ca22e1119ead20da9ebc01e8033beef664d94c0affc8cef6e315344c4d5e61288358bf7ff4f7c49135dcf5743c4070573f7d8e45e70abba113
+EBUILD tegaki-zinnia-japanese-0.3.ebuild 517 BLAKE2B 76fc71caa1044e4d93ffefb1bb36b08063209dc64a0d941e1c57a458d8d4008562c6932eb17fc0162e15850abc183e77a83b89660688475e94f8218ece978003 SHA512 8318cc5090f3da7a1358a3e0ecc3e34ecaec42392c758a48b027d89714d4ae98e59724a177a6cc00c278d28c4abb21fa30ab4ff4c4a3d70a91013da1ba1d6e93
+MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-i18n/tegaki-zinnia-japanese/metadata.xml b/app-i18n/tegaki-zinnia-japanese/metadata.xml
new file mode 100644
index 000000000000..c921b96adf6c
--- /dev/null
+++ b/app-i18n/tegaki-zinnia-japanese/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-i18n/tegaki-zinnia-japanese/tegaki-zinnia-japanese-0.3.ebuild b/app-i18n/tegaki-zinnia-japanese/tegaki-zinnia-japanese-0.3.ebuild
new file mode 100644
index 000000000000..3cf54ff01940
--- /dev/null
+++ b/app-i18n/tegaki-zinnia-japanese/tegaki-zinnia-japanese-0.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Handwriting model data of Japanese"
+HOMEPAGE="http://tegaki.org/"
+SRC_URI="http://www.tegaki.org/releases/${PV}/models/${P}.zip"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	sed -i -e "/^installpath=/s:local/::" Makefile || die
+	sed -i -e "/^installpath=/s:installpath=:installpath=${ED}:" Makefile || die
+}
+
+src_compile() {
+	:
+}
diff --git a/app-i18n/tomoe-0.6.0-r3 b/app-i18n/tomoe-0.6.0-r3
deleted file mode 100644
index 9fb6af6e9741..000000000000
--- a/app-i18n/tomoe-0.6.0-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/glib:2 hyperestraier? ( app-text/hyperestraier ) mysql? ( virtual/libmysqlclient ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 ) virtual/rubygems dev-ruby/ruby-glib2[ruby_targets_ruby23?,ruby_targets_ruby24?] ) subversion? ( dev-vcs/subversion ) dev-util/gtk-doc-am dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Japanese handwriting recognition engine
-EAPI=6
-HOMEPAGE=http://tomoe.osdn.jp/
-IUSE=hyperestraier mysql python ruby ruby_targets_ruby23 ruby_targets_ruby24 static-libs subversion python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib:2 hyperestraier? ( app-text/hyperestraier ) mysql? ( virtual/libmysqlclient ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 ) virtual/rubygems dev-ruby/ruby-glib2[ruby_targets_ruby23?,ruby_targets_ruby24?] ) subversion? ( dev-vcs/subversion )
-REQUIRED_USE=python? ( python_targets_python2_7 ) ruby? ( || ( ruby_targets_ruby23 ruby_targets_ruby24 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/tomoe/tomoe-0.6.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a0bbb62dfe7ab3810d9190191abefdef
diff --git a/app-i18n/tomoe-gtk-0.6.0-r4 b/app-i18n/tomoe-gtk-0.6.0-r4
deleted file mode 100644
index 5afa664f41e5..000000000000
--- a/app-i18n/tomoe-gtk-0.6.0-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=app-i18n/tomoe[python(+)?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x11-libs/gtk+:2 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Tomoe GTK+ interface widget library
-EAPI=6
-HOMEPAGE=http://tomoe.osdn.jp/
-IUSE=python static-libs python_targets_python2_7
-KEYWORDS=amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-i18n/tomoe[python(+)?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x11-libs/gtk+:2 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/tomoe/tomoe-gtk-0.6.0.tar.gz
-_eclasses_=ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=be736d4b155c35ee6dc3c2a6fb4cb607
diff --git a/app-i18n/tomoe-gtk/Manifest b/app-i18n/tomoe-gtk/Manifest
new file mode 100644
index 000000000000..8a7d8f93bccb
--- /dev/null
+++ b/app-i18n/tomoe-gtk/Manifest
@@ -0,0 +1,3 @@
+DIST tomoe-gtk-0.6.0.tar.gz 448058 BLAKE2B 06db81c971bf06ae1b625afb90950e7a76ad2acfb6abf038ce0c6114c4f7bc42a76a7f07dc848cfa5e6aef3039e6bab32b0d7496fea1fb67bf936b5f9631a130 SHA512 caa9b79edde7885e00d939cb3de30b32da0c1c8a7d803e26c756ee0695f7e15bee241036b1125f838e72e016f4bee9736a398108fff0eed20f1fdb86d221dc43
+EBUILD tomoe-gtk-0.6.0-r4.ebuild 943 BLAKE2B b1f7f8097fb39a53a0e559e59784365a2ec50f46ca3233f5834326847ffcbc3f0237a4145a20d3e23630363eb43c226bd3a03e853974ec56291a10b3663ae971 SHA512 924a073b6e03c0db053f4ed36546fbb414d355fe04cbc2f53de98db676445bd6813e0ed168f16635db48ea247ac51c69a406efd91cfa6cf796614f0f819173a6
+MISC metadata.xml 374 BLAKE2B 39965153f406f0dab239af88b4da0823befba31b026a262e1dd42373514fdd91b21cf582c3a00184459f62253f5fed7828bae911d82c3ba31331bb7f6d6abc6e SHA512 8b35eb486271612ca74076681fc7c84a27ec5bf49b8523996d14f7cb26d22952569497656378d07ca03ec7f9e05a30e851b9220f905fcc2265d4a4568badf15e
diff --git a/app-i18n/tomoe-gtk/metadata.xml b/app-i18n/tomoe-gtk/metadata.xml
new file mode 100644
index 000000000000..b26c59a53cf3
--- /dev/null
+++ b/app-i18n/tomoe-gtk/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">tomoe</remote-id>
+    <remote-id type="sourceforge-jp">tomoe</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild
new file mode 100644
index 000000000000..ee72ae4622bb
--- /dev/null
+++ b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ltprune python-single-r1
+
+DESCRIPTION="Tomoe GTK+ interface widget library"
+HOMEPAGE="http://tomoe.osdn.jp/"
+SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="app-i18n/tomoe[python(+)?,${PYTHON_USEDEP}]
+	x11-libs/gtk+:2
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with python python "") \
+		--without-gucharmap
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
diff --git a/app-i18n/tomoe/Manifest b/app-i18n/tomoe/Manifest
new file mode 100644
index 000000000000..32af54cdccb6
--- /dev/null
+++ b/app-i18n/tomoe/Manifest
@@ -0,0 +1,7 @@
+AUX tomoe-export-symbols.patch 8483 BLAKE2B 45a7ce461400256809275d626bcf7c3d4b1201be2a07f7db2c77b94059e11b5026cdd060cc7e2f57a1c1d60498ca266218b3c26356dd27447f00bc8fd090b107 SHA512 32caa46e10d2c1885e7d850f7ecb3ac79a4754156100e4db68e87f1614b0d9db71fde6af9d8520f337143bf2a3e6f3fe1f6e7e83f1c066552238a2a2c3d3bba5
+AUX tomoe-gentoo.patch 599 BLAKE2B d297c41007f17ac07f6a80fb451c2d605ebf275b64af96b81e31875ff2ce065684d78e60610627b2295195b024813b3d02b2327a3c06c38e992d7e78361f897a SHA512 50b573c046f9b98c64bfd8e0320f7d4d7f4c113d6cc5368fbaa68575d199ce269bfc8827709a6565f244a1b6e82e220db7309570a022c30ad03c51317110030b
+AUX tomoe-glib-2.32.patch 688 BLAKE2B 5aeb0fa73f54331e20d8a3cd360a4e7c06e770f988686bd3ddd055b49390abd1c064a9369d89c7a4f6cd6c9631a075ba56857b0db54befeace96c233cf9e7947 SHA512 ec0344ccb48ecc8f0df3a76424ed93c9e223a3b22733626a460c4729681d7f9f072ddb84311d22e161c04503dd845c7da774ea9832df32cb79199ca47589073c
+AUX tomoe-ruby19.patch 2646 BLAKE2B 7b2289af7e87946bb9c4cb197b493bc2b8625a3bc3f22ee42270a403bd36b1bee4efcbb46117f11d537e3c8a38dfbcfca6484c0a1db6ec2f0b7a5469dac35b47 SHA512 52f555412853c3485e8d3ab7b7739f030e2c3d2b5c4aac14ebb967c93427fe04cbcfec2f5997f09f0f7611dc268ee63437b256ef4cac1ea805f0ae84a522b836
+DIST tomoe-0.6.0.tar.gz 4918949 BLAKE2B c9f4accc77fe7c6214c4d19dbbac7d0d39ed7947588ab1b8a1416f6cfeda33a6cfa84352f888d02848c8e2026bd5c36d2fe52d099bda6ca41a6d215733b11aa3 SHA512 eab618d7b28fc9613c175fab6f80fc7d6acc34af3a47f20c11b42a32acd87143ae10caca67fa1a5e2e75441d431799a5725a5d507604f8bd7447bbc1826f0bb8
+EBUILD tomoe-0.6.0-r3.ebuild 2136 BLAKE2B 62990d33dbb526e9e82e2e1dc754f8cfe735000b39196250ccf7c78fdbfa4ed1ed17b7a1591048efc4e0f844656762176cc27cc260d71bcad0a2b26ef1bc5e26 SHA512 70814b92e3da0d39d38dba7380c59f3d1c265cb4afb8c56abcde02ac4ea3b95c58b352f1d09b6b0c30749ec037112d98da68cef42427c9274ce6812c4cd134d3
+MISC metadata.xml 482 BLAKE2B 454f6c496dda5f9ca738bb81c843a650be203b58bbaf4f0775204be463de6eccdd11023705295e89d1cc8513eead67dbe1fb26740bdc39216e8e2d4ee838e8ca SHA512 0898e0ba0bd42458870d268ee6bc881da1c88ab01969037d57f0d4abf5f140a7ce77bf87d918976bd763a33c8869e73d0fb2ec744be747d5bc30d594cc54efeb
diff --git a/app-i18n/tomoe/files/tomoe-export-symbols.patch b/app-i18n/tomoe/files/tomoe-export-symbols.patch
new file mode 100644
index 000000000000..2b2d98b6ddd7
--- /dev/null
+++ b/app-i18n/tomoe/files/tomoe-export-symbols.patch
@@ -0,0 +1,240 @@
+Index: trunk/module/dict/tomoe-dict-xml.c
+===================================================================
+--- trunk/module/dict/tomoe-dict-xml.c	(revision 1581)
++++ trunk/module/dict/tomoe-dict-xml.c	(revision 1582)
+@@ -303,14 +303,14 @@
+         return success;
+ 
+     result.name = NULL;
+-    result.chars = _tomoe_dict_ptr_array_get_array (TOMOE_DICT_PTR_ARRAY (dict));
+-    success = _tomoe_xml_parser_parse_dictionary_file (dict->filename, &result);
++    result.chars = tomoe_dict_ptr_array_get_array (TOMOE_DICT_PTR_ARRAY (dict));
++    success = tomoe_xml_parser_parse_dictionary_file (dict->filename, &result);
+     if (result.name) {
+         g_free (dict->name);
+         dict->name = g_strdup (result.name);
+         g_free (result.name);
+     }
+-    _tomoe_dict_ptr_array_sort (TOMOE_DICT_PTR_ARRAY (dict));
++    tomoe_dict_ptr_array_sort (TOMOE_DICT_PTR_ARRAY (dict));
+ 
+     return success;
+ }
+@@ -343,7 +343,7 @@
+     else
+         g_string_append (xml, "<dictionary>\n");
+ 
+-    chars = _tomoe_dict_ptr_array_get_array (TOMOE_DICT_PTR_ARRAY (dict));
++    chars = tomoe_dict_ptr_array_get_array (TOMOE_DICT_PTR_ARRAY (dict));
+     for (i = 0; i < chars->len; i++) {
+         gchar *chr_xml;
+         TomoeChar *chr = g_ptr_array_index (chars, i);
+Index: trunk/module/dict/tomoe-dict-unihan.c
+===================================================================
+--- trunk/module/dict/tomoe-dict-unihan.c	(revision 1581)
++++ trunk/module/dict/tomoe-dict-unihan.c	(revision 1582)
+@@ -193,7 +193,7 @@
+         object = klass->constructor (type, n_props, props);
+         the_singleton = TOMOE_DICT_UNIHAN (object);
+ 
+-        chars = _tomoe_dict_ptr_array_get_array (TOMOE_DICT_PTR_ARRAY (object));
++        chars = tomoe_dict_ptr_array_get_array (TOMOE_DICT_PTR_ARRAY (object));
+         _tomoe_unihan_create (chars);
+     } else {
+         object = g_object_ref (G_OBJECT (the_singleton));
+Index: trunk/lib/tomoe-char.c
+===================================================================
+--- trunk/lib/tomoe-char.c	(revision 1581)
++++ trunk/lib/tomoe-char.c	(revision 1582)
+@@ -143,7 +143,7 @@
+ TomoeChar*
+ tomoe_char_new_from_xml_data (const gchar *data, gssize len)
+ {
+-    return _tomoe_xml_parser_parse_char_data (data, len);
++    return tomoe_xml_parser_parse_char_data (data, len);
+ }
+ 
+ static void
+Index: trunk/lib/tomoe-xml-parser.c
+===================================================================
+--- trunk/lib/tomoe-xml-parser.c	(revision 1581)
++++ trunk/lib/tomoe-xml-parser.c	(revision 1582)
+@@ -428,8 +428,8 @@
+ }
+ 
+ gboolean
+-_tomoe_xml_parser_parse_dictionary_file (const gchar *filename,
+-                                         TomoeXMLParsedData *result)
++tomoe_xml_parser_parse_dictionary_file (const gchar *filename,
++                                        TomoeXMLParsedData *result)
+ {
+     GMarkupParseContext *context;
+     FILE *f;
+@@ -469,7 +469,7 @@
+ }
+ 
+ TomoeChar *
+-_tomoe_xml_parser_parse_char_data (const gchar *xml, gssize len)
++tomoe_xml_parser_parse_char_data (const gchar *xml, gssize len)
+ {
+     GMarkupParseContext *context;
+     TomoeXMLParsedData result;
+Index: trunk/lib/tomoe-xml-parser.h
+===================================================================
+--- trunk/lib/tomoe-xml-parser.h	(revision 1581)
++++ trunk/lib/tomoe-xml-parser.h	(revision 1582)
+@@ -37,10 +37,10 @@
+     GPtrArray *chars;
+ };
+ 
+-gboolean   _tomoe_xml_parser_parse_dictionary_file (const gchar *filename,
+-                                                    TomoeXMLParsedData *result);
+-TomoeChar *_tomoe_xml_parser_parse_char_data       (const gchar *xml,
+-                                                    gssize      len);
++gboolean   tomoe_xml_parser_parse_dictionary_file (const gchar *filename,
++                                                   TomoeXMLParsedData *result);
++TomoeChar *tomoe_xml_parser_parse_char_data       (const gchar *xml,
++                                                   gssize      len);
+ 
+ 
+ G_END_DECLS
+Index: trunk/lib/tomoe-dict-ptr-array.c
+===================================================================
+--- trunk/lib/tomoe-dict-ptr-array.c	(revision 1581)
++++ trunk/lib/tomoe-dict-ptr-array.c	(revision 1582)
+@@ -50,7 +50,7 @@
+ 
+ static TomoeDictClass *parent_class;
+ 
+-G_DEFINE_ABSTRACT_TYPE (TomoeDictPtrArray, _tomoe_dict_ptr_array, TOMOE_TYPE_DICT)
++G_DEFINE_ABSTRACT_TYPE (TomoeDictPtrArray, tomoe_dict_ptr_array, TOMOE_TYPE_DICT)
+ 
+ static void         dispose                    (GObject       *object);
+ static void         set_property               (GObject       *object,
+@@ -75,7 +75,7 @@
+ static gchar       *get_available_private_utf8 (TomoeDict     *dict);
+ 
+ static void
+-_tomoe_dict_ptr_array_class_init (TomoeDictPtrArrayClass *klass)
++tomoe_dict_ptr_array_class_init (TomoeDictPtrArrayClass *klass)
+ {
+     GObjectClass *gobject_class;
+     TomoeDictClass *dict_class;
+@@ -123,7 +123,7 @@
+ }
+ 
+ static void
+-_tomoe_dict_ptr_array_init (TomoeDictPtrArray *dict)
++tomoe_dict_ptr_array_init (TomoeDictPtrArray *dict)
+ {
+     TomoeDictPtrArrayPrivate *priv = TOMOE_DICT_PTR_ARRAY_GET_PRIVATE (dict);
+     priv->chars    = g_ptr_array_new();
+@@ -196,7 +196,7 @@
+ }
+ 
+ void
+-_tomoe_dict_ptr_array_sort (TomoeDictPtrArray *dict)
++tomoe_dict_ptr_array_sort (TomoeDictPtrArray *dict)
+ {
+     TomoeDictPtrArrayPrivate *priv;
+ 
+@@ -219,7 +219,7 @@
+ 
+     unregister_char (dict, tomoe_char_get_utf8 (chr));
+     g_ptr_array_add (priv->chars, g_object_ref (G_OBJECT (chr)));
+-    _tomoe_dict_ptr_array_sort (TOMOE_DICT_PTR_ARRAY (dict));
++    tomoe_dict_ptr_array_sort (TOMOE_DICT_PTR_ARRAY (dict));
+ 
+     priv->modified = TRUE;
+ 
+@@ -449,7 +449,7 @@
+     g_ptr_array_add (*dest_chars, tomoe_char_dup (chr));
+ }
+ 
+-gboolean
++static gboolean
+ copy (TomoeDict *src_dict, TomoeDict *dest_dict)
+ {
+     TomoeDictPtrArrayPrivate *src_priv, *dest_priv;
+@@ -487,7 +487,7 @@
+     return TOMOE_DICT_PTR_ARRAY_GET_PRIVATE (dict)->editable;
+ }
+ 
+-gchar *
++static gchar *
+ get_available_private_utf8 (TomoeDict *dict)
+ {
+     TomoeDictPtrArrayPrivate *priv;
+@@ -523,7 +523,7 @@
+ }
+ 
+ GPtrArray *
+-_tomoe_dict_ptr_array_get_array (TomoeDictPtrArray *dict)
++tomoe_dict_ptr_array_get_array (TomoeDictPtrArray *dict)
+ {
+     g_return_val_if_fail (TOMOE_IS_DICT_PTR_ARRAY (dict), NULL);
+ 
+Index: trunk/lib/tomoe-dict-ptr-array.h
+===================================================================
+--- trunk/lib/tomoe-dict-ptr-array.h	(revision 1581)
++++ trunk/lib/tomoe-dict-ptr-array.h	(revision 1582)
+@@ -29,7 +29,7 @@
+ 
+ #include "tomoe-dict.h"
+ 
+-#define TOMOE_TYPE_DICT_PTR_ARRAY            (_tomoe_dict_ptr_array_get_type ())
++#define TOMOE_TYPE_DICT_PTR_ARRAY            (tomoe_dict_ptr_array_get_type ())
+ #define TOMOE_DICT_PTR_ARRAY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TOMOE_TYPE_DICT_PTR_ARRAY, TomoeDictPtrArray))
+ #define TOMOE_DICT_PTR_ARRAY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TOMOE_TYPE_DICT_PTR_ARRAY, TomoeDictPtrArrayClass))
+ #define TOMOE_IS_DICT_PTR_ARRAY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TOMOE_TYPE_DICT_PTR_ARRAY))
+@@ -49,9 +49,9 @@
+     TomoeDictClass parent_class;
+ };
+ 
+-GType     _tomoe_dict_ptr_array_get_type        (void) G_GNUC_CONST;
+-void      _tomoe_dict_ptr_array_sort            (TomoeDictPtrArray *dict);
+-GPtrArray *_tomoe_dict_ptr_array_get_array      (TomoeDictPtrArray *dict);
++GType      tomoe_dict_ptr_array_get_type        (void) G_GNUC_CONST;
++void       tomoe_dict_ptr_array_sort            (TomoeDictPtrArray *dict);
++GPtrArray *tomoe_dict_ptr_array_get_array       (TomoeDictPtrArray *dict);
+ 
+ G_END_DECLS
+ 
+Index: trunk/lib/Makefile.am
+===================================================================
+--- trunk/lib/Makefile.am	(revision 1581)
++++ trunk/lib/Makefile.am	(revision 1582)
+@@ -30,13 +30,15 @@
+ 	tomoe-context.h			\
+ 	tomoe-config.h			\
+ 	tomoe-dict.h			\
++	tomoe-dict-ptr-array.h		\
+ 	tomoe-module.h			\
+ 	tomoe-module-impl.h		\
+ 	tomoe-query.h			\
+ 	tomoe-reading.h			\
+ 	tomoe-recognizer.h		\
+ 	tomoe-shelf.h			\
+-	tomoe-writing.h
++	tomoe-writing.h			\
++	tomoe-xml-parser.h
+ 
+ enum_source_prefix = tomoe-enum-types
+ 
+@@ -103,15 +105,13 @@
+ 	tomoe-config.c		\
+ 	tomoe-dict.c		\
+ 	tomoe-dict-ptr-array.c	\
+-	tomoe-dict-ptr-array.h	\
+ 	tomoe-module.c		\
+ 	tomoe-query.c		\
+ 	tomoe-reading.c		\
+ 	tomoe-recognizer.c	\
+ 	tomoe-shelf.c		\
+ 	tomoe-writing.c         \
+-	tomoe-xml-parser.c	\
+-	tomoe-xml-parser.h
++	tomoe-xml-parser.c
+ 
+ libtomoe_la_LDFLAGS =				\
+ 	-version-info $(LT_VERSION_INFO)	\
diff --git a/app-i18n/tomoe/files/tomoe-gentoo.patch b/app-i18n/tomoe/files/tomoe-gentoo.patch
new file mode 100644
index 000000000000..92ed311a0a76
--- /dev/null
+++ b/app-i18n/tomoe/files/tomoe-gentoo.patch
@@ -0,0 +1,22 @@
+--- a/module/dict/Makefile.am
++++ b/module/dict/Makefile.am
+@@ -34,7 +34,7 @@
+ 
+ LIBADD = $(TOMOE_LIBS)			\
+ 	$(top_builddir)/lib/libtomoe.la
+-LDFLAGS =							\
++AM_LDFLAGS =							\
+   -rpath $(dict_moduledir) -avoid-version -module		\
+   -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS)
+ 
+--- a/module/recognizer/Makefile.am
++++ b/module/recognizer/Makefile.am
+@@ -23,7 +23,7 @@
+ AM_CPPFLAGS =
+ INCLUDES = $(TOMOE_CFLAGS)
+ 
+-LDFLAGS =							\
++AM_LDFLAGS =							\
+   -rpath $(recognizer_moduledir) -avoid-version -module		\
+   -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS)
+ 
diff --git a/app-i18n/tomoe/files/tomoe-glib-2.32.patch b/app-i18n/tomoe/files/tomoe-glib-2.32.patch
new file mode 100644
index 000000000000..eb05ab8b8d50
--- /dev/null
+++ b/app-i18n/tomoe/files/tomoe-glib-2.32.patch
@@ -0,0 +1,33 @@
+--- a/lib/glib-compat-key-file.h
++++ b/lib/glib-compat-key-file.h
+@@ -51,7 +51,7 @@
+ #ifndef __G_KEY_FILE_H__
+ #define __G_KEY_FILE_H__
+ 
+-#include <glib/gerror.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+--- a/lib/glib-utils.h
++++ b/lib/glib-utils.h
+@@ -28,7 +28,7 @@
+ #include "config.h"
+ #endif /* HAVE_CONFIG_H */
+ 
+-#include <glib/garray.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include "glib-compat-file-utilities.h"
+ #include "glib-compat-key-file.h"
+--- a/lib/tomoe.c
++++ b/lib/tomoe.c
+@@ -26,7 +26,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <glib/garray.h>
++#include <glib.h>
+ #include "tomoe.h"
+ 
+ static gboolean initialized = FALSE;
diff --git a/app-i18n/tomoe/files/tomoe-ruby19.patch b/app-i18n/tomoe/files/tomoe-ruby19.patch
new file mode 100644
index 000000000000..bca6aa807f04
--- /dev/null
+++ b/app-i18n/tomoe/files/tomoe-ruby19.patch
@@ -0,0 +1,84 @@
+--- a/bindings/ruby/tomoe-rb-char.c
++++ b/bindings/ruby/tomoe-rb-char.c
+@@ -2,6 +2,10 @@
+ 
+ #define _SELF(obj) RVAL2TCHR(obj)
+ 
++#ifndef RSTRING_LEN
++# define RSTRING_LEN(s) (RSTRING(s)->len)
++#endif
++
+ static VALUE
+ tc_initialize(int argc, VALUE *argv, VALUE self)
+ {
+@@ -13,7 +17,7 @@
+     if (NIL_P(xml)) {
+         chr = tomoe_char_new();
+     } else {
+-        chr = tomoe_char_new_from_xml_data(RVAL2CSTR(xml), RSTRING(xml)->len);
++        chr = tomoe_char_new_from_xml_data(RVAL2CSTR(xml), RSTRING_LEN(xml));
+     }
+ 
+     G_INITIALIZE(self, chr);
+--- a/macros/ruby.m4
++++ b/macros/ruby.m4
+@@ -28,13 +28,18 @@
+ 
+   changequote(<<, >>)
+   for var_name in archdir sitearchdir CFLAGS LIBRUBYARG libdir \
+-                  sitelibdir sitearchdir; do
+-    rbconfig_tmp=`$rbconfig "print Config::CONFIG['$var_name']"`
++                  sitelibdir rubyhdrdir rubyarchhdrdir; do
++    rbconfig_tmp=`$rbconfig "print RbConfig::CONFIG['$var_name']"`
+     eval "rbconfig_$var_name=\"$rbconfig_tmp\""
+   done
+   changequote([, ])
+ 
+-  RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_archdir "
++  if test "x$rbconfig_rubyhdrdir" = "x"; then
++    RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_archdir "
++  else
++    RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_rubyhdrdir "
++    RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_rubyarchhdrdir "
++  fi
+   RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_sitearchdir "
+   RUBY_CFLAGS="$RUBY_CFLAGS $rbconfig_CFLAGS "
+   RUBY_LIBS="$rbconfig_LIBRUBYARG"
+--- a/module/dict/tomoe-dict-ruby.c
++++ b/module/dict/tomoe-dict-ruby.c
+@@ -52,6 +52,13 @@
+ #define TOMOE_IS_DICT_RUBY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TOMOE_TYPE_DICT_RUBY))
+ #define TOMOE_DICT_RUBY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), TOMOE_TYPE_DICT_RUBY, TomoeDictRubyClass))
+ 
++#ifndef RARRAY_LEN
++# define RARRAY_LEN(a) (RARRAY(a)->len)
++#endif
++#ifndef RARRAY_PTR
++# define RARRAY_PTR(a) (RARRAY(a)->ptr)
++#endif
++
+ enum {
+     PROP_0,
+     PROP_FILENAME,
+@@ -209,7 +216,7 @@
+         ruby_script (PACKAGE);
+         ruby_set_argv (1, argv);
+ 
+-        if (RARRAY(rb_load_path)->len == 0) {
++        if (RARRAY_LEN(rb_load_path) == 0) {
+             ruby_init_loadpath ();
+         }
+     }
+@@ -405,10 +412,10 @@
+ 
+     rb_results = rb_funcall (dict->rb_dict, rb_intern ("search"),
+                              1, GOBJ2RVAL (query));
+-    len = RARRAY (rb_results)->len;
++    len = RARRAY_LEN(rb_results);
+     for (i = len; i; i--) {
+         results = g_list_prepend (results,
+-                                  RVAL2TCND (RARRAY (rb_results)->ptr[i]));
++                                  RVAL2TCND (RARRAY_PTR(rb_results)[i]));
+     }
+     return results;
+ }
diff --git a/app-i18n/tomoe/metadata.xml b/app-i18n/tomoe/metadata.xml
new file mode 100644
index 000000000000..216815207e4e
--- /dev/null
+++ b/app-i18n/tomoe/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <use>
+    <flag name="hyperestraier">Enable support for <pkg>app-text/hyperestraier</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">tomoe</remote-id>
+    <remote-id type="sourceforge-jp">tomoe</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild
new file mode 100644
index 000000000000..249cf77a5630
--- /dev/null
+++ b/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby23 ruby24"
+
+inherit autotools ltprune python-single-r1 ruby-single
+
+DESCRIPTION="Japanese handwriting recognition engine"
+HOMEPAGE="http://tomoe.osdn.jp/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="hyperestraier mysql python ruby ${USE_RUBY//ruby/ruby_targets_ruby} static-libs subversion"
+RESTRICT="test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	ruby? ( || ( ${USE_RUBY//ruby/ruby_targets_ruby} ) )"
+
+_ruby_set_globals() {
+	local ruby
+	for ruby in ${USE_RUBY}; do
+		RUBY_USEDEP="${RUBY_USEDEP}ruby_targets_${ruby}?,"
+	done
+	RUBY_USEDEP="${RUBY_USEDEP%,}"
+}
+_ruby_set_globals
+unset -f _ruby_set_globals
+
+RDEPEND="dev-libs/glib:2
+	hyperestraier? ( app-text/hyperestraier )
+	mysql? ( virtual/libmysqlclient )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+	)
+	ruby? (
+		${RUBY_DEPS}
+		dev-ruby/ruby-glib2[${RUBY_USEDEP}]
+	)
+	subversion? ( dev-vcs/subversion )"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-export-symbols.patch
+	"${FILESDIR}"/${PN}-glib-2.32.patch
+	"${FILESDIR}"/${PN}-ruby19.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e "s/use_est=yes/use_est=$(usex hyperestraier)/" \
+		-e "s/use_mysql=yes/use_mysql=$(usex mysql)/" \
+		configure.ac
+
+	sed -i "s/use_svn=yes/use_svn=$(usex subversion)/" macros/svn.m4
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local ruby
+	for ruby in ${RUBY_TARGETS_PREFERENCE}; do
+		if use ruby_targets_${ruby}; then
+			break
+		fi
+	done
+
+	econf \
+		$(use_enable ruby dict-ruby) \
+		$(use_enable static-libs static) \
+		$(use_with python python "") \
+		$(use_with ruby ruby "$(type -p ${ruby})") \
+		--with-svn-include="${EPREFIX}"/usr/include \
+		--with-svn-lib="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
diff --git a/app-i18n/transifex-client-0.10 b/app-i18n/transifex-client-0.10
deleted file mode 100644
index 8b6bd3018d56..000000000000
--- a/app-i18n/transifex-client-0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A command line interface for Transifex
-EAPI=5
-HOMEPAGE=https://pypi.org/project/transifex-client/ http://www.transifex.net/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/transifex/transifex-client/archive/0.10.tar.gz -> transifex-client-0.10.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b720f5f364dd6ee5a6af760a0f3c844e
diff --git a/app-i18n/transifex-client-0.12.2 b/app-i18n/transifex-client-0.12.2
deleted file mode 100644
index 1315fc77fcb0..000000000000
--- a/app-i18n/transifex-client-0.12.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A command line interface for Transifex
-EAPI=6
-HOMEPAGE=https://pypi.org/project/transifex-client/ http://www.transifex.net/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/t/transifex-client/transifex-client-0.12.2.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=24f9995512dccd732924d9fa0b5d4477
diff --git a/app-i18n/transifex-client-0.12.4 b/app-i18n/transifex-client-0.12.4
deleted file mode 100644
index 99d98ed43eb9..000000000000
--- a/app-i18n/transifex-client-0.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A command line interface for Transifex
-EAPI=6
-HOMEPAGE=https://pypi.org/project/transifex-client/ http://www.transifex.net/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/t/transifex-client/transifex-client-0.12.4.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=36cbf7a2752b6e11f48077775cd8256b
diff --git a/app-i18n/transifex-client/Manifest b/app-i18n/transifex-client/Manifest
new file mode 100644
index 000000000000..9ee2808f16d4
--- /dev/null
+++ b/app-i18n/transifex-client/Manifest
@@ -0,0 +1,7 @@
+DIST transifex-client-0.10.tar.gz 71817 BLAKE2B ff98cf6ec54131fb7fe25f3eb5b10d204b4269db1d72ec45cd1646fefca9e71e8493846560ad380778ab27119ae81f10a01b3405fb39a20839098f86de8756cc SHA512 c8134f3fc04953d468c2e6ceb0ef90e8335709bde778c5d7d532b3ea390e71abdf8856b8eaa5acf6507c4e6fd2f918e6b0989b3913ee603cc5987b1a9d6b3964
+DIST transifex-client-0.12.2.tar.gz 177046 BLAKE2B e676930ef1269db6b28cd9aebeab20749ed51d27428d0ff7f7b2ac3427812d1a36598d51593d739b5447e088f82e34c6c0b7b209f3c9568f3577bbb640ce0399 SHA512 5cf1df26a195b85cbb20dc6b53ce9e6a39330347edee7e294f8f50bfa954bc47304dcaed1109e405794c67bef0fb62ae6eace90e69556c89ec48d14d6990fdb7
+DIST transifex-client-0.12.4.tar.gz 179349 BLAKE2B 4287bf32a31a5319f54ae5f141f53fa00554c542d7f0f1000e985547f01029b05dc18f38ef992d37c08c6c0ab54d934a4ab37c37f0bfee299d824224316acbad SHA512 516531a0c5a7242da27e8b34a0513b24b806d3b3a271cfe29b31ef7969472f82a37e6fbb1d6198feb1c5bd99d7503bacf3f162808504415ea46670af3fe2369e
+EBUILD transifex-client-0.10.ebuild 497 BLAKE2B aa3269d370a187f15c506f560af4d24587a72ef05816a2af668be4995805d2c02a245c57a70834fb4e2501be35313c76842a72ea766e71ef426802292924f2fd SHA512 fb907677958cfa3278922b22b420511f0243302b82d18aff21459e85b0a5d6f58ce5a5ac00bbf939d05a9d88c1104886078e907f88bb6116aa011472659deecc
+EBUILD transifex-client-0.12.2.ebuild 512 BLAKE2B 5c8bf4e477d373f8e57065baf1bc9e5040dd67c4fa5a39ce567c163521c8a6ab381075b6b16d9f0bce16f7d375970caca6d4365162e2f6fba04f67475b767536 SHA512 284e9383b5399b098e7bc26806cec41affcc6c8b254a4491c389123d1d29716b01263d7c48a10eda51bc255f71e7492689580bf309bea6cf333c484b5dd8b849
+EBUILD transifex-client-0.12.4.ebuild 630 BLAKE2B 1056dde4c5b77d8103c33365b4a428a4a74b746332db67daef2a5489ad87a077423b0d368c9d89281f13ccd15b35f47de32053c9e04db9da8eaf590d4f991146 SHA512 0ad5eb19f0607f40c3e745c484b14577a09220a03d71db4687ed63a418cab7c0b9cb9ac2cd8bb758bc4f5b4efd8c8c44799676888dfd046b1c0838c9f9a88bfe
+MISC metadata.xml 395 BLAKE2B e5566817de8587a0b985f3c608a62a389fac50cd352ba62de05cd33d741129e9ca5feea892c2ae0b46d22882a7c3aea8623b83f00d1fd62f94c5e0b91b9f769c SHA512 142f6e0d75c0dcc6cc315899a48f0362c08977c0f8f70c23d33715080a979f2320050df48d320747ca73c9651fa94411179f335aea5b4713b3640122ffd43cb1
diff --git a/app-i18n/transifex-client/metadata.xml b/app-i18n/transifex-client/metadata.xml
new file mode 100644
index 000000000000..5073b1c3f70b
--- /dev/null
+++ b/app-i18n/transifex-client/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">transifex-client</remote-id>
+		<remote-id type="github">transifex/transifex-client</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/transifex-client/transifex-client-0.10.ebuild b/app-i18n/transifex-client/transifex-client-0.10.ebuild
new file mode 100644
index 000000000000..ffa6e59029dd
--- /dev/null
+++ b/app-i18n/transifex-client/transifex-client-0.10.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A command line interface for Transifex"
+HOMEPAGE="https://pypi.org/project/transifex-client/ http://www.transifex.net/"
+SRC_URI="https://github.com/transifex/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/app-i18n/transifex-client/transifex-client-0.12.2.ebuild b/app-i18n/transifex-client/transifex-client-0.12.2.ebuild
new file mode 100644
index 000000000000..267aa3228929
--- /dev/null
+++ b/app-i18n/transifex-client/transifex-client-0.12.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A command line interface for Transifex"
+HOMEPAGE="https://pypi.org/project/transifex-client/ http://www.transifex.net/"
+SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]"
diff --git a/app-i18n/transifex-client/transifex-client-0.12.4.ebuild b/app-i18n/transifex-client/transifex-client-0.12.4.ebuild
new file mode 100644
index 000000000000..1123e4d9a247
--- /dev/null
+++ b/app-i18n/transifex-client/transifex-client-0.12.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A command line interface for Transifex"
+HOMEPAGE="https://pypi.org/project/transifex-client/ http://www.transifex.net/"
+SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-i18n/translate-shell-0.9.6.6 b/app-i18n/translate-shell-0.9.6.6
deleted file mode 100644
index 81d6316a09b6..000000000000
--- a/app-i18n/translate-shell-0.9.6.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-misc/rlwrap >=sys-apps/gawk-4.0.2 curl? ( net-misc/curl[ssl] ) bidi? ( dev-libs/fribidi ) tts? ( || ( media-sound/mpg123 app-accessibility/espeak media-video/mpv media-video/mplayer ) ) test? ( app-editors/emacs )
-DESCRIPTION=Online command-line translator
-EAPI=6
-HOMEPAGE=https://www.soimort.org/translate-shell/
-IUSE=+curl +bidi test tts
-KEYWORDS=~amd64
-LICENSE=public-domain
-RDEPEND=app-misc/rlwrap >=sys-apps/gawk-4.0.2 curl? ( net-misc/curl[ssl] ) bidi? ( dev-libs/fribidi ) tts? ( || ( media-sound/mpg123 app-accessibility/espeak media-video/mpv media-video/mplayer ) )
-SLOT=0
-SRC_URI=https://github.com/soimort/translate-shell/archive/v0.9.6.6.tar.gz -> translate-shell-0.9.6.6.tar.gz
-_md5_=f8144b70d2b02f0f1ec246a24262199a
diff --git a/app-i18n/translate-shell-0.9.6.7 b/app-i18n/translate-shell-0.9.6.7
deleted file mode 100644
index 4b6ebf48cb24..000000000000
--- a/app-i18n/translate-shell-0.9.6.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-misc/rlwrap >=sys-apps/gawk-4.0.2 curl? ( net-misc/curl[ssl] ) bidi? ( dev-libs/fribidi ) tts? ( || ( media-sound/mpg123 app-accessibility/espeak media-video/mpv media-video/mplayer ) ) test? ( app-editors/emacs )
-DESCRIPTION=Online command-line translator
-EAPI=6
-HOMEPAGE=https://www.soimort.org/translate-shell/
-IUSE=+curl +bidi test tts
-KEYWORDS=~amd64
-LICENSE=public-domain
-RDEPEND=app-misc/rlwrap >=sys-apps/gawk-4.0.2 curl? ( net-misc/curl[ssl] ) bidi? ( dev-libs/fribidi ) tts? ( || ( media-sound/mpg123 app-accessibility/espeak media-video/mpv media-video/mplayer ) )
-SLOT=0
-SRC_URI=https://github.com/soimort/translate-shell/archive/v0.9.6.7.tar.gz -> translate-shell-0.9.6.7.tar.gz
-_md5_=f8144b70d2b02f0f1ec246a24262199a
diff --git a/app-i18n/translate-shell/Manifest b/app-i18n/translate-shell/Manifest
new file mode 100644
index 000000000000..1536d266ea83
--- /dev/null
+++ b/app-i18n/translate-shell/Manifest
@@ -0,0 +1,7 @@
+AUX translate-shell-0.9.6.6-remove-online-tests.patch 1199 BLAKE2B 3d502db0cbbf9b7174c136b7d01f040b07bb72a5a60aa40c4874a75f2e49cd15fcae5509fcec96182762c2e8b69411d0998ebc6e24e0f2567e1b165fe6eed166 SHA512 111e11c9c9756e7de709ac6e2477aa1a3e81ddcfc8227db1d6435c77c0196411ec5aef8dba584a767b4b43f94132efbf63e30bb0d3975116bcb3920350431098
+AUX translate-shell-0.9.6.7-remove-online-tests.patch 1351 BLAKE2B 61eb05917872e07bbc0121e8562ce292d8aa3405fca943815e772debfe39f5c24c53d5d7b9739d8165596558a8ab58eff07e8c69e305f564df2c85a2d4de8e3d SHA512 3910dda851bc71122e07d47df4a63f00fc44b4b2c4b851fddd7686dd93376a0e9e06b5488ded5eb655d17015d7a16da3d4d0ed4d2f0c081eb105320c561045e3
+DIST translate-shell-0.9.6.6.tar.gz 73189 BLAKE2B ad4de403f2c95a1e4de5c963cb017f5a744f08d3bb8256dcc22f28c0916f6a0e693bce171a5dc500de5353c954bab7681f1227df9e48be286ad5aa07c5d06fa4 SHA512 c5451e537f44e325ee2f59d54942f91b8e2ccc0e322c42a2c4a0e98b8a933fe0630798a45e6f587ad5aee2cbb092204710ae36779c94b8333376a8072678d868
+DIST translate-shell-0.9.6.7.tar.gz 74290 BLAKE2B 640e895b7f05c214a3f6fefab98fc85345fa155c29126bc9f14282e345f574cfa077ff7a55e5f1ed51fad3dbd50710a3831b894cabe48d16ce3d903fd63b2f47 SHA512 2648ea5adccd1ba19438bc683b41b7d3c4e1b3fcd79f9273a17ade90df6184a60d0f342f1745857ffb8d5457115bd60d0239a3e77343866a25b64529904ab416
+EBUILD translate-shell-0.9.6.6.ebuild 753 BLAKE2B d6e963c5d674047164ee290f1e6fa9eecae232b641861c1de3c1c3b87a20587f1acfb72a5be7bba6b13d2834cf5e5d6f97994bf19f08ede63bbfe899d905fb98 SHA512 6ca520bdf93406d25e88eee30e7fd47c19bbcc4cc4fbad662ac9a42aefc8d7d4e367dae81d00b5b31d91989e9ad3e3896024e3d34c09a6574cb4f98fbc8cce96
+EBUILD translate-shell-0.9.6.7.ebuild 753 BLAKE2B d6e963c5d674047164ee290f1e6fa9eecae232b641861c1de3c1c3b87a20587f1acfb72a5be7bba6b13d2834cf5e5d6f97994bf19f08ede63bbfe899d905fb98 SHA512 6ca520bdf93406d25e88eee30e7fd47c19bbcc4cc4fbad662ac9a42aefc8d7d4e367dae81d00b5b31d91989e9ad3e3896024e3d34c09a6574cb4f98fbc8cce96
+MISC metadata.xml 856 BLAKE2B 0bfbb3ab59d613c16732c000d7b66f618b05be517ea8976fc187deea834b214f9dc405b1140fa51d98940935beadd3a3c94d35274fc75444360491f5be99662a SHA512 3c5b5a99f2ca8d41ea076b0190ea06a23e7334282a55c5664dd417e34c92cc5df7d03f33bd1d9b1708a1632de66c4d02587c6fe3e6761a70be75783e447c3d00
diff --git a/app-i18n/translate-shell/files/translate-shell-0.9.6.6-remove-online-tests.patch b/app-i18n/translate-shell/files/translate-shell-0.9.6.6-remove-online-tests.patch
new file mode 100644
index 000000000000..2eaf607b4bc8
--- /dev/null
+++ b/app-i18n/translate-shell/files/translate-shell-0.9.6.6-remove-online-tests.patch
@@ -0,0 +1,42 @@
+diff --git a/Makefile b/Makefile
+index acc96e0..622e136 100644
+--- a/Makefile
++++ b/Makefile
+@@ -27,8 +27,6 @@ test: build
+ 
+ check: test
+ 	$(BUILDDIR)/$(COMMAND) -V
+-	[ "`$(BUILDDIR)/$(COMMAND) -no-init -D -b �者`" = 'Ninja' ] &&\
+-	[ "`$(BUILDDIR)/$(COMMAND) -no-init -D -b 'hello world'`" = 'hello world' ]
+ 
+ install: build
+ 	@mkdir -p $(DESTDIR)$(PREFIX)/bin &&\
+diff --git a/test/TestUtils.awk b/test/TestUtils.awk
+index 08bb2e9..3465327 100644
+--- a/test/TestUtils.awk
++++ b/test/TestUtils.awk
+@@ -30,24 +30,6 @@ BEGIN {
+         assertTrue(newerVersion("2", "1.9.9999"))
+     }
+ 
+-    T("curl()", 1)
+-    {
+-        delete tokens; delete ast
+-        tokenize(tokens, curl("https://httpbin.org/get"))
+-        parseJson(ast, tokens)
+-        assertEqual(unparameterize(ast[0 SUBSEP "url"]),
+-                    "https://httpbin.org/get")
+-    }
+-
+-    T("curlPost()", 1)
+-    {
+-        delete tokens; delete ast
+-        tokenize(tokens, curlPost("https://httpbin.org/post", "fizz=buzz"))
+-        parseJson(ast, tokens)
+-        assertEqual(unparameterize(ast[0 SUBSEP "url"]),
+-                    "https://httpbin.org/post")
+-    }
+-
+     T("dump()", 3)
+     {
+         delete group
diff --git a/app-i18n/translate-shell/files/translate-shell-0.9.6.7-remove-online-tests.patch b/app-i18n/translate-shell/files/translate-shell-0.9.6.7-remove-online-tests.patch
new file mode 100644
index 000000000000..f68fec1fdae1
--- /dev/null
+++ b/app-i18n/translate-shell/files/translate-shell-0.9.6.7-remove-online-tests.patch
@@ -0,0 +1,44 @@
+diff --git a/Makefile b/Makefile
+index bb932fc..622e136 100644
+--- a/Makefile
++++ b/Makefile
+@@ -27,10 +27,6 @@ test: build
+ 
+ check: test
+ 	$(BUILDDIR)/$(COMMAND) -V
+-	[ "`$(BUILDDIR)/$(COMMAND) -no-init -D -b �者`" = 'Ninja' ] &&\
+-	[ "`$(BUILDDIR)/$(COMMAND) -no-init -D -b -e bing �者`" = 'Ninja' ] &&\
+-	[ "`$(BUILDDIR)/$(COMMAND) -no-init -D -b -e yandex �者`" = 'Ninja' ] &&\
+-	[ "`$(BUILDDIR)/$(COMMAND) -no-init -D -b -e deepl Ninja`" = 'Ninja' ]
+ 
+ install: build
+ 	@mkdir -p $(DESTDIR)$(PREFIX)/bin &&\
+diff --git a/test/TestUtils.awk b/test/TestUtils.awk
+index 08bb2e9..3465327 100644
+--- a/test/TestUtils.awk
++++ b/test/TestUtils.awk
+@@ -30,24 +30,6 @@ BEGIN {
+         assertTrue(newerVersion("2", "1.9.9999"))
+     }
+ 
+-    T("curl()", 1)
+-    {
+-        delete tokens; delete ast
+-        tokenize(tokens, curl("https://httpbin.org/get"))
+-        parseJson(ast, tokens)
+-        assertEqual(unparameterize(ast[0 SUBSEP "url"]),
+-                    "https://httpbin.org/get")
+-    }
+-
+-    T("curlPost()", 1)
+-    {
+-        delete tokens; delete ast
+-        tokenize(tokens, curlPost("https://httpbin.org/post", "fizz=buzz"))
+-        parseJson(ast, tokens)
+-        assertEqual(unparameterize(ast[0 SUBSEP "url"]),
+-                    "https://httpbin.org/post")
+-    }
+-
+     T("dump()", 3)
+     {
+         delete group
diff --git a/app-i18n/translate-shell/metadata.xml b/app-i18n/translate-shell/metadata.xml
new file mode 100644
index 000000000000..bea3adaede38
--- /dev/null
+++ b/app-i18n/translate-shell/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>erkiferenc@gmail.com</email>
+		<name>Ferenc Erki</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Translate Shell (formerly Google Translate CLI) is a command-line
+		translator powered by Google Translate (default), Bing Translator, and
+		Yandex.Translate.
+	</longdescription>
+	<use>
+		<flag name="tts">Enable text-to-speech support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">soimort/translate-shell</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/translate-shell/translate-shell-0.9.6.6.ebuild b/app-i18n/translate-shell/translate-shell-0.9.6.6.ebuild
new file mode 100644
index 000000000000..6447ab3f65e0
--- /dev/null
+++ b/app-i18n/translate-shell/translate-shell-0.9.6.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Online command-line translator"
+HOMEPAGE="https://www.soimort.org/translate-shell/"
+SRC_URI="https://github.com/soimort/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+curl +bidi test tts"
+
+RDEPEND="
+	app-misc/rlwrap
+	>=sys-apps/gawk-4.0.2
+	curl? ( net-misc/curl[ssl] )
+	bidi? ( dev-libs/fribidi )
+	tts? ( || (
+		media-sound/mpg123
+		app-accessibility/espeak
+		media-video/mpv
+		media-video/mplayer
+		)
+	)"
+DEPEND="${RDEPEND}
+	test? ( app-editors/emacs )
+	"
+
+PATCHES=(
+	"${FILESDIR}/${P}-remove-online-tests.patch"
+)
+
+src_install() {
+	emake PREFIX="${D}/usr" install
+}
diff --git a/app-i18n/translate-shell/translate-shell-0.9.6.7.ebuild b/app-i18n/translate-shell/translate-shell-0.9.6.7.ebuild
new file mode 100644
index 000000000000..6447ab3f65e0
--- /dev/null
+++ b/app-i18n/translate-shell/translate-shell-0.9.6.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Online command-line translator"
+HOMEPAGE="https://www.soimort.org/translate-shell/"
+SRC_URI="https://github.com/soimort/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+curl +bidi test tts"
+
+RDEPEND="
+	app-misc/rlwrap
+	>=sys-apps/gawk-4.0.2
+	curl? ( net-misc/curl[ssl] )
+	bidi? ( dev-libs/fribidi )
+	tts? ( || (
+		media-sound/mpg123
+		app-accessibility/espeak
+		media-video/mpv
+		media-video/mplayer
+		)
+	)"
+DEPEND="${RDEPEND}
+	test? ( app-editors/emacs )
+	"
+
+PATCHES=(
+	"${FILESDIR}/${P}-remove-online-tests.patch"
+)
+
+src_install() {
+	emake PREFIX="${D}/usr" install
+}
diff --git a/app-i18n/uchardet-0.0.6-r2 b/app-i18n/uchardet-0.0.6-r2
deleted file mode 100644
index 93529aa0551a..000000000000
--- a/app-i18n/uchardet-0.0.6-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=An encoding detector library
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/uchardet/
-IUSE=cpu_flags_x86_sse2 static-libs test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86
-LICENSE=|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )
-SLOT=0
-SRC_URI=https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.6.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=582c1d6cc2eccb2eca156e537191b671
diff --git a/app-i18n/uchardet-9999 b/app-i18n/uchardet-9999
deleted file mode 100644
index 9fccbbbdfe26..000000000000
--- a/app-i18n/uchardet-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=An encoding detector library
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/uchardet/
-IUSE=cpu_flags_x86_sse2 static-libs test
-LICENSE=|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )
-SLOT=0
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c94ee6c97c68c1477914943b3a71c5df
diff --git a/app-i18n/uchardet/Manifest b/app-i18n/uchardet/Manifest
new file mode 100644
index 000000000000..6b103c21f985
--- /dev/null
+++ b/app-i18n/uchardet/Manifest
@@ -0,0 +1,5 @@
+AUX uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch 2401 BLAKE2B 3f0cf425385d333488c7eeb37c37f3ec6a224e0a96d2c1bbcaded770c8ab6b5bd8277808fbce2bbc960cb3838e0e9de8d889ef9fe2af2e3b44ec4a81031d43f1 SHA512 fb684a362095810bb462609859018dd22987704ab9def0d0ea9ab6afc076fddcf338c622b9f587649d6f561a216b8bc234d3499c499ce3d4589113e908037972
+DIST uchardet-0.0.6.tar.xz 169192 BLAKE2B a0bc80ecd12565c1459b8136e3dc0530250571b5adbe4a7013c561f846f64f58482b9fd9cc5aa7493f20e913f59504a6e08c26571bf33ff34b4823f55d857b8c SHA512 eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5
+EBUILD uchardet-0.0.6-r2.ebuild 823 BLAKE2B d3a291c1dc983135f549fff78942472ef409dcad3db18f7e602ea555ffa1efea5472b4bc70de98822c61ea70aa4a671495eb95de1d06a6dbe15ce462d6dd2231 SHA512 17b2dab20ed3dc8176e435689d0d9624b70f68719a9f253af93209e6414a0bcc62cc6508b337006f99b55b463d6b980e00b02a380eee708291b7635c80a9a475
+EBUILD uchardet-9999.ebuild 709 BLAKE2B ee0157c9893a0f32f9a1ae4239ca45ffa55bd8f2ec65a3733b95374d32c242ad4da69979a31927942ca2eb1d75dc6be23e8acbe38645b82878a1204ea2c9d6d5 SHA512 78900bf42f2d6050df74789fac4bd03259dbf76adad2f0310e285dfc0a58bd66eff606e6f66455d688e93430544e11553130a679b7bf1ca0cab4575057ff3e46
+MISC metadata.xml 472 BLAKE2B d9ef3c52d66ba665481312bd5f99c8be7ada8ea593c851d103451b388c3d37972762a33c9f7d2552ace1dfcaed4bf907145985c081eef0ffd29ffdb6d1c26108 SHA512 3cc702714648db5605638ba28364caa1e0ad0be1b9fb519b434f34fa993f76ba29a9ccdef0e8dea8f4b0fd89514c7196328a1f77efbb9aece30adce5063f7536
diff --git a/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch b/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch
new file mode 100644
index 000000000000..2bc4977a5f00
--- /dev/null
+++ b/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch
@@ -0,0 +1,59 @@
+Add configuration option to enable SSE2.
+Add -ffloat-store flag on x86 without SSE2.
+
+Gentoo bug: https://bugs.gentoo.org/631852
+Gentoo bug: https://bugs.gentoo.org/641716
+Upstream bug: https://bugs.freedesktop.org/show_bug.cgi?id=101033
+
+This patch is an aggregation of the following upstream commits:
+5996bbd995aed5045cc22e4d1fab08c989377983
+77bf71ea365a19ac55c59cf10399b566a02d82c1
+939482ab2b5a6585bdd2e5251f3f2f113d64686f
+cd617d181de03a7a13c2020e6c73cd14585e24b6
+f136d434f0809e064ac195b5bc4e0b50484a474c
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e9a699e..d140a24 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,6 @@
+ ######## Project settings
+ cmake_minimum_required(VERSION 2.8.5)
++include(CheckCCompilerFlag)
+ set (PACKAGE_NAME uchardet)
+ project (${PACKAGE_NAME} CXX C)
+ enable_testing()
+@@ -33,13 +34,31 @@ include(GNUInstallDirs)
+
+ ######## Configuration
+
+-option(BUILD_BINARY "Build executable" ON)
+-option(BUILD_SHARED_LIBS "Build shared library and link executable to it" ON)
++option(BUILD_BINARY "Build the CLI tool." ON)
++option(BUILD_SHARED_LIBS "Build shared library and link executable to it." ON)
++option(CHECK_SSE2 "Check and enable SSE2 extensions if supported. Disabling SSE on platforms which support it may decrease performances." ON)
++set(TARGET_ARCHITECTURE "" CACHE STRING "Target CPU architecture. It is autodetected if not specified.")
+
+ if (BUILD_SHARED_LIBS)
+ 	option(BUILD_STATIC "Build static library" ON)
+ endif (BUILD_SHARED_LIBS)
+
++if (TARGET_ARCHITECTURE STREQUAL "")
++    string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} TARGET_ARCHITECTURE)
++endif (TARGET_ARCHITECTURE STREQUAL "")
++
++if (TARGET_ARCHITECTURE MATCHES ".*(x86)|(amd).*")
++    CHECK_C_COMPILER_FLAG(-msse2 SUPPORTS_CFLAG_SSE2)
++    CHECK_C_COMPILER_FLAG(-mfpmath=sse SUPPORTS_CFLAG_SSE_MATH)
++    if (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
++        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse")
++        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse")
++    else (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
++        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffloat-store")
++        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffloat-store")
++    endif (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
++endif (TARGET_ARCHITECTURE MATCHES ".*(x86)|(amd).*")
++
+ configure_file(
+ 	uchardet.pc.in
+ 	uchardet.pc
diff --git a/app-i18n/uchardet/metadata.xml b/app-i18n/uchardet/metadata.xml
new file mode 100644
index 000000000000..fea82382a727
--- /dev/null
+++ b/app-i18n/uchardet/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>itumaykin+gentoo@gmail.com</email>
+		<name>Coacher</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.freedesktop.org/enter_bug.cgi?product=uchardet</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild b/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild
new file mode 100644
index 000000000000..5c0b29761a4b
--- /dev/null
+++ b/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="An encoding detector library"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
+SRC_URI="https://www.freedesktop.org/software/uchardet/releases/${P}.tar.xz"
+
+LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
+IUSE="cpu_flags_x86_sse2 static-libs test"
+
+PATCHES=( "${FILESDIR}/${P}-enforce-IEEE-float-precision-r1.patch" )
+
+src_prepare() {
+	cmake-utils_src_prepare
+	use test || cmake_comment_add_subdirectory test
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DTARGET_ARCHITECTURE="${ARCH}"
+		-DBUILD_STATIC=$(usex static-libs)
+		-DCHECK_SSE2=$(usex cpu_flags_x86_sse2)
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-i18n/uchardet/uchardet-9999.ebuild b/app-i18n/uchardet/uchardet-9999.ebuild
new file mode 100644
index 000000000000..d694e455f2fe
--- /dev/null
+++ b/app-i18n/uchardet/uchardet-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils git-r3
+
+DESCRIPTION="An encoding detector library"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/uchardet/uchardet.git"
+
+LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
+SLOT="0"
+KEYWORDS=""
+IUSE="cpu_flags_x86_sse2 static-libs test"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	use test || cmake_comment_add_subdirectory test
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DTARGET_ARCHITECTURE="${ARCH}"
+		-DBUILD_STATIC=$(usex static-libs)
+		-DCHECK_SSE2=$(usex cpu_flags_x86_sse2)
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-i18n/uim-1.8.6-r1 b/app-i18n/uim-1.8.6-r1
deleted file mode 100644
index 37219a2bb62f..000000000000
--- a/app-i18n/uim-1.8.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=!dev-scheme/sigscheme X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt ) anthy? ( app-i18n/anthy ) canna? ( app-i18n/canna ) curl? ( net-misc/curl ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) expat? ( dev-libs/expat ) libffi? ( virtual/libffi ) gtk? ( x11-libs/gtk+:3 ) gtk2? ( x11-libs/gtk+:2 ) libedit? ( dev-libs/libedit ) libnotify? ( x11-libs/libnotify ) m17n-lib? ( dev-libs/m17n-lib ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) qt4? ( dev-qt/qtgui:4[qt3support] ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=A multilingual input method framework
-EAPI=6
-HOMEPAGE=https://github.com/uim/uim
-IUSE=X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs xft
-KEYWORDS=amd64 ~arm hppa ppc ppc64 x86
-LICENSE=BSD GPL-2 LGPL-2.1
-RDEPEND=!dev-scheme/sigscheme X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt ) anthy? ( app-i18n/anthy ) canna? ( app-i18n/canna ) curl? ( net-misc/curl ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) expat? ( dev-libs/expat ) libffi? ( virtual/libffi ) gtk? ( x11-libs/gtk+:3 ) gtk2? ( x11-libs/gtk+:2 ) libedit? ( dev-libs/libedit ) libnotify? ( x11-libs/libnotify ) m17n-lib? ( dev-libs/m17n-lib ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) qt4? ( dev-qt/qtgui:4[qt3support] ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0 ) X? ( media-fonts/font-sony-misc l10n_ja? ( || ( media-fonts/font-jis-misc media-fonts/intlfonts ) ) l10n_ko? ( || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) ) l10n_zh-CN? ( || ( media-fonts/font-isas-misc media-fonts/intlfonts ) ) l10n_zh-TW? ( media-fonts/intlfonts ) )
-REQUIRED_USE=gtk? ( X ) gtk2? ( X ) qt4? ( X ) xft? ( X )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/uim/uim/releases/download/uim-1.8.6/uim-1.8.6.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e2f40feeaa435c76da60fb8cf7b5c448
diff --git a/app-i18n/uim-1.8.6-r2 b/app-i18n/uim-1.8.6-r2
deleted file mode 100644
index 9c31b44f63fc..000000000000
--- a/app-i18n/uim-1.8.6-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=!dev-scheme/sigscheme X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt ) anthy? ( app-i18n/anthy ) canna? ( app-i18n/canna ) curl? ( net-misc/curl ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) expat? ( dev-libs/expat ) libffi? ( virtual/libffi ) gtk? ( x11-libs/gtk+:3 ) gtk2? ( x11-libs/gtk+:2 ) libedit? ( dev-libs/libedit ) libnotify? ( x11-libs/libnotify ) m17n-lib? ( dev-libs/m17n-lib ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) qt4? ( dev-qt/qtgui:4[qt3support] ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) dev-util/intltool sys-devel/gettext virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=A multilingual input method framework
-EAPI=6
-HOMEPAGE=https://github.com/uim/uim
-IUSE=X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls qt4 skk sqlite ssl static-libs xft
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=BSD GPL-2 LGPL-2.1
-RDEPEND=!dev-scheme/sigscheme X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt ) anthy? ( app-i18n/anthy ) canna? ( app-i18n/canna ) curl? ( net-misc/curl ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) expat? ( dev-libs/expat ) libffi? ( virtual/libffi ) gtk? ( x11-libs/gtk+:3 ) gtk2? ( x11-libs/gtk+:2 ) libedit? ( dev-libs/libedit ) libnotify? ( x11-libs/libnotify ) m17n-lib? ( dev-libs/m17n-lib ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) qt4? ( dev-qt/qtgui:4[qt3support] ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) X? ( media-fonts/font-sony-misc l10n_ja? ( || ( media-fonts/font-jis-misc media-fonts/intlfonts ) ) l10n_ko? ( || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) ) l10n_zh-CN? ( || ( media-fonts/font-isas-misc media-fonts/intlfonts ) ) l10n_zh-TW? ( media-fonts/intlfonts ) )
-REQUIRED_USE=gtk? ( X ) gtk2? ( X ) qt4? ( X ) xft? ( X )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/uim/uim/releases/download/uim-1.8.6/uim-1.8.6.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=196e0a835ff2983dff5faa15b134f795
diff --git a/app-i18n/uim-1.8.8 b/app-i18n/uim-1.8.8
deleted file mode 100644
index 2a6e8bdcae87..000000000000
--- a/app-i18n/uim-1.8.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=!dev-scheme/sigscheme X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt ) anthy? ( app-i18n/anthy ) canna? ( app-i18n/canna ) curl? ( net-misc/curl ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) expat? ( dev-libs/expat ) libffi? ( virtual/libffi ) gtk? ( x11-libs/gtk+:3 ) gtk2? ( x11-libs/gtk+:2 ) libedit? ( dev-libs/libedit ) libnotify? ( x11-libs/libnotify ) m17n-lib? ( dev-libs/m17n-lib ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtx11extras:5 ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) dev-util/intltool sys-devel/gettext virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=A multilingual input method framework
-EAPI=6
-HOMEPAGE=https://github.com/uim/uim
-IUSE=X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=BSD GPL-2 LGPL-2.1
-RDEPEND=!dev-scheme/sigscheme X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt ) anthy? ( app-i18n/anthy ) canna? ( app-i18n/canna ) curl? ( net-misc/curl ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) expat? ( dev-libs/expat ) libffi? ( virtual/libffi ) gtk? ( x11-libs/gtk+:3 ) gtk2? ( x11-libs/gtk+:2 ) libedit? ( dev-libs/libedit ) libnotify? ( x11-libs/libnotify ) m17n-lib? ( dev-libs/m17n-lib ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtx11extras:5 ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) X? ( media-fonts/font-sony-misc l10n_ja? ( || ( media-fonts/font-jis-misc media-fonts/intlfonts ) ) l10n_ko? ( || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) ) l10n_zh-CN? ( || ( media-fonts/font-isas-misc media-fonts/intlfonts ) ) l10n_zh-TW? ( media-fonts/intlfonts ) )
-REQUIRED_USE=gtk? ( X ) gtk2? ( X ) qt5? ( X ) xft? ( X )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/uim/uim/releases/download/1.8.8/uim-1.8.8.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ecce160da87d58e90ccbbe7455b8abc2
diff --git a/app-i18n/uim-tomoe-gtk-0.6.0 b/app-i18n/uim-tomoe-gtk-0.6.0
deleted file mode 100644
index 92c37021c56a..000000000000
--- a/app-i18n/uim-tomoe-gtk-0.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=app-i18n/uim ~app-i18n/tomoe-gtk-0.6.0 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Japanese input method Tomoe IMEngine for uim
-EAPI=6
-HOMEPAGE=http://tomoe.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-i18n/uim ~app-i18n/tomoe-gtk-0.6.0
-SLOT=0
-SRC_URI=mirror://sourceforge/tomoe/uim-tomoe-gtk-0.6.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=db2acd4cbc8e02e10e6f754883d8e08d
diff --git a/app-i18n/uim-tomoe-gtk/Manifest b/app-i18n/uim-tomoe-gtk/Manifest
new file mode 100644
index 000000000000..1685c5c27fda
--- /dev/null
+++ b/app-i18n/uim-tomoe-gtk/Manifest
@@ -0,0 +1,3 @@
+DIST uim-tomoe-gtk-0.6.0.tar.gz 372357 BLAKE2B 4624dcaa209dd1f89bbcff6232b72673b9a9e22609c326104e1fbef9e007c33e8711cd435ef5239d43e0104a65fc652ff74eb9b8787b1e0123e10f71bb07b241 SHA512 201c6a755feaef22b11f88a27b0d004d22ab13e806684ad839f7491ca17626eaf0f866a026c3fcf3b981c41c9c6a880d7f9f7a5156d3dad70d8edb78568b1d5d
+EBUILD uim-tomoe-gtk-0.6.0.ebuild 477 BLAKE2B 1f99c0f6dab6d649c31042f7767b8ddfd90490f8e610a2604524548f08aada432be2b8738495aa7c31831a683a031d94be37b7fdccbf8ac4ccd43a33e3d3ca0c SHA512 473e6b8e6f76d8ed127d4e88c051b7c33c5b9c75fe44818f4f7f8a687727d26cbe5480c1dcd8938b3574b44b69c999ca4079bf09164751ae873fb67dc0e5ef50
+MISC metadata.xml 309 BLAKE2B f8126911d309ca51f6e56437d2c219026c2e50d854b62c44afc5e211cff957d1776b0fef17a64da072033c5df308c6015786feb49344be3c8c4c57074d028d36 SHA512 7d9c17a3c4279406d23064447a7370658c494bbc5eab2a05f048f58ac3e136804ad65dc2fafbfc132b1f82ca6a651f6fe34beb68ea370b5a0eb1a3f6c98d3c2d
diff --git a/app-i18n/uim-tomoe-gtk/metadata.xml b/app-i18n/uim-tomoe-gtk/metadata.xml
new file mode 100644
index 000000000000..f01b1e07af44
--- /dev/null
+++ b/app-i18n/uim-tomoe-gtk/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tomoe</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild b/app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild
new file mode 100644
index 000000000000..6d00f5ece70d
--- /dev/null
+++ b/app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+DESCRIPTION="Japanese input method Tomoe IMEngine for uim"
+HOMEPAGE="http://tomoe.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-i18n/uim
+	~app-i18n/tomoe-gtk-0.6.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
new file mode 100644
index 000000000000..eeb5d4e68437
--- /dev/null
+++ b/app-i18n/uim/Manifest
@@ -0,0 +1,15 @@
+AUX 50uim-gentoo.el 71 BLAKE2B 94142633d1a13a0d4ea71e4325883be1e407e154277a4a361701bf694b62e3e8855d4627a72015fb04b1470e128df80fefcdb999e2f1090fa03a454287af52f2 SHA512 e2b6d74d14cdf7d81ab128b2e4ffe1d7dcc0013d61685687ca92619704fd38ec1da6a12fabc3878aa7a9ddd9bf0194c499d3100f176f0a96920322a451c04831
+AUX uim-1.8.6-gentoo.patch 618 BLAKE2B 339602558ab7f8d09ef49f9be948f735c6f262961e82d74d22f83a47b9a4072c64d1d197147a168caaa9fbe3fd4b9b1cbc2364576130d400d06cc77551544a75 SHA512 b48d80d26d15956ece6457df32ea35c8ccb2b37cd222699bd35a1cbf40cd6fec14ae424cac17ee91db159a9369a37cc7b8af29c2613d55eb1e82be4e06324d86
+AUX uim-1.8.6-libressl.patch 2041 BLAKE2B d13fc555ce0351b46a08f6fd258a5f222ac104e5107281548a97d2251cfcec89ece8addc2bd5be51f192a854b72701bb9abdc1f97e2c717cd2ae907a088579c1 SHA512 a1af2af13b26b631064165c8f6d6dafaba09d236b489e0e8fd84a7ab6d9c0720a8a91cd9f8baabcc1e640157559fd77f68e18d5e85aaf0c335e25b69e0ef120a
+AUX uim-1.8.6-qt.patch 755 BLAKE2B dccef1b392e331b230f99f34c3dfc2829a49d5c5a15ac7c41eef201f06e5e6bd5c78ea7a3253b7bbcbbccb77feee7bfae677368cdccc1090c4dd8df26a38a5eb SHA512 ba3b80fe5951e2d508c8fc280038f17523a2de5a0bb136179a486c076aa3dd343112dcc976b2d2e4ae157aaa81682ea85031fcb51682776ecdcdb929f6aceb65
+AUX uim-1.8.6-tinfo.patch 2646 BLAKE2B edb4fde474b7264ed8a4a4db329ac06068ddb68e4b0bb6bd33e011018b5450de8ecc2b94716ca486a8a3b965867ee62eb0b3be2b2e939155a0cc34a02264a7a6 SHA512 34c2df710f0053c40b858369036d2e4bbac6a5da6f81794c3d97f6c58713d14c4bffffda555d9fc10ce2d70406578b2a50c9397b23c008ec4b106aa0a4582338
+AUX uim-gentoo.patch 601 BLAKE2B fba57214c7e222e9f042cda4194738ffd170787d3d5431415a9a26632b25bdd9566489352ee4e64f396add88f270931320faed73652002fe67a379f1d644ff65 SHA512 002538e809f174f026df354ebcd4b487d42c0e9f7e409b8c97240969ec3be55f22b754ea34d707fb8eadab1321dd8a3c4b7861b51a606eb741f314f20e473f4a
+AUX uim-tinfo.patch 1594 BLAKE2B 9c52b5603f5d6ebe229e15597ef75ae7049744dee0b2977a9bcd0f7ba59fb8cf111dc8fcc1c25b4ce4363b8f969d76d50a3892ebfe9808afa517bafdde623658 SHA512 13c074b9b33ceb169dcb3cb879f9dfced36dc29da5f45aacaf3dbcd62f3d9a5d565a05b6c3353dc30a33f33f1740032f233e731dc6f430a92c4d133614e57cdc
+AUX uim-zh-TW.patch 871 BLAKE2B 091efbed0182f05c87e5a5c789ca7ea3862e61566dad5411a5158b348e73123a60efe869b7aa8d43af603ba01e908eb5d135762069abb3c01951a144739b6126 SHA512 0cf0955cded7870b5012f283adb30dbbab6fee9d468178248987036cd3e78fc21e1279481289f9400784fb1e59fda91d1cc8ac1cc8b3d57f0f24258b8b9f40f4
+AUX xinput-uim 108 BLAKE2B f66525e52af923170224ca9953e82489d7f6f92c3e83d96452663ebd538723d1dbaaaa4233bf2bebe1ad6f783fffd4e3e4e82bba5f6fd92d0ef88e3cbaaff6eb SHA512 b3ba31a87e19f589ac8051ece45b6b6c44b295dde76a5ce6164d1e435d791c4e7cafc7192177384f4052fd928caabb8574a9192cf783f4cb22e4ee16741343fc
+DIST uim-1.8.6.tar.bz2 6500739 BLAKE2B 78623c015cafafa1fbaf32542535de1f0207f8452a422d929a15f4421e4c9926192d0d3b761a7865a38affdf616dc5477e083c0fd8655261ff80ca817fd37029 SHA512 26a95d3b51ef7a99108234b9af30ee7b74141cb3af13d092d4cdbf0749f630934cfd67f74b09dacc3adcdce4a390104489d68a4e2419ec07418645a9b4e5715b
+DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3
+EBUILD uim-1.8.6-r1.ebuild 5052 BLAKE2B 67f7e600a86a2f74ee49def7684bed41182946a6f0591892ef3b79609a5ae0002514ea941eeae6dca13ce93627fce28efbf1c9fb84f3fec805d301a347309edc SHA512 521d6bb0c8e40cf4a8b2a8c7ecbf650bbb24d6143ecfb4fa2e6ab3b0aa1df2d6e243345bb6bee9412c3fd5af8cfe20b88a05fb4ab3e048406ac3f674ac587aab
+EBUILD uim-1.8.6-r2.ebuild 5157 BLAKE2B 87909b8657beb68f9148b937ccdbaf97cc515d556fd7bbd97b9c5e08a202d7e3f1b835a0d1394dba7d98236642cf3eb94199ae764f45435cb769961d0b537672 SHA512 405dc2308abd24708c3b4fb68e866b83300a48909d5b60c1c21127235e2a7d69e984fda7e4131774de3c86da1c442cac36010569bf9d573ea89a79ee298522b0
+EBUILD uim-1.8.8.ebuild 5300 BLAKE2B c778627e7f1868b6c8c54133965c24619f8450a5ebcae0f58cc093d6b23f3176fa7e67ac7b1622434a10fa96d1202a1693c81c554514a28f8a4d6221ba0bf36b SHA512 ab7edd45870830ae7a5149a4f69903624dc8ec323cc9274384b50076da2c7375284368690dbd64b1b05cc4f051a25a30760fdda0fcabef0d7980fe28312258e5
+MISC metadata.xml 1058 BLAKE2B 3569e92b5050f14f1ed7482e602db2bddda608f49940bd1d0be7708247abd6ef67e648918f271722b8688f56065394da64acd48c0333a23bc6475be4349d49af SHA512 392645fde85e225d2ffeac5fae39018208f40e4f2a44e6a2dd082af82759c69bfb17c1fc8a515d10e0ae808b747074ad6cc13c1cca79582047f8778c8458e088
diff --git a/app-i18n/uim/files/50uim-gentoo.el b/app-i18n/uim/files/50uim-gentoo.el
new file mode 100644
index 000000000000..101505c4bd59
--- /dev/null
+++ b/app-i18n/uim/files/50uim-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'uim-mode "uim" nil t)
diff --git a/app-i18n/uim/files/uim-1.8.6-gentoo.patch b/app-i18n/uim/files/uim-1.8.6-gentoo.patch
new file mode 100644
index 000000000000..0feee5a70997
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.6-gentoo.patch
@@ -0,0 +1,28 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -36,6 +36,7 @@
+ AC_PATH_PROGS(SHA1, sha1 sha1sum)
+ AC_PATH_PROGS(SED, sed gsed)
+ AX_PATH_QMAKE4
++PKG_PROG_PKG_CONFIG
+ 
+ AM_MAINTAINER_MODE
+ 
+@@ -1792,7 +1793,7 @@
+   fi
+   AX_LANG_WNOERROR  # end AC_LANG_WERROR
+ 
+-  QT_CONFIG_OPTS="debug"
++  QT_CONFIG_OPTS="debug nostrip"
+ else
+   CFLAGS="$CFLAGS -DNDEBUG"
+   CXXFLAGS="$CXXFLAGS -DNDEBUG"
+@@ -1810,7 +1811,7 @@
+   AX_CFLAGS_GCC_OPTION([-Wno-unused-variable],  [SCIM_CFLAGS])
+   AX_LANG_WNOERROR  # end AC_LANG_WERROR
+ 
+-  QT_CONFIG_OPTS="release"
++  QT_CONFIG_OPTS="release nostrip"
+ fi
+ 
+ AC_ARG_ENABLE(warnings-into-error,
diff --git a/app-i18n/uim/files/uim-1.8.6-libressl.patch b/app-i18n/uim/files/uim-1.8.6-libressl.patch
new file mode 100644
index 000000000000..b14de58433aa
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.6-libressl.patch
@@ -0,0 +1,79 @@
+From 7a281b1131399f04627986e6f9a54499b08e239d Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Thu, 21 Apr 2016 23:12:10 +0200
+Subject: [PATCH] Make openssl SSLv2 and SSLv3 support optional
+
+Fixes compilation with libressl
+---
+ uim/openssl.c | 30 ++++++++++++++++++++++++++++++
+ 1 file changed, 30 insertions(+)
+
+diff --git a/uim/openssl.c b/uim/openssl.c
+index ba1b238..35ca1ca 100644
+--- a/uim/openssl.c
++++ b/uim/openssl.c
+@@ -208,34 +208,64 @@ c_SSL_write(uim_lisp s_, uim_lisp buf_)
+ static uim_lisp
+ c_SSLv2_method(void)
+ {
++#ifndef OPENSSL_NO_SSL2
+   return MAKE_PTR(SSLv2_method());
++#else
++  uim_notify_fatal(N_("uim-openssl: SSLv2_method() is not supported on this system"));
++  return uim_scm_f();
++#endif
+ }
+ static uim_lisp
+ c_SSLv2_server_method(void)
+ {
++#ifndef OPENSSL_NO_SSL2
+   return MAKE_PTR(SSLv2_server_method());
++#else
++  uim_notify_fatal(N_("uim-openssl: SSLv2_server_method() is not supported on this system"));
++  return uim_scm_f();
++#endif
+ }
+ static uim_lisp
+ c_SSLv2_client_method(void)
+ {
++#ifndef OPENSSL_NO_SSL2
+   return MAKE_PTR(SSLv2_client_method());
++#else
++  uim_notify_fatal(N_("uim-openssl: SSLv2_client_method() is not supported on this system"));
++  return uim_scm_f();
++#endif
+ }
+ 
+ /* SSLv3 */
+ static uim_lisp
+ c_SSLv3_method(void)
+ {
++#ifndef OPENSSL_NO_SSL3
+   return MAKE_PTR(SSLv3_method());
++#else
++  uim_notify_fatal(N_("uim-openssl: SSLv3_method() is not supported on this system"));
++  return uim_scm_f();
++#endif
+ }
+ static uim_lisp
+ c_SSLv3_server_method(void)
+ {
++#ifndef OPENSSL_NO_SSL3
+   return MAKE_PTR(SSLv3_server_method());
++#else
++  uim_notify_fatal(N_("uim-openssl: SSLv3_server_method() is not supported on this system"));
++  return uim_scm_f();
++#endif
+ }
+ static uim_lisp
+ c_SSLv3_client_method(void)
+ {
++#ifndef OPENSSL_NO_SSL3
+   return MAKE_PTR(SSLv3_client_method());
++#else
++  uim_notify_fatal(N_("uim-openssl: SSLv3_client_method() is not supported on this system"));
++  return uim_scm_f();
++#endif
+ }
+ 
+ /* SSLv3 but can rollback to v2 */
diff --git a/app-i18n/uim/files/uim-1.8.6-qt.patch b/app-i18n/uim/files/uim-1.8.6-qt.patch
new file mode 100644
index 000000000000..6c0cb7eee667
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.6-qt.patch
@@ -0,0 +1,16 @@
+--- a/m4/ax_path_qmake4.m4
++++ b/m4/ax_path_qmake4.m4
+@@ -23,10 +23,10 @@
+ #   the copyright notice and this notice are preserved.
+ 
+ AC_DEFUN([AX_PATH_QMAKE4], [
+-  ax_guessed_qt4_dirs="/usr/lib/qt4/bin:/usr/local/lib/qt4/bin:/usr/qt4/bin:/usr/local/qt4/bin:${QT4DIR}/bin:${QTDIR}/bin"
++  ax_guessed_qt4_dirs="${QT4DIR}/bin:${QTDIR}/bin"
+   AC_PROG_EGREP
+-  AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], ["$PATH:$ax_guessed_qt4_dirs"])
+-  AC_PATH_PROGS(_QMAKE, [qmake], [], ["$PATH:$ax_guessed_qt4_dirs"])
++  AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], ["$ax_guessed_qt4_dirs:$PATH"])
++  AC_PATH_PROGS(_QMAKE, [qmake], [], ["$ax_guessed_qt4_dirs:$PATH"])
+ 
+   AC_CACHE_CHECK([for Qt4 version of qmake], ax_cv_path_QMAKE4, [
+     ax_cv_path_QMAKE4=no
diff --git a/app-i18n/uim/files/uim-1.8.6-tinfo.patch b/app-i18n/uim/files/uim-1.8.6-tinfo.patch
new file mode 100644
index 000000000000..51105c909f54
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.6-tinfo.patch
@@ -0,0 +1,65 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1058,27 +1058,25 @@
+       ;;
+       yes|*)
+         use_uim_fep="yes"
+-	AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
+-	  [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
+-	    AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
+-	AC_CHECK_FUNCS(forkpty)
+-	if test $ac_cv_func_forkpty = no; then
+-	  AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
+-	fi
+-	AC_SUBST(FEP_LIBADD)
+       ;;
+     esac
+   ],
+-  [ use_uim_fep="yes"
+-    AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
+-      [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
+-        AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
+-    AC_CHECK_FUNCS(forkpty)
+-    if test $ac_cv_func_forkpty = no; then
+-      AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
+-    fi
+-    AC_SUBST(FEP_LIBADD)
+-  ])
++  [use_uim_fep="yes"])
++
++if test "x$use_uim_fep" != "xno"; then
++  PKG_CHECK_MODULES(CURSES, ncurses,
++    [FEP_LIBADD="$CURSES_LIBS $FEP_LIBADD"],
++    [
++      AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
++        [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
++          AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
++    ])
++  AC_CHECK_FUNCS(forkpty)
++  if test $ac_cv_func_forkpty = no; then
++    AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
++  fi
++  AC_SUBST(FEP_LIBADD)
++fi
+ 
+ AC_ARG_ENABLE(emacs,
+   AC_HELP_STRING([--disable-emacs],
+@@ -1210,10 +1208,14 @@
+     saved_LDFLAGS=$LDFLAGS
+     CPPFLAGS="${CPPFLAGS} -I$libedit_path/include"
+     LDFLAGS="${LDFLAGS} -L$libedit_path/lib"
+-    AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
+-        [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
+-            AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
+-            use_libedit="no")])
++    PKG_CHECK_MODULES(CURSES, ncurses,
++        [LIBEDIT_LIBS="$CURSES_LIBS"],
++        [
++            AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
++                [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
++                    AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
++                    use_libedit="no")])
++        ])
+     if test "x$use_libedit" != "xno"; then
+         AC_CHECK_LIB(edit, el_init,
+             [LIBEDIT_LIBS="-ledit $LIBEDIT_LIBS -L$libedit_path/lib"
diff --git a/app-i18n/uim/files/uim-gentoo.patch b/app-i18n/uim/files/uim-gentoo.patch
new file mode 100644
index 000000000000..de498b754d86
--- /dev/null
+++ b/app-i18n/uim/files/uim-gentoo.patch
@@ -0,0 +1,28 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,6 +38,7 @@
+ AC_PATH_PROGS(SED, sed gsed)
+ AX_PATH_QMAKE4
+ AX_PATH_QMAKE5
++PKG_PROG_PKG_CONFIG
+ 
+ AM_MAINTAINER_MODE
+ 
+@@ -1618,7 +1619,7 @@
+   fi
+   AX_LANG_WNOERROR  # end AC_LANG_WERROR
+ 
+-  QT_CONFIG_OPTS="debug"
++  QT_CONFIG_OPTS="debug nostrip"
+ else
+   CFLAGS="$CFLAGS -DNDEBUG"
+   CXXFLAGS="$CXXFLAGS -DNDEBUG"
+@@ -1629,7 +1630,7 @@
+   AX_CFLAGS_GCC_OPTION([-Wno-unused-function], [UIM_SCM_CFLAGS])
+   AX_LANG_WNOERROR  # end AC_LANG_WERROR
+ 
+-  QT_CONFIG_OPTS="release"
++  QT_CONFIG_OPTS="release nostrip"
+ fi
+ 
+ AC_ARG_ENABLE(warnings-into-error,
diff --git a/app-i18n/uim/files/uim-tinfo.patch b/app-i18n/uim/files/uim-tinfo.patch
new file mode 100644
index 000000000000..e2fcfceb3158
--- /dev/null
+++ b/app-i18n/uim/files/uim-tinfo.patch
@@ -0,0 +1,38 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1180,9 +1180,13 @@
+ 
+ if test "x$enable_fep" != xno; then
+   enable_fep=yes
+-  AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
+-    [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
+-      AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);enable_fep=no)])
++  PKG_CHECK_MODULES(CURSES, ncurses,
++    [FEP_LIBADD="$CURSES_LIBS $FEP_LIBADD"],
++    [
++      AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
++        [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
++          AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);enable_fep=no)])
++    ])
+   AC_CHECK_FUNCS(forkpty)
+   if test "x$ac_cv_func_forkpty" = xno; then
+     AC_CHECK_LIB(util, forkpty,
+@@ -1319,10 +1323,14 @@
+   saved_LDFLAGS=$LDFLAGS
+   CPPFLAGS="${CPPFLAGS} -I$libedit_path/include"
+   LDFLAGS="${LDFLAGS} -L$libedit_path/lib"
+-  AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
+-    [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
+-      AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
+-        with_libedit=no)])
++  PKG_CHECK_MODULES(CURSES, ncurses,
++    [LIBEDIT_LIBS="$CURSES_LIBS"],
++    [
++      AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
++        [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
++          AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
++            with_libedit=no)])
++    ])
+ 
+   if test "x$with_libedit" != xno; then
+       AC_CHECK_LIB(edit, el_init,
diff --git a/app-i18n/uim/files/uim-zh-TW.patch b/app-i18n/uim/files/uim-zh-TW.patch
new file mode 100644
index 000000000000..f73850013178
--- /dev/null
+++ b/app-i18n/uim/files/uim-zh-TW.patch
@@ -0,0 +1,11 @@
+--- a/xim/convdisp.cpp
++++ b/xim/convdisp.cpp
+@@ -69,7 +69,7 @@
+ #endif
+ 
+ const char *fontset_zhCN = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -isas-fangsong ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0";
+-const char *fontset_zhTW = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -taipei-fixed-medium-r-normal--16-150-75-75-c-160-big5-0";
++const char *fontset_zhTW = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -eten-fixed-medium-r-normal--16-150-75-75-c-160-big5.eten-0";
+ const char *fontset_ja = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -jis-fixed-medium-r-normal--16-*-75-75-c-160-jisx0208.1983-0, -sony-fixed-medium-r-normal--16-*-*-*-c-80-jisx0201.1976-0";
+ const char *fontset_ko = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -daewoo-gothic-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0";
+ 
diff --git a/app-i18n/uim/files/xinput-uim b/app-i18n/uim/files/xinput-uim
new file mode 100644
index 000000000000..a0969dd9f01a
--- /dev/null
+++ b/app-i18n/uim/files/xinput-uim
@@ -0,0 +1,6 @@
+XIM=uim
+XIM_PROGRAM="@EPREFIX@/usr/bin/uim-xim"
+XIM_ARGS=
+GTK_IM_MODULE=uim
+QT_IM_MODULE=uim
+SHORT_DESC=UIM
diff --git a/app-i18n/uim/metadata.xml b/app-i18n/uim/metadata.xml
new file mode 100644
index 000000000000..5954a1c59d13
--- /dev/null
+++ b/app-i18n/uim/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <longdescription lang="en">
+    uim is a simple, secure and flexible input method library.  At the moment
+    Anthy, SKK, Prime, T-code, TUT-code (these are Japanese input method),
+    Pinyin (Chinese input method), Hangul (Korean input method), IPA
+    (International Phonetic Alphabet) are implemented.  You can extend the
+    library with Scheme thus easily, or with C if it becomes rather complicated.
+  </longdescription>
+  <use>
+    <flag name="anthy">Enable support for <pkg>app-i18n/anthy</pkg></flag>
+    <flag name="eb">Enable support for <pkg>dev-libs/eb</pkg></flag>
+    <flag name="gtk2">Enable support for <pkg>x11-libs/gtk+</pkg>:2</flag>
+    <flag name="skk">Enable support for <pkg>app-i18n/skk-jisyo</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="github">uim/uim</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
new file mode 100644
index 000000000000..af634f34baf1
--- /dev/null
+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools elisp-common gnome2-utils qmake-utils
+
+DESCRIPTION="A multilingual input method framework"
+HOMEPAGE="https://github.com/uim/uim"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86"
+IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs xft"
+RESTRICT="test"
+REQUIRED_USE="gtk? ( X )
+	gtk2? ( X )
+	qt4? ( X )
+	xft? ( X )"
+
+CDEPEND="!dev-scheme/sigscheme
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXft
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+	anthy? ( app-i18n/anthy )
+	canna? ( app-i18n/canna )
+	curl? ( net-misc/curl )
+	eb? ( dev-libs/eb )
+	emacs? ( virtual/emacs )
+	expat? ( dev-libs/expat )
+	libffi? ( virtual/libffi )
+	gtk? ( x11-libs/gtk+:3 )
+	gtk2? ( x11-libs/gtk+:2 )
+	libedit? ( dev-libs/libedit )
+	libnotify? ( x11-libs/libnotify )
+	m17n-lib? ( dev-libs/m17n-lib )
+	ncurses? ( sys-libs/ncurses:0= )
+	nls? ( virtual/libintl )
+	qt4? ( dev-qt/qtgui:4[qt3support] )
+	skk? ( app-i18n/skk-jisyo )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl:0 )"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+RDEPEND="${CDEPEND}
+	X? (
+		media-fonts/font-sony-misc
+		l10n_ja? (
+			|| (
+				media-fonts/font-jis-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_ko? (
+			|| (
+				media-fonts/font-daewoo-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_zh-CN? (
+			|| (
+				media-fonts/font-isas-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_zh-TW? ( media-fonts/intlfonts )
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-qt.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+	"${FILESDIR}"/${PN}-zh-TW.patch
+)
+DOCS=( AUTHORS NEWS README RELNOTE )
+
+AT_NO_RECURSIVE="yes"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with X x)
+		$(use_with anthy anthy-utf8)
+		$(use_with canna)
+		$(use_with curl)
+		$(use_with eb)
+		$(use_enable emacs)
+		$(use_with emacs lispdir "${SITELISP}")
+		$(use_with expat)
+		$(use_with libedit)
+		$(use_with libffi ffi)
+		$(use_with gtk gtk3)
+		$(use_with gtk2)
+		$(use_with m17n-lib m17nlib)
+		$(use_enable ncurses fep)
+		$(use_enable nls)
+		$(use_with qt4 qt4)
+		$(use_with qt4 qt4-immodule)
+		$(use_enable qt4 qt4-qt3support)
+		$(use_with skk)
+		$(use_with sqlite sqlite3)
+		$(use_enable ssl openssl)
+		$(use_enable static-libs static)
+		$(use_with xft)
+		--without-anthy
+		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt4 qt4)))
+		--disable-gnome-applet
+		--disable-gnome3-applet
+		--disable-kde-applet
+		--disable-kde4-applet
+		--without-mana
+		--without-prime
+	)
+
+	if (use gtk || use gtk2) && (use anthy || use canna); then
+		myconf+=( --enable-dict )
+	else
+		myconf+=( --disable-dict )
+	fi
+
+	if use libnotify; then
+		myconf+=( --enable-notify=libnotify )
+	fi
+
+	if use gtk || use gtk2 || use qt4; then
+		myconf+=( --enable-pref )
+	else
+		myconf+=( --disable-pref )
+	fi
+
+	export QT4DIR="$(qt4_get_libdir)"
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	if use emacs; then
+		cd emacs
+		elisp-compile *.el || die
+	fi
+}
+
+src_install() {
+	# bug #222677
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+
+	find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
+	use static-libs || find "${ED}" -name '*.la' -delete || die
+
+	insinto /etc/X11/xinit/xinput.d
+	sed \
+		-e "s:@EPREFIX@:${EPREFIX}:g" \
+		"${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
+	doins "${T}"/${PN}.conf
+
+	if use emacs; then
+		elisp-install ${PN}-el emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
+	fi
+}
+
+pkg_postinst() {
+	elog "New input method switcher has been introduced. You need to set"
+	elog
+	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
+	elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
+	elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
+	elog
+	elog "If you would like to use uim-anthy as default input method, put"
+	elog "(define default-im-name 'anthy)"
+	elog "to your ~/.uim."
+	elog
+	elog "All input methods can be found by running uim-im-switcher-gtk, "
+	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4."
+
+	if use emacs; then
+		elisp-site-regen
+		echo
+		elog "uim is autoloaded with Emacs with a minimal set of features:"
+		elog "There is no keybinding defined to call it directly, so please"
+		elog "create one yourself and choose an input method."
+		elog "Integration with LEIM is not done with this ebuild, please have"
+		elog "a look at the documentation how to achieve this."
+	fi
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+}
diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
new file mode 100644
index 000000000000..8ecd96c02155
--- /dev/null
+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools elisp-common gnome2-utils qmake-utils
+
+DESCRIPTION="A multilingual input method framework"
+HOMEPAGE="https://github.com/uim/uim"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls qt4 skk sqlite ssl static-libs xft"
+RESTRICT="test"
+REQUIRED_USE="gtk? ( X )
+	gtk2? ( X )
+	qt4? ( X )
+	xft? ( X )"
+
+CDEPEND="!dev-scheme/sigscheme
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXft
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+	anthy? ( app-i18n/anthy )
+	canna? ( app-i18n/canna )
+	curl? ( net-misc/curl )
+	eb? ( dev-libs/eb )
+	emacs? ( virtual/emacs )
+	expat? ( dev-libs/expat )
+	libffi? ( virtual/libffi )
+	gtk? ( x11-libs/gtk+:3 )
+	gtk2? ( x11-libs/gtk+:2 )
+	libedit? ( dev-libs/libedit )
+	libnotify? ( x11-libs/libnotify )
+	m17n-lib? ( dev-libs/m17n-lib )
+	ncurses? ( sys-libs/ncurses:0= )
+	nls? ( virtual/libintl )
+	qt4? ( dev-qt/qtgui:4[qt3support] )
+	skk? ( app-i18n/skk-jisyo )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+RDEPEND="${CDEPEND}
+	X? (
+		media-fonts/font-sony-misc
+		l10n_ja? (
+			|| (
+				media-fonts/font-jis-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_ko? (
+			|| (
+				media-fonts/font-daewoo-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_zh-CN? (
+			|| (
+				media-fonts/font-isas-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_zh-TW? ( media-fonts/intlfonts )
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-libressl.patch
+	"${FILESDIR}"/${P}-qt.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+	"${FILESDIR}"/${PN}-zh-TW.patch
+)
+DOCS=( AUTHORS NEWS README RELNOTE )
+
+AT_NO_RECURSIVE="yes"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with X x)
+		$(use_with anthy anthy-utf8)
+		$(use_with canna)
+		$(use_with curl)
+		$(use_with eb)
+		$(use_enable emacs)
+		$(use_with emacs lispdir "${SITELISP}")
+		$(use_with expat)
+		$(use_with libedit)
+		$(use_with libffi ffi)
+		$(use_with gtk gtk3)
+		$(use_with gtk2)
+		$(use_with m17n-lib m17nlib)
+		$(use_enable ncurses fep)
+		$(use_enable nls)
+		$(use_with qt4 qt4)
+		$(use_with qt4 qt4-immodule)
+		$(use_enable qt4 qt4-qt3support)
+		$(use_with skk)
+		$(use_with sqlite sqlite3)
+		$(use_enable ssl openssl)
+		$(use_enable static-libs static)
+		$(use_with xft)
+		--without-anthy
+		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt4 qt4)))
+		--disable-gnome-applet
+		--disable-gnome3-applet
+		--disable-kde-applet
+		--disable-kde4-applet
+		--without-mana
+		--without-prime
+	)
+
+	if (use gtk || use gtk2) && (use anthy || use canna); then
+		myconf+=( --enable-dict )
+	else
+		myconf+=( --disable-dict )
+	fi
+
+	if use libnotify; then
+		myconf+=( --enable-notify=libnotify )
+	fi
+
+	if use gtk || use gtk2 || use qt4; then
+		myconf+=( --enable-pref )
+	else
+		myconf+=( --disable-pref )
+	fi
+
+	export QT4DIR="$(qt4_get_libdir)"
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	if use emacs; then
+		cd emacs
+		elisp-compile *.el || die
+	fi
+}
+
+src_install() {
+	# bug #222677
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+
+	find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
+	use static-libs || find "${ED}" -name '*.la' -delete || die
+
+	insinto /etc/X11/xinit/xinput.d
+	sed \
+		-e "s:@EPREFIX@:${EPREFIX}:g" \
+		"${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
+	doins "${T}"/${PN}.conf
+
+	if use emacs; then
+		elisp-install ${PN}-el emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
+	fi
+}
+
+pkg_postinst() {
+	elog "New input method switcher has been introduced. You need to set"
+	elog
+	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
+	elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
+	elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
+	elog
+	elog "If you would like to use uim-anthy as default input method, put"
+	elog "(define default-im-name 'anthy)"
+	elog "to your ~/.uim."
+	elog
+	elog "All input methods can be found by running uim-im-switcher-gtk, "
+	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4."
+
+	if use emacs; then
+		elisp-site-regen
+		echo
+		elog "uim is autoloaded with Emacs with a minimal set of features:"
+		elog "There is no keybinding defined to call it directly, so please"
+		elog "create one yourself and choose an input method."
+		elog "Integration with LEIM is not done with this ebuild, please have"
+		elog "a look at the documentation how to achieve this."
+	fi
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+}
diff --git a/app-i18n/uim/uim-1.8.8.ebuild b/app-i18n/uim/uim-1.8.8.ebuild
new file mode 100644
index 000000000000..96c19d017d73
--- /dev/null
+++ b/app-i18n/uim/uim-1.8.8.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools elisp-common gnome2-utils
+
+DESCRIPTION="A multilingual input method framework"
+HOMEPAGE="https://github.com/uim/uim"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft"
+RESTRICT="test"
+REQUIRED_USE="gtk? ( X )
+	gtk2? ( X )
+	qt5? ( X )
+	xft? ( X )"
+
+CDEPEND="!dev-scheme/sigscheme
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXft
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+	anthy? ( app-i18n/anthy )
+	canna? ( app-i18n/canna )
+	curl? ( net-misc/curl )
+	eb? ( dev-libs/eb )
+	emacs? ( virtual/emacs )
+	expat? ( dev-libs/expat )
+	libffi? ( virtual/libffi )
+	gtk? ( x11-libs/gtk+:3 )
+	gtk2? ( x11-libs/gtk+:2 )
+	libedit? ( dev-libs/libedit )
+	libnotify? ( x11-libs/libnotify )
+	m17n-lib? ( dev-libs/m17n-lib )
+	ncurses? ( sys-libs/ncurses:0= )
+	nls? ( virtual/libintl )
+	qt5? ( dev-qt/qtx11extras:5 )
+	skk? ( app-i18n/skk-jisyo )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+RDEPEND="${CDEPEND}
+	X? (
+		media-fonts/font-sony-misc
+		l10n_ja? (
+			|| (
+				media-fonts/font-jis-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_ko? (
+			|| (
+				media-fonts/font-daewoo-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_zh-CN? (
+			|| (
+				media-fonts/font-isas-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_zh-TW? ( media-fonts/intlfonts )
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-tinfo.patch
+	"${FILESDIR}"/${PN}-zh-TW.patch
+)
+DOCS=( AUTHORS NEWS README RELNOTE doc )
+
+AT_NO_RECURSIVE="yes"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
+	# fix build with >=dev-scheme/chicken-4, bug #656852
+	touch scm/json-parser-expanded.scm
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with X x)
+		$(use_with anthy anthy-utf8)
+		$(use_with canna)
+		$(use_with curl)
+		$(use_with eb)
+		$(use_enable emacs)
+		$(use_with emacs lispdir "${SITELISP}")
+		$(use_with expat)
+		$(use_with libedit)
+		$(use_with libffi ffi)
+		$(use_with gtk gtk3)
+		$(use_with gtk2)
+		$(use_with m17n-lib m17nlib)
+		$(use_enable ncurses fep)
+		$(use_enable nls)
+		$(use_with qt5)
+		$(use_with qt5 qt5-immodule)
+		$(use_with skk)
+		$(use_with sqlite sqlite3)
+		$(use_enable ssl openssl)
+		$(use_enable static-libs static)
+		$(use_with xft)
+		--without-anthy
+		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt5 qt5)))
+		--disable-gnome-applet
+		--disable-gnome3-applet
+		--disable-kde-applet
+		--disable-kde4-applet
+		--without-mana
+		--without-prime
+		--disable-qt4-qt3support
+	)
+
+	if (use gtk || use gtk2) && (use anthy || use canna); then
+		myconf+=( --enable-dict )
+	else
+		myconf+=( --disable-dict )
+	fi
+
+	if use libnotify; then
+		myconf+=( --enable-notify=libnotify )
+	fi
+
+	if use gtk || use gtk2 || use qt5; then
+		myconf+=( --enable-pref )
+	else
+		myconf+=( --disable-pref )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	if use emacs; then
+		cd emacs
+		elisp-compile *.el || die
+	fi
+}
+
+src_install() {
+	# bug #222677
+	emake -j1 DESTDIR="${D}" install
+	rm -f doc/Makefile*
+	einstalldocs
+
+	find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
+	use static-libs || find "${ED}" -name '*.la' -delete || die
+
+	insinto /etc/X11/xinit/xinput.d
+	sed \
+		-e "s:@EPREFIX@:${EPREFIX}:g" \
+		"${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
+	doins "${T}"/${PN}.conf
+
+	if use X; then
+		docinto xim
+		dodoc xim/README*
+	fi
+
+	if use emacs; then
+		elisp-install ${PN}-el emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
+		docinto emacs
+		dodoc emacs/README*
+	fi
+
+	if use ncurses; then
+		docinto fep
+		dodoc fep/README*
+	fi
+}
+
+pkg_postinst() {
+	elog "New input method switcher has been introduced. You need to set"
+	elog
+	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
+	elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
+	elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
+	elog
+	elog "If you would like to use uim-anthy as default input method, put"
+	elog "(define default-im-name 'anthy)"
+	elog "to your ~/.uim."
+	elog
+	elog "All input methods can be found by running uim-im-switcher-gtk, "
+	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt5."
+
+	if use emacs; then
+		elisp-site-regen
+		echo
+		elog "uim is autoloaded with Emacs with a minimal set of features:"
+		elog "There is no keybinding defined to call it directly, so please"
+		elog "create one yourself and choose an input method."
+		elog "Integration with LEIM is not done with this ebuild, please have"
+		elog "a look at the documentation how to achieve this."
+	fi
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+}
diff --git a/app-i18n/unicode-cldr-31.0.1 b/app-i18n/unicode-cldr-31.0.1
deleted file mode 100644
index cba095ee78d2..000000000000
--- a/app-i18n/unicode-cldr-31.0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-arch/unzip
-DESCRIPTION=Unicode Common Locale Data Repository
-EAPI=6
-HOMEPAGE=http://cldr.unicode.org/
-KEYWORDS=~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86
-LICENSE=unicode
-SLOT=0
-SRC_URI=http://unicode.org/Public/cldr/31.0.1/core.zip -> unicode-cldr-common-31.0.1.zip
-_md5_=7bc9f9e729be1766b96378e0ee5a837a
diff --git a/app-i18n/unicode-cldr-33.0 b/app-i18n/unicode-cldr-33.0
deleted file mode 100644
index 47bb177cff8b..000000000000
--- a/app-i18n/unicode-cldr-33.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-arch/unzip
-DESCRIPTION=Unicode Common Locale Data Repository
-EAPI=6
-HOMEPAGE=http://cldr.unicode.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=unicode
-SLOT=0
-SRC_URI=https://unicode.org/Public/cldr/33/cldr-common-33.0.zip -> unicode-cldr-common-33.0.zip
-_md5_=92bc0f35d4bf28d30c1629edd604927a
diff --git a/app-i18n/unicode-cldr/Manifest b/app-i18n/unicode-cldr/Manifest
new file mode 100644
index 000000000000..366c6b5708c7
--- /dev/null
+++ b/app-i18n/unicode-cldr/Manifest
@@ -0,0 +1,5 @@
+DIST unicode-cldr-common-31.0.1.zip 16370865 BLAKE2B 46e941471074116eb00ba81848b37c82e025e12841d75ef9e4e2620f887384c4dbb3f8c36febcd86d19cd17d4d84e77e11121d1ed1cf2ccf67a09260cdddc9f7 SHA512 6ef4a73b31bde5dead5af9145e5befa5969e9449b4072c94c5370c979db54e3072ec5bf15f54152045da329bf4382e54edb532c0ec77a2ce451bacc8778b73bc
+DIST unicode-cldr-common-33.0.zip 20401984 BLAKE2B 1318f8c73678f4ed2ff6a2d947171515d52825c2395e77c8149fb6a5646110876dd8e1bc30a3b918cb25c4bf106b42fe2a372a9938ff0dbf106cf0d7dc33d75a SHA512 f2f9fa5242702fd8044c9b239e175b7ead41e36da39c9e67e70b4fde7ed5d28115141ea457cda4f645b10a2d29734b35590bd0f012296bdf4986a920b87532dd
+EBUILD unicode-cldr-31.0.1.ebuild 496 BLAKE2B 8df1bcb6bbc05a9177c20aab6337a752e65d21ac11993aaa85a48025f5e196eb151a09dd3525ee76ffdae1710c0ff399fe6428dbada25ae89d83f64300b445ff SHA512 93ba56c3abf39bc27c7d825c63255fcea2c1c2d942b3984fd5a98cd911399f5ac4002e1e89972ca5495e9787cba266d0ce82f4d83ff9699d4c33bce90a02a880
+EBUILD unicode-cldr-33.0.ebuild 717 BLAKE2B b006633e8110d3192fd50b056a65284e2f2968596f9188915ea0775385740021cabe5ee4e57c81cfc2fbc78de8de3503962512df6427818120d1436799238ffa SHA512 b43596ab85bbd46cca4ae3418344b407d2907e3570e7608d5a1c8810a51f51ab532719e5171a4877700ea3cc2aa9ef2c938a30e5ee89ace26ba016a486160a30
+MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/unicode-cldr/metadata.xml b/app-i18n/unicode-cldr/metadata.xml
new file mode 100644
index 000000000000..e1a49f498885
--- /dev/null
+++ b/app-i18n/unicode-cldr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-i18n/unicode-cldr/unicode-cldr-31.0.1.ebuild b/app-i18n/unicode-cldr/unicode-cldr-31.0.1.ebuild
new file mode 100644
index 000000000000..f055cf19ccd9
--- /dev/null
+++ b/app-i18n/unicode-cldr/unicode-cldr-31.0.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Unicode Common Locale Data Repository"
+HOMEPAGE="http://cldr.unicode.org/"
+SRC_URI="http://${PN%-*}.org/Public/${PN/*-}/${PV}/core.zip -> ${PN}-common-${PV}.zip"
+
+LICENSE="unicode"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/${PN/-//}
+	doins -r common
+}
diff --git a/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild b/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
new file mode 100644
index 000000000000..2b0a7f62b66a
--- /dev/null
+++ b/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Unicode Common Locale Data Repository"
+HOMEPAGE="http://cldr.unicode.org/"
+if [[ "${PV}" =~ ^[[:digit:]]+\.0$ ]]; then
+	SRC_URI="https://unicode.org/Public/${PN#*-}/${PV%.0}/${PN#*-}-common-${PV}.zip -> ${PN}-common-${PV}.zip"
+else
+	SRC_URI="https://unicode.org/Public/${PN#*-}/${PV}/${PN#*-}-common-${PV}.zip -> ${PN}-common-${PV}.zip"
+fi
+
+LICENSE="unicode"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/unicode/cldr
+	doins -r common
+}
diff --git a/app-i18n/unicode-data-10.0.0 b/app-i18n/unicode-data-10.0.0
deleted file mode 100644
index 19f835fccc3f..000000000000
--- a/app-i18n/unicode-data-10.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Unicode data from unicode.org
-EAPI=6
-HOMEPAGE=http://www.unicode.org/ucd/
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=unicode
-SLOT=0
-SRC_URI=http://www.unicode.org/Public/zipped/10.0.0/UCD.zip -> unicode-data-10.0.0-UCD.zip http://www.unicode.org/Public/zipped/10.0.0/Unihan.zip -> unicode-data-10.0.0-Unihan.zip
-_md5_=4697f90e9038c7baa9c3a9e5509f934a
diff --git a/app-i18n/unicode-data-9.0.0 b/app-i18n/unicode-data-9.0.0
deleted file mode 100644
index 37d111270073..000000000000
--- a/app-i18n/unicode-data-9.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Unicode data from unicode.org
-EAPI=6
-HOMEPAGE=http://www.unicode.org/ucd/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=unicode
-SLOT=0
-SRC_URI=http://www.unicode.org/Public/zipped/9.0.0/UCD.zip -> unicode-data-9.0.0-UCD.zip http://www.unicode.org/Public/zipped/9.0.0/Unihan.zip -> unicode-data-9.0.0-Unihan.zip
-_md5_=c2c04c587b7abd5f36238b9733ebe919
diff --git a/app-i18n/unicode-data/Manifest b/app-i18n/unicode-data/Manifest
new file mode 100644
index 000000000000..3657fd71c228
--- /dev/null
+++ b/app-i18n/unicode-data/Manifest
@@ -0,0 +1,7 @@
+DIST unicode-data-10.0.0-UCD.zip 5991193 BLAKE2B 4724c6f11156b8d97c924c1e08232d2f13ac331f386585289e148adb70f1a070bb8b71718232e29b4f7bd1ec47d016e44072bd7336c171c56bd7e88b15110d72 SHA512 4e232ddd01c5c85175f29cbda61d6a87f274669a3184e885cb44410c26f25eee70da984b3f4798f8d6c304b05333e9245e2eb6e3830ee7b16b2f2e50d32c9ee0
+DIST unicode-data-10.0.0-Unihan.zip 6632227 BLAKE2B 2bd290b083c87752c3462b8fe7a8c13e3943c69083ba7fbbcc659ca40476e984de1d49a102648d0a669bdaac81babb4c15d0ccba7769e3e4eb1db9efba778f67 SHA512 377f53ddc9ae514e8866c0e6b79f9b1d3613fad5a7e29c57a06baf8be84cbada0703b1c660401e7dbd2bb861b09fa9159b77322f42b34f5a0dc0d8f70ac4db12
+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 807 BLAKE2B 00d0f88e9ec8184cd3c4582919926728cbb7d06a0e1cb1782b3636f145d3de00cd27f0225a82ebee8b70a094f431c56248cb8e2582e82ae6168484ea31356ab0 SHA512 e8b2cf0538eb25b2cd86a103a87c208f408be565ff3b65ebd0d95dd94a4ed281e3bc515c137a71c727c9db253577a7500d33e68d5e93b765ca967502209a19ba
+EBUILD unicode-data-9.0.0.ebuild 800 BLAKE2B d031a95a58bf1d2253c6316e87835f22a7e2dd8fa0ab825e62cc8780c92892bed91c5271660688291cd50a451b9c31962b01cfa28a4a74838b6f73e882702274 SHA512 e47297daa5421946234c9878839dda124ac8b9c825c0c51b1594e9b683c1a0de74d8f96347a085e87b89fd571d0e3598493c7440e67ec582d866c6b01ec170e7
+MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/app-i18n/unicode-data/metadata.xml b/app-i18n/unicode-data/metadata.xml
new file mode 100644
index 000000000000..cc081897d48c
--- /dev/null
+++ b/app-i18n/unicode-data/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-i18n/unicode-data/unicode-data-10.0.0.ebuild b/app-i18n/unicode-data/unicode-data-10.0.0.ebuild
new file mode 100644
index 000000000000..0675f42d9f2e
--- /dev/null
+++ b/app-i18n/unicode-data/unicode-data-10.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Unicode data from unicode.org"
+HOMEPAGE="http://www.unicode.org/ucd/"
+SRC_URI="http://www.unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
+	http://www.unicode.org/Public/zipped/${PV}/Unihan.zip -> ${P}-Unihan.zip"
+
+LICENSE="unicode"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+src_unpack() {
+	# Unihan.zip needs to be installed as a zip for reverse deps
+	# https://bugzilla.gnome.org/show_bug.cgi?id=768210
+	unpack ${P}-UCD.zip
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r "${S}"/*
+	newins "${DISTDIR}"/${P}-Unihan.zip Unihan.zip
+}
diff --git a/app-i18n/unicode-data/unicode-data-9.0.0.ebuild b/app-i18n/unicode-data/unicode-data-9.0.0.ebuild
new file mode 100644
index 000000000000..ec2cabb7b45f
--- /dev/null
+++ b/app-i18n/unicode-data/unicode-data-9.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Unicode data from unicode.org"
+HOMEPAGE="http://www.unicode.org/ucd/"
+SRC_URI="http://www.unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
+	http://www.unicode.org/Public/zipped/${PV}/Unihan.zip -> ${P}-Unihan.zip"
+
+LICENSE="unicode"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+src_unpack() {
+	# Unihan.zip needs to be installed as a zip for reverse deps
+	# https://bugzilla.gnome.org/show_bug.cgi?id=768210
+	unpack ${P}-UCD.zip
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r "${S}"/*
+	newins "${DISTDIR}"/${P}-Unihan.zip Unihan.zip
+}
diff --git a/app-i18n/unicode-emoji-11.0 b/app-i18n/unicode-emoji-11.0
deleted file mode 100644
index a3194f651c04..000000000000
--- a/app-i18n/unicode-emoji-11.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=UTS #51 Unicode Emoji
-EAPI=6
-HOMEPAGE=https://unicode.org/emoji/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=unicode
-SLOT=0
-SRC_URI=https://unicode.org/Public/emoji/11.0/emoji-data.txt -> unicode-emoji-data-11.0.txt https://unicode.org/Public/emoji/11.0/emoji-sequences.txt -> unicode-emoji-sequences-11.0.txt https://unicode.org/Public/emoji/11.0/emoji-test.txt -> unicode-emoji-test-11.0.txt https://unicode.org/Public/emoji/11.0/emoji-variation-sequences.txt -> unicode-emoji-variation-sequences-11.0.txt https://unicode.org/Public/emoji/11.0/emoji-zwj-sequences.txt -> unicode-emoji-zwj-sequences-11.0.txt
-_md5_=6185bd0897854b68bf80a36801b3dc8b
diff --git a/app-i18n/unicode-emoji-5.0 b/app-i18n/unicode-emoji-5.0
deleted file mode 100644
index 2faed1a3194b..000000000000
--- a/app-i18n/unicode-emoji-5.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=UTR #51 Unicode Emoji
-EAPI=6
-HOMEPAGE=https://unicode.org/emoji
-KEYWORDS=~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86
-LICENSE=unicode
-SLOT=0
-SRC_URI=https://unicode.org/Public/emoji/5.0/emoji-data.txt -> unicode-emoji-data-5.0.txt https://unicode.org/Public/emoji/5.0/emoji-sequences.txt -> unicode-emoji-sequences-5.0.txt https://unicode.org/Public/emoji/5.0/emoji-test.txt -> unicode-emoji-test-5.0.txt https://unicode.org/Public/emoji/5.0/emoji-variation-sequences.txt -> unicode-emoji-variation-sequences-5.0.txt https://unicode.org/Public/emoji/5.0/emoji-zwj-sequences.txt -> unicode-emoji-zwj-sequences-5.0.txt
-_md5_=368e116b9b923c16b0d80296a41907a3
diff --git a/app-i18n/unicode-emoji/Manifest b/app-i18n/unicode-emoji/Manifest
new file mode 100644
index 000000000000..0e700fdd2823
--- /dev/null
+++ b/app-i18n/unicode-emoji/Manifest
@@ -0,0 +1,13 @@
+DIST unicode-emoji-data-11.0.txt 59720 BLAKE2B f1416d01d384245769549cc6ea93a2fe28bbfe77d30b26c9042965e3f9aee546572ef593284f767017b3a76acbc8015987c924be3afcc06df60b31588962a455 SHA512 501847414275564c7753b7d2b8e45cdfbf9fe96a96f0f3eea81f34c480da551b317b432ca426f6441c95eea520992e8888ead749e9c60da38233afd159d9b555
+DIST unicode-emoji-data-5.0.txt 35041 BLAKE2B 83e52d46495e9e657717aa2c59a6f7eb457ef0592a88b86b72558bb12edf30587c833877d23739bb245a77b946ad983c967fa6706a7482132ac793a4823da570 SHA512 3b68cb709700cf871f545f357a54864c6cf1dee2ee7046f42d895c0811a75129206edf2c0617a5f1183417066f0fdf2e74086e880a65826590aac9d1d31f568f
+DIST unicode-emoji-sequences-11.0.txt 105983 BLAKE2B 5b929faa3cfdbcfa11fa72f77386d3a7aee2dddc5ceb3d110d275a3ed523ddadc7be71b3fb857901d880970d5ab48dfc4b024d7e379b5efb0992e7424bfde80a SHA512 c9af23e0738350b6d61691498ac82cccec970bb2cd4a0c5d6fab6c86fef742c09c6a83f50124c1f98c285e706d145786bb29cbf4339ff1a01c75ad7515b159a6
+DIST unicode-emoji-sequences-5.0.txt 103383 BLAKE2B 1fc122b617963090d7ce165c9bc13a0507c5c26e60c36fa320f3527bae72e7362be944aa28cc4ea29598551361c304d43c7fe276a0452c2c5fae7e584b3169da SHA512 729bbf862b8d7ff6225b7416a0a464592f89040e4c27674c0d9afb6e0d997162c0a336c2a1e9de41313dcd45b504b3b27915ee8c67e45186c942c2996076d554
+DIST unicode-emoji-test-11.0.txt 361356 BLAKE2B 0e3b035fff3a4e542b3dd1172cf1438648a273ec0490316f843009b725c04764180a3ce0581b3e9819a0a5724c95ae5b536065e80401510d0b8e174636544184 SHA512 89c5a0f2eb460234e50dcc0fc904fbb254a1c0afa54b5bb672032f01764e0bed3624d1a4cd5627c83fcf1ea1347c9e3baaca05b2c685890afa505763baf8be79
+DIST unicode-emoji-test-5.0.txt 341770 BLAKE2B ab4e0900dd685172ba686c3a8e501cb3333be5594338526179a3d851970546fdde2793f9c31c501e978608bcee57d7281b4722bc6f657f0626c4a48ca2ad8490 SHA512 368483fadaa2c87e1197d0b0351c1e68b4244e73ab93542d73df7169d1dfcdf98b0fc1da8a969645f6a2d45db1f2db5f75ba919dd05f1012fbc2f3fb524f5c5d
+DIST unicode-emoji-variation-sequences-11.0.txt 36333 BLAKE2B c32b674969a102d24645d33fb000c31997c26c1e6de956fc82ae41c2fd43b244f3757e8ab217cbb03434defca16373fd33affa25c6df0b7b9393f0ab191ec65f SHA512 a0a487ef43d9cd49ff2ced654794e7190f357b00dd70ec9b84e640181dc5b2df44b2063aa4b16447d00815094155b24531f115e9121c51c95635b0af4b043643
+DIST unicode-emoji-variation-sequences-5.0.txt 36120 BLAKE2B 50e19bd7147486437dc4fd7784ec9bd5869e58f934738fa1d46edc030202fb9490ddebd6f1cefb98dd78b3be2c4da7e3f2acef0ce54487a183123311efbf7205 SHA512 484509ed56c5ea5e73160e211643a938d3fa08474281d316e5ed2d2346f38f5140a147454a9cb81c9f463d6c62befd98a8b70b695ee50effdbcfc6085dcaa520
+DIST unicode-emoji-zwj-sequences-11.0.txt 126959 BLAKE2B 82d78fd5fd47bb4201001903c0610e3950a2fa1c315fe8494e15977999ba0b8f0d4431eb842db6f01ab765fd181067b07258ddb4c547ddfc01fc0da7680ea540 SHA512 a2a50cd5451d3ba1da0f3b46e18a10d621ead0372599b98dad0fd47fdb271407f72bd72854136c93311b13950cedc2b1594f06d460e551ab120ed30ba8abce4d
+DIST unicode-emoji-zwj-sequences-5.0.txt 115207 BLAKE2B beb8f304be16ffe34fde4cab20bfb981f3ae61ffc6827ced0b3160de7e405459fdf38c6e7fcafdd3887da16da7870b84520f1c68e661480efbd0cb9510a04649 SHA512 26398ac77035d2f5df7a61f4c2a8a098af8e551576c9c9f157379c05aa8f75de5a0827c9bc476eb20f32c38b0c3605f6a1d9e07fe27f0e75df359ed2a7e6d25b
+EBUILD unicode-emoji-11.0.ebuild 1031 BLAKE2B 68f74394355740b377a5b81554522f153b6e4c40010646662c69ddd3fead6c3a56711fdf42724d8b8a0e9206d46f7a903d1a2bb1e8ba8634994d2d946c739942 SHA512 aabc122ce67d5f0ed853ff8e0a8555d12e8a2f8b92b5506144a039e15f6326c38388ea3949f1d839142ff7fa5e77440da881e7f62cc877d7ab1d62fcb89c362e
+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/metadata.xml b/app-i18n/unicode-emoji/metadata.xml
new file mode 100644
index 000000000000..e1a49f498885
--- /dev/null
+++ b/app-i18n/unicode-emoji/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
new file mode 100644
index 000000000000..68f27b9b7b12
--- /dev/null
+++ b/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="UTS #51 Unicode Emoji"
+HOMEPAGE="https://unicode.org/emoji/"
+BASE_URI="https://unicode.org/Public/${PN#*-}/${PV}"
+SRC_URI="${BASE_URI}/${PN#*-}-data.txt -> ${PN}-data-${PV}.txt
+	${BASE_URI}/${PN#*-}-sequences.txt -> ${PN}-sequences-${PV}.txt
+	${BASE_URI}/${PN#*-}-test.txt -> ${PN}-test-${PV}.txt
+	${BASE_URI}/${PN#*-}-variation-sequences.txt -> ${PN}-variation-sequences-${PV}.txt
+	${BASE_URI}/${PN#*-}-zwj-sequences.txt -> ${PN}-zwj-sequences-${PV}.txt"
+
+LICENSE="unicode"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}"
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	insinto /usr/share/unicode/emoji
+	local source_file target_file
+	for source_file in ${A}; do
+		target_file="${source_file#${PN%-*}-}"
+		target_file="${target_file%-${PV}.txt}.txt"
+		newins "${DISTDIR}/${source_file}" "${target_file}"
+	done
+}
diff --git a/app-i18n/unicode-emoji/unicode-emoji-5.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-5.0.ebuild
new file mode 100644
index 000000000000..88eb81f4ac53
--- /dev/null
+++ b/app-i18n/unicode-emoji/unicode-emoji-5.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="UTR #51 Unicode Emoji"
+HOMEPAGE="https://unicode.org/emoji"
+BASE_URI="https://${PN%-*}.org/Public/${PN/*-}/${PV}"
+SRC_URI="${BASE_URI}/${PN/*-}-data.txt -> ${PN}-data-${PV}.txt
+	${BASE_URI}/${PN/*-}-sequences.txt -> ${PN}-sequences-${PV}.txt
+	${BASE_URI}/${PN/*-}-test.txt -> ${PN}-test-${PV}.txt
+	${BASE_URI}/${PN/*-}-variation-sequences.txt -> ${PN}-variation-sequences-${PV}.txt
+	${BASE_URI}/${PN/*-}-zwj-sequences.txt -> ${PN}-zwj-sequences-${PV}.txt"
+
+LICENSE="unicode"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	local a
+	insinto /usr/share/${PN/-//}
+	for a in ${A}; do
+		newins "${DISTDIR}"/${a} $(echo ${a} | sed "s/${PN%-*}-\(.*\)-${PV}/\1/")
+	done
+}
diff --git a/app-i18n/xcin-2.5.3_pre3-r2 b/app-i18n/xcin-2.5.3_pre3-r2
deleted file mode 100644
index 88959dc9d554..000000000000
--- a/app-i18n/xcin-2.5.3_pre3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=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 nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Chinese X Input Method
-EAPI=0
-HOMEPAGE=http://cle.linux.org.tw/xcin/
-IUSE=debug nls unicode
-KEYWORDS=~amd64 ppc x86
-LICENSE=XCIN GPL-2
-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
-SLOT=0
-SRC_URI=mirror://debian/pool/main/x/xcin/xcin_2.5.2.99.pre2+cvs20030224.orig.tar.gz mirror://debian/pool/main/x/xcin/xcin_2.5.2.99.pre2+cvs20030224-1.4.diff.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=edee2204a150ca20d04a819c6b3f6dda
diff --git a/app-i18n/xcin-2.5.3_pre3-r3 b/app-i18n/xcin-2.5.3_pre3-r3
deleted file mode 100644
index 30250184038a..000000000000
--- a/app-i18n/xcin-2.5.3_pre3-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=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 nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Chinese X Input Method
-EAPI=4
-HOMEPAGE=http://cle.linux.org.tw/xcin/
-IUSE=debug nls unicode
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=XCIN GPL-2
-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
-SLOT=0
-SRC_URI=mirror://debian/pool/main/x/xcin/xcin_2.5.2.99.pre2+cvs20030224.orig.tar.gz mirror://debian/pool/main/x/xcin/xcin_2.5.2.99.pre2+cvs20030224-1.4.diff.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e0171e6bf81ce170c2564b1635a8ab79
diff --git a/app-i18n/xcin/Manifest b/app-i18n/xcin/Manifest
new file mode 100644
index 000000000000..164f248b38f6
--- /dev/null
+++ b/app-i18n/xcin/Manifest
@@ -0,0 +1,8 @@
+AUX xcin-2.5.3_pre3-glibc-2.10.patch 5024 BLAKE2B 07e1a19138e88dc1911280c0cc68309ec902a8c69d00d784f78f0cf1110303a1f213a4925e041f4d707df20c1ec47467c8c378f6b94e366656d2789756669e3c SHA512 5c6166b9621b0a58ee516a3a0566a36b550b0652c426589feb2839247dbebc76285bbb958f8f4524c6536f9fb84b248f70e54310e7eb320158235e86cd9ce1dc
+AUX xcin-2.5.3_pre3-ldflags.patch 4525 BLAKE2B b66701186b4d37bf7191ab43fe87e4f9d6797ab600d7bec5850f1bc34272bb0a724ece4ec1ad4c973c9e4489b26a814f775e32c1e110845fb0a19920c4ff25b3 SHA512 369c68e187b17105fbcbdefafd753b56f014192a02c5a2a6b30e7f220564e3d838f433598b1f2ef37530aac7c5d6e43817c607ac473876a4b00da5dede9db87e
+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
+MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-i18n/xcin/files/xcin-2.5.3_pre3-glibc-2.10.patch b/app-i18n/xcin/files/xcin-2.5.3_pre3-glibc-2.10.patch
new file mode 100644
index 000000000000..3d472f95b0f4
--- /dev/null
+++ b/app-i18n/xcin/files/xcin-2.5.3_pre3-glibc-2.10.patch
@@ -0,0 +1,110 @@
+diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/doc/En/internal/module.En xcin-2.5.2.99.pre2+cvs20030224/doc/En/internal/module.En
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/doc/En/internal/module.En	2000-12-13 18:55:41.000000000 +0200
++++ xcin-2.5.2.99.pre2+cvs20030224/doc/En/internal/module.En	2009-12-29 18:09:20.000000000 +0200
+@@ -481,13 +481,13 @@
+             char *lc_ctype;             /* LC_CTYPE locale category name */
+             char *lc_messages;          /* LC_MESSAGES locale category name */
+             char *encoding;             /* encoding name */
+-        } locale_t;
++        } xcin_locale_t;
+ 
+         typedef struct {
+             char *rcfile;               /* rcfile name. */
+             char *default_dir;          /* Default module directory. */
+             char *user_dir;             /* User data directory. */
+-            locale_t locale;            /* Locale name. */
++            xcin_locale_t locale;            /* Locale name. */
+         } xcin_rc_t;
+ 
+       The return value of this function is True when excuting successfully,
+diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/doc/internal/module xcin-2.5.2.99.pre2+cvs20030224/doc/internal/module
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/doc/internal/module	2002-10-29 13:53:42.000000000 +0200
++++ xcin-2.5.2.99.pre2+cvs20030224/doc/internal/module	2009-12-29 18:09:24.000000000 +0200
+@@ -423,13 +423,13 @@
+ 	    char *lc_ctype;		/* LC_CTYPE locale category name */
+ 	    char *lc_messages;		/* LC_MESSAGES locale category name */
+ 	    char *encoding;		/* encoding name */
+-	} locale_t;
++	} xcin_locale_t;
+ 
+ 	typedef struct {
+ 	    char *rcfile;               /* rcfile name. */
+ 	    char *default_dir;          /* Default module directory. */
+ 	    char *user_dir;             /* User data directory. */
+-	    locale_t locale;            /* Locale name. */
++	    xcin_locale_t locale;            /* Locale name. */
+ 	} xcin_rc_t;
+ 
+       ¥»¨ç¦¡­Y¦¨¥\¶Ç¦^ True, ¥¢±Ñ¶Ç¦^ False¡C
+diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/src/include/xcintool.h xcin-2.5.2.99.pre2+cvs20030224/src/include/xcintool.h
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/src/include/xcintool.h	2002-10-29 13:53:42.000000000 +0200
++++ xcin-2.5.2.99.pre2+cvs20030224/src/include/xcintool.h	2009-12-29 18:09:01.000000000 +0200
+@@ -202,12 +202,12 @@
+     char *lc_messages;
+     char *encoding;
+     int encid, locid;
+-} locale_t;
++} xcin_locale_t;
+ 
+ typedef struct {
+     int argc;			/* Command line arguement list */
+     char **argv;
+-    locale_t locale;            /* Locale name. */
++    xcin_locale_t locale;            /* Locale name. */
+     char *usrhome;		/* User home directory. */
+     char *default_dir;          /* Default module directory. */
+     char *user_dir;             /* User data directory. */
+diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/cin2tab/cin2tab.c xcin-2.5.2.99.pre2+cvs20030224/src/util/cin2tab/cin2tab.c
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/cin2tab/cin2tab.c	2009-12-29 18:07:44.000000000 +0200
++++ xcin-2.5.2.99.pre2+cvs20030224/src/util/cin2tab/cin2tab.c	2009-12-29 18:09:12.000000000 +0200
+@@ -233,7 +233,7 @@
+ }
+ 
+ static void
+-cin2tab_setlocale(locale_t *locale)
++cin2tab_setlocale(xcin_locale_t *locale)
+ {
+     char loc_return[128], enc_return[128];
+     int ret;
+diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/src/xcin_main.c xcin-2.5.2.99.pre2+cvs20030224/src/xcin_main.c
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/src/xcin_main.c	2003-01-20 19:50:05.000000000 +0200
++++ xcin-2.5.2.99.pre2+cvs20030224/src/xcin_main.c	2009-12-29 18:09:06.000000000 +0200
+@@ -56,7 +56,7 @@
+ static void
+ xcin_setlocale(void)
+ {
+-    locale_t *locale = &(xcin_core.xcin_rc.locale);
++    xcin_locale_t *locale = &(xcin_core.xcin_rc.locale);
+     char loc_return[128], enc_return[128];
+ 
+     set_perr("xcin");
+@@ -332,7 +332,7 @@
+     char *cmd[2], value[256], *s, loc_buf[64], *loc_name=NULL;
+     char *fmt = N_("%s:\n\tlocale section \"%s\": %s: value not specified.\n");
+     xcin_rc_t *xrc = &(xcin_core.xcin_rc);
+-    locale_t *locale = &(xcin_core.xcin_rc.locale);
++    xcin_locale_t *locale = &(xcin_core.xcin_rc.locale);
+ /*
+  *  Determine the true locale setting name.
+  */
+@@ -409,7 +409,7 @@
+     char *cmd[2], value[256], *s, *s1, objname[100], objenc[100];
+     char *fmt = N_("%s:\n\tIM section \"%s\": %s: %s.\n");
+     xcin_rc_t *xrc = &(xcin_core.xcin_rc);
+-    locale_t *locale = &(xcin_core.xcin_rc.locale);
++    xcin_locale_t *locale = &(xcin_core.xcin_rc.locale);
+     int setkey;
+ /*
+  *  Go to each CINPUT sub-node and read important keywords.
+diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/src/xim.c xcin-2.5.2.99.pre2+cvs20030224/src/xim.c
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/src/xim.c	2009-12-29 18:07:44.000000000 +0200
++++ xcin-2.5.2.99.pre2+cvs20030224/src/xim.c	2009-12-29 18:09:06.000000000 +0200
+@@ -1032,7 +1032,7 @@
+     XIMTriggerKeys on_keys;
+     XIMEncodings encodings;
+     Window mainwin;
+-    locale_t *locale;
++    xcin_locale_t *locale;
+     char* imlocale = NULL;
+     int i;
+ 
diff --git a/app-i18n/xcin/files/xcin-2.5.3_pre3-ldflags.patch b/app-i18n/xcin/files/xcin-2.5.3_pre3-ldflags.patch
new file mode 100644
index 000000000000..374490848980
--- /dev/null
+++ b/app-i18n/xcin/files/xcin-2.5.3_pre3-ldflags.patch
@@ -0,0 +1,96 @@
+diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/bimsphone/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/bimsphone/Makefile.in
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/bimsphone/Makefile.in	2001-11-11 21:50:46.000000000 +0900
++++ xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/bimsphone/Makefile.in	2011-11-21 01:08:21.736965412 +0900
+@@ -15,7 +15,7 @@
+ 
+ $(TARGET): $(OBJ)
+ 	$(LIBTOOL) --mode=link $(CC) -module -avoid-version -o $(TARGET) \
+-		$(OBJ) $(LIB) -rpath $(moddir)
++		$(OBJ) $(LDFLAGS) $(LIB) -rpath $(moddir)
+ include .depend
+ 
+ depend:
+diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/chewing/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/chewing/Makefile.in
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/chewing/Makefile.in	2011-11-21 01:07:12.878761904 +0900
++++ xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/chewing/Makefile.in	2011-11-21 08:32:24.024474064 +0900
+@@ -21,7 +21,7 @@
+ 
+ $(TARGET): $(OBJ)
+ 	$(LIBTOOL) --mode=link $(CC) -module -avoid-version -o $(TARGET) \
+-		$(OBJ) $(LIB) -rpath $(moddir)
++		$(OBJ) $(LDFLAGS) $(LIB) -rpath $(moddir)
+ include .depend
+ 
+ sort_word: sort_word.c key2pho.c
+diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/gen_inp/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/gen_inp/Makefile.in
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/gen_inp/Makefile.in	2001-11-11 21:50:46.000000000 +0900
++++ xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/gen_inp/Makefile.in	2011-11-21 01:08:21.736965412 +0900
+@@ -15,7 +15,7 @@
+ 
+ $(TARGET): $(OBJ)
+ 	$(LIBTOOL) --mode=link $(CC) -module -avoid-version -o $(TARGET) \
+-		$(OBJ) $(LIB) -rpath $(moddir)
++		$(OBJ) $(LDFLAGS) $(LIB) -rpath $(moddir)
+ include .depend
+ 
+ depend:
+diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/zh_hex/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/zh_hex/Makefile.in
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/zh_hex/Makefile.in	2001-11-11 21:50:47.000000000 +0900
++++ xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/zh_hex/Makefile.in	2011-11-21 01:08:21.736965412 +0900
+@@ -14,7 +14,7 @@
+ 
+ $(TARGET): $(OBJ)
+ 	$(LIBTOOL) --mode=link $(CC) -module -avoid-version -o $(TARGET) \
+-		$(OBJ) -rpath $(moddir)
++		$(OBJ) $(LDFLAGS) -rpath $(moddir)
+ include .depend
+ 
+ depend:
+diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Makefile.in
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Makefile.in	2001-11-05 01:47:26.000000000 +0900
++++ xcin-2.5.2.99.pre2+cvs20030224/src/Makefile.in	2011-11-21 01:08:53.576059606 +0900
+@@ -26,7 +26,7 @@
+ 
+ $(BIN): subsys $(OBJ)
+ 	@$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -export-dynamic \
+-		$(INC) $(DEFS) -o $(BIN) $(OBJ) $(LIB)
++		$(INC) $(DEFS) -o $(BIN) $(OBJ) $(LDFLAGS) $(LIB)
+ include .depend
+ 
+ subsys:
+diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/lib/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/lib/Makefile.in
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/src/lib/Makefile.in	2001-09-21 02:00:57.000000000 +0900
++++ xcin-2.5.2.99.pre2+cvs20030224/src/lib/Makefile.in	2011-11-21 01:08:21.736965412 +0900
+@@ -23,7 +23,7 @@
+ 
+ $(LXCIN_NAME): make_subdir
+ 	( OBJS=`ls $(LXCIN_OBJ)`; \
+-	  $(LIBTOOL) --mode=link $(CC) -o $@ $$OBJS $(LIB) -rpath $(libdir) \
++	  $(LIBTOOL) --mode=link $(CC) -o $@ $$OBJS $(LDFLAGS) $(LIB) -rpath $(libdir) \
+ 		-version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER) )
+ 
+ make_subdir:
+diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/cin2tab/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/util/cin2tab/Makefile.in
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/cin2tab/Makefile.in	2001-11-05 01:47:29.000000000 +0900
++++ xcin-2.5.2.99.pre2+cvs20030224/src/util/cin2tab/Makefile.in	2011-11-21 01:08:21.736965412 +0900
+@@ -14,7 +14,7 @@
+ all: $(BIN)
+ 
+ $(BIN): $(OBJ)
+-	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INC) $(DEFS) -o $(BIN) $(OBJ) $(LIB)
++	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INC) $(DEFS) -o $(BIN) $(OBJ) $(LDFLAGS) $(LIB)
+ include .depend
+ 
+ depend:
+diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/testprog/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/util/testprog/Makefile.in
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/testprog/Makefile.in	2002-01-01 22:49:17.000000000 +0900
++++ xcin-2.5.2.99.pre2+cvs20030224/src/util/testprog/Makefile.in	2011-11-21 08:33:44.547672718 +0900
+@@ -15,7 +15,7 @@
+ all: $(BIN)
+ 
+ $(BIN): $(OBJ)
+-	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJ) $(LIB)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJ) $(LDFLAGS) $(LIB)
+ include .depend
+ 
+ depend:
diff --git a/app-i18n/xcin/files/xcin-2.5.3_pre3-make.patch b/app-i18n/xcin/files/xcin-2.5.3_pre3-make.patch
new file mode 100644
index 000000000000..d5967c31476f
--- /dev/null
+++ b/app-i18n/xcin/files/xcin-2.5.3_pre3-make.patch
@@ -0,0 +1,118 @@
+diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/cin/big5/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/cin/big5/Makefile.in
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/cin/big5/Makefile.in	2001-09-07 00:41:32.000000000 +0900
++++ xcin-2.5.2.99.pre2+cvs20030224/cin/big5/Makefile.in	2011-11-21 00:44:20.979695505 +0900
+@@ -9,43 +9,43 @@
+ all: all-$(OS_TYPE)
+ 
+ all-LINUX:
+-	( BIG5ENC=big5 BIG5HKENC=big5hkscs make -f Rules make-big5 make-big5hkscs )
++	( BIG5ENC=big5 BIG5HKENC=big5hkscs $(MAKE) -f Rules make-big5 make-big5hkscs )
+ 
+ all-FREEBSD:
+-	( BIG5ENC=big5 make -f Rules make-big5 )
++	( BIG5ENC=big5 $(MAKE) -f Rules make-big5 )
+ 
+ all-OPENBSD:
+-	( BIG5ENC=big5 make -f Rules make-big5 )
++	( BIG5ENC=big5 $(MAKE) -f Rules make-big5 )
+ 
+ all-NETBSD:
+-	( BIG5ENC=big5 make -f Rules make-big5 )
++	( BIG5ENC=big5 $(MAKE) -f Rules make-big5 )
+ 
+ all-HPUX:
+-	( BIG5ENC=big5 BIG5HKENC=hkbig5 make -f Rules make-big5 make-big5hkscs )
++	( BIG5ENC=big5 BIG5HKENC=hkbig5 $(MAKE) -f Rules make-big5 make-big5hkscs )
+ 
+ all-SOLARIS:
+-	( BIG5ENC=big5 make -f Rules make-big5 )
++	( BIG5ENC=big5 $(MAKE) -f Rules make-big5 )
+ 
+ 
+ install: all install-$(OS_TYPE)
+ 
+ install-LINUX:
+-	( BIG5ENC=big5 BIG5HKENC=big5hkscs make -f Rules install_big5 install_big5hkscs )
++	( BIG5ENC=big5 BIG5HKENC=big5hkscs $(MAKE) -f Rules install_big5 install_big5hkscs )
+ 
+ install-FREEBSD:
+-	( BIG5ENC=big5 make -f Rules install_big5 )
++	( BIG5ENC=big5 $(MAKE) -f Rules install_big5 )
+ 
+ install-OPENBSD:
+-	( BIG5ENC=big5 make -f Rules install_big5 )
++	( BIG5ENC=big5 $(MAKE) -f Rules install_big5 )
+ 
+ install-NETBSD:
+-	( BIG5ENC=big5 make -f Rules install_big5 )
++	( BIG5ENC=big5 $(MAKE) -f Rules install_big5 )
+ 
+ install-HPUX:
+-	( BIG5ENC=big5 BIG5HKENC=hkbig5 make -f Rules install_big5 install_big5hkscs )
++	( BIG5ENC=big5 BIG5HKENC=hkbig5 $(MAKE) -f Rules install_big5 install_big5hkscs )
+ 
+ install-SOLARIS:
+-	( BIG5ENC=big5 make -f Rules install_big5 )
++	( BIG5ENC=big5 $(MAKE) -f Rules install_big5 )
+ 
+ 
+ clean:
+diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/cin/gb/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/cin/gb/Makefile.in
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/cin/gb/Makefile.in	2001-09-07 00:41:33.000000000 +0900
++++ xcin-2.5.2.99.pre2+cvs20030224/cin/gb/Makefile.in	2011-11-21 00:44:07.491653510 +0900
+@@ -9,43 +9,43 @@
+ all: all-$(OS_TYPE)
+ 
+ all-LINUX:
+-	( GB2312ENC=gb2312 GBKENC=gbk make -f Rules make-gb2312 make-gbk )
++	( GB2312ENC=gb2312 GBKENC=gbk $(MAKE) -f Rules make-gb2312 make-gbk )
+ 
+ all-FREEBSD:
+-	( GB2312ENC=euc make -f Rules make-gb2312 )
++	( GB2312ENC=euc $(MAKE) -f Rules make-gb2312 )
+ 
+ all-OPENBSD:
+-	( GB2312ENC=euc make -f Rules make-gb2312 )
++	( GB2312ENC=euc $(MAKE) -f Rules make-gb2312 )
+ 
+ all-NETBSD:
+-	( GB2312ENC=euccn make -f Rules make-gb2312 )
++	( GB2312ENC=euccn $(MAKE) -f Rules make-gb2312 )
+ 
+ all-HPUX:
+-	( GB2312ENC=hp15cn make -f Rules make-gb2312 )
++	( GB2312ENC=hp15cn $(MAKE) -f Rules make-gb2312 )
+ 
+ all-SOLARIS:
+-	( GB2312ENC=euc make -f Rules make-gb2312 )
++	( GB2312ENC=euc $(MAKE) -f Rules make-gb2312 )
+ 
+ 
+ install: all install-$(OS_TYPE)
+ 
+ install-LINUX:
+-	( GB2312ENC=gb2312 GBKENC=gbk make -f Rules install_gb2312 install_gbk )
++	( GB2312ENC=gb2312 GBKENC=gbk $(MAKE) -f Rules install_gb2312 install_gbk )
+ 
+ install-FREEBSD:
+-	( GB2312ENC=euc make -f Rules install_gb2312 )
++	( GB2312ENC=euc $(MAKE) -f Rules install_gb2312 )
+ 
+ install-OPENBSD:
+-	( GB2312ENC=euc make -f Rules install_gb2312 )
++	( GB2312ENC=euc $(MAKE) -f Rules install_gb2312 )
+ 
+ install-NETBSD:
+-	( GB2312ENC=euccn make -f Rules install_gb2312 )
++	( GB2312ENC=euccn $(MAKE) -f Rules install_gb2312 )
+ 
+ install-HPUX:
+-	( GB2312ENC=hp15cn make -f Rules install_gb2312 )
++	( GB2312ENC=hp15cn $(MAKE) -f Rules install_gb2312 )
+ 
+ install-SOLARIS:
+-	( GB2312ENC=euc make -f Rules install_gb2312 )
++	( GB2312ENC=euc $(MAKE) -f Rules install_gb2312 )
+ 
+ clean:
+ 	rm -f *.tab* core
diff --git a/app-i18n/xcin/metadata.xml b/app-i18n/xcin/metadata.xml
new file mode 100644
index 000000000000..c921b96adf6c
--- /dev/null
+++ b/app-i18n/xcin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-i18n/xcin/xcin-2.5.3_pre3-r2.ebuild b/app-i18n/xcin/xcin-2.5.3_pre3-r2.ebuild
new file mode 100644
index 000000000000..44255b37febd
--- /dev/null
+++ b/app-i18n/xcin/xcin-2.5.3_pre3-r2.ebuild
@@ -0,0 +1,72 @@
+# 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
new file mode 100644
index 000000000000..5ba8a1b13e56
--- /dev/null
+++ b/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+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_prepare() {
+	epatch \
+		"${WORKDIR}"/${MY_P}-1.4.diff \
+		"${FILESDIR}"/${P}-glibc-2.10.patch \
+		"${FILESDIR}"/${P}-make.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
+	rm -f configure
+	cd script
+	elibtoolize
+	eautoreconf
+	mv configure ../
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--with-xcin-rcdir="${EPREFIX}/etc" \
+		--with-xcin-dir="${EPREFIX}/usr/$(get_libdir)/xcin25" \
+		--with-db-lib="${EPREFIX}/usr/$(get_libdir)" \
+		--with-tabe-inc="${EPREFIX}/usr/include/tabe" \
+		--with-tabe-lib="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable debug)
+}
+
+src_compile() {
+	emake -j1 || die "emake failed."
+}
+
+src_install() {
+	emake \
+		prefix="${ED}/usr" \
+		program_prefix="${D}" \
+		install || die
+
+	find "${ED}" -name "*.la" -type f -delete || die
+
+	for docdir in doc doc/En doc/En/internal doc/history doc/internal doc/modules; do
+		docinto ${docdir#doc/}
+		for doc in $(find ${docdir} -maxdepth '1' -type 'f'); do
+			if use unicode; then
+					iconv -f BIG5 -t UTF-8 --output=${doc}.UTF-8 ${doc}
+					mv ${doc}.UTF-8 ${doc}
+			fi
+			dodoc ${doc}
+		done
+	done
+}
diff --git a/app-i18n/xsunpinyin-2.0.3-r3 b/app-i18n/xsunpinyin-2.0.3-r3
deleted file mode 100644
index c646226fac6b..000000000000
--- a/app-i18n/xsunpinyin-2.0.3-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=~app-i18n/sunpinyin-2.0.3 x11-libs/gtk+:2 x11-libs/libX11 dev-util/scons[python_targets_python2_7]
-DESCRIPTION=The SunPinyin IMEngine Wrapper for XIM Framework
-EAPI=5
-HOMEPAGE=https://sunpinyin.googlecode.com
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 CDDL
-RDEPEND=~app-i18n/sunpinyin-2.0.3 x11-libs/gtk+:2 x11-libs/libX11
-SLOT=0
-SRC_URI=https://sunpinyin.googlecode.com/files/xsunpinyin-2.0.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=58a5ea7d5d7b1f420d560f4575c29ff4
diff --git a/app-i18n/xsunpinyin-2.0.4_pre20130108 b/app-i18n/xsunpinyin-2.0.4_pre20130108
deleted file mode 100644
index 9661f888201c..000000000000
--- a/app-i18n/xsunpinyin-2.0.4_pre20130108
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst unpack
-DEPEND=~app-i18n/sunpinyin-2.0.4_pre20130108:= x11-libs/gtk+:2 x11-libs/libX11 dev-util/scons[python_targets_python2_7]
-DESCRIPTION=The SunPinyin IMEngine Wrapper for XIM Framework
-EAPI=5
-HOMEPAGE=https://sunpinyin.googlecode.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 CDDL
-RDEPEND=~app-i18n/sunpinyin-2.0.4_pre20130108:= x11-libs/gtk+:2 x11-libs/libX11
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/sunpinyin-2.0.4_pre20130108.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ca7494a4ada0b6aeee83a522db218471
diff --git a/app-i18n/xsunpinyin/Manifest b/app-i18n/xsunpinyin/Manifest
new file mode 100644
index 000000000000..ce47974e0a66
--- /dev/null
+++ b/app-i18n/xsunpinyin/Manifest
@@ -0,0 +1,7 @@
+AUX README.gentoo 164 BLAKE2B 38860db416a64e3acfa7900c3a97c612df73109b414d9b666f5170d306771218b39c81ef34c24c019dcc8baea191febf314101f32e60cfc999028422a98901e9 SHA512 4793b665af505a5b33ed27b99aa236bc9e1ce4e4bfaa12e2fa7fe5e275cde71759e893a30f28fff1c79b2a02e0d4979a0c84319518c487751156b683fab2436e
+AUX xsunpinyin-2.0.3-force-switch.patch 1328 BLAKE2B c61eb697aa9214c1bc603b7a8d210e629e67ba57141fe6c1daa28e27066e8adfb1c3065f520442c163671e2eb4a600e7c083db524aae162adc7b7d872dbfd7c4 SHA512 fcc2110c2b1e0b4dda4995688e360bee7f0e26582bb212875e41e22b208168d0a18d5a2a1a4cdf93935a43bef11bdb0a6fd45a9506675165c1a2a1aeedd2ad5e
+DIST sunpinyin-2.0.4_pre20130108.tar.xz 964764 BLAKE2B 2c9d2e3fc02009ad10784c9408434c6806d1403026fb27629701650fe0e8a69c5580050846cf5c3b870215b8bfd68fe9c52d8bdaf83c41e523224463af9cf530 SHA512 7c1dd7db8b800e9d436746a560a16de2c6777576868f2e7e28f6dcb767b91ccd62b974f9d4ce6bd6ce80d30e1ee83887c3ee03c227e7e9fa59c01db4867465b2
+DIST xsunpinyin-2.0.3.tar.gz 128835 BLAKE2B b8f3dd0b7efd0e40d54ee15085e4f1e7e2fff0d4f22845d7e043012f761e358e97843d1f3a26b85e49303afa86fb4a8263974f6f761d192b44bd88a1a0eef18f SHA512 71bc1677d545ecbd8572c9ba1877d091a2a58154eb326623ed240701f98a70ec29245e98d684a30aad46445e6c461359663ba3778e7f5c42469f0bea6e2bc419
+EBUILD xsunpinyin-2.0.3-r3.ebuild 629 BLAKE2B ba3693a7f3eeb42793333d40f272f02a0a9ad0fa10d592e057075d0562f21a255c37f420125899af207d5c6f7e46e123f3c1689d14771c2b696c94224d14a019 SHA512 0a0916bb06034a2f0585911be41e92007a785d40e9e5c95cce5ce010de15c980f4a14fedbec846570f344484d77e1657e76ec386b683b8c07bc0513f80650db0
+EBUILD xsunpinyin-2.0.4_pre20130108.ebuild 836 BLAKE2B 66d779b1ece649ee371c02e5161b32076b8ce0a55ca55372982682a0dce10d14c97f0d679c026c5c3011ee4512e4dc1a0f30944591b1acf1d8057b3c759f12f5 SHA512 a89e6c8c09595dd5e0ead3435c3618e3e2279e1b403e2abd4f6711025aeca1897560dd17d84381ddd18ae05e23e5bb0ddcf33250f67558dfea71ab798bf58977
+MISC metadata.xml 323 BLAKE2B cb36295be070944db054e52bd199f502dd1136e35d27e7eb9a0caac66798393c12d19fa9b7a421c9e3561023474a01d0788da1a333b34f15fc576862272955ee SHA512 b91630bdda4510f930c9b114a77859e6350c16cfd41c8b585895d4f40a9d8d7ce4a02dd6f46be41ecc7ba6ad2ce6846b143d1745ac9e1385821e403419df9a39
diff --git a/app-i18n/xsunpinyin/files/README.gentoo b/app-i18n/xsunpinyin/files/README.gentoo
new file mode 100644
index 000000000000..7de1985c1f32
--- /dev/null
+++ b/app-i18n/xsunpinyin/files/README.gentoo
@@ -0,0 +1,5 @@
+To use sunpinyin with XIM, you should use the following in your user startup
+scripts such as .xinitrc or .xprofile:
+
+XMODIFIERS=@im=xsunpinyin ; export XMODIFIERS
+
diff --git a/app-i18n/xsunpinyin/files/xsunpinyin-2.0.3-force-switch.patch b/app-i18n/xsunpinyin/files/xsunpinyin-2.0.3-force-switch.patch
new file mode 100644
index 000000000000..04f70e2d2aad
--- /dev/null
+++ b/app-i18n/xsunpinyin/files/xsunpinyin-2.0.3-force-switch.patch
@@ -0,0 +1,45 @@
+diff --git a/wrapper/xim/SConstruct b/wrapper/xim/SConstruct
+index 9d1cafd..495871d 100644
+--- a/wrapper/xim/SConstruct
++++ b/wrapper/xim/SConstruct
+@@ -32,7 +32,7 @@ imdkit_sources = ['IMdkit/FrameMgr.c',
+                   'IMdkit/IMValues.c']
+ 
+ 
+-cflags='-O2 -g -pipe'
++cflags='-O2 -g -pipe '
+ 
+ # options
+ AddOption('--prefix', dest='prefix', type='string', nargs=1, action='store',
+@@ -52,7 +52,6 @@ def PassVariables(envvar, env):
+ 
+ env = Environment(ENV=os.environ,
+                   CFLAGS=cflags, CXXFLAGS=cflags,
+-                  LINKFLAGS=['-export-dynamic'],
+                   CPPPATH=['.', 'IMdkit'])
+ opts.Update(env)
+ 
+@@ -62,11 +61,6 @@ if GetOption('prefix') is not None:
+ 
+ opts.Save('configure.conf', env)
+ 
+-
+-# set rpath
+-if GetOption('rpath') is not None:
+-    env.Append(LINKFLAGS='-Wl,-R -Wl,%s' % GetOption('rpath'))
+-
+ envvar = [('CC', 'CC'),
+           ('CXX', 'CXX'),
+           ('CFLAGS', 'CFLAGS'),
+@@ -83,7 +77,11 @@ extra_cflags += ' -DSUNPINYIN_XIM_SETTING_DIR=\\"%s\\"' % data_dir
+ 
+ env.Append(CFLAGS=extra_cflags)
+ env.Append(CXXFLAGS=extra_cflags)
++env.Append(LINKFLAGS=' -export-dynamic')
+ 
++# set rpath
++if GetOption('rpath') is not None:
++    env.Append(LINKFLAGS=' -Wl,-R -Wl,%s' % GetOption('rpath'))
+ 
+ #
+ #==============================configure================================
diff --git a/app-i18n/xsunpinyin/metadata.xml b/app-i18n/xsunpinyin/metadata.xml
new file mode 100644
index 000000000000..11bbcd490ca1
--- /dev/null
+++ b/app-i18n/xsunpinyin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">sunpinyin</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r3.ebuild b/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r3.ebuild
new file mode 100644
index 000000000000..44ee7e7f2fbe
--- /dev/null
+++ b/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils scons-utils
+
+DESCRIPTION="The SunPinyin IMEngine Wrapper for XIM Framework"
+HOMEPAGE="https://sunpinyin.googlecode.com"
+SRC_URI="${HOMEPAGE}/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="~app-i18n/sunpinyin-2.0.3
+	x11-libs/gtk+:2
+	x11-libs/libX11"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-force-switch.patch"
+}
+
+src_compile() {
+	escons --prefix="/usr"
+}
+
+src_install() {
+	escons --prefix="/usr" --install-sandbox="${D}" install
+}
diff --git a/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20130108.ebuild b/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20130108.ebuild
new file mode 100644
index 000000000000..108302b49c3b
--- /dev/null
+++ b/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20130108.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit readme.gentoo scons-utils toolchain-funcs
+
+DESCRIPTION="The SunPinyin IMEngine Wrapper for XIM Framework"
+HOMEPAGE="https://sunpinyin.googlecode.com/"
+SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/sunpinyin-${PV}.tar.xz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="~app-i18n/sunpinyin-${PV}:=
+	x11-libs/gtk+:2
+	x11-libs/libX11"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	default
+	mv "${WORKDIR}/sunpinyin-${PV}" "${S}" || die
+}
+
+src_configure() {
+	tc-export CXX
+	myesconsargs=( --prefix="${EPREFIX}/usr" )
+}
+
+src_compile() {
+	pushd "${S}"/wrapper/xim
+	escons
+	popd
+}
+
+src_install() {
+	pushd "${S}"/wrapper/xim
+	escons --install-sandbox="${D}" install
+	popd
+	readme.gentoo_create_doc
+}
diff --git a/app-i18n/xvnkb-0.2.8a-r1 b/app-i18n/xvnkb-0.2.8a-r1
deleted file mode 100644
index 04ea864bb61a..000000000000
--- a/app-i18n/xvnkb-0.2.8a-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) x11-base/xorg-proto
-DESCRIPTION=Vietnamese input keyboard for X
-EAPI=0
-HOMEPAGE=http://xvnkb.sourceforge.net/
-IUSE=spell xft
-KEYWORDS=x86 ppc
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 xft? ( x11-libs/libXft )
-SLOT=0
-SRC_URI=http://xvnkb.sourceforge.net/xvnkb/xvnkb-0.2.8a.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b353d5d5e071f488c331f499728259b2
diff --git a/app-i18n/xvnkb-0.2.9a-r1 b/app-i18n/xvnkb-0.2.9a-r1
deleted file mode 100644
index 5d626ee7341b..000000000000
--- a/app-i18n/xvnkb-0.2.9a-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) x11-base/xorg-proto
-DESCRIPTION=Vietnamese input keyboard for X
-EAPI=0
-HOMEPAGE=http://xvnkb.sourceforge.net/
-IUSE=spell xft
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 xft? ( x11-libs/libXft )
-SLOT=0
-SRC_URI=http://xvnkb.sourceforge.net/xvnkb-0.2.9a.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=50f17b810cece10fcce10703e9f0d34e
diff --git a/app-i18n/xvnkb/Manifest b/app-i18n/xvnkb/Manifest
new file mode 100644
index 000000000000..98416183c6ce
--- /dev/null
+++ b/app-i18n/xvnkb/Manifest
@@ -0,0 +1,8 @@
+AUX 0.2.8a-putenv.patch 337 BLAKE2B a288ed8cfa4d4130df371cccd61c86267ccf0d51b68eb297306abf666de218bdf036ed9a7c50de30d34566135a16045c0788d12db974a386a9ac2f8076fcad60 SHA512 1354f215534427f63b2ba663cc271858bc0cc4451c369464033241d71b665dcf5858b748e0144587b044644d20639f34684674b6ad49a71f8f02cfc156241a6f
+AUX xvnkb-0.2.8a.patch 562 BLAKE2B 9302bfc3e510b555995f00efb9bc9d51276ce557a8b4c32306f01318c1950c533e6e219b7ab4a63e2aaf45421c42d87caa529eab3f9efd6d3ea644b582bb5825 SHA512 1859b8bcbae7baa33d565d7fe4f861bfd14a1a08dfc0b0188704f728ab1ada606f74dcb7782afc83bf644ead6f66e0228231d85cefae9a210293e595da480c46
+AUX xvnkb-0.2.9a-ldflags.patch 1261 BLAKE2B cfa566937710bc9c45f9faa0cb6d5dc4d62ef96383c957e7e0d3d731814d5112978062dd873e5428b1035f77f2a96e5e76973258c35da859f98b76cc1773cc52 SHA512 5b54ce3d25a9f634f53347e553ce45b35456228b0cb00f9308d872dcbb33c18218e27921a54e4b9e91d98892f0490c864662d96cee09e99a8400fba46f590afb
+DIST xvnkb-0.2.8a.tar.bz2 76221 BLAKE2B a9bc825ba9412f7e2fa1fdd400ba5f648ad9001dbac7e3b804fc444d5b88534b4f75cb529bf489cb0b107564d4c562be419ea9883b29d154cb3141e0d52fec1e SHA512 76ed49fec52fbcfa4a81a7d80208b3f11d911695e2f8f37d9fbb5e6e1899ffffa722c26a577d4236dfd459769d08d0180593ee0db971910b0cd62e77c49516d5
+DIST xvnkb-0.2.9a.tar.bz2 76429 BLAKE2B 33205bfe8dcc2fd68eaffb507dfb2db55cc1a71d33765f807b3804091a29f8c34ca8dcaf65a3f3978da921534d054096fb22abded3c4829d5ca256d3e51fff34 SHA512 3dbf4adb65f321d721fc74e05e92d2d1460e63c49e8a1ab2e10ab9f015e1a57bd3e641645d1283f1d0c5592eb7b342bf210d9fcab9ba441b6416c2f8fd1af6da
+EBUILD xvnkb-0.2.8a-r1.ebuild 1483 BLAKE2B 5968d85c9c2d49b71d914e1980f3747b786ec360c285fea0507eb803352d88a75d369e8c2186b900499cc268970ab213ca020b124bf78b32c937bc51b7398137 SHA512 701d40458a32c5154c71013eb6e19009f523f2558cb4199f1c3b982db7c77c63a7319122ca45916ef00e6ddd3790dad35c2eb5447c1868f20727a06e00c2866f
+EBUILD xvnkb-0.2.9a-r1.ebuild 1426 BLAKE2B 23c976233d008fa9e822d4a12ea4661c9761ded63d1a33105c1d1a67b557a8f7aea370436657354308da2ba6df838763b1f363bfcf7e05dd6fbd6059e120292e SHA512 7facf8728a6b2e147bdebed757347c7fff69fe35024a6891a7ebf6b40898b49313417191b738969e3c081297d6e4ba662636496f4567ebcacc7935146d140d57
+MISC metadata.xml 319 BLAKE2B d651b6c56f28bb3735d1ee4cbe42ab1cd6f0db55692494fbb78ad9e61aa5655a9003dd12d2da620d184bae5739f79c9642b69e182fc134ed0401b8b135e78694 SHA512 72d8e0bd2181f6f9ab0b0d9a688a718b6e5b606abb7882cb50d36c0e273308055eeb87f0a55834d85240fea60278c8933c828a79822a24b9700189bc1bea77b1
diff --git a/app-i18n/xvnkb/files/0.2.8a-putenv.patch b/app-i18n/xvnkb/files/0.2.8a-putenv.patch
new file mode 100644
index 000000000000..ef7827e20fe8
--- /dev/null
+++ b/app-i18n/xvnkb/files/0.2.8a-putenv.patch
@@ -0,0 +1,11 @@
+--- xvnkb.c.old	2005-05-04 22:11:50.323413496 +0700
++++ xvnkb.c	2005-05-04 22:12:01.212758064 +0700
+@@ -77,7 +77,7 @@
+ static void __attribute__ ((constructor)) xvnkb_init(void)
+ {
+ 	static char gtk_xim_env[24] = "GTK_IM_MODULE=xim";
+-	putenv(gtk_xim_env);
++	/*putenv(gtk_xim_env);*/
+ 	/* TODO:
+ 	 - Initialize some more variables
+ 	 */
diff --git a/app-i18n/xvnkb/files/xvnkb-0.2.8a.patch b/app-i18n/xvnkb/files/xvnkb-0.2.8a.patch
new file mode 100644
index 000000000000..51862a1986bd
--- /dev/null
+++ b/app-i18n/xvnkb/files/xvnkb-0.2.8a.patch
@@ -0,0 +1,16 @@
+diff -ur xvnkb-0.2.8/visckey.c xvnkb-0.2.8-new/visckey.c
+--- xvnkb-0.2.8/visckey.c	2004-01-17 05:19:17.000000000 +0700
++++ xvnkb-0.2.8-new/visckey.c	2004-03-03 04:20:44.000000000 +0700
+@@ -423,8 +423,11 @@
+ /*----------------------------------------------------------------------------*/
+ inline void VKClearBuffer()
+ {
+-	tempoff = count = *word = vpc = 0;
++	tempoff = count = *word = 0;
++#ifdef VK_CHECK_SPELLING
++	vpc = 0;
+ 	vp = -1;
++#endif
+ }
+ /*----------------------------------------------------------------------------*/
+ inline long VKBackspaceDelete()
diff --git a/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch b/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch
new file mode 100644
index 000000000000..f089f0dde899
--- /dev/null
+++ b/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch
@@ -0,0 +1,34 @@
+diff --git a/Makefile.common b/Makefile.common
+index 06f0b78..d9f8976 100644
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -19,10 +19,10 @@ all: do-it-all
+ 	$(CC) -fpic $(CFLAGS) $(FPTR) $(VK_OPT) -DVERSION=\"$(VERSION)\" -Wall -I$(XLIB_INC) -c $<
+ 
+ $(CORE): $(CORE_OBJS)
+-	$(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL)
++	$(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL) $(LDFLAGS)
+ 
+ $(GUI): $(GUI_OBJS)
+-	$(CC) $(CFLAGS) $(GUI_OBJS) -o $@ -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS)
++	$(CC) $(CFLAGS) $(GUI_OBJS) -o $@ -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS) $(LDFLAGS)
+ 
+ main: $(CORE) $(GUI)
+ 	@echo >/dev/null
+diff --git a/tools/Makefile.common b/tools/Makefile.common
+index fe16cc1..16ec511 100644
+--- a/tools/Makefile.common
++++ b/tools/Makefile.common
+@@ -16,10 +16,10 @@ all: do-it-all
+ 	$(CC) $(CFLAGS) $(DEFS) -Wall -I$(XLIB_INC) -c $<
+ 
+ xvnkb_ctrl: $(CONTROL_OBJS)
+-	$(CC) $(CFLAGS) -o $@ $(CONTROL_OBJS) -L$(XLIB_PATH) $(LIBS)
++	$(CC) $(CFLAGS) -o $@ $(CONTROL_OBJS) -L$(XLIB_PATH) $(LIBS) $(LDFLAGS)
+ 
+ xvnkb_setup: $(SETUP_OBJS)
+-	$(CC) $(CFLAGS) -o $@ $(SETUP_OBJS) -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS)
++	$(CC) $(CFLAGS) -o $@ $(SETUP_OBJS) -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS) $(LDFLAGS)
+ 
+ main-tools: $(TOOLS)
+ 
diff --git a/app-i18n/xvnkb/metadata.xml b/app-i18n/xvnkb/metadata.xml
new file mode 100644
index 000000000000..73d5d9ae8a5a
--- /dev/null
+++ b/app-i18n/xvnkb/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">xvnkb</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild b/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild
new file mode 100644
index 000000000000..90d39c16aca2
--- /dev/null
+++ b/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils
+
+IUSE="spell xft"
+
+DESCRIPTION="Vietnamese input keyboard for X"
+SRC_URI="http://xvnkb.sourceforge.net/xvnkb/${P}.tar.bz2"
+HOMEPAGE="http://xvnkb.sourceforge.net/"
+
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="x86 ppc"
+RDEPEND="x11-libs/libX11
+	xft? ( x11-libs/libXft )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}.patch"
+	epatch "${FILESDIR}/${PV}-putenv.patch"
+
+	# Remove pregenerated dep file.
+	rm -f "${S}/tools/Makefile.dep"
+}
+
+src_compile() {
+	local myconf
+
+	use spell || myconf="${myconf} --no-spellcheck"
+	use xft || myconf="${myconf} --no-xft"
+
+	# *not* autotools
+	./configure \
+		--use-extstroke ${myconf} \
+		|| die "./configure failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin xvnkb
+	dobin tools/xvnkb_ctrl
+
+	dolib xvnkb.so.${PV}
+	dosym /usr/lib/xvnkb.so.${PV} /usr/lib/xvnkb.so
+
+	dodoc ChangeLog AUTHORS THANKS TODO INSTALL* README* doc/*
+	docinto scripts
+	dodoc scripts/*
+	docinto contrib
+	dodoc contrib/*
+}
+
+pkg_postinst() {
+	elog "Remember to"
+	elog "$ export LANG=en_US.UTF-8"
+	elog "(or any other UTF-8 locale) and"
+	elog "$ export LD_PRELOAD=/usr/lib/xvnkb.so"
+	elog "before starting X Window"
+	elog "More documents are in /usr/share/doc/${PF}"
+	ewarn "Programs with suid/sgid will have LD_PRELOAD cleared"
+	ewarn "You have to unset suid/sgid to use with xvnkb"
+}
diff --git a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
new file mode 100644
index 000000000000..3011a7130047
--- /dev/null
+++ b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils multilib toolchain-funcs
+
+IUSE="spell xft"
+
+DESCRIPTION="Vietnamese input keyboard for X"
+SRC_URI="http://xvnkb.sourceforge.net/${P}.tar.bz2"
+HOMEPAGE="http://xvnkb.sourceforge.net/"
+
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+RDEPEND="x11-libs/libX11
+	xft? ( x11-libs/libXft )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+}
+
+src_compile() {
+	local myconf
+
+	tc-export CC
+
+	use spell || myconf="${myconf} --no-spellcheck"
+	use xft || myconf="${myconf} --no-xft"
+
+	# *not* autotools
+	./configure \
+		--use-extstroke ${myconf} \
+		|| die "./configure failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin xvnkb
+	dobin tools/xvnkb_ctrl
+
+	dolib xvnkb.so.${PV}
+	dosym xvnkb.so.${PV} /usr/$(get_libdir)/xvnkb.so
+
+	dodoc ChangeLog AUTHORS THANKS TODO README* doc/*
+	docinto scripts; dodoc scripts/*
+	docinto contrib; dodoc contrib/*
+}
+
+pkg_postinst() {
+	elog "Remember to"
+	elog "$ export LANG=en_US.UTF-8"
+	elog "(or any other UTF-8 locale) and"
+	elog "$ export LD_PRELOAD=/usr/$(get_libdir)/xvnkb.so"
+	elog "before starting X Window"
+	elog "More documents are in /usr/share/doc/${PF}"
+	ewarn "Programs with suid/sgid will have LD_PRELOAD cleared"
+	ewarn "You have to unset suid/sgid to use with xvnkb"
+}
diff --git a/app-i18n/yaskkserv-1.1.0 b/app-i18n/yaskkserv-1.1.0
deleted file mode 100644
index d1d90f204f23..000000000000
--- a/app-i18n/yaskkserv-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=config configure install postinst postrm
-DEPEND=app-i18n/skk-jisyo gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) systemd? ( virtual/udev[systemd] ) dev-lang/perl virtual/pkgconfig
-DESCRIPTION=Yet Another SKK server
-EAPI=6
-HOMEPAGE=http://umiushi.org/~wac/yaskkserv/
-IUSE=gnutls libressl systemd
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/skk-jisyo gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) systemd? ( virtual/udev[systemd] )
-REQUIRED_USE=?? ( gnutls libressl )
-SLOT=0
-SRC_URI=http://umiushi.org/~wac/yaskkserv/yaskkserv-1.1.0.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=663c8ef3fe7750fbe34011d3be41f966
diff --git a/app-i18n/yaskkserv/Manifest b/app-i18n/yaskkserv/Manifest
new file mode 100644
index 000000000000..59b31ba49975
--- /dev/null
+++ b/app-i18n/yaskkserv/Manifest
@@ -0,0 +1,7 @@
+AUX yaskkserv-gentoo.patch 5013 BLAKE2B 5eed1d31e9ded20e2736747afdf7b646daf918259c60a03bef12059de5bb275189e22e35965be90ce8318233478baa7d76a771ac9faa67163bd084a5b95f65f4 SHA512 2a60853a4badd5d32482be108b36cce90fa42995f2cbe1d9324e6d3da2a94ee8f6744f1b9bce3b9f34f1b2b0cddd8cb5a212e06b7b45d95b744e162f58ec0ba0
+AUX yaskkserv.confd 280 BLAKE2B 465561acdcf1daa1589d84a74708ceff777dee5ed04510e2ca04bac2dbd034d1a5847476b68844bbd819f6818b8b1a07c52404548d417a8db30737ca7f235eb2 SHA512 dd9c906937814a1e59d92d80427e4ba97b2ff8e0a3d26dc457b882693de30ad5db5aa7941b948f876d7ef90b402bd4c42142eac3caca29f6976197463597a835
+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
+EBUILD yaskkserv-1.1.0.ebuild 1634 BLAKE2B 9d38a535488ba0470aef7bed156208e5c92d12207a659458c9a355ffa6dd36b5b98d4e641531073b5b1424b37102ac83a5f7a0887ec7f8384f884b806770ed28 SHA512 64bfc3d49f57b5098c82aa0e325eaedb7b2b52055288b9ba78fd00643cfcaa63d69e63d3d9d469c87eb49505907b67e12d5a99997fc0387c25c4c1e87e2a5016
+MISC metadata.xml 327 BLAKE2B e7280f2de60adaf8396e8530232e5c100ceb19ff3938d0635135b5664f2bd5175dff3556f07b35278b6835b8df8a6b32299d17d840fcf23a77806f038bd6ad2b SHA512 4e5e5cc7feecfa981ffbacc46f83a56d0dac8f2c5f2cc745ad9dff4ee0f674d40e3b8b8cf46389ffebc0f19281081f9b96d0066588412db91519ec880a10ea73
diff --git a/app-i18n/yaskkserv/files/yaskkserv-gentoo.patch b/app-i18n/yaskkserv/files/yaskkserv-gentoo.patch
new file mode 100644
index 000000000000..56894afd4321
--- /dev/null
+++ b/app-i18n/yaskkserv/files/yaskkserv-gentoo.patch
@@ -0,0 +1,93 @@
+--- a/Makefile
++++ b/Makefile
+@@ -57,16 +57,16 @@
+ 	$(MAKE) --no-print-directory -C $(SOURCE_PATH) -f $(MAKEFILE) test
+ 
+ install_common_		:
+-	$(MKDIR) -p $(PREFIX)/bin
+-	$(INSTALL) $(VAR_PATH)/yaskkserv_make_dictionary/yaskkserv_make_dictionary $(PREFIX)/bin/yaskkserv_make_dictionary
++	$(MKDIR) -p $(DESTDIR)$(PREFIX)/bin
++	$(INSTALL) $(VAR_PATH)/yaskkserv_make_dictionary/yaskkserv_make_dictionary $(DESTDIR)$(PREFIX)/bin/yaskkserv_make_dictionary
+ 
+ install			: install_normal
+ 
+ install_all		: install_common_
+-	$(MKDIR) -p $(PREFIX)/sbin
+-	$(INSTALL) $(VAR_PATH)/yaskkserv_simple/yaskkserv_simple $(PREFIX)/sbin/yaskkserv_simple
+-	$(INSTALL) $(VAR_PATH)/yaskkserv_normal/yaskkserv_normal $(PREFIX)/sbin/yaskkserv_normal
+-	$(INSTALL) $(VAR_PATH)/yaskkserv_hairy/yaskkserv_hairy $(PREFIX)/sbin/yaskkserv_hairy
++	$(MKDIR) -p $(DESTDIR)$(PREFIX)/sbin
++	$(INSTALL) $(VAR_PATH)/yaskkserv_simple/yaskkserv_simple $(DESTDIR)$(PREFIX)/sbin/yaskkserv_simple
++	$(INSTALL) $(VAR_PATH)/yaskkserv_normal/yaskkserv_normal $(DESTDIR)$(PREFIX)/sbin/yaskkserv_normal
++	$(INSTALL) $(VAR_PATH)/yaskkserv_hairy/yaskkserv_hairy $(DESTDIR)$(PREFIX)/sbin/yaskkserv_hairy
+ 
+ install_simple		: install_common_
+ 	$(MKDIR) -p $(PREFIX)/sbin
+--- a/source/Makefile.bsd_cygwin_linux_gcc.common
++++ b/source/Makefile.bsd_cygwin_linux_gcc.common
+@@ -16,16 +16,16 @@
+ endif				# DEBUG
+ 
+ INCLUDE_FLAGS		= -I . -I $(VAR_PATH) -I $(PROJECT_ROOT)/source/skk -I $(PROJECT_ROOT)/source/skk/architecture -I $(PROJECT_ROOT)/source/skk/architecture/$(ARCHITECTURE_LOWER_CASE)
+-LIBRARY_FLAGS		= -L/usr/lib
++LIBRARY_FLAGS		=
+ 
+-CPPFLAGS		= $(DEBUG_FLAGS) $(CXXFLAGS_ARCHITECTURE) $(CXXFLAGS_BYTE_ORDER) $(CXXFLAGS_CONFIG) $(INCLUDE_FLAGS) $(CXXFLAGS_DEFINE) -D $(PROJECT_IDENTIFIER)_VERSION=\"$(PROJECT_VERSION)\"
++CPPFLAGS		+= $(DEBUG_FLAGS) $(CXXFLAGS_ARCHITECTURE) $(CXXFLAGS_BYTE_ORDER) $(CXXFLAGS_CONFIG) $(INCLUDE_FLAGS) $(CXXFLAGS_DEFINE) -D $(PROJECT_IDENTIFIER)_VERSION=\"$(PROJECT_VERSION)\"
+ 
+-CXXFLAGS		= $(DEBUG_FLAGS) $(CXXFLAGS_ARCHITECTURE) $(CXXFLAGS_BYTE_ORDER) $(CXXFLAGS_CONFIG) $(INCLUDE_FLAGS) $(OPTIMIZE_FLAGS) $(CXXFLAGS_WARNING) -fno-exceptions -fno-rtti -fmessage-length=0 -pipe -fPIC -D $(PROJECT_IDENTIFIER)_VERSION=\"$(PROJECT_VERSION)\"
++CXXFLAGS		+= $(DEBUG_FLAGS) $(CXXFLAGS_ARCHITECTURE) $(CXXFLAGS_BYTE_ORDER) $(CXXFLAGS_CONFIG) $(INCLUDE_FLAGS) $(OPTIMIZE_FLAGS) $(CXXFLAGS_WARNING) -fno-exceptions -fno-rtti -fmessage-length=0 -pipe -fPIC -D $(PROJECT_IDENTIFIER)_VERSION=\"$(PROJECT_VERSION)\"
+ 
+-LDFLAGS			= $(DEBUG_FLAGS) $(LDFLAGS_ARCHITECTURE) $(OPTIMIZE_FLAGS) -pipe $(LIBRARY_FLAGS) -fPIC
++LDFLAGS			+= $(DEBUG_FLAGS) $(LDFLAGS_ARCHITECTURE) $(OPTIMIZE_FLAGS) -pipe $(LIBRARY_FLAGS) -fPIC
+ 
+ CXX			= $(CCACHE) $(COMPILER)
+ LD			= $(COMPILER)
+ CPP			= $(CXX)
+ LD			= $(CXX)
+-STRIP			= strip
++STRIP			= true
+--- a/source/yaskkserv_hairy/Makefile.bsd_cygwin_linux_gcc
++++ b/source/yaskkserv_hairy/Makefile.bsd_cygwin_linux_gcc
+@@ -12,7 +12,7 @@
+ # RUN_FLAGS		= --port=9999 --google-japanese-input=dictionary --google-suggest --google-japanese-input-timeout=1.1 https://www.google.com
+ # RUN_FLAGS		= --port=9999 --google-japanese-input=dictionary --google-japanese-input-timeout=1.1 http://www.google.com /home/wac/local/share/skk/SKK-JISYO.total+zipcode.yaskkserv
+ # RUN_FLAGS		= --port=9999 --google-japanese-input=dictionary --google-japanese-input-timeout=1.1 http://www.google.com
+-CXXFLAGS		+= $(CXXFLAGS_OPTIMIZE_SERVER_HAIRY) $(CXXFLAGS_WARNING_SERVER_HAIRY)
++CXXFLAGS		+= $(CXXFLAGS_WARNING_SERVER_HAIRY)
+ 
+ SOURCES			= ${wildcard *.cpp}
+ OBJECTS			= ${addprefix $(VAR_PATH)/$(TARGET_BASE)/,$(SOURCES:.cpp=.o)}
+--- a/source/yaskkserv_make_dictionary/Makefile.bsd_cygwin_linux_gcc
++++ b/source/yaskkserv_make_dictionary/Makefile.bsd_cygwin_linux_gcc
+@@ -5,7 +5,7 @@
+ TARGET_BASE		= yaskkserv_make_dictionary
+ 
+ RUN_FLAGS		=
+-CXXFLAGS		+= $(CXXFLAGS_OPTIMIZE_TOOL) $(CXXFLAGS_WARNING_TOOL)
++CXXFLAGS		+= $(CXXFLAGS_WARNING_TOOL)
+ 
+ SOURCES			= ${wildcard *.cpp}
+ OBJECTS			= ${addprefix $(VAR_PATH)/$(TARGET_BASE)/,$(SOURCES:.cpp=.o)}
+--- a/source/yaskkserv_normal/Makefile.bsd_cygwin_linux_gcc
++++ b/source/yaskkserv_normal/Makefile.bsd_cygwin_linux_gcc
+@@ -5,7 +5,7 @@
+ TARGET_BASE		= yaskkserv_normal
+ 
+ RUN_FLAGS		= --check-update --port=9999 /var/tmp/SKK-JISYO.total+zipcode.yaskkserv
+-CXXFLAGS		+= $(CXXFLAGS_OPTIMIZE_SERVER_NORMAL) $(CXXFLAGS_WARNING_SERVER_NORMAL)
++CXXFLAGS		+= $(CXXFLAGS_WARNING_SERVER_NORMAL)
+ 
+ SOURCES			= ${wildcard *.cpp}
+ OBJECTS			= ${addprefix $(VAR_PATH)/$(TARGET_BASE)/,$(SOURCES:.cpp=.o)}
+--- a/source/yaskkserv_simple/Makefile.bsd_cygwin_linux_gcc
++++ b/source/yaskkserv_simple/Makefile.bsd_cygwin_linux_gcc
+@@ -5,7 +5,7 @@
+ TARGET_BASE		= yaskkserv_simple
+ 
+ RUN_FLAGS		= --port=9999 /var/tmp/SKK-JISYO.total+zipcode.yaskkserv
+-CXXFLAGS		+= $(CXXFLAGS_OPTIMIZE_SERVER_SIMPLE) $(CXXFLAGS_WARNING_SERVER_SIMPLE)
++CXXFLAGS		+= $(CXXFLAGS_WARNING_SERVER_SIMPLE)
+ 
+ SOURCES			= ${wildcard *.cpp}
+ OBJECTS			= ${addprefix $(VAR_PATH)/$(TARGET_BASE)/,$(SOURCES:.cpp=.o)}
diff --git a/app-i18n/yaskkserv/files/yaskkserv.confd b/app-i18n/yaskkserv/files/yaskkserv.confd
new file mode 100644
index 000000000000..eef7cad616ab
--- /dev/null
+++ b/app-i18n/yaskkserv/files/yaskkserv.confd
@@ -0,0 +1,10 @@
+# Select yaskkserv server type:
+#  - simple
+#    Without dictionary reloading
+#  - normal
+#  - hairy
+#    With "Server completion" and "Google Japanese Input API"
+YASKKSERV_SERVER_TYPE="normal"
+
+# Options to pass to yaskkserv
+YASKKSERV_OPTS="/usr/share/skk/SKK-JISYO.L.yaskkserv"
diff --git a/app-i18n/yaskkserv/files/yaskkserv.initd b/app-i18n/yaskkserv/files/yaskkserv.initd
new file mode 100644
index 000000000000..d2e5aefd9e10
--- /dev/null
+++ b/app-i18n/yaskkserv/files/yaskkserv.initd
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/${RC_SVCNAME}_${YASKKSERV_SERVER_TYPE}"
+command_args="--no-daemonize ${YASKKSERV_OPTS}"
+command_background="true"
+pidfile="${pidfile:-/run/${RC_SVCNAME}.pid}"
+
+depend() {
+	need net
+	use logger
+}
diff --git a/app-i18n/yaskkserv/files/yaskkserv.service b/app-i18n/yaskkserv/files/yaskkserv.service
new file mode 100644
index 000000000000..40c8ee4c8974
--- /dev/null
+++ b/app-i18n/yaskkserv/files/yaskkserv.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Yet Another SKK server
+After=yaskkserv.socket
+Requires=yaskkserv.socket
+
+[Service]
+User=nobody
+EnvironmentFile=/etc/conf.d/yaskkserv
+ExecStart=/usr/sbin/yaskkserv${YASKKSERV_SERVER_TYPE} --no-daemonize ${YASKKSERV_OPTS}
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-i18n/yaskkserv/metadata.xml b/app-i18n/yaskkserv/metadata.xml
new file mode 100644
index 000000000000..11ae35030635
--- /dev/null
+++ b/app-i18n/yaskkserv/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">wachikun/yaskkserv</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-i18n/yaskkserv/yaskkserv-1.1.0.ebuild b/app-i18n/yaskkserv/yaskkserv-1.1.0.ebuild
new file mode 100644
index 000000000000..0d0ae48356cc
--- /dev/null
+++ b/app-i18n/yaskkserv/yaskkserv-1.1.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 )
+	)
+	systemd? ( virtual/udev[systemd] )"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+REQUIRED_USE="?? ( gnutls libressl )"
+
+PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
+DOCS=( README.md )
+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
+}
diff --git a/app-i18n/zhcon-0.2.6-r3 b/app-i18n/zhcon-0.2.6-r3
deleted file mode 100644
index 464d8281619b..000000000000
--- a/app-i18n/zhcon-0.2.6-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=ggi? ( media-libs/libggi[X] ) gpm? ( sys-libs/gpm ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.9* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A Fast CJK (Chinese/Japanese/Korean) Console Environment
-EAPI=6
-HOMEPAGE=http://zhcon.sourceforge.net/
-IUSE=ggi gpm
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=ggi? ( media-libs/libggi[X] ) gpm? ( sys-libs/gpm )
-SLOT=0
-SRC_URI=mirror://sourceforge/zhcon/zhcon-0.2.5.tar.gz mirror://sourceforge/zhcon/zhcon-0.2.5-to-0.2.6.diff.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dd1ab66d7c08b29268692dafd3714c68
diff --git a/app-i18n/zhcon/Manifest b/app-i18n/zhcon/Manifest
new file mode 100644
index 000000000000..8870a37ba72f
--- /dev/null
+++ b/app-i18n/zhcon/Manifest
@@ -0,0 +1,12 @@
+AUX zhcon-0.2.6+gcc-4.3.patch 5808 BLAKE2B 2e0087dd58f52d490df4d064792e22cdc40eb2ceed82989d914e34e1b86aa5a76b20666990b46ffdc190b600475b1310b03bb5e27ba8139558223fa306b5f52a SHA512 f8bc5a21ec505494fa104c16ed1057a73b0da3be060b381a1ba8ad29d470dbb8e9361714821eb9ec19ae8898b77a7c9855ca163daf632c2e3bad90aa3c7239cb
+AUX zhcon-0.2.6+linux-headers-2.6.26.patch 527 BLAKE2B f7f0cd2a975861489dbbf4410859dbab197e72ff2c1f521c58cd7cc981c46e3ee2bd4ae67c6898fc7509e23d21e544312fe368ef4982a95f5e7b2ea33065e9c2 SHA512 2800b14b46341afdaf2e8d555232a78583415de168ba1fef32205a73b32fa838fcdb1a99f6d389b2d5df87c9d5d764fe44eba7e70d5164521e3ac65977de553c
+AUX zhcon-0.2.6-amd64.patch 2760 BLAKE2B eab6f9885400c0282d71cc19970ded49d93fe8c0694a6dec18266fed69ad4acf19b057f159c7f5af2e2eae1a8773cf8ab6edb1217f36735588f86bc8a987ac93 SHA512 4c2a398b78b3026ddfb6a2a77308bb1a78cae51eff0691d42ff7c849a266414c74033f8ce6b6bf211a7ab6dcf39d94dffc96e27dd4e9604629a70f7a65bd907a
+AUX zhcon-0.2.6-automagic-fix.patch 1363 BLAKE2B 6b03a2dd0c91953e75a11685ea0726375a3a972168f62f9beda0ea1839b875b1efdf5313c5b7d26cc3213ee6e5f6c0660a659b0d964101cead275759974b9db9 SHA512 c88b2d15e8a9f47de46d6cd5e0ac6a0e5bbeaa45ffb39a91d9067fc3f730019ac753e8517e2636994b5ab5bc44c1bd081246b0700ecff61b3dab45caba0d3226
+AUX zhcon-0.2.6-curses.patch 694 BLAKE2B 681ad2b8314ce379ccb0ad77123cf168da41656dde31e88e1fc746557e59220645f262a62e8abfd3088c77888f0aa8fb877db7b0eba6e81f5b4299611bb38c8c SHA512 245b60dd255cff47d70cd1d4dea7b816fcbc668cfa74d5642bb9689e3f819667e76b8336ec3c746d34a3c744d2a6c1d88b32b73f20e41e1f5c830524e158c265
+AUX zhcon-0.2.6.configure.in.patch 379 BLAKE2B b87b5e6f61890d058c77eb5d578ec9db6cfc7c66ac2b599bcaef8246da118b63013b4ce918c6ffc996ca41da5d80af2db974b7ef5165b593ce7e15da947af234 SHA512 8d226fb01707b37bc5accd44fad01cf028ccfd4c9d826f4056700c9291b3f544333f80f716da4834dae5e32a6a17bdd1c7913635e14eb10764716a45b91229d6
+AUX zhcon-0.2.6.make-fix.patch 3071 BLAKE2B 527083f2fbe91ffeccdb6b6130f68d32e09e0d3b3738fac0e5626eba886a7f325836305df6ffb6f206d05f220c342b945cab2d442f3165de77e77ea66584dba9 SHA512 25ac39954f69c251ea1587f580879ca1e38502997b1b7313ef43a84d8626811c5b74e1a0065fec94f4c5acf378ee4495cb41c3ff3a902bd73973f15239c593a8
+AUX zhcon-0.2.6.sysconfdir.patch 779 BLAKE2B 869a6fe3bcf632d0c29eb37145dc516fde1bc01066dd3d657b38fa91a355f613b23326653ee7bf06a368cd7fd6fe8012b70fceb0a805f9699910a1b6ad5b241b SHA512 8996e04f6cb7ba7fa1b548fa47ab3463a76aa690e59fce1614986dbf73d3569eea479c5c764e84f6994a6b6795c4fcf29f9018a3b5cee2ec075677f909de4e11
+DIST zhcon-0.2.5-to-0.2.6.diff.gz 2881 BLAKE2B eb7b3bc38ae77c7a0add2a0693822fb34a7721ec4224a5be6fc533f0c69878a66c123a12b2d38a09ab1a3360f3d1e0658ccaf35e138d102748675cd60f81df21 SHA512 c4725e600cde5a629735506c8eaa3b78df4606cd2745891a21c4f25889cff10b6fe4cbeb3cf60b85ad62ed0e46c8e7bbb802b7675f79f3a1d82f6942c393d4ad
+DIST zhcon-0.2.5.tar.gz 5011644 BLAKE2B 326add20cac0bab31c4a34a0261374f2daf8db84f0fafd774c3498c4ba42275a6258bac0b74447626e691c1e86bcd6e0a6408cb8d6af5c1ff2a8912b5dc3d411 SHA512 35f1517b649e5afe3156eb1aa7735f3d3a988fad08c433b8f343df6ba3fdef89493afe61488a76059e4bfa1db4455d21d0bde7041bab37eb50e5ab0b622218fa
+EBUILD zhcon-0.2.6-r3.ebuild 1296 BLAKE2B f75f9fb5c44f4c68ccb783712b7c85e83065055812d2093cbf4fec41dbea50074048e7f6f0ef6c235333259478b6f5a4b46bed137d2dcec5425c13e8cbf9a7a8 SHA512 7c77d58404379cb4d46429d53b6bc66c494b57035bbeb3cd8c4ceb96e2e5164fd6b4762005fe8c72e1a98cfca6072f0dc9e3f93f14a8c4f66be1d5f4cca4322f
+MISC metadata.xml 620 BLAKE2B 2d07a1bd4880b59a4d6c76325ffe19ebaeacb2943797f5afeeb25ce7521d1ca406d3367496a0ebcf0235bcdd54d6e68bbb2196dd24f926877a00a0ce1313aec5 SHA512 f67cb7edc94c9d26bf5b7e89d9a02333aec62d8dce387b2449c1879f93a56654a12292b92be63936615ca916452a0d19d62bee984e2462fb939a0fe98e2e7c84
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6+gcc-4.3.patch b/app-i18n/zhcon/files/zhcon-0.2.6+gcc-4.3.patch
new file mode 100644
index 000000000000..beece66b1da8
--- /dev/null
+++ b/app-i18n/zhcon/files/zhcon-0.2.6+gcc-4.3.patch
@@ -0,0 +1,185 @@
+diff -NrU5 zhcon-0.2.6.orig/src/basefont.cpp zhcon-0.2.6/src/basefont.cpp
+--- zhcon-0.2.6.orig/src/basefont.cpp	2008-04-29 23:15:08.000000000 +0200
++++ zhcon-0.2.6/src/basefont.cpp	2008-04-29 23:15:37.000000000 +0200
+@@ -27,10 +27,12 @@
+ #include "global.h"
+ #include "debug.h"
+ #include "hzdecoder.h"
+ #include "basefont.h"
+ 
++#include <cstring>
++
+ BaseFont::BaseFont(string & fn, int w, int h)
+ :mFd(0)
+ ,mpBuf(0)
+ ,mWidth(w)
+ ,mHeight(h) {
+diff -NrU5 zhcon-0.2.6.orig/src/display/fblinear4.cpp zhcon-0.2.6/src/display/fblinear4.cpp
+--- zhcon-0.2.6.orig/src/display/fblinear4.cpp	2008-04-29 23:15:08.000000000 +0200
++++ zhcon-0.2.6/src/display/fblinear4.cpp	2008-04-29 23:15:37.000000000 +0200
+@@ -20,10 +20,12 @@
+ #include <assert.h>
+ #include <endian.h>
+ #include "global.h"
+ #include "fblinear4.h"
+ 
++#include <cstring>
++
+ __u16 FBLinear4::nibbletab_cfb4[] = {
+ #if BYTE_ORDER == LITTLE_ENDIAN
+ 0x0000,0xf000,0x0f00,0xff00,
+ 0x00f0,0xf0f0,0x0ff0,0xfff0,
+ 0x000f,0xf00f,0x0f0f,0xff0f,
+diff -NrU5 zhcon-0.2.6.orig/src/display/fblinear8.cpp zhcon-0.2.6/src/display/fblinear8.cpp
+--- zhcon-0.2.6.orig/src/display/fblinear8.cpp	2008-04-29 23:15:08.000000000 +0200
++++ zhcon-0.2.6/src/display/fblinear8.cpp	2008-04-29 23:15:37.000000000 +0200
+@@ -20,10 +20,12 @@
+ #include <assert.h>
+ #include <endian.h>
+ #include "global.h"
+ #include "fblinear8.h"
+ 
++#include <cstring>
++
+ __u32 FBLinear8::nibbletab_cfb8[] = {
+ #if BYTE_ORDER == LITTLE_ENDIAN
+ 0x00000000,0xff000000,0x00ff0000,0xffff0000,
+ 0x0000ff00,0xff00ff00,0x00ffff00,0xffffff00,
+ 0x000000ff,0xff0000ff,0x00ff00ff,0xffff00ff,
+diff -NrU5 zhcon-0.2.6.orig/src/display/fbvgaplanes.cpp zhcon-0.2.6/src/display/fbvgaplanes.cpp
+--- zhcon-0.2.6.orig/src/display/fbvgaplanes.cpp	2008-04-29 23:15:08.000000000 +0200
++++ zhcon-0.2.6/src/display/fbvgaplanes.cpp	2008-04-29 23:15:37.000000000 +0200
+@@ -36,10 +36,12 @@
+         : "a" ((char) value),
+         "d" ((unsigned short) port));
+ }
+ #endif
+ 
++#include <cstring>
++
+ /* based on kernel
+  * Force strict CPU ordering.
+  * And yes, this is required on UP too when we're talking
+  * to devices.
+  *
+diff -NrU5 zhcon-0.2.6.orig/src/display/vgadev.cpp zhcon-0.2.6/src/display/vgadev.cpp
+--- zhcon-0.2.6.orig/src/display/vgadev.cpp	2008-04-29 23:15:08.000000000 +0200
++++ zhcon-0.2.6/src/display/vgadev.cpp	2008-04-29 23:15:37.000000000 +0200
+@@ -35,10 +35,12 @@
+ #include <cassert>
+ #include "debug.h"
+ #include "vgadev.h"
+ #include "lrmi.h"
+ 
++#include <cstring>
++
+ #define GRAPH_BASE 0xA0000
+ #define GRAPH_ADDR  0x3ce
+ #define GRAPH_DATA  0x3cf
+ 
+ char *VGADev::mpBuf = NULL;
+diff -NrU5 zhcon-0.2.6.orig/src/graphdev.cpp zhcon-0.2.6/src/graphdev.cpp
+--- zhcon-0.2.6.orig/src/graphdev.cpp	2008-04-29 23:15:08.000000000 +0200
++++ zhcon-0.2.6/src/graphdev.cpp	2008-04-29 23:16:14.000000000 +0200
+@@ -24,20 +24,23 @@
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+ #include <assert.h>
+ #include <iostream>
++#include <cstdlib>
+ #include "debug.h"
+ 
+ #include "display/fbdev.h"
+ #include "display/vgadev.h"
+ #if defined(linux) || defined(__FreeBSD__)
+     #ifdef HAVE_GGI_LIB
+     #include "display/libggi.h"
+     #endif
+ #endif
+ 
++#include <cstring>
++
+ using namespace std;
+ // mmap framebuffer address
+ GraphDev *GraphDev::mpGraphDev = NULL;
+ 
+ // font
+diff -NrU5 zhcon-0.2.6.orig/src/inputclient.cpp zhcon-0.2.6/src/inputclient.cpp
+--- zhcon-0.2.6.orig/src/inputclient.cpp	2008-04-29 23:15:08.000000000 +0200
++++ zhcon-0.2.6/src/inputclient.cpp	2008-04-29 23:15:37.000000000 +0200
+@@ -14,10 +14,12 @@
+  *   the Free Software Foundation; either version 2 of the License, or     *
+  *   (at your option) any later version.                                   *
+  *                                                                         *
+  ***************************************************************************/
+ 
++#include <cstdlib>
++
+ #include "inputclient.h"
+ 
+ Console* InputClient::mpCon = NULL;
+ InputClient::InputClient()
+ : mVisible(false),
+diff -NrU5 zhcon-0.2.6.orig/src/inputmanager.cpp zhcon-0.2.6/src/inputmanager.cpp
+--- zhcon-0.2.6.orig/src/inputmanager.cpp	2008-04-29 23:15:08.000000000 +0200
++++ zhcon-0.2.6/src/inputmanager.cpp	2008-04-29 23:19:01.000000000 +0200
+@@ -22,10 +22,11 @@
+ using namespace std;
+ 
+ #include <unistd.h>
+ #include <sys/time.h>
+ #include <string>
++#include <cstdlib>
+ 
+ #include "global.h"
+ #include "debug.h"
+ #include "keymap.h"
+ #include "console.h"
+diff -NrU5 zhcon-0.2.6.orig/src/inputmanager.h zhcon-0.2.6/src/inputmanager.h
+--- zhcon-0.2.6.orig/src/inputmanager.h	2008-04-29 23:15:08.000000000 +0200
++++ zhcon-0.2.6/src/inputmanager.h	2008-04-29 23:15:37.000000000 +0200
+@@ -24,10 +24,11 @@
+   *@author ejoy
+   */
+ using namespace std;
+ #include <cassert>
+ #include <vector>
++#include <sys/types.h>
+ 
+ #include "mouse.h"
+ #if defined(__FreeBSD__)
+     #include <sys/kbio.h>
+ #endif
+diff -NrU5 zhcon-0.2.6.orig/src/window.cpp zhcon-0.2.6/src/window.cpp
+--- zhcon-0.2.6.orig/src/window.cpp	2008-04-29 23:15:08.000000000 +0200
++++ zhcon-0.2.6/src/window.cpp	2008-04-29 23:15:37.000000000 +0200
+@@ -22,10 +22,12 @@
+ #include <algorithm>
+ #include "global.h"
+ #include "debug.h"
+ #include "window.h"
+ 
++#include <cstring>
++
+ //static members for all the windows
+ Window* Window::mpConsole = NULL;
+ char* Window::mpOverlaps = NULL;
+ 
+ Window::Window(int x1, int y1, int x2, int y2, int type)
+diff -NrU5 zhcon-0.2.6.orig/src/zhcon.cpp zhcon-0.2.6/src/zhcon.cpp
+--- zhcon-0.2.6.orig/src/zhcon.cpp	2008-04-29 23:15:08.000000000 +0200
++++ zhcon-0.2.6/src/zhcon.cpp	2008-04-29 23:15:37.000000000 +0200
+@@ -81,10 +81,12 @@
+ #ifndef NDEBUG
+ #include "debug.h"
+ ofstream debug("debug");
+ #endif
+ 
++#include <cstring>
++
+ Zhcon* Zhcon::mpZhcon = NULL;
+ int Zhcon::mTtyPid = 0;
+ Zhcon::STATE Zhcon::mState = STOP;
+ 
+ void Zhcon::SignalVtLeave(int signo) {
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6+linux-headers-2.6.26.patch b/app-i18n/zhcon/files/zhcon-0.2.6+linux-headers-2.6.26.patch
new file mode 100644
index 000000000000..67d5b961a070
--- /dev/null
+++ b/app-i18n/zhcon/files/zhcon-0.2.6+linux-headers-2.6.26.patch
@@ -0,0 +1,18 @@
+diff --git a/src/display/lrmi.c b/src/display/lrmi.c
+index 85c6fe6..5c74260 100644
+--- a/src/display/lrmi.c
++++ b/src/display/lrmi.c
+@@ -33,6 +33,13 @@ This software has NO WARRANTY.  Use it at your own risk.
+ 
+ #include "lrmi.h"
+ 
++#if defined(__linux__) && !defined(TF_MASK)
++	#define TF_MASK X86_EFLAGS_TF
++	#define IF_MASK X86_EFLAGS_IF
++	#define VIF_MASK X86_EFLAGS_VIF
++	#define IOPL_MASK X86_EFLAGS_IOPL
++#endif
++
+ #define REAL_MEM_BASE 	((void *)0x10000)
+ #define REAL_MEM_SIZE 	0x10000
+ #define REAL_MEM_BLOCKS 	0x100
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6-amd64.patch b/app-i18n/zhcon/files/zhcon-0.2.6-amd64.patch
new file mode 100644
index 000000000000..58da5e99766a
--- /dev/null
+++ b/app-i18n/zhcon/files/zhcon-0.2.6-amd64.patch
@@ -0,0 +1,77 @@
+diff --git a/src/winime.cpp b/src/winime.cpp
+index 0c52393..85729a3 100644
+--- a/src/winime.cpp
++++ b/src/winime.cpp
+@@ -56,10 +56,10 @@ mCandilistBufLen(0)
+ 
+     memcpy(&mHead, mpBuf, sizeof(mHead));
+     int len = strlen(mHead.mCodeSet);
+-    mpIndex1 = (char **) (mpBuf + sizeof(mHead));
+-    mpIndex2 = (char **) (mpBuf + sizeof(mHead) + len * sizeof(char *));
+-    mpText = mpBuf + sizeof(mHead) + len * sizeof(char *) +
+-                len * len * sizeof(char *);
++    mpIndex1 = (int *) (mpBuf + sizeof(mHead));
++    mpIndex2 = (int *) (mpBuf + sizeof(mHead) + len * sizeof(int));
++    mpText = mpBuf + sizeof(mHead) + len * sizeof(int) +
++                len * len * sizeof(int);
+ }
+ 
+ WinIme::~WinIme() {
+@@ -246,32 +246,33 @@ int WinIme::Search(char c) {
+             //                p = *t;
+         }
+         else
+-            p = mpIndex1[Index(c)];
++            p = (char *)mpIndex1[Index(c)];
+ 
+         if (p == (char *) 0xffffffff)
+             found = false;
+-        p = (unsigned int) p + mpText;
++        p = (unsigned long) p + mpText;
+     } //2nd level index
+     else if (mNum == 1) {
+         int l = strlen(mHead.mCodeSet);
+         if (c == mHead.mWildChar) {
+             char **t;
+             t =
+-                find_if(mpIndex2 + Index(mInput[0]) * l,
+-                        mpIndex2 + (Index(mInput[0]) + 1) * l,
++                find_if((char **)(mpIndex2 + Index(mInput[0]) * l),
++                        (char **)(mpIndex2 + (Index(mInput[0]) + 1) * l),
+                         bind2nd(not_equal_to < char *>(),
+                                 (char *) 0xffffffff));
+-            if (t == mpIndex2 + (Index(mInput[0]) + 1) * l)
++            if (t == ((char **)mpIndex2) + (Index(mInput[0]) + 1) * l)
+                 p = (char *) 0xffffffff;
+             else
+                 p = *t;
+-        } else
+-            p = mpIndex2[Index(mInput[0]) * l + Index(c)];
++        } else {
++            int dd =  Index(mInput[0]) * l + Index(c);
++            p = (char *)(mpIndex2[Index(mInput[0]) * l + Index(c)]);
++        }
+ 
+         if (p == (char *) 0xffffffff)
+             found = false;
+-
+-        p = (unsigned int) p + mpText;
++        p = (unsigned long) p + mpText;
+     } else if (mNum < mHead.mMaxCodes) {
+         p = mpOffset[mNum - 1];
+         if (p == (char *) 0xffffffff)
+diff --git a/src/winime.h b/src/winime.h
+index c2f51ab..816a270 100644
+--- a/src/winime.h
++++ b/src/winime.h
+@@ -83,8 +83,8 @@ class WinIme {
+         char* mpOffset[12];
+         int mFd;
+         char* mpBuf;
+-        char** mpIndex1;
+-        char** mpIndex2;
++        int *mpIndex1;
++        int *mpIndex2;
+         char* mpText;
+         char* mpCur;                  //current search position
+         unsigned int mBufSize;
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6-automagic-fix.patch b/app-i18n/zhcon/files/zhcon-0.2.6-automagic-fix.patch
new file mode 100644
index 000000000000..5b4b24137f1e
--- /dev/null
+++ b/app-i18n/zhcon/files/zhcon-0.2.6-automagic-fix.patch
@@ -0,0 +1,36 @@
+--- zhcon-0.2.5.orig/configure.in	2010-01-31 15:12:10.521592172 +0100
++++ zhcon-0.2.5/configure.in	2010-01-31 15:12:33.939593092 +0100
+@@ -170,18 +170,25 @@
+ dnl-----------------------------------------------------------------------
+ dnl Checks for gpm
+ dnl-----------------------------------------------------------------------
+-usegpm="yes"
+-AC_CHECK_HEADERS(gpm.h,,usegpm="no")
+-AC_CHECK_LIB(gpm,Gpm_Open,,usegpm="no")
++AC_ARG_WITH([gpm], AS_HELP_STRING([--without-gpm], [Build without gpm library (default: test)]))
++
++usegpm='no'
++if test "x$with_gpm" != "xno"; then
++    AC_CHECK_HEADERS(gpm.h,,AC_ERROR([gpm.h not found]))
++    AC_CHECK_LIB(gpm,Gpm_Open,,AC_ERROR([libgpm not found]))
++    usegpm='yes'
++fi
+ 
+ dnl-----------------------------------------------------------------------
+ dnl Checks for libggi
+ dnl-----------------------------------------------------------------------
+-useggi="yes"
+-AC_CHECK_HEADERS(ggi/ggi.h,,useggi="no")
+-AC_CHECK_LIB(ggi, main,,useggi="no")
+-if test "$useggi" = 'yes';then
+-	AC_DEFINE(HAVE_GGI_LIB)
++AC_ARG_WITH([ggi], AS_HELP_STRING([--without-ggi], [Build without ggi library (default: test)]))
++
++useggi='no'
++if test "x$with_ggi" != "xno"; then
++    AC_CHECK_HEADERS(ggi/ggi.h,,AC_ERROR([ggi.h not found]))
++    AC_CHECK_LIB(ggi, ggiInit,, AC_ERROR([libggi not found]))
++    useggi='yes'
+ fi
+ 
+ AC_OUTPUT([Makefile
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch b/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
new file mode 100644
index 000000000000..200014e1d717
--- /dev/null
+++ b/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
@@ -0,0 +1,22 @@
+diff --git a/configure.in b/configure.in
+index 63172e4..6c2afcc 100644
+--- a/configure.in
++++ b/configure.in
+@@ -132,7 +132,7 @@ fi
+ AC_SUBST(ZHCON_LOCALE_DIR)
+ 
+ AC_CHECK_LIB(util, forkpty)
+-AC_CHECK_LIB(curses, main)
++AC_SEARCH_LIBS([tgetent], [cursesw curses ncursesw ncurses], [break;])
+ 
+ dnl for freebsd
+ dnl AC_CHECK_LIB(c, i386_set_ioperm)
+@@ -172,7 +172,7 @@ dnl Checks for gpm
+ dnl-----------------------------------------------------------------------
+ usegpm="yes"
+ AC_CHECK_HEADERS(gpm.h,,usegpm="no")
+-AC_CHECK_LIB(gpm,main,,usegpm="no")
++AC_CHECK_LIB(gpm,Gpm_Open,,usegpm="no")
+ 
+ dnl-----------------------------------------------------------------------
+ dnl Checks for libggi
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6.configure.in.patch b/app-i18n/zhcon/files/zhcon-0.2.6.configure.in.patch
new file mode 100644
index 000000000000..0624a934e02c
--- /dev/null
+++ b/app-i18n/zhcon/files/zhcon-0.2.6.configure.in.patch
@@ -0,0 +1,11 @@
+--- a/configure.in	2006-06-22 13:02:59.197841560 +0800
++++ b/configure.in	2006-06-22 12:48:59.000000000 +0800
+@@ -55,7 +55,7 @@
+ 
+ CFLAGS="$CFLAGS -funsigned-char -O2" 
+ CXXFLAGS="$CXXFLAGS -funsigned-char -O2"
+-if test $enable_debug = 'yes';then
++if test "x$enable_debug" = "xyes";then
+         CFLAGS="$CFLAGS -O0 -g3 -Wall" 
+         CXXFLAGS="$CXXFLAGS -O0 -g3 -Wall" 
+ else
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6.make-fix.patch b/app-i18n/zhcon/files/zhcon-0.2.6.make-fix.patch
new file mode 100644
index 000000000000..ccde407ef81a
--- /dev/null
+++ b/app-i18n/zhcon/files/zhcon-0.2.6.make-fix.patch
@@ -0,0 +1,82 @@
+diff -Naur zhcon-0.2.5.orig/doc/Makefile.am zhcon-0.2.5/doc/Makefile.am
+--- zhcon-0.2.5.orig/doc/Makefile.am	2006-05-03 02:57:18.000000000 +0900
++++ zhcon-0.2.5/doc/Makefile.am	2011-01-25 18:08:26.483746175 +0900
+@@ -3,8 +3,8 @@
+ EXTRA_DIST = zhcon.1.in poem.big5 poem.gb poem.gb.utf8 bpsf.txt manual.tex manual.dvi manual.ps README.html default.css html.tar.gz
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(mandir)/man1/
+-	$(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(mandir)/man1/zhcon.1
++	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1/
++	$(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(DESTDIR)$(mandir)/man1/zhcon.1
+ 
+ uninstall-local:
+-	-rm -f $(mandir)/man1/zhcon.1
++	-rm -f $(DESTDIR)$(mandir)/man1/zhcon.1
+diff -Naur zhcon-0.2.5.orig/font/Makefile.am zhcon-0.2.5/font/Makefile.am
+--- zhcon-0.2.5.orig/font/Makefile.am	2006-04-25 01:39:04.000000000 +0900
++++ zhcon-0.2.5/font/Makefile.am	2011-01-25 18:08:26.483746175 +0900
+@@ -1,8 +1,8 @@
+ EXTRA_DIST = *.bpsf
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(libdir)/zhcon/font/
+-	$(INSTALL_DATA) $(srcdir)/*.bpsf $(libdir)/zhcon/font/
++	$(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/font/
++	$(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(libdir)/zhcon/font/
+ 
+ uninstall-local:
+-	-rm -f $(libdir)/zhcon/font/*.bpsf
++	-rm -f $(DESTDIR)$(libdir)/zhcon/font/*.bpsf
+diff -Naur zhcon-0.2.5.orig/input/Makefile.am zhcon-0.2.5/input/Makefile.am
+--- zhcon-0.2.5.orig/input/Makefile.am	2006-04-25 01:38:44.000000000 +0900
++++ zhcon-0.2.5/input/Makefile.am	2011-01-25 18:08:26.483746175 +0900
+@@ -1,8 +1,8 @@
+ EXTRA_DIST = *.mb
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(libdir)/zhcon/input/
+-	$(INSTALL_DATA) $(srcdir)/*.mb $(libdir)/zhcon/input/
++	$(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/input/
++	$(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(libdir)/zhcon/input/
+ 
+ uninstall-local:
+-	-rm -f $(libdir)/zhcon/input/*.mb
++	-rm -f $(DESTDIR)$(libdir)/zhcon/input/*.mb
+diff -Naur zhcon-0.2.5.orig/src/Makefile.am zhcon-0.2.5/src/Makefile.am
+--- zhcon-0.2.5.orig/src/Makefile.am	2006-05-03 02:12:41.000000000 +0900
++++ zhcon-0.2.5/src/Makefile.am	2011-01-25 18:11:42.446555911 +0900
+@@ -7,15 +7,12 @@
+ 
+ SUBDIRS = display
+ 
+-install-exec-local:
+-	chmod 4755 $(bindir)/zhcon
+-
+ install-data-local:
+-	$(mkinstalldirs) $(prefix)/etc
+-	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(prefix)/etc/zhcon.conf
++	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
++	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(sysconfdir)/zhcon.conf
+ 
+ uninstall-local:
+-	-rm -f $(prefix)/etc/zhcon.conf
++	-rm -f $(DESTDIR)$(sysconfdir)/zhcon.conf
+ 
+ # set the include path found by configure
+ INCLUDES= $(all_includes)
+diff -Naur zhcon-0.2.5.orig/tools/Makefile.am zhcon-0.2.5/tools/Makefile.am
+--- zhcon-0.2.5.orig/tools/Makefile.am	2006-04-25 01:38:46.000000000 +0900
++++ zhcon-0.2.5/tools/Makefile.am	2011-01-25 18:04:22.701226453 +0900
+@@ -9,11 +9,6 @@
+ #getbpsf_LDADD = -L/usr/X11R6/lib -lX11
+ #getbpsf_CPPFLAGS = -I/usr/X11R6/include
+ 
+-LDFLAGS=
+-CXXFLAGS=
+-CCFLAGS=
+-LIBS=
+-
+ EXTRA_DIST = README getbpsf.txt gpm-1.19.6-pty.diff\
+              gpm-1.19.6-patched.tar.gz
+ 
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch b/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch
new file mode 100644
index 000000000000..551d656dd6e2
--- /dev/null
+++ b/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch
@@ -0,0 +1,24 @@
+diff -ruN /src/Makefile.am /tmp/src/Makefile.am
+--- a/src/Makefile.am	2006-06-22 12:35:01.531885552 +0800
++++ b/src/Makefile.am	2006-06-22 12:31:44.000000000 +0800
+@@ -5,6 +5,8 @@
+ 
+ zhcon_LDADD = display/libdisplay.a
+ 
++zhcon_CPPFLAGS = -DSYSCONF_DIR=\"${sysconfdir}\"
++
+ SUBDIRS = display
+ 
+ install-exec-local:
+diff -ruN src/zhcon.cpp /tmp/src/zhcon.cpp
+--- a/src/zhcon.cpp	2006-06-22 12:35:01.398905768 +0800
++++ b/src/zhcon.cpp	2006-06-22 12:32:41.000000000 +0800
+@@ -123,7 +123,7 @@
+     string cfgfile = getenv("HOME");
+     cfgfile += "/.zhconrc";
+     if (access(cfgfile.c_str(), R_OK) != 0)
+-        cfgfile = PREFIX "/etc/zhcon.conf";
++        cfgfile = SYSCONF_DIR"/zhcon.conf";
+ 
+     //for debug,a pause enable us to attach zhcon's pid in gdb
+     //char c;cin>>c;
diff --git a/app-i18n/zhcon/metadata.xml b/app-i18n/zhcon/metadata.xml
new file mode 100644
index 000000000000..b720aad5796d
--- /dev/null
+++ b/app-i18n/zhcon/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<longdescription>zhcon is a Fast double-byte virtual console for
+Chinese/Japanese/Korean (CJK) running under GNU/Linux and FreeBSD.
+It adds the ability of displaying and inputting CJK double-byte
+characters on console device. Currently Japanese display and input
+function seems to be broken.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">zhcon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
new file mode 100644
index 000000000000..f428d22d614f
--- /dev/null
+++ b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+WANT_AUTOMAKE="1.9"
+
+inherit autotools eutils
+
+MY_P="${P/6/5}"
+
+DESCRIPTION="A Fast CJK (Chinese/Japanese/Korean) Console Environment"
+HOMEPAGE="http://zhcon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zhcon/${MY_P}.tar.gz
+		mirror://sourceforge/zhcon/zhcon-0.2.5-to-0.2.6.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ggi gpm"
+
+DEPEND="ggi? ( media-libs/libggi[X] )
+	gpm? ( sys-libs/gpm )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}.sysconfdir.patch
+	"${FILESDIR}"/${P}.configure.in.patch
+	"${FILESDIR}"/${P}+gcc-4.3.patch
+	"${FILESDIR}"/${P}+linux-headers-2.6.26.patch
+	"${FILESDIR}"/${P}-curses.patch
+	"${FILESDIR}"/${P}-amd64.patch
+	"${FILESDIR}"/${P}-automagic-fix.patch
+	"${FILESDIR}"/${P}.make-fix.patch
+)
+
+src_prepare() {
+	epatch "${DISTDIR}"/zhcon-0.2.5-to-0.2.6.diff.gz
+	default
+	for f in $(grep -lir HAVE_GGI_LIB *); do
+		sed -i -e "s/HAVE_GGI_LIB/HAVE_LIBGGI/" "${f}" || die "sed failed"
+	done
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with ggi) \
+		$(use_with gpm)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog README NEWS TODO THANKS
+	dodoc README.BSD README.gpm README.utf8
+}
diff --git a/app-i18n/zinnia-0.06-r3 b/app-i18n/zinnia-0.06-r3
deleted file mode 100644
index 7ae40ec864f2..000000000000
--- a/app-i18n/zinnia-0.06-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl:=
-DESCRIPTION=Zinnia - Online hand recognition system with machine learning
-EAPI=6
-HOMEPAGE=https://taku910.github.io/zinnia/ https://github.com/taku910/zinnia https://sourceforge.net/projects/zinnia/
-IUSE=perl static-libs
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=BSD
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://sourceforge/zinnia/zinnia-0.06.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=32de76d92e941f8a0ef004fd9162177f
diff --git a/app-i18n/zinnia-tomoe-0.6.0_p20080911 b/app-i18n/zinnia-tomoe-0.6.0_p20080911
deleted file mode 100644
index 2ca620061ecc..000000000000
--- a/app-i18n/zinnia-tomoe-0.6.0_p20080911
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=app-i18n/zinnia >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Handwriting model files trained with Tomoe data
-EAPI=6
-HOMEPAGE=https://taku910.github.io/zinnia/ https://github.com/taku910/zinnia https://sourceforge.net/projects/zinnia/
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=app-i18n/zinnia
-SLOT=0
-SRC_URI=mirror://sourceforge/zinnia/zinnia-tomoe-0.6.0-20080911.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a41937dbee90edefc0b8972530381c5a
diff --git a/app-i18n/zinnia-tomoe/Manifest b/app-i18n/zinnia-tomoe/Manifest
new file mode 100644
index 000000000000..5a262fd510e6
--- /dev/null
+++ b/app-i18n/zinnia-tomoe/Manifest
@@ -0,0 +1,3 @@
+DIST zinnia-tomoe-0.6.0-20080911.tar.bz2 30666390 BLAKE2B 5bb5c68ebe4dd60b4b6f573f442d52626bd2594e78395882c69020089a036ed3e61454a8760dee8a6608fb90390d5de977228b5664a3cddd7be18b39910d9d78 SHA512 5c5cf06de46b8feebebca38d8ee4908af1d58f921e30bbbf92b9e5b79acb37e9c78466a1771dc01ddabe4740a0f03f41c50dce55fc38a414b582a1b4708886f5
+EBUILD zinnia-tomoe-0.6.0_p20080911.ebuild 697 BLAKE2B 440e4124d68717e98cc27044de79d8a2369889173fb63ce06aebb00baf24b0838762cceee2cb07ac5f963011c5b47e12b78ceeb97c8e1adcc0497149018f8716 SHA512 b5f2ed26fee47b87487fbd472ea523b7ab0d189bc20e379370f8660d07c140d778ccd7473dfa2a0c40d85029f9cba9e1745b8eaf0a90a7d87a08c50998a0d729
+MISC metadata.xml 364 BLAKE2B b36ea1c73d260d631f7861eca392d8b1797e35cb5ce0ed7afaa2e327eebb9fc77d5beafe910121f154d4f542757b37f955dc4fd730b0d021e1db733322a87704 SHA512 5e5c6833463859dbfd6561adce41426f607b435301a01a6e7f2bd8cb598a89632e607706c52fef903d96f2e0094d9c33fdfb69c2384455e451d634ecbee62842
diff --git a/app-i18n/zinnia-tomoe/metadata.xml b/app-i18n/zinnia-tomoe/metadata.xml
new file mode 100644
index 000000000000..0601843f122a
--- /dev/null
+++ b/app-i18n/zinnia-tomoe/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">taku910/zinnia</remote-id>
+		<remote-id type="sourceforge">zinnia</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/zinnia-tomoe/zinnia-tomoe-0.6.0_p20080911.ebuild b/app-i18n/zinnia-tomoe/zinnia-tomoe-0.6.0_p20080911.ebuild
new file mode 100644
index 000000000000..87c842d657b8
--- /dev/null
+++ b/app-i18n/zinnia-tomoe/zinnia-tomoe-0.6.0_p20080911.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+MY_P="${P/_p/-}"
+
+DESCRIPTION="Handwriting model files trained with Tomoe data"
+HOMEPAGE="https://taku910.github.io/zinnia/ https://github.com/taku910/zinnia https://sourceforge.net/projects/zinnia/"
+SRC_URI="mirror://sourceforge/zinnia/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 x86"
+IUSE=""
+
+DEPEND="app-i18n/zinnia"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(AUTHORS)
+
+src_prepare() {
+	default
+	mv configure.in configure.ac || die
+	sed -e "/^modeldir[[:space:]]*=/s/lib/$(get_libdir)/" -i Makefile.am || die
+	eautoreconf
+}
diff --git a/app-i18n/zinnia/Manifest b/app-i18n/zinnia/Manifest
new file mode 100644
index 000000000000..653bc788d69b
--- /dev/null
+++ b/app-i18n/zinnia/Manifest
@@ -0,0 +1,6 @@
+AUX zinnia-0.06-c++-2011.patch 235 BLAKE2B 5a2dfa58d70b76198c8101e7a2f7b925e26dd8b5b29242990e84bc239dd5d7d7e62c554eba7b7f47c96273b5126d59bb8908518dacafe8b991528d43f9732e94 SHA512 23d856c2d14b28d4a2863767f1888701eba2693f5b7dda20bdb7959311d7ce875bb2df2776c576979d7f5dfb8106086a472af7a5e37b3972f8e16e2cc4ed1d6f
+AUX zinnia-0.06-flags.patch 367 BLAKE2B 8f43fefa0822909054eaae843d98f51e0c0b007f95b546b768b2024bcce348139d0b8f738d8e3f64640267e8c2a5de600e034fd0f480bdd87f2c8855550b0d42 SHA512 f43f238cc037293a7914a00bf364068f977f5e4451e6a23959b7a6346f20d1cf5ae20d61c9e031dae0897f582ae62e3a8fb8cd77de72fe474b010ebbcc2d10b4
+AUX zinnia-0.06-perl_build.patch 336 BLAKE2B f8eb4d1ac570bad3a0cbb9fe2c09ac5e826f895741a7bf4b1e82ac439e03153936a915f4e24980d066905d9621c00a4892a65bd394e02423dee2995e319213aa SHA512 f3eeea5a6d23c07e50dc99d66b5799c5a03ff42d16afa43b97c8ff1ee9f63efe45864ba4eddb3c1bf69c38a632a4469a5f823ce13d1f57299ae027a1f698c9d0
+DIST zinnia-0.06.tar.gz 457415 BLAKE2B 3c401735fec424030dd9f8d6d14f90a83cd6ad5eb8e0ec1b0d2d15285cecf14c793043fb9ad0982d6614e48bdbe913360d2f3933bb2e1a623c7920536cb3bd14 SHA512 b9a44dc3664302269c4d8481225964a3188c1921f5af7f136fdccdc452917f6ff934884e266436a0f1e0a32af19d3bea5f5e4416e694a653983039a513277b53
+EBUILD zinnia-0.06-r3.ebuild 1688 BLAKE2B e88e53b8dad245801176ee03631aaeb3c50df4572a0660cf7bbc879bcf1b34f1ea485584078449661b644684e01af634f97e5cfbfb9da030571eaa194a74cb73 SHA512 d47e14f0f2908eea885b58928ec54fc6c948733a7fcbef477b232100fcfad556620e65529041c8f36d0b8c4ab9bab88c065464f9714675069d1327d9032cc316
+MISC metadata.xml 364 BLAKE2B b36ea1c73d260d631f7861eca392d8b1797e35cb5ce0ed7afaa2e327eebb9fc77d5beafe910121f154d4f542757b37f955dc4fd730b0d021e1db733322a87704 SHA512 5e5c6833463859dbfd6561adce41426f607b435301a01a6e7f2bd8cb598a89632e607706c52fef903d96f2e0094d9c33fdfb69c2384455e451d634ecbee62842
diff --git a/app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch b/app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch
new file mode 100644
index 000000000000..0ef6ae40e434
--- /dev/null
+++ b/app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch
@@ -0,0 +1,11 @@
+--- /trainer.cpp
++++ /trainer.cpp
+@@ -103,7 +103,7 @@
+     if (!fn) {
+       return false;
+     }
+-    x_.push_back(std::make_pair<std::string, FeatureNode *>(y, fn));
++    x_.push_back(std::make_pair(y, fn));
+     return true;
+   }
+ 
diff --git a/app-i18n/zinnia/files/zinnia-0.06-flags.patch b/app-i18n/zinnia/files/zinnia-0.06-flags.patch
new file mode 100644
index 000000000000..80442ee4880f
--- /dev/null
+++ b/app-i18n/zinnia/files/zinnia-0.06-flags.patch
@@ -0,0 +1,18 @@
+--- /configure.in
++++ /configure.in
+@@ -59,15 +59,6 @@
+ AC_SUBST([pkgconfigdir])
+ AC_MSG_NOTICE([pkgconfig directory is ${pkgconfigdir}])
+ 
+-dnl
+-dnl check gcc
+-dnl
+-if test -n "$GCC"; then
+-   CFLAGS="-O3 -Wall"
+-   CXXFLAGS="-O3 -Wall"
+-   AC_MSG_RESULT($ac_cv_x86_sse)
+-fi
+-
+ AC_DEFUN(ADD_CC_FLAG, [
+   AC_MSG_CHECKING(whether ${CC-cc} accepts $1)
+   AC_LANG_SAVE
diff --git a/app-i18n/zinnia/files/zinnia-0.06-perl_build.patch b/app-i18n/zinnia/files/zinnia-0.06-perl_build.patch
new file mode 100644
index 000000000000..4da9e1eeb900
--- /dev/null
+++ b/app-i18n/zinnia/files/zinnia-0.06-perl_build.patch
@@ -0,0 +1,11 @@
+--- /perl/Makefile.PL
++++ /perl/Makefile.PL
+@@ -4,7 +4,7 @@
+     'CC'                => 'c++',
+     'LD'                => 'c++',
+     'INC'               => '',
+-    'LIBS'              => '-lzinnia',
++    'LIBS'              => '-L../.libs -lzinnia',
+ #    'VERSION'	        => '0.1',
+     'OBJECT'            => 'zinnia_wrap.o' 
+ );
diff --git a/app-i18n/zinnia/metadata.xml b/app-i18n/zinnia/metadata.xml
new file mode 100644
index 000000000000..0601843f122a
--- /dev/null
+++ b/app-i18n/zinnia/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">taku910/zinnia</remote-id>
+		<remote-id type="sourceforge">zinnia</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/zinnia/zinnia-0.06-r3.ebuild b/app-i18n/zinnia/zinnia-0.06-r3.ebuild
new file mode 100644
index 000000000000..7133d88b29bd
--- /dev/null
+++ b/app-i18n/zinnia/zinnia-0.06-r3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools flag-o-matic perl-module toolchain-funcs
+
+DESCRIPTION="Zinnia - Online hand recognition system with machine learning"
+HOMEPAGE="https://taku910.github.io/zinnia/ https://github.com/taku910/zinnia https://sourceforge.net/projects/zinnia/"
+SRC_URI="mirror://sourceforge/zinnia/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 x86"
+IUSE="perl static-libs"
+
+PATCHES=(
+	"${FILESDIR}/${P}-flags.patch"
+	"${FILESDIR}/${P}-perl_build.patch"
+	"${FILESDIR}/${P}-c++-2011.patch"
+)
+
+DOCS=(AUTHORS)
+
+src_prepare() {
+	default
+	mv configure.in configure.ac || die
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	eautoreconf
+
+	if use perl; then
+			pushd perl > /dev/null
+			PATCHES=()
+			perl-module_src_prepare
+			popd > /dev/null
+	fi
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+
+	if use perl; then
+			pushd perl > /dev/null
+
+			# We need to run this here as otherwise it won't pick up the
+			# just-built -lzinnia and cause the extension to have
+			# undefined symbols.
+			perl-module_src_configure
+
+			append-cppflags "-I${S}"
+			append-ldflags "-L${S}/.libs"
+
+			emake \
+				CC="$(tc-getCXX)" \
+				LD="$(tc-getCXX)" \
+				OPTIMIZE="${CPPFLAGS} ${CXXFLAGS}" \
+				LDDLFLAGS="-shared" \
+				OTHERLDFLAGS="${LDFLAGS}"
+			popd > /dev/null
+	fi
+}
+
+src_test() {
+	default
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+
+	if use perl; then
+			pushd perl > /dev/null
+			perl-module_src_install
+			popd > /dev/null
+	fi
+
+	(
+		docinto html
+		dodoc doc/*.css doc/*.html
+	)
+}