gentoo resync : 08.01.2021

12 files changed, 118 insertions, 39 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 00aaa704fbfe..4a0dc7f1504e 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/enca/Manifest b/app-i18n/enca/Manifest
index d6d9c99dd0a3..de0b3a3feaf5 100644
--- a/app-i18n/enca/Manifest
+++ b/app-i18n/enca/Manifest
@@ -1,3 +1,4 @@
 DIST enca-1.19.tar.xz 465412 BLAKE2B fefd58502cf345f9b88d620d5af349d72b9e2af70d61c9b5aa3632cf91011110dc1fa08e78dd04c02c5a333adfefeb88f529f3cadcb75d0cea2b500a5a70c057 SHA512 6678639992685180457bbef7b0da6e475071ec6935dfd672188fc242ef80b906e75eff9a206e07989893d0ef4ae5eb500f1d0bbd6b4d58146c94bb143b5fb296
-EBUILD enca-1.19-r2.ebuild 2094 BLAKE2B 0a23cc210c98486de1d099378ccfc8e64f92de02dba4ba081442570d6b7cbd7c5f11c717557f4ea1a28f0ed56fbe863f9a238216cb5d6ad3fb33d4f02951018f SHA512 22dd1b367bc3d496c4ced1b8d8ad6431b59f18312d0b4d920d1db0db5bef7d77bb45a74816d5269104baddae3c33b158050edf4e299f65a8c9f87bf50f260383
+EBUILD enca-1.19-r2.ebuild 2083 BLAKE2B e20fb87d6f0480f6f18092690d17b64b4075e6437a721b8bd3bf89af23d6e059c28c1d3f4b7ad06f2d18a877cdfb9c0e373a46b77e0d6e9e78d969b3125d8858 SHA512 7a660d1927d237961baa18adf6f0f83db132460d5b17b6a2e0939afce37b133729471d52f67b321fd2362b07cb97d529ec031821772334ea0fda447d78b22344
+EBUILD enca-1.19-r3.ebuild 1614 BLAKE2B 0dda242d015018b9c3dc2071c9c3129dd818aee61b46aacc7f75a8155cf8eb76dbfd922e5d4b74e4a841672616d605e54a9d40a672f753923b5bd3b47191c849 SHA512 62313a59ff4fa5f775d3679885f7f785bff8964c57e8c476e1a8f75bf0dc8e3e73c70bccbe86943cd63cbaea822cf07d15af61133506871dbe18258a75a3084e
 MISC metadata.xml 324 BLAKE2B 61e560fc5161d96f01841ebd42ce64012725667f0545fe3bfa463f94b61a536822e1109bfa044f17f6e12c6c45bd24c284aa4846f36db5836e24742b1cc171e9 SHA512 b10801cd8a372709601915899abe03282148aa9a0519160963f5a7734fbeadc082f5493e46ecfb887a16c4b9b5f28424b3b2b87ab4b34708b77cdf3cd4eba03f
diff --git a/app-i18n/enca/enca-1.19-r2.ebuild b/app-i18n/enca/enca-1.19-r2.ebuild
index aedbe2b2bc0f..631cb8be1eec 100644
--- a/app-i18n/enca/enca-1.19-r2.ebuild
+++ b/app-i18n/enca/enca-1.19-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://dl.cihar.com/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +iconv recode static-libs"
 
 RDEPEND="
