diff options
| author | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2017-09-01 21:35:29 +0200 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2017-09-02 11:52:02 -0400 |
| commit | 52247dfb39050c811eaaa01c426dae43bd17fdd5 (patch) | |
| tree | ca8237d5d5c0978c9cfbee15d43b239a8491cf88 | |
| parent | c39edb484cfef7f0968c2dc4dfefb55bb93a362c (diff) | |
| download | gentoo-52247dfb39050c811eaaa01c426dae43bd17fdd5.tar.gz gentoo-52247dfb39050c811eaaa01c426dae43bd17fdd5.tar.xz | |
app-i18n/fcitx: Always install libfcitx-gclient library.
| -rw-r--r-- | app-i18n/fcitx/fcitx-4.2.9.1.ebuild | 20 | ||||
| -rw-r--r-- | app-i18n/fcitx/fcitx-9999.ebuild | 20 |
2 files changed, 10 insertions, 30 deletions
diff --git a/app-i18n/fcitx/fcitx-4.2.9.1.ebuild b/app-i18n/fcitx/fcitx-4.2.9.1.ebuild index d1ada64b61b..ea7c27463e5 100644 --- a/app-i18n/fcitx/fcitx-4.2.9.1.ebuild +++ b/app-i18n/fcitx/fcitx-4.2.9.1.ebuild @@ -25,7 +25,8 @@ 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 )" -RDEPEND="sys-apps/dbus +RDEPEND="dev-libs/glib:2 + sys-apps/dbus virtual/libiconv virtual/libintl x11-libs/libxkbcommon @@ -37,25 +38,15 @@ RDEPEND="sys-apps/dbus xml? ( x11-libs/libxkbfile ) ) cairo? ( - dev-libs/glib:2 x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) enchant? ( app-text/enchant ) - gtk2? ( - dev-libs/glib:2 - x11-libs/gtk+:2 - ) - gtk3? ( - dev-libs/glib:2 - x11-libs/gtk+:3 - ) - introspection? ( - dev-libs/glib:2 - dev-libs/gobject-introspection - ) + gtk2? ( x11-libs/gtk+:2 ) + gtk3? ( x11-libs/gtk+:3 ) + introspection? ( dev-libs/gobject-introspection ) lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:= ) @@ -105,7 +96,6 @@ src_configure() { -DENABLE_ENCHANT=$(usex enchant) -DENABLE_GETTEXT=$(usex nls) -DENABLE_GIR=$(usex introspection) - -DENABLE_GLIB2=$(if use cairo || use gtk2 || use gtk3 || use introspection; then echo yes; else echo no; fi) -DENABLE_GTK2_IM_MODULE=$(usex gtk2) -DENABLE_GTK3_IM_MODULE=$(usex gtk3) -DENABLE_LIBXML2=$(usex xml) diff --git a/app-i18n/fcitx/fcitx-9999.ebuild b/app-i18n/fcitx/fcitx-9999.ebuild index 3d658af9461..08e71fb657b 100644 --- a/app-i18n/fcitx/fcitx-9999.ebuild +++ b/app-i18n/fcitx/fcitx-9999.ebuild @@ -25,7 +25,8 @@ 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 )" -RDEPEND="sys-apps/dbus +RDEPEND="dev-libs/glib:2 + sys-apps/dbus virtual/libiconv virtual/libintl x11-libs/libxkbcommon @@ -37,25 +38,15 @@ RDEPEND="sys-apps/dbus xml? ( x11-libs/libxkbfile ) ) cairo? ( - dev-libs/glib:2 x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) enchant? ( app-text/enchant ) - gtk2? ( - dev-libs/glib:2 - x11-libs/gtk+:2 - ) - gtk3? ( - dev-libs/glib:2 - x11-libs/gtk+:3 - ) - introspection? ( - dev-libs/glib:2 - dev-libs/gobject-introspection - ) + gtk2? ( x11-libs/gtk+:2 ) + gtk3? ( x11-libs/gtk+:3 ) + introspection? ( dev-libs/gobject-introspection ) lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:= ) @@ -100,7 +91,6 @@ src_configure() { -DENABLE_ENCHANT=$(usex enchant) -DENABLE_GETTEXT=$(usex nls) -DENABLE_GIR=$(usex introspection) - -DENABLE_GLIB2=$(if use cairo || use gtk2 || use gtk3 || use introspection; then echo yes; else echo no; fi) -DENABLE_GTK2_IM_MODULE=$(usex gtk2) -DENABLE_GTK3_IM_MODULE=$(usex gtk3) -DENABLE_LIBXML2=$(usex xml) |