app-i18n/ibus-m17n: switch to gtk2 USE flag

Package-Manager: Portage-2.3.6, Repoman-2.3.1

diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild
index aad4f296f04003b06bde3d8ee77b4f52b19d76a5..e7c59414eb7f330c5ca10b3a4e7d8470e77e5222 100644 (file)
--- a/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild
@@ -10,13 +10,13 @@ SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.go
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="gtk gtk3 nls"
+IUSE="gtk gtk2 nls"
 
 CDEPEND="app-i18n/ibus
        dev-libs/m17n-lib
        gtk? (
-               !gtk3? ( x11-libs/gtk+:2 )
-               gtk3? ( x11-libs/gtk+:3 )
+               gtk2? ( x11-libs/gtk+:2 )
+               !gtk2? ( x11-libs/gtk+:3 )
        )
        nls? ( virtual/libintl )"
 RDEPEND="${CDEPEND}
@@ -28,10 +28,10 @@ DEPEND="${CDEPEND}
        dev-util/intltool
        sys-devel/gettext
        virtual/pkgconfig"
-REQUIRED_USE="gtk3? ( gtk )"
+REQUIRED_USE="gtk2? ( gtk )"
 
 src_configure() {
        econf \
                $(use_enable nls) \
-               $(use_with gtk gtk $(usex !gtk3 2.0 3.0))
+               $(use_with gtk gtk $(usex gtk2 2.0 3.0))
 }

diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild
index e3d0ab7586ccc45f85ceb034bcb901c4748c6ccc..4151c4c2cd46e179844a9d7b3d358a41af6460e5 100644 (file)
--- a/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild
@@ -10,13 +10,13 @@ SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.go
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gtk gtk3 nls"
+IUSE="gtk gtk2 nls"
 
 CDEPEND="app-i18n/ibus
        dev-libs/m17n-lib
        gtk? (
-               !gtk3? ( x11-libs/gtk+:2 )
-               gtk3? ( x11-libs/gtk+:3 )
+               gtk2? ( x11-libs/gtk+:2 )
+               !gtk2? ( x11-libs/gtk+:3 )
        )
        nls? ( virtual/libintl )"
 RDEPEND="${CDEPEND}
@@ -28,10 +28,10 @@ DEPEND="${CDEPEND}
        dev-util/intltool
        sys-devel/gettext
        virtual/pkgconfig"
-REQUIRED_USE="gtk3? ( gtk )"
+REQUIRED_USE="gtk2? ( gtk )"
 
 src_configure() {
        econf \
                $(use_enable nls) \
-               $(use_with gtk gtk $(usex !gtk3 2.0 3.0))
+               $(use_with gtk gtk $(usex gtk2 2.0 3.0))
 }

diff --git a/app-i18n/ibus-m17n/metadata.xml b/app-i18n/ibus-m17n/metadata.xml
index b9d88c40b20394c96df8d6d1f287c1733ca5be98..7b7ce9871f2656bd653140d801f921d04caa2eba 100644 (file)
--- a/app-i18n/ibus-m17n/metadata.xml
+++ b/app-i18n/ibus-m17n/metadata.xml
@@ -14,11 +14,8 @@
     <remote-id type="github">ibus/ibus-m17n</remote-id>
   </upstream>
   <use>
-    <flag name="gtk">
-      Build the preference interfaces, based on <pkg>x11-libs/gtk+</pkg>:2
-    </flag>
-    <flag name="gtk3">
-      Build the preference interfaces, based on <pkg>x11-libs/gtk+</pkg>:3
+    <flag name="gtk2">
+      Build with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3
     </flag>
   </use>
 </pkgmetadata>