--- libdbusmenu-0.3.16-r2.ebuild	2011-05-24 18:45:05.519941974 +0200
+++ libdbusmenu-0.4.4.ebuild	2011-05-24 18:43:52.850126830 +0200
@@ -30,7 +30,7 @@
 		dev-libs/json-glib[introspection=]
 		dev-util/dbus-test-runner
 	)
-	vala? ( dev-lang/vala:0 )
+	vala? ( dev-lang/vala:0.10 )
 	dev-util/intltool
 	dev-util/pkgconfig"
 
@@ -43,26 +43,25 @@
 
 src_prepare() {
 	# Make Vala bindings optional, launchpad-bug #713685
-	epatch "${FILESDIR}/${P}-optional-vala.patch"
+	epatch "${FILESDIR}/${PN}-0.3.16-optional-vala.patch"
 	# Make tests optional, launchpad-bug #552526
-	epatch "${FILESDIR}/${P}-optional-tests.patch"
+	epatch "${FILESDIR}/${PN}-0.3.16-optional-tests.patch"
 	# Make libdbusmenu-gtk library optional, launchpad-bug #552530
 	epatch "${FILESDIR}/${P}-optional-gtk.patch"
 	# Decouple testapp from libdbusmenu-gtk, launchpad-bug #709761
-	epatch "${FILESDIR}/${P}-decouple-testapp.patch"
+	epatch "${FILESDIR}/${PN}-0.3.94-decouple-testapp.patch"
 	# Make dbusmenudumper optional, launchpad-bug #643871
 	epatch "${FILESDIR}/${PN}-0.3.14-optional-dumper.patch"
 	# Fixup undeclared HAVE_INTROSPECTION, launchpad-bug #552538
 	epatch "${FILESDIR}/${PN}-0.3.14-fix-aclocal.patch"
-	# Fix introspection generation, launchpad-bug #713690
-	epatch "${FILESDIR}/${P}-fix-introspection.patch"
 	# Drop -Werror in a release
 	sed -e 's:-Werror::g' -i libdbusmenu-glib/Makefile.am libdbusmenu-gtk/Makefile.am || die "sed failed"
 	eautoreconf
 }
 
 src_configure() {
-	econf \
+	VALA_API_GEN=$(type -p vapigen-0.10) \
+		econf \
 		$(use_enable gtk) \
 		$(use_enable gtk dumper) \
 		$(use_enable introspection) \