diff --git a/app-i18n/enca/enca-1.19-r3.ebuild b/app-i18n/enca/enca-1.19-r3.ebuild
new file mode 100644
index 000000000000..a818121498e4
--- /dev/null
+++ b/app-i18n/enca/enca-1.19-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Detect and convert encoding of text files"
+HOMEPAGE="https://cihar.com/software/enca/"
+SRC_URI="https://dl.cihar.com/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc +iconv recode"
+
+BDEPEND="doc? ( dev-util/gtk-doc )"
+RDEPEND="
+	iconv? ( virtual/libiconv )
+	recode? ( app-text/recode:= )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext
+"
+
+pkg_pretend() {
+	if tc-is-cross-compiler && use iconv; then
+		die "${PN} can't be cross built with iconv USE enabled. See Gentoo bug 593220."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Disable unconditional documentation build.
+	sed -i -e '/SUBDIRS/s/ devel-docs//g' Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-external
+		--disable-static
+		$(use_enable doc gtk-doc)
+		$(use_with iconv libiconv-prefix "${EPREFIX}/usr")
+		$(use_with recode librecode "${EPREFIX}/usr")
+	)
+
+	# Workaround automagic virtual/libiconv dependency.
+	use iconv || export am_cv_func_iconv=no
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Workaround cross compilation issues. See Gentoo bug 424473.
+	tc-is-cross-compiler && tc-env_build emake -e -C tools
+
+	emake
+	use doc && emake -C devel-docs docs
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use doc && emake -C devel-docs DESTDIR="${D}" install
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-i18n/kakasi/Manifest b/app-i18n/kakasi/Manifest
index 2c967c1b0dd7..ea796ea1318f 100644
--- a/app-i18n/kakasi/Manifest
+++ b/app-i18n/kakasi/Manifest
@@ -1,5 +1,5 @@
 DIST kakasi-2.3.4.tar.gz 1099258 BLAKE2B e3644e8688082df393ab3b1dc356b682b3ea4a66c46d33c3e3c65ffd882a357600ec99f017e72bea491ad7779cbbaa044479101322a14baccc5385edc20a7b22 SHA512 33fa17251ba00163f6d9df208f18c88ff2dfa9891320f1d00fc0c72686bbcc59cf3ccbfb76fa66dfb135a6e942ef4d5d907edc3f1ca9d380c5b7a7d4df090a66
 DIST kakasi-2.3.6.tar.gz 1352154 BLAKE2B 2e23c5e83aefc040567d0a945b98c52a1123fe41383ded90a2e2a0cea5a9ee0e8d1f4560cb1d5959df5253702eaa958d3522791ef16235aa07dcc2beb2fe008c SHA512 212dbf4125db343b5d8ab5849fd85cbc1060c259eb1a37593817a990104ce53c146e0ba8e79c7f7427d1eb59b0d7d6c3d7f9e2cb8e303cff3088a030f1b0327a
-EBUILD kakasi-2.3.4-r2.ebuild 820 BLAKE2B 5a51df72a8c14d14e74f6ba02f96ea8a2bb443cded7e63beb8454132f1cc384e7083067996c59c6f3492dec115a977713c55617877bc2afce1815efc20d7039d SHA512 e4042dbdf406cfd20d88847182575e8777e26f0036131922bcfdc4e051d99a4446b81f1d71fb8eda7d0bbefbbf319a2563e947c7dc4aebdb5ce8ef0324700771
-EBUILD kakasi-2.3.6.ebuild 796 BLAKE2B f6b2e2be1ec75b8df8ea2d2f780ecb4814e488c1256bba4a4326e2dae196ff348274ea41bbac5bb9684c53d5483ee3b57affd3651ffc52fe622113f677bc3366 SHA512 7666e34f3376ad8bc012be9795b98cbe9aed336b6b2239bdc3ea48e7037bf0a712eb251bdf21062854e48f53c458f373bebe752851e4636a387c39b0c849f69e
+EBUILD kakasi-2.3.4-r2.ebuild 809 BLAKE2B c81a2afc86bc72f50da691f618f1dc3a6ba2c2222e9233b1e4115de86dd04280d5173219edbb1448d786b82aa3c7ca6bf35d91b2fb5294a5342572b5ed5648be SHA512 48f64f60ba0448b9da67a42a6a04074b046ab024cddbdd4d772abead2845f15dba79b6e55d4cde6102ec80f56bbff8265a9ae707e765e7baa005159d28c42352
+EBUILD kakasi-2.3.6.ebuild 785 BLAKE2B bab98eba0bcd4c744be4e1bff0647a8a93437bbfffbb587cc406a7eb63384562832c77c4fe59d8b5b713aaa54acda8e7eca47100ef0d6f9af8cbf506c8e7f256 SHA512 3939ee5b13bd1ceb54271545047cd9ea9c2a7f054dc085df7567023946c600bc10635b9f305afb7e4b535141c5a9783a51a4d82bfcc7a3c2caddf3299ce126e2
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/app-i18n/kakasi/kakasi-2.3.4-r2.ebuild b/app-i18n/kakasi/kakasi-2.3.4-r2.ebuild
index feb65bcb9d84..b69e70b53497 100644
--- a/app-i18n/kakasi/kakasi-2.3.4-r2.ebuild
+++ b/app-i18n/kakasi/kakasi-2.3.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.namazu.org/stable/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="static-libs"
 
 DOCS=( AUTHORS ChangeLog {,O}NEWS README{,-ja} THANKS TODO doc/{ChangeLog.lib,JISYO,README.lib} )
