[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/

["Akinori Hattori" <hattya@gentoo.org>]

commit:     f24b69fc5a937c4a2df16391c5481fa69d3be462
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Mon May 28 14:27:47 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Mon May 28 14:55:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f24b69fc

app-i18n/uim: switch to gtk2 USE flag

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-i18n/uim/metadata.xml        |  2 +-
 app-i18n/uim/uim-1.8.6-r1.ebuild | 24 ++++++++++++------------
 app-i18n/uim/uim-1.8.6-r2.ebuild | 24 ++++++++++++------------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/app-i18n/uim/metadata.xml b/app-i18n/uim/metadata.xml
index a509c6471ec..5954a1c59d1 100644
--- a/app-i18n/uim/metadata.xml
+++ b/app-i18n/uim/metadata.xml
@@ -15,7 +15,7 @@
   <use>
     <flag name="anthy">Enable support for <pkg>app-i18n/anthy</pkg></flag>
     <flag name="eb">Enable support for <pkg>dev-libs/eb</pkg></flag>
-    <flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
+    <flag name="gtk2">Enable support for <pkg>x11-libs/gtk+</pkg>:2</flag>
     <flag name="skk">Enable support for <pkg>app-i18n/skk-jisyo</pkg></flag>
   </use>
   <upstream>

diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
index 8f11f1958d1..98d789b88b7 100644
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild
@@ -12,10 +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 gtk3 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 qt4 skk sqlite ssl static-libs xft"
 RESTRICT="test"
 REQUIRED_USE="gtk? ( X )
-	gtk3? ( X )
+	gtk2? ( X )
 	qt4? ( X )
 	xft? ( X )"
 
@@ -36,8 +36,8 @@ CDEPEND="!dev-scheme/sigscheme
 	emacs? ( virtual/emacs )
 	expat? ( dev-libs/expat )
 	libffi? ( virtual/libffi )
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
+	gtk? ( x11-libs/gtk+:3 )
+	gtk2? ( x11-libs/gtk+:2 )
 	libedit? ( dev-libs/libedit )
 	libnotify? ( x11-libs/libnotify )
 	m17n-lib? ( dev-libs/m17n-lib )
@@ -104,8 +104,8 @@ src_configure() {
 		$(use_with expat)
 		$(use_with libedit)
 		$(use_with libffi ffi)
-		$(use_with gtk gtk2)
-		$(use_with gtk3)
+		$(use_with gtk gtk3)
+		$(use_with gtk2)
 		$(use_with m17n-lib m17nlib)
 		$(use_enable ncurses fep)
 		$(use_enable nls)
@@ -126,7 +126,7 @@ src_configure() {
 		--without-prime
 	)
 
-	if (use gtk || use gtk3) && (use anthy || use canna); then
+	if (use gtk || use gtk2) && (use anthy || use canna); then
 		myconf+=( --enable-dict )
 	else
 		myconf+=( --disable-dict )
@@ -136,7 +136,7 @@ src_configure() {
 		myconf+=( --enable-notify=libnotify )
 	fi
 
-	if use gtk || use gtk3 || use qt4; then
+	if use gtk || use gtk2 || use qt4; then
 		myconf+=( --enable-pref )
 	else
 		myconf+=( --disable-pref )
@@ -197,12 +197,12 @@ pkg_postinst() {
 		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_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
 }
 
 pkg_postrm() {
 	use emacs && elisp-site-regen
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
 }

diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
index 92b6abc0c68..d17f38959ea 100644
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild
@@ -12,10 +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 gtk3 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 qt4 skk sqlite ssl static-libs xft"
 RESTRICT="test"
 REQUIRED_USE="gtk? ( X )
-	gtk3? ( X )
+	gtk2? ( X )
 	qt4? ( X )
 	xft? ( X )"
 
@@ -36,8 +36,8 @@ CDEPEND="!dev-scheme/sigscheme
 	emacs? ( virtual/emacs )
 	expat? ( dev-libs/expat )
 	libffi? ( virtual/libffi )
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
+	gtk? ( x11-libs/gtk+:3 )
+	gtk2? ( x11-libs/gtk+:2 )
 	libedit? ( dev-libs/libedit )
 	libnotify? ( x11-libs/libnotify )
 	m17n-lib? ( dev-libs/m17n-lib )
@@ -108,8 +108,8 @@ src_configure() {
 		$(use_with expat)
 		$(use_with libedit)
 		$(use_with libffi ffi)
-		$(use_with gtk gtk2)
-		$(use_with gtk3)
+		$(use_with gtk gtk3)
+		$(use_with gtk2)
 		$(use_with m17n-lib m17nlib)
 		$(use_enable ncurses fep)
 		$(use_enable nls)
@@ -130,7 +130,7 @@ src_configure() {
 		--without-prime
 	)
 
-	if (use gtk || use gtk3) && (use anthy || use canna); then
+	if (use gtk || use gtk2) && (use anthy || use canna); then
 		myconf+=( --enable-dict )
 	else
 		myconf+=( --disable-dict )
@@ -140,7 +140,7 @@ src_configure() {
 		myconf+=( --enable-notify=libnotify )
 	fi
 
-	if use gtk || use gtk3 || use qt4; then
+	if use gtk || use gtk2 || use qt4; then
 		myconf+=( --enable-pref )
 	else
 		myconf+=( --disable-pref )
@@ -201,12 +201,12 @@ pkg_postinst() {
 		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_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
 }
 
 pkg_postrm() {
 	use emacs && elisp-site-regen
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
 }