gentoo resync : 29.08.2018

3 files changed, 16 insertions, 22 deletions

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