gentoo resync : 25.10.2021

19 files changed, 448 insertions, 139 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index b76fc9e133bd..9d598ddccbd1 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
index b21e08625186..cac8704f7383 100644
--- a/app-i18n/ibus-hangul/Manifest
+++ b/app-i18n/ibus-hangul/Manifest
@@ -1,6 +1,4 @@
 AUX ibus-hangul-test.patch 446 BLAKE2B 06a83c8701e803f97b5755215488639b77c3be819b39932e6d6e957467eec482f32bf0477d84e7ec552a495f2e5b56f4dc730c27851cff2f252b0b36152d19f6 SHA512 3171d14b3eb495f09c5a90cee9fc85d87a5b773452367f1ed1bd33eaa3a220658052f6edef53fc7585292b0811f5b04b53eade0175d609dadcee0d29ea3506ac
-DIST ibus-hangul-1.5.3.tar.gz 525834 BLAKE2B 6c92dbbde39bc42b7df974dbb23c9ef62088c8d3f63a500bd3c7e9c90b3d80d16dc1d76616620e1d7590fee549979a03585ac635761687dc11737d65fdf09e08 SHA512 ba21a8afb750e33744042c5e4f9d88891764921a37c4dbe1f4efa9883fd3c889789854af57adcd24bc1ca365ee49d2e01073c54d72cd025558b41788fb6213b4
 DIST ibus-hangul-1.5.4.tar.gz 542612 BLAKE2B 46495c04a37888a3ed21831b5bbca5b788f4d3a831fb3ce4eb13d95f302877fadddf831016f1d29aa2c1a6ba73fc0d585f2be57c10267a51a1a2186642632918 SHA512 dc4c755349424605de3832496a8a0cf7e8da577cbeff85d2b03da187fd5fdc9de5475eb523c69310e4f7edbb9a513f6f218de082ba32a25a477cdf5eb6f65513
-EBUILD ibus-hangul-1.5.3-r1.ebuild 988 BLAKE2B 843a94ce91a794fdb3edb82521e1ac317eb13d42a596286049b46bac75963987b3e8e62a462cfed23ac8ea1252c6cb04805a04d83dd767916816daabd9d43137 SHA512 31ca698a4989a3503ee2f79a6afb5d6e7dea3906f553ae03034f47c479e5a7bc404e7040c4344ffe117a1aad0db81b58189353e5ab1c569c377464ba8da05119
-EBUILD ibus-hangul-1.5.4.ebuild 1223 BLAKE2B 73a04f764828b84eef8c7ca1f507fddf915e77432f281dfaf6a4c06ba8308813fd239f1c331e85cd618f1ceaf889d2aba585bcd50de6c1bdce62b2f435ec78e5 SHA512 dc7246018b7e13a098aceb39507da85329e91c167e18ddeaa4d486752accebf11732f21ab5bffcba73cc5f328d1456d69ae146223fd3ad15dcbe248a98c7057e
+EBUILD ibus-hangul-1.5.4.ebuild 1221 BLAKE2B 6e96e2760d1e5cd89d7397e6b8d06702dd4b3457bcceb339468ccc738020d0bdb30ea4dd88671bf2ee44268182156fd88febdcaa8e454b1950f6439a28e08c09 SHA512 c442df0276f89948a1f42a5c44f71de9f392cd13349c4e143fa6ed3a633797614344b038e53d786fe1f8ef5b029c0a4a0773b65912fa2aa9bfc0dc872078cd95
 MISC metadata.xml 321 BLAKE2B d336297b96a4ba3ae1e2c8bf3b1493717b49ce42c85cb0748af54c7bf6be4a1c74461c122dbbfc9b107fa02f4e83800798dd61c1bba74426bb7a2487e0d8fef9 SHA512 d05f79c856e4e579d1f98cd7c9869294f1906fa7e73eeae7120ee6af710d5f16f103d63f1261a9d798ba5584fa8e6f349d73d407a747811515280c736b43eb48
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild
deleted file mode 100644
index 8c38721ea651..000000000000
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8,9} )
-inherit gnome2-utils python-single-r1 xdg
-
-DESCRIPTION="Korean Hangul engine for IBus"
-HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
-SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	>=app-i18n/libhangul-0.1
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--with-python=${EPYTHON}
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
index e8b64f68faad..a2c9a9f929a9 100644
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-i18n/ibus-m17n/Manifest b/app-i18n/ibus-m17n/Manifest
index 6e0d9a931b6b..2314326a2a04 100644
--- a/app-i18n/ibus-m17n/Manifest
+++ b/app-i18n/ibus-m17n/Manifest
@@ -1,7 +1,5 @@
-DIST ibus-m17n-1.4.5.tar.gz 493250 BLAKE2B a5fd4de169997dea78acf6273a7e44cefbc9ab4499cbee92c30f394ef7267c15fb1af42d45d227bc160150f35195477f9ec3d2534f9764bab4fa86c0fae046eb SHA512 64bed564d59b0992ebc8a931e0845f687c176e5336d7c7fbc1d575433eb276714615f8fee412a532ec2c8870e46d8d6c41636c984b666c92427dadbdc84838b5
-DIST ibus-m17n-1.4.6.tar.gz 493592 BLAKE2B 1b9978277a008a4e72ffe03306d409532da7757d53cdb8bae9d6b5776b417e3b731fe432cb5f5c50f7f52d83ed9a2dd572a866111f9186ac42f5ce8afe511ad4 SHA512 d33c89735e5e6c93301a3c3985f46708e41d44b66e580b282e484a7497c0b9d2615c66931cdd7260b4a63d9e9af4d9ebbad5e23d4a3f8a7773dcab61a7600c57
 DIST ibus-m17n-1.4.7.tar.gz 493889 BLAKE2B 48a9b2ff1590d790d763014c0c9e5c08bf7ba84361a922aa71ab9cdb5b5e4c69fc5608a27c19eadc83578fdaafc3375c5bcedc1d81e2743a994d622042ffd436 SHA512 b011d4ee63a538a51f67012932d872fc2d527c6f3e5dd1642b7e70d3a32164532bc2ab69fb794eb985617b2698074af9079dac7991b5a2a30828595b129cce40