diff --git a/app-i18n/kakasi/kakasi-2.3.6.ebuild b/app-i18n/kakasi/kakasi-2.3.6.ebuild
index 3743b23970a4..60aabcccbed4 100644
--- a/app-i18n/kakasi/kakasi-2.3.6.ebuild
+++ b/app-i18n/kakasi/kakasi-2.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -9,7 +9,7 @@ SRC_URI="http://${PN}.namazu.org/stable/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="l10n_ja static-libs"
 
 DOCS=( AUTHORS ChangeLog {,O}NEWS README{,-ja} THANKS TODO doc/{ChangeLog.lib,JISYO,README.lib} )
diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
index ff8f73bc0f4f..fb752d7bdaa3 100644
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@@ -4,6 +4,6 @@ DIST nkf-2.1.4.tar.gz 232479 BLAKE2B 81887b8b0422e92b2fa2be285c1d9fa4da16d572ca5
 DIST nkf-2.1.5.tar.gz 215879 BLAKE2B b5ae8f51b0ed97261f9e82ad469adbc9e469e709dc5acb64bfba48881555931eade5fcb772e7956a7401399008ec33bd57c8d6d8b5790eefe4d69d4e1dabed7c SHA512 fa5b683184481b25249872e7902033a72b6a6219b4c63d508a738710029430733e78cfa13b3d69dc281676762765e0452c92244a3855d3acbb5e23aa63214847
 DIST python-nkf-0.2.0_p20141211.tar.gz 187761 BLAKE2B b607e155934dd14ad4d29298f209a233d846122299326df48e45339661d1cd08a789f5278928cb4a32c747673723f5f8877d98c7a6200af6b2dbbf29cd100f00 SHA512 5a493f32244e3cb72d188fa39b810baef31ce5f530309797a05474e3f58cf22fd5f8b6c66cdf5268451c49ffb759c476c707329ce1ccf42da0362ad4f5c24d71
 DIST python-nkf-0.2.0_p20191121.tar.gz 188496 BLAKE2B f7c9baaff8129956b7981011634f7ee5ece97e1b6650551a5cc2b50ff51a0c96a454f39e888c80120242a12b202c0422c0ecfc21858b1822a4959ff4c108b10d SHA512 ae1494ebdd488dc40802178a1b7b05c9a9b0bcf9cf9fa5017c6bc9f153c01b475c00f993489a21f643acc4ad61595c38c5afe28f3512a4d24f36eda7abd33958
