gentoo resync : 29.08.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-08-29 20:19:23 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-08-29 20:19:23 +0100
commit: 12bb627384ddfd47382b9f1b6464481a58d01ebb (patch)
tree: f9760c04ccd4fcd7de214e2acd5b0e43fb530aa9 /app-i18n
parent: 5fdd950c7ae03e12746a45c86d85861beaacc846 (diff)
51 files changed, 618 insertions, 381 deletions
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 95606d380271..2a890c6b0e2c 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index 04f60b84c42b..7fb51a55c79b 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -4,6 +4,6 @@ DIST fcitx-data-pinyin.tar.gz 1608886 BLAKE2B 3b7e72559bb838b4f2245e6faf2d627df1
 DIST fcitx-data-py_stroke-20121124.tar.gz 445601 BLAKE2B 43b29b30da11b18196918e4df847406871eff75595b62608ad86b0ef6de83ec5e1b722645cabb809281075b393b5970e4d9580594caa73060c866c2d3cd988e7 SHA512 d80ff9a3549e07c7a6935e686785f9a076c58f1a782a832ae28ee65e2a213d67f089f450ce09bed87ec2a141c32b9c1fcb83c221ddcab436858fa9009f161fb3
 DIST fcitx-data-py_table-20121124.tar.gz 186822 BLAKE2B d696413f2e88f1ca87938d632e12997d14a31a66eaf011c6a7b3c0f607cf45f48e53644ea07d73dbbb0ad898dee6d5ff2d0e4fc2fdcae923acbc03d3d387aaeb SHA512 0fa72ce6820a316e9729bc0d7a08af5ca3468134de9ff1bf0c559a398846a7bcf7313a3609d943e6bab637d930cf45ad9acfe25a8d3df078a774b071a7296486
 DIST fcitx-data-table.tar.gz 4144686 BLAKE2B 696845bb234915a364d614d47cc3baf8421a12ca1778611b0843e52e651da98b5ed9f3e0c9895a829b67f1bcceb1f982a7f6606c8a2d383af8c4573a150c71ef SHA512 99e1d69c679355fcf3e117a1ef39b131cbd3af841387d2335757247d840b90ff6b7323e16fca98cf7a043033faf250d2e9c6d47b96845d18c278a0cf6f30fec9
-EBUILD fcitx-4.2.9.6.ebuild 4496 BLAKE2B b6bac936499ab6ee25b793ab38a20216b8f81b83b0514c5a3eabfd98bf8e96fad7616f0a9cfcce6686ccbd5ac5eb9b5c4a4222573d4b5d9c14b6f5e95b5088b9 SHA512 11e08f367df55805fc178dd9699506922094365646ae4bb68bc858da9c3f9d4043b741297e6002d9a74bf077f7c2828699933d7938b347fed16a4fcb10797270
-EBUILD fcitx-4.9999.ebuild 4471 BLAKE2B 6d7b590c69384e109731669cc510a516e76a6b7bd661238c7e8dcc50f159fc380dc6e99d59126552dfe161f59b91f96f4be082129751d565ac0c6d66c5260de4 SHA512 c593762d88126401d022eddf1a6c59f5dc480b7c97c02bb2b92a5e224de9fc76da41a7f8725c4fa996e4c425181047b5a04a1b5e21ae208ca60b7ff95643565c
-MISC metadata.xml 1139 BLAKE2B 3402416658db0bc853f3aaf8362cd37ac9454c8232cc94865a77f0414246f23542b3cc432daea8e25feb2837e89e3266c5bb266ec0118570bd855aa8493fcfc1 SHA512 eebc7e6f6e5baf897b0bba53075d2160512822c3f9f0b536c447b27fe7f9c23a6cce7f39e3bf0c78e6d2b959231df425b40af783b8d0b5e7a6137f8395c59301
+EBUILD fcitx-4.2.9.6.ebuild 4393 BLAKE2B d62663cd669f9eab880237b563a4e5d28556dd8611affe11d90116b67248aef2b70ab85a7e703b5effe6339597f4e0feb34e37e00959d34347a093e0f6cda196 SHA512 e39ed2314c5502e4f9c479901b30643a0d7c7f279d02343d3072da9f5559770cf183598fc83d5aef49858380180368896da2eaa45c69e02f2f07db83a7fc42cb
+EBUILD fcitx-4.9999.ebuild 4368 BLAKE2B 9be628acad1d46b6360edb40df518f39431edfc64eec510d99ac569cf2c69cccd66671cdecba690044203361f19eadd8cbef7b95ea61c2a55068c565288bda45 SHA512 1d0b77cf941b1d8f1da9fdb6dd85ab02faf86a5c24594eaef4549b93912ce39660e24d31962573589b7066eac9ba69390e6165c34221c44f6eabfd0582830ddc
+MISC metadata.xml 1076 BLAKE2B c4c0558a1e4b836fbf1e78ea1c4f8d60167fb07de270322133e9fa5479b7da4acd0bb5e7169e4759bbd0f8c1638aa271f6e82b2150c785ab5c54416b36a495ef SHA512 47382c905538cef508f9ca639a184dc767cd6ff063047da4ab4200c27631e833137a736899b45fcf5f0c9e4d59da93a6d1dd61873d6ad70a93ceb6cf4391da70
diff --git a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
index 98e30b8de8fa..e5a259025b1d 100644
--- a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
@@ -26,8 +26,8 @@ fi
 LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
 SLOT="4"
 KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
-REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )"
+IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango static-libs +table test +xml"
+REQUIRED_USE="cairo? ( X ) pango? ( cairo )"
 
 RDEPEND="dev-libs/glib:2
 	sys-apps/dbus
@@ -58,11 +58,6 @@ RDEPEND="dev-libs/glib:2
 	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
@@ -109,9 +104,9 @@ src_configure() {
 		-DENABLE_LUA=$(usex lua)
 		-DENABLE_OPENCC=$(usex opencc)
 		-DENABLE_PANGO=$(usex pango)
-		-DENABLE_QT=$(usex qt4)
-		-DENABLE_QT_GUI=$(usex qt4)
-		-DENABLE_QT_IM_MODULE=$(usex qt4)
+		-DENABLE_QT=OFF
+		-DENABLE_QT_GUI=OFF
+		-DENABLE_QT_IM_MODULE=OFF
 		-DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
 		-DENABLE_STATIC=$(usex static-libs)
 		-DENABLE_TABLE=$(usex table)
diff --git a/app-i18n/fcitx/fcitx-4.9999.ebuild b/app-i18n/fcitx/fcitx-4.9999.ebuild
index 6a3c3d9e00b8..22103a582078 100644
--- a/app-i18n/fcitx/fcitx-4.9999.ebuild
+++ b/app-i18n/fcitx/fcitx-4.9999.ebuild
@@ -26,8 +26,8 @@ fi
 LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
 SLOT="4"
 KEYWORDS=""
-IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
-REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )"
+IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango static-libs +table test +xml"
+REQUIRED_USE="cairo? ( X ) pango? ( cairo )"
 
 RDEPEND="dev-libs/glib:2
 	sys-apps/dbus
@@ -58,11 +58,6 @@ RDEPEND="dev-libs/glib:2
 	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
