[gentoo-commits] proj/gnome:master commit in: eclass/

[Gilles Dartiguelongue]

commit:     f793496cbf2ce2827019e775c75c99397945e718
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  2 14:08:55 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov  2 14:08:55 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f793496c

eclass/vala.eclass: use on-if-missing USE flag notation

As discussed on the mail alias.

---
 eclass/vala.eclass | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/eclass/vala.eclass b/eclass/vala.eclass
index 38feda2..c2c6282 100644
--- a/eclass/vala.eclass
+++ b/eclass/vala.eclass
@@ -53,15 +53,11 @@ 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
-               if [[ "$v" = "0.26" ]]; then
-                       echo -n " dev-lang/vala:${v}"
-               else
-                       echo -n " dev-lang/vala:${v}${u}"
-               fi
+               echo -n " dev-lang/vala:${v}${u}"
        done
        echo " )"
 }
@@ -72,13 +68,9 @@ 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
-               if [[ "$v" = "0.26" ]]; then
-                       has_version "dev-lang/vala:${v}" && echo "${v}" && 
return
-               else
-                       has_version "dev-lang/vala:${v}${u}" && echo "${v}" && 
return
-               fi
+               has_version "dev-lang/vala:${v}${u}" && echo "${v}" && return
        done
 }