summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2009-07-24 09:06:31 +0000
committerFabian Groffen <grobian@gentoo.org>2009-07-24 09:06:31 +0000
commitbff4c97df67cf4b563cd9046d1dd2d590b2de7ca (patch)
treebb30c21189fb5f1ea1fc20720ec9a3c92d326041 /mail-mta/exim
parentVersion bump. Remove old patch (diff)
downloadhistorical-bff4c97df67cf4b563cd9046d1dd2d590b2de7ca.tar.gz
historical-bff4c97df67cf4b563cd9046d1dd2d590b2de7ca.tar.bz2
historical-bff4c97df67cf4b563cd9046d1dd2d590b2de7ca.zip
block net-mail/mailwrapper since Exim will now collide on the sendmail symlink
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'mail-mta/exim')
-rw-r--r--mail-mta/exim/ChangeLog5
-rw-r--r--mail-mta/exim/Manifest4
-rw-r--r--mail-mta/exim/exim-4.69-r3.ebuild3
3 files changed, 7 insertions, 5 deletions
diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index bd91a7381947..1fbce5ae2ebe 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,6 @@
# ChangeLog for mail-mta/exim
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.143 2009/07/24 08:54:11 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.144 2009/07/24 09:06:31 grobian Exp $
*exim-4.69-r3 (24 Jul 2009)
@@ -10,7 +10,8 @@
The big bug-fix (bug #82772), remove mailwrapper support. After long
discussions, and many possibilities, it was finally decided to remove
mailwrapper instead of fixing it, hopefully followed by some other approach
- soon. Added cross-compile patch, in preparation for bug #266591.
+ soon. Block mailwrapper since Exim will now collide on the sendmail
+ symlink. Added cross-compile patch, in preparation for bug #266591.
24 Jul 2009; Fabian Groffen <grobian@gentoo.org> exim-4.69-r2.ebuild:
Exim uses libiconv for header expansion, make this dependency explicit and
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 32e44d7bf710..28aaedbeacd7 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -14,7 +14,7 @@ AUX pam.d-exim 101 RMD160 8ad4e0a05068ae20d5e8d401146456945d068322 SHA1 bdca3fb3
DIST exim-4.69.tar.bz2 1658939 RMD160 ae97c807c63f858ba4a0ab402677225da9337d05 SHA1 321e238b6e6b32498110511ce72a911538305a39 SHA256 18e856cfdb682ba8e8ccb943ab538734d34d0ecefd63465ecc5430bc15915069
DIST exiscan.conf 22113 RMD160 e52b77f656b3ba2105e833075d1368f41e414d64 SHA1 74dc6e30f49402f5e6fefc280ea325d17f6af8c4 SHA256 f8cc731d3225a902461e05c0997df23bfd231ea8d5bf33a9aba5783bc6e0c964
DIST system_filter.exim.gz 3075 RMD160 47bcc6de402d896b73fd01d7f0d3c3ecbad9cf0b SHA1 384d138d8612f3a80b2b68f272b43cd69bc4411a SHA256 3a3471b486a09e0a0153f7b520e1eaf26d21b97d73ea8348bdc593c00eb1e437
-EBUILD exim-4.69-r3.ebuild 9954 RMD160 b80177ee5eefbf74f32d620a6c8e28a32cd19307 SHA1 4cfdbc2417dbdd825b1909167370fbb773d65b1a SHA256 7e8706b251af067f94c42f9ffe084daa815fa6792c205ce2dbfe2de5740dc159
+EBUILD exim-4.69-r3.ebuild 9977 RMD160 8216cb032a98e08a6e4d52ac3cabe8752c15f5f3 SHA1 2f36a7985391eb7578c50ed792f09773f3baa075 SHA256 cefde9100403296a9f9895a2b3c3dbeae1f402ca70b1699b0c3718cba737c20f
EBUILD exim-4.69.ebuild 9906 RMD160 9b244dbbde9d454ea7be15bc46071e99943ec163 SHA1 ab0cfcfbe15b98681d79e077dab3195b0c1aadbe SHA256 6f5a4c76b40df44e203d86afbeba637b1a752349e0e3568cc08127fea204f915
-MISC ChangeLog 32338 RMD160 cee4328ed3d1f83c4326cb56ebf6ae123279ee40 SHA1 1e86b2214871dd685dd84bff3b63089e75bca7dc SHA256 ff37685959d0dd4b8afe02f2076e52773766ab883bb058ba8affbf79633e3551
+MISC ChangeLog 32412 RMD160 38837b4481df3a991cded49a2aa6fd74ea4fb971 SHA1 3b5e671d2819cd7b3c52b7340fb4d6c9bbe79436 SHA256 43c05578b42273806ea6d390a9572de19216b494e64865fbaf021e94708cf565
MISC metadata.xml 1586 RMD160 c9b4546115c6db062a7fb9370039bb7e3b44ebd5 SHA1 933e217c55a4ee72b166119ab4f0dde986cc9825 SHA256 40a3ea558abbab45d65e7b79df9c56280be359e5bafca10195bd9d4b30e3c60d
diff --git a/mail-mta/exim/exim-4.69-r3.ebuild b/mail-mta/exim/exim-4.69-r3.ebuild
index ca7733e26faf..6f78fd158c95 100644
--- a/mail-mta/exim/exim-4.69-r3.ebuild
+++ b/mail-mta/exim/exim-4.69-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.69-r3.ebuild,v 1.1 2009/07/24 08:54:11 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.69-r3.ebuild,v 1.2 2009/07/24 09:06:31 grobian Exp $
inherit eutils toolchain-funcs multilib pam
@@ -47,6 +47,7 @@ DEPEND=">=sys-apps/sed-4.0.5
# added X check for #57206
RDEPEND="${DEPEND}
!virtual/mta
+ !net-mail/mailwrapper
>=net-mail/mailbase-0.00-r5
virtual/logger"