commit: 94ededead382d8d387b32bf4d1d49357f0335e4e
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Tue Aug 22 11:56:09 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 14:20:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94ededea
app-i18n/fcitx: Delete "dbus" USE flag and unconditionally enable support for
DBus.
app-i18n/fcitx/fcitx-4.2.9.1.ebuild | 9 ++++-----
app-i18n/fcitx/fcitx-9999.ebuild | 9 ++++-----
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/app-i18n/fcitx/fcitx-4.2.9.1.ebuild
b/app-i18n/fcitx/fcitx-4.2.9.1.ebuild
index 3b6fd11730d..d1ada64b61b 100644
--- a/app-i18n/fcitx/fcitx-4.2.9.1.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.1.ebuild
@@ -22,10 +22,11 @@ fi
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
KEYWORDS="amd64 hppa ppc ppc64 x86"
-IUSE="+X +autostart +cairo +dbus debug +enchant gtk2 gtk3 +introspection lua
nls opencc +pango qt4 static-libs +table test +xml"
-REQUIRED_USE="autostart? ( dbus ) cairo? ( X ) gtk2? ( dbus ) gtk3? ( dbus )
introspection? ( dbus ) pango? ( cairo ) qt4? ( X dbus )"
+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="virtual/libiconv
+RDEPEND="sys-apps/dbus
+ virtual/libiconv
virtual/libintl
x11-libs/libxkbcommon
X? (
@@ -42,7 +43,6 @@ RDEPEND="virtual/libiconv
pango? ( x11-libs/pango )
!pango? ( media-libs/fontconfig )
)
- dbus? ( sys-apps/dbus )
enchant? ( app-text/enchant )
gtk2? (
dev-libs/glib:2
@@ -101,7 +101,6 @@ src_configure() {
-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-DSYSCONFDIR="${EPREFIX}/etc"
-DENABLE_CAIRO=$(usex cairo)
- -DENABLE_DBUS=$(usex dbus)
-DENABLE_DEBUG=$(usex debug)
-DENABLE_ENCHANT=$(usex enchant)
-DENABLE_GETTEXT=$(usex nls)
diff --git a/app-i18n/fcitx/fcitx-9999.ebuild b/app-i18n/fcitx/fcitx-9999.ebuild
index ddd7747350a..3d658af9461 100644
--- a/app-i18n/fcitx/fcitx-9999.ebuild
+++ b/app-i18n/fcitx/fcitx-9999.ebuild
@@ -22,10 +22,11 @@ fi
LICENSE="GPL-2+ LGPL-2+ MIT"
SLOT="0"
KEYWORDS=""
-IUSE="+X +autostart +cairo +dbus debug +enchant gtk2 gtk3 +introspection lua
nls opencc +pango qt4 static-libs +table test +xml"
-REQUIRED_USE="autostart? ( dbus ) cairo? ( X ) gtk2? ( dbus ) gtk3? ( dbus )
introspection? ( dbus ) pango? ( cairo ) qt4? ( X dbus )"
+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="virtual/libiconv
+RDEPEND="sys-apps/dbus
+ virtual/libiconv
virtual/libintl
x11-libs/libxkbcommon
X? (
@@ -42,7 +43,6 @@ RDEPEND="virtual/libiconv
pango? ( x11-libs/pango )
!pango? ( media-libs/fontconfig )
)
- dbus? ( sys-apps/dbus )
enchant? ( app-text/enchant )
gtk2? (
dev-libs/glib:2
@@ -96,7 +96,6 @@ src_configure() {
-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-DSYSCONFDIR="${EPREFIX}/etc"
-DENABLE_CAIRO=$(usex cairo)
- -DENABLE_DBUS=$(usex dbus)
-DENABLE_DEBUG=$(usex debug)
-DENABLE_ENCHANT=$(usex enchant)
-DENABLE_GETTEXT=$(usex nls)
