2017-08-22 14:44:13 UTC

27 files changed, 148 insertions, 86 deletions

diff --git a/metadata/md5-cache/app-i18n/fcitx-4.2.9.1 b/metadata/md5-cache/app-i18n/fcitx-4.2.9.1
index 605e3b88dcbf..7fece865adac 100644
--- a/metadata/md5-cache/app-i18n/fcitx-4.2.9.1
+++ b/metadata/md5-cache/app-i18n/fcitx-4.2.9.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile ) ) cairo? ( dev-libs/glib:2 x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) dbus? ( sys-apps/dbus ) enchant? ( app-text/enchant ) gtk2? ( dev-libs/glib:2 x11-libs/gtk+:2 ) gtk3? ( dev-libs/glib:2 x11-libs/gtk+:3 ) introspection? ( dev-libs/glib:2 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.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=sys-apps/dbus virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile ) ) cairo? ( dev-libs/glib:2 x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) enchant? ( app-text/enchant ) gtk2? ( dev-libs/glib:2 x11-libs/gtk+:2 ) gtk3? ( dev-libs/glib:2 x11-libs/gtk+:3 ) introspection? ( dev-libs/glib:2 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.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework
 EAPI=6
 HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx
-IUSE=+X +autostart +cairo +dbus debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml
+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=GPL-2+ LGPL-2+
-RDEPEND=virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile ) ) cairo? ( dev-libs/glib:2 x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) dbus? ( sys-apps/dbus ) enchant? ( app-text/enchant ) gtk2? ( dev-libs/glib:2 x11-libs/gtk+:2 ) gtk3? ( dev-libs/glib:2 x11-libs/gtk+:3 ) introspection? ( dev-libs/glib:2 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=autostart? ( dbus ) cairo? ( X ) gtk2? ( dbus ) gtk3? ( dbus ) introspection? ( dbus ) pango? ( cairo ) qt4? ( X dbus )
+RDEPEND=sys-apps/dbus virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile ) ) cairo? ( dev-libs/glib:2 x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) enchant? ( app-text/enchant ) gtk2? ( dev-libs/glib:2 x11-libs/gtk+:2 ) gtk3? ( dev-libs/glib:2 x11-libs/gtk+:3 ) introspection? ( dev-libs/glib:2 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=0
 SRC_URI=https://download.fcitx-im.org/fcitx/fcitx-4.2.9.1_dict.tar.xz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=745ba878e37c52d26fb4876353cd395d
+_md5_=e74ebb9b5adc05d94e9d569c456e3813
diff --git a/metadata/md5-cache/app-i18n/fcitx-9999 b/metadata/md5-cache/app-i18n/fcitx-9999
index 49e057237d05..cb7357b9a36f 100644
--- a/metadata/md5-cache/app-i18n/fcitx-9999
+++ b/metadata/md5-cache/app-i18n/fcitx-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile ) ) cairo? ( dev-libs/glib:2 x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) dbus? ( sys-apps/dbus ) enchant? ( app-text/enchant ) gtk2? ( dev-libs/glib:2 x11-libs/gtk+:2 ) gtk3? ( dev-libs/glib:2 x11-libs/gtk+:3 ) introspection? ( dev-libs/glib:2 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.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1
+DEPEND=sys-apps/dbus virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile ) ) cairo? ( dev-libs/glib:2 x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) enchant? ( app-text/enchant ) gtk2? ( dev-libs/glib:2 x11-libs/gtk+:2 ) gtk3? ( dev-libs/glib:2 x11-libs/gtk+:3 ) introspection? ( dev-libs/glib:2 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.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework
 EAPI=6
 HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx
-IUSE=+X +autostart +cairo +dbus debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml
+IUSE=+X +autostart +cairo debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml
 LICENSE=GPL-2+ LGPL-2+ MIT
-RDEPEND=virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile ) ) cairo? ( dev-libs/glib:2 x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) dbus? ( sys-apps/dbus ) enchant? ( app-text/enchant ) gtk2? ( dev-libs/glib:2 x11-libs/gtk+:2 ) gtk3? ( dev-libs/glib:2 x11-libs/gtk+:3 ) introspection? ( dev-libs/glib:2 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=autostart? ( dbus ) cairo? ( X ) gtk2? ( dbus ) gtk3? ( dbus ) introspection? ( dbus ) pango? ( cairo ) qt4? ( X dbus )
+RDEPEND=sys-apps/dbus virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile ) ) cairo? ( dev-libs/glib:2 x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) enchant? ( app-text/enchant ) gtk2? ( dev-libs/glib:2 x11-libs/gtk+:2 ) gtk3? ( dev-libs/glib:2 x11-libs/gtk+:3 ) introspection? ( dev-libs/glib:2 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=0
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_unpack:git-r3 src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a5862074fe3429783190224c6ddf1fcb
+_md5_=250c80a0b5daf8a4d4ab961c7c0c0c79
diff --git a/metadata/md5-cache/app-i18n/fcitx-libpinyin-0.3.3 b/metadata/md5-cache/app-i18n/fcitx-libpinyin-0.3.3
index 26dfde440bb2..927ed4320c1c 100644
--- a/metadata/md5-cache/app-i18n/fcitx-libpinyin-0.3.3
+++ b/metadata/md5-cache/app-i18n/fcitx-libpinyin-0.3.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-i18n/fcitx-4.2.8[dbus] app-i18n/libpinyin dev-libs/glib:2 sys-apps/dbus virtual/libintl dictmanager? ( >=app-i18n/fcitx-4.2.8[qt4] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DEPEND=>=app-i18n/fcitx-4.2.8 app-i18n/libpinyin dev-libs/glib:2 sys-apps/dbus virtual/libintl dictmanager? ( >=app-i18n/fcitx-4.2.8[qt4] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
 DESCRIPTION=Libpinyin module for Fcitx
 EAPI=5
 HOMEPAGE=http://fcitx-im.org/
 IUSE=dictmanager
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=app-i18n/fcitx-4.2.8[dbus] app-i18n/libpinyin dev-libs/glib:2 sys-apps/dbus virtual/libintl dictmanager? ( >=app-i18n/fcitx-4.2.8[qt4] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 )
+RDEPEND=>=app-i18n/fcitx-4.2.8 app-i18n/libpinyin dev-libs/glib:2 sys-apps/dbus virtual/libintl dictmanager? ( >=app-i18n/fcitx-4.2.8[qt4] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 )
 SLOT=0
 SRC_URI=http://download.fcitx-im.org/fcitx-libpinyin/fcitx-libpinyin-0.3.3_dict.tar.xz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_prepare:cmake-utils src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=37408b7dca5d86855e852fd7280e1e4e
+_md5_=2e07ead5da9dbd18de67ccf6f549969a
diff --git a/metadata/md5-cache/app-i18n/fcitx-libpinyin-0.5.1 b/metadata/md5-cache/app-i18n/fcitx-libpinyin-0.5.1
new file mode 100644
index 000000000000..bf064311abe3
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/fcitx-libpinyin-0.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-i18n/fcitx-4.2.8 >=app-i18n/libpinyin-1.9.91:= dev-libs/glib:2 sys-apps/dbus virtual/libintl dictmanager? ( >=app-i18n/fcitx-qt5-1.1 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtdbus-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwebengine-5.7:5[widgets] >=dev-qt/qtwidgets-5.7:5 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=Chinese LibPinyin input methods for Fcitx
+EAPI=6
+HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-libpinyin
+IUSE=dictmanager
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+ GPL-3+
+RDEPEND=>=app-i18n/fcitx-4.2.8 >=app-i18n/libpinyin-1.9.91:= dev-libs/glib:2 sys-apps/dbus virtual/libintl dictmanager? ( >=app-i18n/fcitx-qt5-1.1 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtdbus-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwebengine-5.7:5[widgets] >=dev-qt/qtwidgets-5.7:5 )
+SLOT=0
+SRC_URI=https://download.fcitx-im.org/fcitx-libpinyin/fcitx-libpinyin-0.5.1_dict.tar.xz
+_eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_prepare:cmake-utils src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d7904d58766a229036093c3d266528dc
diff --git a/metadata/md5-cache/app-i18n/fcitx-libpinyin-9999 b/metadata/md5-cache/app-i18n/fcitx-libpinyin-9999
new file mode 100644
index 000000000000..006e7b196766
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/fcitx-libpinyin-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=app-i18n/fcitx-4.2.8 >=app-i18n/libpinyin-1.9.91:= dev-libs/glib:2 sys-apps/dbus virtual/libintl dictmanager? ( >=app-i18n/fcitx-qt5-1.1 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtdbus-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwebengine-5.7:5[widgets] >=dev-qt/qtwidgets-5.7:5 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Chinese LibPinyin input methods for Fcitx
+EAPI=6
+HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-libpinyin
+IUSE=dictmanager
+LICENSE=GPL-2+ GPL-3+
+RDEPEND=>=app-i18n/fcitx-4.2.8 >=app-i18n/libpinyin-1.9.91:= dev-libs/glib:2 sys-apps/dbus virtual/libintl dictmanager? ( >=app-i18n/fcitx-qt5-1.1 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtdbus-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwebengine-5.7:5[widgets] >=dev-qt/qtwidgets-5.7:5 )
+SLOT=0
+_eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_unpack:git-r3 src_prepare:cmake-utils src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4fead0883426cc266ecccafb5a4f5a06
diff --git a/metadata/md5-cache/app-i18n/fcitx-qt5-1.1.0 b/metadata/md5-cache/app-i18n/fcitx-qt5-1.1.0
new file mode 100644
index 000000000000..295fb0ac4268
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/fcitx-qt5-1.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-i18n/fcitx-4.2.8 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 virtual/libintl x11-libs/libxkbcommon kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Fcitx input method module for Qt 5
+EAPI=6
+HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5
+KEYWORDS=~amd64 ~hppa ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-i18n/fcitx-4.2.8 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 virtual/libintl x11-libs/libxkbcommon
+SLOT=0
+SRC_URI=https://download.fcitx-im.org/fcitx-qt5/fcitx-qt5-1.1.0.tar.xz
+_eclass_exported_funcs=src_prepare:cmake-utils src_configure:cmake-utils src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1fb9bcca59175cac629c409927a850f9
diff --git a/metadata/md5-cache/app-i18n/fcitx-rime-0.3.1 b/metadata/md5-cache/app-i18n/fcitx-rime-0.3.1
index 27bc6b087198..f9fe3219bea7 100644
--- a/metadata/md5-cache/app-i18n/fcitx-rime-0.3.1
+++ b/metadata/md5-cache/app-i18n/fcitx-rime-0.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-i18n/fcitx-4.2.8.1[dbus] >=app-i18n/librime-1.0 app-i18n/rime-data virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=>=app-i18n/fcitx-4.2.8.1 >=app-i18n/librime-1.0 app-i18n/rime-data virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Rime support for Fcitx
 EAPI=5
 HOMEPAGE=http://fcitx-im.org/
 KEYWORDS=amd64 ~ppc ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=app-i18n/fcitx-4.2.8.1[dbus] >=app-i18n/librime-1.0 app-i18n/rime-data
+RDEPEND=>=app-i18n/fcitx-4.2.8.1 >=app-i18n/librime-1.0 app-i18n/rime-data
 SLOT=0
 SRC_URI=http://download.fcitx-im.org/fcitx-rime/fcitx-rime-0.3.1.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=dccda8f668e90a8870c46c3b960e3c1d
+_md5_=ebfb9ebe89cbf5ffcb5248b74d50b6cf
diff --git a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.9.0 b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.9.0
index 71270335d1ff..658c076f9310 100644
--- a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.9.0
+++ b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.9.0
@@ -1,15 +1,15 @@
 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_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_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=app-i18n/libpinyin-1.9.91 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_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.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+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_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_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=app-i18n/libpinyin-1.9.91:= 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_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.15: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_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_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=app-i18n/libpinyin-1.9.91 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_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 )
+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_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_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=app-i18n/libpinyin-1.9.91:= 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_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.0.tar.gz -> ibus-libpinyin-1.9.0.tar.gz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:python-single-r1 src_prepare:- src_configure:-
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=21d88e150e47d489a0c221be812f7c40
+_md5_=3c2bb3111a51d683bc802cc6a706f8bd
diff --git a/metadata/md5-cache/app-i18n/ibus-qt-1.3.1 b/metadata/md5-cache/app-i18n/ibus-qt-1.3.1
deleted file mode 100644
index 5cff1d288ebf..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-qt-1.3.1
+++ /dev/null
@@ -1,14 +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.7.2
-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://ibus.googlecode.com/files/ibus-qt-1.3.1-Source.tar.gz
-_eclass_exported_funcs=src_prepare:cmake-utils src_configure:- src_compile:- src_test:cmake-utils src_install:-
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1bb54a55d683e09523a883b4d812b042
diff --git a/metadata/md5-cache/app-i18n/ibus-qt-1.3.3 b/metadata/md5-cache/app-i18n/ibus-qt-1.3.3
index 446f674e5917..c3344ca72326 100644
--- a/metadata/md5-cache/app-i18n/ibus-qt-1.3.3
+++ b/metadata/md5-cache/app-i18n/ibus-qt-1.3.3
@@ -4,11 +4,11 @@ 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
+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
 _eclass_exported_funcs=src_prepare:cmake-utils src_configure:- src_compile:- src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=75579a723bf67a78f40f162f6b80bce8
+_md5_=66cf905bfdc5d8f26912373bd24e5c9e
diff --git a/metadata/md5-cache/app-i18n/kcm-fcitx-0.4.3 b/metadata/md5-cache/app-i18n/kcm-fcitx-0.4.3
index 48245af5163e..9bf00e4f30d4 100644
--- a/metadata/md5-cache/app-i18n/kcm-fcitx-0.4.3
+++ b/metadata/md5-cache/app-i18n/kcm-fcitx-0.4.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-i18n/fcitx-4.2.8[dbus,qt4] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 virtual/libintl x11-libs/libX11 x11-libs/libxkbfile dev-util/automoc sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=app-i18n/fcitx-4.2.8[qt4] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 virtual/libintl x11-libs/libX11 x11-libs/libxkbfile dev-util/automoc sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=KDE configuration module for Fcitx
 EAPI=6
 HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/kcm-fcitx
 IUSE=minimal
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.8[dbus,qt4] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 virtual/libintl x11-libs/libX11 x11-libs/libxkbfile
+RDEPEND=>=app-i18n/fcitx-4.2.8[qt4] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 virtual/libintl x11-libs/libX11 x11-libs/libxkbfile
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/kcm-fcitx/kcm-fcitx-0.4.3.tar.xz
 _eclass_exported_funcs=pkg_preinst:xdg pkg_postrm:xdg pkg_postinst:xdg src_prepare:- src_configure:cmake-utils src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=65585aa86ca7c2589b795170b630060f
+_md5_=bd23a1f3175a29831e62b041176beb4b
diff --git a/metadata/md5-cache/app-i18n/kcm-fcitx-0.4.9999 b/metadata/md5-cache/app-i18n/kcm-fcitx-0.4.9999
index 146511918a17..63f350253643 100644
--- a/metadata/md5-cache/app-i18n/kcm-fcitx-0.4.9999
+++ b/metadata/md5-cache/app-i18n/kcm-fcitx-0.4.9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=app-i18n/fcitx-4.2.8[dbus,qt4] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 virtual/libintl x11-libs/libX11 x11-libs/libxkbfile dev-util/automoc sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1
+DEPEND=>=app-i18n/fcitx-4.2.8[qt4] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 virtual/libintl x11-libs/libX11 x11-libs/libxkbfile dev-util/automoc sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1
 DESCRIPTION=KDE configuration module for Fcitx
 EAPI=6
 HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/kcm-fcitx
 IUSE=minimal
 LICENSE=GPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.8[dbus,qt4] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 virtual/libintl x11-libs/libX11 x11-libs/libxkbfile
+RDEPEND=>=app-i18n/fcitx-4.2.8[qt4] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 virtual/libintl x11-libs/libX11 x11-libs/libxkbfile
 SLOT=4
 _eclass_exported_funcs=pkg_preinst:xdg pkg_postrm:xdg pkg_postinst:xdg src_unpack:git-r3 src_prepare:- src_configure:cmake-utils src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=39b7f9d271ca29aaf6f1eab3db2d2ba4
+_md5_=79f20a616ede8220ad958fd8eceecfbb
diff --git a/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.3 b/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.3
index 65e78afbc6fe..bd6b55356bd1 100644
--- a/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.3
+++ b/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-i18n/fcitx-4.2.8[dbus] app-i18n/fcitx-qt5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kcmutils:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knewstuff:5 kde-frameworks/kwidgetsaddons:5 virtual/libintl !app-i18n/kcm-fcitx:4[-minimal(-)] kde-frameworks/extra-cmake-modules:5 sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=>=app-i18n/fcitx-4.2.8 app-i18n/fcitx-qt5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kcmutils:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knewstuff:5 kde-frameworks/kwidgetsaddons:5 virtual/libintl !app-i18n/kcm-fcitx:4[-minimal(-)] kde-frameworks/extra-cmake-modules:5 sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=KDE configuration module for Fcitx
 EAPI=6
 HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/kcm-fcitx
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.8[dbus] app-i18n/fcitx-qt5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kcmutils:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knewstuff:5 kde-frameworks/kwidgetsaddons:5 virtual/libintl !app-i18n/kcm-fcitx:4[-minimal(-)]
+RDEPEND=>=app-i18n/fcitx-4.2.8 app-i18n/fcitx-qt5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kcmutils:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knewstuff:5 kde-frameworks/kwidgetsaddons:5 virtual/libintl !app-i18n/kcm-fcitx:4[-minimal(-)]
 SLOT=5
 SRC_URI=https://download.fcitx-im.org/kcm-fcitx/kcm-fcitx-0.5.3.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a5919b48446b98c821cac761d7520b08
+_md5_=ef3f8c535577b4640e69b0b3310a530d
diff --git a/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.4 b/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.4
new file mode 100644
index 000000000000..5be72cc4b446
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-i18n/fcitx-4.2.8 >=app-i18n/fcitx-qt5-1.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kcmutils:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knewstuff:5 kde-frameworks/kwidgetsaddons:5 virtual/libintl !app-i18n/kcm-fcitx:4[-minimal(-)] kde-frameworks/extra-cmake-modules:5 sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=KDE configuration module for Fcitx
+EAPI=6
+HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/kcm-fcitx
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-i18n/fcitx-4.2.8 >=app-i18n/fcitx-qt5-1.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kcmutils:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knewstuff:5 kde-frameworks/kwidgetsaddons:5 virtual/libintl !app-i18n/kcm-fcitx:4[-minimal(-)]
+SLOT=5
+SRC_URI=https://download.fcitx-im.org/kcm-fcitx/kcm-fcitx-0.5.4.tar.xz
+_eclass_exported_funcs=src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=04ca2010f70cdca947691658f04f6454
diff --git a/metadata/md5-cache/app-i18n/kcm-fcitx-9999 b/metadata/md5-cache/app-i18n/kcm-fcitx-9999
index de3dbeca17d7..243a6abc5fd8 100644
--- a/metadata/md5-cache/app-i18n/kcm-fcitx-9999
+++ b/metadata/md5-cache/app-i18n/kcm-fcitx-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=app-i18n/fcitx-4.2.8[dbus] app-i18n/fcitx-qt5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kcmutils:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knewstuff:5 kde-frameworks/kwidgetsaddons:5 virtual/libintl !app-i18n/kcm-fcitx:4[-minimal(-)] kde-frameworks/extra-cmake-modules:5 sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
+DEPEND=>=app-i18n/fcitx-4.2.8 >=app-i18n/fcitx-qt5-1.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kcmutils:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knewstuff:5 kde-frameworks/kwidgetsaddons:5 virtual/libintl !app-i18n/kcm-fcitx:4[-minimal(-)] kde-frameworks/extra-cmake-modules:5 sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=KDE configuration module for Fcitx
 EAPI=6
 HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/kcm-fcitx
 LICENSE=GPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.8[dbus] app-i18n/fcitx-qt5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kcmutils:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knewstuff:5 kde-frameworks/kwidgetsaddons:5 virtual/libintl !app-i18n/kcm-fcitx:4[-minimal(-)]
+RDEPEND=>=app-i18n/fcitx-4.2.8 >=app-i18n/fcitx-qt5-1.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kcmutils:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knewstuff:5 kde-frameworks/kwidgetsaddons:5 virtual/libintl !app-i18n/kcm-fcitx:4[-minimal(-)]
 SLOT=5
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=876e283146b976f7f3fbd19280977c3c
+_md5_=c7238cc93b46f19ffdcc646e937b4f90
diff --git a/metadata/md5-cache/app-i18n/libpinyin-0.8.0 b/metadata/md5-cache/app-i18n/libpinyin-0.8.0
index 6cfd226e3938..f697fb4439a5 100644
--- a/metadata/md5-cache/app-i18n/libpinyin-0.8.0
+++ b/metadata/md5-cache/app-i18n/libpinyin-0.8.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install prepare
-DEPEND=sys-libs/db:4.8 dev-libs/glib:2 virtual/libintl virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-libs/db:= dev-libs/glib:2 virtual/libintl virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Library for Chinese pinyin input methods
 EAPI=5
 HOMEPAGE=https://github.com/libpinyin/libpinyin
 KEYWORDS=amd64 ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/db:4.8 dev-libs/glib:2
-SLOT=0
+LICENSE=GPL-2+
+RDEPEND=sys-libs/db:= dev-libs/glib:2
+SLOT=0/2
 SRC_URI=mirror://github/libpinyin/libpinyin/libpinyin-lite-0.8.0.tar.gz -> libpinyin-0.8.0.tar mirror://github/libpinyin/libpinyin/model.text.tar.gz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=bc00a3952f65e8027185039124b8300a
+_md5_=5a7dbb7e07ad93ae074a15104060c0e0
diff --git a/metadata/md5-cache/app-i18n/libpinyin-1.0.0 b/metadata/md5-cache/app-i18n/libpinyin-1.0.0
index 37d8db6ba913..89b1338faa39 100644
--- a/metadata/md5-cache/app-i18n/libpinyin-1.0.0
+++ b/metadata/md5-cache/app-i18n/libpinyin-1.0.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install prepare
-DEPEND=sys-libs/db:4.8 dev-libs/glib:2 virtual/libintl virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-libs/db:= dev-libs/glib:2 virtual/libintl virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Library for Chinese pinyin input methods
 EAPI=5
 HOMEPAGE=https://github.com/libpinyin/libpinyin
 KEYWORDS=amd64 ~arm64 ~ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/db:4.8 dev-libs/glib:2
-SLOT=0
+LICENSE=GPL-2+
+RDEPEND=sys-libs/db:= dev-libs/glib:2
+SLOT=0/4
 SRC_URI=mirror://sourceforge/libpinyin/libpinyin/libpinyin-lite-1.0.0.tar.gz -> libpinyin-1.0.0.tar mirror://sourceforge/libpinyin/models/model7.text.tar.gz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=4439b2652c057203adc5b960bc405f0f
+_md5_=e6c71a9b8bd6c37dc92123ddad34a041
diff --git a/metadata/md5-cache/app-i18n/libpinyin-1.3.0-r1 b/metadata/md5-cache/app-i18n/libpinyin-1.3.0-r1
index cf8534cf858a..7af5b7dc96d3 100644
--- a/metadata/md5-cache/app-i18n/libpinyin-1.3.0-r1
+++ b/metadata/md5-cache/app-i18n/libpinyin-1.3.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install prepare
-DEPEND=sys-libs/db:* dev-libs/glib:2 virtual/libintl virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-libs/db:= dev-libs/glib:2 virtual/libintl virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Library for Chinese pinyin input methods
 EAPI=5
 HOMEPAGE=https://github.com/libpinyin/libpinyin
 KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/db:* dev-libs/glib:2
-SLOT=0
+LICENSE=GPL-2+
+RDEPEND=sys-libs/db:= dev-libs/glib:2
+SLOT=0/7
 SRC_URI=https://github.com/libpinyin/libpinyin/archive/1.3.0.tar.gz -> libpinyin-1.3.0.tar.gz mirror://sourceforge/libpinyin/models/model11.text.tar.gz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=0ee8d474dd1a9e484e61c4f5c2103259
+_md5_=464595954f1165b0dcf882ea17d91afa
diff --git a/metadata/md5-cache/app-i18n/libpinyin-2.0.92 b/metadata/md5-cache/app-i18n/libpinyin-2.0.92
index 94c278368bb1..f943831a6358 100644
--- a/metadata/md5-cache/app-i18n/libpinyin-2.0.92
+++ b/metadata/md5-cache/app-i18n/libpinyin-2.0.92
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/glib:2 sys-libs/db:* virtual/libintl virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/glib:2 sys-libs/db:= virtual/libintl virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15: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
 KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 sys-libs/db:*
-SLOT=0
+LICENSE=GPL-3+
+RDEPEND=dev-libs/glib:2 sys-libs/db:=
+SLOT=0/12
 SRC_URI=https://github.com/libpinyin/libpinyin/archive/2.0.92.tar.gz -> libpinyin-2.0.92.tar.gz mirror://sourceforge/libpinyin/models/model14.text.tar.gz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=9a3953b7d030782bfcb6203cb36fbbf0
+_md5_=147fd7adb9da73fd6571abca01162a53
diff --git a/metadata/md5-cache/app-i18n/librime-0.9.9 b/metadata/md5-cache/app-i18n/librime-0.9.9
index 2944737cad3c..dc2dfb4d05f9 100644
--- a/metadata/md5-cache/app-i18n/librime-0.9.9
+++ b/metadata/md5-cache/app-i18n/librime-0.9.9
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-i18n/opencc dev-cpp/glog >=dev-cpp/yaml-cpp-0.5.0 dev-db/kyotocabinet >=dev-libs/boost-1.46.0[threads(+)] sys-libs/zlib x11-proto/xproto test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=app-i18n/opencc:= dev-cpp/glog >=dev-cpp/yaml-cpp-0.5.0 dev-db/kyotocabinet >=dev-libs/boost-1.46.0[threads(+)] sys-libs/zlib x11-proto/xproto test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Rime Input Method Engine library
 EAPI=5
 HOMEPAGE=http://rime.im/
 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-db/kyotocabinet >=dev-libs/boost-1.46.0[threads(+)] sys-libs/zlib x11-proto/xproto
+RDEPEND=app-i18n/opencc:= dev-cpp/glog >=dev-cpp/yaml-cpp-0.5.0 dev-db/kyotocabinet >=dev-libs/boost-1.46.0[threads(+)] sys-libs/zlib x11-proto/xproto
 SLOT=0
 SRC_URI=https://rimeime.googlecode.com/files/librime-0.9.9.tar.gz
 _eclass_exported_funcs=src_prepare:cmake-utils src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f958f67fa0acdb7a1184d08cf6186eba
+_md5_=0851d10cbf923e0d425dc56cbf189155
diff --git a/metadata/md5-cache/app-i18n/librime-1.2 b/metadata/md5-cache/app-i18n/librime-1.2
index aa5f1eccb184..280bbf95ce7d 100644
--- a/metadata/md5-cache/app-i18n/librime-1.2
+++ b/metadata/md5-cache/app-i18n/librime-1.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-i18n/opencc dev-cpp/glog >=dev-cpp/yaml-cpp-0.5.0 dev-db/kyotocabinet dev-libs/marisa >=dev-libs/boost-1.46.0[threads(+)] sys-libs/zlib x11-proto/xproto test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=app-i18n/opencc:= dev-cpp/glog >=dev-cpp/yaml-cpp-0.5.0 dev-db/kyotocabinet dev-libs/marisa >=dev-libs/boost-1.46.0[threads(+)] sys-libs/zlib x11-proto/xproto test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Rime Input Method Engine library
 EAPI=5
 HOMEPAGE=http://rime.im/
 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-db/kyotocabinet dev-libs/marisa >=dev-libs/boost-1.46.0[threads(+)] sys-libs/zlib x11-proto/xproto
+RDEPEND=app-i18n/opencc:= dev-cpp/glog >=dev-cpp/yaml-cpp-0.5.0 dev-db/kyotocabinet dev-libs/marisa >=dev-libs/boost-1.46.0[threads(+)] sys-libs/zlib x11-proto/xproto
 SLOT=0
 SRC_URI=http://dl.bintray.com/lotem/rime/librime-1.2.tar.gz
 _eclass_exported_funcs=src_prepare:cmake-utils src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=4e668f447df435666dd784604a11f7ed
+_md5_=4406fccab65d3a5a26acffbb4f66abb0
diff --git a/metadata/md5-cache/app-i18n/librime-1.2.9 b/metadata/md5-cache/app-i18n/librime-1.2.9
index cfeb5276ffdc..6b45f597777a 100644
--- a/metadata/md5-cache/app-i18n/librime-1.2.9
+++ b/metadata/md5-cache/app-i18n/librime-1.2.9
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>app-i18n/opencc-1.0.2 dev-cpp/glog >=dev-cpp/yaml-cpp-0.5.0 dev-db/kyotocabinet dev-libs/leveldb dev-libs/marisa >=dev-libs/boost-1.46.0[threads(+)] sys-libs/zlib x11-proto/xproto test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=>app-i18n/opencc-1.0.2:= dev-cpp/glog >=dev-cpp/yaml-cpp-0.5.0 dev-db/kyotocabinet dev-libs/leveldb dev-libs/marisa >=dev-libs/boost-1.46.0[threads(+)] sys-libs/zlib x11-proto/xproto test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Rime Input Method Engine library
 EAPI=5
 HOMEPAGE=http://rime.im/
 IUSE=static-libs test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-3
-RDEPEND=>app-i18n/opencc-1.0.2 dev-cpp/glog >=dev-cpp/yaml-cpp-0.5.0 dev-db/kyotocabinet dev-libs/leveldb dev-libs/marisa >=dev-libs/boost-1.46.0[threads(+)] sys-libs/zlib
+RDEPEND=>app-i18n/opencc-1.0.2:= dev-cpp/glog >=dev-cpp/yaml-cpp-0.5.0 dev-db/kyotocabinet dev-libs/leveldb dev-libs/marisa >=dev-libs/boost-1.46.0[threads(+)] sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/rime/librime/archive/rime-1.2.9.tar.gz -> librime-1.2.9.tar.gz
 _eclass_exported_funcs=src_unpack:vcs-snapshot src_prepare:cmake-utils src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f9ab06ff18c67404c5f955b81fb9b6a9
+_md5_=3eb34654b356fa77065951e176937c1d
diff --git a/metadata/md5-cache/app-i18n/opencc-1.0.4 b/metadata/md5-cache/app-i18n/opencc-1.0.4
index 17760691705d..5da4500f1a5a 100644
--- a/metadata/md5-cache/app-i18n/opencc-1.0.4
+++ b/metadata/md5-cache/app-i18n/opencc-1.0.4
@@ -6,8 +6,8 @@ HOMEPAGE=https://github.com/BYVoid/OpenCC
 IUSE=doc static-libs
 KEYWORDS=amd64 hppa ppc ppc64 x86
 LICENSE=Apache-2.0
-SLOT=0
+SLOT=0/2
 SRC_URI=https://github.com/BYVoid/OpenCC/archive/ver.1.0.4.tar.gz -> opencc-1.0.4.tar.gz
 _eclass_exported_funcs=src_unpack:vcs-snapshot src_prepare:cmake-utils src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0a827329c5ac9126acc0bb1cf3fb9bbb
+_md5_=f557abf5b9cd094076ed0f30e4ed4e68
diff --git a/metadata/md5-cache/app-i18n/opencc-1.0.5 b/metadata/md5-cache/app-i18n/opencc-1.0.5
index 7dc2e13b422f..70e5f4b3d63a 100644
--- a/metadata/md5-cache/app-i18n/opencc-1.0.5
+++ b/metadata/md5-cache/app-i18n/opencc-1.0.5
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install prepare test unpack
+DEFINED_PHASES=compile configure install prepare test
 DEPEND=doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Libraries for conversion between Traditional and Simplified Chinese
+DESCRIPTION=Project for conversion between Traditional and Simplified Chinese
 EAPI=6
 HOMEPAGE=https://github.com/BYVoid/OpenCC
-IUSE=doc static-libs
+IUSE=doc
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
-SLOT=0
+SLOT=0/2
 SRC_URI=https://github.com/BYVoid/OpenCC/archive/ver.1.0.5.tar.gz -> opencc-1.0.5.tar.gz
-_eclass_exported_funcs=src_unpack:vcs-snapshot src_prepare:cmake-utils src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:-
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=5541f1d58bcbbd393a04969c9febeef9
+_eclass_exported_funcs=src_prepare:cmake-utils src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:-
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a625dbe82dd4a35401c9137865ac1ab0
diff --git a/metadata/md5-cache/app-i18n/opencc-9999 b/metadata/md5-cache/app-i18n/opencc-9999
new file mode 100644
index 000000000000..b7190bfd629f
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/opencc-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Project for conversion between Traditional and Simplified Chinese
+EAPI=6
+HOMEPAGE=https://github.com/BYVoid/OpenCC
+IUSE=doc
+LICENSE=Apache-2.0
+SLOT=0/2
+_eclass_exported_funcs=src_unpack:git-r3 src_prepare:cmake-utils src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:-
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5efedce3206709a3d2f0fc1b61ae2d4f
diff --git a/metadata/md5-cache/dev-lisp/cl-unicode-0.1.5 b/metadata/md5-cache/dev-lisp/cl-unicode-0.1.5
index be7dee792529..6f7603379aa7 100644
--- a/metadata/md5-cache/dev-lisp/cl-unicode-0.1.5
+++ b/metadata/md5-cache/dev-lisp/cl-unicode-0.1.5
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/edicl/cl-unicode/archive/v0.1.5.tar.gz -> cl-unicode-0.1.5.tar.gz
 _eclass_exported_funcs=src_configure:- src_compile:- src_install:-
 _eclasses_=common-lisp-3	aae227dd64002603622f1dcc63c9744c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=66ad8b021b8d1a743171d707fa1bc8b3
+_md5_=32c157785a062c93b27e504e8c1ac8e2
diff --git a/metadata/md5-cache/x11-themes/hicolor-icon-theme-0.16 b/metadata/md5-cache/x11-themes/hicolor-icon-theme-0.16
new file mode 100644
index 000000000000..14c2d408a47a
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/hicolor-icon-theme-0.16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=postinst postrm preinst
+DEPEND=app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Fallback theme for the freedesktop icon theme specification
+EAPI=6
+HOMEPAGE=https://freedesktop.org/wiki/Software/icon-theme
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://icon-theme.freedesktop.org/releases/hicolor-icon-theme-0.16.tar.xz
+_eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:-
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9ec690e17d28de3acd9b7bdf5741b678