gentoo resync : 04.08.2018

31 files changed, 100 insertions, 114 deletions

diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 4844f5d355e8..f84f6455cb04 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.12 b/metadata/md5-cache/app-i18n/ibus-1.5.12
index 309fa807f736..4228f9f95d47 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.12
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.12
@@ -10,5 +10,5 @@ RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2
 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	b43d08fe0771faf2f5e7be19c2789d33	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
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	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	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4b0ee9b42b4c8f34d904e56499ef51bd
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.16 b/metadata/md5-cache/app-i18n/ibus-1.5.16
index 3470836afaf4..77bb08c516b6 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.16
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.16
@@ -10,5 +10,5 @@ RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2
 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	b43d08fe0771faf2f5e7be19c2789d33	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
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	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	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6f3ac7af1be54e0273ceb6ce4870a069
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.17 b/metadata/md5-cache/app-i18n/ibus-1.5.17
index 59676de89551..d3993b02de8b 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.17
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.17
@@ -10,5 +10,5 @@ RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2
 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	b43d08fe0771faf2f5e7be19c2789d33	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
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	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	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b0c9965df52abffd8371ff55cd329fc8
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.18 b/metadata/md5-cache/app-i18n/ibus-1.5.18
index bfd0501d79e6..669df53257ce 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.18
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.18
@@ -10,5 +10,5 @@ RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2
 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	b43d08fe0771faf2f5e7be19c2789d33	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
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	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	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=72c3bc189a5ab3b4e57a8c86f00051b8
diff --git a/metadata/md5-cache/app-i18n/ibus-chewing-1.5.1-r1 b/metadata/md5-cache/app-i18n/ibus-chewing-1.5.1-r1
index e5365daaa390..f4b096ff0a2a 100644
--- a/metadata/md5-cache/app-i18n/ibus-chewing-1.5.1-r1
+++ b/metadata/md5-cache/app-i18n/ibus-chewing-1.5.1-r1
@@ -9,5 +9,5 @@ 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	b43d08fe0771faf2f5e7be19c2789d33	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
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	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	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cbe1f0eaf10f86798da8e0d4d62a169b
diff --git a/metadata/md5-cache/app-i18n/ibus-chewing-1.6.1 b/metadata/md5-cache/app-i18n/ibus-chewing-1.6.1
index 30eb1b99725f..4345c1c01e08 100644
--- a/metadata/md5-cache/app-i18n/ibus-chewing-1.6.1
+++ b/metadata/md5-cache/app-i18n/ibus-chewing-1.6.1
@@ -9,5 +9,5 @@ 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	b43d08fe0771faf2f5e7be19c2789d33	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
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	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	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=857eb588962e6b88b327a808bf4a103b
diff --git a/metadata/md5-cache/app-i18n/ibus-m17n-1.3.2 b/metadata/md5-cache/app-i18n/ibus-m17n-1.3.2
deleted file mode 100644
index 13f800f0551b..000000000000
--- a/metadata/md5-cache/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/metadata/md5-cache/app-i18n/ibus-m17n-1.3.4 b/metadata/md5-cache/app-i18n/ibus-m17n-1.3.4
index 6fc677c92b05..7514c192be5a 100644
--- a/metadata/md5-cache/app-i18n/ibus-m17n-1.3.4
+++ b/metadata/md5-cache/app-i18n/ibus-m17n-1.3.4
@@ -4,10 +4,10 @@ DESCRIPTION=M17N engine for IBus
 EAPI=6
 HOMEPAGE=https://github.com/ibus/ibus/wiki
 IUSE=gtk gtk2 nls
-KEYWORDS=~amd64 ~x86
+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
+_md5_=65ac405033a67aa5df2dd7b7d3af9221
diff --git a/metadata/md5-cache/app-i18n/ibus-rime-0.9.9 b/metadata/md5-cache/app-i18n/ibus-rime-0.9.9
deleted file mode 100644
index 5ffecfabffc7..000000000000
--- a/metadata/md5-cache/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/metadata/md5-cache/app-i18n/ibus-rime-1.1 b/metadata/md5-cache/app-i18n/ibus-rime-1.1
deleted file mode 100644
index aeb9cb1f00ed..000000000000
--- a/metadata/md5-cache/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/metadata/md5-cache/app-i18n/ibus-rime-1.2 b/metadata/md5-cache/app-i18n/ibus-rime-1.2
index f88c7c5f7279..bf31275b4b8b 100644
--- a/metadata/md5-cache/app-i18n/ibus-rime-1.2
+++ b/metadata/md5-cache/app-i18n/ibus-rime-1.2
@@ -1,11 +1,11 @@
 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/
