1 |
commit: 2187e3945052a0b85037fc0e73ad6deed019a7a2 |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 18 06:41:48 2018 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 20 07:07:40 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2187e394 |
7 |
|
8 |
ruby-ng.eclass: drop support for jruby |
9 |
|
10 |
jruby has been removed from the tree for quite some time and is not |
11 |
used at all anymore in ebuilds. This also drops an inherit of |
12 |
java-utils-2. |
13 |
|
14 |
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> |
15 |
|
16 |
eclass/ruby-ng.eclass | 12 +----------- |
17 |
1 file changed, 1 insertion(+), 11 deletions(-) |
18 |
|
19 |
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass |
20 |
index 90c36cd86e4..a6c4c3396b3 100644 |
21 |
--- a/eclass/ruby-ng.eclass |
22 |
+++ b/eclass/ruby-ng.eclass |
23 |
@@ -73,7 +73,7 @@ case ${EAPI} in |
24 |
;; |
25 |
esac |
26 |
|
27 |
-inherit ${inherits} java-utils-2 multilib toolchain-funcs ruby-utils |
28 |
+inherit ${inherits} multilib toolchain-funcs ruby-utils |
29 |
|
30 |
EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_install pkg_setup |
31 |
|
32 |
@@ -402,8 +402,6 @@ ruby-ng_pkg_setup() { |
33 |
# before doing anything; by leaving the parameters empty we know |
34 |
# it's a special case. |
35 |
_ruby_each_implementation |
36 |
- |
37 |
- has ruby_targets_jruby ${IUSE} && use ruby_targets_jruby && java-pkg_setup-vm |
38 |
} |
39 |
|
40 |
# @FUNCTION: ruby-ng_src_unpack |
41 |
@@ -619,9 +617,6 @@ ruby_get_implementation() { |
42 |
local ruby=${RUBY:-$(type -p ruby 2>/dev/null)} |
43 |
|
44 |
case $(${ruby} --version) in |
45 |
- *jruby*) |
46 |
- echo "jruby" |
47 |
- ;; |
48 |
*rubinius*) |
49 |
echo "rbx" |
50 |
;; |
51 |
@@ -703,11 +698,6 @@ ruby-ng_cucumber() { |
52 |
;; |
53 |
esac |
54 |
|
55 |
- if [[ ${RUBY} == *jruby ]]; then |
56 |
- ewarn "Skipping cucumber tests on JRuby (unsupported)." |
57 |
- return 0 |
58 |
- fi |
59 |
- |
60 |
${RUBY} -S cucumber ${cucumber_params} "$@" || die "cucumber failed" |
61 |
} |