diff options
| author |   Naohiro Aota <naota@gentoo.org> | 2013-11-26 15:20:33 +0000 |
|---|---|---|
| committer | Naohiro Aota <naota@gentoo.org> | 2013-11-26 15:20:33 +0000 |
| commit | 122bb9674576bd30f863301187e3bd504c50c1f5 (patch) | |
| tree | 1e20090e87f2387bfa7c502b31d1991c157489af /app-i18n/ibus | |
| parent | add 0.7.0 release (diff) | |
| download | gentoo-2-122bb9674576bd30f863301187e3bd504c50c1f5.tar.gz gentoo-2-122bb9674576bd30f863301187e3bd504c50c1f5.tar.bz2 gentoo-2-122bb9674576bd30f863301187e3bd504c50c1f5.zip | |
Force USE=dconf. #490646
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F8551514)
Diffstat (limited to 'app-i18n/ibus')
| -rw-r--r-- | app-i18n/ibus/ChangeLog | 5 | ||||
| -rw-r--r-- | app-i18n/ibus/ibus-1.5.4-r1.ebuild | 23 |
2 files changed, 11 insertions, 17 deletions
diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog index e8ec2ab25213..0751194a3f97 100644 --- a/app-i18n/ibus/ChangeLog +++ b/app-i18n/ibus/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-i18n/ibus # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.134 2013/11/17 06:40:29 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.135 2013/11/26 15:20:33 naota Exp $ + + 26 Nov 2013; Naohiro Aota <naota@gentoo.org> ibus-1.5.4-r1.ebuild: + Force USE=dconf. #490646 *ibus-1.5.4-r1 (17 Nov 2013) diff --git a/app-i18n/ibus/ibus-1.5.4-r1.ebuild b/app-i18n/ibus/ibus-1.5.4-r1.ebuild index c0722368dacf..136fb07fe265 100644 --- a/app-i18n/ibus/ibus-1.5.4-r1.ebuild +++ b/app-i18n/ibus/ibus-1.5.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.4-r1.ebuild,v 1.1 2013/11/17 06:40:29 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.4-r1.ebuild,v 1.2 2013/11/26 15:20:33 naota Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) @@ -18,7 +18,7 @@ SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="dconf deprecated +gconf gtk +gtk3 +introspection nls +python test vala wayland +X" +IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X" REQUIRED_USE="|| ( gtk gtk3 X ) deprecated? ( python ) python? ( @@ -30,8 +30,8 @@ COMMON_DEPEND=" gnome-base/librsvg:2 sys-apps/dbus[X?] app-text/iso-codes + >=gnome-base/dconf-0.13.4 - dconf? ( >=gnome-base/dconf-0.13.4 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) @@ -93,7 +93,7 @@ src_configure() { python_conf="--disable-python-library --disable-setup" fi econf \ - $(use_enable dconf) \ + --enable-dconf \ $(use_enable introspection) \ $(use_enable gconf) \ $(use_enable gtk gtk2) \ @@ -132,20 +132,15 @@ src_install() { pkg_preinst() { use gconf && gnome2_gconf_savelist - use gconf && gnome2_schemas_savelist + gnome2_schemas_savelist gnome2_icon_savelist } pkg_postinst() { - if use dconf; then - ebegin "Updating dconf system databases" - dconf update - eend $? - fi use gconf && gnome2_gconf_install - use gconf && gnome2_schemas_update use gtk && gnome2_query_immodules_gtk2 use gtk3 && gnome2_query_immodules_gtk3 + gnome2_schemas_update gnome2_icon_cache_update elog "To use ibus, you should:" @@ -167,13 +162,9 @@ pkg_postinst() { } pkg_postrm() { - if use dconf; then - ebegin "Updating dconf system databases" - dconf update - eend $? - fi use gtk && gnome2_query_immodules_gtk2 use gtk3 && gnome2_query_immodules_gtk3 use gconf && gnome2_schemas_update + gnome2_schemas_savelist gnome2_icon_cache_update } |