@@ -109,9 +104,9 @@ src_configure() {
 		-DENABLE_LUA=$(usex lua)
 		-DENABLE_OPENCC=$(usex opencc)
 		-DENABLE_PANGO=$(usex pango)
-		-DENABLE_QT=$(usex qt4)
-		-DENABLE_QT_GUI=$(usex qt4)
-		-DENABLE_QT_IM_MODULE=$(usex qt4)
+		-DENABLE_QT=OFF
+		-DENABLE_QT_GUI=OFF
+		-DENABLE_QT_IM_MODULE=OFF
 		-DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
 		-DENABLE_STATIC=$(usex static-libs)
 		-DENABLE_TABLE=$(usex table)
diff --git a/app-i18n/fcitx/metadata.xml b/app-i18n/fcitx/metadata.xml
index 7090f71a5172..e9e77497feec 100644
--- a/app-i18n/fcitx/metadata.xml
+++ b/app-i18n/fcitx/metadata.xml
@@ -16,7 +16,6 @@
 		<flag name="gtk3">Install input method module for GTK+ 3</flag>
 		<flag name="opencc">Enable OpenCC engine (using <pkg>app-i18n/opencc</pkg>) for converter between Simplified Chinese and Traditional Chinese</flag>
 		<flag name="pango">Enable support for <pkg>x11-libs/pango</pkg></flag>
-		<flag name="qt4">Install input method module for Qt 4</flag>
 		<flag name="table">Install table input methods for Simplified Chinese</flag>
 	</use>
 	<upstream>
diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
index c3f9a139704e..0c4a61caba90 100644
--- a/app-i18n/ibus-hangul/Manifest
+++ b/app-i18n/ibus-hangul/Manifest
@@ -1,3 +1,5 @@
 DIST ibus-hangul-1.5.0.tar.gz 505707 BLAKE2B 4dd630d7ed83ff4913e87c4d77f951845714697500a87ae337d898fe674d29e9421d5d506c2beb3acef859864d655f20d92f6a0cc5620f293a8a7623c4bd3158 SHA512 a9bef9ad887d1b41555af12e7589a9c4c69ddf4f61890907d90cbab6b9bf4cb6df4739c54d34ee1b2507486a1cb568f826bb4641e9ccee8ccfa11ff2d7e962bb
-EBUILD ibus-hangul-1.5.0.ebuild 935 BLAKE2B f0636e7f313db22213e2b6653f5ebdd958814b8b14f749419e46d55cf59a6fe8127fc5d6edb9439989b363db7c35d01eb13b55727c907ecd925d143c9443fcb5 SHA512 09b7c95e19af3dc76168b94d2a610eea1dcad3d72b4bb203cf2b785fdcc780e1b09e21118b1a7d6dd28c0932b83e9c28f977d15c220dc8e118585f577037cf87
-MISC metadata.xml 488 BLAKE2B 041bd1fd85e70d4c68feb85d9af3bc2d526f34852003568851d247c2f0ed70063cb77cbc3ba6bd14c7cd876ebc68840dbbedae4db64ea9897ef6b4c2cfb52fe1 SHA512 e46e56035a8bd336671564f460a30d5de6951ff53f6bd2567b4a17fb1fb661644caf4c4a40b7cd237cb57a19a71f174f243dea5e16eca490bda9116ce14ebd22
+DIST ibus-hangul-1.5.1.tar.gz 460517 BLAKE2B 913d0d8b8995fac3cd73ca40280761d5bf44f35134cb7e73075c233f9c1ef5aa00bb7d7b8da20a69273cd0eb8202b9deb409e1b8d1b6ebbeccccb5f0ef98d341 SHA512 1254398cc4daef2bcbb4cf5be5cfe4c3478097cc5be1f2b39861efe55529ba36602798a84c2540298c2c3b6405c1bd38c97543827c74a473dca5a2d23e3ac4ec
+EBUILD ibus-hangul-1.5.0-r1.ebuild 942 BLAKE2B e2df71bb4f867e955910ba19c8d32d5d4b0fbea2a5ce81119ade5e9524b79fa067e56d3708b6be85bbef658326048d01a2bf75f96c52e490ecd31b9dfd5c6b44 SHA512 b6f32af0d9b72bee3a2eb460f0f8c43e0f61b35d0226031f16532770ea9f2651b49312f851a0b03f108f15f685a7df655733772f486f144f99e5831d7421db29
+EBUILD ibus-hangul-1.5.1.ebuild 890 BLAKE2B 17c644c67c9ea41e25ef9aff14172e54a00c95b0cd8f933acc7ed22c81d0fe7dcce220222bfd95b341fa092ab8c5457aef840a78c4ef8959f8ae57502e1cf333 SHA512 23f6465a3547f9837f205cbfde7652727fb56472c713b245fa4a0f5fdb1879bbf2e2c4487266f3f488a9caa30ff29d45260b4610e23e60f10671f94674db6724
+MISC metadata.xml 469 BLAKE2B fc2c441dc9e4074913f97fd699f765f5cf658cf2faf60bd2e5794349cf58ae83d875bee8303f4836625111b1af89bfad5379c53424910725fc344bc89eef7eb7 SHA512 e22052e96605c02b108b6ec009c81f92ec83fe39978645ec5fccce5cbe4b17f1e205bd5e2173b3f082ff3a0ca404a6576b7f4bc2afa3915482d7afbb154b0172
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.0-r1.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..7b61f434638f
--- /dev/null
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit gnome2-utils python-single-r1
+
+DESCRIPTION="Hangul engine for IBus"
+HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
+SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=app-i18n/libhangul-0.1
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	sed -i "s/@PYTHON@/${EPYTHON}/" setup/${PN/-/-setup-}.in
+
+	default
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.0.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.0.ebuild
deleted file mode 100644
index 38435562f840..000000000000
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="The Hangul engine for IBus input platform"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/choehwanjin/ibus-hangul/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND=">=app-i18n/ibus-1.4[python,${PYTHON_USEDEP}]
-	=dev-python/pygobject-2*[${PYTHON_USEDEP}]
-	=dev-python/pygtk-2*[${PYTHON_USEDEP}]
-	>=app-i18n/libhangul-0.1
-	nls? ( virtual/libintl )
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? (
-		dev-util/intltool
-		>=sys-devel/gettext-0.17
-		)"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	sed -ie "s:python:${EPYTHON}:" \
-		setup/ibus-setup-hangul.in || die
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild
new file mode 100644
index 000000000000..0c0401cb2c0b
--- /dev/null
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit gnome2-utils python-single-r1
+
+DESCRIPTION="Hangul engine for IBus"
+HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
+SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=app-i18n/libhangul-0.1
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--with-python=${EPYTHON}
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/ibus-hangul/metadata.xml b/app-i18n/ibus-hangul/metadata.xml
index 7f550752e704..13995a6450cd 100644
--- a/app-i18n/ibus-hangul/metadata.xml
+++ b/app-i18n/ibus-hangul/metadata.xml
@@ -5,9 +5,11 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
-	<longdescription lang="en">The Hangul engine for IBus platform. It provides Korean input method from libhangul.</longdescription>
+	<longdescription lang="en">
+		The Hangul engine for IBus. It provides Korean input method from
+		<pkg>app-i18n/libhangul</pkg>.
+	</longdescription>
 	<upstream>
-		<remote-id type="google-code">ibus</remote-id>
-		<remote-id type="github">ibus/ibus</remote-id>
+		<remote-id type="github">libhangul/ibus-hangul</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-sunpinyin/Manifest b/app-i18n/ibus-sunpinyin/Manifest
index 7a4ce9315f92..22965320ecb6 100644
--- a/app-i18n/ibus-sunpinyin/Manifest
+++ b/app-i18n/ibus-sunpinyin/Manifest
@@ -1,4 +1,4 @@
 AUX ibus-sunpinyin-python3.patch 388 BLAKE2B 35131840c58bc47980dbbe046723217afb8926f61de601d664524b961c80f718753e41a82b7cdcd8b137d71c97ad84b91a3b71677610b2f369f9be2da2582185 SHA512 90c7d08588e996e7df966f9ee4b3b044a038392a0f3f074f4803b45a6579ad774119a3c700167924f073a3109f8172f8fea12129c2eb36e914b89eb68cc5a7dc
 DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e
-EBUILD ibus-sunpinyin-3.0.0_rc1.ebuild 1287 BLAKE2B aa4e01e681c5bedcbb6e5502bfd5c1868293dd0223fd7f1ada3ad03eababd4311e651a88f6c0af854fef1517fc9a978da2554220d0361d35e18f1ab5f2990c30 SHA512 76a496271a1c0078fde67c988b418fd67316901266062d265af124182fb7ade521fee0eae33973fbb4353442f36cb384b4163577558fa515854d8289d13cb704
+EBUILD ibus-sunpinyin-3.0.0_rc1.ebuild 1290 BLAKE2B 493687740e51a5d8540073d7b9fe03ce59bace1d1c1e67805fcf2ba6219766f9c07e6e8bedb5ba69a2d9ac14bb12d6b3547ab4a4e07e4d19b139e1744cd7b851 SHA512 79f36ae48dc2d61128cb2a15b72a3fd14d804516c3cf835b936d358a12fd13fcafdb92dec584f757dbdc274d6c2e15da800c84001b55515ac8a0332c5ca39557
 MISC metadata.xml 318 BLAKE2B cd239258d08a95f0d27a760678be36731954a721daae521d147b882fd07eb5206a38ce9ac9938e94e3501611cd95aba5699fb2e5a5176f3652e8e5531e5e4cf8 SHA512 44d76425ce41ba6cb84f584c7dfe3b0552eb65aec93b4ed72f9c2e6c153e5e51a3965bf4248486046d3ca9e39f861c3bcde90424ba35e4a57f2102a24faf0df5
diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild
index 695603734e1d..5bbaed2f6f60 100644
--- a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild
+++ b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild
@@ -20,7 +20,7 @@ IUSE="+nls"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python,${PYTHON_USEDEP}]
+	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
 	~app-i18n/sunpinyin-${PV}:=
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
diff --git a/app-i18n/ibus-table/Manifest b/app-i18n/ibus-table/Manifest
index 35f32abfd51e..53b00f89f118 100644
--- a/app-i18n/ibus-table/Manifest
+++ b/app-i18n/ibus-table/Manifest
@@ -1,5 +1,5 @@
-DIST ibus-table-1.5.0.tar.gz 432844 BLAKE2B 183c50be5545d176e44da4b5fae914d838cf4f43024fe56a0ba1e9a699e7f94ea3fb95e20775f8a28963c7e5e320332f51c33c58dcb1ac9a6017d87b6b3d60e9 SHA512 2c52da1b4d6ae8aec29e97a8a413b388912cfcfd15860ba0e65c97b139b14f8a7d4087eb196d516abe731df03a2e4904666194414242da8cf1f3f0b54696248e
 DIST ibus-table-1.9.18.tar.gz 585309 BLAKE2B 42d7d130bd2695c1c1a7010c0bcf29c1ecaa3899c8ef8d24b11e10434771415bfd8b91723ef4c489721f0276d05dce08de3472c49632b9d30da5be1a53f82dc7 SHA512 3f28269be1987023402eb6075b8e68b3bbba3c572a94551d072281677fde5fa14f8f4186455f8f9156b252934580c7a3837555d0edb46c76f13c8b109e26aca2
-EBUILD ibus-table-1.5.0-r1.ebuild 909 BLAKE2B 444c1043917802ce157c42c7975218543c0e2a25f72f280c770aa11a60283325afe693ad37507606eb8d15115740ca59a98db36023bf3cddfc7c41b8c5cc9c7a SHA512 93de9941ae6fc3f7fc984faf14511692c3e0a73998bb725e54fa465b2c4f417a7e2c40f630c6de482dbe1131ad34c7675fca306ca4c9ef038d9fd9a821ac53c5
-EBUILD ibus-table-1.9.18.ebuild 890 BLAKE2B 3a3cad572585b34b3094cc54874c80325b9ecde715ea25673b133be9fc7734b967ef4447e08c7c6bae730600cd9045595e2c50b7096131b7da63cc4dc8a00dff SHA512 ec786ca8823a3c4cc8933f26aa3505f21b408115c1f3d92f958a2efcffe295094368aa198a50cbcf602f3d0185411a056fbba606d457aca46fe7849527495f69
-MISC metadata.xml 433 BLAKE2B f165f823d61ad57b3db2925cd9dc184b23111bc4f375477673a908a3556fb68a668ec7f6bcf69aa72c5aedc7f15f34695a0bddaa8d77e72c75f4b9da7b0dd4d2 SHA512 827cf106065bdc9e3eb26c098a8480f3865f93e7bf667981437e725af60ad4fda297ed5d43cd9332f3131544e0ebec03dc058c688382a2a80ef34947339fc855
+DIST ibus-table-1.9.20.tar.gz 588045 BLAKE2B 9daba3a91fb2ef4d6ad6ba6bf2c1a7d4db12ae40ebd2ef3a843e68cc9d77791ed9a76550ceef0d7ccb8ad69322b897ebad36ff0bedf1d8a4790c69dec698e2fc SHA512 535008344a423a0c3afacf11206912cbc7b27b7a2724cc0f2dc944d0654a02f0b7d6eda397e95542a41b03fa675820531b12e2b0d8f2091ac6083d707a8ac285
+EBUILD ibus-table-1.9.18.ebuild 792 BLAKE2B 2f46968d5099a4ce021ac478189d75a64416faa97b9054b4e46983e96ddfcf419ef0f525f98cec28a9c78eeb8489e669cc68c03769e67cd78f4b3b14d39ad89b SHA512 34b8c63520193606f950766eead6273c9ef1941a7cc6122fe27e87f538111a3277ba9c7413777f3de80638688b210ff8d5f7e851ea9b31733a97e2e1ccb38e95
+EBUILD ibus-table-1.9.20.ebuild 794 BLAKE2B ec50c7daad4c41734326d740803e7e987851e2a60e6cf41c7757680d2864896b510a130d341992505d5386cc2a46ecebe9f293ca611476e07aedfb2ae5182b3e SHA512 61e29af1a7c597bb4675387be0d6a84fd72ee1ab7b1db40a9c9336ff30e4dea1a703ee9fa74cc5ec069d3e73f0215b4f6d7f9159a9429393d5c2bf7230ee5850
+MISC metadata.xml 419 BLAKE2B 7d8e333e50af2c6d8032fbae3455032febd51e3e7209c55fbfb28b52bb80482d4b95f7ba3ce02465218a93741abd016366a5356d8febcbe50881c55c27a0d6d3 SHA512 b75c10c039ede5a9840b7ca4edf556a22d0072605b6e74d0e6f36e09ec32f66bc81f0db967a90716c5748dd3a5d2a4a64e6da704f7620e4ef2e4a041c9c9d389
diff --git a/app-i18n/ibus-table/ibus-table-1.9.18.ebuild b/app-i18n/ibus-table/ibus-table-1.9.18.ebuild
index 114b81267db0..9b3dfb89ccfd 100644
--- a/app-i18n/ibus-table/ibus-table-1.9.18.ebuild
+++ b/app-i18n/ibus-table/ibus-table-1.9.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kaio/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -29,11 +29,6 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	python_fix_shebang .
 
-	sed -i \
-		"s/python/${EPYTHON}/" \
-		engine/${PN}-createdb.in \
-		engine/${PN/-/-engine-}.in
-
 	default
 }
 
diff --git a/app-i18n/ibus-table/ibus-table-1.5.0-r1.ebuild b/app-i18n/ibus-table/ibus-table-1.9.20.ebuild
index 313b0d5d4716..2a357802f975 100644
--- a/app-i18n/ibus-table/ibus-table-1.5.0-r1.ebuild
+++ b/app-i18n/ibus-table/ibus-table-1.9.20.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit python-single-r1
 
 DESCRIPTION="Tables engines for IBus"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/${P}.tar.gz"
+SRC_URI="https://github.com/kaio/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -29,11 +29,6 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	python_fix_shebang .
 
-	sed -i \
-		"s/python/${EPYTHON}/" \
-		engine/${PN}-createdb.in \
-		engine/${PN/-/-engine-}.in
-
 	default
 }
 
diff --git a/app-i18n/ibus-table/metadata.xml b/app-i18n/ibus-table/metadata.xml
index 577d254feeb7..35a59248fa68 100644
--- a/app-i18n/ibus-table/metadata.xml
+++ b/app-i18n/ibus-table/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <longdescription lang="en">
-    A framework for table based input methods using IBus.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">kaio/ibus-table</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<longdescription lang="en">
+		A framework for table based input methods using IBus.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">kaio/ibus-table</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 9cce5b734554..e97fbb46584a 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,7 +1,10 @@
+AUX ibus-1.5.19-gdk-wayland.patch 2996 BLAKE2B d203c843a0ba692c1be81c1172866bea6ea30e6ea25c562d04ad31934af48f4e2bcc5d5ec862af049a026c3656c0fce960715c7271514e1d4faa54c8f6ed369c SHA512 e53619feafc4f5e7cc662d0c59be5beda916dc3b2ec2f74121b6b3fb874ed3bc15f43ee739b272f2304344c9acbc399b5c522d2f5d54695aca7e48d4b68430bb
 DIST ibus-1.5.12.tar.gz 2190284 BLAKE2B 57ac7f9e8e8f0419bad1bf3aa629282ef3c0188d29e98bc872e594955f69e0863020d600c674cabed56db156a85210b5b3c1fe137b135395a27d2535e4938164 SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81
 DIST ibus-1.5.16.tar.gz 2375719 BLAKE2B cf4cbd4556e43403c73da3cd2cb9f6da8e0baf5f90b3bc74f6d12c1bad057198ed828053dcbb3ddfd28c37d9011b6166e834385720aa827a68f594dbd4cf9298 SHA512 494ead69cf9c0111fd25fd1de27e796d89db4f08443afa1ec469f638469b25d8b19a59ea7ab0db0f3a130b9a89b3f2819667099ba38fc973d6efc61b367ce237
 DIST ibus-1.5.18.tar.gz 2760121 BLAKE2B dfcf549362ac9ac0cb9adb9cedc3fd7146877a42e0e086ad7be18ccb6239868ed940d2c371d83c2e2706c7120702af0bcb0106da60889f0b3d5857b8929b9165 SHA512 34519c3464eaf2cac3320e1568fc76f4edb281afa70f335c015b828ff4e86b3224d77b95cdc0b2e76e42459c54b1044264ff226963fe739dd553ac7326d2f2d3
