gentoo resync : 09.06.2018

24 files changed, 71 insertions, 191 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 95bc5dab4545..c453657d49ab 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index 9777607f15f8..9d60cf325bdb 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,5 +1,5 @@
-DIST ibus-typing-booster-1.5.36.tar.gz 6413145 BLAKE2B e0948e81cc7002ee4eae8cb94da765dfba701e6b0872db85c5f847895be640292f78840ef19b9daf452c73a0b7d5c8385d6095f244d060d2cd0b8e1a7edd796a SHA512 f9aa7b226b31732e1bdb78172a60ac8de3b86a86669a6aea017469001cb509bc8c1c3799764ed265befdc058f920bf7022c70d431503ad4ef27cc20eb9fa0537
 DIST ibus-typing-booster-1.5.38.tar.gz 6408096 BLAKE2B a4559044a4cd06c5dcf69d77d5ec3d8163d564702ff88d3ed11b8c073f5272e2cfab446de548a29887b74767f4318db98fb898dc4d15488fd4c9963cea151009 SHA512 67b81a47501ae4e885d2a79b122799b78dcdd044ad8e36a140d4c6587a23072d08e3e025f755c191cee82c3ab81ea1a974a5a0f6438e7203ba2d63d7e1cd4eff
-EBUILD ibus-typing-booster-1.5.36.ebuild 860 BLAKE2B 7b813a51e80a378e694d3b9d6c3268e7d32d497d9fd62fa78f5239dbe1025dc79ccbfa958d2fdfc7e73be9dbe8bbb75efa29e4a12e41ec679b2efafd94a8e065 SHA512 fa03b6fb55e7505dd13e4aaf830444ea8f25c19089901528c4646611193f8002a0e860f09ba0bc5ca44c5e5cacbde1c3002220ee7e323239ca7c580c5216be2e
+DIST ibus-typing-booster-2.0.0.tar.gz 5689495 BLAKE2B a3ee39faf206c4681d10989d4e438cffc0b78d9339973523af61310482b3ec13c7935e9e49403a3359e0f32d087b72afb27ae7975dcd3abd427b9a0f5f0ba581 SHA512 140044be13b47590a0835bb4b8da7311cdb92e8134a88a7b999ea6f530298950c4f8ce9ff3462394e4b52de0c56e3072671da85c99b448a91f442fdc460c608b
 EBUILD ibus-typing-booster-1.5.38.ebuild 860 BLAKE2B 7b813a51e80a378e694d3b9d6c3268e7d32d497d9fd62fa78f5239dbe1025dc79ccbfa958d2fdfc7e73be9dbe8bbb75efa29e4a12e41ec679b2efafd94a8e065 SHA512 fa03b6fb55e7505dd13e4aaf830444ea8f25c19089901528c4646611193f8002a0e860f09ba0bc5ca44c5e5cacbde1c3002220ee7e323239ca7c580c5216be2e
+EBUILD ibus-typing-booster-2.0.0.ebuild 860 BLAKE2B 7b813a51e80a378e694d3b9d6c3268e7d32d497d9fd62fa78f5239dbe1025dc79ccbfa958d2fdfc7e73be9dbe8bbb75efa29e4a12e41ec679b2efafd94a8e065 SHA512 fa03b6fb55e7505dd13e4aaf830444ea8f25c19089901528c4646611193f8002a0e860f09ba0bc5ca44c5e5cacbde1c3002220ee7e323239ca7c580c5216be2e
 MISC metadata.xml 331 BLAKE2B 85b93b548e9cbef93b09e59ebf23c10b1cb4c392bcb6aeeab697cdaa775afa06874b5a6965ab09ffd8c937a0842699cdb27ad70c6146d5c37b516d82a92c80b2 SHA512 e0524c2ebad138f51a5d79d639e809196029a83f46dc331c2bd21d94417d5adf8d059f15694b484f4fcb107dff2aba7d3ad4c87a19accaccf75429bfa2c92b63
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-1.5.36.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.0.0.ebuild
index b4bb8048b30d..b4bb8048b30d 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-1.5.36.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.0.0.ebuild
diff --git a/app-i18n/kanjipad/Manifest b/app-i18n/kanjipad/Manifest
index 5079f86916af..e9463a954026 100644
--- a/app-i18n/kanjipad/Manifest
+++ b/app-i18n/kanjipad/Manifest
@@ -1,5 +1,5 @@
 AUX kanjipad-2.0.0-cflags.patch 613 BLAKE2B bae1e330b7256a81b0ed3bf79fd3a778e55ce8c21fe6a63bed07ed90d33383ff0c4b8edb5eb0f11e930d498ee302886fe8127162de5c4d9f4f9f7c1868c92aa0 SHA512 2164e5ff2202cd4314ee2d8dcc98f6d428748c3c62251c89daae83466a4a4b59bb08655d1bd98a5725569e680f1cfc25f3cd971919d3ffa20c78d38dd895b402
 AUX kanjipad-2.0.0-underlinking.patch 449 BLAKE2B 2ff743dc0bf407a499b181295e747c1327361dcf5f0ab63f91544ddce5aa73bbe16b1acfe85c1b4aa28ae88268f32d5b52e87947686bca10301c21b30413852e SHA512 78c510337dfe2ed1bff81bbdd6195b6e76e97aac4b1a634b8cf29590eac9d70ddf7b720ad9fe6cfcb9c01e3697d3c6def382d8693902369a2be9531440daf95c
 DIST kanjipad-2.0.0.tar.gz 75930 BLAKE2B 032031a30ed294d2e1951e0cc123b599db2f34fe7ad7714200107644167e69b57e292ec1fd0af30bb354516a9eb27bbff5aeb4055319c98a690ed53ee002cc96 SHA512 66a38597358f97a9b43c3d1f4a9d6cf583b6158350131bae3b4d47edb167877def8eff4dde666c41549accb54c7256e08403985bb06d56758050a46d5b471ef6
