From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1002210-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 736CC1382C5
	for <garchives@archives.gentoo.org>; Thu,  8 Feb 2018 09:45:12 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 770B8E096C;
	Thu,  8 Feb 2018 09:45:11 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 40C29E096C
	for <gentoo-commits@lists.gentoo.org>; Thu,  8 Feb 2018 09:45:09 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id D171B335C39
	for <gentoo-commits@lists.gentoo.org>; Thu,  8 Feb 2018 09:45:07 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C5A71C5
	for <gentoo-commits@lists.gentoo.org>; Thu,  8 Feb 2018 09:45:06 +0000 (UTC)
From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" <grobian@gentoo.org>
Message-ID: <1518083079.a54014c3a59aa701cae98288d3ed9f8a04809a0c.grobian@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-mta/exim/
X-VCS-Repository: repo/gentoo
X-VCS-Files: mail-mta/exim/exim-4.89-r5.ebuild mail-mta/exim/exim-4.89.1.ebuild mail-mta/exim/exim-4.90.ebuild
X-VCS-Directories: mail-mta/exim/
X-VCS-Committer: grobian
X-VCS-Committer-Name: Fabian Groffen
X-VCS-Revision: a54014c3a59aa701cae98288d3ed9f8a04809a0c
X-VCS-Branch: master
Date: Thu,  8 Feb 2018 09:45:06 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 73ef2035-1fdc-411f-9c61-2936ef8f1b99
X-Archives-Hash: 4a889c5e32fcd93caabd5c1e9c94e9b2

commit:     a54014c3a59aa701cae98288d3ed9f8a04809a0c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  8 09:44:39 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Feb  8 09:44:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a54014c3

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

 mail-mta/exim/exim-4.89-r5.ebuild | 4 ++--
 mail-mta/exim/exim-4.89.1.ebuild  | 6 +++---
 mail-mta/exim/exim-4.90.ebuild    | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mail-mta/exim/exim-4.89-r5.ebuild b/mail-mta/exim/exim-4.89-r5.ebuild
index e2dd69cac65..5201343c00f 100644
--- 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 55536b6c0d3..6ccacc0529b 100644
--- 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 c6f82d8187f..e4f0e7b5fa0 100644
--- 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 )
 "