Moving to mail-mta/exim

56 files changed, 0 insertions, 6295 deletions

diff --git a/net-mail/exim/ChangeLog b/net-mail/exim/ChangeLog
deleted file mode 100644
index 6a5f891fc59a..000000000000
--- a/net-mail/exim/ChangeLog
+++ /dev/null
@@ -1,294 +0,0 @@
-# ChangeLog for net-mail/exim
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/ChangeLog,v 1.63 2004/05/13 22:17:23 lu_zero Exp $
-
-  14 May 2004; Luca Barbato <lu_zero@gentoo.org> exim-4.34.ebuild:
-  Marked ppc
-
-  13 May 2004; Colin Morey <peitolm@gentoo.org> exim-4.34.ebuild:
-  Bumping 4.34 to stable
-
-  11 May 2004; Guy Martin <gmsoft@gentoo.org> exim-4.34.ebuild:
-  Marked stable on hppa.
-
-  11 May 2004; Bryan Østergaard <kloeri@gentoo.org> exim-4.34.ebuild:
-  Stable on alpha, bug #50217.
-
-  11 May 2004; Jon Portnoy <avenj@gentoo.org> exim-4.34.ebuild :
-  AMD64 keywords per security bug.
-
-*exim-4.34 (10 May 2004)
-
-  10 May 2004; Colin Morey <peitolm@gentoo.org> exim-4.34.ebuild:
-  Version bump, should resolve bug #50217
-
-*exim-4.33-r1 (09 May 2004)
-
-  09 May 2004; Colin Morey <peitolm@gentoo.org> exim-4.33-r1.ebuild:
-  Security bump.
-
-*exim-4.33 (06 May 2004)
-
-  06 May 2004; Colin Morey <peitolm@gentoo.org> exim-4.33.ebuild:
-  Version bump, now using .bz2 source
-
-  02 May 2004; Colin Morey <peitolm@gentoo.org> exim-4.32-r1.ebuild:
-  Bumping to Stable. Latest exiscan-acl patch
-
-*exim-4.32-r1 (28 Apr 2004)
-
-  28 Apr 2004; Colin Morey <peitolm@gentoo.org> exim-4.32-r1.ebuild:
-  Bump of exiscan-acl patch
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> exim-4.12.ebuild,
-  exim-4.14.ebuild, exim-4.20-r1.ebuild, exim-4.20-r2.ebuild,
-  exim-4.20.ebuild, exim-4.21.ebuild, exim-4.22.ebuild, exim-4.24-r1.ebuild,
-  exim-4.24-r2.ebuild, exim-4.24-r3.ebuild, exim-4.24.ebuild,
-  exim-4.30-r1.ebuild, exim-4.30.ebuild, exim-4.31.ebuild, exim-4.32.ebuild:
-  Add inherit eutils
-
-*exim-4.32 (24 Apr 2004)
-
-  24 Apr 2004; Colin Morey <peitolm@gentoo.org> exim-4.31.ebuild,
-  exim-4.32.ebuild, metadata.xml:
-  Version bump, also fixes the following :
-    # Includes Typo fix for bug 47106
-    # enable optional exim_monitor support via X use flag bug #46778
-    # To fix bug 41196 (ipv6 breakage)
-
-  24 Apr 2004; Colin Morey <peitolm@gentoo.org> exim-4.31.ebuild,
-  metadata.xml:
-  Bumping exim-4.31 to stable
-
-*exim-4.30-r1 (30 Mar 2004)
-
-  30 Mar 2004; Colin Morey <peitolm@gentoo.org> exim-4.30-r1.ebuild:
-  provides fixes for, #40358 #28665 #27206
-
-*exim-4.31 (30 Mar 2004)
-
-  30 Mar 2004; Colin Morey <peitolm@gentoo.org> exim-4.31.ebuild:
-  Version Bump, also provides fixes for, #40358 #28665 #27206
-
-*exim-4.30 (29 Mar 2004)
-
-  29 Mar 2004; Jay Pfeifer <pfeifer@gentoo.org> exim-4.30.ebuild
-  Version bump. Closes bug #36486.
-
-*exim-4.24-r3 (23 Mar 2004)
-
-  23 Mar 2004; Grant Goodyear <g2boojum@hotmail.com> exim-4.24-r3.ebuild,
-  files/mailer.conf:
-  New revision that supports mailwrapper.
-
-  14 Mar 2004; Tom Gall <tgall@gentoo.org> exim-4.24-r1.ebuild,
-  exim-4.24-r2.ebuild:
-  remove ppc64 for now
-
-*exim-4.24-r2 (06 Mar 2004)
-
-  06 Mar 2004; Kurt Lieber <klieber@gentoo.org> exim-4.24-r2.ebuild:
-  change to allow extra LDFLAGS to be passed to exim
-
-  18 Jan 2004; Martin Holzer <mholzer@gentoo.org> files/exim.rc6:
-  adding provide mta. Closes #34544.
-
-  14 Jan 2004; Aron Griffis <agriffis@gentoo.org> exim-4.24-r1.ebuild:
-  add ~alpha (bug 21240)
-
-  14 Dec 2003; Lars Weiler <pylon@gentoo.org> exim-4.24-r1.ebuild:
-  Make stable on ppc
-
-*exim-4.24-r1 (07 Nov 2003)
-
-  07 Nov 2003; Kurt Lieber <klieber@gentoo.org> exim-4.24-r1.ebuild:
-  minor change to fix 32814. if the original ebuild emerged successfully for
-  you, there is no need to install this version.
-
-  05 Nov 2003; Kurt Lieber <klieber@gentoo.org> exim-4.22.ebuild,
-  exim-4.24.ebuild:
-  fixed #29881.  thanks to Marcin Jurczuk <spock@stars.eu.org> for the patch
-
-*exim-4.24 (05 Nov 2003)
-
-  05 Nov 2003; Kurt Lieber <klieber@gentoo.org> exim-4.24.ebuild,
-  version bump
-
-  21 Oct 2003; Tavis Ormandy <taviso@gentoo.org> exim-4.21.ebuild:
-  adding ~alpha keyword
-
-*exim-4.22 (18 Aug 2003)
-
-  18 Aug 2003; Nick Hadaway <raker@gentoo.org> exim-4.22.ebuild:
-  Upstream bug fixes for ipv6 and a compile warning among others.
-  No ebuild changes.
-
-*exim-4.21 (17 Aug 2003)
-
-  17 Aug 2003; Nick Hadaway <raker@gentoo.org> exim-4.21.ebuild:
-  exiscan support has been deprecated.  exiscan-acl is still around 
-  though.  ipv6 support has been added.  4.21 contains a patch for a 
-  recently announced security flaw.
-
-*exim-4.20-r2 (16 Aug 2003)
-
-  16 Aug 2003; Nick Hadaway <raker@gentoo.org> exim-4.20-r2.ebuild:
-  Added USE_DB=yes to ${S}/Local/Makefile so exim uses the "native"
-  dbm interface.  This Should resolve bug #25181.
-
-  18 Jul 2003; Olivier Crete <tester@gentoo.org> exim-4.14.ebuild,
-  exim-4.20-r1.ebuild, files/exim-4.14-tail.patch:
-  Posixify tail and add amd64
-
-  08 Jul 2003; Todd Berman <tberman@gentoo.org> exim-4.12.ebuild,
-  exim-4.14.ebuild, exim-4.20-r1.ebuild, exim-4.20.ebuild:
-  Updating the mailbase RDEPEND.
-
-*exim-4.20-r1 (27 Jun 2003)
-
-  30 Jun 2003; Guy Martin <gmsoft@gentoo.org> exim-4.20-r1.ebuild :
-  Added hppa to KEYWORDS.
-
-  27 Jun 2003; Todd Berman <tberman@gentoo.org> exim-4.20-r1.ebuild,
-  files/exim-4.20-maildir.patch:
-  Great fixup by srcerer <tschafer@hotmail.com>, including (but not limited to)
-  logging to /var/log/exim, maildir support via USE, exiscan and exiscan-acl
-  also follow maildir USE variable, assorted other small fixed and closed bugs
-  (#21513, #21480, #21302)
-
-  12 Jun 2003; <msterret@gentoo.org> exim-4.20.ebuild:
-  add Header
-
-  12 Jun 2003; <msterret@gentoo.org> exim-4.14.ebuild:
-  add Header
-
-*exim-4.20 (10 Jun 2003)
-
-  10 Jun 2003; Jack Morgan <jmorgan@gentoo.org> exim-4.20.ebuild:
-  Added new edbuild. Includes exiscan-acl support. Thanks to Tim Schafer <tschafer@hotmail.com>
-  Closes bug #21302
-
-*exim-4.14 (30 May 2003)
-
-  30 May 2003; Jack Morgan <jmorgan@gentoo.org> exim-4.14.ebuild:
-  Updates exiscan, closes bug #20613 
-
-*exim-4.12 (28 Jan 2003)
-
-  25 Apr 2003; Martin Holzer <mholzer@gentoo.org> exim-4.12.ebuild:
-  fixed wrong sed state. Closes #19886.
-
-  12 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest,
-  exim-4.12.ebuild:
-  added symlinks for rsmtp and rmail, closing bug #19126 by Stefan Fo"rster
-  <gentoo@stefan-foerster.de>
-
-  25 Mar 2003; Seemant Kulleen <seemant@gentoo.org> exim-4.12.ebuild:
-  removed suid bit on /etc/conf.d/exim thanks to: Benjamin Podszun (Blafasel @
-  irc) <Dar@Dar-Klajid.de> in bug #18148
-
-  07 Feb 2003; Nick Hadaway <raker@gentoo.org> exim-4.12.ebuild :
-  Marked stable for x86.
-
-  28 Jan 2003; Nick Hadaway <raker@gentoo.org> exim-4.12.ebuild,
-  files/digest-exim-4.12 :
-  Version bump.  Also bumped exiscan to 4.12-21.
-
-  16 Dec 2002; Daniel Ahlberg <aliz@gentoo.org> : exim-4.10.ebuild
-  Marked stable.  
-
-  15 Dec 2002; Daniel Ahlberg <aliz@gentoo.org> : exim-4.10.ebuild
-  Added patch to fix security issue.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*exim-4.10 (15 Nov 2002)
-
-  12 Apr 2003; Seemant Kulleen <seemant@gentoo.org> exim-4.10.ebuild:
-  same, but for the previous version as well
-
-  03 Feb 2003; Jon Nall <nall@gentoo.org> exim-4.10.ebuild :
-  added ~ppc
-
-  15 Nov 2002; Nick Hadaway <raker@gentoo.org> exim-4.10.ebuild,
-  files/digest-exim-4.10, files/exiscan.conf :
-  New exim ebuild with support for exiscan patched in.  Marked unstable.
-
-*exim-4.05 (29 Aug 2002)
-
-  15 Sep 2002; Nick Hadaway <raker@gentoo.org> exim-4.05.ebuild :
-  Fixed a typo.  -lpg to -lpq.  See bug #7878
-
-  11 Sep 2002; Nick Hadaway <raker@gentoo.org> exim-4.05.ebuild :
-  Updated ebuild to install convert4r{3,4} into /usr/sbin as suggested
-  by bug #7702 and changed use variable from pgsql to postgres.
-
-  03 Sep 2002; Nick Hadaway <raker@gentoo.org> exim-4.05.ebuild :
-  Still masked.  /etc/exim/configure.default is now installed as
-  /etc/exim/exim.conf.dist to match most other packages config file
-  name style.
-
-  01 Sep 2002; Nick Hadaway <raker@gentoo.org> exim-4.05.ebuild :
-  Changed use variables to coincide with already defined system variables.
-
-  29 Aug 2002; Nick Hadaway <raker@gentoo.org>
-  exim-4.05.ebuild, files/digest-exim-4.05 :
-  Version bump.  Currently masked for portage tree freeze.
-  Removed nonexistant sample config.
-
-*exim-4.04-r2 (20 Aug 2002)
-
-  25 Mar 2003; Seemant Kulleen <seemant@gentoo.org> exim-4.04-r2.ebuild:
-  changed pgsql USE to postgres, which exists
-
-  01 Sep 2002; Nick Hadaway <raker@gentoo.org> exim-4.04-r2.ebuild :
-  Changed use variables to coincide with already defined system variables.
-
-  29 Aug 2002; Nick Hadaway <raker@gentoo.org> exim-4.04-r2.ebuild :
-  Removed nonexistant sample config.
-
-  20 Aug 2002; Nick Hadaway <raker@gentoo.org>
-  exim-4.04-r2.ebuild, files/digest-exim-4.04-r2 :
-  Updated ebuild with a cleaner LOOKUP_INCLUDE and LOOKUP_LIBS scheme
-  as suggested by Eric Renfro.  Added support for mta-pgsql USE variable 
-  and updated dependancies.
-
-*exim-4.04-r1 (15 Aug 2002)
-
-  15 Aug 2002; Nick Hadaway <raker@gentoo.org> exim-4.04-r1.ebuild :
-  Added LOOKUP_CDB to compile options.  This will add support for
-  Constant Database lookups which are in many cases faster than
-  linear lookups.  All CDB code is included in exim.  To learn more
-  about CDB check out http://cr.yp.to/cdb.html.
-
-  15 Aug 2002; Nick Hadaway <raker@gentoo.org> exim-4.04-r1.ebuild :
-  Updated ebuild to add LOOKUP_DSEARCH support.  This allows more
-  functionality to exim with virual hosts.
-
-*exim-3.36-r1 (18 Apr 2002)
-
-  18 Apr 2002; Ryan Phillips <rphillips@gentoo.org>
-  exim-3.36-r1.ebuild files/digest-exim-3.36-r1 :
-  Updated due to security exploit in exim-3.34
-  
-*exim-3.34-r2 (15 Apr 2002)
-
-  15 Apr 2002; Seemant Kulleen <seemant@gentoo.org>
-  exim-3.34-r2.ebuild files/digest-exim-3.34-r2 :
-  Updated the USE flags from mta-ldap, mta-tls and mta-mysql to the more general
-  and widely used ldap, ssl and mysql flags respectively.
-
-*exim-3.34-r1 (1 Apr 2002)
-
-  1 Apr 2002; Grant Goodyear <g2boojum@gentoo.org> :
-  Applied jnelson patches (bug #1444) to solve "missing exim binary"
-  problem.
-  
-*exim-3.34 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/net-mail/exim/Manifest b/net-mail/exim/Manifest
deleted file mode 100644
index dad482af45eb..000000000000
--- a/net-mail/exim/Manifest
+++ /dev/null
@@ -1,55 +0,0 @@
-MD5 68fc403ba2c98ccba281939085cb9052 files/auth_conf.sub 775
-MD5 0cb2ffe88c81fd7ac8429b5a19d58b35 files/configure 16346
-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/net-mail/exim/exim-4.10.ebuild b/net-mail/exim/exim-4.10.ebuild
deleted file mode 100644
index 12a04b77f05a..000000000000
--- a/net-mail/exim/exim-4.10.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# 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/net-mail/exim/exim-4.10.ebuild,v 1.11 2004/03/29 21:00:55 pfeifer Exp $
-
-IUSE="tcpd ssl postgres mysql ldap pam"
-
-S=${WORKDIR}/${P}
-EXISCAN_VER=${PV}-16
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.gz
-	http://duncanthrax.net/exiscan/exiscan-${EXISCAN_VER}.tar.gz"
-HOMEPAGE="http://www.exim.org/"
-
-DEPEND="virtual/glibc
-	>=sys-libs/db-3.2
-	>=dev-lang/perl-5.6.0
-	>=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 )"
-RDEPEND="${DEPEND}
-	!virtual/mta
-	>=net-mail/mailbase-0.00"
-PROVIDE="virtual/mta"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc ppc"
-
-src_unpack() {
-
-	local myconf
-	unpack ${A}
-
-	cd ${S}/src
-	patch < ${FILESDIR}/${PF}-gentoo.diff || die
-	cd ${S}
-
-	einfo "Patching exiscan support into exim ${PV}.."
-	patch -p1 < ${WORKDIR}/exiscan-${EXISCAN_VER}/exiscan-${EXISCAN_VER}.patch
-
-	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:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
-		-e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=/usr/share/info:" \
-		-e "s:# LOG_FILE_PATH=syslog:LOG_FILE_PATH=syslog:" \
-		-e "s:LOG_FILE_PATH=syslog\:/var/log/exim_%slog::" \
-		-e "s:# PID_FILE_PATH=/var/lock/exim%s.pid:PID_FILE_PATH=/var/run/exim%s.pid:" \
-		-e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=/var/spool/exim:" \
-		-e "s:# SUPPORT_MAILDIR=yes:SUPPORT_MAILDIR=yes:" \
-		-e "s:# SUPPORT_MAILSTOR=yes:SUPPORT_MAILSTORE=yes:" \
-		-e "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" \
-		-e "s:EXIM_USER=:EXIM_USER=mail:" \
-		-e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \
-		src/EDITME > Local/Makefile
-
-	cd Local
-	if use pam; then
-		cp Makefile Makefile.orig
-		sed -e "s:# SUPPORT_PAM=yes:SUPPORT_PAM=yes:" Makefile.orig > Makefile
-		myconf="${myconf} -lpam"
-	fi
-	if use tcpd; then
-		cp Makefile Makefile.orig
-		sed -e "s:# USE_TCP_WRAPPERS=yes:USE_TCP_WRAPPERS=yes:" Makefile.orig > Makefile
-		myconf="${myconf} -lwrap"
-	fi
-	if [ -n "$myconf" ] ; then
-		echo "EXTRALIBS=${myconf}" >> Makefile
-	fi
-
-	cd ${S}
-	if use ssl; then
-		cp Local/Makefile Local/Makefile.tmp
-		sed -e "s:# SUPPORT_TLS=yes:SUPPORT_TLS=yes:" \
-			-e "s:# TLS_LIBS=-lssl -lcrypto:TLS_LIBS=-lssl -lcrypto:" Local/Makefile.tmp > Local/Makefile
-	fi
-
-	LOOKUP_INCLUDE=
-	LOOKUP_LIBS=
-
-	if use ldap; then
-		cp Local/Makefile Local/Makefile.tmp
-		sed -e "s:# LOOKUP_LDAP=yes:LOOKUP_LDAP=yes:" \
-			-e "s:# LDAP_LIB_TYPE=OPENLDAP2:LDAP_LIB_TYPE=OPENLDAP2:" \
-			Local/Makefile.tmp >| Local/Makefile
-		LOOKUP_INCLUDE="-I/usr/include/ldap"
-		LOOKUP_LIBS="-L/usr/lib -lldap -llber"
-	fi
-
-	if use mysql; then
-		cp Local/Makefile Local/Makefile.tmp
-		sed -e "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" \
-			Local/Makefile.tmp >| Local/Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I/usr/include/mysql"
-		LOOKUP_LIBS="$LOOKUP_LIBS -L/usr/lib -lmysqlclient"
-	fi
-
-	if use postgres; then
-		cp Local/Makefile Local/Makefile.tmp
-		sed -e "s:# LOOKUP_PGSQL=yes:LOOKUP_PGSQL=yes:" \
-			Local/Makefile.tmp >| Local/Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I/usr/include/postgresql"
-		LOOKUP_LIBS="$LOOKUP_LIBS -lpq"
-	fi
-
-	if [ -n "$LOOKUP_INCLUDE" ]; then
-		cp Local/Makefile Local/Makefile.tmp
-		sed -e "s:# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include:LOOKUP_INCLUDE=$LOOKUP_INCLUDE:" \
-			Local/Makefile.tmp >| Local/Makefile
-	fi
-
-	if [ -n "$LOOKUP_LIBS" ]; then
-		cp Local/Makefile Local/Makefile.tmp
-		sed -e "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq:LOOKUP_LIBS=$LOOKUP_LIBS:" \
-			Local/Makefile.tmp >| Local/Makefile
-	fi
-
-
-	cat Makefile | sed -e 's/^buildname=.*/buildname=exim-gentoo/g' > Makefile.gentoo && mv -f Makefile.gentoo Makefile
-
-	cp Local/Makefile Local/Makefile.tmp
-	sed -e "s:# LOOKUP_DSEARCH=yes:LOOKUP_DSEARCH=yes:" Local/Makefile.tmp >| Local/Makefile
-
-	cp Local/Makefile Local/Makefile.tmp
-	sed -e "s:# LOOKUP_CDB=yes:LOOKUP_CDB=yes:" Local/Makefile.tmp >| Local/Makefile
-}
-
-src_compile() {
-
-	make || die
-
-}
-
-
-src_install () {
-
-	cd ${S}/build-exim-gentoo
-	insopts -o root -g root -m 4755
-	insinto /usr/sbin
-	doins exim
-
-	dodir /usr/bin /usr/sbin /usr/lib
-	dosym /usr/sbin/exim /usr/bin/mailq
-	dosym /usr/sbin/exim /usr/bin/newaliases
-	dosym /usr/sbin/exim /usr/bin/mail
-	dosym exim /usr/sbin/rsmtp
-	dosym exim /usr/sbin/rmail
-	dosym /usr/sbin/exim /usr/lib/sendmail
-	dosym /usr/sbin/exim /usr/sbin/sendmail
-
-	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
-
-	dodir /etc/exim
-
-	cd ${S}/src
-	cp configure.default ${D}/etc/exim/exim.conf.dist
-
-	dodoc ${S}/doc/*
-	doman ${S}/doc/exim.8
-	# INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam
-	insinto /etc/pam.d
-	doins ${FILESDIR}/pam.d-exim
-
-	# A nice filter for exim to protect your windows clients.
-	insinto /etc/exim
-	doins ${FILESDIR}/system_filter.exim
-	dodoc ${FILESDIR}/auth_conf.sub
-	doins ${FILESDIR}/exiscan.conf
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/exim.rc6 exim
-	insinto /etc/conf.d
-	newins ${FILESDIR}/exim.confd exim
-}
-
-
-pkg_config() {
-
-	${ROOT}/usr/sbin/rc-update add exim
-
-}
-
-pkg_postinst() {
-
-	einfo "Read the bottom of /etc/exim/system_filter.exim for usage."
-	einfo "/usr/share/doc/${P}/auth_conf.sub.gz contains the configuration sub for using smtp auth."
-	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
-
-}
diff --git a/net-mail/exim/exim-4.12.ebuild b/net-mail/exim/exim-4.12.ebuild
deleted file mode 100644
index 7bc8e6bb39cf..000000000000
--- a/net-mail/exim/exim-4.12.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.12.ebuild,v 1.12 2004/04/27 20:54:50 agriffis Exp $
-
-inherit eutils
-
-IUSE="tcpd ssl postgres mysql ldap pam"
-
-EXISCAN_VER=${PV}-21
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.gz
-	http://duncanthrax.net/exiscan/exiscan-${EXISCAN_VER}.tar.gz"
-HOMEPAGE="http://www.exim.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc"
-
-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 )"
-
-RDEPEND="${DEPEND}
-	!virtual/mta
-	>=net-mail/mailbase-0.00-r4"
-
-src_unpack() {
-	unpack ${A}
-
-	local myconf
-
-	cd ${S}
-	einfo "Patching exiscan support into exim ${PV}.."
-	epatch ${WORKDIR}/exiscan-${EXISCAN_VER}/exiscan-${EXISCAN_VER}.patch
-
-	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:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
-		-e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=/usr/share/info:" \
-		-e "s:# LOG_FILE_PATH=syslog:LOG_FILE_PATH=syslog:" \
-		-e "s:LOG_FILE_PATH=syslog\:/var/log/exim_%slog::" \
-		-e "s:# PID_FILE_PATH=/var/lock/exim%s.pid:PID_FILE_PATH=/var/run/exim%s.pid:" \
-		-e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=/var/spool/exim:" \
-		-e "s:# SUPPORT_MAILDIR=yes:SUPPORT_MAILDIR=yes:" \
-		-e "s:# SUPPORT_MAILSTOR=yes:SUPPORT_MAILSTORE=yes:" \
-		-e "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" \
-		-e "s:EXIM_USER=:EXIM_USER=mail:" \
-		-e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \
-		src/EDITME > Local/Makefile
-
-	cd Local
-	if use pam; then
-		sed -i "s:# \(SUPPORT_PAM=yes\):\1:" Makefile
-		myconf="${myconf} -lpam"
-	fi
-	if use tcpd; then
-		sed -i "s:# \(USE_TCP_WRAPPERS=yes\):\1:" Makefile
-		myconf="${myconf} -lwrap"
-	fi
-	if [ -n "$myconf" ] ; then
-		echo "EXTRALIBS=${myconf}" >> 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: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
-
-	sed -i "s:# LOOKUP_CDB=yes:LOOKUP_CDB=yes:" Local/Makefile
-}
-
-src_compile() {
-	make || die
-}
-
-
-src_install () {
-
-	cd ${S}/build-exim-gentoo
-	insopts -o root -g root -m 4755
-	insinto /usr/sbin
-	doins exim
-
-	dodir /usr/bin /usr/sbin /usr/lib
-	dosym ../sbin/exim /usr/bin/mailq
-	dosym ../sbin/exim /usr/bin/newaliases
-	dosym ../sbin/exim /usr/bin/mail
-	dosym exim /usr/sbin/rsmtp
-	dosym exim /usr/sbin/rmail
-	dosym exim /usr/sbin/sendmail
-	dosym /usr/sbin/exim /usr/lib/sendmail
-
-	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
-
-	dodir /etc/exim
-
-	cd ${S}/src
-	cp configure.default ${D}/etc/exim/exim.conf.dist
-
-	dodoc ${S}/doc/*
-	doman ${S}/doc/exim.8
-	# INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam
-	insinto /etc/pam.d
-	doins ${FILESDIR}/pam.d-exim
-
-	# A nice filter for exim to protect your windows clients.
-	insinto /etc/exim
-	doins ${FILESDIR}/system_filter.exim
-	dodoc ${FILESDIR}/auth_conf.sub
-	doins ${FILESDIR}/exiscan.conf
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/exim.rc6 exim
-	insinto /etc/conf.d
-	newins ${FILESDIR}/exim.confd exim
-	fperms 644 /etc/conf.d/exim
-}
-
-
-pkg_config() {
-
-	${ROOT}/usr/sbin/rc-update add exim
-
-}
-
-pkg_postinst() {
-
-	einfo "Read the bottom of /etc/exim/system_filter.exim for usage."
-	einfo "/usr/share/doc/${P}/auth_conf.sub.gz contains the configuration sub for using smtp auth."
-	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
-
-}
diff --git a/net-mail/exim/exim-4.14.ebuild b/net-mail/exim/exim-4.14.ebuild
deleted file mode 100644
index d23d31ca46aa..000000000000
--- a/net-mail/exim/exim-4.14.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.14.ebuild,v 1.8 2004/04/27 20:54:50 agriffis Exp $
-
-inherit eutils
-
-IUSE="tcpd ssl postgres mysql ldap pam"
-
-EXISCAN_VER=${PV}-26
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.gz
-	http://duncanthrax.net/exiscan/exiscan-${EXISCAN_VER}.tar.gz"
-HOMEPAGE="http://www.exim.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc amd64"
-
-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 )"
-
-RDEPEND="${DEPEND}
-	!virtual/mta
-	>=net-mail/mailbase-0.00-r5"
-
-src_unpack() {
-	unpack ${A}
-
-	local myconf
-
-	cd ${S}
-	einfo "Patching exiscan support into exim ${PV}.."
-	epatch ${WORKDIR}/exiscan-${EXISCAN_VER}/exiscan-${EXISCAN_VER}.patch
-
-	epatch ${FILESDIR}/exim-4.14-tail.patch
-
-	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:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
-		-e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=/usr/share/info:" \
-		-e "s:# LOG_FILE_PATH=syslog:LOG_FILE_PATH=syslog:" \
-		-e "s:LOG_FILE_PATH=syslog\:/var/log/exim_%slog::" \
-		-e "s:# PID_FILE_PATH=/var/lock/exim%s.pid:PID_FILE_PATH=/var/run/exim%s.pid:" \
-		-e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=/var/spool/exim:" \
-		-e "s:# SUPPORT_MAILDIR=yes:SUPPORT_MAILDIR=yes:" \
-		-e "s:# SUPPORT_MAILSTOR=yes:SUPPORT_MAILSTORE=yes:" \
-		-e "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" \
-		-e "s:EXIM_USER=:EXIM_USER=mail:" \
-		-e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \
-		src/EDITME > Local/Makefile
-
-	cd Local
-	if use pam; then
-		sed -i "s:# \(SUPPORT_PAM=yes\):\1:" Makefile
-		myconf="${myconf} -lpam"
-	fi
-	if use tcpd; then
-		sed -i "s:# \(USE_TCP_WRAPPERS=yes\):\1:" Makefile
-		myconf="${myconf} -lwrap"
-	fi
-	if [ -n "$myconf" ] ; then
-		echo "EXTRALIBS=${myconf}" >> 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: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
-
-	sed -i "s:# LOOKUP_CDB=yes:LOOKUP_CDB=yes:" Local/Makefile
-}
-
-src_compile() {
-	make || die
-}
-
-
-src_install () {
-
-	cd ${S}/build-exim-gentoo
-	insopts -o root -g root -m 4755
-	insinto /usr/sbin
-	doins exim
-
-	dodir /usr/bin /usr/sbin /usr/lib
-	dosym ../sbin/exim /usr/bin/mailq
-	dosym ../sbin/exim /usr/bin/newaliases
-	dosym ../sbin/exim /usr/bin/mail
-	dosym exim /usr/sbin/rsmtp
-	dosym exim /usr/sbin/rmail
-	dosym exim /usr/sbin/sendmail
-	dosym /usr/sbin/exim /usr/lib/sendmail
-
-	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
-
-	dodir /etc/exim
-
-	cd ${S}/src
-	cp configure.default ${D}/etc/exim/exim.conf.dist
-
-	dodoc ${S}/doc/*
-	doman ${S}/doc/exim.8
-	# INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam
-	insinto /etc/pam.d
-	doins ${FILESDIR}/pam.d-exim
-
-	# A nice filter for exim to protect your windows clients.
-	insinto /etc/exim
-	doins ${FILESDIR}/system_filter.exim
-	dodoc ${FILESDIR}/auth_conf.sub
-	doins ${FILESDIR}/exiscan.conf
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/exim.rc6 exim
-	insinto /etc/conf.d
-	newins ${FILESDIR}/exim.confd exim
-	fperms 644 /etc/conf.d/exim
-}
-
-
-pkg_config() {
-
-	${ROOT}/usr/sbin/rc-update add exim
-
-}
-
-pkg_postinst() {
-
-	einfo "Read the bottom of /etc/exim/system_filter.exim for usage."
-	einfo "/usr/share/doc/${P}/auth_conf.sub.gz contains the configuration sub for using smtp auth."
-	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
-
-}
diff --git a/net-mail/exim/exim-4.20-r1.ebuild b/net-mail/exim/exim-4.20-r1.ebuild
deleted file mode 100644
index 077992bce21c..000000000000
--- a/net-mail/exim/exim-4.20-r1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.20-r1.ebuild,v 1.9 2004/04/27 20:54:50 agriffis Exp $
-
-inherit eutils
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan exiscan-acl maildir lmtp"
-
-EXISCAN_VER=${PV}-26
-EXISCANACL_VER=${PV}-09
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.gz
-	exiscan? ( http://duncanthrax.net/exiscan/exiscan-${EXISCAN_VER}.tar.gz )
-	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 hppa ~ppc ~amd64"
-
-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 )"
-
-RDEPEND="${DEPEND}
-	!virtual/mta
-	>=net-mail/mailbase-0.00-r5"
-
-src_unpack() {
-	unpack ${A}
-
-	local myconf
-
-	cd ${S}
-
-	epatch ${FILESDIR}/exim-4.14-tail.patch
-
-	if use maildir; then
-		einfo "Patching maildir support into exim.conf"
-		epatch ${FILESDIR}/exim-${PV}-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
-	if use exiscan; then
-		einfo "Patching exiscan support into exim ${PV}.."
-		epatch ${WORKDIR}/exiscan-${EXISCAN_VER}/exiscan-${EXISCAN_VER}.patch
-	fi
-	if use exiscan-acl; then
-		einfo "Patching exican-acl support into exim ${PV}.."
-		epatch ${DISTDIR}/exiscan-acl-${EXISCANACL_VER}.patch
-	fi
-
-	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:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
-		-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_MAILSTOR=yes:SUPPORT_MAILSTORE=yes:" \
-		-e "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" \
-		-e "s:EXIM_USER=:EXIM_USER=mail:" \
-		-e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \
-		src/EDITME > Local/Makefile
-
-	cd Local
-	if use pam; then
-		sed -i "s:# \(SUPPORT_PAM=yes\):\1:" Makefile
-		myconf="${myconf} -lpam"
-	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 [ -n "$myconf" ] ; then
-		echo "EXTRALIBS=${myconf}" >> 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: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
-
-	sed -i "s:# LOOKUP_CDB=yes:LOOKUP_CDB=yes:" Local/Makefile
-}
-
-src_compile() {
-	make || die
-}
-
-
-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
-	dosym ../sbin/exim /usr/bin/mail
-	dosym exim /usr/sbin/rsmtp
-	dosym exim /usr/sbin/rmail
-	dosym exim /usr/sbin/sendmail
-	dosym ../sbin/exim /usr/lib/sendmail
-
-	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."
-
-}
-
-
diff --git a/net-mail/exim/exim-4.20-r2.ebuild b/net-mail/exim/exim-4.20-r2.ebuild
deleted file mode 100644
index c185c3fe2708..000000000000
--- a/net-mail/exim/exim-4.20-r2.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.20-r2.ebuild,v 1.4 2004/04/27 20:54:50 agriffis Exp $
-
-inherit eutils
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan exiscan-acl maildir lmtp"
-
-EXISCAN_VER=${PV}-26
-EXISCANACL_VER=${PV}-09
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.gz
-	exiscan? ( http://duncanthrax.net/exiscan/exiscan-${EXISCAN_VER}.tar.gz )
-	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 ~hppa ~ppc ~amd64"
-
-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 )"
-
-RDEPEND="${DEPEND}
-	!virtual/mta
-	>=net-mail/mailbase-0.00-r5"
-
-src_unpack() {
-	unpack ${A}
-
-	local myconf
-
-	cd ${S}
-
-	epatch ${FILESDIR}/exim-4.14-tail.patch
-
-	if use maildir; then
-		einfo "Patching maildir support into exim.conf"
-		epatch ${FILESDIR}/exim-${PV}-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
-	if use exiscan; then
-		einfo "Patching exiscan support into exim ${PV}.."
-		epatch ${WORKDIR}/exiscan-${EXISCAN_VER}/exiscan-${EXISCAN_VER}.patch
-	fi
-	if use exiscan-acl; then
-		einfo "Patching exican-acl support into exim ${PV}.."
-		epatch ${DISTDIR}/exiscan-acl-${EXISCANACL_VER}.patch
-	fi
-
-	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:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
-		-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_MAILSTOR=yes:SUPPORT_MAILSTORE=yes:" \
-		-e "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" \
-		-e "s:EXIM_USER=:EXIM_USER=mail:" \
-		-e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \
-		src/EDITME > Local/Makefile
-
-	cd Local
-	if use pam; then
-		sed -i "s:# \(SUPPORT_PAM=yes\):\1:" Makefile
-		myconf="${myconf} -lpam"
-	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 [ -n "$myconf" ] ; then
-		echo "EXTRALIBS=${myconf}" >> 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: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
-
-	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
-}
-
-
-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
-	dosym ../sbin/exim /usr/bin/mail
-	dosym exim /usr/sbin/rsmtp
-	dosym exim /usr/sbin/rmail
-	dosym exim /usr/sbin/sendmail
-	dosym ../sbin/exim /usr/lib/sendmail
-
-	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."
-
-}
-
-
diff --git a/net-mail/exim/exim-4.20.ebuild b/net-mail/exim/exim-4.20.ebuild
deleted file mode 100644
index d26526949359..000000000000
--- a/net-mail/exim/exim-4.20.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.20.ebuild,v 1.5 2004/04/27 20:54:50 agriffis Exp $
-
-inherit eutils
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan exiscan-acl"
-
-EXISCAN_VER=${PV}-26
-EXISCANACL_VER=${PV}-09
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.gz
-	exiscan? ( http://duncanthrax.net/exiscan/exiscan-${EXISCAN_VER}.tar.gz )
-	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"
-
-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 )"
-
-RDEPEND="${DEPEND}
-	!virtual/mta
-	>=net-mail/mailbase-0.00-r5"
-
-src_unpack() {
-	unpack ${A}
-
-	local myconf
-
-	cd ${S}
-	if use exiscan; then
-		einfo "Patching exiscan support into exim ${PV}.."
-		epatch ${WORKDIR}/exiscan-${EXISCAN_VER}/exiscan-${EXISCAN_VER}.patch
-	fi
-	if use exiscan-acl; then
-		einfo "Patching exican-acl support into exim ${PV}.."
-		epatch ${DISTDIR}/exiscan-acl-${EXISCANACL_VER}.patch
-	fi
-
-	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:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
-		-e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=/usr/share/info:" \
-		-e "s:# LOG_FILE_PATH=syslog:LOG_FILE_PATH=syslog:" \
-		-e "s:LOG_FILE_PATH=syslog\:/var/log/exim_%slog::" \
-		-e "s:# PID_FILE_PATH=/var/lock/exim%s.pid:PID_FILE_PATH=/var/run/exim%s.pid:" \
-		-e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=/var/spool/exim:" \
-		-e "s:# SUPPORT_MAILDIR=yes:SUPPORT_MAILDIR=yes:" \
-		-e "s:# SUPPORT_MAILSTOR=yes:SUPPORT_MAILSTORE=yes:" \
-		-e "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" \
-		-e "s:EXIM_USER=:EXIM_USER=mail:" \
-		-e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \
-		src/EDITME > Local/Makefile
-
-	cd Local
-	if use pam; then
-		sed -i "s:# \(SUPPORT_PAM=yes\):\1:" Makefile
-		myconf="${myconf} -lpam"
-	fi
-	if use tcpd; then
-		sed -i "s:# \(USE_TCP_WRAPPERS=yes\):\1:" Makefile
-		myconf="${myconf} -lwrap"
-	fi
-	if [ -n "$myconf" ] ; then
-		echo "EXTRALIBS=${myconf}" >> 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: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
-
-	sed -i "s:# LOOKUP_CDB=yes:LOOKUP_CDB=yes:" Local/Makefile
-}
-
-src_compile() {
-	make || die
-}
-
-
-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 exim /usr/bin/mailq
-	dosym exim /usr/bin/newaliases
-	dosym exim /usr/bin/mail
-	dosym exim /usr/sbin/rsmtp
-	dosym exim /usr/sbin/rmail
-	dosym exim /usr/sbin/sendmail
-	dosym exim /usr/lib/sendmail
-
-	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 exim.conf.dist
-	doins ${FILESDIR}/system_filter.exim
-	doins ${FILESDIR}/auth_conf.sub
-	if use exiscan; then
-		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
-}
-
-
-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."
-
-}
diff --git a/net-mail/exim/exim-4.21.ebuild b/net-mail/exim/exim-4.21.ebuild
deleted file mode 100644
index 5928bb41c24c..000000000000
--- a/net-mail/exim/exim-4.21.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.21.ebuild,v 1.6 2004/04/27 20:54:50 agriffis Exp $
-
-inherit eutils
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6"
-
-EXISCANACL_VER=${PV}-10
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.gz
-	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 hppa ppc amd64 ~alpha"
-
-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 )"
-RDEPEND="${DEPEND}
-	!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 maildir; 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
-
-	if use exiscan-acl; then
-		einfo "Patching exican-acl support into exim ${PV}.."
-		epatch ${DISTDIR}/exiscan-acl-${EXISCANACL_VER}.patch
-	fi
-
-	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:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
-		-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_MAILSTOR=yes:SUPPORT_MAILSTORE=yes:" \
-		-e "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" \
-		-e "s:EXIM_USER=:EXIM_USER=mail:" \
-		-e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \
-		src/EDITME > Local/Makefile
-
-	cd Local
-	if use pam; then
-		sed -i "s:# \(SUPPORT_PAM=yes\):\1:" Makefile
-		myconf="${myconf} -lpam"
-	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
-	fi
-
-	if [ -n "$myconf" ] ; then
-		echo "EXTRALIBS=${myconf}" >> 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: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
-
-	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
-	dosym ../sbin/exim /usr/bin/mail
-	dosym exim /usr/sbin/rsmtp
-	dosym exim /usr/sbin/rmail
-	dosym exim /usr/sbin/sendmail
-	dosym ../sbin/exim /usr/lib/sendmail
-
-	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."
-}
-
-
diff --git a/net-mail/exim/exim-4.22.ebuild b/net-mail/exim/exim-4.22.ebuild
deleted file mode 100644
index c1b1a0db07c0..000000000000
--- a/net-mail/exim/exim-4.22.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.22.ebuild,v 1.5 2004/04/27 20:54:50 agriffis Exp $
-
-inherit eutils
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl"
-
-EXISCANACL_VER=${PV}-10
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.gz
-	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 ~hppa ~ppc ~amd64"
-
-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}
-	!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 maildir; 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
-
-	if use exiscan-acl; then
-		einfo "Patching exican-acl support into exim ${PV}.."
-		epatch ${DISTDIR}/exiscan-acl-${EXISCANACL_VER}.patch
-	fi
-
-	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:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
-		-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_MAILSTOR=yes:SUPPORT_MAILSTORE=yes:" \
-		-e "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" \
-		-e "s:EXIM_USER=:EXIM_USER=mail:" \
-		-e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \
-		src/EDITME > Local/Makefile
-
-	cd Local
-	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
-	fi
-
-	if [ -n "$myconf" ] ; then
-		echo "EXTRALIBS=${myconf}" >> 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: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
-
-	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
-	dosym ../sbin/exim /usr/bin/mail
-	dosym exim /usr/sbin/rsmtp
-	dosym exim /usr/sbin/rmail
-	dosym exim /usr/sbin/sendmail
-	dosym ../sbin/exim /usr/lib/sendmail
-
-	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."
-}
-
-
diff --git a/net-mail/exim/exim-4.24-r1.ebuild b/net-mail/exim/exim-4.24-r1.ebuild
deleted file mode 100644
index 5ad941c9b32d..000000000000
--- a/net-mail/exim/exim-4.24-r1.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.24-r1.ebuild,v 1.6 2004/04/27 20:54:50 agriffis Exp $
-
-inherit eutils
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl"
-
-EXISCANACL_VER=${PV}-13
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.gz
-	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 ~hppa ppc ~amd64 ~alpha"
-
-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}
-	!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 maildir; 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
-
-	if use exiscan-acl; then
-		einfo "Patching exican-acl support into exim ${PV}.."
-		epatch ${DISTDIR}/exiscan-acl-${EXISCANACL_VER}.patch
-	fi
-
-	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:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
-		-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_MAILSTOR=yes:SUPPORT_MAILSTORE=yes:" \
-		-e "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" \
-		-e "s:EXIM_USER=:EXIM_USER=mail:" \
-		-e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \
-		src/EDITME > Local/Makefile
-
-	cd Local
-	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
-	fi
-
-	if [ -n "$myconf" ] ; then
-		echo "EXTRALIBS=${myconf}" >> 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
-
-	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
-	dosym ../sbin/exim /usr/bin/mail
-	dosym exim /usr/sbin/rsmtp
-	dosym exim /usr/sbin/rmail
-	dosym exim /usr/sbin/sendmail
-	dosym ../sbin/exim /usr/lib/sendmail
-
-	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."
-}
-
-
diff --git a/net-mail/exim/exim-4.24-r2.ebuild b/net-mail/exim/exim-4.24-r2.ebuild
deleted file mode 100644
index 44d26efe576f..000000000000
--- a/net-mail/exim/exim-4.24-r2.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $
-
-inherit eutils
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl"
-
-EXISCANACL_VER=${PV}-13
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.gz
-	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 ~hppa ppc ~amd64 ~alpha"
-
-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}
-	!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 maildir; 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
-
-	if use exiscan-acl; then
-		einfo "Patching exican-acl support into exim ${PV}.."
-		epatch ${DISTDIR}/exiscan-acl-${EXISCANACL_VER}.patch
-	fi
-
-	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:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
-		-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_MAILSTOR=yes:SUPPORT_MAILSTORE=yes:" \
-		-e "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" \
-		-e "s:EXIM_USER=:EXIM_USER=mail:" \
-		-e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \
-		src/EDITME > Local/Makefile
-
-	cd Local
-	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
-	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
-
-	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
-	dosym ../sbin/exim /usr/bin/mail
-	dosym exim /usr/sbin/rsmtp
-	dosym exim /usr/sbin/rmail
-	dosym exim /usr/sbin/sendmail
-	dosym ../sbin/exim /usr/lib/sendmail
-
-	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."
-}
-
-
diff --git a/net-mail/exim/exim-4.24-r3.ebuild b/net-mail/exim/exim-4.24-r3.ebuild
deleted file mode 100644
index 9e41fc0e44f4..000000000000
--- a/net-mail/exim/exim-4.24-r3.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $
-
-inherit eutils
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl"
-
-EXISCANACL_VER=${PV}-13
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.gz
-	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 ~hppa ppc ~amd64 ~alpha"
-
-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}
-	net-mail/mailwrapper
-	>=net-mail/mailbase-0.00-r5"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	local myconf
-
-	epatch ${FILESDIR}/exim-4.14-tail.patch
-
-	if use maildir; 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
-
-	if use exiscan-acl; then
-		einfo "Patching exican-acl support into exim ${PV}.."
-		epatch ${DISTDIR}/exiscan-acl-${EXISCANACL_VER}.patch
-	fi
-
-	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:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
-		-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_MAILSTOR=yes:SUPPORT_MAILSTORE=yes:" \
-		-e "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" \
-		-e "s:EXIM_USER=:EXIM_USER=mail:" \
-		-e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \
-		src/EDITME > Local/Makefile
-
-	cd Local
-	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
-	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
-
-	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/sendmail /usr/bin/mailq
-	dosym ../sbin/sendmail /usr/bin/newaliases
-	dosym ../sbin/sendmail /usr/bin/mail
-	dosym sendmail /usr/sbin/rsmtp
-	dosym sendmail /usr/sbin/rmail
-	dosym ../sbin/sendmail /usr/lib/sendmail
-	insinto /etc
-	doins ${FILESDIR}/mailer.conf
-
-	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."
-}
-
-
diff --git a/net-mail/exim/exim-4.24.ebuild b/net-mail/exim/exim-4.24.ebuild
deleted file mode 100644
index c270de549d0b..000000000000
--- a/net-mail/exim/exim-4.24.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.24.ebuild,v 1.4 2004/04/27 20:54:50 agriffis Exp $
-
-inherit eutils
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl"
-
-EXISCANACL_VER=${PV}-13
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.gz
-	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 ~hppa ~ppc ~amd64"
-
-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}
-	!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 maildir; 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
-
-	if use exiscan-acl; then
-		einfo "Patching exican-acl support into exim ${PV}.."
-		epatch ${DISTDIR}/exiscan-acl-${EXISCANACL_VER}.patch
-	fi
-
-	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:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
-		-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_MAILSTOR=yes:SUPPORT_MAILSTORE=yes:" \
-		-e "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" \
-		-e "s:EXIM_USER=:EXIM_USER=mail:" \
-		-e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \
-		src/EDITME > Local/Makefile
-
-	cd Local
-	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
-	fi
-
-	if [ -n "$myconf" ] ; then
-		echo "EXTRALIBS=${myconf}" >> 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: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
-
-	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
-	dosym ../sbin/exim /usr/bin/mail
-	dosym exim /usr/sbin/rsmtp
-	dosym exim /usr/sbin/rmail
-	dosym exim /usr/sbin/sendmail
-	dosym ../sbin/exim /usr/lib/sendmail
-
-	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."
-}
-
-
diff --git a/net-mail/exim/exim-4.30-r1.ebuild b/net-mail/exim/exim-4.30-r1.ebuild
deleted file mode 100644
index d583025b8782..000000000000
--- a/net-mail/exim/exim-4.30-r1.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.30-r1.ebuild,v 1.2 2004/04/27 20:54:50 agriffis Exp $
-
-inherit eutils
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl wildlsearch dnsdb"
-
-EXISCANACL_VER=${PV}-16
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.gz
-	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"
-
-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}
-	net-mail/mailwrapper
-	>=net-mail/mailbase-0.00-r5"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	local myconf
-
-	epatch ${FILESDIR}/exim-4.14-tail.patch
-
-	if use maildir; 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
-
-	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:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
-		-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_MAILSTOR=yes:SUPPORT_MAILSTORE=yes:" \
-		-e "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" \
-		-e "s:EXIM_USER=:EXIM_USER=mail:" \
-		-e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \
-		src/EDITME > Local/Makefile
-
-	cd Local
-	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
-	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 exim /usr/sbin/sendmail
-	dosym ../sbin/exim /usr/lib/sendmail
-
-	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."
-}
-
-
diff --git a/net-mail/exim/exim-4.30.ebuild b/net-mail/exim/exim-4.30.ebuild
deleted file mode 100644
index cd020031d21c..000000000000
--- a/net-mail/exim/exim-4.30.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $
-
-inherit eutils
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl"
-
-EXISCANACL_VER=${PV}-16
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.gz
-	exiscan-acl? ( http://duncanthrax.net/exiscan-acl/exiscan-acl-${EXISCANACL_VER}.patch )"
-HOMEPAGE="http://www.exim.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 -*"
-
-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}
-	net-mail/mailwrapper
-	>=net-mail/mailbase-0.00-r5"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	local myconf
-
-	epatch ${FILESDIR}/exim-4.14-tail.patch
-
-	if use maildir; 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
-
-	if use exiscan-acl; then
-		einfo "Patching exican-acl support into exim ${PV}.."
-		epatch ${DISTDIR}/exiscan-acl-${EXISCANACL_VER}.patch
-	fi
-
-	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:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
-		-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_MAILSTOR=yes:SUPPORT_MAILSTORE=yes:" \
-		-e "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" \
-		-e "s:EXIM_USER=:EXIM_USER=mail:" \
-		-e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \
-		src/EDITME > Local/Makefile
-
-	cd Local
-	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
-	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
-
-	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/sendmail /usr/bin/mailq
-	dosym ../sbin/sendmail /usr/bin/newaliases
-	dosym ../sbin/sendmail /usr/bin/mail
-	dosym sendmail /usr/sbin/rsmtp
-	dosym sendmail /usr/sbin/rmail
-	dosym ../sbin/sendmail /usr/lib/sendmail
-	insinto /etc
-	doins ${FILESDIR}/mailer.conf
-
-	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."
-}
-
-
diff --git a/net-mail/exim/exim-4.31.ebuild b/net-mail/exim/exim-4.31.ebuild
deleted file mode 100644
index 65e098947297..000000000000
--- a/net-mail/exim/exim-4.31.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.31.ebuild,v 1.3 2004/04/27 20:54:50 agriffis Exp $
-
-inherit eutils
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl wildlsearch dnsdb"
-
-EXISCANACL_VER=${PV}-16
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.gz
-	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"
-
-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}
-	net-mail/mailwrapper
-	>=net-mail/mailbase-0.00-r5"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	local myconf
-
-	epatch ${FILESDIR}/exim-4.14-tail.patch
-
-	if use maildir; 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
-
-	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:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
-		-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_MAILSTOR=yes:SUPPORT_MAILSTORE=yes:" \
-		-e "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" \
-		-e "s:EXIM_USER=:EXIM_USER=mail:" \
-		-e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \
-		src/EDITME > Local/Makefile
-
-	cd Local
-	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
-	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 exim /usr/sbin/sendmail
-	dosym ../sbin/exim /usr/lib/sendmail
-
-	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."
-}
-
-
diff --git a/net-mail/exim/exim-4.32-r1.ebuild b/net-mail/exim/exim-4.32-r1.ebuild
deleted file mode 100644
index f64c6e17cc37..000000000000
--- a/net-mail/exim/exim-4.32-r1.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.32-r1.ebuild,v 1.2 2004/05/02 13:42:54 peitolm Exp $
-
-inherit eutils
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl wildlsearch dnsdb perl mbox X"
-
-EXISCANACL_VER=${PV}-19
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.gz
-	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"
-
-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}
-	net-mail/mailwrapper
-	>=net-mail/mailbase-0.00-r5"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	local myconf
-
-	epatch ${FILESDIR}/exim-4.14-tail.patch
-
-	if use maildir; 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 exim /usr/sbin/sendmail
-	dosym ../sbin/exim /usr/lib/sendmail
-
-	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."
-}
-
-
diff --git a/net-mail/exim/exim-4.32.ebuild b/net-mail/exim/exim-4.32.ebuild
deleted file mode 100644
index c13fdc20626b..000000000000
--- a/net-mail/exim/exim-4.32.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.32.ebuild,v 1.2 2004/04/27 20:54:50 agriffis Exp $
-
-inherit eutils
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl wildlsearch dnsdb perl mbox X"
-
-EXISCANACL_VER=${PV}-18
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.gz
-	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"
-
-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}
-	net-mail/mailwrapper
-	>=net-mail/mailbase-0.00-r5"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	local myconf
-
-	epatch ${FILESDIR}/exim-4.14-tail.patch
-
-	if use maildir; 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 exim /usr/sbin/sendmail
-	dosym ../sbin/exim /usr/lib/sendmail
-
-	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."
-}
-
-
diff --git a/net-mail/exim/exim-4.33-r1.ebuild b/net-mail/exim/exim-4.33-r1.ebuild
deleted file mode 100644
index 6b04717dd6c3..000000000000
--- a/net-mail/exim/exim-4.33-r1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.33-r1.ebuild,v 1.1 2004/05/09 15:48:51 peitolm Exp $
-
-inherit eutils
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl wildlsearch dnsdb perl mbox X"
-
-EXISCANACL_VER=${PV}-20
-
-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"
-
-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}
-	net-mail/mailwrapper
-	>=net-mail/mailbase-0.00-r5"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	local myconf
-
-	epatch ${FILESDIR}/exim-4.14-tail.patch
-	epatch ${FILESDIR}/exim-4.33-r1-header-syntax.patch
-
-	if use maildir; 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 exim /usr/sbin/sendmail
-	dosym ../sbin/exim /usr/lib/sendmail
-
-	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."
-}
-
-
diff --git a/net-mail/exim/exim-4.33.ebuild b/net-mail/exim/exim-4.33.ebuild
deleted file mode 100644
index 0db32a63a309..000000000000
--- a/net-mail/exim/exim-4.33.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.33.ebuild,v 1.1 2004/05/06 18:06:18 peitolm Exp $
-
-inherit eutils
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl wildlsearch dnsdb perl mbox X"
-
-EXISCANACL_VER=${PV}-20
-
-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"
-
-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}
-	net-mail/mailwrapper
-	>=net-mail/mailbase-0.00-r5"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	local myconf
-
-	epatch ${FILESDIR}/exim-4.14-tail.patch
-
-	if use maildir; 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 exim /usr/sbin/sendmail
-	dosym ../sbin/exim /usr/lib/sendmail
-
-	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."
-}
-
-
diff --git a/net-mail/exim/exim-4.34.ebuild b/net-mail/exim/exim-4.34.ebuild
deleted file mode 100644
index 113bcba95d35..000000000000
--- a/net-mail/exim/exim-4.34.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.34.ebuild,v 1.6 2004/05/13 22:17:23 lu_zero Exp $
-
-inherit eutils
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl wildlsearch dnsdb perl mbox X"
-
-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}
-	net-mail/mailwrapper
-	>=net-mail/mailbase-0.00-r5"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	local myconf
-
-	epatch ${FILESDIR}/exim-4.14-tail.patch
-
-	if use maildir; 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 exim /usr/sbin/sendmail
-	dosym ../sbin/exim /usr/lib/sendmail
-
-	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."
-}
-
-
diff --git a/net-mail/exim/files/auth_conf.sub b/net-mail/exim/files/auth_conf.sub
deleted file mode 100644
index fb744a5a67a1..000000000000
--- a/net-mail/exim/files/auth_conf.sub
+++ /dev/null
@@ -1,25 +0,0 @@
-######################################################################
-#                   AUTHENTICATION CONFIGURATION                     #
-######################################################################
-# If you're using PAM to authenticate, lifes real simple.
-# This plain directive works for nearly everything except windows MUA's the
-# login directive will allow you to authenticate your Outlook 2000 and
-# outlook express clients.
-
-
-
-plain:
-  driver = plaintext
-  public_name = PLAIN
-  server_condition = "${if pam{$2:$3}{1}{0}}"
-  server_set_id = $2
-
-login:
-  driver = plaintext
-  public_name = LOGIN
-  server_prompts = "Username:: : Password::"
-  server_condition = "${if pam{$1:$2}{1}{0}}"
-  server_set_id = $1
-
-# FIXME
-# Need to add authenticator for SPA!!
diff --git a/net-mail/exim/files/configure b/net-mail/exim/files/configure
deleted file mode 100644
index 740da7fc501a..000000000000
--- a/net-mail/exim/files/configure
+++ /dev/null
@@ -1,419 +0,0 @@
-######################################################################
-#                  Runtime configuration file for Exim               #
-######################################################################
-
-
-# This is a default configuration file which will operate correctly in
-# uncomplicated installations. Please see the manual for a complete list
-# of all the runtime configuration options that can be included in a
-# configuration file. There are many more than are mentioned here. The
-# manual is in the file doc/spec.txt in the Exim distribution as a plain
-# ASCII file. Other formats (PostScript, Texinfo, HTML, PDF) are available
-# from the Exim ftp sites. The manual is also online via the Exim web sites.
-
-
-# This file is divided into several parts, all but the last of which are
-# terminated by a line containing the word "end". The parts must appear
-# in the correct order, and all must be present (even if some of them are
-# in fact empty). Blank lines, and lines starting with # are ignored.
-
-
-############ IMPORTANT ########## IMPORTANT ########### IMPORTANT ############
-#                                                                            #
-# Whenever you change Exim's configuration file, you *must* remember to HUP  #
-# the Exim daemon, because it will not pick up the new configuration until   #
-# until you do this. It is usually a good idea to test a new configuration   #
-# for syntactic correctness (e.g. using "exim -C /config/file -bV") first.   #
-#                                                                            #
-############ IMPORTANT ########## IMPORTANT ########### IMPORTANT ############
-
-
-
-######################################################################
-#                    MAIN CONFIGURATION SETTINGS                     #
-######################################################################
-
-# Specify your host's canonical name here. This should normally be the fully
-# qualified "official" name of your host. If this option is not set, the
-# uname() function is called to obtain the name.
-
-# primary_hostname =
-
-
-# Specify the domain you want to be added to all unqualified addresses
-# here. An unqualified address is one that does not contain an "@" character
-# followed by a domain. For example, "caesar@rome.ex" is a fully qualified
-# address, but the string "caesar" (i.e. just a login name) is an unqualified
-# email address. Unqualified addresses are accepted only from local callers by
-# default. See the receiver_unqualified_{hosts,nets} options if you want
-# to permit unqualified addresses from remote sources. If this option is
-# not set, the primary_hostname value is used for qualification.
-
-# qualify_domain =
-
-
-# If you want unqualified recipient addresses to be qualified with a different
-# domain to unqualified sender addresses, specify the recipient domain here.
-# If this option is not set, the qualify_domain value is used.
-
-# qualify_recipient =
-
-
-# Specify your local domains as a colon-separated list here. If this option
-# is not set (i.e. not mentioned in the configuration file), the
-# qualify_recipient value is used as the only local domain. If you do not want
-# to do any local deliveries, uncomment the following line, but do not supply
-# any data for it. This sets local_domains to an empty string, which is not
-# the same as not mentioning it at all. An empty string specifies that there
-# are no local domains; not setting it at all causes the default value (the
-# setting of qualify_recipient) to be used.
-
-# local_domains =
-
-
-# If you want to accept mail addressed to your host's literal IP address, for
-# example, mail addressed to "user@[111.111.111.111]", then uncomment the
-# following line, or supply the literal domain(s) as part of "local_domains"
-# above. You also need to comment "forbid_domain_literals" below. This is not
-# recommended for today's Internet.
-
-# local_domains_include_host_literals
-
-
-# The following line prevents Exim from recognizing addresses of the form
-# "user@[111.111.111.111]" that is, with a "domain literal" (an IP address)
-# instead of a named domain. The RFCs still require this form, but it makes
-# little sense to permit mail to be sent to specific hosts by their IP address
-# in the modern Internet, and this ancient format has been used by those
-# seeking to abuse hosts by using them for unwanted relaying. If you really
-# do want to support domain literals, remove the following line, and see
-# also the "domain_literal" router below.
-
-forbid_domain_literals
-
-
-# No local deliveries will ever be run under the uids of these users (a colon-
-# separated list). An attempt to do so gets changed so that it runs under the
-# uid of "nobody" instead. This is a paranoic safety catch. Note the default
-# setting means you cannot deliver mail addressed to root as if it were a
-# normal user. This isn't usually a problem, as most sites have an alias for
-# root that redirects such mail to a human administrator.
-
-never_users = root
-
-
-# The use of your host as a mail relay by any host, including the local host
-# calling its own SMTP port, is locked out by default. If you want to permit
-# relaying from the local host, you should set
-#
-# host_accept_relay = localhost
-#
-# If you want to permit relaying through your host from certain hosts or IP
-# networks, you need to set the option appropriately, for example
-#
-# host_accept_relay = my.friends.host : 192.168.0.0/16
-#
-# If you are an MX backup or gateway of some kind for some domains, you must
-# set relay_domains to match those domains. This will allow any host to
-# relay through your host to those domains.
-#
-# relay_domains =
-#
-# See the section of the manual entitled "Control of relaying" for more
-# information.
-
-
-# The setting below causes Exim to do a reverse DNS lookup on all incoming
-# IP calls, in order to get the true host name. If you feel this is too
-# expensive, you can specify the networks for which a lookup is done, or
-# remove the setting entirely.
-
-host_lookup = *
-
-
-# By default, Exim expects all envelope addresses to be fully qualified, that
-# is, they must contain both a local part and a domain. If you want to accept
-# unqualified addresses (just a local part) from certain hosts, you can specify
-# these hosts by setting one or both of
-#
-# receiver_unqualified_hosts =
-# sender_unqualified_hosts =
-#
-# to control sender and receiver addresses, respectively. When this is done,
-# unqualified addresses are qualified using the settings of qualify_domain
-# and/or qualify_recipient (see above).
-
-
-# By default, Exim does not make any checks, other than syntactic ones, on
-# incoming addresses during the SMTP dialogue. This reduces delays in SMTP
-# transactions, but it does mean that you might accept messages with unknown
-# recipients, and/or bad senders.
-
-# Uncomment this line if you want incoming recipient addresses to be verified
-# during the SMTP dialogue. Unknown recipients are then rejected at this stage,
-# and the generation of a failure message is the job of the sending host.
-
-# receiver_verify
-
-# Uncomment this line if you want incoming sender addresses (return-paths) to
-# be verified during the SMTP dialogue. Verification can normally only check
-# that the domain exists.
-
-# sender_verify
-
-
-# Exim contains support for the Realtime Blocking List (RBL) that is being
-# maintained as part of the DNS. See http://maps.vix.com/rbl/ for background.
-# Uncommenting the first line below will make Exim reject mail from any
-# host whose IP address is blacklisted in the RBL at maps.vix.com. Some
-# others have followed the RBL lead and have produced other lists: DUL is
-# a list of dial-up addresses, and ORBS is a list of open relay systems. The
-# second line below checks all three lists.
-
-# rbl_domains = rbl.maps.vix.com
-# rbl_domains = rbl.maps.vix.com:dul.maps.vix.com:relays.orbs.org
-
-
-# If you want Exim to support the "percent hack" for all your local domains,
-# uncomment the following line. This is the feature by which mail addressed
-# to x%y@z (where z is one of your local domains) is locally rerouted to
-# x@y and sent on. Otherwise x%y is treated as an ordinary local part.
-
-# percent_hack_domains = *
-
-
-# When Exim can neither deliver a message nor return it to sender, it "freezes"
-# the delivery error message (aka "bounce message"). There are also other
-# circumstances in which messages get frozen. They will stay on the queue for
-# ever unless one of the following options is set.
-
-# This option unfreezes unfreezes bounce messages after two days, tries
-# once more to deliver them, and ignores any delivery failures.
-
-ignore_errmsg_errors_after = 2d
-
-# This option cancels (removes) frozen messages that are older than a week.
-
-timeout_frozen_after = 7d
-
-end
-
-
-
-######################################################################
-#                      TRANSPORTS CONFIGURATION                      #
-######################################################################
-#                       ORDER DOES NOT MATTER                        #
-#     Only one appropriate transport is called for each delivery.    #
-######################################################################
-
-# A transport is used only when referenced from a director or a router that
-# successfully handles an address.
-
-
-# This transport is used for delivering messages over SMTP connections.
-
-remote_smtp:
-  driver = smtp
-
-
-# This transport is used for local delivery to user mailboxes in traditional
-# BSD mailbox format. By default it will be run under the uid and gid of the
-# local user, and requires the sticky bit to be set on the /var/mail directory.
-# Some systems use the alternative approach of running mail deliveries under a
-# particular group instead of using the sticky bit. The commented options below
-# show how this can be done.
-
-local_delivery:
-  driver = appendfile
-#  file = /var/mail/$local_part
-  directory = $home/.maildir
-  maildir_format
-  delivery_date_add
-  envelope_to_add
-  return_path_add
-# group = mail
-# mode = 0660
-
-
-# This transport is used for handling pipe deliveries generated by alias
-# or .forward files. If the pipe generates any standard output, it is returned
-# to the sender of the message as a delivery error. Set return_fail_output
-# instead of return_output if you want this to happen only when the pipe fails
-# to complete normally. You can set different transports for aliases and
-# forwards if you want to - see the references to address_pipe in the directors
-# section below.
-
-address_pipe:
-  driver = pipe
-  return_output
-
-
-# This transport is used for handling deliveries directly to files that are
-# generated by aliasing or forwarding.
-
-address_file:
-  driver = appendfile
-  delivery_date_add
-  envelope_to_add
-  return_path_add
-
-
-# This transport is used for handling autoreplies generated by the filtering
-# option of the forwardfile director.
-
-address_reply:
-  driver = autoreply
-
-
-end
-
-
-
-######################################################################
-#                      DIRECTORS CONFIGURATION                       #
-#             Specifies how local addresses are handled              #
-######################################################################
-#                          ORDER DOES MATTER                         #
-#   A local address is passed to each in turn until it is accepted.  #
-######################################################################
-
-# Local addresses are those with a domain that matches some item in the
-# "local_domains" setting above, or those which are passed back from the
-# routers because of a "self=local" setting (not used in this configuration).
-
-
-# This director handles aliasing using a traditional /etc/aliases file.
-# If any of your aliases expand to pipes or files, you will need to set
-# up a user and a group for these deliveries to run under. You can do
-# this by uncommenting the "user" option below (changing the user name
-# as appropriate) and adding a "group" option if necessary. Alternatively, you
-# can specify "user" on the transports that are used. Note that those
-# listed below are the same as are used for .forward files; you might want
-# to set up different ones for pipe and file deliveries from aliases.
-
-system_aliases:
-  driver = aliasfile
-  file = /etc/mail/aliases
-  search_type = lsearch
-# user = exim
-  file_transport = address_file
-  pipe_transport = address_pipe
-
-
-# This director handles forwarding using traditional .forward files.
-# If you want it also to allow mail filtering when a forward file
-# starts with the string "# Exim filter", uncomment the "filter" option.
-
-# The no_verify setting means that this director will be skipped when
-# verifying addresses if sender_verify or receiver_verify is set (though
-# they are not set by default). Similarly, no_expn means that this director
-# will be skipped if smtp_expn_hosts is set to allow any hosts to use the
-# EXPN command.
-
-# The check_ancestor option means that if the forward file generates an
-# address that is an ancestor of the current one, the current one gets
-# passed on instead. This covers the case where A is aliased to B and B
-# has a .forward file pointing to A.
-
-# The three transports specified at the end are those that are used when
-# forwarding generates a direct delivery to a file, or to a pipe, or sets
-# up an auto-reply, respectively.
-
-userforward:
-  driver = forwardfile
-  file = .forward
-  no_verify
-  no_expn
-  check_ancestor
-# filter
-  file_transport = address_file
-  pipe_transport = address_pipe
-  reply_transport = address_reply
-
-
-# This director matches local user mailboxes.
-
-localuser:
-  driver = localuser
-  transport = local_delivery
-
-
-end
-
-
-
-######################################################################
-#                      ROUTERS CONFIGURATION                         #
-#            Specifies how remote addresses are handled              #
-######################################################################
-#                          ORDER DOES MATTER                         #
-#  A remote address is passed to each in turn until it is accepted.  #
-######################################################################
-
-# Remote addresses are those with a domain that does not match any item
-# in the "local_domains" setting above.
-
-
-# This router routes to remote hosts over SMTP using a DNS lookup with
-# default options.
-
-lookuphost:
-  driver = lookuphost
-  transport = remote_smtp
-
-
-# This router routes to remote hosts over SMTP by explicit IP address,
-# when an email address is given in "domain literal" form, for example,
-# <user@[192.168.35.64]>. The RFCs require this facility. However, it is
-# little-known these days, and has been exploited by evil people seeking
-# to abuse SMTP relays. Consequently it is commented out in the default
-# configuration. If you uncomment this router, you also need to comment out
-# "forbid_domain_literals" above, so that Exim can recognize the syntax of
-# domain literal addresses.
-
-# domain_literal:
-#   driver = ipliteral
-#   transport = remote_smtp
-
-
-end
-
-
-
-######################################################################
-#                      RETRY CONFIGURATION                           #
-######################################################################
-
-# This single retry rule applies to all domains and all errors. It specifies
-# retries every 15 minutes for 2 hours, then increasing retry intervals,
-# starting at 1 hour and increasing each time by a factor of 1.5, up to 16
-# hours, then retries every 8 hours until 4 days have passed since the first
-# failed delivery.
-
-# Domain               Error       Retries
-# ------               -----       -------
-
-*                      *           F,2h,15m; G,16h,1h,1.5; F,4d,8h
-
-end
-
-
-
-######################################################################
-#                      REWRITE CONFIGURATION                         #
-######################################################################
-
-# There are no rewriting specifications in this default configuration file.
-
-end
-
-
-
-######################################################################
-#                   AUTHENTICATION CONFIGURATION                     #
-######################################################################
-
-# There are no authenticator specifications in this default configuration file.
-
-# End of Exim configuration file
diff --git a/net-mail/exim/files/digest-exim-4.10 b/net-mail/exim/files/digest-exim-4.10
deleted file mode 100644
index bde1295f7441..000000000000
--- a/net-mail/exim/files/digest-exim-4.10
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3248805102546701a83ddceb032303af exim-4.10.tar.gz 1333428
-MD5 a11a02044421705b7b5fee6742eca5c2 exiscan-4.10-16.tar.gz 94556
diff --git a/net-mail/exim/files/digest-exim-4.12 b/net-mail/exim/files/digest-exim-4.12
deleted file mode 100644
index b684cd6591ae..000000000000
--- a/net-mail/exim/files/digest-exim-4.12
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a69c8ebeec91559dea8fc4364ecb89a2 exim-4.12.tar.gz 1444383
-MD5 7ed67d3e10caf99174c693ff2016cf9c exiscan-4.12-21.tar.gz 100775
diff --git a/net-mail/exim/files/digest-exim-4.14 b/net-mail/exim/files/digest-exim-4.14
deleted file mode 100644
index bca81a3e6537..000000000000
--- a/net-mail/exim/files/digest-exim-4.14
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 bebd65023b117e2fa7dcea46f1129556 exim-4.14.tar.gz 1504354
-MD5 3bd9b18f55c079bcd9af2eb07fec469b exiscan-4.14-26.tar.gz 63656
diff --git a/net-mail/exim/files/digest-exim-4.20 b/net-mail/exim/files/digest-exim-4.20
deleted file mode 100644
index 1bf1437b725c..000000000000
--- a/net-mail/exim/files/digest-exim-4.20
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a1f06f1de1ab602a25d78ad2a20819f2 exim-4.20.tar.gz 1549612
-MD5 a18eb772895af7b190d17c5b151d4dd9 exiscan-4.20-26.tar.gz 63663
-MD5 5898fa2e00e85c771cffe741f3198c07 exiscan-acl-4.20-09.patch 263216
diff --git a/net-mail/exim/files/digest-exim-4.20-r1 b/net-mail/exim/files/digest-exim-4.20-r1
deleted file mode 100644
index 1bf1437b725c..000000000000
--- a/net-mail/exim/files/digest-exim-4.20-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a1f06f1de1ab602a25d78ad2a20819f2 exim-4.20.tar.gz 1549612
-MD5 a18eb772895af7b190d17c5b151d4dd9 exiscan-4.20-26.tar.gz 63663
-MD5 5898fa2e00e85c771cffe741f3198c07 exiscan-acl-4.20-09.patch 263216
diff --git a/net-mail/exim/files/digest-exim-4.20-r2 b/net-mail/exim/files/digest-exim-4.20-r2
deleted file mode 100644
index 368f6db1d642..000000000000
--- a/net-mail/exim/files/digest-exim-4.20-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a1f06f1de1ab602a25d78ad2a20819f2 exim-4.20.tar.gz 1549612
diff --git a/net-mail/exim/files/digest-exim-4.21 b/net-mail/exim/files/digest-exim-4.21
deleted file mode 100644
index 58c8ead0f650..000000000000
--- a/net-mail/exim/files/digest-exim-4.21
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 eed92d34e02a5de1493d766fc92b0c94 exim-4.21.tar.gz 1625897
-MD5 c9571d38c50a41adad84bfb21669c2f9 exiscan-acl-4.21-10.patch 286429
diff --git a/net-mail/exim/files/digest-exim-4.22 b/net-mail/exim/files/digest-exim-4.22
deleted file mode 100644
index 7e970affc9da..000000000000
--- a/net-mail/exim/files/digest-exim-4.22
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 20df3d13b1d3cd2cd95312f2293e0b40 exim-4.22.tar.gz 1607027
-MD5 68f1643ac7de3b4c818916e714de8159 exiscan-acl-4.22-10.patch 286429
diff --git a/net-mail/exim/files/digest-exim-4.24 b/net-mail/exim/files/digest-exim-4.24
deleted file mode 100644
index 72ea7eafa2c7..000000000000
--- a/net-mail/exim/files/digest-exim-4.24
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 74f4116be9b71991b54b91abd7c99eec exim-4.24.tar.gz 1625449
-MD5 c8eb375adc7a7233d754eec20f07997f exiscan-acl-4.24-13.patch 290551
diff --git a/net-mail/exim/files/digest-exim-4.24-r1 b/net-mail/exim/files/digest-exim-4.24-r1
deleted file mode 100644
index 72ea7eafa2c7..000000000000
--- a/net-mail/exim/files/digest-exim-4.24-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 74f4116be9b71991b54b91abd7c99eec exim-4.24.tar.gz 1625449
-MD5 c8eb375adc7a7233d754eec20f07997f exiscan-acl-4.24-13.patch 290551
diff --git a/net-mail/exim/files/digest-exim-4.24-r2 b/net-mail/exim/files/digest-exim-4.24-r2
deleted file mode 100644
index 72ea7eafa2c7..000000000000
--- a/net-mail/exim/files/digest-exim-4.24-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 74f4116be9b71991b54b91abd7c99eec exim-4.24.tar.gz 1625449
-MD5 c8eb375adc7a7233d754eec20f07997f exiscan-acl-4.24-13.patch 290551
diff --git a/net-mail/exim/files/digest-exim-4.24-r3 b/net-mail/exim/files/digest-exim-4.24-r3
deleted file mode 100644
index 72ea7eafa2c7..000000000000
--- a/net-mail/exim/files/digest-exim-4.24-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 74f4116be9b71991b54b91abd7c99eec exim-4.24.tar.gz 1625449
-MD5 c8eb375adc7a7233d754eec20f07997f exiscan-acl-4.24-13.patch 290551
diff --git a/net-mail/exim/files/digest-exim-4.30 b/net-mail/exim/files/digest-exim-4.30
deleted file mode 100644
index 2a8c077a8ce7..000000000000
--- a/net-mail/exim/files/digest-exim-4.30
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ba8fe22a527172bc3cf6481ba26712cb exim-4.30.tar.gz 1670421
-MD5 9e20b18f2be3983d73777b4f85b5db15 exiscan-acl-4.30-16.patch 367351
diff --git a/net-mail/exim/files/digest-exim-4.30-r1 b/net-mail/exim/files/digest-exim-4.30-r1
deleted file mode 100644
index 082fdb20e1d1..000000000000
--- a/net-mail/exim/files/digest-exim-4.30-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ba8fe22a527172bc3cf6481ba26712cb exim-4.30.tar.gz 1670421
diff --git a/net-mail/exim/files/digest-exim-4.31 b/net-mail/exim/files/digest-exim-4.31
deleted file mode 100644
index eaabfbaa925e..000000000000
--- a/net-mail/exim/files/digest-exim-4.31
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1bbc5823cd32d5a00175f32de104503f exim-4.31.tar.gz 1700513
-MD5 69fe6fce9e0ca72aaf2319a87e672fbf exiscan-acl-4.31-16.patch 367277
diff --git a/net-mail/exim/files/digest-exim-4.32 b/net-mail/exim/files/digest-exim-4.32
deleted file mode 100644
index ff81698596a3..000000000000
--- a/net-mail/exim/files/digest-exim-4.32
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 27bbde30300200c2780cff7c7cbc6f8d exim-4.32.tar.gz 1706875
-MD5 8c49a4a25abe85ed69523a479567e24a exiscan-acl-4.32-18.patch 384568
diff --git a/net-mail/exim/files/digest-exim-4.32-r1 b/net-mail/exim/files/digest-exim-4.32-r1
deleted file mode 100644
index cf12c67744f8..000000000000
--- a/net-mail/exim/files/digest-exim-4.32-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 27bbde30300200c2780cff7c7cbc6f8d exim-4.32.tar.gz 1706875
-MD5 c2f90a62f0535ccd3114f8d07a670af9 exiscan-acl-4.32-19.patch 391654
diff --git a/net-mail/exim/files/digest-exim-4.33 b/net-mail/exim/files/digest-exim-4.33
deleted file mode 100644
index 9b87feb03933..000000000000
--- a/net-mail/exim/files/digest-exim-4.33
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8514c800172e4ab4e9cb90553605e1f2 exim-4.33.tar.bz2 1327741
-MD5 5e9d3be31121ea5ece12d872a368717c exiscan-acl-4.33-20.patch 395525
diff --git a/net-mail/exim/files/digest-exim-4.33-r1 b/net-mail/exim/files/digest-exim-4.33-r1
deleted file mode 100644
index 9b87feb03933..000000000000
--- a/net-mail/exim/files/digest-exim-4.33-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8514c800172e4ab4e9cb90553605e1f2 exim-4.33.tar.bz2 1327741
-MD5 5e9d3be31121ea5ece12d872a368717c exiscan-acl-4.33-20.patch 395525
diff --git a/net-mail/exim/files/digest-exim-4.34 b/net-mail/exim/files/digest-exim-4.34
deleted file mode 100644
index 8f852ab954ed..000000000000
--- a/net-mail/exim/files/digest-exim-4.34
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 bab611edc153867334b1c7cffd8fe3c0 exim-4.34.tar.bz2 1328742
-MD5 6fa74ecf1c2a83dbce1e46f991fce27b exiscan-acl-4.34-21.patch 395967
diff --git a/net-mail/exim/files/exim-4.10-gentoo.diff b/net-mail/exim/files/exim-4.10-gentoo.diff
deleted file mode 100644
index 6be612358fa0..000000000000
--- a/net-mail/exim/files/exim-4.10-gentoo.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-*** exim-4.10/src/daemon.c  Mon Jul 22 09:59:48 2002
-- --- daemon.c   Wed Dec  4 10:52:04 2002
-***************
-*** 960,991 ****
-    (b) When -bd is used and -oX is not used, or
-    (c) When -oP is used to supply a path.
-
-! The variable daemon_write_pid is used to control this.
-
-- - Note re use of sprintf: spool_directory and pid_file_path are checked on
-- - input to be < 200 characters. */
-- -
-  if (running_in_test_harness || daemon_write_pid)
-    {
-    FILE *f;
-- -   uschar buff[256];
-- -
-    if (pid_file_path[0] == 0)
-!     sprintf(CS buff, "%s/exim-daemon.pid", spool_directory);
-!   else
-!     sprintf(CS buff, CS pid_file_path, "");   /* Backward compatibility */
-
-!   f = Ufopen(buff, "wb");
-    if (f != NULL)
-      {
-      fprintf(f, "%d\n", (int)getpid());
-      fchmod(fileno(f), 0644);
-      fclose(f);
-!     DEBUG(D_any) debug_printf("pid written to %s\n", buff);
-      }
-    else
-      DEBUG(D_any)
-!       debug_printf("%s\n", string_open_failed(errno, "pid file %s", buff));
-    }
-
-  /* Set up the handler for SIGHUP, which causes a restart of the daemon. */
-- --- 960,987 ----
-    (b) When -bd is used and -oX is not used, or
-    (c) When -oP is used to supply a path.
-
-! The variable daemon_write_pid is used to control this. */
-
-  if (running_in_test_harness || daemon_write_pid)
-    {
-    FILE *f;
-    if (pid_file_path[0] == 0)
-!     pid_file_path = string_sprintf("%s/exim-daemon.pid", spool_directory);
-
-!   f = Ufopen(pid_file_path, "wb");
-    if (f != NULL)
-      {
-      fprintf(f, "%d\n", (int)getpid());
-      fchmod(fileno(f), 0644);
-      fclose(f);
-!     DEBUG(D_any) debug_printf("pid written to %s\n", pid_file_path);
-      }
-    else
-+     {
-      DEBUG(D_any)
-!       debug_printf("%s\n", string_open_failed(errno, "pid file %s",
-!         pid_file_path));
-!     }
-    }
-
-  /* Set up the handler for SIGHUP, which causes a restart of the daemon. */
diff --git a/net-mail/exim/files/exim-4.14-tail.patch b/net-mail/exim/files/exim-4.14-tail.patch
deleted file mode 100644
index 481dca9b80d4..000000000000
--- a/net-mail/exim/files/exim-4.14-tail.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/Configure-config.h.orig	2003-07-17 18:01:19.000000000 -0400
-+++ scripts/Configure-config.h	2003-07-17 18:01:25.000000000 -0400
-@@ -41,7 +41,7 @@
- 
- # Double-check that config.h is complete.
- 
--if [ "`tail -1 config.h`" != "/* End of config.h */" ] ; then
-+if [ "`tail -n 1 config.h`" != "/* End of config.h */" ] ; then
-   echo "*** config.h appears to be incomplete"
-   echo "*** unexpected failure in buildconfig program"
-   exit 1
diff --git a/net-mail/exim/files/exim-4.20-maildir.patch b/net-mail/exim/files/exim-4.20-maildir.patch
deleted file mode 100644
index 3cb198d545c1..000000000000
--- a/net-mail/exim/files/exim-4.20-maildir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN ./exim-4.20.orig/src/configure.default exim-4.20/src/configure.default
---- ./exim-4.20.orig/src/configure.default	2003-06-27 16:48:22.000000000 -0700
-+++ exim-4.20/src/configure.default	2003-06-27 16:52:20.000000000 -0700
-@@ -451,7 +451,9 @@
- 
- local_delivery:
-   driver = appendfile
--  file = /var/mail/$local_part
-+#  file = /var/mail/$local_part
-+  directory = /home/$local_part/.maildir
-+  maildir_format
-   delivery_date_add
-   envelope_to_add
-   return_path_add
diff --git a/net-mail/exim/files/exim-4.30-conf.patch b/net-mail/exim/files/exim-4.30-conf.patch
deleted file mode 100644
index 5d154b96f71e..000000000000
--- a/net-mail/exim/files/exim-4.30-conf.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/configure.default.orig	2004-03-29 22:48:24.000000000 +0100
-+++ src/configure.default.orig.patch-01	2004-03-29 22:57:10.000000000 +0100
-@@ -41,6 +41,16 @@
- #                    MAIN CONFIGURATION SETTINGS                     #
- ######################################################################
- 
-+# This Sets up the default log location to syslog, specifically to the "mail"
-+# Facility. Please note that you may want to change this, as other mail, 
-+# relatively noisy mail programs also log to the mail facility (eg. courier)
-+
-+# Note: 
-+# If exim cannot log to syslog it will try to log to, /var/log/exim/exim_%s.log
-+log_file_path=syslog
-+
-+
-+
- # Specify your host's canonical name here. This should normally be the fully
- # qualified "official" name of your host. If this option is not set, the
- # uname() function is called to obtain the name. In many cases this does
diff --git a/net-mail/exim/files/exim-4.33-r1-header-syntax.patch b/net-mail/exim/files/exim-4.33-r1-header-syntax.patch
deleted file mode 100644
index 06cef16b17db..000000000000
--- a/net-mail/exim/files/exim-4.33-r1-header-syntax.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-*** exim-4.33/src/verify.c  Wed May  5 11:08:36 2004
---- verify.c	Thu May  6 14:36:40 2004
-***************
-*** 1264,1282 ****
-
-      if (recipient == NULL && Ustrcmp(errmess, "empty address") != 0)
-        {
--       uschar hname[64];
--       uschar *t = h->text;
--       uschar *tt = hname;
-        uschar *verb = US"is";
-        int len;
-
--       while (*t != ':') *tt++ = *t++;
--       *tt = 0;
--
-        /* Arrange not to include any white space at the end in the
-        error message. */
-
--       t = ss;
-        while (t > s && isspace(t[-1])) t--;
-
-        /* Add the address which failed to the error message, since in a
---- 1264,1276 ----
-
-      if (recipient == NULL && Ustrcmp(errmess, "empty address") != 0)
-        {
-        uschar *verb = US"is";
-+       uschar *t = ss;
-        int len;
-
-        /* Arrange not to include any white space at the end in the
-        error message. */
-
-        while (t > s && isspace(t[-1])) t--;
-
-        /* Add the address which failed to the error message, since in a
diff --git a/net-mail/exim/files/exim.confd b/net-mail/exim/files/exim.confd
deleted file mode 100644
index a3974d33b406..000000000000
--- a/net-mail/exim/files/exim.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# Command-line options for running exim
-EXIM_OPTS="-bd -q15m"
diff --git a/net-mail/exim/files/exim.rc6 b/net-mail/exim/files/exim.rc6
deleted file mode 100644
index b72a531adaf2..000000000000
--- a/net-mail/exim/files/exim.rc6
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/files/exim.rc6,v 1.9 2004/03/06 03:19:44 vapier Exp $
-
-depend() {
-	need logger net
-	provide mta
-}
-
-start() {
-	ebegin "Starting exim"
-	start-stop-daemon --start --quiet --exec /usr/sbin/exim -- ${EXIM_OPTS:--bd -q15m}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping exim"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/exim
-	eend $?
-}
diff --git a/net-mail/exim/files/exiscan.conf b/net-mail/exim/files/exiscan.conf
deleted file mode 100644
index ae9ec8ec0be3..000000000000
--- a/net-mail/exim/files/exiscan.conf
+++ /dev/null
@@ -1,555 +0,0 @@
-# These are configuration exacmples for getting exiscan going on your
-# system  Changes must be made to /etc/exim/exim.conf to enable the
-# exiscan facility.
-
-# Global options
-# -------------------------------------------------------------------------
-# These options apply to all facilities.
-
-# exiscan_condition   (string, mantadory, default unset)
-# ------------------------------------------------------
-# This option is the "master condition" that is evaluated to see if
-# ANY exiscan facility should be used to scan the current message. If
-# the condition does not apply, exiscan just skips over the message (no
-# facilities are used). When this options is not set, exiscan will
-# be disabled. Note: facilities have individual conditions as well.
-# 
-# Example: to make exiscan only work on messages coming in with SMTP or
-#          ESMTP, use
-#
-#          exiscan_condition = \ 
-#             ${if or {{eq{$received_protocol}{esmtp}} \
-#                      {eq{$received_protocol}{smtp}}} \
-#                         {1}{0} }
-
-exiscan_condition = 1
-
-# exiscan_crypt_salt   (string, mantadory, default unset)
-# -------------------------------------------------------
-# exiscan inserts a crypt()ed version of the message ID into the header
-# when it has successfully scanned a message. This 'tag' is used to
-# determine if the message is 'clean' if it should be re-sent or delayed.
-# The exiscan_crypt_salt setting defines a 2-character string to be used
-# as a "seed" for the crypt process. You MUST set this option to a
-# 2-character string, otherwise exiscan will be disabled.
-
-exiscan_crypt_salt = fo
-
-# exiscan_unpack_mime   (bool, optional, default "true")
-# ------------------------------------------------------
-# Normally, exiscan unpacks MIME and TNEF containers (Thanks to
-# Paul L. Daniels ripMIME library).
-# If your scanner is able to scan on mailpacks (MBOX style files)
-# directly, we do not need to unpack the mails. ONLY disable this
-# option if this works with your scanner ! The default is "true",
-# so you do not need to explicitly set this option.
-
-exiscan_unpack_mime = true
-
-# exiscan_timeout   (time,optional, default "15m")
-# ------------------------------------------------
-# To cope with mishaps in the scanner process, exim uses a timeout on
-# the exiscan function call. If exiscan does not return in the given
-# timeframe, exim will assume a local problem and temporarily reject
-# the message. This timeout tells exim how long it will wait for
-# exiscan to return. The default is 900 seconds (15 minutes).
-
-exiscan_timeout = 30s
-
-
-# Antivirus facility (av) options
-# ---------------------------------------------------------------------
-# These options are used by the antivirus facility. You need an
-# external virus scanner on your system.
-
-# exiscan_av_condition   (string, default unset)
-# ----------------------------------------------
-# If this condition evaluates to "true", exiscan will call the virus
-# scanner facility on that message.
-#
-# Example: To scan ALL messages, just set this variable to "1"
-#
-#          exiscan_av_condition = 1
-
-exiscan_av_condition = 1
-
-# exiscan_av_action   (string, default 'reject')
-# ----------------------------------------------
-# This defines the action exiscan should take when it finds a virus
-# in the message.
-# Possible values are 'pass','reject','blackhole','freeze' or
-# 'redirect <address>'. When this option is unset, it defaults to
-# 'reject'.
-#
-# Example: redirect messages with viruses to postmaster
-#
-#          exiscan_av_action = redirect postmaster@mydomain.com
-
-exiscan_av_action = reject
-
-# exiscan_av_scanner   (string, default unset)
-# --------------------------------------------
-# This option tells exiscan what type of virus scanner to use. It
-# can be one of
-#
-#   keyword   | scanner
-#   -------------------------------------------------------------
-#   cmdline   | generic command line scanner
-#   sophie    | sophie AV daemon (http://www.vanja.com/tools/sophie/)
-#   kavdaemon | Kapersky AVP Daemon 3.x (http://www.kapersky.com)
-#   openav    | OpenAV scanner daemon (http://www.openantivirus.org)
-#
-# Depending on the scanner type you choose with this option, you
-# need to declare one or more further options below.
-
-exiscan_av_scanner = cmdline
-
-# exiscan_av_scanner_path   (string, default unset)
-# -------------------------------------------------
-# This option is needed ONLY for the cmdline av scanner type.
-# It contains the path to the virus scanner executable
-# That means FULL ABSOLUTE PATH AND EXECUTABLE !
-# Sorry for the caps but people keep messing this up.
-#
-# Example: Sophos Sweep in /usr/local/bin
-#
-#          exiscan_av_scanner_path = /usr/local/bin/sweep
-
-# exiscan_av_scanner_path = /usr/bin/sweep
-
-# exiscan_av_scanner_options   (string, default unset)
-# ----------------------------------------------------
-# This option is needed ONLY for the cmdline av scanner type.
-# It containts the options to be passed to the scanner on the command
-# line.
-# ATTENTION: the given string MUST containe ONE pipe ('|') symbol,
-# which will be replaced by exiscan with the path to be scanned.
-# Normally, the pipe will be at the end of the string, but some
-# scanners may also expect it somewhere else.
-#
-# Example: this works for Sophos Sweep
-#
-#           exiscan_av_scanner_options = -all -archive -ss |
-
-# exiscan_av_scanner_options = -all -archive -ss |
-
-# exiscan_av_scanner_regexp_trigger   (string, default unset)
-# -----------------------------------------------------------
-# This option is needed ONLY for the cmdline av scanner type.
-# exiscan parses both STDOUT and STDERR output of the scanner, line
-# by line. To determine if a virus was found, we use a perl-compatible
-# regular expression. In the simplest case, this will simply be a
-# string just like the example below which will work with Sophos Sweep.
-#
-# Example: this works for Sophos Sweep
-#
-#          exiscan_av_scanner_regexp_trigger = found in
-
-exiscan_av_scanner_regexp_trigger = found in
-
-# exiscan_av_scanner_regexp_description   (string, default unset)
-# ---------------------------------------------------------------
-# This option is needed ONLY for the cmdline av scanner type.
-# It contains a regular expression to fish the viruses' name out
-# of the scanner output.
-# IMPORTANT: this expression MUST contain exactly ONE pair of braces,
-# matching the substring with the virus info.
-# Typically, the braces will contain '.*', to match any number
-# of any character inside. To the left and right of the braces, you
-# should place other matching criteria, of course !
-#
-# Example: Sophos Sweep reports a virus on a line like this:
-#
-#           >>> Virus 'W32/Magistr-B' found in file ./those.bat
-#
-#          We want to get the W32/Magistr-B string, so we can match
-#          for the single quotes left and right of it, resulting in
-#          the regex '(.*)' (WITH the quotes!)
-#
-#          exiscan_av_scanner_regexp_description = '(.*)'
-
-exiscan_av_scanner_regexp_description = '(.*)'
-
-# exiscan_av_sophie_socket  (string, default unset)
-# -------------------------------------------------
-# This option is needed ONLY for the sophie av scanner type.
-# Sophie opens a unix socket in your file system. The default is
-# /var/run/sophie.
-# Please make sure that exim can access that socket (permissions!).
-# Also make sure that the user that Sophie runs with (./configure
-# option !!) is allowed to read the exim queue directory.
-# Sophie drops privileges, so while it may show up as running as root
-# in 'ps', it may have set its effective UID to another user !
-# Ideally, exims and sophies effective user settings should be the
-# same.
-#
-# Example:
-#
-#          exiscan_av_sophie_socket = /var/run/sophie
-
-# exiscan_av_sophie_socket = /var/run/sophie
-
-# exiscan_av_kavdaemon_socket   (string, default unset)
-# -----------------------------------------------------
-# This option is needed ONLY for the kavdaemon av scanner type.
-# kavdaemon opens a unix socket in your file system. The default
-# is /opt/AVP/AvpCtl.
-# Please make sure that exim can access that socket (permissions!).
-# Also make sure that the user that kavdaemon runs with is allowed
-# to read the exim queue directory.
-#
-# Attention: you need to run kavdaemon with the disinfection option
-# disabled, and with proper path settings, like this:
-#
-#   ./kavdaemon -E -f=/opt/AVP /
-#
-# Note the slash at the end, it is important. /opt/AVP is the
-# default AVP base directory.
-#
-# Example:
-#
-#          exiscan_av_kavdaemon_socket = /opt/AVP/AvpCtl
-
-# exiscan_av_kavdaemon_socket = /opt/AVP/AvpCtl
-
-# exiscan_av_openav_host   (string, default unset)
-# -----------------------------------------------------
-# This option is needed ONLY for the openav av scanner type.
-# It must be set to the IP address or hostname your openav
-# scanner daemon is operating on.
-# You must also set exiscan_av_openav_host along with this
-# option.
-#
-# Example: to use the openav daemon on the local host, use
-#
-#          exiscan_av_openav_host = 127.0.0.1
-#
-# exiscan_av_openav_port   (string, default unset)
-# -----------------------------------------------------
-# This option is needed ONLY for the openav av scanner type.
-# It must be set to the port number your openav scanner daemon
-# is operating on. It is usually '8127'.
-# You must also set exiscan_av_openav_host along with this
-# option.
-#
-# Example: to use the openav daemon on the port 8127, set
-#
-#          exiscan_av_openav_port = 8127
-
-# exiscan_av_openav_host = 127.0.0.1
-# exiscan_av_openav_port = 8127
-
-
-# Antispam facility (spamd) options
-# ---------------------------------------------------------------------
-# These options are used by the antispam facility. You need to install
-# SpamAssassin on your system. You can get it at
-#
-#   http://www.spamassassin.org
-#
-# exiscan uses the 'spamd' daemon directly, it needs to run in order for
-# this facility to work.
-#
-# Please read the section on header lines and actions further below to
-# learn what you can do with this facility.
-
-# exiscan_spamd_condition   (string, default unset)
-# -------------------------------------------------
-# If this condition evaluates to "true", exiscan will call the
-# antispam facility on that message.
-# Please read the "Setting Conditions" section below for more
-# information on setting conditions.
-#
-# Example: To scan ALL messages, just set this variable to "1"
-#
-#          exiscan_spamd_condition = 1
-
-exiscan_spamd_condition = 0
-
-# exiscan_spamd_action   (string, default unset)
-# ----------------------------------------------
-# This defines the action exiscan should take when a message
-# exceeds the defined spam score treshold (see below).
-# Possible values are 'pass','reject','blackhole','freeze' or
-# 'redirect <address>'. When this option is unset, it defaults to
-# 'pass' (meaning that only a header with spam info is added to
-# the message - see section "Header Lines" below).
-# Important: Please read the "Setting Actions" section below for more
-# information on actions.
-#
-# Example: reject messages exceeding the spam score treshold
-#
-#          exiscan_spamd_action = reject
-
-# exiscan_spamd_action = reject
-
-# exiscan_spamd_header_style   (string, default "single")
-# -------------------------------------------------------
-# This setting defines how much information the spamd facility
-# will add to the headers of the message. The following settings
-# are available:
-#
-#  none   - This will not add any spam info header to the message.
-#           When not using exiscan_spamd_treshold, this is quite
-#           useless.
-#  single - This will add the X-Spam-Score header (see the HEADERS
-#           section below)
-#  flag   - This will add the X-Spam-Score header and, if the
-#           messages' score is over the treshold, the X-Spam-Flag
-#           header. (see the HEADERS section below)
-#  full   - This will add the X-Spam-Score header and, if the
-#           messages' score is over the treshold, the X-Spam-Flag
-#           header and the FULL spamassassin report in clear text
-#           as a multiline header called "X-Spam-Report".
-#
-# Example:  exiscan_spamd_header_style = full
-
-# exiscan_spamd_header_style = full
-
-# exiscan_spamd_subject_tag  (string, default unset)
-# --------------------------------------------------
-# If you want to "tag" the subject of messages which have a spam
-# score greater than the exiscan_spamd_treshold, you can set this
-# option to a string that will be prepended to the subject.
-# This is only useful if exiscan_spamd_action is "pass".
-# End-user MUAs can then filter on that string in the subject.
-#
-# Example: if you set
-#
-#          exiscan_spamd_subject_tag = *SPAM*
-#
-#          the subject "URGENT BUSINESS PROPOSAL" will be
-#          changed into "*SPAM* URGENT BUSINESS PROPOSAL".
-
-# exiscan_spamd_subject_tag = *****SPAM*****
-
-# exiscan_spamd_treshold   (integer, default 999)
-# ----------------------------------------------
-# This defines the number of "spam score" points a message must
-# exceed to be classified as "spam" by exiscan. The default value
-# is very high, so if you only want to add headers to messages,
-# you do not need to set this option. Sensible value ranges
-# are 4-20. The lower you set this value, the more spam you may
-# catch, however the possibility of false positives is also higher.
-#
-# Example: set spam score treshold to 6 points
-#
-#          exiscan_spamd_treshold = 6
-
-# exiscan_spamd_treshold = 15
-
-# exiscan_spamd_address   (string, default unset)
-# -----------------------------------------------
-# This contains the IP address and port where the spamd is listening,
-# separated by a whitespace. By default, it resides on localhost port
-# 783. You can also run it on another machine to decrease the load on
-# the mail server. Uncommenting this option turns off the antispam
-# facility.
-#
-# Example: spamd running on localhost with default port
-#
-#          exiscan_spamd_address = 127.0.0.1 783
-
-# exiscan_spamd_address = 127.0.0.1 783
-
-
-# Regular expression scanning facility (regex) options
-# ---------------------------------------------------------------------
-# This facility can be used to scan a message for a set of regular
-# expressions. The scanning will be done line-by-line on the complete
-# message, including all headers, except for exiscan's own X- header.
-#
-# This facility is handy for blocking content that cannot yet be caught
-# by your AV scanner, or to crack down on spam (try 'mortgage' :).
-#
-# To prevent double bounces, this facility will not scan bounce messages
-# (messages with an empty envelope sender)
-
-# exiscan_regex_condition   (string, default unset)
-# -------------------------------------------------
-# If this condition evaluates to "true", exiscan will call the
-# regex facility on that message.
-# Please read the "Setting Conditions" section below for more
-# information on setting conditions.
-#
-# Example: To regex scan ALL messages, just set this variable to "1"
-#
-#          exiscan_regex_condition = 1
-
-exiscan_regex_condition = 0
-
-# exiscan_regex_action   (string, default 'reject')
-# -------------------------------------------------
-# This defines the action exiscan should take when a message
-# matches a defined regular expression.
-# Possible values are 'pass','reject','blackhole','freeze' or
-# 'redirect <address>'. When this option is unset, it defaults to
-# 'reject'.
-# Important: Please read the "Setting Actions" section below for more
-# information on actions.
-#
-# Example: blackhole messages matching a regular expression
-#
-#          exiscan_regex_action = blackhole
-
-# exiscan_regex_action = reject
-
-# exiscan_regex_data   (string, default unset)
-# --------------------------------------------
-# This option contains the regular expressions you wish to match
-# against messages, as a colon-separated list.
-# To put a colon inside a regular expression, you need to double
-# it (::).
-#
-# Example: Match 'mortgate' with case-insensitive 'm' and
-#          'make money'
-#
-#          exiscan_regex_data = [Mm]ortage : make money
-
-# exiscan_regex_data =
-
-
-# File extension scanning facility (extension) options
-# --------------------------------------------------------------------
-# This facility can be used to block mails containing files with
-# specific extensions, mostly those that may cause harm on the Windows
-# platform (vbs,pif,bat,exe,com etc.).
-#
-# To prevent double bounces, this facility will not scan bounce messages
-# (messages with an empty envelope sender)
-
-# exiscan_extension_condition   (string, default unset)
-# -----------------------------------------------------
-# If this condition evaluates to "true", exiscan will call the
-# extension facility on that message.
-# Please read the "Setting Conditions" section below for more
-# information on setting conditions.
-#
-# Example: To regex scan ALL messages, just set this variable to "1"
-#
-#          exiscan_extension_condition = 1
-
-exiscan_extension_condition = 0
-
-# exiscan_extension_action   (string, default 'reject')
-# -----------------------------------------------------
-# This defines the action exiscan should take when a message
-# contains one of the defined file types.
-# Possible values are 'pass','reject','blackhole','freeze' or
-# 'redirect <address>'. When this option is unset, it defaults to
-# 'reject'.
-# Important: Please read the "Setting Actions" section below for more
-# information on actions.
-#
-# Example: freeze messages containing an unwanted file type
-#
-#          exiscan_extension_action = freeze
-
-# exiscan_extension_action = freeze
-
-# exiscan_extension_data   (string, default unset)
-# ------------------------------------------------
-# This option contains the file extension for which you would like
-# to scan messages, as a colon-separated list.
-#
-# Example: Match 'exe', 'com', and 'vbs'
-#
-#          exiscan_extension_data = exe:com:vbs
-
-# exiscan_extension_data = exe:com:vbs
-
-
-
-
-# SETTING CONDITIONS
-# ------------------------------------------------------------------------------
-#
-# exiscan has five 'condition' options (see above): one 'master' condition and
-# one per facility. Each of these conditions is a string that may contain
-# 'expandable' components. Read chapter 11 of the exim 4 spec to learn more
-# about string expansion in exim.
-#
-# A condition is 'false' when it
-#
-#   - is unset
-#   - expands to 0 (string or number)
-#
-# All other values result in a 'true' condition.
-#
-# The master condition (option exiscan_condition) decides if exiscan is run
-# on a message. You should use it to skip messages that do not need to be
-# scanned. Typically, you will only want to scan messages that come in via
-# smtp or esmtp:
-#
-#   exiscan_condition = \
-#                 ${if or {{eq{$received_protocol}{esmtp}} \
-#                          {eq{$received_protocol}{smtp}}} \
-#                             {1}{0} }
-#
-# This will skip scanning messages coming from local sources or from authen-
-# ticated senders (asmtp).
-#
-# Each facility has its own condition to decide if it should be applied to
-# a message (exiscan-<facility>-condition). For example, you can use those
-# with file lookups to use a facility only on specific sender or recipient
-# domains. The excercise is left up to the reader :)
-#
-# To make a condition always true, just set it to '1'.
-#
-#
-# SETTING ACTIONS
-# ------------------------------------------------------------------------------
-#
-# Every facility in exiscan that 'matches' a message (found a virus, spam over
-# treshold, found regex/extension) can trigger a configurable action. Each
-# facility has an "action" option (exiscan_<facility>_action) where you can set
-# the action identifier for that facility.
-#
-# The following actions are available:
-#
-#   - reject    The message is rejected with a permanent error (5xx), stating
-#               the cause including information for the sender of the message.
-#
-#   - freeze    The message is accepted and immediately frozen, with the cause
-#               saved in the header file. The postmaster can then review the
-#               frozen messages and eventually thaw or delete them.
-#               (NB: does someone want to write a web frontend for that task ?
-#               Submissions welcome ;)
-#               IMPORTANT: If you use an automatic unfreeze timer in your exim
-#               config, exim will automatically thaw these messages after the
-#               specified time, resulting in delivery !
-#               It might also be a good idea to use exim's 'move_frozen_messages'
-#               option in conjunction with this action.
-#
-#   - blackhole The message is accepted and then destroyed by removing all reci-
-#               pients. I do not recommended to use this action unless you have
-#               a good cause to do so.
-#
-#   - redirect <newaddress>  The messages' envelope recipients are replaced by
-#                            an address stated behind the 'redirect' parameter.
-#                            Example:
-#
-#                              exiscan_spamd_action = redirect the@new.address
-#
-#                            Since the original envelope addresses are destroyed
-#                            by that action, you must rely on the headers to
-#                            figure out the intended original recipients.
-#
-#   - pass      No action is taken on the message, except that the facility
-#               will add it's X- header line to the message. This is especially
-#               useful for the spamd facility, if you only want to "mark" spam.
-#               See the "added headers" section below to learn what headers
-#               exiscan adds to messages.
-#
-# The facilities are called in the following order:
-#
-#   1 - av
-#   2 - extension
-#   3 - regex
-#   4 - spamd
-#
-# When a facility "matches" a message, processing is stopped and the proper return
-# code is passed to exim, except if the action for this facility is set to "pass".
-# The "spamd" facility is called last, since it takes the most processing time. The
-# "av" facility is called first, since both "extension" and "regex" may block the
-# same message too, only without giving valuable information.
diff --git a/net-mail/exim/files/mailer.conf b/net-mail/exim/files/mailer.conf
deleted file mode 100644
index a0d702f22579..000000000000
--- a/net-mail/exim/files/mailer.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-#	$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
-#
-sendmail	/usr/sbin/exim
-send-mail	/usr/sbin/exim
-mailq		/usr/sbin/exim
-newaliases	/usr/sbin/exim
-rsmtp		/usr/sbin/exim
-rmail		/usr/sbin/exim
-mail		/usr/sbin/exim
-
-# Execute the "real" sendmail program from postfix, 
-# named /usr/sbin/sendmail.postfix
-#
-#sendmail	/usr/sbin/sendmail.postfix
-#send-mail	/usr/sbin/sendmail.postfix
-#mailq		/usr/sbin/sendmail.postfix
-#newaliases	/usr/sbin/sendmail.postfix
-
-# Execute the "real" sendmail program from ssmtp, 
-# named /usr/sbin/ssmtp
-#
-#sendmail	/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
-#send-mail	/usr/sbin/sendmail.sendmail
-#mailq		/usr/sbin/sendmail.sendmail
-#newaliases	/usr/sbin/sendmail.sendmail
-#hoststat	/usr/sbin/sendmail.sendmail
-#purgestat	/usr/sbin/sendmail.sendmail
diff --git a/net-mail/exim/files/pam.d-exim b/net-mail/exim/files/pam.d-exim
deleted file mode 100644
index 9b3a1d211063..000000000000
--- a/net-mail/exim/files/pam.d-exim
+++ /dev/null
@@ -1,3 +0,0 @@
-# You may need to remove the "md5"
-auth required pam_unix.so shadow md5
-account required pam_unix.so
diff --git a/net-mail/exim/files/system_filter.exim b/net-mail/exim/files/system_filter.exim
deleted file mode 100644
index 9a916b68fddb..000000000000
--- a/net-mail/exim/files/system_filter.exim
+++ /dev/null
@@ -1,220 +0,0 @@
-# Exim filter
-## Version: 0.13
-#	$Id: system_filter.exim,v 1.1 2001/08/14 20:17:21 lamer Exp $
-
-## If you haven't worked with exim filters before, read
-## the install notes at the end of this file.
-
-#
-# Only run any of this stuff on the first pass through the
-# filter - this is an optomisation for messages that get
-# queued and have several delivery attempts
-#
-# we express this in reverse so we can just bail out
-# on inappropriate messages
-#
-if not first_delivery
-then
-  finish
-endif
-
-# Check for MS buffer overruns as per latest BUGTRAQ.
-# http://www.securityfocus.com/frames/?content=/templates/article.html%3Fid%3D61
-# This could happen in error messages, hence its placing
-# here...
-# We substract the first n characters of the date header
-# and test if its the same as the date header... which
-# is a lousy way of checking if the date is longer than
-# n chars long
-if ${length_80:$header_date:} is not $header_date:
-then
-  fail text "This message has been rejected because it has\n\
-	     \tan overlength date field which can be used\n\
-	     \tto subvert Microsoft mail programs\n\
-             \tThe following URL has further information\n\
-	     \thttp://www.securityfocus.com/frames/?content=/templates/article.html%3Fid%3D61"
-  seen finish
-endif
-
-# This is a nasty compromise.
-# This crud is now being sent with a <> envelope sender, but
-# blocking all error messages that pattern match prevents
-# bounces getting back.... so we fudge it somewhat
-if $header_from: contains "@sexyfun.net"
-then
-  fail text "This message has been rejected since it has\n\
-		\tthe signature of a known virus in the header."
-  seen finish
-endif
-if error_message and $header_from: contains "Mailer-Daemon@"
-then
-  # looks like a real error message - just ignore it
-  finish
-endif
-
-# Look for single part MIME messages with suspicious name extensions
-# Check Content-Type header using quoted filename [content_type_quoted_fn_match]
-if $header_content-type: matches "(?:file)?name=(\"[^\"]+\\\\.(?:vb[se]|ws[fh]|jse?|exe|com|cmd|shs|hta|bat|scr|pif)\")"
-then
-  fail text "This message has been rejected because it has\n\
-	     \tpotentially executable content $1\n\
-	     \tThis form of attachment has been used by\n\
-             \trecent viruses or other malware.\n\
-	     \tIf you meant to send this file then please\n\
-	     \tpackage it up as a zip file and resend it."
-  seen finish
-endif
-# same again using unquoted filename [content_type_unquoted_fn_match]
-if $header_content-type: matches "(?:file)?name=([\\\\w.-]+\\\\.(?:vb[se]|ws[fh]|jse?|exe|com|cmd|shs|hta|bat|scr|pif))"
-then
-  fail text "This message has been rejected because it has\n\
-	     \tpotentially executable content $1\n\
-	     \tThis form of attachment has been used by\n\
-             \trecent viruses or other malware.\n\
-	     \tIf you meant to send this file then please\n\
-	     \tpackage it up as a zip file and resend it."
-  seen finish
-endif
-
-
-# Attempt to catch embedded VBS attachments
-# in emails.   These were used as the basis for 
-# the ILOVEYOU virus and its variants
-# Quoted filename - [body_quoted_fn_match]
-if $message_body matches "(?:Content-(?:Type:(?>\\\\s*)[\\\\w-]+/[\\\\w-]+|Disposition:(?>\\\\s*)attachment);(?>\\\\s*)(?:file)?name=|begin(?>\\\\s+)[0-7]{3,4}(?>\\\\s+))(\"[^\"]+\\\\.(?:vb[se]|ws[fh]|jse?|exe|com|cmd|shs|hta|bat|scr|pif)\")[\\\\s;]"
-then
-  fail text "This message has been rejected because it has\n\
-	     \ta potentially executable attachment $1\n\
-	     \tThis form of attachment has been used by\n\
-             \trecent viruses or other malware.\n\
-	     \tIf you meant to send this file then please\n\
-	     \tpackage it up as a zip file and resend it."
-  seen finish
-endif
-# same again using unquoted filename [body_unquoted_fn_match]
-if $message_body matches "(?:Content-(?:Type:(?>\\\\s*)[\\\\w-]+/[\\\\w-]+|Disposition:(?>\\\\s*)attachment);(?>\\\\s*)(?:file)?name=|begin(?>\\\\s+)[0-7]{3,4}(?>\\\\s+))([\\\\w.-]+\\\\.(?:vb[se]|ws[fh]|jse?|exe|com|cmd|shs|hta|bat|scr|pif))[\\\\s;]"
-then
-  fail text "This message has been rejected because it has\n\
-	     \ta potentially executable attachment $1\n\
-	     \tThis form of attachment has been used by\n\
-             \trecent viruses or other malware.\n\
-	     \tIf you meant to send this file then please\n\
-	     \tpackage it up as a zip file and resend it."
-  seen finish
-endif
-
-#### Version history
-#
-# 0.01 5 May 2000
-#	Initial release
-# 0.02 8 May 2000
-#	Widened list of content-types accepted, added WSF extension
-# 0.03 8 May 2000
-#	Embedded the install notes in for those that don't do manuals
-# 0.04 9 May 2000
-#	Check global content-type header.  Efficiency mods to REs
-# 0.05 9 May 2000
-#	More minor efficiency mods, doc changes
-# 0.06 20 June 2000
-#	Added extension handling - thx to Douglas Gray Stephens & Jeff Carnahan
-# 0.07 19 July 2000
-#	Latest MS Outhouse bug catching
-# 0.08 19 July 2000
-#	Changed trigger length to 80 chars, fixed some spelling
-# 0.09 29 September 2000
-#	More extensions... its getting so we should just allow 2 or 3 through
-# 0.10 18 January 2001
-#	Removed exclusion for error messages - this is a little nasty
-#	since it has other side effects, hence we do still exclude
-#	on unix like error messages
-# 0.11 20 March, 2001
-#	Added CMD extension, tidied docs slightly, added RCS tag
-#	** Missed changing version number at top of file :-(
-# 0.12 10 May, 2001
-#	Added HTA extension
-# 0.13 22 May, 2001
-#	Reformatted regexps and code to build them so that they are
-#	shorter than the limits on pre exim 3.20 filters.  This will
-#	make them significantly less efficient, but I am getting so
-#	many queries about this that requiring 3.2x appears unsupportable.
-#
-#### Install Notes
-#
-# Exim filters run the exim filter language - a very primitive
-# scripting language - in place of a user .forward file, or on
-# a per system basis (on all messages passing through).
-# The filtering capability is documented in the main set of manuals
-# a copy of which can be found on the exim web site
-#	http://www.exim.org/
-#
-# To install, copy the filter file (with appropriate permissions)
-# to /etc/exim/system_filter.exim and add to your exim config file
-# [location is installation depedant - typicaly /etc/exim/config ]
-# at the top the line:-
-#	message_filter = /etc/exim/system_filter.exim
-#	message_body_visible = 5000
-#
-# You may also want to set the message_filter_user & message_filter_group
-# options, but they default to the standard exim user and so can
-# be left untouched.  The other message_filter_* options are only
-# needed if you modify this to do other functions such as deliveries.
-# The main exim documentation is quite thorough and so I see no need
-# to expand it here...
-#
-# Any message that matches the filter will then be bounced.
-# If you wish you can change the error message by editing it
-# in the section above - however be careful you don't break it.
-#
-# After install exim should be restarted - a kill -HUP to the
-# daemon will do this.
-#
-#### LIMITATIONS
-#
-# This filter tries to parse MIME with a regexp... that doesn't
-# work too well.  It will also only see the amount of the body
-# specified in message_body_visible
-#
-#### BASIS
-#
-# The regexp that is used to pickup MIME/uuencoded parts is replicated
-# below (in perl format).  You need to remember that exim converts
-# newlines to spaces in the message_body variable.
-#
-#  (?:Content-					# start of content header
-#  (?:Type: (?>\s*)				# rest of c/t header
-#    [\w-]+/[\w-]+				# content-type (any)
-#    |Disposition: (?>\s*)			# content-disposition hdr
-#    attachment)					# content-disposition
-#  ;(?>\s*)					# ; space or newline
-#  (?:file)?name=				# filename=/name= 
-#  |begin (?>\s+) [0-7]{3,4} (?>\s+)) 		# begin octal-mode
-#  (\"[^\"]+\.					# quoted filename.
-#	(?:vb[se]				# list of extns
-#	|ws[fh]
-#	|jse?
-#	|exe
-#	|com
-#	|cmd
-#	|shs
-#	|hta
-#	|bat
-#	|scr
-#	|pif)
-#	\"					# end quote
-#  |[\w.-]+\.					# unquoted filename.ext
-#	(?:vb[se]				# list of extns
-#	|ws[fh]
-#	|jse?
-#	|exe
-#	|com
-#	|cmd
-#	|shs
-#	|hta
-#	|bat
-#	|scr
-#	|pif)
-#  )						# end of filename capture
-#  [\s;]					# trailing ;/space/newline
-#
-#
-### [End]
diff --git a/net-mail/exim/metadata.xml b/net-mail/exim/metadata.xml
deleted file mode 100644
index 56d290e16246..000000000000
--- a/net-mail/exim/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>net-mail</herd>
-<maintainer>
-  <!-- Primary maintainer -->
-  <email>peitolm@gentoo.org</email>
-  <name>Colin Morey</name>
-</maintainer>
-<maintainer>
-  <!--secondary maintainer, please bug peitolm first.. -->
-  <email>pfeifer@gentoo.org</email>
-  <name>Jay Pfeifer</name>
-<!--  <description>Description of the maintainership</description> -->
-</maintainer>
-<longdescription>
-Exim is a message transfer agent (MTA) developed at the University of Cambridge for use on Unix systems connected to the Internet. It is freely available under the terms of the GNU General Public Licence. In style it is similar to Smail 3, but its facilities are more general. There is a great deal of flexibility in the way mail can be routed, and there are extensive facilities for checking incoming mail. Exim can be installed in place of sendmail, although the configuration of exim is quite different to that of sendmail.
-</longdescription>
-</pkgmetadata>