11 files changed, 372 insertions, 247 deletions

diff --git a/lang/Makefile b/lang/Makefile
index cb61714701ba..ad8b4654a2da 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -380,6 +380,7 @@
     SUBDIR += u++
     SUBDIR += ucc
     SUBDIR += vala
+    SUBDIR += vala-vapigen
     SUBDIR += visualworks
     SUBDIR += whitespace
     SUBDIR += xds
diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
index 9056f877d30c..89de1fff4009 100644
--- a/lang/gjs/Makefile
+++ b/lang/gjs/Makefile
@@ -3,12 +3,11 @@
 # Whom:                Pawel Worach <pawel.worach@gmail.com>
 #
 # $FreeBSD$
-#   $MCom: ports/lang/gjs/Makefile,v 1.5 2010/03/20 01:14:31 marcus Exp $
+#   $MCom: ports/lang/gjs/Makefile,v 1.12 2010/11/15 20:14:53 kwm Exp $
 #
 
 PORTNAME=	gjs
-PORTVERSION=	0.6
-PORTREVISION=	2
+PORTVERSION=	0.7.7
 CATEGORIES=	lang gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/lang/gjs/distinfo b/lang/gjs/distinfo
index da2a1c0cddd7..77acc71b0400 100644
--- a/lang/gjs/distinfo
+++ b/lang/gjs/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gjs-0.6.tar.bz2) = 0667ee25bc89eeea2fede223be82df81
-SHA256 (gnome2/gjs-0.6.tar.bz2) = 5c5a54bbb819bfaea1e0e76f0508467e8d5690360ab550e1284951d905a56e5d
-SIZE (gnome2/gjs-0.6.tar.bz2) = 436575
+SHA256 (gnome2/gjs-0.7.7.tar.bz2) = 30fd38a589dc5520604718b416564f4db4f23c5821c46beaced35e4af0bf4318
+SIZE (gnome2/gjs-0.7.7.tar.bz2) = 485317
diff --git a/lang/gjs/pkg-plist b/lang/gjs/pkg-plist
index dc7fbe65c206..406b87203fa1 100644
--- a/lang/gjs/pkg-plist
+++ b/lang/gjs/pkg-plist
@@ -2,12 +2,16 @@ bin/gjs
 bin/gjs-console
 include/gjs-1.0/gjs-dbus/dbus-proxy.h
 include/gjs-1.0/gjs-dbus/dbus.h
+include/gjs-1.0/gjs/byteArray.h
+include/gjs-1.0/gjs/compat.h
 include/gjs-1.0/gjs/context.h
 include/gjs-1.0/gjs/gi/arg.h
 include/gjs-1.0/gjs/gi/boxed.h
 include/gjs-1.0/gjs/gi/closure.h
 include/gjs-1.0/gjs/gi/enumeration.h
+include/gjs-1.0/gjs/gi/foreign.h
 include/gjs-1.0/gjs/gi/function.h
+include/gjs-1.0/gjs/gi/gjs_gi_trace.h
 include/gjs-1.0/gjs/gi/keep-alive.h
 include/gjs-1.0/gjs/gi/ns.h
 include/gjs-1.0/gjs/gi/object.h
@@ -16,6 +20,7 @@ include/gjs-1.0/gjs/gi/repo.h
 include/gjs-1.0/gjs/gi/union.h
 include/gjs-1.0/gjs/gi/value.h
 include/gjs-1.0/gjs/gjs.h
+include/gjs-1.0/gjs/gjs-module.h
 include/gjs-1.0/gjs/importer.h
 include/gjs-1.0/gjs/jsapi-util.h
 include/gjs-1.0/gjs/mem.h
@@ -29,9 +34,6 @@ lib/gjs-1.0/console.so
 lib/gjs-1.0/dbusNative.a
 lib/gjs-1.0/dbusNative.la
 lib/gjs-1.0/dbusNative.so
-lib/gjs-1.0/debugger.a
-lib/gjs-1.0/debugger.la
-lib/gjs-1.0/debugger.so
 lib/gjs-1.0/gettextNative.a
 lib/gjs-1.0/gettextNative.la
 lib/gjs-1.0/gettextNative.so
@@ -59,11 +61,13 @@ lib/libgjs.so.0
 libdata/pkgconfig/gjs-1.0.pc
 libdata/pkgconfig/gjs-dbus-1.0.pc
 libdata/pkgconfig/gjs-gi-1.0.pc
+libdata/pkgconfig/gjs-internals-1.0.pc
 share/gjs-1.0/cairo.js
 share/gjs-1.0/dbus.js
 share/gjs-1.0/gettext.js
 share/gjs-1.0/jsUnit.js
 share/gjs-1.0/lang.js
+share/gjs-1.0/promise.js
 share/gjs-1.0/signals.js
 share/gjs-1.0/tweener/equations.js
 share/gjs-1.0/tweener/tweenList.js
