commit: 648fb67294c4b900b0e97838e521f20914358409 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Thu Apr 14 05:08:35 2022 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Fri Apr 15 19:24:58 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=648fb672
app-i18n/ibus: Split IUSE=+gtk3 from IUSE=+gtk Before this commit, the USE=gtk flag did two things in one: 1. enabled the GTK+3 UI 2. enabled the GTK+3 IM module The new IUSE=gtk3 flag will control case #2. A later commit will rename IUSE=gtk (which controls case #1) to IUSE=gui to be more in line with Gentoo policies. Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> app-i18n/ibus/ibus-1.5.26.ebuild | 14 +++++++------- app-i18n/ibus/metadata.xml | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app-i18n/ibus/ibus-1.5.26.ebuild b/app-i18n/ibus/ibus-1.5.26.ebuild index 6eef64481367..3bba87ebd2c2 100644 --- a/app-i18n/ibus/ibus-1.5.26.ebuild +++ b/app-i18n/ibus/ibus-1.5.26.ebuild @@ -19,16 +19,16 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="+X appindicator +emoji +gtk +gtk2 +gtk4 +introspection nls +python systemd test +unicode vala wayland" +IUSE="+X appindicator +emoji +gtk +gtk2 +gtk3 +gtk4 +introspection nls +python systemd test +unicode vala wayland" RESTRICT="!test? ( test )" REQUIRED_USE=" gtk2? ( gtk ) - appindicator? ( gtk ) + appindicator? ( gtk3 ) python? ( ${PYTHON_REQUIRED_USE} introspection ) - test? ( gtk ) + test? ( gtk3 ) vala? ( introspection )" DEPEND=" @@ -43,10 +43,10 @@ DEPEND=" !gtk? ( x11-libs/gtk+:2 ) ) gtk? ( - x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) + gtk3? ( x11-libs/gtk+:3 ) gtk4? ( gui-libs/gtk:4 ) ) introspection? ( dev-libs/gobject-introspection ) @@ -142,9 +142,9 @@ src_configure() { $(use_enable emoji emoji-dict) $(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) $(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) - $(use_enable gtk gtk3) $(use_enable gtk ui) $(use_enable gtk2) + $(use_enable gtk3) $(use_enable gtk4) $(use_enable introspection) $(use_enable nls) @@ -208,16 +208,16 @@ src_install() { } pkg_postinst() { - use gtk && gnome2_query_immodules_gtk3 use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 xdg_icon_cache_update gnome2_schemas_update dconf update } pkg_postrm() { - use gtk && gnome2_query_immodules_gtk3 use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 xdg_icon_cache_update gnome2_schemas_update } diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml index 940da8fb7bc4..b94c839a675b 100644 --- a/app-i18n/ibus/metadata.xml +++ b/app-i18n/ibus/metadata.xml @@ -13,6 +13,7 @@ <use> <flag name="emoji">Enable support for Emoji</flag> <flag name="gtk2">Enable the GTK-2 input method module</flag> + <flag name="gtk3">Enable the GTK-3 input method module</flag> <flag name="gtk4">Enable the GTK-4 input method module</flag> <flag name="unicode">Enable support for Unicode choice</flag> </use>
