Add support for vala 0.26

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 5079388361ee23628dc21b5d5296da645b727d10..7181058a4f7d300a6fd33494039efc6d60ab2677 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1468 2014/12/18 16:39:08 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1469 2014/12/21 12:25:49 eva Exp $
+
+  21 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org> vala.eclass:
+  Add support for vala 0.26.
 
   18 Dec 2014; Michael Palimaka <kensington@gentoo.org> cmake-utils.eclass:
   Declare local CPPFLAGS to avoid multiple appends in cmake-multilib.

diff --git a/eclass/vala.eclass b/eclass/vala.eclass
index f99e011f1830e6ee0c888202c2dcddd1f82bf70f..10da82d6b33a60196afc191b5c0c66b11f69449d 100644 (file)
--- a/eclass/vala.eclass
+++ b/eclass/vala.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vala.eclass,v 1.10 2014/11/11 11:00:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vala.eclass,v 1.11 2014/12/21 12:25:49 eva Exp $
 
 # @ECLASS: vala.eclass
 # @MAINTAINER:
@@ -31,8 +31,8 @@ VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.20}
 
 # @ECLASS-VARIABLE: VALA_MAX_API_VERSION
 # @DESCRIPTION:
-# Maximum vala API version (e.g. 0.22).
-VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.24}
+# Maximum vala API version (e.g. 0.26).
+VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.26}
 
 # @ECLASS-VARIABLE: VALA_USE_DEPEND
 # @DEFAULT_UNSET
@@ -65,7 +65,7 @@ vala_api_versions() {
 # VALA_MIN_API_VERSION
 vala_depend() {
        local u v versions=$(vala_api_versions)
-       [[ ${VALA_USE_DEPEND} ]] && u="[${VALA_USE_DEPEND}]"
+       [[ ${VALA_USE_DEPEND} ]] && u="[${VALA_USE_DEPEND}(+)]"
 
        echo -n "|| ("
        for v in ${versions}; do
@@ -80,7 +80,7 @@ vala_depend() {
 # VALA_MAX_API_VERSION, VALA_MIN_API_VERSION, and VALA_USE_DEPEND.
 vala_best_api_version() {
        local u v
-       [[ ${VALA_USE_DEPEND} ]] && u="[${VALA_USE_DEPEND}]"
+       [[ ${VALA_USE_DEPEND} ]] && u="[${VALA_USE_DEPEND}(+)]"
        for v in $(vala_api_versions); do
                has_version "dev-lang/vala:${v}${u}" && echo "${v}" && return
        done