+DEPEND=app-i18n/ibus app-i18n/librime x11-libs/libnotify dev-util/cmake virtual/pkgconfig
+DESCRIPTION=Rime Input Method Engine for IBus
+EAPI=6
+HOMEPAGE=https://rime.im/ https://github.com/rime/ibus-rime
 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
+_md5_=36dfb743a29551d8f919b5b29933bb53
diff --git a/metadata/md5-cache/app-i18n/ibus-rime-1.3.0 b/metadata/md5-cache/app-i18n/ibus-rime-1.3.0
new file mode 100644
index 000000000000..289fc80cf97e
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-rime-1.3.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=prepare
+DEPEND=app-i18n/ibus app-i18n/librime x11-libs/libnotify dev-util/cmake virtual/pkgconfig
+DESCRIPTION=Rime Input Method Engine for IBus
+EAPI=6
+HOMEPAGE=https://rime.im/ https://github.com/rime/ibus-rime
+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://github.com/rime/ibus-rime/archive/1.3.0.tar.gz -> ibus-rime-1.3.0.tar.gz
+_md5_=8088219d16475bd32a609ba603dacd24
diff --git a/metadata/md5-cache/app-i18n/ibus-tutcode-1.0.2-r1 b/metadata/md5-cache/app-i18n/ibus-tutcode-1.0.2-r1
deleted file mode 100644
index e1de777490e7..000000000000
--- a/metadata/md5-cache/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	b43d08fe0771faf2f5e7be19c2789d33	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/metadata/md5-cache/app-i18n/librime-1.2.9 b/metadata/md5-cache/app-i18n/librime-1.2.9
index 4ac7f653ca7a..cdbe855750d1 100644
--- a/metadata/md5-cache/app-i18n/librime-1.2.9
+++ b/metadata/md5-cache/app-i18n/librime-1.2.9
@@ -1,13 +1,13 @@
 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