-EBUILD kanjipad-2.0.0.ebuild 858 BLAKE2B 8db5da39cd54aea0e0c640dda32059a08f0f7986f493260f7c429f929d8eef10abcb93bc7fece244fb0bd174cea147a4008542bd2af491c614c8b3cc29d33fcb SHA512 4fdcbd5a683c0d5ff89546714afaf49de648baa9b779767cd66c036ba5055208e113cfdaf00f852c8610070b37913ce5f26ad9c3d7c7b199a20c999453bd571d
+EBUILD kanjipad-2.0.0.ebuild 878 BLAKE2B cddc79498081d19e7b086ee4be2f6d3aafc41511d6395a4dd18f103bdd58f0b4dfc6bebe4a8fc5644e037d0fadef56dd6b2eb0aa33dae94c64ea6acc5e86691f SHA512 3a25a5ed9e2cfc17701fc58ae4ac9c8d51bf2804635c7bb045d585bd6d385c12d51ee34ad06bcb1a73b555c24d8b5eec60e133d18a23b7eebd4e312476c0a1c1
 MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-i18n/kanjipad/kanjipad-2.0.0.ebuild b/app-i18n/kanjipad/kanjipad-2.0.0.ebuild
index 790545ce7d57..82d47a93e351 100644
--- a/app-i18n/kanjipad/kanjipad-2.0.0.ebuild
+++ b/app-i18n/kanjipad/kanjipad-2.0.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Japanese handwriting recognition tool"
-HOMEPAGE="http://fishsoup.net/software/kanjipad/"
-SRC_URI="http://fishsoup.net/software/kanjipad/${P}.tar.gz"
+HOMEPAGE="https://fishsoup.net/software/kanjipad/"
+SRC_URI="https://fishsoup.net/software/kanjipad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64 ppc64"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
@@ -19,22 +19,26 @@ RDEPEND="x11-libs/gtk+:2
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+DOCS=( ChangeLog README TODO jstroke/README-kanjipad )
+
+PATCHES=(
+	"${FILESDIR}/${P}-cflags.patch"
+	"${FILESDIR}/${P}-underlinking.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-cflags.patch \
-		"${FILESDIR}"/${P}-underlinking.patch
+	default
+	perl -i -pe "s|PREFIX=/usr/local|PREFIX=/usr|;
+		s|-DG.*DISABLE_DEPRECATED||g" Makefile || die "Fixing Makefile failed"
 }
 