-EBUILD nkf-2.1.4.ebuild 2284 BLAKE2B d1f140750fe2115ec9db10d9800b80506c4c6e6f40bb7abaf0db0ac06a557554587db35affd02bc21d7c0efe2b648db67149d4eadb9afae92c3c3a07d66a4950 SHA512 918615a41b12f6db0a6801087e95369eeb13fb206115f74b71c97b7d4b43276260483d1af65ce82732eb71767cbcf5e1b71ebe8cd02e395f8d29d282526b1c48
-EBUILD nkf-2.1.5.ebuild 2246 BLAKE2B 480d9cfffaac6349a9e1282db886741d13a48f130c0050d2a50a134480b511080aefb8b87fd5609ebe59cec6ac78e2c4df499c17f1e195284f70092b0247cb53 SHA512 c4fd73ad50bbfa01baadf62969871e3badbfeb8307855d38e6bcd2b6c4e93b0c9127630d758f992c16fc5c295912385c6577636d364525de2e938a879130d272
+EBUILD nkf-2.1.4.ebuild 2273 BLAKE2B 299ddcc8c8433d172c576f75d86cfa885fdb38a12035aaab522f18e04401d8304eea9733e8ead128e7482728e213eb72d9e5c42a02525c55f2b90453ac0bde5e SHA512 7f62941c66854e91cee087158a0fa967d322e14a45d63414597c3be6557e3f941de8dd0d65781d3fddb6ced0ea80ff406b2ff7a2114cd33ec31a2f41c0f9c7d6
+EBUILD nkf-2.1.5.ebuild 2235 BLAKE2B e5f23b9eb0160b331daed53ddebc1312125620fb9fe7f7dd3def3a9b687d1b6bd6fba8149dd06a29037986629cd23d7df05c4a1f607c9ca035f073e74e8a8b35 SHA512 001f137f98133bfc5f53eb141392256d2920a8d7519bf6098a4608c6716224bf0b978486c143793bdb2a0d468db2f0305e9db3a4bc0d6bc9e316bc249267e3d4
 MISC metadata.xml 310 BLAKE2B 5db509d8ef0ebd0727be43314f12d877a704ff9eb8b9cde61733c4dbad8196780c07c9de484f29786116e7fe9267ca3f6be9f727be9f4fa34e582b23fa586594 SHA512 2db03c97fb76c37b779c7f6e467c03b2bc08d2642090cc27a99ae07296edcde04924e37c8a3e6cb23d61552e8cf4bee273e5c17077fac0ae0ea3458aaa81eacd
diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
index a470fb8bf853..6dc52c427365 100644
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/64158/${P}.tar.gz
 
 LICENSE="ZLIB python? ( BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="perl python l10n_ja"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-i18n/nkf/nkf-2.1.5.ebuild b/app-i18n/nkf/nkf-2.1.5.ebuild
index 718622f52d28..d2e6c75e1d30 100644
--- a/app-i18n/nkf/nkf-2.1.5.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/70406/${P}.tar.gz
 
 LICENSE="ZLIB python? ( BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="perl python l10n_ja"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 385cf3c93297..1d0a83811e9e 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -6,5 +6,5 @@ AUX uim-xkb.patch 400 BLAKE2B 54992f9ef87e4ede3e2beaadf4bd55c018b0aec3eb645b7716
 AUX uim-zh-TW.patch 871 BLAKE2B 091efbed0182f05c87e5a5c789ca7ea3862e61566dad5411a5158b348e73123a60efe869b7aa8d43af603ba01e908eb5d135762069abb3c01951a144739b6126 SHA512 0cf0955cded7870b5012f283adb30dbbab6fee9d468178248987036cd3e78fc21e1279481289f9400784fb1e59fda91d1cc8ac1cc8b3d57f0f24258b8b9f40f4
 AUX xinput-uim 108 BLAKE2B f66525e52af923170224ca9953e82489d7f6f92c3e83d96452663ebd538723d1dbaaaa4233bf2bebe1ad6f783fffd4e3e4e82bba5f6fd92d0ef88e3cbaaff6eb SHA512 b3ba31a87e19f589ac8051ece45b6b6c44b295dde76a5ce6164d1e435d791c4e7cafc7192177384f4052fd928caabb8574a9192cf783f4cb22e4ee16741343fc
 DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3