+DEPEND=app-i18n/opencc:= dev-cpp/glog:= dev-cpp/yaml-cpp:= dev-libs/boost:=[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, the core library
 EAPI=6
-HOMEPAGE=http://rime.im/ https://github.com/rime/librime
+HOMEPAGE=https://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:=
+RDEPEND=app-i18n/opencc:= dev-cpp/glog:= dev-cpp/yaml-cpp:= dev-libs/boost:=[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	b43d08fe0771faf2f5e7be19c2789d33	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
+_md5_=cba78c938a56457b77e1b16a20334e80
diff --git a/metadata/md5-cache/app-i18n/librime-1.3.1 b/metadata/md5-cache/app-i18n/librime-1.3.1
new file mode 100644
index 000000000000..6e3c5d1e2bc4
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/librime-1.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=app-i18n/opencc:= dev-cpp/glog:= dev-cpp/yaml-cpp:= dev-libs/boost:=[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, the core library
+EAPI=6
+HOMEPAGE=https://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:= dev-libs/boost:=[threads] dev-libs/leveldb:= dev-libs/marisa:=
+SLOT=0/1
+SRC_URI=https://github.com/rime/librime/archive/1.3.1.tar.gz -> librime-1.3.1.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	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_=63fd6bc2b908148e374c4d328e27963e
diff --git a/metadata/md5-cache/app-i18n/libskk-1.0.1 b/metadata/md5-cache/app-i18n/libskk-1.0.1
index 6bbacb513313..4af0abaee3a0 100644
--- a/metadata/md5-cache/app-i18n/libskk-1.0.1
+++ b/metadata/md5-cache/app-i18n/libskk-1.0.1
@@ -9,5 +9,5 @@ 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	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1
 _md5_=f978fd405668e09f6586f2ab6041ae38
diff --git a/metadata/md5-cache/app-i18n/libskk-1.0.2 b/metadata/md5-cache/app-i18n/libskk-1.0.2
index fb6895719f27..5481574e5020 100644
--- a/metadata/md5-cache/app-i18n/libskk-1.0.2
+++ b/metadata/md5-cache/app-i18n/libskk-1.0.2
@@ -9,5 +9,5 @@ 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	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1
 _md5_=4288c1d347291ec80c7d86bbec374b58
diff --git a/metadata/md5-cache/app-i18n/man-pages-fr-3.40.1 b/metadata/md5-cache/app-i18n/man-pages-fr-3.40.1
index d41e78d2a8ba..2179c315ec83 100644
--- a/metadata/md5-cache/app-i18n/man-pages-fr-3.40.1
+++ b/metadata/md5-cache/app-i18n/man-pages-fr-3.40.1
@@ -2,9 +2,9 @@ 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
+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
+_md5_=cabdf9b118e4d9c5c6f9a91580088e4a
diff --git a/metadata/md5-cache/app-i18n/man-pages-ja-20171215 b/metadata/md5-cache/app-i18n/man-pages-ja-20171215
index 7e948dc7d195..dea5e17f4c00 100644
--- a/metadata/md5-cache/app-i18n/man-pages-ja-20171215
+++ b/metadata/md5-cache/app-i18n/man-pages-ja-20171215
@@ -2,9 +2,9 @@ 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
+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
+_md5_=2a728ee4656b55d8c004cffa5a816d86
diff --git a/metadata/md5-cache/app-i18n/nkf-2.1.3 b/metadata/md5-cache/app-i18n/nkf-2.1.3
deleted file mode 100644
index 01fadf6134af..000000000000
--- a/metadata/md5-cache/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	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	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/metadata/md5-cache/app-i18n/nkf-2.1.3-r1 b/metadata/md5-cache/app-i18n/nkf-2.1.3-r1
deleted file mode 100644
index 2ad4ed9e7c8c..000000000000
--- a/metadata/md5-cache/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	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	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/metadata/md5-cache/app-i18n/nkf-2.1.3-r2 b/metadata/md5-cache/app-i18n/nkf-2.1.3-r2
new file mode 100644
index 000000000000..34e883cf6bc1
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/nkf-2.1.3-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+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:=
+DESCRIPTION=Network Kanji code conversion Filter with UTF-8/16 support
+EAPI=6
+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:=
+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_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cf98bc3180373c529fd2b4f6664113b9
diff --git a/metadata/md5-cache/app-i18n/nkf-2.1.4 b/metadata/md5-cache/app-i18n/nkf-2.1.4
new file mode 100644
index 000000000000..2e87d0fc005e
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/nkf-2.1.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=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-lang/perl:=
+DESCRIPTION=Network Kanji code conversion Filter with UTF-8/16 support
+EAPI=6
+HOMEPAGE=http://sourceforge.jp/projects/nkf/
+IUSE=perl python l10n_ja python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-macos
+LICENSE=ZLIB python? ( BSD )
+RDEPEND=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-lang/perl:=
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://sourceforge.jp/nkf/64158/nkf-2.1.4.tar.gz python? ( https://github.com/fumiyas/python-nkf/archive/000915e115acac57a1fdbceb1e6361788af83a3d.tar.gz -> python-nkf-0.2.0_p20141211.tar.gz )
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d118cbd3b431331616ac520dac1afda3
diff --git a/metadata/md5-cache/app-i18n/poedit-2.0.9 b/metadata/md5-cache/app-i18n/poedit-2.0.9
index 7042b2e43ce8..f5eb41308140 100644
--- a/metadata/md5-cache/app-i18n/poedit-2.0.9
+++ b/metadata/md5-cache/app-i18n/poedit-2.0.9
@@ -3,10 +3,10 @@ DEPEND=app-text/gtkspell:3 x11-libs/gtk+:3 >=dev-cpp/lucene++-3.0.5 dev-libs/boo
 DESCRIPTION=GUI gettext translations editor
 EAPI=6
 HOMEPAGE=https://poedit.net
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+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.9-oss/poedit-2.0.9.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	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_=415cba0c11c96f4bc5075955fc353fd6
+_md5_=21f9fe8a3b97480bfb284cdb7e6d2683
diff --git a/metadata/md5-cache/app-i18n/rime-data-0.35 b/metadata/md5-cache/app-i18n/rime-data-0.35
index 208ae05d6b87..f0fb7ceca6d8 100644
--- a/metadata/md5-cache/app-i18n/rime-data-0.35
+++ b/metadata/md5-cache/app-i18n/rime-data-0.35
@@ -1,11 +1,11 @@
-DEFINED_PHASES=-
+DEFINED_PHASES=prepare
 DEPEND=app-i18n/librime
 DESCRIPTION=Data resources for Rime Input Method Engine
 EAPI=6
-HOMEPAGE=http://rime.im/ https://github.com/rime/brise
+HOMEPAGE=https://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
+_md5_=724ccc62be0ca40ace074536dcbe3838
diff --git a/metadata/md5-cache/app-i18n/rime-data-0.38.20180515 b/metadata/md5-cache/app-i18n/rime-data-0.38.20180515
new file mode 100644
index 000000000000..1162074d44b1
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/rime-data-0.38.20180515
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile prepare
+DEPEND=app-i18n/librime
+DESCRIPTION=Data resources for Rime Input Method Engine
+EAPI=6
+HOMEPAGE=https://rime.im/ https://github.com/rime/brise
+IUSE=extra
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3 LGPL-3 extra? ( Apache-2.0 )
+RDEPEND=app-i18n/librime
+SLOT=0
+SRC_URI=https://github.com/rime/brise/releases/download/brise-0.38/brise-0.38.20180515.tar.gz
+_md5_=e86425c8a18c26c640c77de652382eb1
diff --git a/metadata/md5-cache/app-i18n/tomoe-gtk-0.6.0-r4 b/metadata/md5-cache/app-i18n/tomoe-gtk-0.6.0-r4
index 5afa664f41e5..2768c4bbf0a6 100644
--- a/metadata/md5-cache/app-i18n/tomoe-gtk-0.6.0-r4
+++ b/metadata/md5-cache/app-i18n/tomoe-gtk-0.6.0-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Tomoe GTK+ interface widget library
 EAPI=6
 HOMEPAGE=http://tomoe.osdn.jp/
 IUSE=python static-libs python_targets_python2_7
-KEYWORDS=amd64 ~x86
+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
+_md5_=bfed32023f69f34d65addcfb25a11e27
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.8 b/metadata/md5-cache/app-i18n/uim-1.8.8
index 10cc0a683281..e08263d51ce0 100644
--- a/metadata/md5-cache/app-i18n/uim-1.8.8
+++ b/metadata/md5-cache/app-i18n/uim-1.8.8
@@ -4,7 +4,7 @@ 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
+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 )
@@ -12,4 +12,4 @@ 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	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ecce160da87d58e90ccbbe7455b8abc2
+_md5_=a97e9825c8ff6133231aa11fd115c505
diff --git a/metadata/md5-cache/app-i18n/uim-tomoe-gtk-0.6.0 b/metadata/md5-cache/app-i18n/uim-tomoe-gtk-0.6.0
index 92c37021c56a..05f861ba18c8 100644
--- a/metadata/md5-cache/app-i18n/uim-tomoe-gtk-0.6.0
+++ b/metadata/md5-cache/app-i18n/uim-tomoe-gtk-0.6.0
@@ -3,10 +3,10 @@ DEPEND=app-i18n/uim ~app-i18n/tomoe-gtk-0.6.0 virtual/pkgconfig >=app-portage/el
 DESCRIPTION=Japanese input method Tomoe IMEngine for uim
 EAPI=6
 HOMEPAGE=http://tomoe.sourceforge.net/
-KEYWORDS=~amd64 ~x86
+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
+_md5_=e11d597792c2ad1a52dbee59fc354986
diff --git a/metadata/md5-cache/app-i18n/yaskkserv-1.1.0 b/metadata/md5-cache/app-i18n/yaskkserv-1.1.0
index d1d90f204f23..e4612f070be8 100644
--- a/metadata/md5-cache/app-i18n/yaskkserv-1.1.0
+++ b/metadata/md5-cache/app-i18n/yaskkserv-1.1.0
@@ -11,4 +11,4 @@ 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
+_md5_=6a4a67361657412b268760d6fee109b0