[gentoo-commits] repo/gentoo:master commit in: eclass/

[Hans de Graaff]

commit:     7399625d4d97ebfe9ea0de62dbfde0cbcb9e2c09
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 07:53:53 2019 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 05:44:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7399625d

ruby-ng.eclass: future proof EAPI checks

Explicitly list old EAPIs but use a wildcard for the latest EAPI, so
that these changes will also be used by default in newer EAPIs.

Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 eclass/ruby-ng.eclass | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index 05c4c41a0bf..8dc3e166125 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -71,7 +71,7 @@ case ${EAPI} in
        4|5)
                inherits="eutils"
                ;;
-       6)
+       *)
                inherits="estack"
                ;;
 esac
@@ -417,7 +417,7 @@ _ruby_apply_patches() {
                                fi
                        done
                        ;;
-               6)
+               *)
                        if [[ -n ${RUBY_PATCHES[@]} ]]; then
                           eqawarn "RUBY_PATCHES is no longer supported, use 
PATCHES instead"
                        fi
@@ -449,7 +449,9 @@ ruby-ng_src_prepare() {
 
        # Handle PATCHES and user supplied patches via the default phase
        case ${EAPI} in
-               6)
+               4|5)
+                       ;;
+               *)
                        _ruby_invoke_environment all default
                        ;;
        esac