1 |
commit: 5f85ec1c9f3b5a5eaa84068d010282f4677c9606 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 30 19:02:42 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 5 10:04:54 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f85ec1c |
7 |
|
8 |
ruby-ng.eclass: Include (-) in RUBY_TARGETS USE-dependencies |
9 |
|
10 |
Using 2-style USE dependencies on packages not having the flag |
11 |
in question is forbidden by PMS. |
12 |
|
13 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
14 |
|
15 |
eclass/ruby-ng.eclass | 8 ++++---- |
16 |
1 file changed, 4 insertions(+), 4 deletions(-) |
17 |
|
18 |
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass |
19 |
index db701d81f4f..f92547b49a9 100644 |
20 |
--- a/eclass/ruby-ng.eclass |
21 |
+++ b/eclass/ruby-ng.eclass |
22 |
@@ -1,4 +1,4 @@ |
23 |
-# Copyright 1999-2019 Gentoo Authors |
24 |
+# Copyright 1999-2020 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
# @ECLASS: ruby-ng.eclass |
28 |
@@ -137,7 +137,7 @@ ruby_samelib() { |
29 |
local res= |
30 |
for _ruby_implementation in $(_ruby_get_all_impls); do |
31 |
has -${_ruby_implementation} $@ || \ |
32 |
- res="${res}ruby_targets_${_ruby_implementation}?," |
33 |
+ res="${res}ruby_targets_${_ruby_implementation}(-)?," |
34 |
done |
35 |
|
36 |
echo "[${res%,}]" |
37 |
@@ -151,9 +151,9 @@ _ruby_atoms_samelib_generic() { |
38 |
"||" | "(" | ")" | *"?") |
39 |
echo "${token}" ;; |
40 |
*]) |
41 |
- echo "${token%[*}[RUBYTARGET,${token/*[}" ;; |
42 |
+ echo "${token%[*}[RUBYTARGET(-),${token/*[}" ;; |
43 |
*) |
44 |
- echo "${token}[RUBYTARGET]" ;; |
45 |
+ echo "${token}[RUBYTARGET(-)]" ;; |
46 |
esac |
47 |
done |
48 |
echo ")" |