commit: 75c28c305fba2bea6882446cad3eed69086c1a0c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 25 20:18:57 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 25 20:18:57 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75c28c30
app-i18n/fcitx: Remove dep on removed qt4
app-i18n/fcitx/fcitx-4.2.9.6.ebuild | 15 +++++----------
app-i18n/fcitx/fcitx-4.9999.ebuild | 15 +++++----------
app-i18n/fcitx/metadata.xml | 1 -
3 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
index 98e30b8de8f..e5a259025b1 100644
--- 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 6a3c3d9e00b..22103a58207 100644
--- 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 7090f71a517..e9e77497fee 100644
--- 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>
