Prepare for new ssmtp with optional mta support (bug #289973). exim-4.71 is unported because of EAPI restrictions.

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

6 files changed, 22 insertions, 11 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index 2277965d358a..e39b838e7728 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/exim
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.186 2011/04/16 16:21:24 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.187 2011/04/22 16:07:44 flameeyes Exp $
+
+  22 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> exim-4.72.ebuild,
+  exim-4.72-r1.ebuild, exim-4.74-r1.ebuild, exim-4.74-r2.ebuild,
+  exim-4.75.ebuild:
+  Prepare for new ssmtp with optional mta support (bug #289973). exim-4.71 is
+  unported because of EAPI restrictions.
 
   16 Apr 2011; Fabian Groffen <grobian@gentoo.org> files/exim.logrotate:
   Reload exim, instead of (re)starting it on logrotate, such that exim won't
diff --git a/mail-mta/exim/exim-4.72-r1.ebuild b/mail-mta/exim/exim-4.72-r1.ebuild
index e97fee3d0ba6..75b50155e08a 100644
--- a/mail-mta/exim/exim-4.72-r1.ebuild
+++ b/mail-mta/exim/exim-4.72-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.72-r1.ebuild,v 1.3 2011/03/28 08:22:33 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.72-r1.ebuild,v 1.4 2011/04/22 16:07:44 flameeyes Exp $
 
 EAPI="3"
 
@@ -58,7 +58,8 @@ RDEPEND="${DEPEND}
 	!mail-mta/postfix
 	!mail-mta/qmail-ldap
 	!mail-mta/sendmail
-	!mail-mta/ssmtp
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
 	!net-mail/mailwrapper
 	>=net-mail/mailbase-0.00-r5
 	virtual/logger
diff --git a/mail-mta/exim/exim-4.72.ebuild b/mail-mta/exim/exim-4.72.ebuild
index 363d26d7ed7c..564b87499cd6 100644
--- a/mail-mta/exim/exim-4.72.ebuild
+++ b/mail-mta/exim/exim-4.72.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.72.ebuild,v 1.10 2011/03/28 08:22:33 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.72.ebuild,v 1.11 2011/04/22 16:07:44 flameeyes Exp $
 
 EAPI="3"
 
@@ -58,7 +58,8 @@ RDEPEND="${DEPEND}
 	!mail-mta/postfix
 	!mail-mta/qmail-ldap
 	!mail-mta/sendmail
-	!mail-mta/ssmtp
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
 	!net-mail/mailwrapper
 	>=net-mail/mailbase-0.00-r5
 	virtual/logger
diff --git a/mail-mta/exim/exim-4.74-r1.ebuild b/mail-mta/exim/exim-4.74-r1.ebuild
index dd510dc2a7b0..33fe66a0ad84 100644
--- a/mail-mta/exim/exim-4.74-r1.ebuild
+++ b/mail-mta/exim/exim-4.74-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.74-r1.ebuild,v 1.9 2011/03/28 08:22:33 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.74-r1.ebuild,v 1.10 2011/04/22 16:07:44 flameeyes Exp $
 
 EAPI="3"
 
@@ -58,7 +58,8 @@ RDEPEND="${DEPEND}
 	!mail-mta/postfix
 	!mail-mta/qmail-ldap
 	!mail-mta/sendmail
-	!mail-mta/ssmtp
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
 	!net-mail/mailwrapper
 	>=net-mail/mailbase-0.00-r5
 	virtual/logger
diff --git a/mail-mta/exim/exim-4.74-r2.ebuild b/mail-mta/exim/exim-4.74-r2.ebuild
index cc91d7d03d40..a08301ab2ea5 100644
--- a/mail-mta/exim/exim-4.74-r2.ebuild
+++ b/mail-mta/exim/exim-4.74-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.74-r2.ebuild,v 1.2 2011/03/28 08:22:33 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.74-r2.ebuild,v 1.3 2011/04/22 16:07:44 flameeyes Exp $
 
 EAPI="3"
 
@@ -58,7 +58,8 @@ RDEPEND="${DEPEND}
 	!mail-mta/postfix
 	!mail-mta/qmail-ldap
 	!mail-mta/sendmail
-	!mail-mta/ssmtp
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
 	!net-mail/mailwrapper
 	>=net-mail/mailbase-0.00-r5
 	virtual/logger
diff --git a/mail-mta/exim/exim-4.75.ebuild b/mail-mta/exim/exim-4.75.ebuild
index dd2f6bc60da6..5f2ff7954b46 100644
--- a/mail-mta/exim/exim-4.75.ebuild
+++ b/mail-mta/exim/exim-4.75.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.75.ebuild,v 1.1 2011/03/31 15:21:24 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.75.ebuild,v 1.2 2011/04/22 16:07:44 flameeyes Exp $
 
 EAPI="3"
 
@@ -58,7 +58,8 @@ RDEPEND="${DEPEND}
 	!mail-mta/postfix
 	!mail-mta/qmail-ldap
 	!mail-mta/sendmail
-	!mail-mta/ssmtp
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
 	!net-mail/mailwrapper
 	>=net-mail/mailbase-0.00-r5
 	virtual/logger