commit: 92ddd1e3ded7a9fed5f7b5ea2b3bbc0fa910b886 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> AuthorDate: Mon Aug 14 14:45:07 2017 +0000 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> CommitDate: Mon Aug 14 14:45:07 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92ddd1e3
app-i18n/ibus: add missing REQUIRED_USE Package-Manager: Portage-2.3.6, Repoman-2.3.1 app-i18n/ibus/ibus-1.5.12.ebuild | 18 ++++++++---------- app-i18n/ibus/ibus-1.5.15.ebuild | 18 ++++++++---------- app-i18n/ibus/ibus-1.5.16.ebuild | 16 +++++++--------- 3 files changed, 23 insertions(+), 29 deletions(-) diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild index ebad2ff67aa..a8413c59fff 100644 --- a/app-i18n/ibus/ibus-1.5.12.ebuild +++ b/app-i18n/ibus/ibus-1.5.12.ebuild @@ -14,8 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"; LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland +X" -REQUIRED_USE="libnotify? ( gtk ) +IUSE="+X gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland" +REQUIRED_USE="gtk2? ( gtk ) + libnotify? ( gtk ) python? ( ${PYTHON_REQUIRED_USE} gtk @@ -29,6 +30,10 @@ CDEPEND="app-text/iso-codes gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] + X? ( + x11-libs/libX11 + !gtk? ( x11-libs/gtk+:2 ) + ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 @@ -46,13 +51,6 @@ CDEPEND="app-text/iso-codes wayland? ( dev-libs/wayland x11-libs/libxkbcommon - ) - X? ( - || ( - x11-libs/gtk+:3 - x11-libs/gtk+:2 - ) - x11-libs/libX11 )" RDEPEND="${CDEPEND} python? ( @@ -104,6 +102,7 @@ src_configure() { fi econf \ + $(use_enable X xim) \ $(use_enable gconf) \ $(use_enable gtk gtk3) \ $(use_enable gtk ui) \ @@ -114,7 +113,6 @@ src_configure() { $(use_enable test tests) \ $(use_enable vala) \ $(use_enable wayland) \ - $(use_enable X xim) \ "${python_conf[@]}" } diff --git a/app-i18n/ibus/ibus-1.5.15.ebuild b/app-i18n/ibus/ibus-1.5.15.ebuild index 439ccca56b0..d98586b8db2 100644 --- a/app-i18n/ibus/ibus-1.5.15.ebuild +++ b/app-i18n/ibus/ibus-1.5.15.ebuild @@ -14,8 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"; LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland +X" -REQUIRED_USE="libnotify? ( gtk ) +IUSE="+X gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland" +REQUIRED_USE="gtk2? ( gtk ) + libnotify? ( gtk ) python? ( ${PYTHON_REQUIRED_USE} gtk @@ -29,6 +30,10 @@ CDEPEND="app-text/iso-codes gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] + X? ( + x11-libs/libX11 + !gtk? ( x11-libs/gtk+:2 ) + ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 @@ -46,13 +51,6 @@ CDEPEND="app-text/iso-codes wayland? ( dev-libs/wayland x11-libs/libxkbcommon - ) - X? ( - || ( - x11-libs/gtk+:3 - x11-libs/gtk+:2 - ) - x11-libs/libX11 )" RDEPEND="${CDEPEND} python? ( @@ -104,6 +102,7 @@ src_configure() { fi econf \ + $(use_enable X xim) \ $(use_enable gconf) \ $(use_enable gtk gtk3) \ $(use_enable gtk ui) \ @@ -114,7 +113,6 @@ src_configure() { $(use_enable test tests) \ $(use_enable vala) \ $(use_enable wayland) \ - $(use_enable X xim) \ --disable-emoji-dict \ "${python_conf[@]}" } diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild index e948253cdf5..a54a1d332c2 100644 --- a/app-i18n/ibus/ibus-1.5.16.ebuild +++ b/app-i18n/ibus/ibus-1.5.16.ebuild @@ -14,8 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"; LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" -IUSE="+emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland +X" +IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland" REQUIRED_USE="emoji? ( gtk ) + gtk2? ( gtk ) kde? ( gtk ) libnotify? ( gtk ) python? ( @@ -31,6 +32,10 @@ CDEPEND="app-text/iso-codes gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] + X? ( + x11-libs/libX11 + !gtk? ( x11-libs/gtk+:2 ) + ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 @@ -49,13 +54,6 @@ CDEPEND="app-text/iso-codes wayland? ( dev-libs/wayland x11-libs/libxkbcommon - ) - X? ( - || ( - x11-libs/gtk+:3 - x11-libs/gtk+:2 - ) - x11-libs/libX11 )" RDEPEND="${CDEPEND} python? ( @@ -116,6 +114,7 @@ src_configure() { fi econf \ + $(use_enable X xim) \ $(use_enable emoji emoji-dict) \ $(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \ $(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \ @@ -130,7 +129,6 @@ src_configure() { $(use_enable test tests) \ $(use_enable vala) \ $(use_enable wayland) \ - $(use_enable X xim) \ "${python_conf[@]}" }