-src_compile() {
+src_configure() {
 	tc-export CC
-	perl -i -pe "s|PREFIX=/usr/local|PREFIX=/usr|;
-		s|-DG.*DISABLE_DEPRECATED||g" Makefile || die
-
-	emake || die
 }
 
 src_install() {
-	dobin kanjipad kpengine || die
+	dobin kanjipad kpengine
 	insinto /usr/share/kanjipad
-	doins jdata.dat || die
-	dodoc ChangeLog README TODO jstroke/README-kanjipad
+	doins jdata.dat
+	einstalldocs
 }
diff --git a/app-i18n/pology/Manifest b/app-i18n/pology/Manifest
index f967e8abfa4a..23c4b1abc77e 100644
--- a/app-i18n/pology/Manifest
+++ b/app-i18n/pology/Manifest
@@ -1,6 +1,4 @@
-DIST pology-0.11.tar.bz2 2064780 BLAKE2B 9453d8b10414c8f50695322de25207fefff4fc5359fcc5e89d639a9cfa0553aadc2bb9953ec3a64daed6235ef7c0b93663983c8605c56a7f83113ab1566dee89 SHA512 bc0193fd4d61390eb9fc5f0ae8eba87e4ef4a3f82f0c1cb937bc24e54cb304d208b5f57c2310291601600f97635e759e700346198637f8d155746c0baaa02b22
 DIST pology-0.12.tar.bz2 1773467 BLAKE2B 7725b6dcb10c0f14533ee31a3d75c78e4fbd12d79ce21017b16d339a880cb73c47c8801e54f5ca0c49d8f364a12179caf6f4100b6eee5b5c47638f61d47a30d0 SHA512 2e23d1dd0c38cc17826908734adf46fb30c30d58f906fc223e2e9251791dad43d02840ae4eca55e04682af574df45a553ccd83faf85a785a1446f645e4222b4f
-EBUILD pology-0.11-r1.ebuild 1595 BLAKE2B 3f21e68eae9e7f57d278d8a729e7074564df5a36636f0a038a0a6f46a8d1ae07b78167970ceea5964eb3842edb87f24ed73fead54d1270f34a94c181d85b07b0 SHA512 6a0fef9e0f5ff397a3ff3bc31a6ad7281c39fa37c5dba19897453f650e62dcc4c4ea6c13d381d83c430fda9a6c63e0af1d60897cc13e5731cd5e69fa8e550ddf
-EBUILD pology-0.12.ebuild 1520 BLAKE2B 4b65348856b650505b9b5e2b1486081ec9bb456706ce75ac6b9c08f8f1178686d6571bd66534fa5f5f31cd66b1123c0caf69a244c54e47bedd81beb3b39fd8ad SHA512 9aa8313e6789c36d4b6faa1280adfc658f5ba1e86523defa5cda1e7b4aef657ebdea15544943ee81390d7c154867cb65a4d18bfa7d28a2f31dcd3066e21f9bc3
-EBUILD pology-9999.ebuild 1520 BLAKE2B 4b65348856b650505b9b5e2b1486081ec9bb456706ce75ac6b9c08f8f1178686d6571bd66534fa5f5f31cd66b1123c0caf69a244c54e47bedd81beb3b39fd8ad SHA512 9aa8313e6789c36d4b6faa1280adfc658f5ba1e86523defa5cda1e7b4aef657ebdea15544943ee81390d7c154867cb65a4d18bfa7d28a2f31dcd3066e21f9bc3
+EBUILD pology-0.12.ebuild 1518 BLAKE2B 3a06c328587ff66ea3b6de85296e3545c2c51c1fd4fd2487bd0984da799661053b631acfef42e2dcaf40b97313cc96871c8152ecfc265c8d9e234383078c58e0 SHA512 6b2a457f20c3e4fb8300af4b0aff6f502abe0cc405c5faec1111fe62183d9e75d489a9f9467061c8d553ed5777e10b719332a6da5d751b5c993249a525ec37ea
+EBUILD pology-9999.ebuild 1520 BLAKE2B 363e87934d6b2664dcc076611232df108638601ecd925c9df580d30009cc9954b37b41cabcc49ac2a5656eb0c1f42b949fd5c0adcd59b519cd666301739ad8d9 SHA512 17b869529d4dda2adb335a4e1be4999ffcc173c7eed73e88d4889b479a31fe53ca389176114b7f3bc538a9e501c91170f3fca7afceb5724acf1f854ccba186b0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-i18n/pology/pology-0.11-r1.ebuild b/app-i18n/pology/pology-0.11-r1.ebuild
deleted file mode 100644
index 5f9de51f8063..000000000000
--- a/app-i18n/pology/pology-0.11-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/l10n-support/pology"
-PYTHON_COMPAT=( python2_7 )
-
-[[ ${PV} == 9999 ]] && VCS_ECLASS="subversion"
-
-inherit python-single-r1 cmake-utils bash-completion-r1 ${VCS_ECLASS}
-unset VCS_ECLASS
-
-DESCRIPTION="A framework for custom processing of PO files"
-HOMEPAGE="http://pology.nedohodnik.net"
-[[ ${PV} == 9999 ]] || SRC_URI="http://pology.nedohodnik.net//release/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-RDEPEND="
-	dev-libs/libxslt
-	dev-libs/libxml2
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.5
-	dev-python/epydoc[${PYTHON_USEDEP}]
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Magic on python parsing makes it impossible to make it parallel safe
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	python_fix_shebang .
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	dosym ../../../pology/syntax/kate/synder.xml /usr/share/apps/katepart/syntax/synder.xml
-
-	newbashcomp "${ED}"/usr/share/pology/completion/bash/pology posieve
-	bashcomp_alias {posieve,poediff}{,.py}
-
-	einfo "You should also consider following packages to install:"
-	einfo "    app-text/aspell"
-	einfo "    app-text/hunspell"
-	einfo "    dev-vcs/git"
-	einfo "    dev-vcs/subversion"
-	einfo "    sci-misc/apertium"
-}
diff --git a/app-i18n/pology/pology-0.12.ebuild b/app-i18n/pology/pology-0.12.ebuild
index 3fe9a9b0038e..f30202d5f5e6 100644
--- a/app-i18n/pology/pology-0.12.ebuild
+++ b/app-i18n/pology/pology-0.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/l10n-support/pology"
 PYTHON_COMPAT=( python2_7 )
@@ -18,7 +18,7 @@ HOMEPAGE="http://pology.nedohodnik.net"
 LICENSE="GPL-3"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-i18n/pology/pology-9999.ebuild b/app-i18n/pology/pology-9999.ebuild
index 3fe9a9b0038e..a1c06c9a1711 100644
--- a/app-i18n/pology/pology-9999.ebuild
+++ b/app-i18n/pology/pology-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/l10n-support/pology"
 PYTHON_COMPAT=( python2_7 )
diff --git a/app-i18n/scim-m17n/Manifest b/app-i18n/scim-m17n/Manifest
index cbc388b41947..38cc186bbe4b 100644
--- a/app-i18n/scim-m17n/Manifest
+++ b/app-i18n/scim-m17n/Manifest
@@ -1,3 +1,3 @@
 DIST scim-m17n-0.2.3.tar.gz 355801 BLAKE2B e6dbfd74ffdac4af4a1dea335a41eded6a499637e772dcb33295c4e5e25e2b04ba420b04ec7029bd6638ea22f74fc9a06f63a48114df7683486581686a733dd3 SHA512 c54be4c8c331d5621dcfa6c0c6f302231071dbbaf3ef7aee4117fe2c2616d58e184d3bae720dce27d5cb6567064add6979630090c72f9350391ca9c3e9c404f3
