From d7c9a4dc1fedd7bdffaeec1c66b422e3a8fa2e1d Mon Sep 17 00:00:00 2001 From: Marc-Antoine Perennou Date: Wed, 11 Apr 2012 10:18:03 +0200 Subject: update vala scm Signed-off-by: Marc-Antoine Perennou --- dev-lang/vala/Manifest | 2 +- dev-lang/vala/vala-9999.ebuild | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest index 29309a63..490bb576 100644 --- a/dev-lang/vala/Manifest +++ b/dev-lang/vala/Manifest @@ -1 +1 @@ -EBUILD vala-9999.ebuild 1113 RMD160 72493362c3fa4911ccbb315893aab532a97ff1bd SHA1 2d1b9fefb3cf82c42571de3003404a773067e434 SHA256 70ebc4bc19aed5e6478eb2e2ec84cdaefc5787edff673b15b3a1dce7823c8b68 +EBUILD vala-9999.ebuild 1301 RMD160 0c8b3f67aeacc2dc61258daeedad53abf8b152b0 SHA1 225b100d7776ce960c141c2732033f62dab0df6a SHA256 84c51cbeba223a177c829cf03276db92e98db7a37793b19c146e58de55872597 diff --git a/dev-lang/vala/vala-9999.ebuild b/dev-lang/vala/vala-9999.ebuild index c93498be..84c8ad0c 100644 --- a/dev-lang/vala/vala-9999.ebuild +++ b/dev-lang/vala/vala-9999.ebuild @@ -12,13 +12,15 @@ DESCRIPTION="Vala - Compiler for the GObject type system" HOMEPAGE="http://live.gnome.org/Vala" LICENSE="LGPL-2.1" -SLOT="0.16" +SLOT="0.18" +OLD_SLOT="0.16" KEYWORDS="" IUSE="bootstrap test +vapigen" RDEPEND=">=dev-libs/glib-2.16:2" DEPEND="${RDEPEND} - dev-lang/vala:0.16 + !bootstrap? ( dev-lang/vala:${SLOT} ) + bootstrap? ( dev-lang/vala:${OLD_SLOT} ) sys-devel/flex || ( sys-devel/bison dev-util/byacc dev-util/yacc ) dev-util/pkgconfig @@ -28,8 +30,14 @@ DEPEND="${RDEPEND} >=dev-libs/glib-2.26:2 )" pkg_setup() { + local WANTED_SLOT + if use bootstrap; then + WANTED_SLOT=${OLD_SLOT} + else + WANTED_SLOT=${SLOT} + fi G2CONF="${G2CONF} - VALAC=$(type -P valac-0.16) + VALAC=$(type -P valac-${WANTED_SLOT}) --disable-unversioned $(use_enable vapigen)" DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" -- cgit v1.2.3-65-gdbad