Update eekboard to 1.0.8.

* switch to use gtk3
* add introspection support

5 files changed, 88 insertions, 103 deletions

diff --git a/x11/eekboard/Makefile b/x11/eekboard/Makefile
index b1dd2521e52..4cefcd65a26 100644
--- a/x11/eekboard/Makefile
+++ b/x11/eekboard/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2013/10/10 14:41:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.27 2013/10/23 12:27:26 obache Exp $
 #
 
-DISTNAME=	eekboard-1.0.5
-PKGREVISION=	12
+DISTNAME=	eekboard-1.0.8
 CATEGORIES=	x11
 MASTER_SITES=	http://cloud.github.com/downloads/ueno/eekboard/
 
@@ -17,21 +16,10 @@ USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake pkg-config intltool msgfmt msgmerge xgettext
 
 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
@@ -53,11 +41,7 @@ TEST_TARGET=		check
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../inputmethod/ibus/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../textproc/libcroco/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libxklavier/buildlink3.mk"
-PY_PATCHPLIST=	yes
-.include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/eekboard/PLIST b/x11/eekboard/PLIST
index c77b08aee22..94326a79cd0 100644
--- a/x11/eekboard/PLIST
+++ b/x11/eekboard/PLIST
@@ -1,9 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/22 13:54:06 obache Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/10/23 12:27:26 obache Exp $
 bin/eekboard
 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
@@ -32,72 +29,58 @@ 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
+${PLIST.introspection}lib/girepository-1.0/Eek-0.90.typelib
+${PLIST.introspection}lib/girepository-1.0/EekGtk-0.90.typelib
+${PLIST.introspection}lib/girepository-1.0/EekXkl-0.90.typelib
+${PLIST.introspection}lib/girepository-1.0/Eekboard-0.90.typelib
 lib/libeek-gtk.la
-lib/libeek-xkb.la
 lib/libeek-xkl.la
 lib/libeek.la
 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
+libexec/eekboard-setup
 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/keyboards/geometry/compact.xml
+share/eekboard/keyboards/keyboards.xml
+share/eekboard/keyboards/symbols/ar.xml
+share/eekboard/keyboards/symbols/as-inscript.xml
+share/eekboard/keyboards/symbols/be.xml
+share/eekboard/keyboards/symbols/bn-inscript.xml
+share/eekboard/keyboards/symbols/fa.xml
+share/eekboard/keyboards/symbols/gu-inscript.xml
+share/eekboard/keyboards/symbols/he.xml
+share/eekboard/keyboards/symbols/hi-inscript.xml
+share/eekboard/keyboards/symbols/ja-kana.xml
+share/eekboard/keyboards/symbols/kk.xml
+share/eekboard/keyboards/symbols/kn-inscript.xml
+share/eekboard/keyboards/symbols/ks-inscript.xml
+share/eekboard/keyboards/symbols/ks.xml
+share/eekboard/keyboards/symbols/mai-inscript.xml
+share/eekboard/keyboards/symbols/ml-inscript.xml
+share/eekboard/keyboards/symbols/mr-inscript.xml
+share/eekboard/keyboards/symbols/my.xml
+share/eekboard/keyboards/symbols/or-inscript.xml
+share/eekboard/keyboards/symbols/pa-inscript.xml
+share/eekboard/keyboards/symbols/ru.xml
+share/eekboard/keyboards/symbols/sd-inscript.xml
+share/eekboard/keyboards/symbols/ta-inscript.xml
+share/eekboard/keyboards/symbols/te-inscript.xml
+share/eekboard/keyboards/symbols/th.xml
+share/eekboard/keyboards/symbols/ua.xml
+share/eekboard/keyboards/symbols/ug.xml
+share/eekboard/keyboards/symbols/us.xml
+share/eekboard/keyboards/symbols/zh-bopomofo.xml
 share/eekboard/preferences-dialog.ui
 share/eekboard/themes/default.css
 share/examples/eekboard/xdg/autostart/eekboard-autostart.desktop
+${PLIST.introspection}share/gir-1.0/Eek-0.90.gir
+${PLIST.introspection}share/gir-1.0/EekGtk-0.90.gir
+${PLIST.introspection}share/gir-1.0/EekXkl-0.90.gir
+${PLIST.introspection}share/gir-1.0/Eekboard-0.90.gir
 share/glib-2.0/schemas/org.fedorahosted.eekboard.gschema.xml
 share/gtk-doc/html/eek/EekContainer.html
 share/gtk-doc/html/eek/EekElement.html
