| 1 |
--- |
| 2 |
eclass/ruby-ng.eclass | 14 ++++++++++---- |
| 3 |
1 file changed, 10 insertions(+), 4 deletions(-) |
| 4 |
|
| 5 |
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass |
| 6 |
index c83778d..cd6a5ae 100644 |
| 7 |
--- a/eclass/ruby-ng.eclass |
| 8 |
+++ b/eclass/ruby-ng.eclass |
| 9 |
@@ -81,7 +81,7 @@ case ${EAPI} in |
| 10 |
0|1) |
| 11 |
die "Unsupported EAPI=${EAPI} (too old) for ruby-ng.eclass" ;; |
| 12 |
2|3) ;; |
| 13 |
- 4|5) |
| 14 |
+ 4|5|6) |
| 15 |
# S is no longer automatically assigned when it doesn't exist. |
| 16 |
S="${WORKDIR}" |
| 17 |
;; |
| 18 |
@@ -263,7 +263,7 @@ ruby_get_use_targets() { |
| 19 |
# confuse this function with ruby_implementation_depend(). |
| 20 |
# |
| 21 |
# @EXAMPLE: |
| 22 |
-# EAPI=4 |
| 23 |
+# EAPI=6 |
| 24 |
# RUBY_OPTIONAL=yes |
| 25 |
# |
| 26 |
# inherit ruby-ng |
| 27 |
@@ -286,7 +286,7 @@ if [[ ${RUBY_OPTIONAL} != yes ]]; then |
| 28 |
RDEPEND="${RDEPEND} $(ruby_implementations_depend)" |
| 29 |
|
| 30 |
case ${EAPI:-0} in |
| 31 |
- 4|5) |
| 32 |
+ 4|5|6) |
| 33 |
REQUIRED_USE+=" || ( $(ruby_get_use_targets) )" |
| 34 |
;; |
| 35 |
esac |
| 36 |
@@ -295,7 +295,7 @@ fi |
| 37 |
_ruby_invoke_environment() { |
| 38 |
old_S=${S} |
| 39 |
case ${EAPI} in |
| 40 |
- 4|5) |
| 41 |
+ 4|5|6) |
| 42 |
if [ -z "${RUBY_S}" ]; then |
| 43 |
sub_S=${P} |
| 44 |
else |
| 45 |
@@ -434,6 +434,12 @@ ruby-ng_src_prepare() { |
| 46 |
|
| 47 |
_ruby_invoke_environment all _ruby_apply_patches |
| 48 |
|
| 49 |
+ case ${EAPI} in |
| 50 |
+ 6) |
| 51 |
+ eapply_user |
| 52 |
+ ;; |
| 53 |
+ esac |
| 54 |
+ |
| 55 |
_PHASE="source copy" \ |
| 56 |
_ruby_each_implementation _ruby_source_copy |
| 57 |
|
| 58 |
-- |
| 59 |
2.10.2 |
Archives