Gentoo Archives: gentoo-dev

From: Hans de Graaff <graaff@g.o>
To: gentoo-dev@l.g.o
Cc: Hans de Graaff <graaff@g.o>
Subject: [gentoo-dev] [PATCH 3/4] eclass/ruby-ng.eclass: remove EAPI 4 support
Date: Thu, 15 Jul 2021 06:30:50
Message-Id: 20210715062926.26442-4-graaff@gentoo.org
In Reply to: [gentoo-dev] [PATCH 0/4] EAPI 8 support for ruby eclasses by Hans de Graaff
1 Signed-off-by: Hans de Graaff <graaff@g.o>
2 ---
3 eclass/ruby-ng.eclass | 22 +++++++++++-----------
4 1 file changed, 11 insertions(+), 11 deletions(-)
5
6 diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
7 index d8afa207661f..ac9c117c0c02 100644
8 --- a/eclass/ruby-ng.eclass
9 +++ b/eclass/ruby-ng.eclass
10 @@ -8,7 +8,7 @@
11 # Author: Diego E. Pettenò <flameeyes@g.o>
12 # Author: Alex Legler <a3li@g.o>
13 # Author: Hans de Graaff <graaff@g.o>
14 -# @SUPPORTED_EAPIS: 4 5 6 7 8
15 +# @SUPPORTED_EAPIS: 5 6 7 8
16 # @BLURB: An eclass for installing Ruby packages with proper support for multiple Ruby slots.
17 # @DESCRIPTION:
18 # The Ruby eclass is designed to allow an easier installation of Ruby packages
19 @@ -68,7 +68,7 @@
20
21 local inherits=""
22 case ${EAPI} in
23 - 4|5)
24 + 5)
25 inherits="eutils toolchain-funcs"
26 ;;
27 6)
28 @@ -87,7 +87,7 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_i
29 S="${WORKDIR}"
30
31 case ${EAPI} in
32 - 4|5|6|7|8) ;;
33 + 5|6|7|8) ;;
34 *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
35 esac
36
37 @@ -207,7 +207,7 @@ ruby_add_rdepend() {
38 1) ;;
39 2)
40 case ${EAPI} in
41 - 4|5|6)
42 + 5|6)
43 [[ "${GENTOO_DEV}" == "yes" ]] && eqawarn "You can now use the usual syntax in ruby_add_rdepend for $CATEGORY/$PF"
44 ruby_add_rdepend "$(_ruby_wrap_conditions "$1" "$2")"
45 return
46 @@ -229,7 +229,7 @@ ruby_add_rdepend() {
47 # Add the dependency as a test-dependency since we're going to
48 # execute the code during test phase.
49 case ${EAPI} in
50 - 4|5|6) DEPEND="${DEPEND} test? ( ${dependency} )" ;;
51 + 5|6) DEPEND="${DEPEND} test? ( ${dependency} )" ;;
52 *) BDEPEND="${BDEPEND} test? ( ${dependency} )" ;;
53 esac
54 if ! has test "$IUSE"; then
55 @@ -252,7 +252,7 @@ ruby_add_bdepend() {
56 1) ;;
57 2)
58 case ${EAPI} in
59 - 4|5|6)
60 + 5|6)
61 [[ "${GENTOO_DEV}" == "yes" ]] && eqawarn "You can now use the usual syntax in ruby_add_bdepend for $CATEGORY/$PF"
62 ruby_add_bdepend "$(_ruby_wrap_conditions "$1" "$2")"
63 return
64 @@ -270,7 +270,7 @@ ruby_add_bdepend() {
65 local dependency=$(_ruby_atoms_samelib "$1")
66
67 case ${EAPI} in
68 - 4|5|6) DEPEND="${DEPEND} $dependency" ;;
69 + 5|6) DEPEND="${DEPEND} $dependency" ;;
70 *) BDEPEND="${BDEPEND} $dependency" ;;
71 esac
72 RDEPEND="${RDEPEND}"
73 @@ -283,7 +283,7 @@ ruby_add_bdepend() {
74 # ruby_add_bdepend.
75 ruby_add_depend() {
76 case ${EAPI} in
77 - 4|5|6) die "only available in EAPI 7 and newer" ;;
78 + 5|6) die "only available in EAPI 7 and newer" ;;
79 *) ;;
80 esac
81
82 @@ -351,7 +351,7 @@ if [[ ${RUBY_OPTIONAL} != yes ]]; then
83 RDEPEND="${RDEPEND} $(ruby_implementations_depend)"
84 REQUIRED_USE+=" || ( $(ruby_get_use_targets) )"
85 case ${EAPI} in
86 - 4|5|6) ;;
87 + 5|6) ;;
88 *) BDEPEND="${BDEPEND} $(ruby_implementations_depend)" ;;
89 esac
90 fi
91 @@ -455,7 +455,7 @@ ruby-ng_src_unpack() {
92
93 _ruby_apply_patches() {
94 case ${EAPI} in
95 - 4|5)
96 + 5)
97 for patch in "${RUBY_PATCHES[@]}"; do
98 if [ -f "${patch}" ]; then
99 epatch "${patch}"
100 @@ -503,7 +503,7 @@ ruby-ng_src_prepare() {
101
102 # Handle PATCHES and user supplied patches via the default phase
103 case ${EAPI} in
104 - 4|5)
105 + 5)
106 ;;
107 *)
108 _ruby_invoke_environment all default
109 --
110 2.31.1