-EBUILD ibus-1.5.12.ebuild 3725 BLAKE2B d851008dd04bc0131c13cc79056061cd4a9d6484e3b29a1d87a8e6f149c9f5fe22a46171a4e4df7229309e1e1bf63c6da7ac69eb41f8c11347835ef25f92d0ef SHA512 5a04b1bcc9687e567cadf7429d01c80911200031359854c630856e47573885a28e2548c2fb91e5ffd8cbce3da85a519b790aa2b2feb948eb98f55ceed0f0127b
-EBUILD ibus-1.5.16.ebuild 4006 BLAKE2B 46b44039cae41cd693372b94586fc17a9b2678895b84f5177aead172f62ae7f50ff7b331b4aecce697a303024ba7ad587c2ffd26e0ce0f789cfb6eb456471908 SHA512 7861b4ea5f207e6d3c014687e07af74a4a34afefaa79abf718815a3e4a92981f2e3f62d17b872eea8de5813cfd9200c4b30c60aa121d6443e643d59bed6ca5b2
-EBUILD ibus-1.5.18.ebuild 4271 BLAKE2B 08c1e5ac33927c935922c070dea574d2ac5650c6ec0e89fce32e2007ea0b0407929b1e460f95beca0d755295a37016c583677c0894ac98e0277cb974c2b35509 SHA512 26d0ecd660cd1a0059f3d3b166e34a34606f23116e12c972b3cd5f7757e8812f597f2d28b5d5ed5e1e8f0ad01c68ae3b8b7175ebe4ef7a0fb574cae674ea778b
+DIST ibus-1.5.19.tar.gz 2842274 BLAKE2B a5aea4770c1c0a58a9e0b1aa26f47a8ab9eb5060a0c06179663984c5b531464ff4575a8ece2f2ee2122f777ca615296c1e46ad4833c68ba2da038f2b85dea374 SHA512 ddcd464c9afb6d081df1cfac65069506877eb4818c3ba5594bcf76f3c6795ef6c17177a778dc89b2ef69d10d87297aa12c8e04f156b750e500b51b32787bd9fc
+EBUILD ibus-1.5.12.ebuild 3678 BLAKE2B 8b08b4f6cf2c188d387c43741f0e430749ba003dd7693ce4b70e36c21d5c046f8f0be82ecc2401df577603f7c074d99904d6dfc3aa60f1327157e835563779a7 SHA512 178fdf0169e444161b598ee800a99328060ec7a28a6cd73ca2c26ddce10372072faabe63234d2a9b7c0e31b758cdf7f533c508f05491be80a9ae130f466a5679
+EBUILD ibus-1.5.16.ebuild 3959 BLAKE2B 7a8872f49d619d6079915884ff25ee90a74653fa4614c61043d34414989cafebe122cedc65d72999b2eaca668f0ab0d76484d6ef177e419a3e284476430bb1ff SHA512 b664b04cc0010f3e6da17f7e2dfd5f10ba2241def9a807d5da176c8b1f0eb14a066dd9df6af3b750f06f3b476d867a30b18e32ce85ab1b4efa44274132b75e96
+EBUILD ibus-1.5.18.ebuild 4223 BLAKE2B 98c21d40535a94e2acf0d82ec6a19d68e76f99401818e4f8aac46b745f7b28369d62299fbde3a50f5a42b1572f33cff7d55e6e9ed5801550aab7b13513c73d04 SHA512 9ccc923eecc135d413da43de8e10fed0f1d0149f066a542e268b4f6370560ef9cfe2db770bfb4e3f7b6194ab1a95cf78e0c97b92b0cd263b3d337e1ec4c9457e
+EBUILD ibus-1.5.19.ebuild 4340 BLAKE2B 2550c7270052bdcdedf645f7698f3e972bc3e22c4456e976e9a161678e8e96ddeddbb6bfba13b8db976538d3f97f3c860773320f3d790c03a726979bdd3b1c41 SHA512 14f9d43bd461806e4bc0fe116ea3c983c691975e8285bba5d919d3c0cf52d4f3e41fb58f749866cc0f5d674e9db6e26aee9da77e431d5b11c29169228b0a7b7a
 MISC metadata.xml 942 BLAKE2B 9d8f0df17ae7c5c60892a8bf661c1f7325f4943e30d51667fe5e56f2c74f55e36c6f40cd6044435b9f046a88a267fa1b5d46f6cddc0cefa6b423554ff905e882 SHA512 5501b7ef3b46de30b69eabe28334556c979c99610f0a6051a254a7591de612d99ea9ee3c18c2f3869ae2046514df8cd555d801cc778bc1db111895256b7ab100
