First stage of general tidy-up, getting rid of old versions of the ebuild

(Portage version: 2.0.53)

17 files changed, 73 insertions, 1359 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index e2859a0481d6..ddeedfda46d4 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for mail-mta/exim
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.62 2006/02/20 16:58:24 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.63 2006/03/05 22:46:30 peitolm Exp $
+
+*exim-4.60-r1 (05 Mar 2006)
+
+  05 Mar 2006; Colin Morey <peitolm@gentoo.org>
+  -files/exim-4.33-r1-header-syntax.patch,
+  -files/exim-4.43-r2-host_aton-buff.patch, 
+  Second stage, removal of old patches.
+
+  05 Mar 2006; Colin Morey <peitolm@gentoo.org> -exim-4.43-r2.ebuild,
+  -exim-4.50-r1.ebuild, -exim-4.50-r2.ebuild, -exim-4.50.ebuild,
+  -exim-4.52.ebuild, +exim-4.60-r1.ebuild:
+  First stage of general tidy-up, getting rid of old versions of the ebuild
+  New version fixes #120229 (wrong processing of sqlite flag),
+  #100369 (exiscan move to mirrors), #120459 (exim has a large FILESDIR)
+  #110234 (Add support for AUTH_CYRUS_SASL)
 
   20 Feb 2006; Markus Rothe <corsair@gentoo.org> exim-4.60.ebuild:
   Stable on ppc64
@@ -93,7 +108,7 @@
   05 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> exim-4.50-r1.ebuild:
   Stable on hppa.
 
-  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> exim-4.50-r1.ebuild:
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> exim-4.50-r1.ebuild:
   Add ~alpha keyword.
 
   26 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> exim-4.50-r1.ebuild:
@@ -176,7 +191,7 @@
   exim-4.43.ebuild:
   KEYWORDS ~amd64 to close bug 61163.
 
-  10 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> exim-4.42.ebuild:
+  10 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> exim-4.42.ebuild:
   Stable on alpha.
 
   08 Oct 2004; Guy Martin <gmsoft@gentoo.org> exim-4.42.ebuild:
@@ -188,7 +203,7 @@
   +exim-4.43.ebuild:
   New Version Bump and Bump of 4.42 to stable.
 
-  04 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> exim-4.42.ebuild:
+  04 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> exim-4.42.ebuild:
   Keyword ~alpha.
 
   05 Sep 2004; Guy Martin <gmsoft@gentoo.org> exim-4.41.ebuild,
@@ -275,7 +290,7 @@
   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:
+  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 :
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index a301c5015f37..0870b06a1fc9 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,28 +1,18 @@
-MD5 602523b6adb3035d379c1fe40ffaf49e ChangeLog 19970
-MD5 b736c67bb1a5d294ee2df24413cf9100 exim-4.43-r2.ebuild 8033
-MD5 9b839c970416e71bf6e0602bda37fa76 exim-4.50-r1.ebuild 7956
-MD5 5faf10649096a3bc679e28b0c319eb6c exim-4.50-r2.ebuild 8497
-MD5 c5d0c353ed73c403a957dc4f7ce88cf7 exim-4.50-r999.ebuild 7638
-MD5 f850af9bb97ec3801c5f27cc6d6c7930 exim-4.50.ebuild 7923
-MD5 1e2488b29f4d874082d026bbf5e9027d exim-4.52.ebuild 8419
-MD5 6c399a024ae828416dad6e931a3ee274 exim-4.54.ebuild 8654
+MD5 5200fdbb6f4aed10658dd1efdf3f8fcd ChangeLog 20687
+MD5 36b94bfa73afc0f111568a7c2accf78f exim-4.50-r999.ebuild 7638
+MD5 40b02c4c042cfd486345b2fff7f521c4 exim-4.54.ebuild 8654
+MD5 85450aecf391793bc7d14cfecff62f7e exim-4.60-r1.ebuild 9165
 MD5 d167a6ce531ad11c3c5633af650417f3 exim-4.60.ebuild 9137
 MD5 68fc403ba2c98ccba281939085cb9052 files/auth_conf.sub 775
 MD5 0cb2ffe88c81fd7ac8429b5a19d58b35 files/configure 16346
-MD5 f05ff505c7b77a17696736e2730ae8d1 files/digest-exim-4.43-r2 133
-MD5 1c2f7177e8deb2c85ee6bd4b6754cd2e files/digest-exim-4.50 63
-MD5 1c2f7177e8deb2c85ee6bd4b6754cd2e files/digest-exim-4.50-r1 63
-MD5 1c2f7177e8deb2c85ee6bd4b6754cd2e files/digest-exim-4.50-r2 63
 MD5 1c2f7177e8deb2c85ee6bd4b6754cd2e files/digest-exim-4.50-r999 63
-MD5 882369ea2394b4dc12f0097f85687295 files/digest-exim-4.52 63
 MD5 b26366d2ddeb6f737f97602be0a873b5 files/digest-exim-4.54 63
 MD5 328f709452c0c5b6d6839040fa967883 files/digest-exim-4.60 63
+MD5 5cabc72047b0ca8080f3ba17feccf992 files/digest-exim-4.60-r1 119
 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 f03fc637e154f9ca79d991e71eb063bf files/exim-4.30-conf.patch 887
