Version bumped. Added dconf local USE flag. Removed old version.

(Portage version: 2.1.10.18/cvs/Linux x86_64)

3 files changed, 33 insertions, 14 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 957fc2a10d36..27e6086a99bc 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.90 2011/09/05 08:41:20 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.91 2011/09/23 16:10:26 matsuu Exp $
+
+*ibus-1.4.0 (23 Sep 2011)
+
+  23 Sep 2011; MATSUU Takuto <matsuu@gentoo.org> -ibus-1.3.9-r1.ebuild,
+  +ibus-1.4.0.ebuild, metadata.xml:
+  Version bumped. Added dconf local USE flag. Removed old version.
 
   05 Sep 2011; Naohiro Aota <naota@gentoo.org> -ibus-1.3.99.20110419-r1.ebuild,
   -ibus-1.3.99.20110419-r2.ebuild:
diff --git a/app-i18n/ibus/ibus-1.3.9-r1.ebuild b/app-i18n/ibus/ibus-1.4.0.ebuild
index 203ef63e6af5..5b94f2a5806e 100644
--- a/app-i18n/ibus/ibus-1.3.9-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.9-r1.ebuild,v 1.6 2011/09/05 08:38:15 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.0.ebuild,v 1.1 2011/09/23 16:10:26 matsuu Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -13,18 +13,17 @@ SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc +gconf gtk introspection nls +python vala X"
+IUSE="dconf doc +gconf gtk gtk3 introspection nls +python vala X"
 
-RDEPEND=">=dev-libs/glib-2.18:2
+RDEPEND=">=dev-libs/glib-2.26:2
+	dconf? ( >=gnome-base/dconf-0.7.5 )
 	gconf? ( >=gnome-base/gconf-2.12:2 )
 	gnome-base/librsvg:2
-	sys-apps/dbus
+	sys-apps/dbus[X?]
 	app-text/iso-codes
-	gtk? (
-		x11-libs/gtk+:2
-	)
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
 	X? (
-		sys-apps/dbus[X]
 		x11-libs/libX11
 		x11-libs/gtk+:2
 	)
@@ -53,8 +52,10 @@ RESTRICT="test"
 
 update_gtk_immodules() {
 	local GTK2_CONFDIR="/etc/gtk-2.0"
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="${GTK2_CONFDIR}/${CHOST}"
+	# bug #366889
+	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
+		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
+	fi
 	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
 
 	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
@@ -62,9 +63,15 @@ update_gtk_immodules() {
 	fi
 }
 
+update_gtk3_immodules() {
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
+	fi
+}
+
 pkg_setup() {
 	# bug #342903
-	confutils_require_any X gtk
+	confutils_require_any X gtk gtk3
 	if use python; then
 		python_set_active_version 2
 		python_pkg_setup
@@ -80,22 +87,25 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		$(use_enable dconf) \
 		$(use_enable doc gtk-doc) \
 		$(use_enable doc gtk-doc-html) \
 		$(use_enable introspection) \
 		$(use_enable gconf) \
 		$(use_enable gtk gtk2) \
 		$(use_enable gtk xim) \
+		$(use_enable gtk3) \
 		$(use_enable nls) \
 		$(use_enable python) \
 		$(use_enable vala) \
-		$(use_enable X xim)
-		#$(use_enable gtk gtk3) \
+		$(use_enable X xim) || die
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
 
+	find "${ED}" -name '*.la' -type f -delete || die
+
 	insinto /etc/X11/xinit/xinput.d
 	newins xinput-ibus ibus.conf || die
 
@@ -113,6 +123,7 @@ pkg_preinst() {
 pkg_postinst() {
 	use gconf && gnome2_gconf_install
 	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
 	use python && python_mod_optimize /usr/share/${PN}
 	gnome2_icon_cache_update
 
@@ -136,6 +147,7 @@ pkg_postinst() {
 
 pkg_postrm() {
 	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
 	use python && python_mod_cleanup /usr/share/${PN}
 	gnome2_icon_cache_update
 }
diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml
index 9984e3072cc8..a8aa1809c443 100644
--- a/app-i18n/ibus/metadata.xml
+++ b/app-i18n/ibus/metadata.xml
@@ -8,6 +8,7 @@ full featured and user friendly input method user interface. It also may help
 developers to develop input method easily.
 </longdescription>
 <use>
+  <flag name='dconf'>Enable support for <pkg>gnome-base/dconf</pkg></flag>
   <flag name='gconf'>Enable support for <pkg>gnome-base/gconf</pkg></flag>
   <flag name='gtk3'>Enable support for gtk+3</flag>
   <flag name='vala'>Enable support for <pkg>dev-lang/vala</pkg></flag>