diff --git a/app-i18n/ibus/files/ibus-1.5.19-gdk-wayland.patch b/app-i18n/ibus/files/ibus-1.5.19-gdk-wayland.patch
new file mode 100644
index 000000000000..8eed29daf397
--- /dev/null
+++ b/app-i18n/ibus/files/ibus-1.5.19-gdk-wayland.patch
@@ -0,0 +1,88 @@
+From aa0f4252ff965729b871c91b4ed089bf98963c0b Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Fri, 10 Aug 2018 15:43:58 +0900
+Subject: [PATCH] ui/gtk3: Check if gdk-wayland is installed
+
+BUG=https://github.com/ibus/ibus/issues/2035
+---
+ configure.ac              | 10 ++++++++++
+ ui/gtk3/Makefile.am       |  5 ++++-
+ ui/gtk3/panelbinding.vala |  5 +++++
+ 3 files changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 091e20f2..4b6a7a21 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -237,12 +237,21 @@ if test x"$enable_gtk3" = x"yes"; then
+     PKG_CHECK_MODULES(GTK3, [
+         gtk+-3.0
+     ])
++    PKG_CHECK_EXISTS([gdk-wayland-3.0],
++        [enable_gdk3_wayland=yes],
++        [enable_gdk3_wayland=no]
++    )
+ 
+     gtk3_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
+     GTK3_IM_MODULEDIR="$libdir"/gtk-3.0/$gtk3_binary_version/immodules
+ else
+     enable_gtk3="no (disabled, use --enable-gtk3 to enable)"
++    enable_gdk3_wayland=no
++fi
++if test x"$enable_gdk3_wayland" != x"yes"; then
++    enable_gdk3_wayland="no (disabled, need to install gdk-wayland-3.0.pc)"
+ fi
++AM_CONDITIONAL([ENABLE_GDK3_WAYLAND], [test x"$enable_gdk3_wayland" = x"yes"])
+ 
+ if test x"$enable_xim" = x"yes"; then
+     # Check for x11
+@@ -785,6 +794,7 @@ Build options:
+   Build gtk3 immodule           $enable_gtk3
+   Build XIM agent server        $enable_xim
+   Build wayland support         $enable_wayland
++  Build gdk3 wayland support    $enable_gdk3_wayland
+   Build appindicator support    $enable_appindicator
+   Build appindicator engine icon $enable_appindicator_engine_icon
+   Build python library          $enable_python_library
+diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
+index aaba7a4d..6ebc96ce 100644
+--- a/ui/gtk3/Makefile.am
++++ b/ui/gtk3/Makefile.am
+@@ -78,7 +78,6 @@ AM_VALAFLAGS = \
+ 	--pkg=ibus-1.0 \
+ 	--pkg=config \
+ 	--pkg=xi \
+-	--pkg=gdk-wayland \
+ 	--target-glib="$(VALA_TARGET_GLIB_VERSION)" \
+ 	$(NULL)
+ 
+@@ -105,6 +104,10 @@ if ENABLE_APPINDICATOR_ENGINE_ICON
+ AM_VALAFLAGS += --define=INDICATOR_ENGINE_ICON
+ endif
+ 
++if ENABLE_GDK3_WAYLAND
++AM_VALAFLAGS += --pkg=gdk-wayland --define=USE_GDK_WAYLAND
++endif
++
+ libexec_PROGRAMS = ibus-ui-gtk3
+ 
+ ibus_ui_gtk3_SOURCES = \
+diff --git a/ui/gtk3/panelbinding.vala b/ui/gtk3/panelbinding.vala
+index 95115b13..981b5509 100644
+--- a/ui/gtk3/panelbinding.vala
++++ b/ui/gtk3/panelbinding.vala
+@@ -237,9 +237,14 @@ class PanelBinding : IBus.PanelService {
+         GLib.Object(connection : bus.get_connection(),
+                     object_path : IBus.PATH_PANEL_EXTENSION_EMOJI);
+ 
++#if USE_GDK_WAYLAND
+         Type instance_type = Gdk.Display.get_default().get_type();
+         Type wayland_type = typeof(GdkWayland.Display);
+         m_is_wayland = instance_type.is_a(wayland_type);
++#else
++        m_is_wayland = false;
++        warning("Checking Wayland is disabled");
++#endif
+ 
+         m_bus = bus;
+         m_application = application;
diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index b3d6a397f2ce..5e7791469af2 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -145,8 +145,6 @@ src_install() {
 
 pkg_preinst() {
 	use gconf && gnome2_gconf_savelist
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
 }
 
 pkg_postinst() {
diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
index b84815cfa142..e4ffeb871fa3 100644
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@@ -161,8 +161,6 @@ src_install() {
 
 pkg_preinst() {
 	use gconf && gnome2_gconf_savelist
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
 }
 
 pkg_postinst() {
diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index d32b42660caf..8c9b39101dc1 100644
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )
@@ -166,8 +166,6 @@ src_install() {
 
 pkg_preinst() {
 	use gconf && gnome2_gconf_savelist
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
 }
 
 pkg_postinst() {
diff --git a/app-i18n/ibus/ibus-1.5.19.ebuild b/app-i18n/ibus/ibus-1.5.19.ebuild
new file mode 100644
index 000000000000..f318087a0030
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.19.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+VALA_MIN_API_VERSION="0.34"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
+REQUIRED_USE="emoji? ( gtk )
+	gtk2? ( gtk )
+	kde? ( gtk )
+	libnotify? ( gtk )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		introspection
+	)
+	test? ( gtk )
+	vala? ( introspection )"
+
+CDEPEND="app-text/iso-codes
+	dev-libs/glib:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		!gtk? ( x11-libs/gtk+:2 )
+	)
+	gconf? ( gnome-base/gconf:2 )
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXi
+		gtk2? ( x11-libs/gtk+:2 )
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	kde? ( dev-qt/qtgui:5 )
+	libnotify? ( x11-libs/libnotify )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${CDEPEND}
+	python? (
+		gtk? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+DEPEND="${CDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	virtual/pkgconfig
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )
+	unicode? ( app-i18n/unicode-data )"
+
+PATCHES=( "${FILESDIR}"/${P}-gdk-wayland.patch )
+
+src_prepare() {
+	vala_src_prepare --ignore-use
+	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
+	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
+		touch ui/gtk3/panelbinding.vala
+	fi
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala
+	fi
+	if ! use kde; then
+		touch ui/gtk3/panel.vala
+	fi
+	if ! use libnotify; then
+		touch ui/gtk3/panel.vala
+	fi
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
+	# fix for parallel install
+	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am
+	# require user interaction
+	sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am
+
+	sed -i "/^bash_completion/d" tools/Makefile.am
+
+	default
+	eautoreconf
+	xdg_environment_reset
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gtk setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	econf \
+		$(use_enable X xim) \
+		$(use_enable emoji emoji-dict) \
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk3) \
+		$(use_enable gtk ui) \
+		$(use_enable gtk2) \
+		$(use_enable introspection) \
+		$(use_enable kde appindicator) \
+		$(use_enable libnotify) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable unicode unicode-dict) \
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		"${python_conf[@]}"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx emake -j1 check
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	if use python; then
+		python_install() {
+			emake -C bindings/pygobject \
+				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
+				DESTDIR="${D}" \
+				install
+		}
+		python_foreach_impl python_install
+	fi
+
+	keepdir /usr/share/ibus/engine
+
+	newbashcomp tools/${PN}.bash ${PN}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/app-i18n/imhangul/Manifest b/app-i18n/imhangul/Manifest
index 644b0b252bbc..511e35b84f23 100644
--- a/app-i18n/imhangul/Manifest
+++ b/app-i18n/imhangul/Manifest
@@ -8,7 +8,9 @@ AUX xinput-imhangul3y 61 BLAKE2B bc4e3c683e3ddc2f3174ddc7c1be36a8479d4584feef204
 AUX xinput-imhangulahn 53 BLAKE2B ed7e3dcf8c5108b833186f1acdaeb34c04d4d6682a3e747f1ce2bafc2e8e98d788610c8372257583e8e5031bd78ca5ef32a013b72fae34a36aca130e808d3e6d SHA512 3ac9858111de532b483c8fb209f2517651e821ecf4aa704118d9f227a9ab090ae85cbb5572e14e6a04dc49b938fdcf103604ab1c2370df257174f94be2de55d9
 AUX xinput-imhangulro 50 BLAKE2B 01b0a4e625348fc9221b2f52d10288befbbf71774e3406005df4365695c1d996643b3369703f9e8ce64d699f88ee616ae2a48fa24f0c648bf2bc28a9625a84fd SHA512 5d1f588fcda77e6d96cfa955f0057edf614fe01290c9541eae61f8be85a7da80a29246bd2c777f517ce544c094a01d13d73d91368be7296aae9639698add90c4
 DIST imhangul-2.1.0.tar.bz2 268205 BLAKE2B c45cc3e0919c695466f7d09c20c3ee5ae827865b6c3093746f8435bfb3f18da0cf94bc4225829dbafb2f13fcd1da0ec4a696adb966bff90285c769eb36232c4b SHA512 ea4621c4e0e5ed1786e644b577bc0c9f3dbbf296f938ddb2ab04923d8147e01123e10e09a61484e30c3ab0ff51d86da80a93bce583eceee207eab90c27df5f8e
+DIST imhangul-2.1.1.tar.bz2 288452 BLAKE2B 14aba1fb582edd735d1469b2fc1c4b576c64f073f525b30a3c5dd681b82d07f7b2960a63c388dae47d93855f25abbfbb2a48b032e5509239325db1cd05ff6b5e SHA512 5db3843aec698bd6315e4c76f3d8ea374b5d985ff7ae8a3d05861afb1d564ffe274d56fa27e8f669884016c50d5fc1850984050d93fdee944c6f7c3c963c96f1
 DIST imhangul-3.1.1.tar.bz2 288236 BLAKE2B bb762481c98d8e4d3e1f32629802320fbdd6ec2388e9d7e9f1838fbbcb05f247549dc2baa68e6f4ec626f32b1911b5dfa89810e64c9e826cb1887400bbe11e71 SHA512 a27fb34a826ceccb16e4c8a422f5571c7c6a4c253cd2a55c1025b0c22500a380a35a8703e9f0f6300fdc92544e1d7b59e33f11e059b85754b1619698e0f74d89
-EBUILD imhangul-2.1.0.ebuild 2012 BLAKE2B 7ede0699e7810052d29de951a577a301fd2dc9e759b3a2ea5f681065dd6c25e0067fa3dd94214bdd4514d6abb612c19769c7a1a3cb4d48937a24f7e1394bf9c4 SHA512 cae04c16e0bbdfe53b1854d1a0e4fca5619e614abeb491c7bb7e035c9a2417a2343c4e3d59e56a4f535b3cad31f7770485f8f18dbe898382723b535059b1feb3
-EBUILD imhangul-3.1.1.ebuild 1701 BLAKE2B b27eb4b7843dfe27b3e553b348214cb760f1e34464d7f3a2c6d31aed969e4443ebebdbfadb6671c3df9f8abf9cfd88bb23b93b831bb1c2c899630e757b30cfb9 SHA512 783af5ebba46190fa5539f243c020d273d21ac57d44f68863e16f61387468830fd2a2657b033eca2c1dc3691ee1babc75271bcc68ec295b5cdf309aea21b1ced
-MISC metadata.xml 312 BLAKE2B 9e2c42462595f69a26248c0f4dd74565c43fc91ebb919aa9208f534dff815e9f41eb30bba9edac267c390d88770b7a2774bd4046de1418c712dd4698d7058b5d SHA512 ea7923a669ff35a1d8067bc6fa5d443db7cc77c9ac78ef7eae002e080d3fa308afb0cfd20027e2021a4ec4a6eac5f3fe1647b049b795c671da1fb4d64fd45e94
+EBUILD imhangul-2.1.0-r1.ebuild 1296 BLAKE2B ff57c2c12fdaa9fe943461bef88d9c46987fb17a9cd18eef0c70358bb46d663cb58449f91ec99019fdc5f427aae289121e8564f11f87304eb3cc473d42ef4c64 SHA512 25baa051bbf72f71b85983c365b9de92c70095dee6d29881c659309270bcea748e2986ff0e8acbfbd74e3a61d8cda7e710440ed1800b00fdec062daa9c396fc6
+EBUILD imhangul-2.1.1.ebuild 1299 BLAKE2B ea15e9375f93a5b05e621dbf29eb814c473194810b85d923426c6565c563ed9b4427c4c371d5da547fb483d7582f10501485b31c5ec12ef67901aab63f5c3d52 SHA512 d73ba627cefe9fed778a8d2b77476d4ab758e2645a50b00620aedd71ae4101e6d379de9c338c2b884ce95708e895dda8bbdc1e7f0dab84343b1d127a8ac1efda
+EBUILD imhangul-3.1.1.ebuild 1299 BLAKE2B 16ea4b4bdcbe78772f7232f381e24b22c633bab010df0490af248e55fca041815922c05449d5fbb7be4a5b02e76855aff63a1f1d394860a0f6958d9de004ddd3 SHA512 566e71123e3eb1ecd97a330f5da28a0654c830b2dbc281403ebf6106a81fd32c74b1634c9b5446838f77cb6a5bcb38c54392bb3a7ba53f7080c76c81e88c8956
+MISC metadata.xml 370 BLAKE2B 3376831ba7380688735a4e50c6e60dc545d34867163bb9191ea4ccd4dcbdae9d2e6e8eb0429195fb7fcafc920f95ff653553f4661e4a08d8d6f823838e89b2a9 SHA512 abd3a62a28dc9405ffa19aad3a8b213a906eef144f10ecb5bc5632d5b892eda73d600c70e126975299fffeeb59ccf38c03b4abdb36fb5e5870130b4453a27b39
diff --git a/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild b/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..be31caf2f266
--- /dev/null
+++ b/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit gnome2-utils
+
+DESCRIPTION="GTK+ 2 Hangul Input Modules"
+HOMEPAGE="https://github.com/libhangul/imhangul"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="app-i18n/libhangul
+	x11-libs/gtk+:2
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	default
+	gnome2_environment_reset
+	gnome2_disable_deprecation_warning
+}
+
+src_configure() {
+	econf --with-gtk-im-module-dir="${EPREFIX%/}"/usr/$(get_libdir)/gtk-2.0/$(pkg-config gtk+-2.0 --variable=gtk_binary_version)/immodules
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+	dodoc ${PN}.conf
+
+	local s
+	insinto /etc/X11/xinit/xinput.d
+	for s in 2{,y} 3{2,9,f,s,y} ahn ro; do
+		newins "${FILESDIR}"/xinput-${PN}${s} ${PN}${s}.conf
+	done
+}
+
+pkg_postinst() {
+	gnome2_query_immodules_gtk2
+	elog
+	elog "If you want to use one of the module as a default input method, "
+	elog
+	elog "export GTK_IM_MODULE=hangul2  # 2 input type"
+	elog "export GTK_IM_MODULE=hangul3f # 3 input type"
+	elog
+}
+
+pkg_postrm() {
+	gnome2_query_immodules_gtk2
+}
diff --git a/app-i18n/imhangul/imhangul-2.1.0.ebuild b/app-i18n/imhangul/imhangul-2.1.0.ebuild
deleted file mode 100644
index 5503848cb8b8..000000000000
--- a/app-i18n/imhangul/imhangul-2.1.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils multilib readme.gentoo-r1
-
-DESCRIPTION="Gtk+-2.0 Hangul Input Modules"
-HOMEPAGE="https://code.google.com/p/imhangul/"
-SRC_URI="https://imhangul.googlecode.com/files/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="
-	>=app-i18n/libhangul-0.0.12
-	>=x11-libs/gtk+-2.2:2
-	virtual/libintl
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-If you want to use one of the module as a default input method,
-
-export GTK_IM_MODULE=hangul2  # 2 input type
-export GTK_IM_MODULE=hangul3f # 3 input type
-"
-
-get_gtk_confdir() {
-	# bug #366889
-	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
-		GTK2_CONFDIR="${GTK2_CONFDIR:=${EPREFIX}/etc/gtk-2.0/$(get_abi_CHOST)}"
-	else
-		GTK2_CONFDIR="${GTK2_CONFDIR:=${EPREFIX}/etc/gtk-2.0}"
-	fi
-	echo ${GTK2_CONFDIR}
-}
-
-src_prepare() {
-	default
-	gnome2_environment_reset
-	gnome2_disable_deprecation_warning
-}
-
-src_configure() {
-	econf \
-		--with-gtk-im-module-dir="${EPREFIX}/usr/$(get_libdir)/gtk-2.0/immodules" \
-		--with-gtk-im-module-file="$(get_gtk_confdir)"
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-
-	insinto /etc/X11/xinit/xinput.d
-	newins "${FILESDIR}/xinput-imhangul2" imhangul2.conf
-	newins "${FILESDIR}/xinput-imhangul2y" imhangul2y.conf
-	newins "${FILESDIR}/xinput-imhangul32" imhangul32.conf
-	newins "${FILESDIR}/xinput-imhangul39" imhangul39.conf
-	newins "${FILESDIR}/xinput-imhangul3f" imhangul3f.conf
-	newins "${FILESDIR}/xinput-imhangul3s" imhangul3s.conf
-	newins "${FILESDIR}/xinput-imhangul3y" imhangul3y.conf
-	newins "${FILESDIR}/xinput-imhangulahn" imhangulahn.conf
-	newins "${FILESDIR}/xinput-imhangulro" imhangulro.conf
-
-	dodoc imhangul.conf
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_query_immodules_gtk2
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_query_immodules_gtk2
-}
diff --git a/app-i18n/imhangul/imhangul-2.1.1.ebuild b/app-i18n/imhangul/imhangul-2.1.1.ebuild
new file mode 100644
index 000000000000..296851718916
--- /dev/null
+++ b/app-i18n/imhangul/imhangul-2.1.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit gnome2-utils
+
+DESCRIPTION="GTK+ 2 Hangul Input Modules"
+HOMEPAGE="https://github.com/libhangul/imhangul"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="app-i18n/libhangul
+	x11-libs/gtk+:2
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	default
+	gnome2_environment_reset
+	gnome2_disable_deprecation_warning
+}
+
+src_configure() {
+	econf --with-gtk-im-module-dir="${EPREFIX%/}"/usr/$(get_libdir)/gtk-2.0/$(pkg-config gtk+-2.0 --variable=gtk_binary_version)/immodules
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+	dodoc ${PN}.conf
+
+	local s
+	insinto /etc/X11/xinit/xinput.d
+	for s in 2{,y} 3{2,9,f,s,y} ahn ro; do
+		newins "${FILESDIR}"/xinput-${PN}${s} ${PN}${s}.conf
+	done
+}
+
+pkg_postinst() {
+	gnome2_query_immodules_gtk2
+	elog
+	elog "If you want to use one of the module as a default input method, "
+	elog
+	elog "export GTK_IM_MODULE=hangul2  # 2 input type"
+	elog "export GTK_IM_MODULE=hangul3f # 3 input type"
+	elog
+}
+
+pkg_postrm() {
+	gnome2_query_immodules_gtk2
+}
diff --git a/app-i18n/imhangul/imhangul-3.1.1.ebuild b/app-i18n/imhangul/imhangul-3.1.1.ebuild
index 1cebdc2d5fc8..667c30d3e7f9 100644
--- a/app-i18n/imhangul/imhangul-3.1.1.ebuild
+++ b/app-i18n/imhangul/imhangul-3.1.1.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
 
-DESCRIPTION="Gtk+-3.0 Hangul Input Modules"
-HOMEPAGE="https://code.google.com/p/imhangul/"
-SRC_URI="https://imhangul.googlecode.com/files/${P}.tar.bz2"
+inherit gnome2-utils
+
+DESCRIPTION="GTK+ 3 Hangul Input Modules"
+HOMEPAGE="https://github.com/libhangul/imhangul"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="3"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND=">=app-i18n/libhangul-0.0.12
+RDEPEND="app-i18n/libhangul
 	x11-libs/gtk+:3
 	virtual/libintl"
 DEPEND="${RDEPEND}
@@ -21,41 +23,34 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	default
-
-	# Drop DEPRECATED flags, bug #387825
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' Makefile.am Makefile.in || die
+	gnome2_environment_reset
+	gnome2_disable_deprecation_warning
 }
 
 src_configure() {
-	econf --with-gtk-im-module-dir="${EPREFIX}/usr/$(get_libdir)/gtk-3.0/$(pkg-config gtk+-3.0 --variable=gtk_binary_version)/immodules"
+	econf --with-gtk-im-module-dir="${EPREFIX%/}"/usr/$(get_libdir)/gtk-3.0/$(pkg-config gtk+-3.0 --variable=gtk_binary_version)/immodules
 }
 
 src_install() {
 	default
-	dodoc imhangul.conf
+	find "${ED}" -name '*.la' -delete || die
+	dodoc ${PN}.conf
 
+	local s
 	insinto /etc/X11/xinit/xinput.d
-	newins "${FILESDIR}/xinput-imhangul2" imhangul2.conf
-	newins "${FILESDIR}/xinput-imhangul2y" imhangul2y.conf
-	newins "${FILESDIR}/xinput-imhangul32" imhangul32.conf
-	newins "${FILESDIR}/xinput-imhangul39" imhangul39.conf
-	newins "${FILESDIR}/xinput-imhangul3f" imhangul3f.conf
-	newins "${FILESDIR}/xinput-imhangul3s" imhangul3s.conf
-	newins "${FILESDIR}/xinput-imhangul3y" imhangul3y.conf
-	newins "${FILESDIR}/xinput-imhangulahn" imhangulahn.conf
-	newins "${FILESDIR}/xinput-imhangulro" imhangulro.conf
-
-	find "${D}" -name '*.la' -delete || die
+	for s in 2{,y} 3{2,9,f,s,y} ahn ro; do
+		newins "${FILESDIR}"/xinput-${PN}${s} ${PN}${s}.conf
+	done
 }
 
 pkg_postinst() {
 	gnome2_query_immodules_gtk3
-	elog ""
+	elog
 	elog "If you want to use one of the module as a default input method, "
-	elog ""
+	elog
 	elog "export GTK_IM_MODULE=hangul2  # 2 input type"
 	elog "export GTK_IM_MODULE=hangul3f # 3 input type"
-	elog ""
+	elog
 }
 
 pkg_postrm() {
diff --git a/app-i18n/imhangul/metadata.xml b/app-i18n/imhangul/metadata.xml
index da6b3414b7d8..20c10eff6410 100644
--- a/app-i18n/imhangul/metadata.xml
+++ b/app-i18n/imhangul/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">imhangul</remote-id>
+		<remote-id type="github">libhangul/imhangul</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/libhangul/Manifest b/app-i18n/libhangul/Manifest
index 242d005f6308..8a7cf447aa87 100644
--- a/app-i18n/libhangul/Manifest
+++ b/app-i18n/libhangul/Manifest
@@ -1,3 +1,3 @@
 DIST libhangul-0.1.0.tar.gz 2899845 BLAKE2B 5d6f4f9d6dfc32b8d6c6c0219b6e25b9c483555dbe623e5d284043d15eb24b4c7044003bcfd4c55b1ff6ab4b3b0c28037a8497f79fc9b733eb7de8952fee3ed0 SHA512 cf84850bf7a41e743457300513c5efdf7b3e18d168f4fdc324aaa8e1be78743752fcb98385764f94c707777ab82cc9444e076808e61fdbd915c9c0d7ea93c534
-EBUILD libhangul-0.1.0.ebuild 763 BLAKE2B 5767897f26c2066f5d7ab363892f120431ff900882e07c3ae36b58a6601b79c8dfdd6a242ec8a80c68ae3ff48c31fb9278847e2de32d2474aab1e9c6342429fe SHA512 9f3af29d02e41436881622c12f80ffebc7ac7d52ea0cf43dd6c6ec8498bbccc7d2fbe1cdfb0895508fb0ba83d9fed92d3050babdc6440ff7ae02294f365a4915
-MISC metadata.xml 320 BLAKE2B a8ae66d28b67c2350f5e94aff3c617c2dd48846c1edb7f6e552334db16c840463a5bb20096f852864a34f0f5423e45e9b8c486c222a438b96756fd62c2ac0799 SHA512 ede9ccfc8a3f5d9082a04a60ee48b19b285cc96e21301e95f4e43d10f7f2630a79cda06a0dd8d6670b6308bd74c035f8e51c95e684b2bf4f68a79a86e57a045a
+EBUILD libhangul-0.1.0.ebuild 778 BLAKE2B bafadd1be6049110530aca323b1781991ca04fb3ff3dd2b74ac8fd00ef6351d928dd5016b058cad1ca9cb7cc12e3e3801ca27b1bdf6206cad7b1fe20b0177396 SHA512 e6a3970358050b940b255c1f8a497b7525212036b7d1cd4e1ea047823d1828038305d05846b5b08f9bf7022246701807043b936c3475f5e05d58a49a7649f23b
+MISC metadata.xml 372 BLAKE2B a6ebcb84d56d599c5aaacfaee2fd8aeff43258684bab32b56a3bfac0407bed79685e15b06624896df2691be1a4b6dc5836b1089422331b2decdfbbb01f1d11f9 SHA512 d94236fff05607342f4cb3c6bc917a2fe26bd05b7f5e36a004a016122b92657e0f0803c17ca59e0384776ff3b09fbf0d91c298c8c599b4e6c82d19fe65d6b2a8
diff --git a/app-i18n/libhangul/libhangul-0.1.0.ebuild b/app-i18n/libhangul/libhangul-0.1.0.ebuild
index f8ec424da315..883eb1b099e3 100644
--- a/app-i18n/libhangul/libhangul-0.1.0.ebuild
+++ b/app-i18n/libhangul/libhangul-0.1.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 DESCRIPTION="Library for hangul input method logic, hanja dictionary"
-HOMEPAGE="https://github.com/choehwanjin/libhangul"
-SRC_URI="https://libhangul.googlecode.com/files/${P}.tar.gz"
+HOMEPAGE="https://github.com/libhangul/libhangul"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1"
@@ -19,8 +19,6 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	test? ( dev-libs/check )"
 
-DOCS=(AUTHORS ChangeLog NEWS)
-
 src_configure() {
 	econf \
 		$(use_enable nls) \
@@ -33,5 +31,5 @@ src_test() {
 
 src_install() {
 	default
-	find "${D}" -name "*.la" -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-i18n/libhangul/metadata.xml b/app-i18n/libhangul/metadata.xml
index 8e75964217ff..81d97de41a3f 100644
--- a/app-i18n/libhangul/metadata.xml
+++ b/app-i18n/libhangul/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Cjk</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">choehwanjin/libhangul</remote-id>
+		<remote-id type="google-code">libhangul</remote-id>
+		<remote-id type="github">libhangul/libhangul</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/nabi/Manifest b/app-i18n/nabi/Manifest
index c40509740c91..56c9d8c7f983 100644
--- a/app-i18n/nabi/Manifest
+++ b/app-i18n/nabi/Manifest
@@ -1,6 +1,4 @@
 AUX xinput-nabi 140 BLAKE2B 20aecc9cabb55c5848d1c853d7d41ba39447ef7b01c7c874dd0a17ab1b515310d5c20a8a52499d88be84efec5486ec229625235611d2723c6c5e66e6d1e8519a SHA512 53321a39f5ebfb96986ae225f3c3b47344885d4c07271a6b7defd9f2164564651bbdd6e58676e443806f15f51ef7588aea59a6c3ef52678b7f9f1b5f3edcc4d8
-DIST nabi-0.99.11.tar.gz 840845 BLAKE2B f1119fa1a2b079b54d9b275347d25b26eaebcd262eaf8ca8071838e1509deceb4df4b0908a354616195ba11bd2e1d994b917cbc965385bd6d9292c1bf1c24dd0 SHA512 0cc2a1e04241a13207226db6c2db811b32ca0cc41c28905122126d6193d6a83c575960aca0f4da0574e399a11b96e7b8c250b6f6245cc8ff3de37c2ea761b834
-DIST nabi-1.0.0.tar.gz 926638 BLAKE2B 4757d09846c6e450b6ecf07188f32fc31f13f5e1235a2f31679d6a70f39dabeea2aac36db16bf98b2cbc7155b9ccca1008cb1423b4bdbcba25117cb0cfa69c68 SHA512 afd621f3ba2743db429625cdf468abad97c20d91af90f01dea14a75d4a4bc7ea3770b37387acf7da8306b92cb3fbb51d74930459f7e42d137062f01d737ede94
-EBUILD nabi-0.99.11.ebuild 1055 BLAKE2B 1f9efe360a4be5292920b962bc3507e3ea25b349f18ea143a8c992a59e2139f34b7c99d1330ecaad688c337caeb0f0cfc12543ef9de486ac709965a6aa42d05c SHA512 f444e645e99c65b905d8d4780b5826535f882d1153e226a74ec12458cce390eca0abe978a46ae91bb95c979b728da700fa6ff7c7e3abb369631f9c1eeb5c5612
-EBUILD nabi-1.0.0.ebuild 1147 BLAKE2B 92bac853dc01353ae3219091678e48cf041cd0ad934e0e2e9a230bff5d71d133e034470977dbe7d44e0a439960205eab5e13e59de6c8183fa41c937d841a5fea SHA512 ad1ef398222a837d46e8db9d94cdbefa6fc3819f7ef863de06aed12d618e703ec913987b3db4e6de018ee3967c5b141f9cc04f40ef450553478c872d7b550c7f
-MISC metadata.xml 325 BLAKE2B e63b13aa21013822befd598d1c728621f69cc439fbeedcb7ec06c1a1d8af9a663dc5d417847df443532434a9d290121ce812659315e218a28bafa2f5516ee451 SHA512 83cebe62b9ad595a0d02c9f3d47483dbc7a17224a082e607b41f80749e5e7abb4f9c5b57b77eb1720aa1d9d833b40691169639e1d57e6930be3da37d8e9f104f
+DIST nabi-1.0.0.tar.gz 868761 BLAKE2B 125028a4a3a6c51edfeee45de42868c5c0397d8545fdaaffc8a305282ea7d8af102487ad86016e1d6e7275cf7e8a5cd0111bd7f8b9c38470021b94585c1cbf1d SHA512 cd093fc54fc4a40eaa85f9973999b9fe2e37344c1004b56fe9a2102bb0747294ba2af76aca2be234ce4fe07a5e8175d1bab7423dd2cee92ab88af865cd856005
+EBUILD nabi-1.0.0.ebuild 1047 BLAKE2B e408069d489b94260cdea18300ddb621b4b454cebafd3411fb570c54fd32df521971a82ff5de940c37f223081723e2511adacf51df1a87226c45df462dafe1b2 SHA512 b4c7cdcf858835a07ac19f497b0794f739309bbebc54cbffaa2ae6c9de8392f5a87eed7e71dd36fe0ef870e285837fde7ee6f8399e0e37266f092f879d27d8eb
+MISC metadata.xml 362 BLAKE2B d66af0b1838b4886a48216cddbb5cd6ee620a2d43a472e0b0b756597aa3d16c584624de99a19121f2a7990095eb63926a5fd7b0e5116160bede3bbc903d3afb3 SHA512 54caebf3c44595273dcd0d89e86517259731740de5c1427300ebf03a6c0b625b18c6091cd36dfd16fe4097ab2c823be62fc3356a52e27d3296d224c7a22abb6e
diff --git a/app-i18n/nabi/metadata.xml b/app-i18n/nabi/metadata.xml
index d811e857b5bb..61261a3a7a2e 100644
--- a/app-i18n/nabi/metadata.xml
+++ b/app-i18n/nabi/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">choehwanjin/nabi</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">nabi</remote-id>
+		<remote-id type="github">libhangul/nabi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/nabi/nabi-0.99.11.ebuild b/app-i18n/nabi/nabi-0.99.11.ebuild
deleted file mode 100644
index 0c6dd59203a9..000000000000
--- a/app-i18n/nabi/nabi-0.99.11.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Simple Hanguk X Input Method"
-HOMEPAGE="https://code.google.com/p/nabi/"
-SRC_URI="https://nabi.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug nls"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND=">=app-i18n/libhangul-0.1.0
-	dev-libs/glib:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.4:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/pango
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-DOCS=( AUTHORS ChangeLog ChangeLog.0 NEWS README TODO )
-
-src_configure() {
-	local myconf=
-
-	# Broken configure: --disable-debug also enables debug
-	use debug && \
-		myconf="${myconf} --enable-debug"
-
-	econf ${myconf}
-}
-
-src_install() {
-	default
-
-	insinto /etc/X11/xinit/xinput.d
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" "${FILESDIR}/xinput-${PN}" | newins - "${PN}.conf"
-}
-
-pkg_postinst() {
-	elog "You MUST add environment variable..."
-	elog
-	elog "export XMODIFIERS=\"@im=nabi\""
-	elog
-}
diff --git a/app-i18n/nabi/nabi-1.0.0.ebuild b/app-i18n/nabi/nabi-1.0.0.ebuild
index b9c453f52723..25b5d86829ac 100644
--- a/app-i18n/nabi/nabi-1.0.0.ebuild
+++ b/app-i18n/nabi/nabi-1.0.0.ebuild
@@ -1,27 +1,23 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit autotools
+EAPI="6"
 
 DESCRIPTION="Simple Hanguk X Input Method"
-HOMEPAGE="https://github.com/choehwanjin/nabi"
-SRC_URI="https://github.com/choehwanjin/${PN}/archive/${P}.tar.gz"
+HOMEPAGE="https://github.com/libhangul/nabi"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug nls"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-RDEPEND=">=app-i18n/libhangul-0.1.0
+RDEPEND=">=app-i18n/libhangul-0.1
 	dev-libs/glib:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.4:2
+	x11-libs/gtk+:2
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
-	x11-libs/pango
 	virtual/libintl"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -29,28 +25,19 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog.0 NEWS README TODO )
 
-S="${WORKDIR}"/${PN}-${P}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
 src_configure() {
-	local myconf=
-
+	local myconf=()
 	# Broken configure: --disable-debug also enables debug
-	use debug && \
-		myconf="${myconf} --enable-debug"
+	use debug && myconf+=( --enable-debug )
 
-	econf ${myconf}
+	econf "${myconf[@]}"
 }
 
 src_install() {
 	default
 
 	insinto /etc/X11/xinit/xinput.d
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" "${FILESDIR}/xinput-${PN}" | newins - "${PN}.conf"
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" "${FILESDIR}"/xinput-${PN} | newins - ${PN}.conf
 }
 
 pkg_postinst() {
diff --git a/app-i18n/scim-bridge/Manifest b/app-i18n/scim-bridge/Manifest
index 992252c8c30a..66e4a0e4368c 100644
--- a/app-i18n/scim-bridge/Manifest
+++ b/app-i18n/scim-bridge/Manifest
@@ -4,5 +4,5 @@ AUX scim-bridge-0.4.16+gcc-4.4.patch 382 BLAKE2B 1b65d8c24dccd10b165a4716897b944
 AUX scim-bridge-0.4.16+gcc-4.7.patch 774 BLAKE2B 61b84631e8972558dba145b7c36108a726028755665720aa82e2dd9c76477536cb332c4c4d62e3555050bee898d8139a1294ce29a6c0482dbcf63ad0cb196576 SHA512 3349b93e71fdb4e6942253877ed1d84c59a099f5c3fd7d6148c780c6a8af65bb47431dde0a84995dab66bc864872130690b1ee89ee1e2db2c50591f94095c35a
 AUX scim-bridge-0.4.16-configure.ac.patch 5693 BLAKE2B bfa3fd40f07872ace34bf8fca2d3fb012e173660aab3a976c69dd2648003d79acf86b1d6da4c4a14b44e92d256f775fca44bf25b7c21beefb9c95ea545300454 SHA512 64fac34fc9d6982d61542af815ae6da5172d5e5208b938a386ad8fa67bd8988829e8c45412a47b9fef0c8b91b52d4f90b269266e49fb867a671cea1dc4581408
 DIST scim-bridge-0.4.16.tar.gz 508870 BLAKE2B 136a8e84b89a58852ff88a2ef632084f1f18c436fc96cd9192d4510b5e6a4adcb51a5a6f314f8c5e6a333b18ec36e2e154db161e1eb65cef0f3cd28fe47c8241 SHA512 8d40a931738f6130ab2fdc4e8dec70143874c53d5720a0403603b57c9f80d7c0a4802609e0446684fa5cba1758e78e5f333d01787527934ed7a19c9727fd66a6
-EBUILD scim-bridge-0.4.16-r3.ebuild 1866 BLAKE2B 9e908a927c3f65e945227a3893c1e17e6be00a936324f119757f0dc2b2656c258a663397c565eb994171d635dc0dad2e54f3d966245388fe5cb31c74963103a1 SHA512 d9d7d1c84a49d606480b2a610a8ddfa80b3758dc6d6f25fdf384f0c27d2b67dc44f507f4096dafa7cdbafdbf7de7b9e1192d9ecdd65d64b1320a188d80a8d7bb
+EBUILD scim-bridge-0.4.16-r3.ebuild 1707 BLAKE2B 402a95b0e417b1759fb20fd5b763f2a9a399dcccd713cf43040a16b7ccdacbe08fa1a1d9f77a7149569a712aef5a11f735baa4eff9c51b8dc189bdd7d810a8a5 SHA512 9eaac0d988a70cb16b1bd0829e83d8a3c966b77282710ef148ceabc005ba12e3aab3e682453cfea567392c064777be559c9014479e2f568b10e3ae7786f3182e
 MISC metadata.xml 308 BLAKE2B 1bdcfa2996c5ba60e52eddb6446bbc6978ebee7f1f2f4658c44438b886a89cf46a3fddea53c479151e5e023e5681dca5f01264a26ca108c895ac6758f01d6430 SHA512 9f18bf632f3eff9a6498145c2b4c04d51bb119c67351216ab757cd3cea2364c60bef683769218c0596ef6bd29235e51df6a64f9ab1234665fc2191e18fc51cc7
diff --git a/app-i18n/scim-bridge/scim-bridge-0.4.16-r3.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.16-r3.ebuild
index 2f7cc8cc7862..cb61c2bfa50c 100644
--- a/app-i18n/scim-bridge/scim-bridge-0.4.16-r3.ebuild
+++ b/app-i18n/scim-bridge/scim-bridge-0.4.16-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
-IUSE="doc gtk qt4"
+IUSE="doc gtk"
 
 RESTRICT="test"
 
@@ -22,11 +22,6 @@ RDEPEND="
 		>=x11-libs/gtk+-2.2:2
 		>=x11-libs/pango-1.1
 	)
-	qt4? (
-		dev-qt/qtgui:4
-		dev-qt/qtcore:4
-		>=x11-libs/pango-1.1
-	)
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -66,13 +61,8 @@ src_configure() {
 
 	# Qt3 is no longer supported, bug 283429
 	myconf="${myconf} --enable-qt3-immodule=no"
-
-	if use qt4 ; then
-		myconf="${myconf} --enable-qt4-immodule=yes"
-		export QT_SELECT="4"
-	else
-		myconf="${myconf} --enable-qt4-immodule=no"
-	fi
+	# Qt4 neither
+	myconf="${myconf} --enable-qt4-immodule=no"
 
 	econf \
 		--disable-static \
diff --git a/app-i18n/scim-pinyin/Manifest b/app-i18n/scim-pinyin/Manifest
index 273a2f93c51d..b8ea5cf459b9 100644
--- a/app-i18n/scim-pinyin/Manifest
+++ b/app-i18n/scim-pinyin/Manifest
@@ -1,4 +1,4 @@
 AUX scim-pinyin-0.5.91-fixconfigure.patch 1313 BLAKE2B 6ab4742b4c857064d07402411b81041e3a5f8cc998876df7421f1b7bab97905e572fe793fdecb91325a34c0f4e774d8d115dbc3ea23db63aa518e0d84240ebb7 SHA512 9d4dd0c259d8171c8a3b171e68eded4670aacd27902ee8373fe7aff36d088b3cec5570783b9588357ea475321b5267ff635b865a57e7fd3a9b1245e86710decb
 DIST scim-pinyin-0.5.92.tar.gz 4769203 BLAKE2B 413a196d175536a044bdf4922bf1f3de6051f7e3cb61131153cab6c15e2301e373bfdd037d3e70c2893f66c29f955696e94bb9c75d1e686ca549d26716de0c47 SHA512 6af20b925c45ca355e12eeb59285e3327c2195038078a0e1741870395dc5a8f7dae60b8c9cd77919fbad94c27e123b9e58439f7011277439f9914d1a543a805f
-EBUILD scim-pinyin-0.5.92.ebuild 845 BLAKE2B 8b9ea8806e578c7a66ef65001d192233d8c1150508f7de7d027b32082c4955d2945eb81174a361f48c835a8ead8d16fc47dd8b57f9956705fef409602efe16c8 SHA512 d5a80f917eb810b87e31894404170eec5f87788c831cd6c8c80d369e7558ee9b44d4f4b0095c1eb378bb4848fb0288c9b2b138a4949bcabc35b9446cc22c6762
+EBUILD scim-pinyin-0.5.92.ebuild 814 BLAKE2B 089fd7a947524716a5d14b9d6a94f119d6a81e7778a0c549fef3ae9e2c99d792303558beabca9ece8c4bd4a4ab3b06261b2b9f460047dc11ce2f455952862cb7 SHA512 e8f4fed61a8e47ee96cefbe45207cbbda78929b70487f747e9586a3a01fe38259b9262169dfde83ad352a47976302d5f88a587e2770778592c5c26b2cac073e2
 MISC metadata.xml 308 BLAKE2B 1bdcfa2996c5ba60e52eddb6446bbc6978ebee7f1f2f4658c44438b886a89cf46a3fddea53c479151e5e023e5681dca5f01264a26ca108c895ac6758f01d6430 SHA512 9f18bf632f3eff9a6498145c2b4c04d51bb119c67351216ab757cd3cea2364c60bef683769218c0596ef6bd29235e51df6a64f9ab1234665fc2191e18fc51cc7
diff --git a/app-i18n/scim-pinyin/scim-pinyin-0.5.92.ebuild b/app-i18n/scim-pinyin/scim-pinyin-0.5.92.ebuild
index c881bd636a93..b0faa6aeb726 100644
--- a/app-i18n/scim-pinyin/scim-pinyin-0.5.92.ebuild
+++ b/app-i18n/scim-pinyin/scim-pinyin-0.5.92.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="nls"
 
 RDEPEND="x11-libs/libXt
-	|| ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 )
+	>=app-i18n/scim-1.1
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/app-i18n/scim-wnn/Manifest b/app-i18n/scim-wnn/Manifest
index ae09f3263fc5..033a7e4104ce 100644
--- a/app-i18n/scim-wnn/Manifest
+++ b/app-i18n/scim-wnn/Manifest
@@ -1,6 +1,6 @@
 AUX scim-wnn-1.0.0-gcc43.patch 987 BLAKE2B 3d523516eaa127e1982d9b795252e01772ee91f46e4629eda6a0fe3ebe32f30f3302545fee9770daffd37ae63877bb6028409d7d5a3fa2b02ed11156a48bc62d SHA512 d3c3baf5399a17f0ca1c6fa77e9e7a37fbbffbeb1b0eeaf1f099c6f07367cccb9e7705955797c218d216384b8621d328e8de7e9eff09ce288c51fe7bcec8b5e7
 DIST scim-wnn-0.2.4.tar.gz 524325 BLAKE2B c1a36cf38e18d27eb501c2e15a59734cc4f6b568bb29b99690bbe7f7bde257f3f2080ddd03a1cae485f510245ecd8ab31be936d27761b54a9f62f02b6204c738 SHA512 72a4e3a0397a711a86733a4f8162627be676280e118e12ef798e4041892bc835869e173710627547978d39f5cd00c032e043e4d2b9db95046cca66cd7ae3a1a1
 DIST scim-wnn-1.0.0.tar.gz 536488 BLAKE2B 5ae2e198bcc2d95bb6f89a57b1331f2a7fd1ad41faecad958cc9f1f011623fbcdabee40b173d17e331b5c96d2b6114d13bc1ae3ebd4605128d69e79db9a299af SHA512 2ba49d247e0dd84b4fd74dee18a2cc83468ffd2dfd98923e588e0ceee82e78c2b25b48c9d7c173f4626f93ac031bfe50764f78624fcf60770784df74bf5f7a33
-EBUILD scim-wnn-0.2.4.ebuild 1169 BLAKE2B f7e4ba321726b7e5b282d064e8f7f9133d8d0227abec576b2fd2f0e7eb61b57dbff62fb6a39bb77bab8af5b60aa1dc887f9d5efb829ebad8081cce90c298735d SHA512 e2cbc08dd873618cbfa3ea5abdf621e572c0527ee3f1be79444913dd2ab0adc20e7a244142bc97016fee359acb5884f7b6bc4e45fac3a0728bdd34ae4ac6e167
+EBUILD scim-wnn-0.2.4.ebuild 1138 BLAKE2B e327966de6b8e384b5d3f30a11379297d3186957a4a2b38d1a4ef888bb20d9676d50c662d8c90c12ff2ad00590756efb592c9a1760a01b32d8926361fb4a532a SHA512 e9654b2662fc47c21772b338abb5d38443cbc9b39ee97161b81873ac10ba74caf09401129e7a49c6755f5e1fc7181e2f2d6a7b3540284c7745c413475efe56bc
 EBUILD scim-wnn-1.0.0-r1.ebuild 1294 BLAKE2B a45289044f747df470478dbc86dfd5069e6de318e46989a1a7c04a605766bb01cb3d420ffd58adce8b54985b25719d985edce258fc404fcfda25535c0a774087 SHA512 47943b231a0bdf9e23088883d5f854d5e9345a5210d53634228d293c56b7958a6419d32d8df027fde10bd3e81f10311f8272fd518067db4a928389d78cd550e0
 MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-i18n/scim-wnn/scim-wnn-0.2.4.ebuild b/app-i18n/scim-wnn/scim-wnn-0.2.4.ebuild
index 1ce3211f149e..6320ed302243 100644
--- a/app-i18n/scim-wnn/scim-wnn-0.2.4.ebuild
+++ b/app-i18n/scim-wnn/scim-wnn-0.2.4.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE="freewnn"
 
-RDEPEND="|| ( >=app-i18n/scim-1.0 >=app-i18n/scim-cvs-1.0 )
+RDEPEND=">=app-i18n/scim-1.0
 	dev-libs/wnn7sdk
 	freewnn? ( app-i18n/freewnn )"
 DEPEND="${RDEPEND}
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index 488017e0ab8a..8bcaa5855be7 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -1,6 +1,6 @@
 AUX xinput-scim 240 BLAKE2B 8c235304288f531db5bea179ff0100f6152b55348057a2604f37e37522a54883d06c954f2804ad4c04dfd3b3518fc5401ad5185e85a85a68d80e38dbbd728eef SHA512 1cfe95fdbf840b9fa43c980bb3f2e16fc6008714f8807650582ca906cb91ddd28b3b7b3c9f1325035e2c614d587d172071b2b7e3c6b30ca3128902b335773893
 DIST scim-1.4.17.tar.gz 1285383 BLAKE2B 95b9ecb0bb25a15876df8175ee0b9392c301e3b0c554ac6ccba6b863420828ce185d3454f2fef48c03e7451f01815020290be7611b8536d8a028153af3a3fe2b SHA512 a7e0696330bca6fdf929ec0565ab4af1b4d0e5f73592cf5cccf1af6412eb351cd5a5ec9a3e5b83b24d6abad89bbb38a375cbbb0fd978f2fa17f6d64b69da0e3a
 DIST scim-1.4.18.tar.gz 1288060 BLAKE2B c2f1ce5608423734899aa6698060245c4ee253048d04d32bf5e853b8c68255340a8d35c0ebaaa50871b07c23ee9018b6bac03b18fbd4fa4dbea0e67c32c9ae30 SHA512 9a6090fc1ab950905a9c54d6678ce3d2a44297d1a992a3e933b0466688638e6cf470c1682daa58a6fbb6de3216b649273faf7edff1ac0ecca1c2c77fc19108fb
-EBUILD scim-1.4.17.ebuild 2650 BLAKE2B 4a6c0f271a6e924844d1de7cba6309f8a0d6a71d0b880ab96226aedb1bc21cbe15c7d919b9d1176bb7f36aaeae3c6c75ff095f2faae00eadaa1ba9060451af1d SHA512 c551d6e3a75da6f16c6bc82d9bbb2ad2d1def41949daa7bff782afb9e8e697de79b7ee14d904398137b2495d51ad9d25af65e57c8bb366f6a06eecd1b04909a6
-EBUILD scim-1.4.18.ebuild 2664 BLAKE2B e13c1ff0034b09803a7332f593c04330635dc22fe0cbc0619100f61523596b744ae877c8d204043cf27985a9424eed2150086fb5cb4f8593cc25fb795427e0af SHA512 d571c9ff88ca85f1d7d4f2729237e76f87694ab7f56c049e1bb004f9ee869f8f8122ba183e8e2513c258be0250bacb5a7afb78e44fda4224b80e0b5b4250c7da
+EBUILD scim-1.4.17.ebuild 2549 BLAKE2B 32dfb1d2d19757539c79b161a9adb47e36df4747eb139a3f657cf676cdc2d8a1bad42200a40cdbe4a0bffc4c9e4de7dffe2a04da67484037cc235fd7eea01acf SHA512 8901a0b280b589f4285be3754506d40cc9957efaf66302768e5db47035d5563c8ecd38bde285059d43b01c08797737e71ee6759979955270e347366c1300f573
+EBUILD scim-1.4.18.ebuild 2563 BLAKE2B 35c0adb30c1f825fc25b0d5ae542af3d36621777a5adfcf84c04f09c4498e39817c540e23c14caa2a89784bb2397f5775700322e4644352eceb8a8e687621f76 SHA512 a0565598c949a8e63a6f2eee4eb8428de8c8890757b89b4fc71ced4637622d0ae2e1955621a745ba9d93b5e36e45817959bbdfc4e7d318ec8a251044bdef025e
 MISC metadata.xml 399 BLAKE2B 35834cd16ccba6bf71752ae33d56e8a70391517ba09f83526d402b3aec5fc5d9c13513e090bb014cad67658c905c1dbbe396cc0c9dfc6f1e7c32c4c09a81d777 SHA512 3bbbad26a22cc5222316cf769f638a0e181ea94d8cee39058bcbd1a08e61dd0096441721190323ddb285c504dc061027e4c4185f8bee1d4d0b4b197903f3be0e
diff --git a/app-i18n/scim/scim-1.4.17.ebuild b/app-i18n/scim/scim-1.4.17.ebuild
index 86a88efe10bb..e8653806f6b4 100644
--- a/app-i18n/scim/scim-1.4.17.ebuild
+++ b/app-i18n/scim/scim-1.4.17.ebuild
@@ -11,16 +11,12 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc gtk3 qt4"
+IUSE="doc gtk3"
 
 RDEPEND="x11-libs/libX11
 	dev-libs/glib:2
 	gtk3? ( x11-libs/gtk+:3 )
 	!gtk3? ( x11-libs/gtk+:2 )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
 	>=dev-libs/atk-1
 	>=x11-libs/pango-1"
 DEPEND="${RDEPEND}
@@ -50,8 +46,7 @@ src_configure() {
 		--enable-ld-version-script \
 		$(usex gtk3 --with-gtk-version={3,2}) \
 		--disable-qt3-immodule \
-		$(use_enable qt4 qt4-immodule) \
-		--with-qt4-moc="$(qt4_get_bindir)/moc"
+		--disable-qt4-immodule
 }
 
 src_compile() {
diff --git a/app-i18n/scim/scim-1.4.18.ebuild b/app-i18n/scim/scim-1.4.18.ebuild
index cf10edfec8e1..4279a7029e83 100644
--- a/app-i18n/scim/scim-1.4.18.ebuild
+++ b/app-i18n/scim/scim-1.4.18.ebuild
@@ -12,16 +12,12 @@ SRC_URI="https://github.com/scim-im/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc gtk3 qt4"
+IUSE="doc gtk3"
 
 RDEPEND="x11-libs/libX11
 	dev-libs/glib:2
 	gtk3? ( x11-libs/gtk+:3 )
 	!gtk3? ( x11-libs/gtk+:2 )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
 	>=dev-libs/atk-1
 	>=x11-libs/pango-1"
 DEPEND="${RDEPEND}
@@ -51,8 +47,7 @@ src_configure() {
 		--enable-ld-version-script \
 		$(usex gtk3 --with-gtk-version={3,2}) \
 		--disable-qt3-immodule \
-		$(use_enable qt4 qt4-immodule) \
-		--with-qt4-moc="$(qt4_get_bindir)/moc"
+		--disable-qt4-immodule
 }
 
 src_compile() {
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index c2e1e5f7cf06..f9cf69bd835c 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -10,7 +10,7 @@ AUX uim-zh-TW.patch 871 BLAKE2B 091efbed0182f05c87e5a5c789ca7ea3862e61566dad5411
 AUX xinput-uim 108 BLAKE2B f66525e52af923170224ca9953e82489d7f6f92c3e83d96452663ebd538723d1dbaaaa4233bf2bebe1ad6f783fffd4e3e4e82bba5f6fd92d0ef88e3cbaaff6eb SHA512 b3ba31a87e19f589ac8051ece45b6b6c44b295dde76a5ce6164d1e435d791c4e7cafc7192177384f4052fd928caabb8574a9192cf783f4cb22e4ee16741343fc
 DIST uim-1.8.6.tar.bz2 6500739 BLAKE2B 78623c015cafafa1fbaf32542535de1f0207f8452a422d929a15f4421e4c9926192d0d3b761a7865a38affdf616dc5477e083c0fd8655261ff80ca817fd37029 SHA512 26a95d3b51ef7a99108234b9af30ee7b74141cb3af13d092d4cdbf0749f630934cfd67f74b09dacc3adcdce4a390104489d68a4e2419ec07418645a9b4e5715b
 DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3
-EBUILD uim-1.8.6-r1.ebuild 5052 BLAKE2B 67f7e600a86a2f74ee49def7684bed41182946a6f0591892ef3b79609a5ae0002514ea941eeae6dca13ce93627fce28efbf1c9fb84f3fec805d301a347309edc SHA512 521d6bb0c8e40cf4a8b2a8c7ecbf650bbb24d6143ecfb4fa2e6ab3b0aa1df2d6e243345bb6bee9412c3fd5af8cfe20b88a05fb4ab3e048406ac3f674ac587aab
-EBUILD uim-1.8.6-r2.ebuild 5157 BLAKE2B 87909b8657beb68f9148b937ccdbaf97cc515d556fd7bbd97b9c5e08a202d7e3f1b835a0d1394dba7d98236642cf3eb94199ae764f45435cb769961d0b537672 SHA512 405dc2308abd24708c3b4fb68e866b83300a48909d5b60c1c21127235e2a7d69e984fda7e4131774de3c86da1c442cac36010569bf9d573ea89a79ee298522b0
+EBUILD uim-1.8.6-r1.ebuild 4894 BLAKE2B 012a1c0a5202c5417825a3a69753c82ac51a9f9e60669d127190eb88644e7b31761c72a0bb424a106710fd321596bb4def686efd36396bb9ba83870400ff11bc SHA512 0ada75918cd193421bf62e853a7d3a8e86609e88612297c4a8533cda4bec97955f82f3b5f42554a064107debb2392812e3ecbee6a40a87513990e4a0c70d4d87
+EBUILD uim-1.8.6-r2.ebuild 4999 BLAKE2B d1695e9093d174eb6423e9b3e76dc8f51030b09738a1a8919f0ce2e6292eab1276cc8a9016b7bb6563815620d43cdde473e008b50ee0a5cb29454863a836e471 SHA512 ddb8ed7138a56171a3a878cf652d360ab4d3776201e933279a9f7c0c0ec61d576eddc0baf42b046ab8fe98bd7c6440c25d62ad03fe0596752604f66bad971a63
 EBUILD uim-1.8.8.ebuild 5464 BLAKE2B fe13e8de8d66c097126f80abe12f3aba0f850adea1d0f5419f4ecd403bb3081ecb655b68ad8ec925de42f6b54d0b8fc21f3099b4d198887e6dcf975a5767d26b SHA512 5c4bccbf032e5613b9948e419721305e40632f204195da22eafdf68a06ba11be8400f77f702395a45e7d18f44911fded290ef271a665db2fd1a4950a1bc93629
 MISC metadata.xml 1058 BLAKE2B 3569e92b5050f14f1ed7482e602db2bddda608f49940bd1d0be7708247abd6ef67e648918f271722b8688f56065394da64acd48c0333a23bc6475be4349d49af SHA512 392645fde85e225d2ffeac5fae39018208f40e4f2a44e6a2dd082af82759c69bfb17c1fc8a515d10e0ae808b747074ad6cc13c1cca79582047f8778c8458e088
diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
index af634f34baf1..8a86ae8ad0f3 100644
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild
@@ -12,11 +12,10 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 LICENSE="BSD GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm hppa ppc ppc64 x86"
-IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs xft"
+IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls skk sqlite ssl static-libs xft"
 RESTRICT="test"
 REQUIRED_USE="gtk? ( X )
 	gtk2? ( X )
-	qt4? ( X )
 	xft? ( X )"
 
 CDEPEND="!dev-scheme/sigscheme
@@ -43,7 +42,6 @@ CDEPEND="!dev-scheme/sigscheme
 	m17n-lib? ( dev-libs/m17n-lib )
 	ncurses? ( sys-libs/ncurses:0= )
 	nls? ( virtual/libintl )
-	qt4? ( dev-qt/qtgui:4[qt3support] )
 	skk? ( app-i18n/skk-jisyo )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl:0 )"
@@ -111,16 +109,16 @@ src_configure() {
 		$(use_with m17n-lib m17nlib)
 		$(use_enable ncurses fep)
 		$(use_enable nls)
-		$(use_with qt4 qt4)
-		$(use_with qt4 qt4-immodule)
-		$(use_enable qt4 qt4-qt3support)
+		--without-qt4
+		--without-qt4-immodule
+		--disable-qt4-qt3support
 		$(use_with skk)
 		$(use_with sqlite sqlite3)
 		$(use_enable ssl openssl)
 		$(use_enable static-libs static)
 		$(use_with xft)
 		--without-anthy
-		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt4 qt4)))
+		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk))
 		--disable-gnome-applet
 		--disable-gnome3-applet
 		--disable-kde-applet
@@ -139,13 +137,12 @@ src_configure() {
 		myconf+=( --enable-notify=libnotify )
 	fi
 
-	if use gtk || use gtk2 || use qt4; then
+	if use gtk || use gtk2; then
 		myconf+=( --enable-pref )
 	else
 		myconf+=( --disable-pref )
 	fi
 
-	export QT4DIR="$(qt4_get_libdir)"
 	econf "${myconf[@]}"
 }
 
@@ -190,7 +187,7 @@ pkg_postinst() {
 	elog "to your ~/.uim."
 	elog
 	elog "All input methods can be found by running uim-im-switcher-gtk, "
-	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4."
+	elog "uim-im-switcher-gtk3."
 
 	if use emacs; then
 		elisp-site-regen
diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
index 8ecd96c02155..3183a39a2a36 100644
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild
@@ -12,11 +12,10 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 LICENSE="BSD GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls qt4 skk sqlite ssl static-libs xft"
+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 skk sqlite ssl static-libs xft"
 RESTRICT="test"
 REQUIRED_USE="gtk? ( X )
 	gtk2? ( X )
-	qt4? ( X )
 	xft? ( X )"
 
 CDEPEND="!dev-scheme/sigscheme
@@ -43,7 +42,6 @@ CDEPEND="!dev-scheme/sigscheme
 	m17n-lib? ( dev-libs/m17n-lib )
 	ncurses? ( sys-libs/ncurses:0= )
 	nls? ( virtual/libintl )
-	qt4? ( dev-qt/qtgui:4[qt3support] )
 	skk? ( app-i18n/skk-jisyo )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? (
@@ -115,16 +113,16 @@ src_configure() {
 		$(use_with m17n-lib m17nlib)
 		$(use_enable ncurses fep)
 		$(use_enable nls)
-		$(use_with qt4 qt4)
-		$(use_with qt4 qt4-immodule)
-		$(use_enable qt4 qt4-qt3support)
+		--without-qt4
+		--without-qt4-immodule
+		--disable-qt4-qt3support
 		$(use_with skk)
 		$(use_with sqlite sqlite3)
 		$(use_enable ssl openssl)
 		$(use_enable static-libs static)
 		$(use_with xft)
 		--without-anthy
-		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt4 qt4)))
+		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk))
 		--disable-gnome-applet
 		--disable-gnome3-applet
 		--disable-kde-applet
