| 1 |
From: Hans de Graaff <graaff@g.o> |
| 2 |
|
| 3 |
jruby has been removed from the tree for quite some time and is not |
| 4 |
used at all anymore in ebuilds. This also drops an inherit of |
| 5 |
java-utils-2 which blocks updating to EAPI 7. |
| 6 |
--- |
| 7 |
eclass/ruby-ng.eclass | 12 +----------- |
| 8 |
1 file changed, 1 insertion(+), 11 deletions(-) |
| 9 |
|
| 10 |
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass |
| 11 |
index 21cbc5d99595..d3264743c89a 100644 |
| 12 |
--- a/eclass/ruby-ng.eclass |
| 13 |
+++ b/eclass/ruby-ng.eclass |
| 14 |
@@ -73,7 +73,7 @@ case ${EAPI} in |
| 15 |
;; |
| 16 |
esac |
| 17 |
|
| 18 |
-inherit ${inherits} java-utils-2 multilib toolchain-funcs ruby-utils |
| 19 |
+inherit ${inherits} multilib toolchain-funcs ruby-utils |
| 20 |
|
| 21 |
EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_install pkg_setup |
| 22 |
|
| 23 |
@@ -402,8 +402,6 @@ ruby-ng_pkg_setup() { |
| 24 |
# before doing anything; by leaving the parameters empty we know |
| 25 |
# it's a special case. |
| 26 |
_ruby_each_implementation |
| 27 |
- |
| 28 |
- has ruby_targets_jruby ${IUSE} && use ruby_targets_jruby && java-pkg_setup-vm |
| 29 |
} |
| 30 |
|
| 31 |
# @FUNCTION: ruby-ng_src_unpack |
| 32 |
@@ -629,9 +627,6 @@ ruby_get_implementation() { |
| 33 |
local ruby=${RUBY:-$(type -p ruby 2>/dev/null)} |
| 34 |
|
| 35 |
case $(${ruby} --version) in |
| 36 |
- *jruby*) |
| 37 |
- echo "jruby" |
| 38 |
- ;; |
| 39 |
*rubinius*) |
| 40 |
echo "rbx" |
| 41 |
;; |
| 42 |
@@ -713,11 +708,6 @@ ruby-ng_cucumber() { |
| 43 |
;; |
| 44 |
esac |
| 45 |
|
| 46 |
- if [[ ${RUBY} == *jruby ]]; then |
| 47 |
- ewarn "Skipping cucumber tests on JRuby (unsupported)." |
| 48 |
- return 0 |
| 49 |
- fi |
| 50 |
- |
| 51 |
${RUBY} -S cucumber ${cucumber_params} "$@" || die "cucumber failed" |
| 52 |
} |
| 53 |
|
| 54 |
-- |
| 55 |
2.21.0 |
Archives