summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2017-02-18 07:30:55 +0100
committerHans de Graaff <graaff@gentoo.org>2017-02-25 09:20:55 +0100
commit03c3ab00ef45e2b73688e28c3c2819be2a649a42 (patch)
tree217930b96ab8b4e2d3f29598b6b3b0a21b3086bc /eclass/ruby-ng.eclass
parentdev-ruby/activerecord: restore x86 keyword (diff)
downloadgentoo-03c3ab00ef45e2b73688e28c3c2819be2a649a42.tar.gz
gentoo-03c3ab00ef45e2b73688e28c3c2819be2a649a42.tar.bz2
gentoo-03c3ab00ef45e2b73688e28c3c2819be2a649a42.zip
ruby-ng.eclass: add support for EAPI=6
Diffstat (limited to 'eclass/ruby-ng.eclass')
-rw-r--r--eclass/ruby-ng.eclass14
1 files changed, 10 insertions, 4 deletions
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index c83778de876..cd6a5ae2ad1 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -81,7 +81,7 @@ case ${EAPI} in
0|1)
die "Unsupported EAPI=${EAPI} (too old) for ruby-ng.eclass" ;;
2|3) ;;
- 4|5)
+ 4|5|6)
# S is no longer automatically assigned when it doesn't exist.
S="${WORKDIR}"
;;
@@ -263,7 +263,7 @@ ruby_get_use_targets() {
# confuse this function with ruby_implementation_depend().
#
# @EXAMPLE:
-# EAPI=4
+# EAPI=6
# RUBY_OPTIONAL=yes
#
# inherit ruby-ng
@@ -286,7 +286,7 @@ if [[ ${RUBY_OPTIONAL} != yes ]]; then
RDEPEND="${RDEPEND} $(ruby_implementations_depend)"
case ${EAPI:-0} in
- 4|5)
+ 4|5|6)
REQUIRED_USE+=" || ( $(ruby_get_use_targets) )"
;;
esac
@@ -295,7 +295,7 @@ fi
_ruby_invoke_environment() {
old_S=${S}
case ${EAPI} in
- 4|5)
+ 4|5|6)
if [ -z "${RUBY_S}" ]; then
sub_S=${P}
else
@@ -434,6 +434,12 @@ ruby-ng_src_prepare() {
_ruby_invoke_environment all _ruby_apply_patches
+ case ${EAPI} in
+ 6)
+ eapply_user
+ ;;
+ esac
+
_PHASE="source copy" \
_ruby_each_implementation _ruby_source_copy