diff --git a/lang/vala-vapigen/Makefile b/lang/vala-vapigen/Makefile
new file mode 100644
index 000000000000..cce3836e0c56
--- /dev/null
+++ b/lang/vala-vapigen/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for:	vala-vapigen
+# Date created:				
+# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/lang/vala-vapigen/Makefile,v 1.2 2010/08/31 14:51:44 avl Exp $
+#
+
+PORTREVISION=	0
+CATEGORIES=	devel gnome
+PKGNAMESUFFIX=	-vapigen
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	The vapigen program from vala
+
+USE_GMAKE=	yes
+
+MASTERDIR=	${.CURDIR}/../vala
+BUILD_WRKSRC=	${WRKSRC}/vapigen
+INSTALL_WRKSRC=	${WRKSRC}/vapigen
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
+
+VALA_SLAVE=	yes
+
+.include "${MASTERDIR}/Makefile"
diff --git a/lang/vala-vapigen/pkg-descr b/lang/vala-vapigen/pkg-descr
new file mode 100644
index 000000000000..1ec2bfea440f
--- /dev/null
+++ b/lang/vala-vapigen/pkg-descr
@@ -0,0 +1,16 @@
+Soup is a SOAP (Simple Object Access Protocol) implementation in C. 
+
+It provides a queued asynchronous callback-based mechanism for sending and
+servicing SOAP requests, and a WSDL (Web Service Definition Language) for C
+compilers which generates client stubs and server skeletons for easily
+calling and implementing SOAP methods.  It uses GLib and is designed to work
+well with GTK applications.
+
+Features:
+  * Completely Asynchronous
+  * Connection cache
+  * HTTP chunked transfer and persistent connections
+  * Authenticated HTTP, SOCKS4, and SOCKS5 proxy support
+  * SSL Support using OpenSSL
+  * Apache module server support
+  * Client digest authentication
diff --git a/lang/vala-vapigen/pkg-plist b/lang/vala-vapigen/pkg-plist
new file mode 100644
index 000000000000..175851d3a862
--- /dev/null
+++ b/lang/vala-vapigen/pkg-plist
@@ -0,0 +1,8 @@
+bin/vala-gen-introspect
+bin/vala-gen-introspect-0.10
+bin/vapicheck
+bin/vapicheck-0.10
+bin/vapigen
+bin/vapigen-0.10
+lib/vala-0.10/gen-introspect-0.10
+@dirrm lib/vala-0.10
diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index ea97811facd7..aafdbadef607 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -3,44 +3,66 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/lang/vala/Makefile,v 1.32 2010/04/21 22:30:45 kwm Exp $
+#   $MCom: ports/lang/vala/Makefile,v 1.46 2010/10/27 21:21:51 kwm Exp $
 #
 
 PORTNAME=	vala
-PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTVERSION=	0.10.1
 CATEGORIES=	lang gnome
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Programming language and compiler that converts Vala code into C code
 
-OPTIONS=	VAPIGEN "Enable VAPI generator" Off
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
 USE_BZIP2=	yes
-USE_GNOME=	glib20 gnomeprefix libxslt
+USE_GNOME=	gnomehack glib20 gnomeprefix libxslt
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}" LDFLAGS="-L${LOCALBASE}/lib"
 USE_BISON=	build
 USE_LDCONFIG=	yes
 
-MAN1=		valac.1
+MAN1?=		valac.1 valac-0.10.1
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_VAPIGEN)
+.if defined(VALA_SLAVE)
+LIB_DEPENDS+=	vala-0.10.0:${PORTSDIR}/lang/vala
 CONFIGURE_ARGS+=--enable-vapigen
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
-MAN1+=		vala-gen-introspect.1 vapigen.1
-PLIST_SUB+=	VAPIGEN=""
+MAN1=		vala-gen-introspect.1 vapigen.1
 .else
 CONFIGURE_ARGS+=--disable-vapigen
-PLIST_SUB+=	VAPIGEN="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|$$(prefix)/libdata/pkgconfig|' \
+# We cheat here, because vala records vapigen related stuff in its .pc file
+# This makes the vapigen work again, although it might get weird when
+# vala-vapigen isn't installed.
+	@${REINPLACE_CMD} -e 's|@vapigen_decl@|vapigen=$${bindir}/vapigen-0.10|g' \
+		-e 's|@gen_introspect_decl@|gen_introspect=$${libdir}/vala-0.10/gen-introspect-0.10|g' \
+		-e 's|@vala_gen_introspect_decl@|vala_gen_introspect=$${bindir}/vala-gen-introspect-0.10|g' \
+		${WRKSRC}/vala.pc.in
+	@${REINPLACE_CMD} -e 's|cp $$< $$@|cp vala.pc vala-0.10.pc|g' \
 		${WRKSRC}/Makefile.in
 
