Making mailwrapper an optional dep

16 files changed, 353 insertions, 65 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index ed5ec8878b1a..b07456093716 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for net-mail/exim
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.1 2004/05/30 02:35:57 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.2 2004/05/31 02:43:38 g2boojum Exp $
+
+*exim-4.34-r1 (30 May 2004)
+
+  30 May 2004; Grant Goodyear <g2boojum@gentoo.org> files/mailer.conf,
+  exim-4.24-r3.ebuild, exim-4.30-r1.ebuild, exim-4.30.ebuild,
+  exim-4.31.ebuild, exim-4.32-r1.ebuild, exim-4.32.ebuild,
+  exim-4.33-r1.ebuild, exim-4.33.ebuild, +exim-4.34-r1.ebuild,
+  exim-4.34.ebuild:
+  New revision w/ "mailwrapper" as an optional dep.
+  
+  Removed mailwrapper as a dep from a number of packages where the
+  package was not, in fact, actually using mailwrapper.  (In fact,
+  the package was clobbering /usr/sbin/sendmail w/ a symlink.)
+  
+  In the masked ebuild I also removed the "maildir" use flag, instead
+  keying on ! mbox.  We're going to remove maildir as a USE flag soon.
 
 *exim-4.24-r2 (29 May 2004)
 
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index dad482af45eb..6683d623af1a 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,55 +1,58 @@
-MD5 68fc403ba2c98ccba281939085cb9052 files/auth_conf.sub 775
+MD5 bcdb1b9de20491565fb1aee8be16fe87 exim-4.32-r1.ebuild 7572
+MD5 481c8676419e48af982f97dc7df08025 exim-4.20-r2.ebuild 6343
+MD5 cd764adf83ac0466519637ccae5a01b5 exim-4.30.ebuild 6315
+MD5 91ac8acf5ef9934a8f4cb1c538fd915a exim-4.21.ebuild 6158
+MD5 38c1df7487b5584c9bb5a55d1000159b exim-4.12.ebuild 5450
+MD5 94a2cfa43bc76ad2aae17eeaef259ec1 exim-4.32.ebuild 7571
+MD5 c8dc3b8d534d29aae6ddffe36ae90a1b exim-4.14.ebuild 5498
+MD5 44d05b5155edda55af65fffad43c2a0b exim-4.24-r1.ebuild 6387
+MD5 69fbefa5729a0e52f234975e26f1c069 exim-4.20-r1.ebuild 6250
+MD5 be54116d7aa2990156e0502c06ac9c1c exim-4.34.ebuild 7591
+MD5 ba81ab7a9874d20bef6a71bca036c255 exim-4.20.ebuild 5585
+MD5 47cb73ac2865327adcf2a7826013d508 exim-4.34-r1.ebuild 7872
+MD5 e232b15a7d72e68e451068854d446806 exim-4.30-r1.ebuild 7128
+MD5 bd7543a337df92a109b8fc428a691d34 .exim-4.34-r1.ebuild.swp 24576
+MD5 ae15541dfb5dbda94e0b3664b4f18746 exim-4.24-r3.ebuild 6343
+MD5 b27caa480d7f9caaa587918d79f6cac3 exim-4.31.ebuild 7124
+MD5 0e715a250526b8d1feb3d4f177a6aadd exim-4.22.ebuild 6372
+MD5 62d0752ea41bdde07655d018cc32b831 exim-4.33-r1.ebuild 7628
+MD5 66c79030d67455cb2575595f4ef46f04 exim-4.33.ebuild 7572
+MD5 f4010cf44f0103841f57fde78a1025e8 exim-4.24.ebuild 6372
+MD5 9ee024e5cafca329162f61d4218eb332 ChangeLog 11204
+MD5 2740551990b84ebe06064444228eece3 exim-4.10.ebuild 6207
+MD5 33dd717372c0b5d66b421e65dc0e45e3 metadata.xml 1065
+MD5 057de12afa38ba603e09829ab1a62cd7 exim-4.24-r2.ebuild 6292
+MD5 4c0b8ee742360c08f0bc0b526fcaad10 files/system_filter.exim 8120
 MD5 0cb2ffe88c81fd7ac8429b5a19d58b35 files/configure 16346
