Update ibus to 1.5.6.

* data/dconf: Don't run "dconf update" if $(DESTDIR) is set
* Support python3 [1]
* Fix to show Property Panel when the mode is auto hide.
* Do not let property panel follow cursor when it's always shown.
* Fix a build error of Gdk.EventKey with vala 0.23.2
* Use XKB layout string instead of ibus-keyboard icon on panel.

4 files changed, 13 insertions, 12 deletions

diff --git a/inputmethod/ibus/Makefile b/inputmethod/ibus/Makefile
index 42bca9e0c0a..b08c3938cc2 100644
--- a/inputmethod/ibus/Makefile
+++ b/inputmethod/ibus/Makefile
@@ -1,10 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2014/04/06 01:49:12 obache Exp $
-
-PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 1.5.4
+# $NetBSD: Makefile,v 1.37 2014/04/06 02:48:03 obache Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=	1
 COMMENT=	Intelligent Input Bus
 
 DEPENDS+=	${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
@@ -26,6 +23,7 @@ CONFIGURE_ARGS+=	--enable-gtk2
 CONFIGURE_ARGS+=	--enable-gtk3
 CONFIGURE_ARGS+=	--enable-surrounding-text
 CONFIGURE_ARGS+=	--enable-introspection=yes
+CONFIGURE_ARGS+=	--with-python=${PYTHONBIN}
 
 SUBST_CLASSES+=		dbus
 SUBST_STAGE.dbus=	post-configure
@@ -68,4 +66,5 @@ GTK3_IMMODULES=	yes
 .include "../../x11/gtk3/modules.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/ibus/Makefile.common b/inputmethod/ibus/Makefile.common
index 1400a24fe5c..a6cd988f8e0 100644
--- a/inputmethod/ibus/Makefile.common
+++ b/inputmethod/ibus/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.2 2014/01/16 11:04:26 obache Exp $
+# $NetBSD: Makefile.common,v 1.3 2014/04/06 02:48:03 obache Exp $
 #
 # used by inputmethod/ibus/Makefile
 # used by inputmethod/ibus-python/Makefile
 
-DISTNAME=	ibus-1.5.5
+DISTNAME=	ibus-1.5.6
 CATEGORIES=	inputmethod
-MASTER_SITES=	http://ibus.googlecode.com/files/
+MASTER_SITES=	https://github.com/ibus/ibus/releases/download/${PKGVERSION_NOREV}/
 
 DISTINFO_FILE=	${.CURDIR}/../../inputmethod/ibus/distinfo
 PATCHDIR=	${.CURDIR}/../../inputmethod/ibus/patches
diff --git a/inputmethod/ibus/PLIST b/inputmethod/ibus/PLIST
index 03d32a15d7b..1ebbccf4bfb 100644
--- a/inputmethod/ibus/PLIST
+++ b/inputmethod/ibus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2014/01/16 11:04:26 obache Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/04/06 02:48:03 obache Exp $
 bin/ibus
 bin/ibus-daemon
 bin/ibus-setup
@@ -166,6 +166,7 @@ share/locale/eu/LC_MESSAGES/ibus10.mo
 share/locale/fa/LC_MESSAGES/ibus10.mo
 share/locale/fr/LC_MESSAGES/ibus10.mo
 share/locale/gu/LC_MESSAGES/ibus10.mo
+share/locale/he/LC_MESSAGES/ibus10.mo
 share/locale/hi/LC_MESSAGES/ibus10.mo
 share/locale/hu/LC_MESSAGES/ibus10.mo
 share/locale/ia/LC_MESSAGES/ibus10.mo
@@ -189,6 +190,7 @@ share/locale/ta/LC_MESSAGES/ibus10.mo
 share/locale/te/LC_MESSAGES/ibus10.mo
 share/locale/tg/LC_MESSAGES/ibus10.mo
 share/locale/uk/LC_MESSAGES/ibus10.mo
+share/locale/ur/LC_MESSAGES/ibus10.mo
 share/locale/vi/LC_MESSAGES/ibus10.mo
 share/locale/zh_CN/LC_MESSAGES/ibus10.mo
 share/locale/zh_HK/LC_MESSAGES/ibus10.mo
diff --git a/inputmethod/ibus/distinfo b/inputmethod/ibus/distinfo
index e702f22adcd..e49d9bf6073 100644
--- a/inputmethod/ibus/distinfo
+++ b/inputmethod/ibus/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2014/01/16 11:04:26 obache Exp $
+$NetBSD: distinfo,v 1.11 2014/04/06 02:48:03 obache Exp $
 
-SHA1 (ibus-1.5.5.tar.gz) = 5671fe504e65aaf396c1d779032d7526c161b64b
-RMD160 (ibus-1.5.5.tar.gz) = d3941dd044886e3946da92b4576b94581a3f8797
-Size (ibus-1.5.5.tar.gz) = 2063794 bytes
+SHA1 (ibus-1.5.6.tar.gz) = c870ea4668fa9512b5f1cbc98eb8699318115869
+RMD160 (ibus-1.5.6.tar.gz) = 43377a69ec91c83f662c57d8b0ba8200d9b47457
+Size (ibus-1.5.6.tar.gz) = 2061466 bytes
 SHA1 (patch-client_gtk2_ibusimcontext.c) = 31e72d06884858476097f04591004ce46b6074c1
 SHA1 (patch-client_gtk3_ibusimcontext.c) = 543192191d14d61ae3e193de6ffda7b099969a1a