-EBUILD scim-m17n-0.2.3.ebuild 879 BLAKE2B 16ad8cdd202f871f5d8aae4f01387a8369f0ff1c38645263a7de0eb4974d55108abe276bb2eb9fe7237ad323c2980af302b598896235720d9b6d4e489ecc53b4 SHA512 be97116f4603de79ca9993d69e6d2d293e9f327d08b6643bad675e3ed82d0e22813ee49a4f2f6ff3508bfb1bc1935295cb3b19717a80b5ed1ba1d7e00b2a44bb
+EBUILD scim-m17n-0.2.3.ebuild 761 BLAKE2B 976228f44e64bc4e0bab402e472787959303c458233cb5d820d232e43b907a01223311942719ee92705dd8542bb9f3829a0a377b1aaf4c53523719f4d7f04e81 SHA512 181b4e6b73fd032478c38f461b1ed782f23712eacea793313411bb66b182eafa7d69ec87822d449a46a70e023accea8095c168ae0aed62466b58c30fae4a9c84
 MISC metadata.xml 308 BLAKE2B 1bdcfa2996c5ba60e52eddb6446bbc6978ebee7f1f2f4658c44438b886a89cf46a3fddea53c479151e5e023e5681dca5f01264a26ca108c895ac6758f01d6430 SHA512 9f18bf632f3eff9a6498145c2b4c04d51bb119c67351216ab757cd3cea2364c60bef683769218c0596ef6bd29235e51df6a64f9ab1234665fc2191e18fc51cc7
diff --git a/app-i18n/scim-m17n/scim-m17n-0.2.3.ebuild b/app-i18n/scim-m17n/scim-m17n-0.2.3.ebuild
index e870b0ecb280..87039f7d14aa 100644
--- a/app-i18n/scim-m17n/scim-m17n-0.2.3.ebuild
+++ b/app-i18n/scim-m17n/scim-m17n-0.2.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 DESCRIPTION="An input module for Smart Common Input Method (SCIM) which uses m17n as backend"
 HOMEPAGE="http://www.scim-im.org/projects/imengines"