+MD5 369b42cafcbe5631c2d03cbbfd4aeddd files/exim-4.10-gentoo.diff 1889
+MD5 f442b68d435598831bab8536ade071b8 files/exim.confd 62
+MD5 5127f4b2ace5cf148e2ac21e101ac967 files/exim-4.33-r1-header-syntax.patch 1017
+MD5 f03fc637e154f9ca79d991e71eb063bf files/exim-4.30-conf.patch 887
+MD5 04ba8d65b73d23eb58c6d3e4accbed7f files/digest-exim-4.20-r1 198
+MD5 0cc15aecabaeace6ff4cdd1a462b9eb0 files/digest-exim-4.20-r2 62
+MD5 117455c076e246e7c02d5fa464dd4be7 files/digest-exim-4.24-r1 132
+MD5 117455c076e246e7c02d5fa464dd4be7 files/digest-exim-4.24-r2 132
+MD5 117455c076e246e7c02d5fa464dd4be7 files/digest-exim-4.24-r3 132
+MD5 56085a2d36e00a6a48cacc7baeb5f451 files/digest-exim-4.30-r1 62
+MD5 3aebdc3dd469414ad4c1f0219c9db79a files/digest-exim-4.32-r1 132
+MD5 904b31332322109b4d2a382d6a253412 files/digest-exim-4.33-r1 133
+MD5 6a964dbcdbca2690ed166e9a59cebe84 files/digest-exim-4.34-r1 133
+MD5 eb249c90af3ab11e5a4d307e184a75ac files/exiscan.conf 22113
+MD5 68fc403ba2c98ccba281939085cb9052 files/auth_conf.sub 775
+MD5 622b726ea7b32aae93a8fe9f3c2af9cd files/exim-4.20-maildir.patch 478
+MD5 ed92061bdbc00a3d47f49db1e047c09d files/mailer.conf 1300
+MD5 5d5aabea7d56a91803df1312c04d32c0 files/exim-4.14-tail.patch 446
+MD5 d230e0fa45f2b65d5bc50c0879c40148 files/pam.d-exim 101
+MD5 11d6c3384f24bf241f30327ec6efdb2d files/exim.rc6 513
 MD5 34def7b529693beda5b84c422d25a878 files/digest-exim-4.10 128
 MD5 100ab1bbdfea50083ecce4bf78af5cc9 files/digest-exim-4.12 129
 MD5 091d3610d9a2a0b879f543cc070ef933 files/digest-exim-4.14 128
 MD5 04ba8d65b73d23eb58c6d3e4accbed7f files/digest-exim-4.20 198
-MD5 04ba8d65b73d23eb58c6d3e4accbed7f files/digest-exim-4.20-r1 198
-MD5 0cc15aecabaeace6ff4cdd1a462b9eb0 files/digest-exim-4.20-r2 62
 MD5 e62c9a744fd2c944af3dbc881156574b files/digest-exim-4.21 132
 MD5 9be54e4b44d4b7b6899302a1f3f74007 files/digest-exim-4.22 132
 MD5 117455c076e246e7c02d5fa464dd4be7 files/digest-exim-4.24 132
-MD5 117455c076e246e7c02d5fa464dd4be7 files/digest-exim-4.24-r1 132
-MD5 369b42cafcbe5631c2d03cbbfd4aeddd files/exim-4.10-gentoo.diff 1889
-MD5 5d5aabea7d56a91803df1312c04d32c0 files/exim-4.14-tail.patch 446
-MD5 622b726ea7b32aae93a8fe9f3c2af9cd files/exim-4.20-maildir.patch 478
-MD5 f442b68d435598831bab8536ade071b8 files/exim.confd 62
-MD5 190c2d133e62eaba6ee4417721cb88c2 files/exim.rc6 512
-MD5 eb249c90af3ab11e5a4d307e184a75ac files/exiscan.conf 22113
-MD5 d230e0fa45f2b65d5bc50c0879c40148 files/pam.d-exim 101
-MD5 0883fe67a34142a57e6f39ed9419cbee files/system_filter.exim 8118
-MD5 117455c076e246e7c02d5fa464dd4be7 files/digest-exim-4.24-r2 132
-MD5 117455c076e246e7c02d5fa464dd4be7 files/digest-exim-4.24-r3 132
-MD5 fd6118c0a56fcc3a96052bf1ff19fd1f files/mailer.conf 995
 MD5 11bc429bd869bdc9709fabe221ac29a7 files/digest-exim-4.30 132
