app-i18n/fcitx: Remove dep on removed qt4

diff --git a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
index 98e30b8de8fa2956cef27aa8f859c7cf4063bbaf..e5a259025b1d4bede2ab1004e199d92c1ec88b82 100644 (file)
--- a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
@@ -26,8 +26,8 @@ fi
 LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
 SLOT="4"
 KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
-REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )"
+IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango static-libs +table test +xml"
+REQUIRED_USE="cairo? ( X ) pango? ( cairo )"
 
 RDEPEND="dev-libs/glib:2
        sys-apps/dbus
@@ -58,11 +58,6 @@ RDEPEND="dev-libs/glib:2
        lua? ( dev-lang/lua:= )
        nls? ( sys-devel/gettext )
        opencc? ( app-i18n/opencc:= )
-       qt4? (
-               dev-qt/qtcore:4
-               dev-qt/qtdbus:4
-               dev-qt/qtgui:4
-       )
        xml? (
                app-text/iso-codes
                dev-libs/libxml2
@@ -109,9 +104,9 @@ src_configure() {
                -DENABLE_LUA=$(usex lua)
                -DENABLE_OPENCC=$(usex opencc)
                -DENABLE_PANGO=$(usex pango)
-               -DENABLE_QT=$(usex qt4)
-               -DENABLE_QT_GUI=$(usex qt4)
-               -DENABLE_QT_IM_MODULE=$(usex qt4)
+               -DENABLE_QT=OFF
+               -DENABLE_QT_GUI=OFF
+               -DENABLE_QT_IM_MODULE=OFF
                -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
                -DENABLE_STATIC=$(usex static-libs)
                -DENABLE_TABLE=$(usex table)

diff --git a/app-i18n/fcitx/fcitx-4.9999.ebuild b/app-i18n/fcitx/fcitx-4.9999.ebuild
index 6a3c3d9e00b8f4baeec6ed34f7c49a1007844103..22103a582078065d2ad453542dd4ca38c55b47ed 100644 (file)
--- a/app-i18n/fcitx/fcitx-4.9999.ebuild
+++ b/app-i18n/fcitx/fcitx-4.9999.ebuild
@@ -26,8 +26,8 @@ fi
 LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
 SLOT="4"
 KEYWORDS=""
-IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
-REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )"
+IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango static-libs +table test +xml"
+REQUIRED_USE="cairo? ( X ) pango? ( cairo )"
 
 RDEPEND="dev-libs/glib:2
        sys-apps/dbus
@@ -58,11 +58,6 @@ RDEPEND="dev-libs/glib:2
        lua? ( dev-lang/lua:= )
        nls? ( sys-devel/gettext )
        opencc? ( app-i18n/opencc:= )
-       qt4? (
-               dev-qt/qtcore:4
-               dev-qt/qtdbus:4
-               dev-qt/qtgui:4
-       )
        xml? (
                app-text/iso-codes
                dev-libs/libxml2
@@ -109,9 +104,9 @@ src_configure() {
                -DENABLE_LUA=$(usex lua)
                -DENABLE_OPENCC=$(usex opencc)
                -DENABLE_PANGO=$(usex pango)
-               -DENABLE_QT=$(usex qt4)
-               -DENABLE_QT_GUI=$(usex qt4)
-               -DENABLE_QT_IM_MODULE=$(usex qt4)
+               -DENABLE_QT=OFF
+               -DENABLE_QT_GUI=OFF
+               -DENABLE_QT_IM_MODULE=OFF
                -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
                -DENABLE_STATIC=$(usex static-libs)
                -DENABLE_TABLE=$(usex table)

diff --git a/app-i18n/fcitx/metadata.xml b/app-i18n/fcitx/metadata.xml
index 7090f71a51724b8e58f6bc5319d97b551a09c71e..e9e77497feec9d74b53dda6fa8ecfbb0b66cd5d8 100644 (file)
--- a/app-i18n/fcitx/metadata.xml
+++ b/app-i18n/fcitx/metadata.xml
@@ -16,7 +16,6 @@
                <flag name="gtk3">Install input method module for GTK+ 3</flag>
                <flag name="opencc">Enable OpenCC engine (using <pkg>app-i18n/opencc</pkg>) for converter between Simplified Chinese and Traditional Chinese</flag>
                <flag name="pango">Enable support for <pkg>x11-libs/pango</pkg></flag>
-               <flag name="qt4">Install input method module for Qt 4</flag>
                <flag name="table">Install table input methods for Simplified Chinese</flag>
        </use>
        <upstream>