Update eekboard to 1.0.5.

many fixes and improvement, API bumped from 0.1 to 0.90.

4 files changed, 179 insertions, 64 deletions

diff --git a/x11/eekboard/Makefile b/x11/eekboard/Makefile
index 742bf2f5711..c8e73b74554 100644
--- a/x11/eekboard/Makefile
+++ b/x11/eekboard/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2012/03/03 00:11:55 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2012/04/22 13:54:06 obache Exp $
 #
 
-DISTNAME=	eekboard-0.0.7
-PKGREVISION=	5
+DISTNAME=	eekboard-1.0.5
 CATEGORIES=	x11
 MASTER_SITES=	http://cloud.github.com/downloads/ueno/eekboard/
 
@@ -18,24 +17,49 @@ USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake pkg-config intltool msgfmt msgmerge xgettext
 
-PKGCONFIG_OVERRIDE+=	eek/eek-xkl-0.1.pc.in
-PKGCONFIG_OVERRIDE+=	eek/eek-0.1.pc.in
-PKGCONFIG_OVERRIDE+=	eek/eek-xkb-0.1.pc.in
-PKGCONFIG_OVERRIDE+=	eek/eek-clutter-0.1.pc.in
-PKGCONFIG_OVERRIDE+=	eek/eek-gtk-0.1.pc.in
+PKGCONFIG_OVERRIDE+=	eek/eek-0.90.pc.in
+PKGCONFIG_OVERRIDE+=	eek/eek-clutter-0.90.pc.in
+PKGCONFIG_OVERRIDE+=	eek/eek-gtk-0.90.pc.in
+PKGCONFIG_OVERRIDE+=	eek/eek-xkb-0.90.pc.in
+PKGCONFIG_OVERRIDE+=	eek/eek-xkl-0.90.pc.in
+PKGCONFIG_OVERRIDE+=	eekboard/eekboard-0.90.pc.in
+
+CONFIGURE_ARGS+=	--with-gtk=2.0
+# missing introspection for GTK2
+CONFIGURE_ARGS+=	--enable-introspection=no
+CONFIGURE_ARGS+=	--enable-vala=no
+# require clutter-gtk-1.0
+CONFIGURE_ARGS+=	--enable-clutter-gtk=no
+# require libcanberra-gtk3
+CONFIGURE_ARGS+=	--enable-libcanberra=no
+
+BUILD_DEFS+=		PKG_SYSCONFBASE
+
+EXAMPLESDIR=		${PREFIX}/share/examples/eekboard
+
+INSTALL_MAKE_FLAGS+=	sysconfdir=${EXAMPLESDIR}
+
+MAKE_DIRS+=		${PKG_SYSCONFBASE}/xdg/autostart
+CONF_FILES+=		${EXAMPLESDIR}/xdg/autostart/eekboard-autostart.desktop \
+			${PKG_SYSCONFBASE}/xdg/autostart/eekboard-autostart.desktop
 
 TEST_TARGET=		check
 
 .include "options.mk"
 
-.include "../../devel/GConf/buildlink3.mk"
-.include "../../devel/at-spi/buildlink3.mk"
+.include "../../devel/glib2/schemas.mk"
+
+.include "../../devel/at-spi2-core/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../inputmethod/ibus/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../textproc/libcroco/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libfakekey/buildlink3.mk"
 .include "../../x11/libxklavier/buildlink3.mk"
+PY_PATCHPLIST=	yes
+.include "../../lang/python/extension.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/eekboard/PLIST b/x11/eekboard/PLIST
index 0149b6a974e..c77b08aee22 100644
--- a/x11/eekboard/PLIST
+++ b/x11/eekboard/PLIST
@@ -1,35 +1,117 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/08/30 11:47:34 obache Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/04/22 13:54:06 obache Exp $
 bin/eekboard
