app-i18n/fcitx: Delete "dbus" USE flag and unconditionally enable support for DBus.

diff --git a/app-i18n/fcitx/fcitx-4.2.9.1.ebuild b/app-i18n/fcitx/fcitx-4.2.9.1.ebuild
index 3b6fd11730d9cf23c23aa59dd30652528afd3280..d1ada64b61b7245abb93c6674c3c99b680f31073 100644 (file)
--- 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 ddd7747350a8dcd6f58057b4c49aadf481066a87..3d658af94612b2eb6d9f7209ca55309d7643cffa 100644 (file)
--- 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)