@@ -143,13 +141,12 @@ src_configure() {
 		myconf+=( --enable-notify=libnotify )
 	fi
 
-	if use gtk || use gtk2 || use qt4; then
+	if use gtk || use gtk2; then
 		myconf+=( --enable-pref )
 	else
 		myconf+=( --disable-pref )
 	fi
 
-	export QT4DIR="$(qt4_get_libdir)"
 	econf "${myconf[@]}"
 }
 
@@ -194,7 +191,7 @@ pkg_postinst() {
 	elog "to your ~/.uim."
 	elog
 	elog "All input methods can be found by running uim-im-switcher-gtk, "
-	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4."
+	elog "uim-im-switcher-gtk3."
 
 	if use emacs; then
 		elisp-site-regen
diff --git a/app-i18n/unicode-cldr/Manifest b/app-i18n/unicode-cldr/Manifest
index 366c6b5708c7..b3e52527b6f6 100644
--- a/app-i18n/unicode-cldr/Manifest
+++ b/app-i18n/unicode-cldr/Manifest
@@ -1,5 +1,5 @@
 DIST unicode-cldr-common-31.0.1.zip 16370865 BLAKE2B 46e941471074116eb00ba81848b37c82e025e12841d75ef9e4e2620f887384c4dbb3f8c36febcd86d19cd17d4d84e77e11121d1ed1cf2ccf67a09260cdddc9f7 SHA512 6ef4a73b31bde5dead5af9145e5befa5969e9449b4072c94c5370c979db54e3072ec5bf15f54152045da329bf4382e54edb532c0ec77a2ce451bacc8778b73bc
 DIST unicode-cldr-common-33.0.zip 20401984 BLAKE2B 1318f8c73678f4ed2ff6a2d947171515d52825c2395e77c8149fb6a5646110876dd8e1bc30a3b918cb25c4bf106b42fe2a372a9938ff0dbf106cf0d7dc33d75a SHA512 f2f9fa5242702fd8044c9b239e175b7ead41e36da39c9e67e70b4fde7ed5d28115141ea457cda4f645b10a2d29734b35590bd0f012296bdf4986a920b87532dd
 EBUILD unicode-cldr-31.0.1.ebuild 496 BLAKE2B 8df1bcb6bbc05a9177c20aab6337a752e65d21ac11993aaa85a48025f5e196eb151a09dd3525ee76ffdae1710c0ff399fe6428dbada25ae89d83f64300b445ff SHA512 93ba56c3abf39bc27c7d825c63255fcea2c1c2d942b3984fd5a98cd911399f5ac4002e1e89972ca5495e9787cba266d0ce82f4d83ff9699d4c33bce90a02a880
-EBUILD unicode-cldr-33.0.ebuild 717 BLAKE2B b006633e8110d3192fd50b056a65284e2f2968596f9188915ea0775385740021cabe5ee4e57c81cfc2fbc78de8de3503962512df6427818120d1436799238ffa SHA512 b43596ab85bbd46cca4ae3418344b407d2907e3570e7608d5a1c8810a51f51ab532719e5171a4877700ea3cc2aa9ef2c938a30e5ee89ace26ba016a486160a30
+EBUILD unicode-cldr-33.0.ebuild 716 BLAKE2B 1efa3832c8a38ca075d99c58119d57fbf1ecd453f5d77cffd3b78c2d7fc96b8538943d5bc64dd4b53525fb059ed54730890227d566317ad7e05029a0fb2ea359 SHA512 1a77c129980ba48751f7b3add6bc02e936325669e051bda9b41d7cb3f8ebd57aa565fbecd50a1dcee334604c723e4a8e628acee60ff2ea92814e878d2d1306cd
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild b/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
index 2b0a7f62b66a..809eb2d930d8 100644
--- a/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
+++ b/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
@@ -13,7 +13,7 @@ fi
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-i18n/unicode-emoji/Manifest b/app-i18n/unicode-emoji/Manifest
index 0e700fdd2823..f6be48fb508c 100644
--- a/app-i18n/unicode-emoji/Manifest
+++ b/app-i18n/unicode-emoji/Manifest
@@ -8,6 +8,6 @@ DIST unicode-emoji-variation-sequences-11.0.txt 36333 BLAKE2B c32b674969a102d246
 DIST unicode-emoji-variation-sequences-5.0.txt 36120 BLAKE2B 50e19bd7147486437dc4fd7784ec9bd5869e58f934738fa1d46edc030202fb9490ddebd6f1cefb98dd78b3be2c4da7e3f2acef0ce54487a183123311efbf7205 SHA512 484509ed56c5ea5e73160e211643a938d3fa08474281d316e5ed2d2346f38f5140a147454a9cb81c9f463d6c62befd98a8b70b695ee50effdbcfc6085dcaa520
 DIST unicode-emoji-zwj-sequences-11.0.txt 126959 BLAKE2B 82d78fd5fd47bb4201001903c0610e3950a2fa1c315fe8494e15977999ba0b8f0d4431eb842db6f01ab765fd181067b07258ddb4c547ddfc01fc0da7680ea540 SHA512 a2a50cd5451d3ba1da0f3b46e18a10d621ead0372599b98dad0fd47fdb271407f72bd72854136c93311b13950cedc2b1594f06d460e551ab120ed30ba8abce4d
 DIST unicode-emoji-zwj-sequences-5.0.txt 115207 BLAKE2B beb8f304be16ffe34fde4cab20bfb981f3ae61ffc6827ced0b3160de7e405459fdf38c6e7fcafdd3887da16da7870b84520f1c68e661480efbd0cb9510a04649 SHA512 26398ac77035d2f5df7a61f4c2a8a098af8e551576c9c9f157379c05aa8f75de5a0827c9bc476eb20f32c38b0c3605f6a1d9e07fe27f0e75df359ed2a7e6d25b
-EBUILD unicode-emoji-11.0.ebuild 1031 BLAKE2B 68f74394355740b377a5b81554522f153b6e4c40010646662c69ddd3fead6c3a56711fdf42724d8b8a0e9206d46f7a903d1a2bb1e8ba8634994d2d946c739942 SHA512 aabc122ce67d5f0ed853ff8e0a8555d12e8a2f8b92b5506144a039e15f6326c38388ea3949f1d839142ff7fa5e77440da881e7f62cc877d7ab1d62fcb89c362e
+EBUILD unicode-emoji-11.0.ebuild 1030 BLAKE2B 5e06785a15d96863520d50af1f5ed5e208bee5e4a54e6571ca762ae6dc16432a4e2ab3541e18d6e68386148496a1e48eb9fea6e721b6eff2b49f768b2db3a975 SHA512 cc588eb3005f2780af1cadbe5ab686dbb4e462173d6524e1dadf5cb0e4fe436bf78c8490998e63d5fa6ad2de96f75d2ca62d4a6a9fd5592a9b4df08f8f845974
 EBUILD unicode-emoji-5.0.ebuild 880 BLAKE2B 08d91ce21e632d7a1befe8be1ca4495ece3e56d38d9bf2f062d086ebe10c0b8db89d021ddde659f0c1a383edfae80bdc5becbcd0ca37c7edc158c1d93ef8775a SHA512 b23eae90ba1df31c6965028ebc6d9b0f3064cfdb16f1069a7774e20ea61780bc4b4c086113f45aaa7e5aa00c4501782ed01972186cb5b753b61d9b33dbc328c5
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
index 68f27b9b7b12..d1d567093e99 100644
--- a/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
+++ b/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="${BASE_URI}/${PN#*-}-data.txt -> ${PN}-data-${PV}.txt
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
author	V3n3RiX <venerix@redcorelinux.org>	2018-08-29 20:19:23 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-08-29 20:19:23 +0100
commit	12bb627384ddfd47382b9f1b6464481a58d01ebb (patch)
tree	f9760c04ccd4fcd7de214e2acd5b0e43fb530aa9 /app-i18n
parent	5fdd950c7ae03e12746a45c86d85861beaacc846 (diff)