-${PLIST.clutter}include/eek-0.1/eek/eek-clutter-drawing-context.h
-${PLIST.clutter}include/eek-0.1/eek/eek-clutter-key.h
-${PLIST.clutter}include/eek-0.1/eek/eek-clutter-keyboard.h
-${PLIST.clutter}include/eek-0.1/eek/eek-clutter-section.h
-${PLIST.clutter}include/eek-0.1/eek/eek-clutter.h
-include/eek-0.1/eek/eek-container.h
-include/eek-0.1/eek/eek-element.h
-include/eek-0.1/eek/eek-gtk-keyboard.h
-include/eek-0.1/eek/eek-gtk.h
-include/eek-0.1/eek/eek-key.h
-include/eek-0.1/eek/eek-keyboard.h
-include/eek-0.1/eek/eek-keysym.h
-include/eek-0.1/eek/eek-layout.h
-include/eek-0.1/eek/eek-section.h
-include/eek-0.1/eek/eek-types.h
-include/eek-0.1/eek/eek-xkb-layout.h
-include/eek-0.1/eek/eek-xkb.h
-include/eek-0.1/eek/eek-xkl-layout.h
-include/eek-0.1/eek/eek-xkl.h
-include/eek-0.1/eek/eek.h
+bin/eekboard-server
+bin/eekxml
+${PLIST.clutter}include/eek-0.90/eek/eek-clutter-keyboard.h
+${PLIST.clutter}include/eek-0.90/eek/eek-clutter.h
+include/eek-0.90/eek/eek-container.h
+include/eek-0.90/eek/eek-element.h
+include/eek-0.90/eek/eek-enumtypes.h
+include/eek-0.90/eek/eek-gtk-keyboard.h
+include/eek-0.90/eek/eek-gtk.h
+include/eek-0.90/eek/eek-key.h
+include/eek-0.90/eek/eek-keyboard.h
+include/eek-0.90/eek/eek-keysym.h
+include/eek-0.90/eek/eek-layout.h
+include/eek-0.90/eek/eek-section.h
+include/eek-0.90/eek/eek-serializable.h
+include/eek-0.90/eek/eek-symbol-matrix.h
+include/eek-0.90/eek/eek-symbol.h
+include/eek-0.90/eek/eek-text.h
+include/eek-0.90/eek/eek-theme.h
+include/eek-0.90/eek/eek-types.h
+include/eek-0.90/eek/eek-xkb-layout.h
+include/eek-0.90/eek/eek-xkb.h
+include/eek-0.90/eek/eek-xkl-layout.h
+include/eek-0.90/eek/eek-xkl.h
+include/eek-0.90/eek/eek-xml-layout.h
+include/eek-0.90/eek/eek-xml.h
+include/eek-0.90/eek/eek.h
+include/eekboard-0.90/eekboard/eekboard-client.h
+include/eekboard-0.90/eekboard/eekboard-context-service.h
+include/eekboard-0.90/eekboard/eekboard-context.h
+include/eekboard-0.90/eekboard/eekboard-service.h
+include/eekboard-0.90/eekboard/eekboard-xklutil.h
 ${PLIST.clutter}lib/libeek-clutter.la
 lib/libeek-gtk.la
 lib/libeek-xkb.la
 lib/libeek-xkl.la
 lib/libeek.la
