diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 38938 -> 38936 bytes | |||
| -rw-r--r-- | eclass/ninja-utils.eclass | 21 |
2 files changed, 9 insertions, 12 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex f1066187c570..2e55614be1ab 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/ninja-utils.eclass b/eclass/ninja-utils.eclass index 859938cb3047..8b42c5849522 100644 --- a/eclass/ninja-utils.eclass +++ b/eclass/ninja-utils.eclass @@ -55,17 +55,7 @@ _NINJA_UTILS_ECLASS=1 inherit multiprocessing -case "${NINJA}" in - ninja) - NINJA_DEPEND=">=dev-util/ninja-1.8.2" - ;; - samu) - NINJA_DEPEND="dev-util/samurai" - ;; - *) - NINJA_DEPEND="" - ;; -esac +NINJA_DEPEND="app-alternatives/ninja" # @FUNCTION: get_NINJAOPTS # @DESCRIPTION: @@ -84,7 +74,14 @@ get_NINJAOPTS() { # by the supplied arguments. This function dies if ninja fails. It # also supports being called via 'nonfatal'. eninja() { - [[ -n "${NINJA_DEPEND}" ]] || ewarn "Unknown value '${NINJA}' for \${NINJA}" + case "${NINJA}" in + ninja|samu) + ;; + *) + ewarn "Unknown value '${NINJA}' for \${NINJA}" + ;; + esac + local v case "${NINJA_VERBOSE}" in OFF) ;; |