@@ -17,12 +17,6 @@ RDEPEND=">=app-i18n/scim-1.4
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog THANKS README
-}
-
 pkg_postinst() {
 	elog
 	elog "To use SCIM with both GTK2 and XIM, you should use the following"
diff --git a/app-i18n/scim-pinyin/Manifest b/app-i18n/scim-pinyin/Manifest
index bbf5c541ec2c..98d6b8f3dfd3 100644
--- a/app-i18n/scim-pinyin/Manifest
+++ b/app-i18n/scim-pinyin/Manifest
@@ -2,8 +2,6 @@ AUX scim-pinyin-0.5.91-fixconfigure.patch 1313 BLAKE2B 6ab4742b4c857064d07402411
 AUX scim-pinyin-0.5.91-gbk.patch 2501 BLAKE2B 5a352313b0a779049e5a74f94fab1ffe23336b2fa979d35961ff0db8e86214d51f4ef3e08a6b65261306fd049fad639dabf767ebc3c5e1d863b8249975b0c819 SHA512 77dc428913f0fdfa8c9c9ac056eaa84d9b60e3b285ce510aa9528be087f5757f3f8055ef0930c4ce1c3776e0ca0e3a3fd725ca5d790ade030a8893e5fc8bca17
 AUX scim-pinyin-0.5.91-gcc43.patch 1737 BLAKE2B 09c72b35e238cb0df6a9d3ca9dc08087257bfdd21dfef3d3a0a1de71984a5f840f8b18207183beae794d8284849adeaba9d3ce122dd65e8290aa4c810febe84b SHA512 3b9d10c2ee4ada9a3d8e6c2c292f745efbe034b8eda30932aeea24c1fbaf54a9ce5e6b9e1dad3c43b33b6b14b009406770a55c23821bbe4d9e421d674d1b34fd
 AUX scim-pinyin-qt335.patch 1122 BLAKE2B 693bfb38d5acf47da482603442c28f5fdd2bb1fb9a9f158fd033321f4d28f092fa049e554bb0281178c47013c8888abc44085b10042702d95a2aea349cf1d450 SHA512 d9cafc0f058f7da5fd2c7b70f7b2eeea249044a1aa886e414d5fad78ceaad168d8cd260e7077c03aad6fe622b637bba5312403b15b61b935157f6258020c1c55
-DIST scim-pinyin-0.5.91.tar.gz 5492055 BLAKE2B 8eb01602f4421c397d6c408c1513c0691a98f10d3f47ed54eed9a39303d9a0eb804d4de2f744e25808c83b8aa9be232482caaaa829b8becc8ee10e4cf67373f2 SHA512 ec4498c68cc7ef913b890eb881c73ffd790a5d8d8d48a0a2c32ceda942a7f359fc4bd181199b5333156119484d53d17396b48026fc7913105cfa10c92dd4548b
 DIST scim-pinyin-0.5.92.tar.gz 4769203 BLAKE2B 413a196d175536a044bdf4922bf1f3de6051f7e3cb61131153cab6c15e2301e373bfdd037d3e70c2893f66c29f955696e94bb9c75d1e686ca549d26716de0c47 SHA512 6af20b925c45ca355e12eeb59285e3327c2195038078a0e1741870395dc5a8f7dae60b8c9cd77919fbad94c27e123b9e58439f7011277439f9914d1a543a805f
-EBUILD scim-pinyin-0.5.91-r3.ebuild 1105 BLAKE2B 0e7c0adacf238b269ebc727e5a559d816d7c519bcaa14f43b63021bf481fbd610b99805af48189ac2b31f6afa1030b42244376db4e0bf843d574d7c9bd5c2dfc SHA512 62dd23c089be06357902c34ea90be0684760bbbf397ec3d24806f6a3a2bb039eb43985c32e3c3a42b3f075e3ef44a95de9f244a68482cfdd76bba06aea45a38b
 EBUILD scim-pinyin-0.5.92.ebuild 845 BLAKE2B 8b9ea8806e578c7a66ef65001d192233d8c1150508f7de7d027b32082c4955d2945eb81174a361f48c835a8ead8d16fc47dd8b57f9956705fef409602efe16c8 SHA512 d5a80f917eb810b87e31894404170eec5f87788c831cd6c8c80d369e7558ee9b44d4f4b0095c1eb378bb4848fb0288c9b2b138a4949bcabc35b9446cc22c6762
 MISC metadata.xml 308 BLAKE2B 1bdcfa2996c5ba60e52eddb6446bbc6978ebee7f1f2f4658c44438b886a89cf46a3fddea53c479151e5e023e5681dca5f01264a26ca108c895ac6758f01d6430 SHA512 9f18bf632f3eff9a6498145c2b4c04d51bb119c67351216ab757cd3cea2364c60bef683769218c0596ef6bd29235e51df6a64f9ab1234665fc2191e18fc51cc7
diff --git a/app-i18n/scim-pinyin/scim-pinyin-0.5.91-r3.ebuild b/app-i18n/scim-pinyin/scim-pinyin-0.5.91-r3.ebuild
deleted file mode 100644
index 3b1c1c0eb32b..000000000000
--- a/app-i18n/scim-pinyin/scim-pinyin-0.5.91-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit autotools eutils
-
-DESCRIPTION="Smart Common Input Method (SCIM) Smart Pinyin Input Method"
-HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="nls"
-
-RDEPEND="x11-libs/libXt
-	|| ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-fixconfigure.patch"
-	epatch "${FILESDIR}/${PN}-qt335.patch"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-	epatch "${FILESDIR}/${P}-gbk.patch"
-
-	AT_M4DIR=m4 AT_NO_RECURSIVE=yes eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_enable nls) \
-		--disable-skim-support \
-		--without-arts \
-		--disable-static \
-		--disable-depedency-tracking \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS NEWS README ChangeLog
-}
diff --git a/app-i18n/scim-tomoe/Manifest b/app-i18n/scim-tomoe/Manifest
index df1b23f2e767..7b5945ce5bd1 100644
--- a/app-i18n/scim-tomoe/Manifest
+++ b/app-i18n/scim-tomoe/Manifest
@@ -1,5 +1,4 @@
 AUX scim-tomoe-0.6.0-gcc43.patch 445 BLAKE2B 7a6f48120398dd661a647914e9097dc69807a2c0d18ba9c56517c48df2a67dd7406cb13dea283ff5b9b8c64a19dcff4548453f0c47cb37f890cef0cf7a1794a8 SHA512 a27202fdf5be0d77d473674475ee99d2b0d1a6eba51ccc45c4c7dc6c3a9c3d1042ed3b25ae15a04fcff885aad7b84c42cac7462fcc739bf12076e675b413fafa
 DIST scim-tomoe-0.6.0.tar.gz 385126 BLAKE2B e211c97caab5221d80541cbc795d3559b9843df4fb03bc559a20dc34b510288aefde87251c35c0a123501192d8f4ffb9209fa3c6c74acbbba75ae3321dd58fe9 SHA512 d70a8838f8c82c76a8e3592ad712997189873cbc4ec7ebeba5d43d6583e24acf318299433c9342ee004c4ae4741cca7e0b88e4642cf46c43f967a47ec5ac9d4f
 EBUILD scim-tomoe-0.6.0-r3.ebuild 644 BLAKE2B adb72e7b638641c3b01236f3cab93340b356bfec4cd0fd32f1db8fb21d59fb39f599e9843bc2ccc1b68fb03f32772282ac142284a26c1185231348df8fb51bf2 SHA512 99f9c7a8c24cce85a0236115dd9d85a03046440c2f0d062d15e93d6358532e16e0cec50e37819e8487d3c79f6bf6ba136f1f12bdd6dccff11c96da88729cd11e
-EBUILD scim-tomoe-0.6.0.ebuild 556 BLAKE2B 27532b7f4078e41e3b1201d32b1db16edfbfe370dc9475c17551e8c28c121f612c0a46d1fd55c35ad1cb32d9da73b4112305f08d959236d30c067a76f65816b6 SHA512 e57bfd2120bd0561753e0b0b01e24d314c69e44b8efbbed1ba8dec5edb30d0da102e3b9408717da28004b3229fb35ed3bcb9ea59de684e43f03fe4abf0b97b34
 MISC metadata.xml 309 BLAKE2B f8126911d309ca51f6e56437d2c219026c2e50d854b62c44afc5e211cff957d1776b0fef17a64da072033c5df308c6015786feb49344be3c8c4c57074d028d36 SHA512 7d9c17a3c4279406d23064447a7370658c494bbc5eab2a05f048f58ac3e136804ad65dc2fafbfc132b1f82ca6a651f6fe34beb68ea370b5a0eb1a3f6c98d3c2d
