1 |
W dniu 19.02.2017, nie o godzinie 09∶03 +0100, użytkownik Hans de Graaff |
2 |
napisał: |
3 |
> jruby has not been supported for some time. Removing support for it in |
4 |
> EAPI 6 allows us to drop the java-utils-2 eclass which in turn also |
5 |
> inherits eutils. |
6 |
> --- |
7 |
> eclass/ruby-ng.eclass | 10 +++++++--- |
8 |
> 1 file changed, 7 insertions(+), 3 deletions(-) |
9 |
> |
10 |
> diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass |
11 |
> index bc42e66..8a3bc18 100644 |
12 |
> --- a/eclass/ruby-ng.eclass |
13 |
> +++ b/eclass/ruby-ng.eclass |
14 |
> @@ -76,11 +76,11 @@ |
15 |
> local inherits="" |
16 |
> case ${EAPI} in |
17 |
> 2|3|4|5) |
18 |
> - inherits="eutils" |
19 |
> + inherits="eutils java-utils-2" |
20 |
> ;; |
21 |
> esac |
22 |
> |
23 |
> -inherit ${inherits} java-utils-2 multilib toolchain-funcs ruby-utils |
24 |
> +inherit ${inherits} multilib toolchain-funcs ruby-utils |
25 |
> |
26 |
> EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_install pkg_setup |
27 |
> |
28 |
> @@ -385,7 +385,11 @@ ruby-ng_pkg_setup() { |
29 |
> # it's a special case. |
30 |
> _ruby_each_implementation |
31 |
> |
32 |
> - has ruby_targets_jruby ${IUSE} && use ruby_targets_jruby && java-pkg_setup-vm |
33 |
> + case ${EAPI} in |
34 |
> + 2|3|4|5) |
35 |
> + has ruby_targets_jruby ${IUSE} && use ruby_targets_jruby && java-pkg_setup-vm |
36 |
|
37 |
Hmm, don't you have to change something more to make jruby disappear |
38 |
from the targets? Like, ban it in ruby_get_use_targets() or something |
39 |
like that? |
40 |
|
41 |
> + ;; |
42 |
> + esac |
43 |
> } |
44 |
> |
45 |
> # @FUNCTION: ruby-ng_src_unpack |
46 |
|
47 |
-- |
48 |
Best regards, |
49 |
Michał Górny |