+.if defined(VALA_SLAVE)
+pre-build:
+	@cd ${WRKSRC} && ${GMAKE} version.h
+	@cd ${WRKSRC}/gobject-introspection && ${GMAKE} libgidl.la && \
+		${GMAKE} gen-introspect
+
+post-install:
+	@cd ${WRKSRC}/gobject-introspection && ${GMAKE} install
+	@${INSTALL_MAN} ${WRKSRC}/doc/vapigen.1 ${WRKSRC}/doc/vala-gen-introspect.1 \
+		 ${PREFIX}/man/man1/
+.else
+post-install:
+	${LN} -fs ${PREFIX}/libdata/pkgconfig/vala-0.10.pc \
+		${PREFIX}/libdata/pkgconfig/vala-1.0.pc
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/lang/vala/distinfo b/lang/vala/distinfo
index 77354e2f01e6..4d334ea5c050 100644
--- a/lang/vala/distinfo
+++ b/lang/vala/distinfo
@@ -1,3 +1,3 @@
-MD5 (vala-0.8.1.tar.bz2) = 3e105d7f39e55925299a3e6e82c32de7
-SHA256 (vala-0.8.1.tar.bz2) = d805853ac87234ec0942e536e3381609eb9da596e32928996103b4342737ea85
-SIZE (vala-0.8.1.tar.bz2) = 2122657
+MD5 (vala-0.10.1.tar.bz2) = b8bc7cf32ca2e0e277912f2a5f86f8e6
+SHA256 (vala-0.10.1.tar.bz2) = eae1d2f52b651e9d2ed31ae0877ab671b5f796a3013c714f86a926806337805a
+SIZE (vala-0.10.1.tar.bz2) = 2415883
diff --git a/lang/vala/files/patch-vapigen_Makefile.in b/lang/vala/files/patch-vapigen_Makefile.in
new file mode 100644
index 000000000000..bc1780d20f73
--- /dev/null
+++ b/lang/vala/files/patch-vapigen_Makefile.in
@@ -0,0 +1,34 @@
+--- vapigen/Makefile.in.orig	2010-08-10 23:24:52.000000000 +0200
++++ vapigen/Makefile.in	2010-08-10 23:27:28.000000000 +0200
+@@ -56,7 +56,6 @@
+ vapicheck_OBJECTS = $(am_vapicheck_OBJECTS)
+ am__DEPENDENCIES_1 =
+ vapicheck_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-	../codegen/libvala@PACKAGE_SUFFIX@.la \
+ 	../gobject-introspection/libgidl.la $(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_$(V))
+ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+@@ -66,7 +65,6 @@
+ am_vapigen_OBJECTS = $(am__objects_3) $(am__objects_1)
+ vapigen_OBJECTS = $(am_vapigen_OBJECTS)
+ vapigen_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-	../codegen/libvala@PACKAGE_SUFFIX@.la \
+ 	../gobject-introspection/libgidl.la $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+@@ -307,13 +305,13 @@
+ 
+ vapigen_LDADD = \
+ 	$(GLIB_LIBS) \
+-	../codegen/libvala@PACKAGE_SUFFIX@.la \
++	-lvala@PACKAGE_SUFFIX@ \
+ 	../gobject-introspection/libgidl.la \
+ 	$(NULL)
+ 
+ vapicheck_LDADD = \
+ 	$(GLIB_LIBS) \
+-	../codegen/libvala@PACKAGE_SUFFIX@.la \
++	-lvala@PACKAGE_SUFFIX@ \
+ 	../gobject-introspection/libgidl.la \
+ 	$(NULL)
+ 
diff --git a/lang/vala/pkg-plist b/lang/vala/pkg-plist
index 8a79ae32ab30..212c33987382 100644
--- a/lang/vala/pkg-plist
+++ b/lang/vala/pkg-plist
@@ -1,228 +1,244 @@
-%%VAPIGEN%%bin/vala-gen-introspect
+bin/vala
+bin/vala-0.10
 bin/valac
-%%VAPIGEN%%bin/vapicheck
-%%VAPIGEN%%bin/vapigen
-include/vala-1.0/vala.h
-include/vala-1.0/valaccode.h
-include/vala-1.0/valacodegen.h
-include/vala-1.0/valagee.h
-lib/libvala.la
-lib/libvala.so
-lib/libvala.so.0
-%%VAPIGEN%%lib/vala/gen-introspect
+bin/valac-0.10
+include/vala-0.10/vala.h
+include/vala-0.10/valaccode.h
+include/vala-0.10/valacodegen.h
+include/vala-0.10/valagee.h
+lib/libvala-0.10.la
+lib/libvala-0.10.so
+lib/libvala-0.10.so.0
+libdata/pkgconfig/vala-0.10.pc
 libdata/pkgconfig/vala-1.0.pc