-lib/pkgconfig/eek-0.1.pc
-lib/pkgconfig/eek-clutter-0.1.pc
-lib/pkgconfig/eek-gtk-0.1.pc
-lib/pkgconfig/eek-xkb-0.1.pc
-lib/pkgconfig/eek-xkl-0.1.pc
+lib/libeekboard.la
+lib/pkgconfig/eek-0.90.pc
+${PLIST.clutter}lib/pkgconfig/eek-clutter-0.90.pc
+lib/pkgconfig/eek-gtk-0.90.pc
+lib/pkgconfig/eek-xkb-0.90.pc
+lib/pkgconfig/eek-xkl-0.90.pc
+lib/pkgconfig/eekboard-0.90.pc
+${PYSITELIB}/eekboard/__init__.py
+${PYSITELIB}/eekboard/__init__.pyc
+${PYSITELIB}/eekboard/__init__.pyo
+${PYSITELIB}/eekboard/client.py
+${PYSITELIB}/eekboard/client.pyc
+${PYSITELIB}/eekboard/client.pyo
+${PYSITELIB}/eekboard/context.py
+${PYSITELIB}/eekboard/context.pyc
+${PYSITELIB}/eekboard/context.pyo
+${PYSITELIB}/eekboard/keysym.py
+${PYSITELIB}/eekboard/keysym.pyc
+${PYSITELIB}/eekboard/keysym.pyo
+${PYSITELIB}/eekboard/serializable.py
+${PYSITELIB}/eekboard/serializable.pyc
+${PYSITELIB}/eekboard/serializable.pyo
+${PYSITELIB}/eekboard/symbol.py
+${PYSITELIB}/eekboard/symbol.pyc
+${PYSITELIB}/eekboard/symbol.pyo
+${PYSITELIB}/eekboard/text.py
+${PYSITELIB}/eekboard/text.pyc
+${PYSITELIB}/eekboard/text.pyo
+share/applications/eekboard.desktop
+share/dbus-1/services/eekboard-server.service
+share/eekboard/keyboards/ar.xml
+share/eekboard/keyboards/as-inscript.xml
+share/eekboard/keyboards/be.xml
+share/eekboard/keyboards/bn-inscript.xml
+share/eekboard/keyboards/fa.xml
+share/eekboard/keyboards/gu-inscript.xml
+share/eekboard/keyboards/he.xml
+share/eekboard/keyboards/hi-inscript.xml
+share/eekboard/keyboards/jp-kana.xml
+share/eekboard/keyboards/kk.xml
+share/eekboard/keyboards/kn-inscript.xml
+share/eekboard/keyboards/ks-inscript.xml
+share/eekboard/keyboards/ks.xml
+share/eekboard/keyboards/mai-inscript.xml
+share/eekboard/keyboards/ml-inscript.xml
+share/eekboard/keyboards/mr-inscript.xml
+share/eekboard/keyboards/my.xml
+share/eekboard/keyboards/or-inscript.xml
+share/eekboard/keyboards/pa-inscript.xml
+share/eekboard/keyboards/ru.xml
+share/eekboard/keyboards/sd-inscript.xml
+share/eekboard/keyboards/ta-inscript.xml
+share/eekboard/keyboards/te-inscript.xml
+share/eekboard/keyboards/th.xml
+share/eekboard/keyboards/ua.xml
+share/eekboard/keyboards/ug.xml
+share/eekboard/keyboards/us.xml
+share/eekboard/keyboards/zh-bopomofo.xml
+share/eekboard/preferences-dialog.ui
+share/eekboard/themes/default.css
+share/examples/eekboard/xdg/autostart/eekboard-autostart.desktop
+share/glib-2.0/schemas/org.fedorahosted.eekboard.gschema.xml
+share/gtk-doc/html/eek/EekContainer.html
+share/gtk-doc/html/eek/EekElement.html
+share/gtk-doc/html/eek/EekGtkKeyboard.html
+share/gtk-doc/html/eek/EekKey.html
+share/gtk-doc/html/eek/EekKeyboard.html
+share/gtk-doc/html/eek/EekKeysym.html
+share/gtk-doc/html/eek/EekLayout.html
+share/gtk-doc/html/eek/EekSection.html
+share/gtk-doc/html/eek/EekSymbol.html
+share/gtk-doc/html/eek/EekText.html
+share/gtk-doc/html/eek/EekXkbLayout.html
+share/gtk-doc/html/eek/EekXklLayout.html
+share/gtk-doc/html/eek/EekXmlLayout.html
 share/gtk-doc/html/eek/api-index-full.html
 share/gtk-doc/html/eek/apireference.html
 share/gtk-doc/html/eek/ch01.html
@@ -37,20 +119,13 @@ share/gtk-doc/html/eek/ch02.html
 share/gtk-doc/html/eek/ch03.html
 share/gtk-doc/html/eek/ch04.html
 share/gtk-doc/html/eek/ch05.html
+share/gtk-doc/html/eek/ch06.html
 share/gtk-doc/html/eek/eek-EekClutterKeyboard.html
-share/gtk-doc/html/eek/eek-EekContainer.html
-share/gtk-doc/html/eek/eek-EekElement.html
-share/gtk-doc/html/eek/eek-EekGtkKeyboard.html
-share/gtk-doc/html/eek/eek-EekKey.html
-share/gtk-doc/html/eek/eek-EekKeyboard.html
-share/gtk-doc/html/eek/eek-EekLayout.html
-share/gtk-doc/html/eek/eek-EekSection.html
-share/gtk-doc/html/eek/eek-EekXkbLayout.html
-share/gtk-doc/html/eek/eek-EekXklLayout.html
-share/gtk-doc/html/eek/eek-eek-keysym.html
-share/gtk-doc/html/eek/eek-eek-types.html
+share/gtk-doc/html/eek/eek-EekSerializable.html
+share/gtk-doc/html/eek/eek-Library-Initialization.html
+share/gtk-doc/html/eek/eek-Miscellaneous-Types.html
+share/gtk-doc/html/eek/eek-XML-Conversion-Utilities.html
 share/gtk-doc/html/eek/eek-overview.html
-share/gtk-doc/html/eek/eek.devhelp
 share/gtk-doc/html/eek/eek.devhelp2
 share/gtk-doc/html/eek/home.png
 share/gtk-doc/html/eek/index.html
