| 1 |
commit: 52247dfb39050c811eaaa01c426dae43bd17fdd5 |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Fri Sep 1 19:35:29 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 2 15:52:02 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52247dfb |
| 7 |
|
| 8 |
app-i18n/fcitx: Always install libfcitx-gclient library. |
| 9 |
|
| 10 |
app-i18n/fcitx/fcitx-4.2.9.1.ebuild | 20 +++++--------------- |
| 11 |
app-i18n/fcitx/fcitx-9999.ebuild | 20 +++++--------------- |
| 12 |
2 files changed, 10 insertions(+), 30 deletions(-) |
| 13 |
|
| 14 |
diff --git a/app-i18n/fcitx/fcitx-4.2.9.1.ebuild b/app-i18n/fcitx/fcitx-4.2.9.1.ebuild |
| 15 |
index d1ada64b61b..ea7c27463e5 100644 |
| 16 |
--- a/app-i18n/fcitx/fcitx-4.2.9.1.ebuild |
| 17 |
+++ b/app-i18n/fcitx/fcitx-4.2.9.1.ebuild |
| 18 |
@@ -25,7 +25,8 @@ KEYWORDS="amd64 hppa ppc ppc64 x86" |
| 19 |
IUSE="+X +autostart +cairo debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml" |
| 20 |
REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )" |
| 21 |
|
| 22 |
-RDEPEND="sys-apps/dbus |
| 23 |
+RDEPEND="dev-libs/glib:2 |
| 24 |
+ sys-apps/dbus |
| 25 |
virtual/libiconv |
| 26 |
virtual/libintl |
| 27 |
x11-libs/libxkbcommon |
| 28 |
@@ -37,25 +38,15 @@ RDEPEND="sys-apps/dbus |
| 29 |
xml? ( x11-libs/libxkbfile ) |
| 30 |
) |
| 31 |
cairo? ( |
| 32 |
- dev-libs/glib:2 |
| 33 |
x11-libs/cairo[X] |
| 34 |
x11-libs/libXext |
| 35 |
pango? ( x11-libs/pango ) |
| 36 |
!pango? ( media-libs/fontconfig ) |
| 37 |
) |
| 38 |
enchant? ( app-text/enchant ) |
| 39 |
- gtk2? ( |
| 40 |
- dev-libs/glib:2 |
| 41 |
- x11-libs/gtk+:2 |
| 42 |
- ) |
| 43 |
- gtk3? ( |
| 44 |
- dev-libs/glib:2 |
| 45 |
- x11-libs/gtk+:3 |
| 46 |
- ) |
| 47 |
- introspection? ( |
| 48 |
- dev-libs/glib:2 |
| 49 |
- dev-libs/gobject-introspection |
| 50 |
- ) |
| 51 |
+ gtk2? ( x11-libs/gtk+:2 ) |
| 52 |
+ gtk3? ( x11-libs/gtk+:3 ) |
| 53 |
+ introspection? ( dev-libs/gobject-introspection ) |
| 54 |
lua? ( dev-lang/lua:= ) |
| 55 |
nls? ( sys-devel/gettext ) |
| 56 |
opencc? ( app-i18n/opencc:= ) |
| 57 |
@@ -105,7 +96,6 @@ src_configure() { |
| 58 |
-DENABLE_ENCHANT=$(usex enchant) |
| 59 |
-DENABLE_GETTEXT=$(usex nls) |
| 60 |
-DENABLE_GIR=$(usex introspection) |
| 61 |
- -DENABLE_GLIB2=$(if use cairo || use gtk2 || use gtk3 || use introspection; then echo yes; else echo no; fi) |
| 62 |
-DENABLE_GTK2_IM_MODULE=$(usex gtk2) |
| 63 |
-DENABLE_GTK3_IM_MODULE=$(usex gtk3) |
| 64 |
-DENABLE_LIBXML2=$(usex xml) |
| 65 |
|
| 66 |
diff --git a/app-i18n/fcitx/fcitx-9999.ebuild b/app-i18n/fcitx/fcitx-9999.ebuild |
| 67 |
index 3d658af9461..08e71fb657b 100644 |
| 68 |
--- a/app-i18n/fcitx/fcitx-9999.ebuild |
| 69 |
+++ b/app-i18n/fcitx/fcitx-9999.ebuild |
| 70 |
@@ -25,7 +25,8 @@ KEYWORDS="" |
| 71 |
IUSE="+X +autostart +cairo debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml" |
| 72 |
REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )" |
| 73 |
|
| 74 |
-RDEPEND="sys-apps/dbus |
| 75 |
+RDEPEND="dev-libs/glib:2 |
| 76 |
+ sys-apps/dbus |
| 77 |
virtual/libiconv |
| 78 |
virtual/libintl |
| 79 |
x11-libs/libxkbcommon |
| 80 |
@@ -37,25 +38,15 @@ RDEPEND="sys-apps/dbus |
| 81 |
xml? ( x11-libs/libxkbfile ) |
| 82 |
) |
| 83 |
cairo? ( |
| 84 |
- dev-libs/glib:2 |
| 85 |
x11-libs/cairo[X] |
| 86 |
x11-libs/libXext |
| 87 |
pango? ( x11-libs/pango ) |
| 88 |
!pango? ( media-libs/fontconfig ) |
| 89 |
) |
| 90 |
enchant? ( app-text/enchant ) |
| 91 |
- gtk2? ( |
| 92 |
- dev-libs/glib:2 |
| 93 |
- x11-libs/gtk+:2 |
| 94 |
- ) |
| 95 |
- gtk3? ( |
| 96 |
- dev-libs/glib:2 |
| 97 |
- x11-libs/gtk+:3 |
| 98 |
- ) |
| 99 |
- introspection? ( |
| 100 |
- dev-libs/glib:2 |
| 101 |
- dev-libs/gobject-introspection |
| 102 |
- ) |
| 103 |
+ gtk2? ( x11-libs/gtk+:2 ) |
| 104 |
+ gtk3? ( x11-libs/gtk+:3 ) |
| 105 |
+ introspection? ( dev-libs/gobject-introspection ) |
| 106 |
lua? ( dev-lang/lua:= ) |
| 107 |
nls? ( sys-devel/gettext ) |
| 108 |
opencc? ( app-i18n/opencc:= ) |
| 109 |
@@ -100,7 +91,6 @@ src_configure() { |
| 110 |
-DENABLE_ENCHANT=$(usex enchant) |
| 111 |
-DENABLE_GETTEXT=$(usex nls) |
| 112 |
-DENABLE_GIR=$(usex introspection) |
| 113 |
- -DENABLE_GLIB2=$(if use cairo || use gtk2 || use gtk3 || use introspection; then echo yes; else echo no; fi) |
| 114 |
-DENABLE_GTK2_IM_MODULE=$(usex gtk2) |
| 115 |
-DENABLE_GTK3_IM_MODULE=$(usex gtk3) |
| 116 |
-DENABLE_LIBXML2=$(usex xml) |
Archives