From 5054592bbf57c081d2b2cfa7361280ad40beb9b9 Mon Sep 17 00:00:00 2001
From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date: Wed, 7 Mar 2012 10:05:04 +0100
Subject: fix vala

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
---
 dev-lang/vala/vala-9999.ebuild | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/dev-lang/vala/vala-9999.ebuild b/dev-lang/vala/vala-9999.ebuild
index adbd3887..c93498be 100644
--- a/dev-lang/vala/vala-9999.ebuild
+++ b/dev-lang/vala/vala-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -18,8 +18,7 @@ IUSE="bootstrap test +vapigen"
 
 RDEPEND=">=dev-libs/glib-2.16:2"
 DEPEND="${RDEPEND}
-	bootstrap? ( dev-lang/vala:0.14 )
-	!bootstrap? ( dev-lang/vala:0.16 )
+	dev-lang/vala:0.16
 	sys-devel/flex
 	|| ( sys-devel/bison dev-util/byacc dev-util/yacc )
 	dev-util/pkgconfig
@@ -29,24 +28,18 @@ DEPEND="${RDEPEND}
 		>=dev-libs/glib-2.26:2 )"
 
 pkg_setup() {
-	local VER
-	if use bootstrap; then
-		VER=0.14
-	else
-		VER=0.16
-	fi
 	G2CONF="${G2CONF}
-		VALAC=$(type -P valac-${VER})
+		VALAC=$(type -P valac-0.16)
 		--disable-unversioned
-		--disable-maintainer-mode
 		$(use_enable vapigen)"
 	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
 }
 
 src_install() {
 	gnome2_src_install
-	mv "${ED}"/usr/share/aclocal/vala.m4 \
-		"${ED}"/usr/share/aclocal/vala-${SLOT/./-}.m4 || die "failed to move vala m4 macro"
+
+	insinto /usr/share/aclocal
+	newins vala.m4 vala-${SLOT/./-}.m4
 }
 
 pkg_postinst() {
-- 
cgit v1.2.3-65-gdbad