-MD5 56085a2d36e00a6a48cacc7baeb5f451 files/digest-exim-4.30-r1 62
 MD5 1e04cfda5987a9c439533a59dd015050 files/digest-exim-4.31 132
-MD5 f03fc637e154f9ca79d991e71eb063bf files/exim-4.30-conf.patch 887
 MD5 63b21a335f1b7603157772f27480f7ad files/digest-exim-4.32 132
-MD5 3aebdc3dd469414ad4c1f0219c9db79a files/digest-exim-4.32-r1 132
 MD5 904b31332322109b4d2a382d6a253412 files/digest-exim-4.33 133
-MD5 904b31332322109b4d2a382d6a253412 files/digest-exim-4.33-r1 133
 MD5 6a964dbcdbca2690ed166e9a59cebe84 files/digest-exim-4.34 133
-MD5 5127f4b2ace5cf148e2ac21e101ac967 files/exim-4.33-r1-header-syntax.patch 1017
-MD5 63f6c3cedbfa89c7db9d52751a7b3564 ChangeLog 10346
-MD5 e8d015031c1ba9f3fe8d6aff0da7c1eb exim-4.10.ebuild 6208
-MD5 c409a3b94a9eaa9cdef89c4909f74fd6 exim-4.12.ebuild 5452
-MD5 e8d311ea42154e4337ea2b28b13703a2 exim-4.14.ebuild 5499
-MD5 a6198501adbfd5442ee74850bd03f336 exim-4.20-r1.ebuild 6251
-MD5 e0e5f637714ad7d1f4bc8fd0ee11d481 exim-4.20-r2.ebuild 6344
-MD5 982d6357e4f7e92bbb13eed40cd5bfd7 exim-4.20.ebuild 5586
-MD5 e8a2b98e20226a304625e2dadb996f78 exim-4.21.ebuild 6159
-MD5 93fb6233ef963440efa718ee9e166499 exim-4.22.ebuild 6373
-MD5 518347c10f9c70ca24f68917bf66bbcb exim-4.24-r1.ebuild 6388
-MD5 40d6c41571cfd527a9721a4a42412439 exim-4.24.ebuild 6373
-MD5 33dd717372c0b5d66b421e65dc0e45e3 metadata.xml 1065
-MD5 057de12afa38ba603e09829ab1a62cd7 exim-4.24-r2.ebuild 6292
-MD5 63c04234282e1e6cac60d7e5c33744eb exim-4.24-r3.ebuild 6338
-MD5 63c79a7a506446743e9fcd37d0a2e0f1 exim-4.30-r1.ebuild 7124
-MD5 716eeb4b64c876fe0f3e1f22a7ae2a76 exim-4.30.ebuild 6310
-MD5 bcbb6ce241eed2432468ba4bc6455169 exim-4.31.ebuild 7120
-MD5 482c7b79ff60dfedc0e74e209390f775 exim-4.32.ebuild 7567
-MD5 5c33ac93eaeeedff608a372b506d8a32 exim-4.32-r1.ebuild 7567
-MD5 ef9b89a399a9f57e2922d6c73c425849 exim-4.33.ebuild 7567
-MD5 277168924dc59b4411949878d449029a exim-4.33-r1.ebuild 7623
-MD5 a5ebdc382d271789abbae898b08e2188 exim-4.34.ebuild 7586
diff --git a/mail-mta/exim/exim-4.10.ebuild b/mail-mta/exim/exim-4.10.ebuild
index d53a3ed6ab9b..3560a29454ae 100644
--- a/mail-mta/exim/exim-4.10.ebuild
+++ b/mail-mta/exim/exim-4.10.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Updated to exim-4 by Ben Lutgens <lamer@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.10.ebuild,v 1.1 2004/05/30 02:35:57 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.10.ebuild,v 1.2 2004/05/31 02:43:38 g2boojum Exp $
 
 IUSE="tcpd ssl postgres mysql ldap pam"
 
diff --git a/mail-mta/exim/exim-4.24-r2.ebuild b/mail-mta/exim/exim-4.24-r2.ebuild
index 44d26efe576f..709dd1af7465 100644
--- a/mail-mta/exim/exim-4.24-r2.ebuild
+++ b/mail-mta/exim/exim-4.24-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.24-r2.ebuild,v 1.2 2004/05/31 02:43:38 g2boojum Exp $
 
 inherit eutils
 
