commit: fab5df2eef030ab7d815a82592a727fc78390710 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> AuthorDate: Tue Aug 1 14:04:34 2017 +0000 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> CommitDate: Tue Aug 1 14:23:15 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fab5df2e
app-i18n/ibus: switch to gtk2 USE flag Package-Manager: Portage-2.3.6, Repoman-2.3.1 app-i18n/ibus/ibus-1.5.12.ebuild | 34 +++++++++++++++++++--------------- app-i18n/ibus/ibus-1.5.15.ebuild | 34 +++++++++++++++++++--------------- app-i18n/ibus/metadata.xml | 2 +- 3 files changed, 39 insertions(+), 31 deletions(-) diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild index c6fc3724541..4ec5bbf3ac6 100644 --- a/app-i18n/ibus/ibus-1.5.12.ebuild +++ b/app-i18n/ibus/ibus-1.5.12.ebuild @@ -14,14 +14,14 @@ 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="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X" +IUSE="deprecated gconf +gtk +gtk2 +introspection nls +python test vala wayland +X" REQUIRED_USE="deprecated? ( python ) python? ( ${PYTHON_REQUIRED_USE} - || ( deprecated gtk3 ) - gtk3? ( introspection ) + || ( deprecated gtk ) + gtk? ( introspection ) ) - test? ( || ( gtk gtk3 ) ) + test? ( gtk ) vala? ( introspection )" CDEPEND="app-text/iso-codes @@ -31,8 +31,12 @@ CDEPEND="app-text/iso-codes sys-apps/dbus[X?] x11-libs/libnotify gconf? ( gnome-base/gconf:2 ) - gtk? ( x11-libs/gtk+:2 ) - gtk3? ( x11-libs/gtk+:3 ) + gtk? ( + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libXi + gtk2? ( x11-libs/gtk+:2 ) + ) introspection? ( dev-libs/gobject-introspection ) nls? ( virtual/libintl ) python? ( @@ -56,7 +60,7 @@ RDEPEND="${CDEPEND} dev-python/dbus-python[${PYTHON_USEDEP}] dev-python/pygtk:2[${PYTHON_USEDEP}] ) - gtk3? ( + gtk? ( x11-libs/gtk+:3[introspection] ) )" @@ -95,7 +99,7 @@ src_configure() { if use python; then python_conf+=( $(use_enable deprecated python-library) - $(use_enable gtk3 setup) + $(use_enable gtk setup) --with-python=${EPYTHON} ) else @@ -104,9 +108,9 @@ src_configure() { econf \ $(use_enable gconf) \ - $(use_enable gtk gtk2) \ - $(use_enable gtk3 ui) \ - $(use_enable gtk3) \ + $(use_enable gtk gtk3) \ + $(use_enable gtk ui) \ + $(use_enable gtk2) \ $(use_enable introspection) \ $(use_enable nls) \ $(use_enable test tests) \ @@ -141,15 +145,15 @@ pkg_preinst() { pkg_postinst() { use gconf && gnome2_gconf_install - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 + use gtk && gnome2_query_immodules_gtk3 + use gtk2 && gnome2_query_immodules_gtk2 gnome2_icon_cache_update gnome2_schemas_update } pkg_postrm() { - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 + use gtk && gnome2_query_immodules_gtk3 + use gtk2 && gnome2_query_immodules_gtk2 gnome2_icon_cache_update gnome2_schemas_update } diff --git a/app-i18n/ibus/ibus-1.5.15.ebuild b/app-i18n/ibus/ibus-1.5.15.ebuild index 4cf925979ad..4537bd35350 100644 --- a/app-i18n/ibus/ibus-1.5.15.ebuild +++ b/app-i18n/ibus/ibus-1.5.15.ebuild @@ -14,14 +14,14 @@ 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="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X" +IUSE="deprecated gconf +gtk +gtk2 +introspection nls +python test vala wayland +X" REQUIRED_USE="deprecated? ( python ) python? ( ${PYTHON_REQUIRED_USE} - || ( deprecated gtk3 ) - gtk3? ( introspection ) + || ( deprecated gtk ) + gtk? ( introspection ) ) - test? ( || ( gtk gtk3 ) ) + test? ( gtk ) vala? ( introspection )" CDEPEND="app-text/iso-codes @@ -31,8 +31,12 @@ CDEPEND="app-text/iso-codes sys-apps/dbus[X?] x11-libs/libnotify gconf? ( gnome-base/gconf:2 ) - gtk? ( x11-libs/gtk+:2 ) - gtk3? ( x11-libs/gtk+:3 ) + gtk? ( + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libXi + gtk2? ( x11-libs/gtk+:2 ) + ) introspection? ( dev-libs/gobject-introspection ) nls? ( virtual/libintl ) python? ( @@ -56,7 +60,7 @@ RDEPEND="${CDEPEND} dev-python/dbus-python[${PYTHON_USEDEP}] dev-python/pygtk:2[${PYTHON_USEDEP}] ) - gtk3? ( + gtk? ( x11-libs/gtk+:3[introspection] ) )" @@ -91,7 +95,7 @@ src_configure() { if use python; then python_conf+=( $(use_enable deprecated python-library) - $(use_enable gtk3 setup) + $(use_enable gtk setup) --with-python=${EPYTHON} ) else @@ -100,9 +104,9 @@ src_configure() { econf \ $(use_enable gconf) \ - $(use_enable gtk gtk2) \ - $(use_enable gtk3 ui) \ - $(use_enable gtk3) \ + $(use_enable gtk gtk3) \ + $(use_enable gtk ui) \ + $(use_enable gtk2) \ $(use_enable introspection) \ $(use_enable nls) \ $(use_enable test tests) \ @@ -138,15 +142,15 @@ pkg_preinst() { pkg_postinst() { use gconf && gnome2_gconf_install - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 + use gtk && gnome2_query_immodules_gtk3 + use gtk2 && gnome2_query_immodules_gtk2 gnome2_icon_cache_update gnome2_schemas_update } pkg_postrm() { - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 + use gtk && gnome2_query_immodules_gtk3 + use gtk2 && gnome2_query_immodules_gtk2 gnome2_icon_cache_update gnome2_schemas_update } diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml index 9fc8f486d7d..889bd876ab3 100644 --- a/app-i18n/ibus/metadata.xml +++ b/app-i18n/ibus/metadata.xml @@ -13,7 +13,7 @@ <use> <flag name="deprecated">Install the deprecated iBus Python library</flag> <flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag> - <flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag> + <flag name="gtk2">Enable support for <pkg>x11-libs/gtk+</pkg>:2</flag> </use> <upstream> <remote-id type="cpe">cpe:/a:ibus_project:ibus</remote-id>