-EBUILD uim-1.8.8.ebuild 5514 BLAKE2B 338725d8bc455fc953de4c80aa3205bd13023cf177d398bf7f8f4e8a0cebaddb9334ef5ba6f5e7f112f3b5ceccd9abbe808d2c9d193d534a130d850b7bbcf35d SHA512 f714daa5937cdcab78e459593e16283dc4b45bbcead6e48c3ddafc8fd26966000a9d3ce82234fc4019ee9ff39973430df81f3ffa4f414bd65fff20b36e4564c5
+EBUILD uim-1.8.8.ebuild 5594 BLAKE2B e0d5a44d15d8aa3c3be61fc9b7e8623c8cc6dccbc3a15c8815f994d78d46b43b0cf3b22be1387fad6e31415abcec35db74c1ea1fae0b8c7a64a1c729a341a0cf SHA512 15826bacc58a89019cf23e8cdbe1491dc84b66739df06c50f7d31123b68f9fade1df76dc30c0ad139f94d58c20738f56f15660241c25134ea71f9ca09a7012a8
 MISC metadata.xml 1058 BLAKE2B 3569e92b5050f14f1ed7482e602db2bddda608f49940bd1d0be7708247abd6ef67e648918f271722b8688f56065394da64acd48c0333a23bc6475be4349d49af SHA512 392645fde85e225d2ffeac5fae39018208f40e4f2a44e6a2dd082af82759c69bfb17c1fc8a515d10e0ae808b747074ad6cc13c1cca79582047f8778c8458e088
diff --git a/app-i18n/uim/uim-1.8.8.ebuild b/app-i18n/uim/uim-1.8.8.ebuild
index 3ed23be0370a..2f6435d4dcfe 100644
--- a/app-i18n/uim/uim-1.8.8.ebuild
+++ b/app-i18n/uim/uim-1.8.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit autotools elisp-common flag-o-matic gnome2-utils
+inherit autotools elisp-common flag-o-matic gnome2-utils qmake-utils
 
 DESCRIPTION="A multilingual input method framework"
 HOMEPAGE="https://github.com/uim/uim"
@@ -19,26 +19,17 @@ REQUIRED_USE="gtk? ( X )
 	qt5? ( X )
 	xft? ( X )"
 
-CDEPEND="!dev-scheme/sigscheme
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXft
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
+COMMON_DEPEND="
 	anthy? ( app-i18n/anthy )
 	canna? ( app-i18n/canna )
 	curl? ( net-misc/curl )
 	eb? ( dev-libs/eb )
 	emacs? ( >=app-editors/emacs-23.1:* )
 	expat? ( dev-libs/expat )
-	libffi? ( dev-libs/libffi:= )
 	gtk? ( x11-libs/gtk+:3 )
 	gtk2? ( x11-libs/gtk+:2 )
 	libedit? ( dev-libs/libedit )
+	libffi? ( dev-libs/libffi:= )
 	libnotify? ( x11-libs/libnotify )
 	m17n-lib? ( dev-libs/m17n-lib )
 	ncurses? ( sys-libs/ncurses:0= )
@@ -49,13 +40,22 @@ CDEPEND="!dev-scheme/sigscheme
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-RDEPEND="${CDEPEND}
+	)
+	X? (
+		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}
+	!dev-scheme/sigscheme
 	X? (
 		media-fonts/font-sony-misc
 		l10n_ja? (
@@ -77,7 +77,13 @@ RDEPEND="${CDEPEND}
 			)
 		)
 		l10n_zh-TW? ( media-fonts/intlfonts )
-	)"
+	)
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-gentoo.patch
@@ -86,6 +92,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-zh-TW.patch
 	"${FILESDIR}"/${P}-fno-common.patch
 )
+
 DOCS=( AUTHORS NEWS README RELNOTE doc )
 
 AT_NO_RECURSIVE="yes"
@@ -121,6 +128,7 @@ src_configure() {
 		$(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)
@@ -214,7 +222,7 @@ pkg_postinst() {
 
 	if use emacs; then
 		elisp-site-regen
-		echo
+		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."