-EBUILD ibus-m17n-1.4.5.ebuild 801 BLAKE2B ae98e47abf2b6a6df31f97e538132ff89550861bcb6e736f7cc626ded61eea34d7e7437119f67483b70a24190e16a26bb47345e7dc023bf8f0d88a0b1fd8341e SHA512 c4e4525aecd307997c3a7a497355fb91cbdf50eec1e1596ca812b7188e2de71b54626bf8efd33efaef28625a015e5aedd91c962409b521f59e05e739be5a41da
-EBUILD ibus-m17n-1.4.6.ebuild 803 BLAKE2B 407d381baf82ab7a97876f9539735575b68175e745d0f7e8b4a83d4bf89e1b8aebfd56dc0bc462c2a751e39e2677a8e3b25c7b2e3cc0c7d1d6d74ad1d3513110 SHA512 f8a64621c6d98ec52730f3fd9713245a8b9f47c076b67c786b291cfa39febd66bd51132845f4a2b205a00006488c83b4b83b9f43de633a37ac5e743768499899
-EBUILD ibus-m17n-1.4.7.ebuild 803 BLAKE2B 407d381baf82ab7a97876f9539735575b68175e745d0f7e8b4a83d4bf89e1b8aebfd56dc0bc462c2a751e39e2677a8e3b25c7b2e3cc0c7d1d6d74ad1d3513110 SHA512 f8a64621c6d98ec52730f3fd9713245a8b9f47c076b67c786b291cfa39febd66bd51132845f4a2b205a00006488c83b4b83b9f43de633a37ac5e743768499899
+DIST ibus-m17n-1.4.8.tar.gz 494516 BLAKE2B ec4cb36d465e25a6e0e334243e7df83444846f9109ef2142daea4949ddaa7cdf5290fc2749a978f7b8fb6d49bb080b2b826726fdc97e26bc722b019c93f13882 SHA512 3e808ffc3b7d03a745be1009a58c8d03ecabe15478f7bf36d70b777d342ad04d0f5574bb78743bcb67ab36674d316aef3cd7070d48ef9e11d07f960d75597aec
+EBUILD ibus-m17n-1.4.7.ebuild 801 BLAKE2B ae98e47abf2b6a6df31f97e538132ff89550861bcb6e736f7cc626ded61eea34d7e7437119f67483b70a24190e16a26bb47345e7dc023bf8f0d88a0b1fd8341e SHA512 c4e4525aecd307997c3a7a497355fb91cbdf50eec1e1596ca812b7188e2de71b54626bf8efd33efaef28625a015e5aedd91c962409b521f59e05e739be5a41da
+EBUILD ibus-m17n-1.4.8.ebuild 803 BLAKE2B 407d381baf82ab7a97876f9539735575b68175e745d0f7e8b4a83d4bf89e1b8aebfd56dc0bc462c2a751e39e2677a8e3b25c7b2e3cc0c7d1d6d74ad1d3513110 SHA512 f8a64621c6d98ec52730f3fd9713245a8b9f47c076b67c786b291cfa39febd66bd51132845f4a2b205a00006488c83b4b83b9f43de633a37ac5e743768499899
 MISC metadata.xml 555 BLAKE2B b9dd5e7d4f230dde589a7e73333d14d52dae05d0e549dbde75332807434fc7c73ee7fe468dd919762527ac65f16c7a484b8d8b5c629c24dbe695c19c96b9abba SHA512 311891667bea4f2d4797440920ba2779a7f54766d3967edb25cb65b30800164a33192babdf7aadaa9adfeade385852d7d8d2a9a039b7c4ecbd2e9ed0a553fe89
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild
deleted file mode 100644
index 8ec1183befae..000000000000
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="M17N engine for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk nls"
-
-DEPEND="app-i18n/ibus
-	dev-libs/m17n-lib
-	gtk? ( x11-libs/gtk+:3 )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	>=dev-db/m17n-db-1.7"
-BDEPEND="sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with gtk gtk 3.0)
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.7.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.7.ebuild
index 1fabfb506072..8ec1183befae 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.7.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk nls"
 
 DEPEND="app-i18n/ibus
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.6.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.8.ebuild
index 1fabfb506072..1fabfb506072 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.6.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.8.ebuild
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index 13c2e98ce7a6..86f1cf675c4f 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,5 +1,5 @@
 DIST ibus-typing-booster-2.14.12.tar.gz 10226257 BLAKE2B 5dae530a7ec425e8bd3c6009d0bdb9b8d321c8670769ddf80ba7f706d6b5140f21f184f877603de3cc6f425a4a1953c645eb177c9fa8183ecfd091ccfb32353a SHA512 09d1898c3ac8a1dc79768df7a44c33862a0b0fbb2122d184f1e8a839b8c3c71191fe5ef932f9e649ac715c8093a5c277d5783594f8defc06ecc13727b851ffa5
 DIST ibus-typing-booster-2.14.13.tar.gz 10239396 BLAKE2B 1c4db896f28f3f1b58bd3071fb6f2d5c1b2b4e0fbad43568ae25d69f301d4ce408ca6c2fb829818f6981c2f212c499c1dfabc3511f09f7a9f5c3d4ae2d08a212 SHA512 4e1f1c39fea030f1f056966007127afeb5c6c098a66ecd6fe0b4ea60f302438e072d6d409ef2bee9ea5b0d1048b5a22d7e4fad9f7f509362e2af251855f6e535
