Gentoo Archives: gentoo-dev

From: graaff@g.o
To: gentoo-dev@l.g.o
Cc: Hans de Graaff <graaff@g.o>
Subject: [gentoo-dev] [PATCH 3/6] ruby-ng.eclass: make presence of RUBY_PATCHES fatal
Date: Sun, 21 Jul 2019 07:55:31
Message-Id: 20190721075510.31524-3-graaff@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/6] ruby-ng.eclass: add EAPI 7 support by graaff@gentoo.org
1 From: Hans de Graaff <graaff@g.o>
2
3 The eqawarn in EAPI 6 is easy to mis and may lead to patches
4 "silently" not being applied. die on this in EAPI 7 to make this
5 situation more explicit.
6
7 Signed-off-by: Hans de Graaff <graaff@g.o>
8 ---
9 eclass/ruby-ng.eclass | 7 ++++++-
10 1 file changed, 6 insertions(+), 1 deletion(-)
11
12 diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
13 index 7fef1085a9dd..59d4450a9954 100644
14 --- a/eclass/ruby-ng.eclass
15 +++ b/eclass/ruby-ng.eclass
16 @@ -420,11 +420,16 @@ _ruby_apply_patches() {
17 fi
18 done
19 ;;
20 - *)
21 + 6)
22 if [[ -n ${RUBY_PATCHES[@]} ]]; then
23 eqawarn "RUBY_PATCHES is no longer supported, use PATCHES instead"
24 fi
25 ;;
26 + *)
27 + if [[ -n ${RUBY_PATCHES[@]} ]]; then
28 + die "RUBY_PATCHES is no longer supported, use PATCHES instead"
29 + fi
30 + ;;
31 esac
32
33 # This is a special case: instead of executing just in the special
34 --
35 2.21.0