diff --git a/app-i18n/scim-tomoe/scim-tomoe-0.6.0.ebuild b/app-i18n/scim-tomoe/scim-tomoe-0.6.0.ebuild
deleted file mode 100644
index 15c689f259f0..000000000000
--- a/app-i18n/scim-tomoe/scim-tomoe-0.6.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Japanese input method Tomoe IMEngine for SCIM"
-HOMEPAGE="http://tomoe.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="|| ( >=app-i18n/scim-1.2.0 >=app-i18n/scim-cvs-1.2.0 )
-	>=app-i18n/tomoe-gtk-0.6.0"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/app-i18n/uchardet/Manifest b/app-i18n/uchardet/Manifest
index f2a46bb66c16..6b103c21f985 100644
--- a/app-i18n/uchardet/Manifest
+++ b/app-i18n/uchardet/Manifest
@@ -1,5 +1,5 @@
 AUX uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch 2401 BLAKE2B 3f0cf425385d333488c7eeb37c37f3ec6a224e0a96d2c1bbcaded770c8ab6b5bd8277808fbce2bbc960cb3838e0e9de8d889ef9fe2af2e3b44ec4a81031d43f1 SHA512 fb684a362095810bb462609859018dd22987704ab9def0d0ea9ab6afc076fddcf338c622b9f587649d6f561a216b8bc234d3499c499ce3d4589113e908037972
 DIST uchardet-0.0.6.tar.xz 169192 BLAKE2B a0bc80ecd12565c1459b8136e3dc0530250571b5adbe4a7013c561f846f64f58482b9fd9cc5aa7493f20e913f59504a6e08c26571bf33ff34b4823f55d857b8c SHA512 eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5
-EBUILD uchardet-0.0.6-r2.ebuild 816 BLAKE2B 4610a2ac3c7c4daafcf54e3126cdca29f283c31b9542966052517aaa24743b6c5ee58c7e7843ab4391d968f6468ac8f3254c359dc04baf632e5c0841f17d4942 SHA512 ffc5e635caf09aca430640d77af203d3a31eb2ce946fe919784267edd6d04b7a3c184a290db8a0ad1caf69f92c592402be7f0a5710f32c09fa857e027bd66618
+EBUILD uchardet-0.0.6-r2.ebuild 823 BLAKE2B d3a291c1dc983135f549fff78942472ef409dcad3db18f7e602ea555ffa1efea5472b4bc70de98822c61ea70aa4a671495eb95de1d06a6dbe15ce462d6dd2231 SHA512 17b2dab20ed3dc8176e435689d0d9624b70f68719a9f253af93209e6414a0bcc62cc6508b337006f99b55b463d6b980e00b02a380eee708291b7635c80a9a475
 EBUILD uchardet-9999.ebuild 709 BLAKE2B ee0157c9893a0f32f9a1ae4239ca45ffa55bd8f2ec65a3733b95374d32c242ad4da69979a31927942ca2eb1d75dc6be23e8acbe38645b82878a1204ea2c9d6d5 SHA512 78900bf42f2d6050df74789fac4bd03259dbf76adad2f0310e285dfc0a58bd66eff606e6f66455d688e93430544e11553130a679b7bf1ca0cab4575057ff3e46
 MISC metadata.xml 472 BLAKE2B d9ef3c52d66ba665481312bd5f99c8be7ada8ea593c851d103451b388c3d37972762a33c9f7d2552ace1dfcaed4bf907145985c081eef0ffd29ffdb6d1c26108 SHA512 3cc702714648db5605638ba28364caa1e0ad0be1b9fb519b434f34fa993f76ba29a9ccdef0e8dea8f4b0fd89514c7196328a1f77efbb9aece30adce5063f7536
diff --git a/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild b/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild
index 74dc6719ee3f..5c0b29761a4b 100644
--- a/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild
+++ b/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/uchardet/releases/${P}.tar.xz"
 
 LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE="cpu_flags_x86_sse2 static-libs test"
 
 PATCHES=( "${FILESDIR}/${P}-enforce-IEEE-float-precision-r1.patch" )
diff --git a/app-i18n/uim-tomoe-gtk/Manifest b/app-i18n/uim-tomoe-gtk/Manifest
index 7a47005d1698..1685c5c27fda 100644
--- a/app-i18n/uim-tomoe-gtk/Manifest
+++ b/app-i18n/uim-tomoe-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST uim-tomoe-gtk-0.6.0.tar.gz 372357 BLAKE2B 4624dcaa209dd1f89bbcff6232b72673b9a9e22609c326104e1fbef9e007c33e8711cd435ef5239d43e0104a65fc652ff74eb9b8787b1e0123e10f71bb07b241 SHA512 201c6a755feaef22b11f88a27b0d004d22ab13e806684ad839f7491ca17626eaf0f866a026c3fcf3b981c41c9c6a880d7f9f7a5156d3dad70d8edb78568b1d5d
-EBUILD uim-tomoe-gtk-0.6.0.ebuild 556 BLAKE2B db17d588d7354da55f53bc7b7d660ee90d63ea999e456e1cf4a66b772f7da1c3d706419ec9a725f2a2e0c72786fdd107d73cfc1f5f27683c53f4ab6c0262a685 SHA512 9a8b514357e6d1c17173255d6cacce979219b6f84d497c598c980a97b8df5db4b086e22ffe0351fb569d27a2b551e6e212d1d24cdb8bf5c1e2c4b87d4a3cc81b
+EBUILD uim-tomoe-gtk-0.6.0.ebuild 477 BLAKE2B 1f99c0f6dab6d649c31042f7767b8ddfd90490f8e610a2604524548f08aada432be2b8738495aa7c31831a683a031d94be37b7fdccbf8ac4ccd43a33e3d3ca0c SHA512 473e6b8e6f76d8ed127d4e88c051b7c33c5b9c75fe44818f4f7f8a687727d26cbe5480c1dcd8938b3574b44b69c999ca4079bf09164751ae873fb67dc0e5ef50
 MISC metadata.xml 309 BLAKE2B f8126911d309ca51f6e56437d2c219026c2e50d854b62c44afc5e211cff957d1776b0fef17a64da072033c5df308c6015786feb49344be3c8c4c57074d028d36 SHA512 7d9c17a3c4279406d23064447a7370658c494bbc5eab2a05f048f58ac3e136804ad65dc2fafbfc132b1f82ca6a651f6fe34beb68ea370b5a0eb1a3f6c98d3c2d