-EBUILD ibus-typing-booster-2.14.12.ebuild 1067 BLAKE2B a880c11bdd9d4d8ff1a1bfb707e0a7e17f490fab6e36a80c8c442d65aacd46303f7920e1f6a8fb1b2aac4b66dd5f9f577097d99334adf2db1108111624a0e775 SHA512 724c53725bf813dd05d956863f9672725459bc506aaaef30e2336562e41d47df1890cca6af2c1adbb76988eba82a2e9b9299288aa9daaaa85fc981f1d1f809d7
-EBUILD ibus-typing-booster-2.14.13.ebuild 1069 BLAKE2B 7ddc93761c9e1007c0f4d9e09ccf8693d956d7f04a759b42187cfadb67b8f3de369dac596f4a0979caeb149f842565f633653d154675bc2bc7000941bb07176d SHA512 762f465a512bf1b62eba82dc0b6ccf494987ec12afa24c13f2a7a950cfa139977b9b7a2e37044c396cdd52bd34469cc1883a59b2ffa40b5f264060e4b49fb6d2
-MISC metadata.xml 241 BLAKE2B d06d8c9218cb9736ecc414504678e9bff30ba6bffbd2b357e9a2ea990df4e73a21b8ad4db267eddfdbf73e8501dabe5a748c4ea9d26906d39425ab744b320216 SHA512 cff6b46a252b531091d1ef597e3f714f98d2ef4aa621662d8c2ec15e4f990cd811300d3439e1be003bd307d0c8d12e78f34cf7fd49f6d006d9362f0e6ccf6252
+EBUILD ibus-typing-booster-2.14.12-r1.ebuild 1148 BLAKE2B 11526afa746bbad40c6747c1a6b83b6be5d3b224373164d5286435c795814695e59b4842c7a7061298c7d160001729e0a5becc50bc4f4673ec97424311646805 SHA512 16c9fe7b754e26af1425fb8e68232097531c1985c8485055eeebace97252e8aa5037ac40d7b0756b202b2cf56fd6aedfca294507ac964e93c2212a56263186c9
+EBUILD ibus-typing-booster-2.14.13-r1.ebuild 1150 BLAKE2B 3809ef99b3c983fc124034d046aa2ed5b3818bf551b288351ccc280078d66f4fcc6036166eb238e25b823dea2c2d7c6de11b4f26f5ef1ea69de089a896fdb117 SHA512 56c958fc7c55aca42bea232e1a44747746768b019326402ce27ee4eb4adfb3adea4a72a0881861986afd29334de4fcd570a233c3ac867046c8a018789ec172c0
+MISC metadata.xml 331 BLAKE2B e076fda3780cbfebae0a799bcc320de0417dfc2a726320c014d253163625da4fd629b180442449368e316e134bf2024f7e03373f2ca0342c4b63a11c63475697 SHA512 f79eaa01a0ad3005064928ef7fbaed4bc98f8850ca36b23309096647b6158c7500e0075f149e4e764a89af99a8fe342eb6a1d9b83a347557300545ecf870e4d8
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.12.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.12-r1.ebuild
index 60292db609e9..3c0b95dc64fc 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.12.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.12-r1.ebuild
@@ -32,6 +32,12 @@ RDEPEND="${DEPEND}
 BDEPEND="sys-devel/gettext
 	virtual/pkgconfig"
 
