commit:     dcf96e7e3e94c2c12f7024f748d596a0295126a0
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 14 11:04:22 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 11:04:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcf96e7e

mail-mta/exim-4.93.0.3: block gnutls with dkim, thanks Bernd Feige

Closes: https://bugs.gentoo.org/702812
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 mail-mta/exim/exim-4.93.0.3.ebuild | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/mail-mta/exim/exim-4.93.0.3.ebuild 
b/mail-mta/exim/exim-4.93.0.3.ebuild
index 7543ff98849..e8a98ba5417 100644
--- a/mail-mta/exim/exim-4.93.0.3.ebuild
+++ b/mail-mta/exim/exim-4.93.0.3.ebuild
@@ -5,16 +5,16 @@ EAPI="7"
 
 inherit db-use toolchain-funcs multilib pam systemd
 
-IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc 
exiscan-acl gnutls idn 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"
+IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc 
exiscan-acl gnutls idn 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"
 REQUIRED_USE="
        arc? ( dkim spf )
        dane? ( ssl !gnutls )
        dmarc? ( dkim spf )
+       dkim? ( ssl !gnutls )
        gnutls? ( ssl )
        pkcs11? ( ssl )
        spf? ( exiscan-acl )
        srs? ( exiscan-acl )
-       !ssl? ( !dkim )
 "
 # NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
 # for x86 and amd64 only, due to this, repoman won't allow depending on
@@ -46,12 +46,14 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
        pam? ( sys-libs/pam )
        tcpd? ( sys-apps/tcp-wrappers )
        ssl? (
-               !libressl? ( dev-libs/openssl:0= )
-               libressl? ( dev-libs/libressl:= )
-       )
-       gnutls? (
-               net-libs/gnutls:0=[pkcs11?]
-               dev-libs/libtasn1
+               gnutls? (
+                       net-libs/gnutls:0=[pkcs11?]
+                       dev-libs/libtasn1
+               )
+               !gnutls? (
+                       !libressl? ( dev-libs/openssl:0= )
+                       libressl? ( dev-libs/libressl:= )
+               )
        )
        ldap? ( >=net-nds/openldap-2.0.7 )
        nis? (

Reply via email to