diff --git a/app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild b/app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild
index 371521d94a71..6d00f5ece70d 100644
--- a/app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild
+++ b/app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI="6"
+
+inherit autotools
 
 DESCRIPTION="Japanese input method Tomoe IMEngine for uim"
 HOMEPAGE="http://tomoe.sourceforge.net/"
@@ -12,13 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="|| ( app-i18n/uim app-i18n/uim-svn )
-	>=app-i18n/tomoe-gtk-0.6.0"
+RDEPEND="app-i18n/uim
+	~app-i18n/tomoe-gtk-0.6.0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README
+src_prepare() {
+	default
+	eautoreconf
 }
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 21ecdcaca6f7..eeb5d4e68437 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,6 +1,7 @@
 AUX 50uim-gentoo.el 71 BLAKE2B 94142633d1a13a0d4ea71e4325883be1e407e154277a4a361701bf694b62e3e8855d4627a72015fb04b1470e128df80fefcdb999e2f1090fa03a454287af52f2 SHA512 e2b6d74d14cdf7d81ab128b2e4ffe1d7dcc0013d61685687ca92619704fd38ec1da6a12fabc3878aa7a9ddd9bf0194c499d3100f176f0a96920322a451c04831
 AUX uim-1.8.6-gentoo.patch 618 BLAKE2B 339602558ab7f8d09ef49f9be948f735c6f262961e82d74d22f83a47b9a4072c64d1d197147a168caaa9fbe3fd4b9b1cbc2364576130d400d06cc77551544a75 SHA512 b48d80d26d15956ece6457df32ea35c8ccb2b37cd222699bd35a1cbf40cd6fec14ae424cac17ee91db159a9369a37cc7b8af29c2613d55eb1e82be4e06324d86
 AUX uim-1.8.6-libressl.patch 2041 BLAKE2B d13fc555ce0351b46a08f6fd258a5f222ac104e5107281548a97d2251cfcec89ece8addc2bd5be51f192a854b72701bb9abdc1f97e2c717cd2ae907a088579c1 SHA512 a1af2af13b26b631064165c8f6d6dafaba09d236b489e0e8fd84a7ab6d9c0720a8a91cd9f8baabcc1e640157559fd77f68e18d5e85aaf0c335e25b69e0ef120a
+AUX uim-1.8.6-qt.patch 755 BLAKE2B dccef1b392e331b230f99f34c3dfc2829a49d5c5a15ac7c41eef201f06e5e6bd5c78ea7a3253b7bbcbbccb77feee7bfae677368cdccc1090c4dd8df26a38a5eb SHA512 ba3b80fe5951e2d508c8fc280038f17523a2de5a0bb136179a486c076aa3dd343112dcc976b2d2e4ae157aaa81682ea85031fcb51682776ecdcdb929f6aceb65
 AUX uim-1.8.6-tinfo.patch 2646 BLAKE2B edb4fde474b7264ed8a4a4db329ac06068ddb68e4b0bb6bd33e011018b5450de8ecc2b94716ca486a8a3b965867ee62eb0b3be2b2e939155a0cc34a02264a7a6 SHA512 34c2df710f0053c40b858369036d2e4bbac6a5da6f81794c3d97f6c58713d14c4bffffda555d9fc10ce2d70406578b2a50c9397b23c008ec4b106aa0a4582338
 AUX uim-gentoo.patch 601 BLAKE2B fba57214c7e222e9f042cda4194738ffd170787d3d5431415a9a26632b25bdd9566489352ee4e64f396add88f270931320faed73652002fe67a379f1d644ff65 SHA512 002538e809f174f026df354ebcd4b487d42c0e9f7e409b8c97240969ec3be55f22b754ea34d707fb8eadab1321dd8a3c4b7861b51a606eb741f314f20e473f4a
 AUX uim-tinfo.patch 1594 BLAKE2B 9c52b5603f5d6ebe229e15597ef75ae7049744dee0b2977a9bcd0f7ba59fb8cf111dc8fcc1c25b4ce4363b8f969d76d50a3892ebfe9808afa517bafdde623658 SHA512 13c074b9b33ceb169dcb3cb879f9dfced36dc29da5f45aacaf3dbcd62f3d9a5d565a05b6c3353dc30a33f33f1740032f233e731dc6f430a92c4d133614e57cdc