diff --git a/mail-mta/exim/exim-4.24-r3.ebuild b/mail-mta/exim/exim-4.24-r3.ebuild
index 9e41fc0e44f4..87caa92eaf20 100644
--- a/mail-mta/exim/exim-4.24-r3.ebuild
+++ b/mail-mta/exim/exim-4.24-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.24-r3.ebuild,v 1.2 2004/05/31 02:43:38 g2boojum Exp $
 
 inherit eutils
 
@@ -30,7 +30,7 @@ DEPEND=">=sys-apps/sed-4.0.5
 	postgres? ( >=dev-db/postgresql-7 )
 	sasl? ( >=dev-libs/cyrus-sasl-2.1.14 )"
 RDEPEND="${DEPEND}
-	net-mail/mailwrapper
+	=net-mail/mailwrapper-0.1
 	>=net-mail/mailbase-0.00-r5"
 
 src_unpack() {
diff --git a/mail-mta/exim/exim-4.30-r1.ebuild b/mail-mta/exim/exim-4.30-r1.ebuild
index 7fc08635cfef..2c2f6bf683dd 100644
--- a/mail-mta/exim/exim-4.30-r1.ebuild
+++ b/mail-mta/exim/exim-4.30-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.30-r1.ebuild,v 1.1 2004/05/30 02:35:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.30-r1.ebuild,v 1.2 2004/05/31 02:43:38 g2boojum Exp $
 
 inherit eutils
 
@@ -30,7 +30,6 @@ DEPEND=">=sys-apps/sed-4.0.5
 	postgres? ( >=dev-db/postgresql-7 )
 	sasl? ( >=dev-libs/cyrus-sasl-2.1.14 )"
 RDEPEND="${DEPEND}
-	net-mail/mailwrapper
 	>=net-mail/mailbase-0.00-r5"
 
 src_unpack() {
diff --git a/mail-mta/exim/exim-4.30.ebuild b/mail-mta/exim/exim-4.30.ebuild
index cd020031d21c..b05b3e4cef46 100644
--- a/mail-mta/exim/exim-4.30.ebuild
+++ b/mail-mta/exim/exim-4.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.30.ebuild,v 1.2 2004/05/31 02:43:38 g2boojum Exp $
 
 inherit eutils
 
@@ -30,7 +30,7 @@ DEPEND=">=sys-apps/sed-4.0.5
 	postgres? ( >=dev-db/postgresql-7 )
 	sasl? ( >=dev-libs/cyrus-sasl-2.1.14 )"
 RDEPEND="${DEPEND}
-	net-mail/mailwrapper
+	=net-mail/mailwrapper-0.1
 	>=net-mail/mailbase-0.00-r5"
 
 src_unpack() {
diff --git a/mail-mta/exim/exim-4.31.ebuild b/mail-mta/exim/exim-4.31.ebuild
index b728ed01e5cd..bb6ef9b5604e 100644
--- a/mail-mta/exim/exim-4.31.ebuild
+++ b/mail-mta/exim/exim-4.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.31.ebuild,v 1.1 2004/05/30 02:35:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.31.ebuild,v 1.2 2004/05/31 02:43:38 g2boojum Exp $
 
 inherit eutils
 
@@ -30,7 +30,6 @@ DEPEND=">=sys-apps/sed-4.0.5
 	postgres? ( >=dev-db/postgresql-7 )
 	sasl? ( >=dev-libs/cyrus-sasl-2.1.14 )"
 RDEPEND="${DEPEND}
-	net-mail/mailwrapper
 	>=net-mail/mailbase-0.00-r5"
 
 src_unpack() {
diff --git a/mail-mta/exim/exim-4.32-r1.ebuild b/mail-mta/exim/exim-4.32-r1.ebuild
index dbc68776381c..6a25d322ba2e 100644
--- a/mail-mta/exim/exim-4.32-r1.ebuild
+++ b/mail-mta/exim/exim-4.32-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.32-r1.ebuild,v 1.1 2004/05/30 02:35:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.32-r1.ebuild,v 1.2 2004/05/31 02:43:38 g2boojum Exp $
 
 inherit eutils
 
@@ -30,7 +30,6 @@ DEPEND=">=sys-apps/sed-4.0.5
 	postgres? ( >=dev-db/postgresql-7 )
 	sasl? ( >=dev-libs/cyrus-sasl-2.1.14 )"
 RDEPEND="${DEPEND}
-	net-mail/mailwrapper
 	>=net-mail/mailbase-0.00-r5"
 
 src_unpack() {
diff --git a/mail-mta/exim/exim-4.32.ebuild b/mail-mta/exim/exim-4.32.ebuild
index 895324f9e3d6..259189d17de1 100644
--- a/mail-mta/exim/exim-4.32.ebuild
+++ b/mail-mta/exim/exim-4.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.32.ebuild,v 1.1 2004/05/30 02:35:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.32.ebuild,v 1.2 2004/05/31 02:43:38 g2boojum Exp $
 
 inherit eutils
 
@@ -30,7 +30,6 @@ DEPEND=">=sys-apps/sed-4.0.5
 	postgres? ( >=dev-db/postgresql-7 )
 	sasl? ( >=dev-libs/cyrus-sasl-2.1.14 )"
 RDEPEND="${DEPEND}
-	net-mail/mailwrapper
 	>=net-mail/mailbase-0.00-r5"
 
 src_unpack() {
diff --git a/mail-mta/exim/exim-4.33-r1.ebuild b/mail-mta/exim/exim-4.33-r1.ebuild
index 1f3a09ec8075..46444c011079 100644
--- a/mail-mta/exim/exim-4.33-r1.ebuild
+++ b/mail-mta/exim/exim-4.33-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.33-r1.ebuild,v 1.1 2004/05/30 02:35:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.33-r1.ebuild,v 1.2 2004/05/31 02:43:38 g2boojum Exp $
 
 inherit eutils
 
@@ -30,7 +30,7 @@ DEPEND=">=sys-apps/sed-4.0.5
 	postgres? ( >=dev-db/postgresql-7 )
 	sasl? ( >=dev-libs/cyrus-sasl-2.1.14 )"
 RDEPEND="${DEPEND}
-	net-mail/mailwrapper
+	=net-mail/mailwrapper-0.1
 	>=net-mail/mailbase-0.00-r5"
 
 src_unpack() {
diff --git a/mail-mta/exim/exim-4.33.ebuild b/mail-mta/exim/exim-4.33.ebuild
index 708fe545c41a..295a8e56ee2a 100644
--- a/mail-mta/exim/exim-4.33.ebuild
+++ b/mail-mta/exim/exim-4.33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.33.ebuild,v 1.1 2004/05/30 02:35:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.33.ebuild,v 1.2 2004/05/31 02:43:38 g2boojum Exp $
 
 inherit eutils
 
@@ -30,7 +30,6 @@ DEPEND=">=sys-apps/sed-4.0.5
 	postgres? ( >=dev-db/postgresql-7 )
 	sasl? ( >=dev-libs/cyrus-sasl-2.1.14 )"
 RDEPEND="${DEPEND}
-	net-mail/mailwrapper
 	>=net-mail/mailbase-0.00-r5"
 
 src_unpack() {
diff --git a/mail-mta/exim/exim-4.34-r1.ebuild b/mail-mta/exim/exim-4.34-r1.ebuild
new file mode 100644
index 000000000000..1597cfff1abc
--- /dev/null
+++ b/mail-mta/exim/exim-4.34-r1.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.34-r1.ebuild,v 1.1 2004/05/31 02:43:38 g2boojum Exp $
+
+inherit eutils
+
+IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl mailwrapper lmtp ipv6 sasl wildlsearch dnsdb perl mbox X exiscan"
+
+EXISCANACL_VER=${PV}-21
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.bz2
+	exiscan-acl? ( http://duncanthrax.net/exiscan-acl/exiscan-acl-${EXISCANACL_VER}.patch )"
+HOMEPAGE="http://www.exim.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~amd64 ~alpha ~hppa ~ppc"
+
+PROVIDE="virtual/mta"
+DEPEND=">=sys-apps/sed-4.0.5
+	dev-lang/perl
+	>=sys-libs/db-3.2
+	>=dev-libs/libpcre-3.4
+	pam? ( >=sys-libs/pam-0.75 )
+	tcpd? ( sys-apps/tcp-wrappers )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	mysql? ( >=dev-db/mysql-3.23.28 )
+	postgres? ( >=dev-db/postgresql-7 )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.14 )"
+RDEPEND="${DEPEND}
+	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
+	!mailwrapper? ( !virtual/mta )
+	>=net-mail/mailbase-0.00-r5"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	local myconf
+
+	epatch ${FILESDIR}/exim-4.14-tail.patch
+
+	if ! use mbox; then
+		einfo "Patching maildir support into exim.conf"
+		epatch ${FILESDIR}/exim-4.20-maildir.patch
+	fi
+
+	sed -i "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'/etc/mail/aliases'" ${S}/src/configure.default
+	cp ${S}/src/configure.default ${S}/src/configure.default.orig
+		epatch ${FILESDIR}/exim-4.30-conf.patch
+
+	if use exiscan-acl; then
+		einfo "Patching exican-acl support into exim ${PV}.."
+		epatch ${DISTDIR}/exiscan-acl-${EXISCANACL_VER}.patch
+	fi
+	# Includes Typo fix for bug 47106
+	sed -e "48i\CFLAGS=${CFLAGS}" \
+		-e "s:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \
+		-e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \
+		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=/usr/sbin:" \
+		-e "s:COMPRESS_COMMAND=/opt/gnu/bin/gzip:COMPRESS_COMMAND=/usr/bin/gzip:" \
+		-e "s:ZCAT_COMMAND=/opt/gnu/bin/zcat:ZCAT_COMMAND=/usr/bin/zcat:" \
+		-e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=/etc/exim/exim.conf:" \
+		-e "s:EXIM_MONITOR=eximon.bin:# EXIM_MONITOR=eximon.bin:" \
+		-e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=/usr/share/info:" \
+		-e "s:# LOG_FILE_PATH=/var/log/exim_%slog:LOG_FILE_PATH=/var/log/exim/exim_%s.log:" \
+		-e "s:# PID_FILE_PATH=/var/lock/exim.pid:PID_FILE_PATH=/var/run/exim.pid:" \
+		-e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=/var/spool/exim:" \
+		-e "s:# SUPPORT_MAILDIR=yes:SUPPORT_MAILDIR=yes:" \
+		-e "s:# SUPPORT_MAILSTORE=yes:SUPPORT_MAILSTORE=yes:" \
+		-e "s:EXIM_USER=:EXIM_USER=mail:" \
+		-e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \
+		src/EDITME > Local/Makefile
+
+	cd Local
+	# enable optional exim_monitor support via X use flag bug #46778
+	if use X; then
+		einfo "Configuring eximon"
+		cp ../exim_monitor/EDITME eximon.conf
+		sed -i "s:# EXIM_MONITOR=eximon.bin:EXIM_MONITOR=eximon.bin:" Makefile
+	fi
+	#These next two should resolve 37964
+	if use perl; then
+		sed -i "s:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" Makefile
+	fi
+	if use mbox; then
+		sed -i "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" Makefile
+	fi
+	if use pam; then
+		sed -i "s:# \(SUPPORT_PAM=yes\):\1:" Makefile
+		myconf="${myconf} -lpam"
+	fi
+	if use sasl; then
+		sed -i "s:# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux:CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl2/mux:" \
+		Makefile
+		myconf="${myconf} -lsasl2"
+	fi
+	if use tcpd; then
+		sed -i "s:# \(USE_TCP_WRAPPERS=yes\):\1:" Makefile
+		myconf="${myconf} -lwrap"
+	fi
+	if use lmtp; then
+		sed -i "s:# \(TRANSPORT_LMTP=yes\):\1:" Makefile
+	fi
+	if use ipv6; then
+		echo "HAVE_IPV6=YES" >> Makefile
+		#To fix bug 41196
+		echo "IPV6_USE_INET_PTON=yes" >> Makefile
+	fi
+
+	if [ -n "$myconf" ] ; then
+		echo "EXTRALIBS=${myconf} ${LDFLAGS}" >> Makefile
+	fi
+
+	cd ${S}
+	if use ssl; then
+		sed -i \
+			-e "s:# \(SUPPORT_TLS=yes\):\1:" \
+			-e "s:# \(TLS_LIBS=-lssl -lcrypto\):\1:" Local/Makefile
+	fi
+
+	LOOKUP_INCLUDE=
+	LOOKUP_LIBS=
+
+	if use ldap; then
+		sed -i \
+			-e "s:# \(LOOKUP_LDAP=yes\):\1:" \
+			-e "s:# \(LDAP_LIB_TYPE=OPENLDAP2\):\1:" Local/Makefile
+		LOOKUP_INCLUDE="-I/usr/include/ldap"
+		LOOKUP_LIBS="-L/usr/lib -lldap -llber"
+	fi
+
+	if use mysql; then
+		sed -i "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" Local/Makefile
+		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I/usr/include/mysql"
+		LOOKUP_LIBS="$LOOKUP_LIBS -L/usr/lib -lmysqlclient"
+	fi
+
+	if use postgres; then
+		sed -i "s:# LOOKUP_PGSQL=yes:LOOKUP_PGSQL=yes:" Local/Makefile
+		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I/usr/include/postgresql"
+		LOOKUP_LIBS="$LOOKUP_LIBS -lpq"
+	fi
+
+	if [ -n "$LOOKUP_INCLUDE" ]; then
+		sed -i "s:# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include:LOOKUP_INCLUDE=$LOOKUP_INCLUDE:" \
+			Local/Makefile
+	fi
+
+	if [ -n "$LOOKUP_LIBS" ]; then
+		sed -i "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds:LOOKUP_LIBS=$LOOKUP_LIBS:" \
+			Local/Makefile
+	fi
+
+
+	cat Makefile | sed -e 's/^buildname=.*/buildname=exim-gentoo/g' > Makefile.gentoo && mv -f Makefile.gentoo Makefile
+
+	sed -i "s:# LOOKUP_DSEARCH=yes:LOOKUP_DSEARCH=yes:" Local/Makefile
+	if use wildlsearch; then
+		sed -i \
+			-e "s:# LOOKUP_WILDLSEARCH=yes:LOOKUP_WILDLSEARCH=yes:" \
+			-e "s:# LOOKUP_NWILDLSEARCH=yes:LOOKUP_NWILDLSEARCH=yes:" Local/Makefile
+	fi
+
+	if use dnsdb; then
+		sed -i "s:# LOOKUP_DNSDB=yes:LOOKUP_DNSDB=yes:" Local/Makefile
+	fi
+	sed -i "s:# LOOKUP_CDB=yes:LOOKUP_CDB=yes:" Local/Makefile
+
+	# Use the "native" interface to the DBM library
+	echo "USE_DB=yes" >> ${S}/Local/Makefile
+}
+
+src_compile() {
+	make || die "make failed"
+}
+
+
+src_install () {
+	cd ${S}/build-exim-gentoo
+	exeinto /usr/sbin
+	doexe exim
+	fperms 4755 /usr/sbin/exim
+
+	dodir /usr/bin /usr/sbin /usr/lib
+	dosym ../sbin/exim /usr/bin/mailq
+	dosym ../sbin/exim /usr/bin/newaliases
+	if \[ ! -e /usr/bin/mail \] && \[ ! -e /bin/mail \]; then
+		    einfo "Installing symbolic link /usr/bin/mail -> /usr/sbin/exim"
+		    einfo "If you install mailx please *REMOVE* that link, that way"
+		    einfo "scripts will use the mailx-binary instead of the exim-binary."
+		    dosym ../sbin/exim /usr/bin/mail
+		else
+		einfo "NOT installing symbolic link /usr/bin/mail -> /usr/sbin/exim,"
+		einfo "because you already have a mail-binary."
+	fi
+	dosym exim /usr/sbin/rsmtp
+	dosym exim /usr/sbin/rmail
+	dosym ../sbin/exim /usr/lib/sendmail
+
+	if use mailwrapper
+	then
+		insinto /etc/mail
+		doins ${FILESDIR}/mailer.conf
+	else
+		dosym exim /usr/sbin/sendmail
+	fi
+
+	exeinto /usr/sbin
+	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
+		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm \
+		convert4r3 convert4r4
+	do
+		doexe $i
+	done
+
+	dodoc ${S}/doc/*
+	doman ${S}/doc/exim.8
+
+	# conf files
+	insinto /etc/exim
+	newins ${S}/src/configure.default.orig exim.conf.dist
+	if use exiscan-acl; then
+		newins ${S}/src/configure.default exim.conf.exiscan-acl
+	fi
+	doins ${FILESDIR}/system_filter.exim
+	doins ${FILESDIR}/auth_conf.sub
+	if use exiscan; then
+		newins ${S}/src/configure.default exim.conf.exiscan
+		doins ${FILESDIR}/exiscan.conf
+	fi
+
+	# INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam
+	insinto /etc/pam.d
+	newins ${FILESDIR}/pam.d-exim exim
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/exim.rc6 exim
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/exim.confd exim
+
+	DIROPTIONS="--mode=0750 --owner=mail --group=mail"
+	dodir /var/log/${PN}
+}
+
+
+pkg_postinst() {
+	einfo "/etc/exim/system_filter.exim is a sample system_filter."
+	einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
+	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
+
+	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
+	then
+		einfo
+		einfo "Since you emerged $PN without mailwrapper in USE,"
+		einfo "you probably want to 'emerge -C mailwrapper' now."
+		einfo
+	fi
+}
+
+
diff --git a/mail-mta/exim/exim-4.34.ebuild b/mail-mta/exim/exim-4.34.ebuild
index aa9e8be5f7f0..c82b49c8a6ac 100644
--- a/mail-mta/exim/exim-4.34.ebuild
+++ b/mail-mta/exim/exim-4.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.34.ebuild,v 1.1 2004/05/30 02:35:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.34.ebuild,v 1.2 2004/05/31 02:43:38 g2boojum Exp $
 
 inherit eutils
 
@@ -30,7 +30,6 @@ DEPEND=">=sys-apps/sed-4.0.5
 	postgres? ( >=dev-db/postgresql-7 )
 	sasl? ( >=dev-libs/cyrus-sasl-2.1.14 )"
 RDEPEND="${DEPEND}
-	net-mail/mailwrapper
 	>=net-mail/mailbase-0.00-r5"
 
 src_unpack() {
diff --git a/mail-mta/exim/files/digest-exim-4.34-r1 b/mail-mta/exim/files/digest-exim-4.34-r1
new file mode 100644
index 000000000000..8f852ab954ed
--- /dev/null
+++ b/mail-mta/exim/files/digest-exim-4.34-r1
@@ -0,0 +1,2 @@
+MD5 bab611edc153867334b1c7cffd8fe3c0 exim-4.34.tar.bz2 1328742
+MD5 6fa74ecf1c2a83dbce1e46f991fce27b exiscan-acl-4.34-21.patch 395967
diff --git a/mail-mta/exim/files/mailer.conf b/mail-mta/exim/files/mailer.conf
index a0d702f22579..2c13780ac227 100644
--- a/mail-mta/exim/files/mailer.conf
+++ b/mail-mta/exim/files/mailer.conf
@@ -1,5 +1,6 @@
-#	$OpenBSD: mailer.conf,v 1.3 2000/04/06 18:24:19 millert Exp $
-#
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/files/mailer.conf,v 1.2 2004/05/31 02:43:38 g2boojum Exp $
+# $OpenBSD: mailer.conf,v 1.3 2000/04/06 18:24:19 millert Exp $
+
 # Execute the "real" sendmail program from exim, 
 # named /usr/sbin/exim
 #
@@ -11,6 +12,11 @@ rsmtp		/usr/sbin/exim
 rmail		/usr/sbin/exim
 mail		/usr/sbin/exim
 
+# Execute the "real" sendmail program from nullmailer
+# named /usr/sbin/sendmail.nullmailer
+#sendmail	/usr/sbin/sendmail.nullmailer
+#mailq		/usr/bin/mailq.nullmailer
+
 # Execute the "real" sendmail program from postfix, 
 # named /usr/sbin/sendmail.postfix
 #
@@ -23,8 +29,10 @@ mail		/usr/sbin/exim
 # named /usr/sbin/ssmtp
 #
 #sendmail	/usr/sbin/ssmtp
+#send-mail	/usr/sbin/ssmtp
 #mailq		/usr/sbin/ssmtp
 #newaliases	/usr/sbin/ssmtp
+
 # Execute the "real" sendmail program, named /usr/sbin/sendmail
 #
 #sendmail	/usr/sbin/sendmail.sendmail
@@ -33,3 +41,4 @@ mail		/usr/sbin/exim
 #newaliases	/usr/sbin/sendmail.sendmail
 #hoststat	/usr/sbin/sendmail.sendmail
 #purgestat	/usr/sbin/sendmail.sendmail
+