| 1 |
On Sat, Apr 16, 2016 at 3:31 PM, Anthony G. Basile <blueness@g.o> wrote: |
| 2 |
> On 4/16/16 3:27 PM, Anthony G. Basile wrote: |
| 3 |
>> On 4/16/16 3:05 PM, Michał Górny wrote: |
| 4 |
>>> On Sat, 16 Apr 2016 19:01:02 +0000 (UTC) |
| 5 |
>>> "Anthony G. Basile" <blueness@g.o> wrote: |
| 6 |
>> |
| 7 |
>> Okay for review. Sorry for the wrap. |
| 8 |
>> |
| 9 |
>> diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass |
| 10 |
>> index 002de76..fc2debd 100644 |
| 11 |
>> --- a/eclass/ssl-cert.eclass |
| 12 |
>> +++ b/eclass/ssl-cert.eclass |
| 13 |
>> @@ -30,10 +30,10 @@ |
| 14 |
>> |
| 15 |
>> if [[ "${SSL_DEPS_SKIP}" == "0" ]]; then |
| 16 |
>> if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then |
| 17 |
>> - DEPEND="${SSL_CERT_USE}? ( dev-libs/openssl:0= )" |
| 18 |
>> + DEPEND="${SSL_CERT_USE}? ( !libressl? ( |
| 19 |
>> dev-libs/openssl:0= ) libressl? ( dev-libs/librssl:0= ) )" |
| 20 |
>> IUSE="${SSL_CERT_USE}" |
| 21 |
>> else |
| 22 |
>> - DEPEND="dev-libs/openssl:0=" |
| 23 |
>> + DEPEND="!libressl? ( dev-libs/openssl:0= ) libressl? ( |
| 24 |
>> dev-libs/librssl:0= )" |
| 25 |
>> fi |
| 26 |
>> fi |
| 27 |
>> |
| 28 |
>> |
| 29 |
>> |
| 30 |
> |
| 31 |
> Actually the eclass also needs IUSE="${IUSE} libressl" |
| 32 |
|
| 33 |
As discussed in IRC, the slot-operator is unneeded, and has been removed. |
| 34 |
|
| 35 |
And I don't really see the point in the libressl USE flag in this |
| 36 |
case; I think that was only needed so the slot-operator would resolve |
| 37 |
correctly. |
| 38 |
|
| 39 |
My suggestion would be this: |
| 40 |
|
| 41 |
DEPEND="${SSL_CERT_USE}? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )" |
Archives