+src_prepare() {
+	default
+
+	sed -i "s|/usr\(/bin/sh\)|\1|" {engine,setup}/*.in
+}
+
 pkg_preinst() {
 	xdg_pkg_preinst
 	gnome2_schemas_savelist
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.13.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.13-r1.ebuild
index 4e8cb0ffc7f7..c4ae2d6d9037 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.13.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.13-r1.ebuild
@@ -32,6 +32,12 @@ RDEPEND="${DEPEND}
 BDEPEND="sys-devel/gettext
 	virtual/pkgconfig"
 
+src_prepare() {
+	default
+
+	sed -i "s|/usr\(/bin/sh\)|\1|" {engine,setup}/*.in
+}
+
 pkg_preinst() {
 	xdg_pkg_preinst
 	gnome2_schemas_savelist
diff --git a/app-i18n/ibus-typing-booster/metadata.xml b/app-i18n/ibus-typing-booster/metadata.xml
index 491c88b3a31f..293189c63481 100644
--- a/app-i18n/ibus-typing-booster/metadata.xml
+++ b/app-i18n/ibus-typing-booster/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mike-fabian/ibus-typing-booster</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 3da594f13338..6759af1e62c3 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,10 +1,17 @@
 AUX 50uim-gentoo.el 71 BLAKE2B 94142633d1a13a0d4ea71e4325883be1e407e154277a4a361701bf694b62e3e8855d4627a72015fb04b1470e128df80fefcdb999e2f1090fa03a454287af52f2 SHA512 e2b6d74d14cdf7d81ab128b2e4ffe1d7dcc0013d61685687ca92619704fd38ec1da6a12fabc3878aa7a9ddd9bf0194c499d3100f176f0a96920322a451c04831
+AUX uim-1.8.8-c++11.patch 861 BLAKE2B b9072af1065cd9103847a076f6327684c5c014d9e19252cd3f5ff0cf3d1821e67dba2603baccc55709178f6be532e3ad6dacca5e121c96d5da4f210b6094f943 SHA512 8b15b6c7100646ca5b86f93dbfae139837cee0fbb19ae6c5164e249ea827376cb51be52b2a0837533bb1c394f129baafb52cefa2c42f43dd9ec9e502678e26b1
+AUX uim-1.8.8-desktop.patch 1242 BLAKE2B 40b51a7e2c94f02bce09c9baa7059af76f7faa3458cd65491f06b08fc1a11debd281196d190b7e80ffd70e763e9e8816b07287871c86c7eb9540732fbeaf2f30 SHA512 bee999b906958c72e149ad07eb86a8f46163b7dbbb0236e37f26f30cb41e7fc871b979790435a0306039f2533c9e60ff990a2b37bd80f2585e3d9014c6bc8075
 AUX uim-1.8.8-fno-common.patch 375 BLAKE2B 88cf3f86fd23e3d9735c3c12df299c678fb332a39937cad0408fcbfdb653eb6084d3b693ceec42e047c7cfe37a78ea8982d49bd9260135169e4af2d2af64be31 SHA512 898ce37332bd02ccc063facb922a965928962f7ecccbb5e74a57d64069eda235f33f7e899e94f8d48e17a58b32a1e98d9eed2dcd9c73eafd012fc0150eba13b4
 AUX uim-gentoo.patch 601 BLAKE2B fba57214c7e222e9f042cda4194738ffd170787d3d5431415a9a26632b25bdd9566489352ee4e64f396add88f270931320faed73652002fe67a379f1d644ff65 SHA512 002538e809f174f026df354ebcd4b487d42c0e9f7e409b8c97240969ec3be55f22b754ea34d707fb8eadab1321dd8a3c4b7861b51a606eb741f314f20e473f4a
+AUX uim-kde.patch 2193 BLAKE2B 38e049b372cf2854879627186a2f014265e410ace9657cfd6afaf9c08bbfc5b4df208a8207861a9edab32c058847b01b3a8ba1b5cf4f88ab6d2d213c494c64d4 SHA512 4ff8306ea451233836f78096eaafd739e1d9c19d9c48230963c7d98c23860ecc649e1e94eb1569e959a2932eae3fb74641e274cb72212a962d149dcde09a0537
+AUX uim-slibtool.patch 573 BLAKE2B 97b6b1130ff7bb0aeb6d58d731cae387e7a2fa96fbbc260ee7482fd595cfd8754440a0db2903dd4e82429d5409e2639545af247e9b761d4119329a9f6bd01030 SHA512 9f8637ee7f7c43af72c1f85e71ad087850972d410c5d9e235f87c7a3dba97cc9970aba0466b897cb8383553185615dd29569c471362f3f90b9ba5e039c679cd6
 AUX uim-tinfo.patch 1594 BLAKE2B 9c52b5603f5d6ebe229e15597ef75ae7049744dee0b2977a9bcd0f7ba59fb8cf111dc8fcc1c25b4ce4363b8f969d76d50a3892ebfe9808afa517bafdde623658 SHA512 13c074b9b33ceb169dcb3cb879f9dfced36dc29da5f45aacaf3dbcd62f3d9a5d565a05b6c3353dc30a33f33f1740032f233e731dc6f430a92c4d133614e57cdc
 AUX uim-xkb.patch 400 BLAKE2B 54992f9ef87e4ede3e2beaadf4bd55c018b0aec3eb645b7716e1c27200a9b4d29a649beb333fe61c30cd36718494b05cb5217d486fb929cd617fe7038bf168d7 SHA512 4e86e051dd05ec0b56d423a079b0b285fdd9b256ae66528781a68ee0bfcf1be15530346facb28eab0a1401f2f27f9dce8cc8e215fe3195879f66e7e4241d80fc
 AUX uim-zh-TW.patch 871 BLAKE2B 091efbed0182f05c87e5a5c789ca7ea3862e61566dad5411a5158b348e73123a60efe869b7aa8d43af603ba01e908eb5d135762069abb3c01951a144739b6126 SHA512 0cf0955cded7870b5012f283adb30dbbab6fee9d468178248987036cd3e78fc21e1279481289f9400784fb1e59fda91d1cc8ac1cc8b3d57f0f24258b8b9f40f4
 AUX xinput-uim 108 BLAKE2B f66525e52af923170224ca9953e82489d7f6f92c3e83d96452663ebd538723d1dbaaaa4233bf2bebe1ad6f783fffd4e3e4e82bba5f6fd92d0ef88e3cbaaff6eb SHA512 b3ba31a87e19f589ac8051ece45b6b6c44b295dde76a5ce6164d1e435d791c4e7cafc7192177384f4052fd928caabb8574a9192cf783f4cb22e4ee16741343fc
+DIST sigscheme-0.9.1.tar.bz2 1140162 BLAKE2B a649ec1a5ff0899af14fa686ea7cf43140c226b1df68d4c9415c3b95c7f7ae32c539df820f0e9da7d7a809c88fa388e563549728c345017dfd62d418748be7e1 SHA512 b66b901e8a6bc6d9188112f78d3ba21a2a0776e1236aa9d2d83df27cf8111b8491f665062b493d14c2a9a1b4eb47ce2789b3ca7180225a085e94623329281e09
 DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3
-EBUILD uim-1.8.8-r1.ebuild 5483 BLAKE2B 21d7f261fba2a0c7e79f578ab8ecaa8464e20ed29a6ef70bad82703191cd11ad68ec65a77350efd5ef09a080c1782566534e7dda1b7c1d069b74c1df3a29662f SHA512 fac70ee9914a29ea22d3a84ffa99e77c5c86bdb50d7089370a31621538a20a1bf9d0a2f880ab11e090381fbe769e77f6863f169de0fbdc3e8f5ff918ba64af67
+DIST uim-1.8.9_pre20210103.tar.gz 4054622 BLAKE2B b50bafe9b0edbac1ab7e56afd5b654bdef793b606df3550ba7b8be467076005925bf2c5d221bbf3b3dbcdc5079bbb0e014ed29bef9b6a55c23384cb281411104 SHA512 39e046a8ee3bbc06ff0bab685e0ded8f63e9c474661ffecf7ed12e25cad3151498b2fecc7f14ca6f0c78974e55265df47d656a55bf158b41fe21a69071d02fe8
+EBUILD uim-1.8.8-r2.ebuild 5589 BLAKE2B b4f750239c437aa66b25088da122675e7426d4f3d1c12d1a03b51a012e2cfe1f6a31314d5f7f764ffb04936991d01a6de804096a1ea7397e611b9c2cf3903d2a SHA512 fe8b7b59138c2631bf047e917214c5e616617bcccd3643ae6ba1517b399378fe0c414922e6c6bb249c8a2499d93ac1d94d8c22538a8770814148a9787f126724
+EBUILD uim-1.8.9_pre20210103.ebuild 5982 BLAKE2B ac68cb831999e5f0fce439a0b54165b5408a7b4a8189f8ce5caf1aa684e4804cfec2babd79c14d306a9343266debfdae3b26c19248c3350a4c0bf9f56fbc052b SHA512 c6aa8ba5f9782a14799e8ccbaa60199c7207cfdaf4ef1b0259ac6bb5ec0e070dec0f6889cdfc6940938a6c1213d0e1f6191a9b6a5625534bb1fa07aa5af3cd9e
 MISC metadata.xml 1059 BLAKE2B 7ddf7ebb4c6fa262fb369edabe5bc106023d8b4960ea067fab673c6ca9a489190e591e92e4c14df617318e5feb08d3c064fbdaa5f1ea66a6ebf983a8154a3828 SHA512 c412582600c38a9c171e3e45cf2bfbac0ac3682d5ab1f367ef3e988a4702e8d36cba58ea4f9c34b28493150f34c863c6071b8c02eb3b68bfe5f3b8f98a195c79
diff --git a/app-i18n/uim/files/uim-1.8.8-c++11.patch b/app-i18n/uim/files/uim-1.8.8-c++11.patch
new file mode 100644
index 000000000000..07e082840967
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.8-c++11.patch
@@ -0,0 +1,23 @@
+From bb25aac568359efbfb68e52dd8d9ee85e65d754b Mon Sep 17 00:00:00 2001
+From: Haelwenn Monnier <lanodan@users.noreply.github.com>
+Date: Thu, 25 Oct 2018 09:10:16 +0200
+Subject: [PATCH] xim/main.cpp: FIx build against clang
+
+main.cpp:68:55: error: invalid suffix on literal; C++11 requires a space between literal and identifier
+---
+ xim/main.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xim/main.cpp b/xim/main.cpp
+index a0b0beceb..c5818ca4a 100644
+--- a/xim/main.cpp
++++ b/xim/main.cpp
+@@ -65,7 +65,7 @@ int g_option_mask;
+ int scr_width, scr_height;
+ int host_byte_order;
+ 
+-#define VERSION_NAME "uim-xim under the way! Version "PACKAGE_VERSION"\n"
++#define VERSION_NAME "uim-xim under the way! Version " PACKAGE_VERSION "\n"
+ const char *version_name=VERSION_NAME;
+ const char *usage=
+ "--help , --version :Show usage or version\n"
diff --git a/app-i18n/uim/files/uim-1.8.8-desktop.patch b/app-i18n/uim/files/uim-1.8.8-desktop.patch
new file mode 100644
index 000000000000..5e0687547915
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.8-desktop.patch
@@ -0,0 +1,35 @@
+From 63cda66c1665b8ccc9ae11a5a4fb341afb8c5ac0 Mon Sep 17 00:00:00 2001
+From: OBATA Akio <obache@users.noreply.github.com>
+Date: Mon, 30 Dec 2019 22:26:11 +0900
+Subject: [PATCH] Fix to use pref tool with default toolkit (#151)
+
+---
+ configure.ac      | 1 +
+ uim.desktop.in.in | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 472c67f02..d530bc081 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1188,6 +1188,7 @@ AM_CONDITIONAL(DEFAULT_TOOLKIT_GTK3, test "x$default_toolkit" = xgtk3)
+ AM_CONDITIONAL(DEFAULT_TOOLKIT_QT,  test "x$default_toolkit" = xqt)
+ AM_CONDITIONAL(DEFAULT_TOOLKIT_QT4, test "x$default_toolkit" = xqt4)
+ AM_CONDITIONAL(DEFAULT_TOOLKIT_QT5, test "x$default_toolkit" = xqt5)
++AC_SUBST(default_toolkit)
+ 
+ AC_ARG_ENABLE(fep,
+   AC_HELP_STRING([--disable-fep],
+diff --git a/uim.desktop.in.in b/uim.desktop.in.in
+index b4a4d4f50..38c5c6d5e 100644
+--- a/uim.desktop.in.in
++++ b/uim.desktop.in.in
+@@ -3,7 +3,7 @@ Type=Application
+ _Name=Input Method
+ _Comment=Customize uim input method environment
+ _Keywords=input;method;
+-Exec=uim-pref-gtk
++Exec=uim-pref-@default_toolkit@
+ Icon=@uim_pixmapsdir@/uim-icon.png
+ Terminal=false
+ Categories=Settings;X-GNOME-PersonalSettings;
diff --git a/app-i18n/uim/files/uim-kde.patch b/app-i18n/uim/files/uim-kde.patch
new file mode 100644
index 000000000000..8a291650ae3d
--- /dev/null
+++ b/app-i18n/uim/files/uim-kde.patch
@@ -0,0 +1,72 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1449,6 +1449,28 @@
+ 
+ AM_CONDITIONAL(KDE4_APPLET, test "x$enable_kde4_applet" = xyes)
+ 
++dnl ****************************
++dnl *** test for KDE5 applet ***
++dnl ****************************
++AC_ARG_ENABLE(kde5-applet,
++  AC_HELP_STRING([--disable-kde5-applet],
++    [do not build uim KDE Plasma 5 widget]),
++  [],
++  [enable_kde5_applet=yes])
++
++if test "x$enable_kde5_applet" != xno; then
++  if test "x$with_qt5" != xyes; then
++    enable_kde5_applet=no
++  fi
++fi
++
++if test "x$enable_kde5_applet" = xyes && test "x$CMAKE" = xno; then
++  AC_MSG_WARN([no CMake found])
++  enable_kde5_applet=no
++fi
++
++AM_CONDITIONAL(KDE5_APPLET, test "x$enable_kde5_applet" = xyes)
++
+ AC_ARG_ENABLE(pref,
+   AC_HELP_STRING([--disable-pref],
+     [do not build graphical utility to edit user settings]),
+@@ -1948,12 +1970,15 @@
+     qt5_immodule_option="DEFINES+=QT5_IMMODULE"
+   fi
+   set -e
+-  # FIXME: move CMAKE_CXX_FLAGS into cmake_option
+-  ${CMAKE} \
+-    -B ${ac_abs_top_builddir}/qt5/applet.cmake \
+-    -S ${ac_abs_top_srcdir}/qt5/applet \
+-    -DCMAKE_CXX_FLAGS="${CXXFLAGS} ${X_CFLAGS}" \
+-    ${cmake_option}
++  # Generate a Makefile for KDE5 applet by cmake
++  if test "x$enable_kde5_applet" = xyes; then
++    # FIXME: move CMAKE_CXX_FLAGS into cmake_option
++    ${CMAKE} \
++      -B ${ac_abs_top_builddir}/qt5/applet.cmake \
++      -S ${ac_abs_top_srcdir}/qt5/applet \
++      -DCMAKE_CXX_FLAGS="${CXXFLAGS} ${X_CFLAGS}" \
++      ${cmake_option}
++  fi
+   ${QMAKE5} -o ${ac_abs_top_builddir}/qt5/candwin/Makefile.qmake \
+     ${ac_abs_top_builddir}/qt5/candwin/uim-candwin-qt5.pro
+   ${QMAKE5} -o ${ac_abs_top_builddir}/qt5/chardict/Makefile.qmake \
+@@ -2007,6 +2032,7 @@
+    Qt5 immodule    : ${with_qt5_immodule}
+    KDE3 Applet     : ${enable_kde_applet}
+    KDE4 Applet     : ${enable_kde4_applet}
++   KDE5 Applet     : ${enable_kde5_applet}
+    FEP             : ${enable_fep}
+    Emacs           : ${enable_emacs}
+    XIM             : ${use_xim}
+--- a/qt5/applet/Makefile.am
++++ b/qt5/applet/Makefile.am
+@@ -6,6 +6,8 @@
+ 	plasmoid
+ 
+ if QT5
++if KDE5_APPLET
+ all clean install uninstall:
+ 	$(MAKE) $(AM_MAKEFLAGS) -C ../applet.cmake $@
+ endif
++endif
diff --git a/app-i18n/uim/files/uim-slibtool.patch b/app-i18n/uim/files/uim-slibtool.patch
new file mode 100644
index 000000000000..51560d439e25
--- /dev/null
+++ b/app-i18n/uim/files/uim-slibtool.patch
@@ -0,0 +1,14 @@
+--- a/qt4/common.pro.in
++++ b/qt4/common.pro.in
+@@ -4,8 +4,9 @@
+                @abs_top_srcdir@ @abs_top_srcdir@/uim \
+                @abs_top_srcdir@/replace
+ QMAKE_LIBDIR += @abs_top_builddir@/uim @abs_top_builddir@/replace \
+-                @abs_top_builddir@/replace/.libs @abs_top_builddir@/uim/.libs
+-LIBS += -lreplace -luim -luim-scm
++                @abs_top_builddir@/replace/.libs @abs_top_builddir@/uim/.libs \
++		@abs_top_builddir@/sigscheme/libgcroots/.libs
++LIBS += -lreplace -luim -luim-scm -lgcroots
+ !win32:!embedded:!mac {
+     LIBS += -luim-x-util
+ }
diff --git a/app-i18n/uim/uim-1.8.8-r1.ebuild b/app-i18n/uim/uim-1.8.8-r2.ebuild
index 1c032e933dce..dd5bb5fe65e5 100644
--- a/app-i18n/uim/uim-1.8.8-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.8-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 inherit autotools elisp-common flag-o-matic gnome2-utils qmake-utils
 
@@ -19,7 +19,15 @@ REQUIRED_USE="gtk? ( X )
 	qt5? ( X )
 	xft? ( X )"
 
-COMMON_DEPEND="
+CDEPEND="X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXft
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
 	anthy? ( app-i18n/anthy )
 	curl? ( net-misc/curl )
 	eb? ( dev-libs/eb )
@@ -36,23 +44,10 @@ COMMON_DEPEND="
 	qt5? ( dev-qt/qtx11extras:5 )
 	skk? ( app-i18n/skk-jisyo )
 	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXft
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
+	ssl? ( dev-libs/openssl:0= )"
+DEPEND="${CDEPEND}
+	X? ( x11-base/xorg-proto )"
+RDEPEND="${CDEPEND}
 	!dev-scheme/sigscheme
 	X? (
 		media-fonts/font-sony-misc
@@ -75,22 +70,21 @@ RDEPEND="${COMMON_DEPEND}
 			)
 		)
 		l10n_zh-TW? ( media-fonts/intlfonts )
-	)
-"
-BDEPEND="
-	dev-util/intltool
+	)"
+BDEPEND="dev-util/intltool
 	sys-devel/gettext
-	virtual/pkgconfig
-"
+	virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-slibtool.patch
 	"${FILESDIR}"/${PN}-tinfo.patch
 	"${FILESDIR}"/${PN}-xkb.patch
 	"${FILESDIR}"/${PN}-zh-TW.patch
+	"${FILESDIR}"/${P}-c++11.patch
+	"${FILESDIR}"/${P}-desktop.patch
 	"${FILESDIR}"/${P}-fno-common.patch
 )
-
 DOCS=( AUTHORS NEWS README RELNOTE doc )
 
 AT_NO_RECURSIVE="yes"
@@ -166,8 +160,9 @@ src_compile() {
 	default
 
 	if use emacs; then
-		cd emacs
+		cd emacs || die
 		elisp-compile *.el || die
+		cd - >/dev/null || die
 	fi
 }
 
diff --git a/app-i18n/uim/uim-1.8.9_pre20210103.ebuild b/app-i18n/uim/uim-1.8.9_pre20210103.ebuild
new file mode 100644
index 000000000000..128f198ace4f
--- /dev/null
+++ b/app-i18n/uim/uim-1.8.9_pre20210103.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools elisp-common flag-o-matic gnome2-utils qmake-utils vcs-snapshot
+
+EGIT_COMMIT="d1ac9d9315ff8c57c713b502544fef9b3a83b3e5"
+SIG_PV="0.9.1"
+
+DESCRIPTION="A multilingual input method framework"
+HOMEPAGE="https://github.com/uim/uim"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://github.com/${PN}/sigscheme/releases/download/${SIG_PV}/sigscheme-${SIG_PV}.tar.bz2"
+
+LICENSE="BSD GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="X +anthy curl eb emacs expat libffi gtk gtk2 kde l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft"
+RESTRICT="test"
+REQUIRED_USE="gtk? ( X )
+	gtk2? ( X )
+	qt5? ( X )
+	xft? ( X )"
+
+CDEPEND="X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXft
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+	anthy? ( app-i18n/anthy )
+	curl? ( net-misc/curl )
+	eb? ( dev-libs/eb )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	expat? ( dev-libs/expat )
+	gtk? ( x11-libs/gtk+:3 )
+	gtk2? ( x11-libs/gtk+:2 )
+	kde? ( kde-frameworks/plasma:5 )
+	libedit? ( dev-libs/libedit )
+	libffi? ( dev-libs/libffi:= )
+	libnotify? ( x11-libs/libnotify )
+	m17n-lib? ( dev-libs/m17n-lib )
+	ncurses? ( sys-libs/ncurses:0= )
+	nls? ( virtual/libintl )
+	qt5? ( dev-qt/qtx11extras:5 )
+	skk? ( app-i18n/skk-jisyo )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl:0= )"
+DEPEND="${CDEPEND}
+	X? ( x11-base/xorg-proto )"
+RDEPEND="${CDEPEND}
+	!dev-scheme/sigscheme
+	X? (
+		media-fonts/font-sony-misc
+		l10n_ja? (
+			|| (
+				media-fonts/font-jis-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_ko? (
+			|| (
+				media-fonts/font-daewoo-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_zh-CN? (
+			|| (
+				media-fonts/font-isas-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_zh-TW? ( media-fonts/intlfonts )
+	)"
+BDEPEND="dev-util/intltool
+	gnome-base/librsvg
+	sys-devel/gettext
+	virtual/pkgconfig
+	kde? ( dev-util/cmake )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-kde.patch
+	"${FILESDIR}"/${PN}-slibtool.patch
+	"${FILESDIR}"/${PN}-tinfo.patch
+	"${FILESDIR}"/${PN}-xkb.patch
+	"${FILESDIR}"/${PN}-zh-TW.patch
+)
+DOCS=( AUTHORS NEWS README RELNOTE doc )
+
+AT_NO_RECURSIVE="yes"
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+	vcs-snapshot_src_unpack
+	rmdir "${S}"/sigscheme || die
+	mv "${WORKDIR}"/sigscheme-${SIG_PV} "${S}"/sigscheme || die
+}
+
+src_prepare() {
+	default
+	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
+	# fix build with >=dev-scheme/chicken-4, bug #656852
+	touch scm/json-parser-expanded.scm
+	# fix build with "-march=pentium4 -O2", bug #661806
+	use x86 && append-cflags $(test-flags-CC -fno-inline-small-functions)
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with X x)
+		$(use_with anthy anthy-utf8)
+		$(use_with curl)
+		$(use_with eb)
+		$(use_enable emacs)
+		$(use_with emacs lispdir "${SITELISP}")
+		$(use_with expat)
+		$(use_enable kde kde5-applet)
+		$(use_with libedit)
+		$(use_with libffi ffi)
+		$(use_with gtk gtk3)
+		$(use_with gtk2)
+		$(use_with m17n-lib m17nlib)
+		$(use_enable ncurses fep)
+		$(use_enable nls)
+		$(use_with qt5)
+		$(use_with qt5 qt5-immodule)
+		_QMAKE5=$(qt5_get_bindir)/qmake
+		$(use_with skk)
+		$(use_with sqlite sqlite3)
+		$(use_enable ssl openssl)
+		$(use_enable static-libs static)
+		$(use_with xft)
+		--without-anthy
+		--without-canna
+		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt5 qt5)))
+		--disable-gnome-applet
+		--disable-gnome3-applet
+		--disable-kde-applet
+		--disable-kde4-applet
+		--without-mana
+		--enable-maintainer-mode
+		--without-prime
+		--disable-qt4-qt3support
+	)
+
+	if (use gtk || use gtk2) && use anthy; then
+		myconf+=( --enable-dict )
+	else
+		myconf+=( --disable-dict )
+	fi
+
+	if use libnotify; then
+		myconf+=( --enable-notify=libnotify )
+	fi
+
+	if use gtk || use gtk2 || use qt5; then
+		myconf+=( --enable-pref )
+	else
+		myconf+=( --disable-pref )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	if use emacs; then
+		cd emacs || die
+		elisp-compile *.el || die
+		cd - >/dev/null || die
+	fi
+}
+
+src_install() {
+	# bug #222677
+	emake -j1 DESTDIR="${D}" install
+	rm -f doc/Makefile*
+	einstalldocs
+
+	find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
+	use static-libs || find "${ED}" -name '*.la' -delete || die
+
+	insinto /etc/X11/xinit/xinput.d
+	sed \
+		-e "s:@EPREFIX@:${EPREFIX}:g" \
+		"${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
+	doins "${T}"/${PN}.conf
+
+	if use X; then
+		docinto xim
+		dodoc xim/README*
+	fi
+
+	if use emacs; then
+		elisp-install ${PN}-el emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
+		docinto emacs
+		dodoc emacs/README*
+	fi
+
+	if use ncurses; then
+		docinto fep
+		dodoc fep/README*
+	fi
+}
+
+pkg_postinst() {
+	elog "New input method switcher has been introduced. You need to set"
+	elog
+	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
+	elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
+	elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
+	elog
+	elog "If you would like to use uim-anthy as default input method, put"
+	elog "(define default-im-name 'anthy)"
+	elog "to your ~/.uim."
+	elog
+	elog "All input methods can be found by running uim-im-switcher-gtk, "
+	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt5."
+
+	if use emacs; then
+		elisp-site-regen
+		elog
+		elog "uim is autoloaded with Emacs with a minimal set of features:"
+		elog "There is no keybinding defined to call it directly, so please"
+		elog "create one yourself and choose an input method."
+		elog "Integration with LEIM is not done with this ebuild, please have"
+		elog "a look at the documentation how to achieve this."
+	fi
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+}