@@ -159,3 +142,9 @@ 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
+${PLIST.vala}share/vala/vapi/eek-0.90.deps
+${PLIST.vala}share/vala/vapi/eek-0.90.vapi
+${PLIST.vala}share/vala/vapi/eek-gtk-0.90.deps
+${PLIST.vala}share/vala/vapi/eek-gtk-0.90.vapi
+${PLIST.vala}share/vala/vapi/eek-xkl-0.90.deps
+${PLIST.vala}share/vala/vapi/eek-xkl-0.90.vapi
diff --git a/x11/eekboard/buildlink3.mk b/x11/eekboard/buildlink3.mk
index 57f8c5bb13a..cb19d10fb81 100644
--- a/x11/eekboard/buildlink3.mk
+++ b/x11/eekboard/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2013/10/10 14:41:46 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2013/10/23 12:27:26 obache Exp $
 #
 
 BUILDLINK_TREE+=	eekboard
@@ -6,23 +6,13 @@ BUILDLINK_TREE+=	eekboard
 .if !defined(EEKBOARD_BUILDLINK3_MK)
 EEKBOARD_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.eekboard+=	eekboard>=1.0.5
-BUILDLINK_ABI_DEPENDS.eekboard?=	eekboard>=1.0.5nb12
+BUILDLINK_API_DEPENDS.eekboard+=	eekboard>=1.0.6
 BUILDLINK_PKGSRCDIR.eekboard?=	../../x11/eekboard
 
-.include "../../mk/bsd.fast.prefs.mk"
-
-pkgbase := eekboard
-.include "../../mk/pkg-build-options.mk"
-
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/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/gtk3/buildlink3.mk"
 .include "../../x11/libxklavier/buildlink3.mk"
 .endif	# EEKBOARD_BUILDLINK3_MK
 
diff --git a/x11/eekboard/distinfo b/x11/eekboard/distinfo
index b7f6155b304..7c45ab3d887 100644
--- a/x11/eekboard/distinfo
+++ b/x11/eekboard/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2012/04/22 13:54:06 obache Exp $
+$NetBSD: distinfo,v 1.5 2013/10/23 12:27:26 obache Exp $
 
-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
+SHA1 (eekboard-1.0.8.tar.gz) = 99fe49c89eb129cee317d975eb508028ab847f6c
+RMD160 (eekboard-1.0.8.tar.gz) = ac4ac6c78a4057e0b10636c851ad9fe72b0c691c
+Size (eekboard-1.0.8.tar.gz) = 883659 bytes
diff --git a/x11/eekboard/options.mk b/x11/eekboard/options.mk
index ea6853d721d..1b99786a276 100644
--- a/x11/eekboard/options.mk
+++ b/x11/eekboard/options.mk
@@ -1,19 +1,41 @@
-# $NetBSD: options.mk,v 1.3 2010/12/23 06:04:36 obache Exp $
+# $NetBSD: options.mk,v 1.4 2013/10/23 12:27:26 obache Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.eekboard
-PKG_SUPPORTED_OPTIONS=	clutter
-PKG_SUGGESTED_OPTIONS=	clutter
+PKG_SUPPORTED_OPTIONS=	introspection vala xtest libcanberra
+PKG_SUGGESTED_OPTIONS=	introspection vala xtest
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=	clutter
+PLIST_VARS+=	introspection vala
 
-.if !empty(PKG_OPTIONS:Mclutter)
-PLIST.clutter=	yes
-.include "../../graphics/clutter/buildlink3.mk"
-.include "../../graphics/clutter-gtk/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-clutter=yes
+.if !empty(PKG_OPTIONS:Mintrospection)
+PLIST.introspection=	yes
+BUILDLINK_DEPMETHOD.gobject-introspection=	build
+.include "../../devel/gobject-introspection/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-introspection=yes
 .else
-CONFIGURE_ARGS+=	--enable-clutter=no
+CONFIGURE_ARGS+=	--enable-introspection=no
+.endif
+
+.if !empty(PKG_OPTIONS:Mvala)
+PLIST.vala=	yes
+.include "../../lang/vala/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-vala=yes
+.else
+CONFIGURE_ARGS+=	--enable-vala=no
+.endif
+
+.if !empty(PKG_OPTIONS:Mxtest)
+.include "../../x11/libXtst/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-xtest=yes
+.else
+CONFIGURE_ARGS+=	--enable-xtest=no
+.endif
+
+.if !empty(PKG_OPTIONS:Mlibcanberra)
+.include "../../audio/libcanberra/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-libcanberra=yes
+.else
+CONFIGURE_ARGS+=	--enable-libcanberra=no
 .endif