@@ -8,7 +9,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 4976 BLAKE2B e819e53f6112104dcb1d07f56c531ea0bd089e79c976a16dabce298f1655cddc8b95cee460d835e3f9d081012a5603943b25928ae4079dc19f58332f6a696f90 SHA512 384f14cbf35c6f791f16e6d462f032731a9a86c41b82d3aa958bb439e6922ec33af21b7054d56f72843627f47f2958334dfbd2d988c44a0ff61da43af170e1b7
-EBUILD uim-1.8.6-r2.ebuild 5081 BLAKE2B b2e2e6122b8b3ba52444b65e7262fb4d1e44a632295e85575ae38419412a67b0cba40d9933b7b0dd1fb9d4f3d9b6fd2b26a386ea5e5a6ddef5b96ef180c1b49d SHA512 c897f747f5126e59ebc52658d839b6ee5e2136ecdc89f20fbf3fc4d9e55c4868ee04068a57453078801d28ae3c2b6b23c92fa0d4971a85a95c33cad0b069de59
-EBUILD uim-1.8.8.ebuild 5210 BLAKE2B d21cd6233b3d415a7dc4abea701d509deea009672ca51ca14f6fb1772f96f91337beb9929d6442ae03e440311d99bbb8ef00d2525e5bc9c0bf06584e267382f4 SHA512 d8ff76a51500a3a91755c0b6c94047397c04f6f690d57872ffc87cc41c5472fcf130bdfe0803a02e0b4cd8bcdac7e99f5e42bb07766d01fba1eb027b51d6ff6d
+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.8.ebuild 5300 BLAKE2B c778627e7f1868b6c8c54133965c24619f8450a5ebcae0f58cc093d6b23f3176fa7e67ac7b1622434a10fa96d1202a1693c81c554514a28f8a4d6221ba0bf36b SHA512 ab7edd45870830ae7a5149a4f69903624dc8ec323cc9274384b50076da2c7375284368690dbd64b1b05cc4f051a25a30760fdda0fcabef0d7980fe28312258e5
 MISC metadata.xml 1058 BLAKE2B 3569e92b5050f14f1ed7482e602db2bddda608f49940bd1d0be7708247abd6ef67e648918f271722b8688f56065394da64acd48c0333a23bc6475be4349d49af SHA512 392645fde85e225d2ffeac5fae39018208f40e4f2a44e6a2dd082af82759c69bfb17c1fc8a515d10e0ae808b747074ad6cc13c1cca79582047f8778c8458e088
diff --git a/app-i18n/uim/files/uim-1.8.6-qt.patch b/app-i18n/uim/files/uim-1.8.6-qt.patch
new file mode 100644
index 000000000000..6c0cb7eee667
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.6-qt.patch
@@ -0,0 +1,16 @@
+--- a/m4/ax_path_qmake4.m4
++++ b/m4/ax_path_qmake4.m4
+@@ -23,10 +23,10 @@
+ #   the copyright notice and this notice are preserved.
+ 
+ AC_DEFUN([AX_PATH_QMAKE4], [
+-  ax_guessed_qt4_dirs="/usr/lib/qt4/bin:/usr/local/lib/qt4/bin:/usr/qt4/bin:/usr/local/qt4/bin:${QT4DIR}/bin:${QTDIR}/bin"
++  ax_guessed_qt4_dirs="${QT4DIR}/bin:${QTDIR}/bin"
+   AC_PROG_EGREP
+-  AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], ["$PATH:$ax_guessed_qt4_dirs"])
+-  AC_PATH_PROGS(_QMAKE, [qmake], [], ["$PATH:$ax_guessed_qt4_dirs"])
++  AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], ["$ax_guessed_qt4_dirs:$PATH"])
++  AC_PATH_PROGS(_QMAKE, [qmake], [], ["$ax_guessed_qt4_dirs:$PATH"])
+ 
+   AC_CACHE_CHECK([for Qt4 version of qmake], ax_cv_path_QMAKE4, [
+     ax_cv_path_QMAKE4=no
diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
index 84c5fa527ebd..af634f34baf1 100644
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit autotools elisp-common gnome2-utils
+inherit autotools elisp-common gnome2-utils qmake-utils
 
 DESCRIPTION="A multilingual input method framework"
 HOMEPAGE="https://github.com/uim/uim"
@@ -78,6 +78,7 @@ RDEPEND="${CDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-qt.patch
 	"${FILESDIR}"/${P}-tinfo.patch
 	"${FILESDIR}"/${PN}-zh-TW.patch
 )
@@ -144,6 +145,7 @@ src_configure() {
 		myconf+=( --disable-pref )
 	fi
 
+	export QT4DIR="$(qt4_get_libdir)"
 	econf "${myconf[@]}"
 }
 
diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
index ccec49f28693..8ecd96c02155 100644
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit autotools elisp-common gnome2-utils
+inherit autotools elisp-common gnome2-utils qmake-utils
 
 DESCRIPTION="A multilingual input method framework"
 HOMEPAGE="https://github.com/uim/uim"
@@ -82,6 +82,7 @@ RDEPEND="${CDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-libressl.patch
+	"${FILESDIR}"/${P}-qt.patch
 	"${FILESDIR}"/${P}-tinfo.patch
 	"${FILESDIR}"/${PN}-zh-TW.patch
 )
@@ -148,6 +149,7 @@ src_configure() {
 		myconf+=( --disable-pref )
 	fi
 
+	export QT4DIR="$(qt4_get_libdir)"
 	econf "${myconf[@]}"
 }
 
diff --git a/app-i18n/uim/uim-1.8.8.ebuild b/app-i18n/uim/uim-1.8.8.ebuild
index b77ac271174f..96c19d017d73 100644
--- a/app-i18n/uim/uim-1.8.8.ebuild
+++ b/app-i18n/uim/uim-1.8.8.ebuild
@@ -92,6 +92,8 @@ SITEFILE="50${PN}-gentoo.el"
 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
 
 	eautoreconf
 }