| 1 |
commit: 94ededead382d8d387b32bf4d1d49357f0335e4e |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Tue Aug 22 11:56:09 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 22 14:20:14 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94ededea |
| 7 |
|
| 8 |
app-i18n/fcitx: Delete "dbus" USE flag and unconditionally enable support for DBus. |
| 9 |
|
| 10 |
app-i18n/fcitx/fcitx-4.2.9.1.ebuild | 9 ++++----- |
| 11 |
app-i18n/fcitx/fcitx-9999.ebuild | 9 ++++----- |
| 12 |
2 files changed, 8 insertions(+), 10 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 3b6fd11730d..d1ada64b61b 100644 |
| 16 |
--- a/app-i18n/fcitx/fcitx-4.2.9.1.ebuild |
| 17 |
+++ b/app-i18n/fcitx/fcitx-4.2.9.1.ebuild |
| 18 |
@@ -22,10 +22,11 @@ fi |
| 19 |
LICENSE="GPL-2+ LGPL-2+" |
| 20 |
SLOT="0" |
| 21 |
KEYWORDS="amd64 hppa ppc ppc64 x86" |
| 22 |
-IUSE="+X +autostart +cairo +dbus debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml" |
| 23 |
-REQUIRED_USE="autostart? ( dbus ) cairo? ( X ) gtk2? ( dbus ) gtk3? ( dbus ) introspection? ( dbus ) pango? ( cairo ) qt4? ( X dbus )" |
| 24 |
+IUSE="+X +autostart +cairo debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml" |
| 25 |
+REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )" |
| 26 |
|
| 27 |
-RDEPEND="virtual/libiconv |
| 28 |
+RDEPEND="sys-apps/dbus |
| 29 |
+ virtual/libiconv |
| 30 |
virtual/libintl |
| 31 |
x11-libs/libxkbcommon |
| 32 |
X? ( |
| 33 |
@@ -42,7 +43,6 @@ RDEPEND="virtual/libiconv |
| 34 |
pango? ( x11-libs/pango ) |
| 35 |
!pango? ( media-libs/fontconfig ) |
| 36 |
) |
| 37 |
- dbus? ( sys-apps/dbus ) |
| 38 |
enchant? ( app-text/enchant ) |
| 39 |
gtk2? ( |
| 40 |
dev-libs/glib:2 |
| 41 |
@@ -101,7 +101,6 @@ src_configure() { |
| 42 |
-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" |
| 43 |
-DSYSCONFDIR="${EPREFIX}/etc" |
| 44 |
-DENABLE_CAIRO=$(usex cairo) |
| 45 |
- -DENABLE_DBUS=$(usex dbus) |
| 46 |
-DENABLE_DEBUG=$(usex debug) |
| 47 |
-DENABLE_ENCHANT=$(usex enchant) |
| 48 |
-DENABLE_GETTEXT=$(usex nls) |
| 49 |
|
| 50 |
diff --git a/app-i18n/fcitx/fcitx-9999.ebuild b/app-i18n/fcitx/fcitx-9999.ebuild |
| 51 |
index ddd7747350a..3d658af9461 100644 |
| 52 |
--- a/app-i18n/fcitx/fcitx-9999.ebuild |
| 53 |
+++ b/app-i18n/fcitx/fcitx-9999.ebuild |
| 54 |
@@ -22,10 +22,11 @@ fi |
| 55 |
LICENSE="GPL-2+ LGPL-2+ MIT" |
| 56 |
SLOT="0" |
| 57 |
KEYWORDS="" |
| 58 |
-IUSE="+X +autostart +cairo +dbus debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml" |
| 59 |
-REQUIRED_USE="autostart? ( dbus ) cairo? ( X ) gtk2? ( dbus ) gtk3? ( dbus ) introspection? ( dbus ) pango? ( cairo ) qt4? ( X dbus )" |
| 60 |
+IUSE="+X +autostart +cairo debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml" |
| 61 |
+REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )" |
| 62 |
|
| 63 |
-RDEPEND="virtual/libiconv |
| 64 |
+RDEPEND="sys-apps/dbus |
| 65 |
+ virtual/libiconv |
| 66 |
virtual/libintl |
| 67 |
x11-libs/libxkbcommon |
| 68 |
X? ( |
| 69 |
@@ -42,7 +43,6 @@ RDEPEND="virtual/libiconv |
| 70 |
pango? ( x11-libs/pango ) |
| 71 |
!pango? ( media-libs/fontconfig ) |
| 72 |
) |
| 73 |
- dbus? ( sys-apps/dbus ) |
| 74 |
enchant? ( app-text/enchant ) |
| 75 |
gtk2? ( |
| 76 |
dev-libs/glib:2 |
| 77 |
@@ -96,7 +96,6 @@ src_configure() { |
| 78 |
-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" |
| 79 |
-DSYSCONFDIR="${EPREFIX}/etc" |
| 80 |
-DENABLE_CAIRO=$(usex cairo) |
| 81 |
- -DENABLE_DBUS=$(usex dbus) |
| 82 |
-DENABLE_DEBUG=$(usex debug) |
| 83 |
-DENABLE_ENCHANT=$(usex enchant) |
| 84 |
-DENABLE_GETTEXT=$(usex nls) |
Archives