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

[Hans de Graaff]

commit:     c37a064beb441dcefd21457ac9d3a15cc55817f2
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 21 06:27:50 2019 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 06:09:41 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c37a064b

ruby-ng.eclass: make presence of RUBY_PATCHES fatal

The eqawarn in EAPI 6 is easy to mis and may lead to patches
"silently" not being applied. die on this in EAPI 7 to make this
situation more explicit.

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

 eclass/ruby-ng.eclass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index 7fef1085a9d..59d4450a995 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -420,11 +420,16 @@ _ruby_apply_patches() {
                                fi
                        done
                        ;;
-               *)
+               6)
                        if [[ -n ${RUBY_PATCHES[@]} ]]; then
                           eqawarn "RUBY_PATCHES is no longer supported, use 
PATCHES instead"
                        fi
                        ;;
+               *)
+                       if [[ -n ${RUBY_PATCHES[@]} ]]; then
+                               die "RUBY_PATCHES is no longer supported, use 
PATCHES instead"
+                       fi
+                       ;;
        esac
 
        # This is a special case: instead of executing just in the special