Update ibus to 1.5.5.

* Add french layout variant oss to simple engine
* Replace datadir/man with mandir.
* Implement lookup-table-orientation in ibus-ui-gtk3.
* Always save the content-type cache for gnome-shell password.
* Update en-us compose table and add locale tables for xkb engines.
* Wayland: Fix Small typo
* Fix gir annotations.
* simple.xml.in: add Slovak qwerty layout variant
* Delete the up/down button message on ibus-setup.
* Fix candidate panel not to be out of screen.
* Update translations.
* Remove -Werror in autogen.sh since the build still have errors.
* Add Property Panel to show IME properties.

7 files changed, 9 insertions, 58 deletions

diff --git a/inputmethod/ibus/Makefile b/inputmethod/ibus/Makefile
index 65dffa8b4c2..e1f14cb7e25 100644
--- a/inputmethod/ibus/Makefile
+++ b/inputmethod/ibus/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2013/12/08 07:34:21 obache Exp $
+# $NetBSD: Makefile,v 1.34 2014/01/16 11:04:26 obache Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=	1
-
 COMMENT=	Intelligent Input Bus
 
 DEPENDS+=	${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
diff --git a/inputmethod/ibus/Makefile.common b/inputmethod/ibus/Makefile.common
index 0d8a5f7f2de..1400a24fe5c 100644
--- a/inputmethod/ibus/Makefile.common
+++ b/inputmethod/ibus/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.1 2013/10/23 11:50:04 obache Exp $
+# $NetBSD: Makefile.common,v 1.2 2014/01/16 11:04:26 obache Exp $
 #
 # used by inputmethod/ibus/Makefile
 # used by inputmethod/ibus-python/Makefile
 
-DISTNAME=	ibus-1.5.4
+DISTNAME=	ibus-1.5.5
 CATEGORIES=	inputmethod
 MASTER_SITES=	http://ibus.googlecode.com/files/
 
diff --git a/inputmethod/ibus/PLIST b/inputmethod/ibus/PLIST
index 91941cd98db..03d32a15d7b 100644
--- a/inputmethod/ibus/PLIST
+++ b/inputmethod/ibus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2013/10/23 11:50:04 obache Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/01/16 11:04:26 obache Exp $
 bin/ibus
 bin/ibus-daemon
 bin/ibus-setup
@@ -154,6 +154,7 @@ share/icons/hicolor/scalable/apps/ibus.svg
 share/locale/ar/LC_MESSAGES/ibus10.mo
 share/locale/as/LC_MESSAGES/ibus10.mo
 share/locale/bg/LC_MESSAGES/ibus10.mo
+share/locale/bn/LC_MESSAGES/ibus10.mo
 share/locale/bn_IN/LC_MESSAGES/ibus10.mo
 share/locale/ca/LC_MESSAGES/ibus10.mo
 share/locale/da/LC_MESSAGES/ibus10.mo
diff --git a/inputmethod/ibus/distinfo b/inputmethod/ibus/distinfo
index aa71fdb5b5b..e702f22adcd 100644
--- a/inputmethod/ibus/distinfo
+++ b/inputmethod/ibus/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.9 2013/11/12 02:57:43 dholland Exp $
+$NetBSD: distinfo,v 1.10 2014/01/16 11:04:26 obache Exp $
 
-SHA1 (ibus-1.5.4.tar.gz) = 2ce4b4d728a4685fd77360d0097b0e568f920c7b
-RMD160 (ibus-1.5.4.tar.gz) = cba23cf9b3a76d4303b36f624627c971f0e2ee2d
-Size (ibus-1.5.4.tar.gz) = 2026656 bytes
-SHA1 (patch-bus_Makefile.in) = ff3e7bd794db625021474f00b6776a1ac13c30f7
+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 (patch-client_gtk2_ibusimcontext.c) = 31e72d06884858476097f04591004ce46b6074c1
 SHA1 (patch-client_gtk3_ibusimcontext.c) = 543192191d14d61ae3e193de6ffda7b099969a1a
-SHA1 (patch-setup_Makefile.in) = ba7267525b5410d5081c33cff0e1c8f28b5ad4b2
-SHA1 (patch-tools_Makefile.in) = 0a9275a58e6819b569706dfb58ad5a5f4a976d62
diff --git a/inputmethod/ibus/patches/patch-bus_Makefile.in b/inputmethod/ibus/patches/patch-bus_Makefile.in
deleted file mode 100644
index 67ada2c81ae..00000000000
--- a/inputmethod/ibus/patches/patch-bus_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bus_Makefile.in,v 1.1 2013/10/23 11:52:50 obache Exp $
-
-* honor $(mandir)
-
---- bus/Makefile.in.orig	2013-09-20 03:17:23.000000000 +0000
-+++ bus/Makefile.in
-@@ -811,7 +811,7 @@ CLEANFILES = \
- man_one_in_files = ibus-daemon.1.in
- man_one_files = $(man_one_in_files:.1.in=.1)
- man_one_DATA = $(man_one_files:.1=.1.gz) 
--man_onedir = $(datadir)/man/man1
-+man_onedir = $(mandir)/man1
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
diff --git a/inputmethod/ibus/patches/patch-setup_Makefile.in b/inputmethod/ibus/patches/patch-setup_Makefile.in
deleted file mode 100644
index 15052259977..00000000000
--- a/inputmethod/ibus/patches/patch-setup_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-setup_Makefile.in,v 1.1 2013/10/23 11:52:50 obache Exp $
-
-* honor $(mandir)
-
---- setup/Makefile.in.orig	2013-09-20 03:17:27.000000000 +0000
-+++ setup/Makefile.in
-@@ -441,7 +441,7 @@ desktopdir = $(datadir)/applications
- man_one_in_files = ibus-setup.1.in
- man_one_files = $(man_one_in_files:.1.in=.1)
- man_one_DATA = $(man_one_files:.1=.1.gz) 
--man_onedir = $(datadir)/man/man1
-+man_onedir = $(mandir)/man1
- CLEANFILES = \
- 	$(man_one_DATA) \
- 	$(man_one_files) \
diff --git a/inputmethod/ibus/patches/patch-tools_Makefile.in b/inputmethod/ibus/patches/patch-tools_Makefile.in
deleted file mode 100644
index b73c48b268d..00000000000
--- a/inputmethod/ibus/patches/patch-tools_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-tools_Makefile.in,v 1.1 2013/10/23 11:52:50 obache Exp $
-
-* honor $(mandir)
-
---- tools/Makefile.in.orig	2013-09-20 03:17:27.000000000 +0000
-+++ tools/Makefile.in
-@@ -526,7 +526,7 @@ bash_completiondir = @datadir@/bash-comp
- man_one_in_files = ibus.1.in
- man_one_files = $(man_one_in_files:.1.in=.1)
- man_one_DATA = $(man_one_files:.1=.1.gz) 
--man_onedir = $(datadir)/man/man1
-+man_onedir = $(mandir)/man1
- EXTRA_DIST = \
- 	$(man_one_in_files) \
- 	ibus.bash \