@@ -60,9 +135,27 @@ share/gtk-doc/html/eek/object-tree.html
 share/gtk-doc/html/eek/right.png
 share/gtk-doc/html/eek/style.css
 share/gtk-doc/html/eek/up.png
+share/gtk-doc/html/eekboard/EekboardClient.html
+share/gtk-doc/html/eekboard/EekboardContext.html
+share/gtk-doc/html/eekboard/EekboardContextService.html
+share/gtk-doc/html/eekboard/EekboardService.html
+share/gtk-doc/html/eekboard/api-index-full.html
+share/gtk-doc/html/eekboard/apireference.html
+share/gtk-doc/html/eekboard/ch01.html
+share/gtk-doc/html/eekboard/ch02.html
+share/gtk-doc/html/eekboard/eekboard.devhelp2
+share/gtk-doc/html/eekboard/home.png
+share/gtk-doc/html/eekboard/index.html
+share/gtk-doc/html/eekboard/index.sgml
+share/gtk-doc/html/eekboard/left.png
+share/gtk-doc/html/eekboard/object-tree.html
+share/gtk-doc/html/eekboard/right.png
+share/gtk-doc/html/eekboard/style.css
+share/gtk-doc/html/eekboard/up.png
+share/icons/hicolor/16x16/apps/eekboard.png
+share/icons/hicolor/22x22/apps/eekboard.png
+share/icons/hicolor/24x24/apps/eekboard.png
+share/icons/hicolor/32x32/apps/eekboard.png
+share/icons/hicolor/48x48/apps/eekboard.png
+share/icons/hicolor/scalable/apps/eekboard.svg
 share/locale/ja/LC_MESSAGES/eekboard.mo
-share/vala/vapi/eek-0.1.vapi
-share/vala/vapi/eek-clutter-0.1.vapi
-share/vala/vapi/eek-gtk-0.1.vapi
-share/vala/vapi/eek-xkb-0.1.vapi
-share/vala/vapi/eek-xkl-0.1.vapi
diff --git a/x11/eekboard/buildlink3.mk b/x11/eekboard/buildlink3.mk
index 1d2e4a2cdff..bbb0b1dd1f2 100644
--- a/x11/eekboard/buildlink3.mk
+++ b/x11/eekboard/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2012/03/03 00:11:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2012/04/22 13:54:06 obache Exp $
 #
 
 BUILDLINK_TREE+=	eekboard
@@ -6,8 +6,7 @@ BUILDLINK_TREE+=	eekboard
 .if !defined(EEKBOARD_BUILDLINK3_MK)
 EEKBOARD_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.eekboard+=	eekboard>=0.0.4
-BUILDLINK_ABI_DEPENDS.eekboard+=	eekboard>=0.0.7nb5
+BUILDLINK_API_DEPENDS.eekboard+=	eekboard>=1.0.5
 BUILDLINK_PKGSRCDIR.eekboard?=	../../x11/eekboard
 
 .include "../../mk/bsd.fast.prefs.mk"
@@ -17,14 +16,13 @@ pkgbase := eekboard
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
 .if !empty(PKG_BUILD_OPTIONS.eekboard:Mclutter)
 .include "../../graphics/clutter/buildlink3.mk"
 .include "../../graphics/clutter-gtk/buildlink3.mk"
 .endif
+.include "../../textproc/libcroco/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libxklavier/buildlink3.mk"
-#.include "../../x11/libfakekey/buildlink3.mk"
 .endif	# EEKBOARD_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-eekboard
diff --git a/x11/eekboard/distinfo b/x11/eekboard/distinfo
index 05e92099a3f..b7f6155b304 100644
--- a/x11/eekboard/distinfo
+++ b/x11/eekboard/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2010/12/23 06:18:27 obache Exp $
+$NetBSD: distinfo,v 1.4 2012/04/22 13:54:06 obache Exp $
 
-SHA1 (eekboard-0.0.7.tar.gz) = e6c3c3385e2a91e5b1501ea92b8f2afd8474248d
-RMD160 (eekboard-0.0.7.tar.gz) = b9fd239e3951dd73178134d55e0e62b0c4f16c19
-Size (eekboard-0.0.7.tar.gz) = 501429 bytes
+SHA1 (eekboard-1.0.5.tar.gz) = c62e290cffb12d4a672e4eddd0ab186871f40ca9
+RMD160 (eekboard-1.0.5.tar.gz) = 7922449b76e34109b9abe3363e361eaa85e43b3f
+Size (eekboard-1.0.5.tar.gz) = 968506 bytes