1 |
Signed-off-by: Ulrich Müller <ulm@g.o> |
2 |
--- |
3 |
eclass/ruby-ng.eclass | 38 +++++++++----------------------------- |
4 |
1 file changed, 9 insertions(+), 29 deletions(-) |
5 |
|
6 |
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass |
7 |
index c43d5b4d9826..167aab755f3a 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: 5 6 7 8 |
15 |
+# @SUPPORTED_EAPIS: 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 |
@@ -67,9 +67,6 @@ |
20 |
# passed to "grep -E" to remove reporting of these shared objects. |
21 |
|
22 |
case ${EAPI} in |
23 |
- 5) |
24 |
- inherit eutils toolchain-funcs |
25 |
- ;; |
26 |
6) |
27 |
inherit estack toolchain-funcs |
28 |
;; |
29 |
@@ -86,7 +83,7 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_i |
30 |
S="${WORKDIR}" |
31 |
|
32 |
case ${EAPI} in |
33 |
- 5|6|7|8) ;; |
34 |
+ 6|7|8) ;; |
35 |
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
36 |
esac |
37 |
|
38 |
@@ -214,7 +211,7 @@ ruby_add_rdepend() { |
39 |
1) ;; |
40 |
2) |
41 |
case ${EAPI} in |
42 |
- 5|6) |
43 |
+ 6) |
44 |
[[ "${GENTOO_DEV}" == "yes" ]] && eqawarn "You can now use the usual syntax in ruby_add_rdepend for $CATEGORY/$PF" |
45 |
ruby_add_rdepend "$(_ruby_wrap_conditions "$1" "$2")" |
46 |
return |
47 |
@@ -236,7 +233,7 @@ ruby_add_rdepend() { |
48 |
# Add the dependency as a test-dependency since we're going to |
49 |
# execute the code during test phase. |
50 |
case ${EAPI} in |
51 |
- 5|6) DEPEND="${DEPEND} test? ( ${dependency} )" ;; |
52 |
+ 6) DEPEND="${DEPEND} test? ( ${dependency} )" ;; |
53 |
*) BDEPEND="${BDEPEND} test? ( ${dependency} )" ;; |
54 |
esac |
55 |
if ! has test "$IUSE"; then |
56 |
@@ -261,7 +258,7 @@ ruby_add_bdepend() { |
57 |
1) ;; |
58 |
2) |
59 |
case ${EAPI} in |
60 |
- 5|6) |
61 |
+ 6) |
62 |
[[ "${GENTOO_DEV}" == "yes" ]] && eqawarn "You can now use the usual syntax in ruby_add_bdepend for $CATEGORY/$PF" |
63 |
ruby_add_bdepend "$(_ruby_wrap_conditions "$1" "$2")" |
64 |
return |
65 |
@@ -279,7 +276,7 @@ ruby_add_bdepend() { |
66 |
local dependency=$(_ruby_atoms_samelib "$1") |
67 |
|
68 |
case ${EAPI} in |
69 |
- 5|6) DEPEND="${DEPEND} $dependency" ;; |
70 |
+ 6) DEPEND="${DEPEND} $dependency" ;; |
71 |
*) BDEPEND="${BDEPEND} $dependency" ;; |
72 |
esac |
73 |
RDEPEND="${RDEPEND}" |
74 |
@@ -294,7 +291,7 @@ ruby_add_depend() { |
75 |
debug-print-function ${FUNCNAME} "${@}" |
76 |
|
77 |
case ${EAPI} in |
78 |
- 5|6) die "only available in EAPI 7 and newer" ;; |
79 |
+ 6) die "only available in EAPI 7 and newer" ;; |
80 |
*) ;; |
81 |
esac |
82 |
|
83 |
@@ -368,7 +365,7 @@ if [[ ${RUBY_OPTIONAL} != yes ]]; then |
84 |
RDEPEND="${RDEPEND} $(ruby_implementations_depend)" |
85 |
REQUIRED_USE+=" || ( $(ruby_get_use_targets) )" |
86 |
case ${EAPI} in |
87 |
- 5|6) ;; |
88 |
+ 6) ;; |
89 |
*) BDEPEND="${BDEPEND} $(ruby_implementations_depend)" ;; |
90 |
esac |
91 |
fi |
92 |
@@ -476,17 +473,6 @@ ruby-ng_src_unpack() { |
93 |
|
94 |
_ruby_apply_patches() { |
95 |
case ${EAPI} in |
96 |
- 5) |
97 |
- for patch in "${RUBY_PATCHES[@]}"; do |
98 |
- if [ -f "${patch}" ]; then |
99 |
- epatch "${patch}" |
100 |
- elif [ -f "${FILESDIR}/${patch}" ]; then |
101 |
- epatch "${FILESDIR}/${patch}" |
102 |
- else |
103 |
- die "Cannot find patch ${patch}" |
104 |
- fi |
105 |
- done |
106 |
- ;; |
107 |
6) |
108 |
if [[ -n ${RUBY_PATCHES[@]} ]]; then |
109 |
eqawarn "RUBY_PATCHES is no longer supported, use PATCHES instead" |
110 |
@@ -525,13 +511,7 @@ ruby-ng_src_prepare() { |
111 |
find . -name '._*' -delete |
112 |
|
113 |
# Handle PATCHES and user supplied patches via the default phase |
114 |
- case ${EAPI} in |
115 |
- 5) |
116 |
- ;; |
117 |
- *) |
118 |
- _ruby_invoke_environment all default |
119 |
- ;; |
120 |
- esac |
121 |
+ _ruby_invoke_environment all default |
122 |
|
123 |
_ruby_invoke_environment all _ruby_apply_patches |
124 |
|
125 |
-- |
126 |
2.35.1 |