1 |
On Tue, 2019-12-31 at 05:34 +0100, Michał Górny wrote: |
2 |
> Using 2-style USE dependencies on packages not having the flag |
3 |
> in question is forbidden by PMS. |
4 |
> |
5 |
> Signed-off-by: Michał Górny <mgorny@g.o> |
6 |
> --- |
7 |
> eclass/ruby-ng.eclass | 6 +++--- |
8 |
> 1 file changed, 3 insertions(+), 3 deletions(-) |
9 |
> |
10 |
> diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass |
11 |
> index db701d81f4fc..c2b9442ef489 100644 |
12 |
> --- a/eclass/ruby-ng.eclass |
13 |
> +++ b/eclass/ruby-ng.eclass |
14 |
> @@ -137,7 +137,7 @@ ruby_samelib() { |
15 |
> local res= |
16 |
> for _ruby_implementation in $(_ruby_get_all_impls); do |
17 |
> has -${_ruby_implementation} $@ || \ |
18 |
> - res="${res}ruby_targets_${_ruby_implementation} |
19 |
> ?," |
20 |
> + res="${res}ruby_targets_${_ruby_implementation} |
21 |
> ?(-)," |
22 |
|
23 |
https://dev.gentoo.org/~ulm/pms/head/pms.html#x1-830008.3.4 |
24 |
In a 4-style use dependency, the flag name may *immediately* be |
25 |
followed by a default specified by either (+) or (-) |
26 |
|
27 |
https://github.com/gentoo-mirror/gentoo/blob/stable/metadata/md5-cache/dev-libs/boost-1.72.0 |
28 |
>=dev-python/numpy-1.17[python_targets_python3_6(-)?,...] |
29 |
|
30 |
Given that you ran this through CI, this smells of dead code... |
31 |
|
32 |
> done |
33 |
> |
34 |
> echo "[${res%,}]" |
35 |
> @@ -151,9 +151,9 @@ _ruby_atoms_samelib_generic() { |
36 |
> "||" | "(" | ")" | *"?") |
37 |
> echo "${token}" ;; |
38 |
> *]) |
39 |
> - echo |
40 |
> "${token%[*}[RUBYTARGET,${token/*[}" ;; |
41 |
> + echo "${token%[*}[RUBYTARGET(- |
42 |
> ),${token/*[}" ;; |
43 |
> *) |
44 |
> - echo "${token}[RUBYTARGET]" ;; |
45 |
> + echo "${token}[RUBYTARGET(-)]" ;; |
46 |
> esac |
47 |
> done |
48 |
> echo ")" |