| 1 |
commit: 75c28c305fba2bea6882446cad3eed69086c1a0c |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 25 20:18:57 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 25 20:18:57 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75c28c30 |
| 7 |
|
| 8 |
app-i18n/fcitx: Remove dep on removed qt4 |
| 9 |
|
| 10 |
app-i18n/fcitx/fcitx-4.2.9.6.ebuild | 15 +++++---------- |
| 11 |
app-i18n/fcitx/fcitx-4.9999.ebuild | 15 +++++---------- |
| 12 |
app-i18n/fcitx/metadata.xml | 1 - |
| 13 |
3 files changed, 10 insertions(+), 21 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild |
| 16 |
index 98e30b8de8f..e5a259025b1 100644 |
| 17 |
--- a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild |
| 18 |
+++ b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild |
| 19 |
@@ -26,8 +26,8 @@ fi |
| 20 |
LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT" |
| 21 |
SLOT="4" |
| 22 |
KEYWORDS="amd64 ~hppa ppc ppc64 x86" |
| 23 |
-IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml" |
| 24 |
-REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )" |
| 25 |
+IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango static-libs +table test +xml" |
| 26 |
+REQUIRED_USE="cairo? ( X ) pango? ( cairo )" |
| 27 |
|
| 28 |
RDEPEND="dev-libs/glib:2 |
| 29 |
sys-apps/dbus |
| 30 |
@@ -58,11 +58,6 @@ RDEPEND="dev-libs/glib:2 |
| 31 |
lua? ( dev-lang/lua:= ) |
| 32 |
nls? ( sys-devel/gettext ) |
| 33 |
opencc? ( app-i18n/opencc:= ) |
| 34 |
- qt4? ( |
| 35 |
- dev-qt/qtcore:4 |
| 36 |
- dev-qt/qtdbus:4 |
| 37 |
- dev-qt/qtgui:4 |
| 38 |
- ) |
| 39 |
xml? ( |
| 40 |
app-text/iso-codes |
| 41 |
dev-libs/libxml2 |
| 42 |
@@ -109,9 +104,9 @@ src_configure() { |
| 43 |
-DENABLE_LUA=$(usex lua) |
| 44 |
-DENABLE_OPENCC=$(usex opencc) |
| 45 |
-DENABLE_PANGO=$(usex pango) |
| 46 |
- -DENABLE_QT=$(usex qt4) |
| 47 |
- -DENABLE_QT_GUI=$(usex qt4) |
| 48 |
- -DENABLE_QT_IM_MODULE=$(usex qt4) |
| 49 |
+ -DENABLE_QT=OFF |
| 50 |
+ -DENABLE_QT_GUI=OFF |
| 51 |
+ -DENABLE_QT_IM_MODULE=OFF |
| 52 |
-DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi) |
| 53 |
-DENABLE_STATIC=$(usex static-libs) |
| 54 |
-DENABLE_TABLE=$(usex table) |
| 55 |
|
| 56 |
diff --git a/app-i18n/fcitx/fcitx-4.9999.ebuild b/app-i18n/fcitx/fcitx-4.9999.ebuild |
| 57 |
index 6a3c3d9e00b..22103a58207 100644 |
| 58 |
--- a/app-i18n/fcitx/fcitx-4.9999.ebuild |
| 59 |
+++ b/app-i18n/fcitx/fcitx-4.9999.ebuild |
| 60 |
@@ -26,8 +26,8 @@ fi |
| 61 |
LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT" |
| 62 |
SLOT="4" |
| 63 |
KEYWORDS="" |
| 64 |
-IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml" |
| 65 |
-REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )" |
| 66 |
+IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango static-libs +table test +xml" |
| 67 |
+REQUIRED_USE="cairo? ( X ) pango? ( cairo )" |
| 68 |
|
| 69 |
RDEPEND="dev-libs/glib:2 |
| 70 |
sys-apps/dbus |
| 71 |
@@ -58,11 +58,6 @@ RDEPEND="dev-libs/glib:2 |
| 72 |
lua? ( dev-lang/lua:= ) |
| 73 |
nls? ( sys-devel/gettext ) |
| 74 |
opencc? ( app-i18n/opencc:= ) |
| 75 |
- qt4? ( |
| 76 |
- dev-qt/qtcore:4 |
| 77 |
- dev-qt/qtdbus:4 |
| 78 |
- dev-qt/qtgui:4 |
| 79 |
- ) |
| 80 |
xml? ( |
| 81 |
app-text/iso-codes |
| 82 |
dev-libs/libxml2 |
| 83 |
@@ -109,9 +104,9 @@ src_configure() { |
| 84 |
-DENABLE_LUA=$(usex lua) |
| 85 |
-DENABLE_OPENCC=$(usex opencc) |
| 86 |
-DENABLE_PANGO=$(usex pango) |
| 87 |
- -DENABLE_QT=$(usex qt4) |
| 88 |
- -DENABLE_QT_GUI=$(usex qt4) |
| 89 |
- -DENABLE_QT_IM_MODULE=$(usex qt4) |
| 90 |
+ -DENABLE_QT=OFF |
| 91 |
+ -DENABLE_QT_GUI=OFF |
| 92 |
+ -DENABLE_QT_IM_MODULE=OFF |
| 93 |
-DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi) |
| 94 |
-DENABLE_STATIC=$(usex static-libs) |
| 95 |
-DENABLE_TABLE=$(usex table) |
| 96 |
|
| 97 |
diff --git a/app-i18n/fcitx/metadata.xml b/app-i18n/fcitx/metadata.xml |
| 98 |
index 7090f71a517..e9e77497fee 100644 |
| 99 |
--- a/app-i18n/fcitx/metadata.xml |
| 100 |
+++ b/app-i18n/fcitx/metadata.xml |
| 101 |
@@ -16,7 +16,6 @@ |
| 102 |
<flag name="gtk3">Install input method module for GTK+ 3</flag> |
| 103 |
<flag name="opencc">Enable OpenCC engine (using <pkg>app-i18n/opencc</pkg>) for converter between Simplified Chinese and Traditional Chinese</flag> |
| 104 |
<flag name="pango">Enable support for <pkg>x11-libs/pango</pkg></flag> |
| 105 |
- <flag name="qt4">Install input method module for Qt 4</flag> |
| 106 |
<flag name="table">Install table input methods for Simplified Chinese</flag> |
| 107 |
</use> |
| 108 |
<upstream> |
Archives