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

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

7 files changed, 32 insertions, 21 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/Manifest b/mail-mta/exim/Manifest
index 05cfd86ca6ab..90b629131876 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -21,17 +21,17 @@ DIST exim-4.75.tar.bz2 1600867 RMD160 2dfea8750cc95d057c0b804c0379f69fbed927a9 S
 DIST exim_469_dsn_1_3.patch 40222 RMD160 c744d6b5b388716e423529eda5b807aa8b9da2eb SHA1 3d1d7115dd80a974d40febbdef844d87860b8729 SHA256 605c520ea79507fd387772796c62303c5a49d1dc47b744b4267301096eedd49a
 DIST system_filter.exim.gz 3075 RMD160 47bcc6de402d896b73fd01d7f0d3c3ecbad9cf0b SHA1 384d138d8612f3a80b2b68f272b43cd69bc4411a SHA256 3a3471b486a09e0a0153f7b520e1eaf26d21b97d73ea8348bdc593c00eb1e437
 EBUILD exim-4.71.ebuild 10089 RMD160 188aa5ed30a04281beb9cae59a852f30c6f0b1c5 SHA1 4a03830842e0cee302ad8a82fbbc3f244b3f37eb SHA256 d6707de1d0619dfd3ea68120f62269094a6f6c63dae5266177568b3f4703aaf4
-EBUILD exim-4.72-r1.ebuild 10306 RMD160 faf68651ad191548aaec72a77800f3232c91b4a0 SHA1 7e7e5a5bdc3475541e7f45bf1797920f323e3c5a SHA256 e3a6f76373b4dfdcfc789fc8248fc02176e5f9afc487aee47ae7ac74000e86e4
-EBUILD exim-4.72.ebuild 10242 RMD160 6826fe71a8818e46240f72abfc99a6e8a5e89ed1 SHA1 64a55a38fda696c9588dbfaac6d972de8325fabf SHA256 0f144f8f971f0ed88b67392aa803cd94da5ee0c337640cd7544e8013fbcd0f8a
-EBUILD exim-4.74-r1.ebuild 10397 RMD160 d7905f026d795066f8797bb4796539b8921be7ab SHA1 6138cef572a0c9ef4f3cfd6f08fd7771dfdf1b90 SHA256 f520644895414bf833d9016776a6edcbb76f6958df27e7c29026e1622b09af0a
-EBUILD exim-4.74-r2.ebuild 10402 RMD160 daa7ffcd0de84a73a3ce55ccefbf14ec3c630e5a SHA1 478eadc5fe7d9fcf0591f992410243e34cdcabb8 SHA256 3edb22b8ba2794f626ab0723639972881425661f3ee2074960e014defbc4a973
-EBUILD exim-4.75.ebuild 10244 RMD160 63919664255a3a597fc4756340e96c351c201a30 SHA1 e2ea1fd197b30f7239ff2e2fa736a4d1d5a3134f SHA256 011924fddac8f5aae4c52c39738e34c4c7b247b5cb2708c40c04d60b3d794c52
-MISC ChangeLog 38888 RMD160 d959ca15c4cd198df2c20a7f9b4c710bf487a34f SHA1 079c1226094a25b7720cec6d84c9fe29591182ad SHA256 b46ce4fee1999ccf5abf94d0556237e34bf3d5720ba9e00a260f49683dbfa132
+EBUILD exim-4.72-r1.ebuild 10352 RMD160 e259bf98d4197e778fe608433650c5cfdec0655d SHA1 69f91a143f467c3c298ad551d80440c06864a6c8 SHA256 ce45149ab49b9e0b22af95be8affa3b3b05b73a7797df53cd03e562dc5f35c28
+EBUILD exim-4.72.ebuild 10288 RMD160 9e51b3905d85e9efc564727f9831ad2678b44a72 SHA1 f42c253d762274976c05fbc998763f812e946224 SHA256 f09b3182b970280ae79333c91d5ea074fe85fbf072d7eda427f5235cf1a6acb5
+EBUILD exim-4.74-r1.ebuild 10444 RMD160 439ae1edecb5574bfc162c04f32856f4751712bd SHA1 32c013c84826d867554e5bfa1122e565cfbd3309 SHA256 820328ddbb652b6a0c30aef66c9cf3c71394b6837833a99c5b5d1a861e3a3fdc
+EBUILD exim-4.74-r2.ebuild 10448 RMD160 f864ecaad8a329f93d6f65354eb9c24c1505cc9a SHA1 3cf4b693f404dc903c386a1ef3882a04dc7bf75f SHA256 69401dd653880d72972844346b705754f006ae4ced1e5be4547179e91b2c0ea8
+EBUILD exim-4.75.ebuild 10287 RMD160 b77ebd1519b26f97965159ec0208370c2224a6b0 SHA1 fec2250cdc652c40042433b43269049ed98a64e1 SHA256 0fc8df2f0b8d936d368ae21aa3e4c7508cab38bf75ee41b2897b8a457e7144ce
+MISC ChangeLog 39169 RMD160 e540f4815afe8baf2a9417f0ce957f985402e502 SHA1 d416c945320126afd7688b9d7d1c0ab8d9e9a3c4 SHA256 706886d4d4b270aec9afacffce75d20183f9251ec04d0b9550b60f863fae0dae
 MISC metadata.xml 1745 RMD160 9a78e06e7038d79e2eb1e08017a2a5e6b53aa63f SHA1 892aff75716b8b21fda4d61289cc388ce0b7a3d1 SHA256 6c25800686eeb918e03fbe6caa54c38512c843e8eca3a2db8783289a9b12bea5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (Darwin)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2pwaEACgkQX3X2B8XHTontsgCfailOQyK9CeGSrQpC2xqFkRD1
-M2kAnR6M+1HtieL59muIVM7+MXTYROur
-=4dwt
+iEYEARECAAYFAk2xp9QACgkQAiZjviIA2XgX+gCfRR4h2nFz8YM/XFa72ZpJcIjN
+gMEAn2vBX/bwt3ZrFydAbUQOiIuQPKLm
+=LK+h
 -----END PGP SIGNATURE-----
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