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