| 1 |
commit: 03c3ab00ef45e2b73688e28c3c2819be2a649a42 |
| 2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 18 06:30:55 2017 +0000 |
| 4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 25 08:20:55 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03c3ab00 |
| 7 |
|
| 8 |
ruby-ng.eclass: add support for EAPI=6 |
| 9 |
|
| 10 |
eclass/ruby-ng.eclass | 14 ++++++++++---- |
| 11 |
1 file changed, 10 insertions(+), 4 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass |
| 14 |
index c83778de87..cd6a5ae2ad 100644 |
| 15 |
--- a/eclass/ruby-ng.eclass |
| 16 |
+++ b/eclass/ruby-ng.eclass |
| 17 |
@@ -81,7 +81,7 @@ case ${EAPI} in |
| 18 |
0|1) |
| 19 |
die "Unsupported EAPI=${EAPI} (too old) for ruby-ng.eclass" ;; |
| 20 |
2|3) ;; |
| 21 |
- 4|5) |
| 22 |
+ 4|5|6) |
| 23 |
# S is no longer automatically assigned when it doesn't exist. |
| 24 |
S="${WORKDIR}" |
| 25 |
;; |
| 26 |
@@ -263,7 +263,7 @@ ruby_get_use_targets() { |
| 27 |
# confuse this function with ruby_implementation_depend(). |
| 28 |
# |
| 29 |
# @EXAMPLE: |
| 30 |
-# EAPI=4 |
| 31 |
+# EAPI=6 |
| 32 |
# RUBY_OPTIONAL=yes |
| 33 |
# |
| 34 |
# inherit ruby-ng |
| 35 |
@@ -286,7 +286,7 @@ if [[ ${RUBY_OPTIONAL} != yes ]]; then |
| 36 |
RDEPEND="${RDEPEND} $(ruby_implementations_depend)" |
| 37 |
|
| 38 |
case ${EAPI:-0} in |
| 39 |
- 4|5) |
| 40 |
+ 4|5|6) |
| 41 |
REQUIRED_USE+=" || ( $(ruby_get_use_targets) )" |
| 42 |
;; |
| 43 |
esac |
| 44 |
@@ -295,7 +295,7 @@ fi |
| 45 |
_ruby_invoke_environment() { |
| 46 |
old_S=${S} |
| 47 |
case ${EAPI} in |
| 48 |
- 4|5) |
| 49 |
+ 4|5|6) |
| 50 |
if [ -z "${RUBY_S}" ]; then |
| 51 |
sub_S=${P} |
| 52 |
else |
| 53 |
@@ -434,6 +434,12 @@ ruby-ng_src_prepare() { |
| 54 |
|
| 55 |
_ruby_invoke_environment all _ruby_apply_patches |
| 56 |
|
| 57 |
+ case ${EAPI} in |
| 58 |
+ 6) |
| 59 |
+ eapply_user |
| 60 |
+ ;; |
| 61 |
+ esac |
| 62 |
+ |
| 63 |
_PHASE="source copy" \ |
| 64 |
_ruby_each_implementation _ruby_source_copy |
Archives