mail-mta/exim: USE=dane requires USE=ssl, bug #646836

Thanks Rolf Eike Beer for reporting.

Closes: https://bugs.gentoo.org/646836
Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/mail-mta/exim/exim-4.89-r5.ebuild b/mail-mta/exim/exim-4.89-r5.ebuild
index e2dd69cac658a31a7f81c7960846a74adbf72b9a..5201343c00fd20aeff5d13e3fc92c5d0568a916e 100644 (file)
--- a/mail-mta/exim/exim-4.89-r5.ebuild
+++ b/mail-mta/exim/exim-4.89-r5.ebuild
@@ -7,9 +7,9 @@ inherit eutils toolchain-funcs multilib pam systemd
 
 IUSE="dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X elibc_glibc"
 REQUIRED_USE="
-       dane? ( !gnutls )
+       dane? ( ssl !gnutls )
        dmarc? ( spf dkim )
-       pkcs11? ( gnutls )
+       pkcs11? ( ssl gnutls )
        spf? ( exiscan-acl )
        srs? ( exiscan-acl )
 "

diff --git a/mail-mta/exim/exim-4.89.1.ebuild b/mail-mta/exim/exim-4.89.1.ebuild
index 55536b6c0d355bb32e8bee27a839358413e20d8f..6ccacc0529b16b0eaad75f5be3791fd39b505daf 100644 (file)
--- a/mail-mta/exim/exim-4.89.1.ebuild
+++ b/mail-mta/exim/exim-4.89.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -7,9 +7,9 @@ inherit eutils toolchain-funcs multilib pam systemd
 
 IUSE="dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X elibc_glibc"
 REQUIRED_USE="
-       dane? ( !gnutls )
+       dane? ( ssl !gnutls )
        dmarc? ( spf dkim )
-       pkcs11? ( gnutls )
+       pkcs11? ( ssl gnutls )
        spf? ( exiscan-acl )
        srs? ( exiscan-acl )
 "

diff --git a/mail-mta/exim/exim-4.90.ebuild b/mail-mta/exim/exim-4.90.ebuild
index c6f82d8187f94f97ab21727495daa0a8febee76a..e4f0e7b5fa0a51fde18bd0c44ff8ba89ef28c194 100644 (file)
--- a/mail-mta/exim/exim-4.90.ebuild
+++ b/mail-mta/exim/exim-4.90.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -7,9 +7,9 @@ inherit eutils toolchain-funcs multilib pam systemd
 
 IUSE="dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X elibc_glibc"
 REQUIRED_USE="
-       dane? ( !gnutls )
+       dane? ( ssl !gnutls )
        dmarc? ( spf dkim )
-       pkcs11? ( gnutls )
+       pkcs11? ( ssl gnutls )
        spf? ( exiscan-acl )
        srs? ( exiscan-acl )
 "