-share/devhelp/books/vala/attributes.html
-share/devhelp/books/vala/classes.html
-share/devhelp/books/vala/default.css
-share/devhelp/books/vala/delegates.html
-share/devhelp/books/vala/enums.html
-share/devhelp/books/vala/exceptions.html
-share/devhelp/books/vala/expressions.html
-share/devhelp/books/vala/index.html
-share/devhelp/books/vala/interfaces.html
-share/devhelp/books/vala/methods.html
-share/devhelp/books/vala/namespaces.html
-share/devhelp/books/vala/overview.html
-share/devhelp/books/vala/statements.html
-share/devhelp/books/vala/structs.html
-share/devhelp/books/vala/types.html
-share/devhelp/books/vala/vala.devhelp2
-%%DATADIR%%/vapi/alsa.vapi
-%%DATADIR%%/vapi/atk.vapi
-%%DATADIR%%/vapi/avahi-gobject.deps
-%%DATADIR%%/vapi/avahi-gobject.vapi
-%%DATADIR%%/vapi/bzlib.vapi
-%%DATADIR%%/vapi/cairo-xcb.deps
-%%DATADIR%%/vapi/cairo-xcb.vapi
-%%DATADIR%%/vapi/cairo.vapi
-%%DATADIR%%/vapi/ccss-1.vapi
-%%DATADIR%%/vapi/clutter-1.0.deps
-%%DATADIR%%/vapi/clutter-1.0.vapi
-%%DATADIR%%/vapi/clutter-gtk-0.10.deps
-%%DATADIR%%/vapi/clutter-gtk-0.10.vapi
-%%DATADIR%%/vapi/clutter-json-1.0.vapi
-%%DATADIR%%/vapi/cogl-1.0.deps
-%%DATADIR%%/vapi/cogl-1.0.vapi
-%%DATADIR%%/vapi/clutter-gst-1.0.deps
-%%DATADIR%%/vapi/clutter-gst-1.0.vapi
-%%DATADIR%%/vapi/curses.vapi
-%%DATADIR%%/vapi/dbus-glib-1.vapi
-%%DATADIR%%/vapi/dconf.vapi
-%%DATADIR%%/vapi/enchant.vapi
-%%DATADIR%%/vapi/fuse.deps
-%%DATADIR%%/vapi/fuse.vapi
-%%DATADIR%%/vapi/gconf-2.0.vapi
-%%DATADIR%%/vapi/gdk-2.0.deps
-%%DATADIR%%/vapi/gdk-2.0.vapi
-%%DATADIR%%/vapi/gdl-1.0.deps
-%%DATADIR%%/vapi/gdl-1.0.vapi
-%%DATADIR%%/vapi/gdk-pixbuf-2.0.deps
-%%DATADIR%%/vapi/gdk-pixbuf-2.0.vapi
-%%DATADIR%%/vapi/gdk-x11-2.0.deps
-%%DATADIR%%/vapi/gdk-x11-2.0.vapi
-%%DATADIR%%/vapi/gdu-gtk.deps
-%%DATADIR%%/vapi/gdu-gtk.vapi
-%%DATADIR%%/vapi/gdu.deps
-%%DATADIR%%/vapi/gdu.vapi
-%%DATADIR%%/vapi/gio-2.0.vapi
-%%DATADIR%%/vapi/gio-unix-2.0.deps
-%%DATADIR%%/vapi/gio-unix-2.0.vapi
-%%DATADIR%%/vapi/glib-2.0.vapi
-%%DATADIR%%/vapi/gmodule-2.0.vapi
-%%DATADIR%%/vapi/gnet-2.0.deps
-%%DATADIR%%/vapi/gnet-2.0.vapi
-%%DATADIR%%/vapi/gnome-desktop-2.0.deps
-%%DATADIR%%/vapi/gnome-desktop-2.0.vapi
-%%DATADIR%%/vapi/gnome-keyring-1.vapi
-%%DATADIR%%/vapi/gnome-vfs-2.0.vapi
-%%DATADIR%%/vapi/gnutls.vapi
-%%DATADIR%%/vapi/gobject-2.0.vapi
-%%DATADIR%%/vapi/goocanvas.deps
-%%DATADIR%%/vapi/goocanvas.vapi
-%%DATADIR%%/vapi/gsl.vapi
-%%DATADIR%%/vapi/gstreamer-0.10.deps
-%%DATADIR%%/vapi/gstreamer-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-app-0.10.deps
-%%DATADIR%%/vapi/gstreamer-app-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-audio-0.10.deps
-%%DATADIR%%/vapi/gstreamer-audio-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-base-0.10.deps
-%%DATADIR%%/vapi/gstreamer-base-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-cdda-0.10.deps
-%%DATADIR%%/vapi/gstreamer-cdda-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-check-0.10.deps
-%%DATADIR%%/vapi/gstreamer-check-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-controller-0.10.deps
-%%DATADIR%%/vapi/gstreamer-controller-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-dataprotocol-0.10.deps
-%%DATADIR%%/vapi/gstreamer-dataprotocol-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-fft-0.10.deps
-%%DATADIR%%/vapi/gstreamer-fft-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-interfaces-0.10.deps
-%%DATADIR%%/vapi/gstreamer-interfaces-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-net-0.10.deps
-%%DATADIR%%/vapi/gstreamer-net-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-netbuffer-0.10.deps
-%%DATADIR%%/vapi/gstreamer-netbuffer-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-pbutils-0.10.deps
-%%DATADIR%%/vapi/gstreamer-pbutils-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-riff-0.10.deps
-%%DATADIR%%/vapi/gstreamer-riff-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-rtp-0.10.deps
-%%DATADIR%%/vapi/gstreamer-rtp-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-rtsp-0.10.deps
-%%DATADIR%%/vapi/gstreamer-rtsp-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-sdp-0.10.deps
-%%DATADIR%%/vapi/gstreamer-sdp-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-tag-0.10.deps
-%%DATADIR%%/vapi/gstreamer-tag-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-video-0.10.deps
-%%DATADIR%%/vapi/gstreamer-video-0.10.vapi
-%%DATADIR%%/vapi/gtk+-2.0.deps
-%%DATADIR%%/vapi/gtk+-2.0.vapi
-%%DATADIR%%/vapi/gtkmozembed.deps
-%%DATADIR%%/vapi/gtkmozembed.vapi
-%%DATADIR%%/vapi/gtksourceview-2.0.deps
-%%DATADIR%%/vapi/gtksourceview-2.0.vapi
-%%DATADIR%%/vapi/gudev-1.0.deps
-%%DATADIR%%/vapi/gudev-1.0.vapi
-%%DATADIR%%/vapi/hal.deps
-%%DATADIR%%/vapi/hal.vapi
-%%DATADIR%%/vapi/hildon-1.deps
-%%DATADIR%%/vapi/hildon-1.vapi
-%%DATADIR%%/vapi/hildon-fm-2.deps
-%%DATADIR%%/vapi/hildon-fm-2.vapi
-%%DATADIR%%/vapi/json-glib-1.0.vapi
-%%DATADIR%%/vapi/libarchive.deps
-%%DATADIR%%/vapi/libarchive.vapi
-%%DATADIR%%/vapi/libbonoboui-2.0.vapi
-%%DATADIR%%/vapi/libdaemon.vapi
-%%DATADIR%%/vapi/libepc-1.0.vapi
-%%DATADIR%%/vapi/libftdi.deps
-%%DATADIR%%/vapi/libftdi.vapi
-%%DATADIR%%/vapi/libgda-4.0.deps
-%%DATADIR%%/vapi/libgda-4.0.vapi
-%%DATADIR%%/vapi/libgda-report-4.0.deps
-%%DATADIR%%/vapi/libgda-report-4.0.vapi
-%%DATADIR%%/vapi/libgdata.deps
-%%DATADIR%%/vapi/libgdata.vapi
-%%DATADIR%%/vapi/libglade-2.0.deps
-%%DATADIR%%/vapi/libglade-2.0.vapi
-%%DATADIR%%/vapi/libgnome-2.0.vapi
-%%DATADIR%%/vapi/libgnome-menu.vapi
-%%DATADIR%%/vapi/libgnomeui-2.0.deps
-%%DATADIR%%/vapi/libgnomeui-2.0.vapi
-%%DATADIR%%/vapi/libgsf-1.deps
-%%DATADIR%%/vapi/libgsf-1.vapi
-%%DATADIR%%/vapi/libgvc.vapi
-%%DATADIR%%/vapi/libmagic.vapi
-%%DATADIR%%/vapi/libnl-1.vapi
-%%DATADIR%%/vapi/libnl-2.0.deps
-%%DATADIR%%/vapi/libnl-2.0.vapi
-%%DATADIR%%/vapi/libnotify.deps
-%%DATADIR%%/vapi/libnotify.vapi
-%%DATADIR%%/vapi/liboobs-1.vapi
-%%DATADIR%%/vapi/libosso.vapi
-%%DATADIR%%/vapi/libpanelapplet-2.0.deps
-%%DATADIR%%/vapi/libpanelapplet-2.0.vapi
-%%DATADIR%%/vapi/libpq.vapi
-%%DATADIR%%/vapi/librsvg-2.0.deps
-%%DATADIR%%/vapi/librsvg-2.0.vapi
-%%DATADIR%%/vapi/libsexy.deps
-%%DATADIR%%/vapi/libsexy.vapi
-%%DATADIR%%/vapi/libsoup-2.2.vapi
-%%DATADIR%%/vapi/libsoup-2.4.deps
-%%DATADIR%%/vapi/libsoup-2.4.vapi
-%%DATADIR%%/vapi/libusb-1.0.deps
-%%DATADIR%%/vapi/libusb-1.0.vapi
-%%DATADIR%%/vapi/libusb.vapi
-%%DATADIR%%/vapi/libwnck-1.0.deps
-%%DATADIR%%/vapi/libwnck-1.0.vapi
-%%DATADIR%%/vapi/libxml-2.0.vapi
-%%DATADIR%%/vapi/linux.deps
-%%DATADIR%%/vapi/linux.vapi
-%%DATADIR%%/vapi/loudmouth-1.0.vapi
-%%DATADIR%%/vapi/lua.vapi
-%%DATADIR%%/vapi/mysql.vapi
-%%DATADIR%%/vapi/pango.deps
-%%DATADIR%%/vapi/pango.vapi
-%%DATADIR%%/vapi/pangocairo.deps
-%%DATADIR%%/vapi/pangocairo.vapi
-%%DATADIR%%/vapi/poppler-glib.deps
-%%DATADIR%%/vapi/poppler-glib.vapi
-%%DATADIR%%/vapi/posix.vapi
-%%DATADIR%%/vapi/purple.deps
-%%DATADIR%%/vapi/purple.vapi
-%%DATADIR%%/vapi/raptor.vapi
-%%DATADIR%%/vapi/rasqal.vapi
-%%DATADIR%%/vapi/readline.vapi
-%%DATADIR%%/vapi/rest.deps
-%%DATADIR%%/vapi/rest.vapi
-%%DATADIR%%/vapi/sdl-gfx.vapi
-%%DATADIR%%/vapi/sdl-image.vapi
-%%DATADIR%%/vapi/sdl-mixer.vapi
-%%DATADIR%%/vapi/sdl-net.vapi
-%%DATADIR%%/vapi/sdl-ttf.vapi
-%%DATADIR%%/vapi/sdl.vapi
-%%DATADIR%%/vapi/sqlite3.vapi
-%%DATADIR%%/vapi/taglib_c.vapi
-%%DATADIR%%/vapi/tiff.vapi
-%%DATADIR%%/vapi/tracker-indexer-module-1.0.vapi
-%%DATADIR%%/vapi/twitter-glib-1.0.deps
-%%DATADIR%%/vapi/twitter-glib-1.0.vapi
-%%DATADIR%%/vapi/unique-1.0.deps
-%%DATADIR%%/vapi/unique-1.0.vapi
-%%DATADIR%%/vapi/v4l2.vapi
-%%DATADIR%%/vapi/vala-1.0.vapi
-%%DATADIR%%/vapi/vte.deps
-%%DATADIR%%/vapi/vte.vapi
-%%DATADIR%%/vapi/webkit-1.0.deps
-%%DATADIR%%/vapi/webkit-1.0.vapi
-%%DATADIR%%/vapi/x11.vapi
-%%DATADIR%%/vapi/xcb.vapi
-%%DATADIR%%/vapi/zlib.vapi
-@dirrm share/devhelp/books/vala
+share/aclocal/vala.m4
+share/devhelp/books/vala-0.10/attributes.html
+share/devhelp/books/vala-0.10/classes.html
+share/devhelp/books/vala-0.10/default.css
+share/devhelp/books/vala-0.10/delegates.html
+share/devhelp/books/vala-0.10/enums.html
+share/devhelp/books/vala-0.10/exceptions.html
+share/devhelp/books/vala-0.10/expressions.html
+share/devhelp/books/vala-0.10/index.html
+share/devhelp/books/vala-0.10/interfaces.html
+share/devhelp/books/vala-0.10/methods.html
+share/devhelp/books/vala-0.10/namespaces.html
+share/devhelp/books/vala-0.10/overview.html
+share/devhelp/books/vala-0.10/statements.html
+share/devhelp/books/vala-0.10/structs.html
+share/devhelp/books/vala-0.10/types.html
+share/devhelp/books/vala-0.10/vala.devhelp2
+%%DATADIR%%-0.10/vapi/alsa.vapi
+%%DATADIR%%-0.10/vapi/atk.vapi
+%%DATADIR%%-0.10/vapi/avahi-gobject.deps
+%%DATADIR%%-0.10/vapi/avahi-gobject.vapi
+%%DATADIR%%-0.10/vapi/bzlib.vapi
+%%DATADIR%%-0.10/vapi/cairo-xcb.deps
+%%DATADIR%%-0.10/vapi/cairo-xcb.vapi
+%%DATADIR%%-0.10/vapi/cairo.vapi
+%%DATADIR%%-0.10/vapi/ccss-1.vapi
+%%DATADIR%%-0.10/vapi/clutter-1.0.deps
+%%DATADIR%%-0.10/vapi/clutter-1.0.vapi
+%%DATADIR%%-0.10/vapi/clutter-gtk-0.10.deps
+%%DATADIR%%-0.10/vapi/clutter-gtk-0.10.vapi
+%%DATADIR%%-0.10/vapi/clutter-json-1.0.vapi
+%%DATADIR%%-0.10/vapi/cogl-1.0.deps
+%%DATADIR%%-0.10/vapi/cogl-1.0.vapi
+%%DATADIR%%-0.10/vapi/clutter-gst-1.0.deps
+%%DATADIR%%-0.10/vapi/clutter-gst-1.0.vapi
+%%DATADIR%%-0.10/vapi/curses.vapi
+%%DATADIR%%-0.10/vapi/dbus-glib-1.vapi
+%%DATADIR%%-0.10/vapi/enchant.vapi
+%%DATADIR%%-0.10/vapi/fuse.deps
+%%DATADIR%%-0.10/vapi/fuse.vapi
+%%DATADIR%%-0.10/vapi/gconf-2.0.vapi
+%%DATADIR%%-0.10/vapi/gdk-2.0.deps
+%%DATADIR%%-0.10/vapi/gdk-2.0.vapi
+%%DATADIR%%-0.10/vapi/gdl-1.0.deps
+%%DATADIR%%-0.10/vapi/gdl-1.0.vapi
+%%DATADIR%%-0.10/vapi/gdk-pixbuf-2.0.deps
+%%DATADIR%%-0.10/vapi/gdk-pixbuf-2.0.vapi
+%%DATADIR%%-0.10/vapi/gdk-x11-2.0.deps
+%%DATADIR%%-0.10/vapi/gdk-x11-2.0.vapi
+%%DATADIR%%-0.10/vapi/gdu-gtk.deps
+%%DATADIR%%-0.10/vapi/gdu-gtk.vapi
+%%DATADIR%%-0.10/vapi/gdu.deps
+%%DATADIR%%-0.10/vapi/gdu.vapi
+%%DATADIR%%-0.10/vapi/gedit-2.20.deps
+%%DATADIR%%-0.10/vapi/gedit-2.20.vapi
+%%DATADIR%%-0.10/vapi/gio-2.0.vapi
+%%DATADIR%%-0.10/vapi/gio-unix-2.0.deps
+%%DATADIR%%-0.10/vapi/gio-unix-2.0.vapi
+%%DATADIR%%-0.10/vapi/glib-2.0.vapi
+%%DATADIR%%-0.10/vapi/gmodule-2.0.vapi
+%%DATADIR%%-0.10/vapi/gnet-2.0.deps
+%%DATADIR%%-0.10/vapi/gnet-2.0.vapi
+%%DATADIR%%-0.10/vapi/gnome-desktop-2.0.deps
+%%DATADIR%%-0.10/vapi/gnome-desktop-2.0.vapi
+%%DATADIR%%-0.10/vapi/gnome-keyring-1.vapi
+%%DATADIR%%-0.10/vapi/gnome-vfs-2.0.vapi
+%%DATADIR%%-0.10/vapi/gnutls.vapi
+%%DATADIR%%-0.10/vapi/gobject-2.0.vapi
+%%DATADIR%%-0.10/vapi/goocanvas.deps
+%%DATADIR%%-0.10/vapi/goocanvas.vapi
+%%DATADIR%%-0.10/vapi/gsl.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-app-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-app-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-audio-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-audio-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-base-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-base-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-cdda-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-cdda-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-check-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-check-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-controller-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-controller-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-dataprotocol-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-dataprotocol-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-fft-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-fft-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-interfaces-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-interfaces-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-net-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-net-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-netbuffer-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-netbuffer-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-pbutils-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-pbutils-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-riff-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-riff-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-rtp-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-rtp-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-rtsp-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-rtsp-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-sdp-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-sdp-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-tag-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-tag-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-video-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-video-0.10.vapi
+%%DATADIR%%-0.10/vapi/gtk+-2.0.deps
+%%DATADIR%%-0.10/vapi/gtk+-2.0.vapi
+%%DATADIR%%-0.10/vapi/gtkmozembed.deps
+%%DATADIR%%-0.10/vapi/gtkmozembed.vapi
+%%DATADIR%%-0.10/vapi/gtksourceview-2.0.deps
+%%DATADIR%%-0.10/vapi/gtksourceview-2.0.vapi
+%%DATADIR%%-0.10/vapi/gudev-1.0.deps
+%%DATADIR%%-0.10/vapi/gudev-1.0.vapi
+%%DATADIR%%-0.10/vapi/hal.deps
+%%DATADIR%%-0.10/vapi/hal.vapi
+%%DATADIR%%-0.10/vapi/hildon-1.deps
+%%DATADIR%%-0.10/vapi/hildon-1.vapi
+%%DATADIR%%-0.10/vapi/hildon-fm-2.deps
+%%DATADIR%%-0.10/vapi/hildon-fm-2.vapi
+%%DATADIR%%-0.10/vapi/json-glib-1.0.vapi
+%%DATADIR%%-0.10/vapi/libarchive.deps
+%%DATADIR%%-0.10/vapi/libarchive.vapi
+%%DATADIR%%-0.10/vapi/libbonoboui-2.0.vapi
+%%DATADIR%%-0.10/vapi/libdaemon.vapi
+%%DATADIR%%-0.10/vapi/libepc-1.0.vapi
+%%DATADIR%%-0.10/vapi/libesmtp.vapi
+%%DATADIR%%-0.10/vapi/libftdi.deps
+%%DATADIR%%-0.10/vapi/libftdi.vapi
+%%DATADIR%%-0.10/vapi/libgda-4.0.deps
+%%DATADIR%%-0.10/vapi/libgda-4.0.vapi
+%%DATADIR%%-0.10/vapi/libgda-report-4.0.deps
+%%DATADIR%%-0.10/vapi/libgda-report-4.0.vapi
+%%DATADIR%%-0.10/vapi/libgdata.deps
+%%DATADIR%%-0.10/vapi/libgdata.vapi
+%%DATADIR%%-0.10/vapi/libglade-2.0.deps
+%%DATADIR%%-0.10/vapi/libglade-2.0.vapi
+%%DATADIR%%-0.10/vapi/libgnome-2.0.vapi
+%%DATADIR%%-0.10/vapi/libgnome-menu.vapi
+%%DATADIR%%-0.10/vapi/libgnomeui-2.0.deps
+%%DATADIR%%-0.10/vapi/libgnomeui-2.0.vapi
+%%DATADIR%%-0.10/vapi/libgsf-1.deps
+%%DATADIR%%-0.10/vapi/libgsf-1.vapi
+%%DATADIR%%-0.10/vapi/libgvc.vapi
+%%DATADIR%%-0.10/vapi/libmagic.vapi
+%%DATADIR%%-0.10/vapi/libnl-1.vapi
+%%DATADIR%%-0.10/vapi/libnl-2.0.deps
+%%DATADIR%%-0.10/vapi/libnl-2.0.vapi
+%%DATADIR%%-0.10/vapi/libnotify.deps
+%%DATADIR%%-0.10/vapi/libnotify.vapi
+%%DATADIR%%-0.10/vapi/liboobs-1.vapi
+%%DATADIR%%-0.10/vapi/libosso.vapi
+%%DATADIR%%-0.10/vapi/libpanelapplet-2.0.deps
+%%DATADIR%%-0.10/vapi/libpanelapplet-2.0.vapi
+%%DATADIR%%-0.10/vapi/libpq.vapi
+%%DATADIR%%-0.10/vapi/librsvg-2.0.deps
+%%DATADIR%%-0.10/vapi/librsvg-2.0.vapi
+%%DATADIR%%-0.10/vapi/libsexy.deps
+%%DATADIR%%-0.10/vapi/libsexy.vapi
+%%DATADIR%%-0.10/vapi/libsoup-2.2.vapi
+%%DATADIR%%-0.10/vapi/libsoup-2.4.deps
+%%DATADIR%%-0.10/vapi/libsoup-2.4.vapi
+%%DATADIR%%-0.10/vapi/libusb-1.0.deps
+%%DATADIR%%-0.10/vapi/libusb-1.0.vapi
+%%DATADIR%%-0.10/vapi/libusb.vapi
+%%DATADIR%%-0.10/vapi/libwnck-1.0.deps
+%%DATADIR%%-0.10/vapi/libwnck-1.0.vapi
+%%DATADIR%%-0.10/vapi/libxml-2.0.vapi
+%%DATADIR%%-0.10/vapi/linux.deps
+%%DATADIR%%-0.10/vapi/linux.vapi
+%%DATADIR%%-0.10/vapi/loudmouth-1.0.vapi
+%%DATADIR%%-0.10/vapi/lua.vapi
+%%DATADIR%%-0.10/vapi/mx-1.0.deps
+%%DATADIR%%-0.10/vapi/mx-1.0.vapi
+%%DATADIR%%-0.10/vapi/mysql.vapi
+%%DATADIR%%-0.10/vapi/orc-0.4.vapi
+%%DATADIR%%-0.10/vapi/pango.deps
+%%DATADIR%%-0.10/vapi/pango.vapi
+%%DATADIR%%-0.10/vapi/pangocairo.deps
+%%DATADIR%%-0.10/vapi/pangocairo.vapi
+%%DATADIR%%-0.10/vapi/poppler-glib.deps
+%%DATADIR%%-0.10/vapi/poppler-glib.vapi
+%%DATADIR%%-0.10/vapi/posix.vapi
+%%DATADIR%%-0.10/vapi/purple.deps
+%%DATADIR%%-0.10/vapi/purple.vapi
+%%DATADIR%%-0.10/vapi/raptor.vapi
+%%DATADIR%%-0.10/vapi/rasqal.deps
+%%DATADIR%%-0.10/vapi/rasqal.vapi
+%%DATADIR%%-0.10/vapi/readline.vapi
+%%DATADIR%%-0.10/vapi/rest-0.6.deps
+%%DATADIR%%-0.10/vapi/rest-0.6.vapi
+%%DATADIR%%-0.10/vapi/rest-extras-0.6.deps
+%%DATADIR%%-0.10/vapi/rest-extras-0.6.vapi
+%%DATADIR%%-0.10/vapi/sdl-gfx.deps
+%%DATADIR%%-0.10/vapi/sdl-gfx.vapi
+%%DATADIR%%-0.10/vapi/sdl-image.deps
+%%DATADIR%%-0.10/vapi/sdl-image.vapi
+%%DATADIR%%-0.10/vapi/sdl-mixer.deps
+%%DATADIR%%-0.10/vapi/sdl-mixer.vapi
+%%DATADIR%%-0.10/vapi/sdl-net.deps
+%%DATADIR%%-0.10/vapi/sdl-net.vapi
+%%DATADIR%%-0.10/vapi/sdl-ttf.deps
+%%DATADIR%%-0.10/vapi/sdl-ttf.vapi
+%%DATADIR%%-0.10/vapi/sdl.vapi
+%%DATADIR%%-0.10/vapi/sqlite3.vapi
+%%DATADIR%%-0.10/vapi/taglib_c.vapi
+%%DATADIR%%-0.10/vapi/tiff.vapi
+%%DATADIR%%-0.10/vapi/tokyocabinet.vapi
+%%DATADIR%%-0.10/vapi/tracker-indexer-module-1.0.vapi
+%%DATADIR%%-0.10/vapi/twitter-glib-1.0.deps
+%%DATADIR%%-0.10/vapi/twitter-glib-1.0.vapi
+%%DATADIR%%-0.10/vapi/unique-1.0.deps
+%%DATADIR%%-0.10/vapi/unique-1.0.vapi
+%%DATADIR%%-0.10/vapi/v4l2.vapi
+%%DATADIR%%-0.10/vapi/vala-0.10.vapi
+%%DATADIR%%-0.10/vapi/vte.deps
+%%DATADIR%%-0.10/vapi/vte.vapi
+%%DATADIR%%-0.10/vapi/webkit-1.0.deps
+%%DATADIR%%-0.10/vapi/webkit-1.0.vapi
+%%DATADIR%%-0.10/vapi/x11.vapi
+%%DATADIR%%-0.10/vapi/xcb.vapi
+%%DATADIR%%-0.10/vapi/zlib.vapi
+@dirrm %%DATADIR%%-0.10/vapi
+@dirrm %%DATADIR%%-0.10
+@dirrm share/devhelp/books/vala-0.10
 @dirrmtry share/devhelp/books
 @dirrmtry share/devhelp
-%%VAPIGEN%%@dirrm lib/vala
-@dirrm include/vala-1.0
+@dirrm include/vala-0.10