From: Hans de Graaff <graaff@gentoo.org>
Date: Sun, 21 Jul 2019 06:27:50 +0000 (+0200)
Subject: ruby-ng.eclass: make presence of RUBY_PATCHES fatal
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c37a064beb441dcefd21457ac9d3a15cc55817f2;p=gentoo.git

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@gentoo.org>
---

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index 7fef1085a9dd..59d4450a9954 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