-MD5 5127f4b2ace5cf148e2ac21e101ac967 files/exim-4.33-r1-header-syntax.patch 1017
-MD5 dec246086bc5cef333efaa95785a4d5e files/exim-4.43-r2-host_aton-buff.patch 6444
 MD5 c76437104cbde9184f01eb0987bfd738 files/exim-4.43-r2-localscan_dlopen.patch 9236
 MD5 67d515cfd03abf9c207c28c997de4177 files/exim-4.50-srs_update-1.0.patch 18372
 MD5 f442b68d435598831bab8536ade071b8 files/exim.confd 62
diff --git a/mail-mta/exim/exim-4.43-r2.ebuild b/mail-mta/exim/exim-4.43-r2.ebuild
deleted file mode 100644
index 543e155634d4..000000000000
--- a/mail-mta/exim/exim-4.43-r2.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.43-r2.ebuild,v 1.5 2005/02/21 14:53:10 agriffis Exp $
-
-inherit eutils
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl mailwrapper lmtp ipv6 sasl dnsdb perl mbox X exiscan nis syslog"
-
-EXISCANACL_VER=${PV}-28
-
-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 hppa alpha amd64 ppc ia64"
-
-PROVIDE="virtual/mta"
-DEPEND=">=sys-apps/sed-4.0.5
-	perl? ( sys-devel/libperl )
-	>=sys-libs/db-3.2
-	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 )
-	X? ( virtual/x11 )"
-	# added X check for #57206
-RDEPEND="${DEPEND}
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	!mailwrapper? ( !virtual/mta )
-	>=net-mail/mailbase-0.00-r5"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	local myconf
-
-	epatch ${FILESDIR}/exim-4.14-tail.patch
-	epatch ${FILESDIR}/exim-4.43-r2-host_aton-buff.patch
-	epatch ${FILESDIR}/exim-4.43-r2-localscan_dlopen.patch
-
-	if ! use mbox; then
-		einfo "Patching maildir support into exim.conf"
-		epatch ${FILESDIR}/exim-4.20-maildir.patch
-	fi
-
-	sed -i "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'/etc/mail/aliases'" ${S}/src/configure.default
-	cp ${S}/src/configure.default ${S}/src/configure.default.orig
-		epatch ${FILESDIR}/exim-4.30-conf.patch
-
-	if use exiscan-acl; then
-		einfo "Patching exican-acl support into exim ${PV}.."
-		epatch ${DISTDIR}/exiscan-acl-${EXISCANACL_VER}.patch
-	fi
-	# Includes Typo fix for bug 47106
-	sed -e "48i\CFLAGS=${CFLAGS}" \
-		-e "s:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \
-		-e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \
-		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=/usr/sbin:" \
-		-e "s:COMPRESS_COMMAND=/opt/gnu/bin/gzip:COMPRESS_COMMAND=/usr/bin/gzip:" \
-		-e "s:ZCAT_COMMAND=/opt/gnu/bin/zcat:ZCAT_COMMAND=/usr/bin/zcat:" \
-		-e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=/etc/exim/exim.conf:" \
-		-e "s:EXIM_MONITOR=eximon.bin:# EXIM_MONITOR=eximon.bin:" \
-		-e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=/usr/share/info:" \
-		-e "s:# LOG_FILE_PATH=/var/log/exim_%slog:LOG_FILE_PATH=/var/log/exim/exim_%s.log:" \
-		-e "s:# PID_FILE_PATH=/var/lock/exim.pid:PID_FILE_PATH=/var/run/exim.pid:" \
-		-e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=/var/spool/exim:" \
-		-e "s:# SUPPORT_MAILDIR=yes:SUPPORT_MAILDIR=yes:" \
-		-e "s:# SUPPORT_MAILSTORE=yes:SUPPORT_MAILSTORE=yes:" \
-		-e "s:EXIM_USER=:EXIM_USER=mail:" \
-		-e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \
-		-e "s:^ZCAT_COMMAND.*$:ZCAT_COMMAND=/bin/zcat:" \
-		-e "s:# LOOKUP_PASSWD=yes:LOOKUP_PASSWD=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 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
-
-	if use nis; then
-		sed -i "s:# LOOKUP_NIS=yes:LOOKUP_NIS=yes:" Local/Makefile
-		sed -i "s:# LOOKUP_NISPLUS=yes:LOOKUP_NISPLUS=yes:" Local/Makefile
-	fi
-	if use syslog; then
-		sed -i "s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Local/Makefile
-	fi
-# 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
-	if use X;then
-			doexe eximon.bin
-			doexe eximon
-	fi
-	fperms 4755 /usr/sbin/exim
-
-	dodir /usr/bin /usr/sbin /usr/lib
-	dosym ../sbin/exim /usr/bin/mailq
-	dosym ../sbin/exim /usr/bin/newaliases
-	einfo "The Exim ebuild will no longer touch /usr/bin/mail, so as not to interfere with mailx/nail."
-	dosym exim /usr/sbin/rsmtp
-	dosym exim /usr/sbin/rmail
-	if \[ ! -e /usr/lib/sendmail \];
-	then
-		dosym /usr/sbin/sendmail /usr/lib/sendmail
-	fi
-
-	if use mailwrapper
-	then
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
-	else
-		dosym exim /usr/sbin/sendmail
-	fi
-
-	exeinto /usr/sbin
-	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
-		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm \
-		convert4r3 convert4r4
-	do
-		doexe $i
-	done
-
-	dodoc ${S}/doc/*
-	doman ${S}/doc/exim.8
-
-	# conf files
-	insinto /etc/exim
-	newins ${S}/src/configure.default.orig exim.conf.dist
-	if use exiscan-acl; then
-		newins ${S}/src/configure.default exim.conf.exiscan-acl
-	fi
-	doins ${FILESDIR}/system_filter.exim
-	doins ${FILESDIR}/auth_conf.sub
-	if use exiscan; then
-		newins ${S}/src/configure.default exim.conf.exiscan
-		doins ${FILESDIR}/exiscan.conf
-	fi
-
-	# INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam
-	insinto /etc/pam.d
-	newins ${FILESDIR}/pam.d-exim exim
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/exim.rc6 exim
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/exim.confd exim
-
-	DIROPTIONS="--mode=0750 --owner=mail --group=mail"
-	dodir /var/log/${PN}
-}
-
-
-pkg_postinst() {
-	einfo "/etc/exim/system_filter.exim is a sample system_filter."
-	einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
-	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
-
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		einfo
-		einfo "Since you emerged $PN without mailwrapper in USE,"
-		einfo "you probably want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-}
diff --git a/mail-mta/exim/exim-4.50-r1.ebuild b/mail-mta/exim/exim-4.50-r1.ebuild
deleted file mode 100644
index 27d6c97a9a60..000000000000
--- a/mail-mta/exim/exim-4.50-r1.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.50-r1.ebuild,v 1.9 2005/08/18 18:38:36 hansmi Exp $
-
-inherit eutils
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl mailwrapper lmtp ipv6 sasl dnsdb perl mbox X exiscan nis syslog"
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.bz2"
-HOMEPAGE="http://www.exim.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ppc sparc x86"
-
-PROVIDE="virtual/mta"
-DEPEND=">=sys-apps/sed-4.0.5
-	perl? ( sys-devel/libperl )
-	>=sys-libs/db-3.2
-	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 )
-	X? ( virtual/x11 )"
-	# added X check for #57206
-RDEPEND="${DEPEND}
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	!mailwrapper? ( !virtual/mta )
-	>=net-mail/mailbase-0.00-r5"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	local myconf
-
-	epatch ${FILESDIR}/exim-4.14-tail.patch
-	epatch ${FILESDIR}/exim-4.43-r2-localscan_dlopen.patch
-
-	if ! use mbox; then
-		einfo "Patching maildir support into exim.conf"
-		epatch ${FILESDIR}/exim-4.20-maildir.patch
-	fi
-
-	sed -i "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'/etc/mail/aliases'" ${S}/src/configure.default
-	cp ${S}/src/configure.default ${S}/src/configure.default.orig
-	epatch ${FILESDIR}/exim-4.30-conf.patch
-
-	# 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:" \
-		-e "s:^ZCAT_COMMAND.*$:ZCAT_COMMAND=/bin/zcat:" \
-		-e "s:# LOOKUP_PASSWD=yes:LOOKUP_PASSWD=yes:" \
-		src/EDITME > Local/Makefile
-
-	# exiscan-acl is now integrated - enabled it when use-flag set
-	if use exiscan-acl; then
-		sed -i "s:# WITH_CONTENT_SCAN=yes:WITH_CONTENT_SCAN=yes:" Local/Makefile
-		sed -i "s:# WITH_OLD_DEMIME=yes:WITH_OLD_DEMIME=yes:" Local/Makefile
-	fi
-
-	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 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
-
-	if use nis; then
-		sed -i "s:# LOOKUP_NIS=yes:LOOKUP_NIS=yes:" Local/Makefile
-		sed -i "s:# LOOKUP_NISPLUS=yes:LOOKUP_NISPLUS=yes:" Local/Makefile
-	fi
-	if use syslog; then
-		sed -i "s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Local/Makefile
-	fi
-# 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
-	if use X;then
-			doexe eximon.bin
-			doexe eximon
-	fi
-	fperms 4755 /usr/sbin/exim
-
-	dodir /usr/bin /usr/sbin /usr/lib
-	dosym ../sbin/exim /usr/bin/mailq
-	dosym ../sbin/exim /usr/bin/newaliases
-	einfo "The Exim ebuild will no longer touch /usr/bin/mail, so as not to interfere with mailx/nail."
-	dosym exim /usr/sbin/rsmtp
-	dosym exim /usr/sbin/rmail
-	if \[ ! -e /usr/lib/sendmail \];
-	then
-		dosym /usr/sbin/sendmail /usr/lib/sendmail
-	fi
-
-	if use mailwrapper
-	then
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
-	else
-		dosym exim /usr/sbin/sendmail
-	fi
-
-	exeinto /usr/sbin
-	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
-		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm \
-		convert4r3 convert4r4
-	do
-		doexe $i
-	done
-
-	dodoc ${S}/doc/*
-	doman ${S}/doc/exim.8
-
-	# conf files
-	insinto /etc/exim
-	newins ${S}/src/configure.default.orig exim.conf.dist
-	if use exiscan-acl; then
-		newins ${S}/src/configure.default exim.conf.exiscan-acl
-	fi
-	doins ${FILESDIR}/system_filter.exim
-	doins ${FILESDIR}/auth_conf.sub
-	if use exiscan; then
-		newins ${S}/src/configure.default exim.conf.exiscan
-		doins ${FILESDIR}/exiscan.conf
-	fi
-
-	# INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam
-	insinto /etc/pam.d
-	newins ${FILESDIR}/pam.d-exim exim
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/exim.rc6 exim
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/exim.confd exim
-
-	DIROPTIONS="--mode=0750 --owner=mail --group=mail"
-	dodir /var/log/${PN}
-}
-
-
-pkg_postinst() {
-	einfo "/etc/exim/system_filter.exim is a sample system_filter."
-	einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
-	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
-
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		einfo
-		einfo "Since you emerged $PN without mailwrapper in USE,"
-		einfo "you probably want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-}
diff --git a/mail-mta/exim/exim-4.50-r2.ebuild b/mail-mta/exim/exim-4.50-r2.ebuild
deleted file mode 100644
index 3d5394096ee6..000000000000
--- a/mail-mta/exim/exim-4.50-r2.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.50-r2.ebuild,v 1.2 2005/07/15 09:19:57 dholm Exp $
-
-inherit eutils
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl mailwrapper lmtp ipv6 sasl dnsdb perl mbox X exiscan nis syslog spf srs"
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.bz2"
-HOMEPAGE="http://www.exim.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~ppc ~x86"
-
-PROVIDE="virtual/mta"
-DEPEND=">=sys-apps/sed-4.0.5
-	perl? ( sys-devel/libperl )
-	>=sys-libs/db-3.2
-	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 )
-	spf? ( mail-filter/libspf2 )
-	srs? ( mail-filter/libsrs_alt )
-	X? ( virtual/x11 )"
-	# added X check for #57206
-RDEPEND="${DEPEND}
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	!mailwrapper? ( !virtual/mta )
-	>=net-mail/mailbase-0.00-r5"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	local myconf
-
-	epatch ${FILESDIR}/exim-4.14-tail.patch
-	epatch ${FILESDIR}/exim-4.43-r2-localscan_dlopen.patch
-
-	if ! use mbox; then
-		einfo "Patching maildir support into exim.conf"
-		epatch ${FILESDIR}/exim-4.20-maildir.patch
-	fi
-
-	sed -i "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'/etc/mail/aliases'" ${S}/src/configure.default
-	cp ${S}/src/configure.default ${S}/src/configure.default.orig
-	epatch ${FILESDIR}/exim-4.30-conf.patch
-
-	# 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:" \
-		-e "s:^ZCAT_COMMAND.*$:ZCAT_COMMAND=/bin/zcat:" \
-		-e "s:# LOOKUP_PASSWD=yes:LOOKUP_PASSWD=yes:" \
-		src/EDITME > Local/Makefile
-
-	# exiscan-acl is now integrated - enabled it when use-flag set
-	if use exiscan-acl; then
-		sed -i "s:# WITH_CONTENT_SCAN=yes:WITH_CONTENT_SCAN=yes:" Local/Makefile
-		sed -i "s:# WITH_OLD_DEMIME=yes:WITH_OLD_DEMIME=yes:" Local/Makefile
-	elif (use spf || use srs) then
-		eerror SPF and SRS support require exiscan-acl to be enabled, please add
-		eerror to your USE settings.
-		exit 1
-	fi
-	if use spf; then
-		myconf="${myconf} -lspf2"
-		sed -i "s:# EXPERIMENTAL_SPF=yes:EXPERIMENTAL_SPF=yes:" Local/Makefile
-		mycflags="${mycflags} -DEXPERIMENTAL_SPF"
-	fi
-	if use srs; then
-		myconf="${myconf} -lsrs_alt"
-		sed -i "s:# EXPERIMENTAL_SRS=yes:EXPERIMENTAL_SRS=yes:" Local/Makefile
-		epatch ${FILESDIR}/exim-4.50-srs_update-1.0.patch
-	fi
-
-	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 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
-
-	if use nis; then
-		sed -i "s:# LOOKUP_NIS=yes:LOOKUP_NIS=yes:" Local/Makefile
-		sed -i "s:# LOOKUP_NISPLUS=yes:LOOKUP_NISPLUS=yes:" Local/Makefile
-	fi
-	if use syslog; then
-		sed -i "s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Local/Makefile
-	fi
-# 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
-	if use X;then
-			doexe eximon.bin
-			doexe eximon
-	fi
-	fperms 4755 /usr/sbin/exim
-
-	dodir /usr/bin /usr/sbin /usr/lib
-	dosym ../sbin/exim /usr/bin/mailq
-	dosym ../sbin/exim /usr/bin/newaliases
-	einfo "The Exim ebuild will no longer touch /usr/bin/mail, so as not to interfere with mailx/nail."
-	dosym exim /usr/sbin/rsmtp
-	dosym exim /usr/sbin/rmail
-	if \[ ! -e /usr/lib/sendmail \];
-	then
-		dosym /usr/sbin/sendmail /usr/lib/sendmail
-	fi
-
-	if use mailwrapper
-	then
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
-	else
-		dosym exim /usr/sbin/sendmail
-	fi
-
-	exeinto /usr/sbin
-	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
-		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm \
-		convert4r3 convert4r4
-	do
-		doexe $i
-	done
-
-	dodoc ${S}/doc/*
-	doman ${S}/doc/exim.8
-
-	# conf files
-	insinto /etc/exim
-	newins ${S}/src/configure.default.orig exim.conf.dist
-	if use exiscan-acl; then
-		newins ${S}/src/configure.default exim.conf.exiscan-acl
-	fi
-	doins ${FILESDIR}/system_filter.exim
-	doins ${FILESDIR}/auth_conf.sub
-	if use exiscan; then
-		newins ${S}/src/configure.default exim.conf.exiscan
-		doins ${FILESDIR}/exiscan.conf
-	fi
-
-	# INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam
-	insinto /etc/pam.d
-	newins ${FILESDIR}/pam.d-exim exim
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/exim.rc6 exim
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/exim.confd exim
-
-	DIROPTIONS="--mode=0750 --owner=mail --group=mail"
-	dodir /var/log/${PN}
-}
-
-
-pkg_postinst() {
-	einfo "/etc/exim/system_filter.exim is a sample system_filter."
-	einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
-	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
-
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		einfo
-		einfo "Since you emerged $PN without mailwrapper in USE,"
-		einfo "you probably want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-}
diff --git a/mail-mta/exim/exim-4.50-r999.ebuild b/mail-mta/exim/exim-4.50-r999.ebuild
index ec374552a1ba..4a5dbffd43e6 100644
--- a/mail-mta/exim/exim-4.50-r999.ebuild
+++ b/mail-mta/exim/exim-4.50-r999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.50-r999.ebuild,v 1.1 2005/07/11 01:47:44 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.50-r999.ebuild,v 1.2 2006/03/05 22:46:30 peitolm Exp $
 
 inherit eutils mailer
 
diff --git a/mail-mta/exim/exim-4.50.ebuild b/mail-mta/exim/exim-4.50.ebuild
deleted file mode 100644
index b12518e1f2ac..000000000000
--- a/mail-mta/exim/exim-4.50.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.50.ebuild,v 1.1 2005/03/03 22:24:58 peitolm Exp $
-
-inherit eutils
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl mailwrapper lmtp ipv6 sasl dnsdb perl mbox X exiscan nis syslog"
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.bz2"
-HOMEPAGE="http://www.exim.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
-
-PROVIDE="virtual/mta"
-DEPEND=">=sys-apps/sed-4.0.5
-	perl? ( sys-devel/libperl )
-	>=sys-libs/db-3.2
-	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 )
-	X? ( virtual/x11 )"
-	# added X check for #57206
-RDEPEND="${DEPEND}
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	!mailwrapper? ( !virtual/mta )
-	>=net-mail/mailbase-0.00-r5"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	local myconf
-
-	epatch ${FILESDIR}/exim-4.14-tail.patch
-	epatch ${FILESDIR}/exim-4.43-r2-localscan_dlopen.patch
-
-	if ! use mbox; then
-		einfo "Patching maildir support into exim.conf"
-		epatch ${FILESDIR}/exim-4.20-maildir.patch
-	fi
-
-	sed -i "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'/etc/mail/aliases'" ${S}/src/configure.default
-	cp ${S}/src/configure.default ${S}/src/configure.default.orig
-	epatch ${FILESDIR}/exim-4.30-conf.patch
-
-	# exiscan-acl is now integrated - enabled it when use-flag set
-	if use exiscan-acl; then
-		sed -i "s:# WITH_CONTENT_SCAN=yes:WITH_CONTENT_SCAN=yes:" Makefile
-		sed -i "s:#	WITH_OLD_DEMIME=yes:WITH_OLD_DEMIME=yes:" Makefile
-	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:" \
-		-e "s:^ZCAT_COMMAND.*$:ZCAT_COMMAND=/bin/zcat:" \
-		-e "s:# LOOKUP_PASSWD=yes:LOOKUP_PASSWD=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 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
-
-	if use nis; then
-		sed -i "s:# LOOKUP_NIS=yes:LOOKUP_NIS=yes:" Local/Makefile
-		sed -i "s:# LOOKUP_NISPLUS=yes:LOOKUP_NISPLUS=yes:" Local/Makefile
-	fi
-	if use syslog; then
-		sed -i "s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Local/Makefile
-	fi
-# 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
-	if use X;then
-			doexe eximon.bin
-			doexe eximon
-	fi
-	fperms 4755 /usr/sbin/exim
-
-	dodir /usr/bin /usr/sbin /usr/lib
-	dosym ../sbin/exim /usr/bin/mailq
-	dosym ../sbin/exim /usr/bin/newaliases
-	einfo "The Exim ebuild will no longer touch /usr/bin/mail, so as not to interfere with mailx/nail."
-	dosym exim /usr/sbin/rsmtp
-	dosym exim /usr/sbin/rmail
-	if \[ ! -e /usr/lib/sendmail \];
-	then
-		dosym /usr/sbin/sendmail /usr/lib/sendmail
-	fi
-
-	if use mailwrapper
-	then
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
-	else
-		dosym exim /usr/sbin/sendmail
-	fi
-
-	exeinto /usr/sbin
-	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
-		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm \
-		convert4r3 convert4r4
-	do
-		doexe $i
-	done
-
-	dodoc ${S}/doc/*
-	doman ${S}/doc/exim.8
-
-	# conf files
-	insinto /etc/exim
-	newins ${S}/src/configure.default.orig exim.conf.dist
-	if use exiscan-acl; then
-		newins ${S}/src/configure.default exim.conf.exiscan-acl
-	fi
-	doins ${FILESDIR}/system_filter.exim
-	doins ${FILESDIR}/auth_conf.sub
-	if use exiscan; then
-		newins ${S}/src/configure.default exim.conf.exiscan
-		doins ${FILESDIR}/exiscan.conf
-	fi
-
-	# INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam
-	insinto /etc/pam.d
-	newins ${FILESDIR}/pam.d-exim exim
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/exim.rc6 exim
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/exim.confd exim
-
-	DIROPTIONS="--mode=0750 --owner=mail --group=mail"
-	dodir /var/log/${PN}
-}
-
-
-pkg_postinst() {
-	einfo "/etc/exim/system_filter.exim is a sample system_filter."
-	einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
-	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
-
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		einfo
-		einfo "Since you emerged $PN without mailwrapper in USE,"
-		einfo "you probably want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-}
diff --git a/mail-mta/exim/exim-4.54.ebuild b/mail-mta/exim/exim-4.54.ebuild
index 498aadb46561..c35b571b6197 100644
--- a/mail-mta/exim/exim-4.54.ebuild
+++ b/mail-mta/exim/exim-4.54.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.54.ebuild,v 1.16 2005/12/04 20:08:22 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.54.ebuild,v 1.17 2006/03/05 22:46:30 peitolm Exp $
 
 inherit eutils
 
diff --git a/mail-mta/exim/exim-4.52.ebuild b/mail-mta/exim/exim-4.60-r1.ebuild
index 751c203d07ee..cbc76f72afa0 100644
--- a/mail-mta/exim/exim-4.52.ebuild
+++ b/mail-mta/exim/exim-4.60-r1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.52.ebuild,v 1.3 2005/10/02 03:16:35 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.60-r1.ebuild,v 1.1 2006/03/05 22:46:30 peitolm Exp $
 
 inherit eutils
 
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl mailwrapper lmtp ipv6 sasl dnsdb perl mbox X exiscan nis syslog spf srs"
+IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl mailwrapper lmtp ipv6 sasl dnsdb perl mbx X exiscan nis syslog spf srs gnutls sqlite"
 
 DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.bz2"
+SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.bz2 mirror://gentoo/exiscan.conf"
 HOMEPAGE="http://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 PROVIDE="virtual/mta"
 DEPEND=">=sys-apps/sed-4.0.5
@@ -21,13 +21,21 @@ DEPEND=">=sys-apps/sed-4.0.5
 	pam? ( >=sys-libs/pam-0.75 )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
+	gnutls? ( net-libs/gnutls )
 	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 )
 	spf? ( >=mail-filter/libspf2-1.2.5-r1 )
 	srs? ( mail-filter/libsrs_alt )
-	X? ( virtual/x11 )"
+	X? ( || ( (	x11-proto/xproto
+			x11-libs/libX11
+			x11-libs/libXmu
+			x11-libs/libXt
+			x11-libs/libXaw )
+		virtual/x11 )
+	)
+	sqlite? ( dev-db/sqlite )"
 	# added X check for #57206
 RDEPEND="${DEPEND}
 	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
@@ -56,8 +64,8 @@ src_unpack() {
 		-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=/bin/gzip:" \
-		-e "s:ZCAT_COMMAND=/opt/gnu/bin/zcat:ZCAT_COMMAND=/bin/zcat:" \
+		-e "s:COMPRESS_COMMAND=/usr/bin/gzip:COMPRESS_COMMAND=/bin/gzip:" \
+		-e "s:ZCAT_COMMAND=/usr/bin/zcat:ZCAT_COMMAND=/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:" \
@@ -102,7 +110,8 @@ src_unpack() {
 	if use perl; then
 		sed -i "s:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" Makefile
 	fi
-	if use mbox; then
+	# mbox useflag renamed, see bug 110741
+	if use mbx; then
 		sed -i "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" Makefile
 	fi
 	if use pam; then
@@ -110,8 +119,8 @@ src_unpack() {
 		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
+		sed -i "s:# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux:CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl2/mux:"  Makefile
+		sed -i "s:# AUTH_CYRUS_SASL=yes:AUTH_CYRUS_SASL=yes:" Makefile
 		myconf="${myconf} -lsasl2"
 	fi
 	if use tcpd; then
@@ -134,8 +143,15 @@ src_unpack() {
 	cd ${S}
 	if use ssl; then
 		sed -i \
-			-e "s:# \(SUPPORT_TLS=yes\):\1:" \
-			-e "s:# \(TLS_LIBS=-lssl -lcrypto\):\1:" Local/Makefile
+			-e "s:# \(SUPPORT_TLS=yes\):\1:" Local/Makefile
+		if use gnutls; then
+			sed -i \
+				-e "s:# \(USE_GNUTLS=yes\):\1:" \
+				-e "s:# \(TLS_LIBS=-lgnutls -ltasn1 -lgcrypt\):\1:" Local/Makefile
+		else
+			sed -i \
+				-e "s:# \(TLS_LIBS=-lssl -lcrypto\):\1:" Local/Makefile
+		fi
 	fi
 
 	LOOKUP_INCLUDE=
@@ -160,14 +176,18 @@ src_unpack() {
 		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I/usr/include/postgresql"
 		LOOKUP_LIBS="$LOOKUP_LIBS -lpq"
 	fi
-
+	if use sqlite; then
+		sed -i "s:# LOOKUP_SQLITE=yes: LOOKUP_SQLITE=yes:" Local/Makefile
+		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I/usr/include/sqlite"
+		LOOKUP_LIBS="$LOOKUP_LIBS -lsqlite3"
+	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:" \
+		sed -i "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3:LOOKUP_LIBS=$LOOKUP_LIBS:" \
 			Local/Makefile
 	fi
 
@@ -228,7 +248,7 @@ src_install () {
 
 	exeinto /usr/sbin
 	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
-		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm \
+		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \
 		convert4r3 convert4r4 exipick
 	do
 		doexe $i
@@ -250,9 +270,12 @@ src_install () {
 		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
+	if use pam
+	then
+		# INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam
+		insinto /etc/pam.d
+		newins ${FILESDIR}/pam.d-exim exim
+	fi
 
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/exim.rc6 exim
diff --git a/mail-mta/exim/files/digest-exim-4.43-r2 b/mail-mta/exim/files/digest-exim-4.43-r2
deleted file mode 100644
index 5deaf298b99b..000000000000
--- a/mail-mta/exim/files/digest-exim-4.43-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f8f646d4920660cb5579becd9265a3bf exim-4.43.tar.bz2 1388183
-MD5 5363ec73d6c3f9b5c8c87b246027cbf7 exiscan-acl-4.43-28.patch 440225
diff --git a/mail-mta/exim/files/digest-exim-4.50 b/mail-mta/exim/files/digest-exim-4.50
deleted file mode 100644
index a96f78c973a6..000000000000
--- a/mail-mta/exim/files/digest-exim-4.50
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7844eff82171872f6b3971a4183368d9 exim-4.50.tar.bz2 1434928
diff --git a/mail-mta/exim/files/digest-exim-4.50-r1 b/mail-mta/exim/files/digest-exim-4.50-r1
deleted file mode 100644
index a96f78c973a6..000000000000
--- a/mail-mta/exim/files/digest-exim-4.50-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7844eff82171872f6b3971a4183368d9 exim-4.50.tar.bz2 1434928
diff --git a/mail-mta/exim/files/digest-exim-4.50-r2 b/mail-mta/exim/files/digest-exim-4.50-r2
deleted file mode 100644
index a96f78c973a6..000000000000
--- a/mail-mta/exim/files/digest-exim-4.50-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7844eff82171872f6b3971a4183368d9 exim-4.50.tar.bz2 1434928
diff --git a/mail-mta/exim/files/digest-exim-4.52 b/mail-mta/exim/files/digest-exim-4.52
deleted file mode 100644
index a3b5dc3d96d7..000000000000
--- a/mail-mta/exim/files/digest-exim-4.52
+++ /dev/null
@@ -1 +0,0 @@
-MD5 89601650f3b854d469451f30b369622b exim-4.52.tar.bz2 1535866
diff --git a/mail-mta/exim/files/digest-exim-4.60-r1 b/mail-mta/exim/files/digest-exim-4.60-r1
new file mode 100644
index 000000000000..e0aea836212a
--- /dev/null
+++ b/mail-mta/exim/files/digest-exim-4.60-r1
@@ -0,0 +1,2 @@
+MD5 eed3c8fc393cf7ccc9c1079b28516128 exim-4.60.tar.bz2 1554749
+MD5 eb249c90af3ab11e5a4d307e184a75ac exiscan.conf 22113
diff --git a/mail-mta/exim/files/exim-4.33-r1-header-syntax.patch b/mail-mta/exim/files/exim-4.33-r1-header-syntax.patch
deleted file mode 100644
index 06cef16b17db..000000000000
--- a/mail-mta/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/mail-mta/exim/files/exim-4.43-r2-host_aton-buff.patch b/mail-mta/exim/files/exim-4.43-r2-host_aton-buff.patch
deleted file mode 100644
index bf69b49c6ea6..000000000000
--- a/mail-mta/exim/files/exim-4.43-r2-host_aton-buff.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-*** src/lookups/dnsdb.c   Tue Oct  5 09:32:08 2004
-- --- dnsdb.c	 Wed Dec 29 09:36:13 2004
-***************
-*** 125,131 ****
-  /* If the type is PTR, we have to construct the relevant magic lookup
-  key. This code is now in a separate function. */
-  
-! if (type == T_PTR)
-    {
-    dns_build_reverse(keystring, buffer);
-    keystring = buffer;
-- --- 125,131 ----
-  /* If the type is PTR, we have to construct the relevant magic lookup
-  key. This code is now in a separate function. */
-  
-! if (type == T_PTR && string_is_ip_address(keystring, NULL))
-    {
-    dns_build_reverse(keystring, buffer);
-    keystring = buffer;
-*** src/host.c    Tue Oct  5 09:32:08 2004
-- --- host.c	Wed Dec 29 09:43:17 2004
-***************
-*** 710,721 ****
-  
-    if (*p == ':') p++;
-  
-!   /* Split the address into components separated by colons. */
-  
-    while (*p != 0)
-      {
-      int len = Ustrcspn(p, ":");
-      if (len == 0) nulloffset = ci;
-      component[ci++] = p;
-      p += len;
-      if (*p == ':') p++;
-- --- 754,771 ----
-  
-    if (*p == ':') p++;
-  
-!   /* Split the address into components separated by colons. The input address 
-!   is supposed to be checked for syntax. There was a case where this was 
-!   overlooked; to guard against that happening again, check here and crash if 
-!   there is a violation. */
-  
-    while (*p != 0)
-      {
-      int len = Ustrcspn(p, ":");
-      if (len == 0) nulloffset = ci;
-+     if (ci > 7) log_write(0, LOG_MAIN|LOG_PANIC_DIE, 
-+       "Internal error: invalid IPv6 address \"%s\" passed to host_aton()",
-+       address);  
-      component[ci++] = p;
-      p += len;
-      if (*p == ':') p++;
-*** src/auths/auth-spa.c  Tue Oct  5 09:32:08 2004
-- --- auth-spa.c	  Wed Dec 29 10:55:58 2004
-***************
-*** 404,411 ****
-    *out = '\0';
-  }
-  
-  int
-! spa_base64_to_bits (char *out, const char *in)
-  /* base 64 to raw bytes in quasi-big-endian order, returning count of bytes */
-  {
-    int len = 0;
-- --- 406,416 ----
-    *out = '\0';
-  }
-  
-+ 
-+ /* The outlength parameter was added by PH, December 2004 */
-+ 
-  int
-! spa_base64_to_bits (char *out, int outlength, const char *in)
-  /* base 64 to raw bytes in quasi-big-endian order, returning count of bytes */
-  {
-    int len = 0;
-***************
-*** 418,423 ****
-- --- 423,430 ----
-  
-    do
-      {
-+       if (len >= outlength)                   /* Added by PH */
-+         return (-1);                          /* Added by PH */
-        digit1 = in[0];
-        if (DECODE64 (digit1) == BAD)
-         return (-1);
-***************
-*** 435,445 ****
-- --- 442,456 ----
-        ++len;
-        if (digit3 != '=')
-         {
-+          if (len >= outlength)                   /* Added by PH */
-+            return (-1);                          /* Added by PH */
-           *out++ =
-             ((DECODE64 (digit2) << 4) & 0xf0) | (DECODE64 (digit3) >> 2);
-           ++len;
-           if (digit4 != '=')
-             {
-+              if (len >= outlength)                   /* Added by PH */
-+                return (-1);                          /* Added by PH */
-               *out++ = ((DECODE64 (digit3) << 6) & 0xc0) | DECODE64 (digit4);
-               ++len;
-             }
-*** src/auths/auth-spa.h  Tue Oct  5 09:32:08 2004
-- --- auth-spa.h	  Wed Dec 29 10:55:58 2004
-***************
-*** 9,14 ****
-- --- 11,19 ----
-   * All the code used here was torn by Marc Prud'hommeaux out of the
-   * Samba project (by Andrew Tridgell, Jeremy Allison, and others).
-   */
-+  
-+ /* December 2004: The spa_base64_to_bits() function has no length checking in 
-+ it. I have added a check. PH */ 
-  
-  /* It seems that some systems have existing but different definitions of some
-  of the following types. I received a complaint about "int16" causing
-***************
-*** 75,81 ****
-  #define spa_request_length(ptr) (((ptr)->buffer - (uint8x*)(ptr)) + (ptr)->bufIndex)
-  
-  void spa_bits_to_base64 (unsigned char *, const unsigned char *, int);
-! int spa_base64_to_bits(char *, const char *);
-  void spa_build_auth_response (SPAAuthChallenge *challenge,
-         SPAAuthResponse *response, char *user, char *password);
-  void spa_build_auth_request (SPAAuthRequest *request, char *user,
-- --- 80,86 ----
-  #define spa_request_length(ptr) (((ptr)->buffer - (uint8x*)(ptr)) + (ptr)->bufIndex)
-  
-  void spa_bits_to_base64 (unsigned char *, const unsigned char *, int);
-! int spa_base64_to_bits(char *, int, const char *);
-  void spa_build_auth_response (SPAAuthChallenge *challenge,
-         SPAAuthResponse *response, char *user, char *password);
-  void spa_build_auth_request (SPAAuthRequest *request, char *user,
-*** src/auths/spa.c	    Tue Oct  5 09:32:08 2004
-- --- spa.c Wed Dec 29 10:55:58 2004
-***************
-*** 133,139 ****
-    return FAIL;
-    }
-  
-! if (spa_base64_to_bits((char *)(&request), (const char *)(data)) < 0)
-    {
-    DEBUG(D_auth) debug_printf("auth_spa_server(): bad base64 data in "
-    "request: %s\n", data);
-- --- 135,141 ----
-    return FAIL;
-    }
-  
-! if (spa_base64_to_bits((char *)(&request), sizeof(request), (const char *)(data)) < 0)
-    {
-    DEBUG(D_auth) debug_printf("auth_spa_server(): bad base64 data in "
-    "request: %s\n", data);
-***************
-*** 153,159 ****
-    }
-  
-  /* dump client response */
-! if (spa_base64_to_bits((char *)(&response), (const char *)(data)) < 0)
-    {
-    DEBUG(D_auth) debug_printf("auth_spa_server(): bad base64 data in "
-    "response: %s\n", data);
-- --- 155,161 ----
-    }
-  
-  /* dump client response */
-! if (spa_base64_to_bits((char *)(&response), sizeof(response), (const char *)(data)) < 0)
-    {
-    DEBUG(D_auth) debug_printf("auth_spa_server(): bad base64 data in "
-    "response: %s\n", data);
-***************
-*** 319,325 ****
-         /* convert the challenge into the challenge struct */
-         DSPA("\n\n%s authenticator: challenge (%s)\n\n",
-                 ablock->name, buffer + 4);
-!        spa_base64_to_bits ((char *)(&challenge), (const char *)(buffer + 4));
-  
-         spa_build_auth_response (&challenge, &response,
-                 CS username, CS password);
-- --- 324,330 ----
-         /* convert the challenge into the challenge struct */
-         DSPA("\n\n%s authenticator: challenge (%s)\n\n",
-                 ablock->name, buffer + 4);
-!        spa_base64_to_bits ((char *)(&challenge), sizeof(challenge), (const char *)(buffer + 4));
-  
-         spa_build_auth_response (&challenge, &response,
-                 CS username, CS password);