exim version bump, Cleanup for large files

(Portage version: 2.0.54)

10 files changed, 24 insertions, 1198 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index ed6664aea868..59ac5dd82ae9 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,14 @@
 # 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.73 2006/05/29 18:53:55 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.74 2006/06/12 20:19:07 peitolm Exp $
+
+*exim-4.62 (12 Jun 2006)
+
+  12 Jun 2006; Colin Morey <peitolm@gentoo.org> -files/exiscan.conf,
+  -exim-4.50-r999.ebuild, -exim-4.54.ebuild, -exim-4.60.ebuild,
+  +exim-4.62.ebuild:
+  New Version Bump, #132009
+  Cleaning out old files for #100369, #120459
 
   29 May 2006; Simon Stelling <blubb@gentoo.org> exim-4.60-r1.ebuild:
   stable on amd64
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 71028e3521b7..d5b6652df407 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,104 +1,21 @@
-AUX auth_conf.sub 775 RMD160 3d0280be4646b4e7bb222da2b95af82c2d0d669d SHA1 3116e59ac760f38eb2562fe44df649be4ffa11e5 SHA256 48c652cdeb971ad2b3854f4c6e417174d45568ad9977bb374afc0700aece962f
+MD5 9dcfb558bd73e6c2010c7f9c02e38e08 ChangeLog 21501
+MD5 7ca5d698b6ee01b6cfb3a9bd5904b4e8 exim-4.60-r1.ebuild 9157
+MD5 ee3fee4f9106d53cb6506eedea1de501 exim-4.61.ebuild 9164
+MD5 ee3fee4f9106d53cb6506eedea1de501 exim-4.62.ebuild 9164
 MD5 68fc403ba2c98ccba281939085cb9052 files/auth_conf.sub 775
-RMD160 3d0280be4646b4e7bb222da2b95af82c2d0d669d files/auth_conf.sub 775
-SHA256 48c652cdeb971ad2b3854f4c6e417174d45568ad9977bb374afc0700aece962f files/auth_conf.sub 775
-AUX configure 16346 RMD160 7826da9ebcf9d9318894bb3a412532a371e62032 SHA1 8e1b61ede8c86fc6efa50eca0e5da52e9be3dfaf SHA256 c0b8dee099095963d77d19a44ed9305759b4db2a1048ae77d1f839f75e017d6e
 MD5 0cb2ffe88c81fd7ac8429b5a19d58b35 files/configure 16346
-RMD160 7826da9ebcf9d9318894bb3a412532a371e62032 files/configure 16346
-SHA256 c0b8dee099095963d77d19a44ed9305759b4db2a1048ae77d1f839f75e017d6e files/configure 16346
-AUX exim-4.10-gentoo.diff 1889 RMD160 5e3b7424901e8ce55c43ed1d87193f915d633285 SHA1 49c5ad9efbfd5e380f4bd4485ea5771203be3029 SHA256 b9c4c055c0992362f16e02d64f81e0427cc87729d67f9ac4e275d0360709b40b
+MD5 5cabc72047b0ca8080f3ba17feccf992 files/digest-exim-4.60-r1 119
+MD5 a15891f2d3e6b13ec121037961d4411f files/digest-exim-4.61 119
+MD5 2fa16d35dc5f7dc8e79aed8b16ee83df files/digest-exim-4.62 119
 MD5 369b42cafcbe5631c2d03cbbfd4aeddd files/exim-4.10-gentoo.diff 1889
-RMD160 5e3b7424901e8ce55c43ed1d87193f915d633285 files/exim-4.10-gentoo.diff 1889
-SHA256 b9c4c055c0992362f16e02d64f81e0427cc87729d67f9ac4e275d0360709b40b files/exim-4.10-gentoo.diff 1889
-AUX exim-4.14-tail.patch 446 RMD160 685e27ff995710f3b8d77d8785b04503170e7e27 SHA1 d52b5d10656ead546beda128068ed2f9dbc67200 SHA256 74d1044bb94e167180fd8f8aba7449ca3d2b09b1ce170a1a2e4e54ca0cd660da
 MD5 5d5aabea7d56a91803df1312c04d32c0 files/exim-4.14-tail.patch 446
-RMD160 685e27ff995710f3b8d77d8785b04503170e7e27 files/exim-4.14-tail.patch 446
-SHA256 74d1044bb94e167180fd8f8aba7449ca3d2b09b1ce170a1a2e4e54ca0cd660da files/exim-4.14-tail.patch 446
-AUX exim-4.20-maildir.patch 478 RMD160 50c6a1dd6ae3f7bb1776696d3d0d7a161c351fce SHA1 c8287f7e44d93b0ca8761b8f7111974cfe1280a5 SHA256 2704c4db67bb7c58c2421656d942f533d1eedf1df187e76297ab72d2c2a2fb4c
 MD5 622b726ea7b32aae93a8fe9f3c2af9cd files/exim-4.20-maildir.patch 478
-RMD160 50c6a1dd6ae3f7bb1776696d3d0d7a161c351fce files/exim-4.20-maildir.patch 478
-SHA256 2704c4db67bb7c58c2421656d942f533d1eedf1df187e76297ab72d2c2a2fb4c files/exim-4.20-maildir.patch 478
-AUX exim-4.30-conf.patch 887 RMD160 4e50bdb4f3a9f061c7f4da763ad5e427b9cbea26 SHA1 cf7ecab19aba3b758d736c584b98fa4be2338050 SHA256 a33425492f246c6afe3be21e83e0dc20ecd5ea300a172d877f666d077648eedf
 MD5 f03fc637e154f9ca79d991e71eb063bf files/exim-4.30-conf.patch 887
-RMD160 4e50bdb4f3a9f061c7f4da763ad5e427b9cbea26 files/exim-4.30-conf.patch 887
-SHA256 a33425492f246c6afe3be21e83e0dc20ecd5ea300a172d877f666d077648eedf files/exim-4.30-conf.patch 887
-AUX exim-4.43-r2-localscan_dlopen.patch 9236 RMD160 d33f7bcf72f947e8d1a3d917713630100c175491 SHA1 e4239a1bf0261f99491b4a29b26bbe8d9beffbd8 SHA256 3ec15d2dfdf251c70647c3def09711385f23983eceeecb6ec9d42b39f54b198d
 MD5 c76437104cbde9184f01eb0987bfd738 files/exim-4.43-r2-localscan_dlopen.patch 9236
-RMD160 d33f7bcf72f947e8d1a3d917713630100c175491 files/exim-4.43-r2-localscan_dlopen.patch 9236
-SHA256 3ec15d2dfdf251c70647c3def09711385f23983eceeecb6ec9d42b39f54b198d files/exim-4.43-r2-localscan_dlopen.patch 9236
-AUX exim-4.50-srs_update-1.0.patch 18372 RMD160 1ac6d641f8c1b8c9c6378bfc0de9dce4c59a7413 SHA1 b4d8b531b267cedfd1b293d1a46d02f18931186e SHA256 df0e4f4901abb53a3ada0367d1682d5b25846804330b37abb2fecc7f0fed1563
 MD5 67d515cfd03abf9c207c28c997de4177 files/exim-4.50-srs_update-1.0.patch 18372
-RMD160 1ac6d641f8c1b8c9c6378bfc0de9dce4c59a7413 files/exim-4.50-srs_update-1.0.patch 18372
-SHA256 df0e4f4901abb53a3ada0367d1682d5b25846804330b37abb2fecc7f0fed1563 files/exim-4.50-srs_update-1.0.patch 18372
-AUX exim.confd 62 RMD160 d8dcabf184ffb9066ad45c3e77cce1ec0392a143 SHA1 c56feda3c3193fad26852310da8ef24ef91f60f6 SHA256 668f912565a59926957090c6143f669f0e9de2cf441507d3c05fcd046865b401
 MD5 f442b68d435598831bab8536ade071b8 files/exim.confd 62
-RMD160 d8dcabf184ffb9066ad45c3e77cce1ec0392a143 files/exim.confd 62
-SHA256 668f912565a59926957090c6143f669f0e9de2cf441507d3c05fcd046865b401 files/exim.confd 62
-AUX exim.rc6 565 RMD160 f9f2d644c2997478e3e9011217bb2d73068ecc22 SHA1 345dbbf7de380eba06c2c2fd90cd2dc006324344 SHA256 f4ed3ffeaf066730451046431b73832a37cdb62ba9ef9c2ae2605188ab830fa7
 MD5 8609e97b73196813ddfc2b3de6a2bbac files/exim.rc6 565
-RMD160 f9f2d644c2997478e3e9011217bb2d73068ecc22 files/exim.rc6 565
-SHA256 f4ed3ffeaf066730451046431b73832a37cdb62ba9ef9c2ae2605188ab830fa7 files/exim.rc6 565
-AUX exiscan.conf 22113 RMD160 e52b77f656b3ba2105e833075d1368f41e414d64 SHA1 74dc6e30f49402f5e6fefc280ea325d17f6af8c4 SHA256 f8cc731d3225a902461e05c0997df23bfd231ea8d5bf33a9aba5783bc6e0c964
-MD5 eb249c90af3ab11e5a4d307e184a75ac files/exiscan.conf 22113
-RMD160 e52b77f656b3ba2105e833075d1368f41e414d64 files/exiscan.conf 22113
-SHA256 f8cc731d3225a902461e05c0997df23bfd231ea8d5bf33a9aba5783bc6e0c964 files/exiscan.conf 22113
-AUX mailer.conf 169 RMD160 3a79ab2c47d643dafb5e7556e5f67fbef2b5ae94 SHA1 a8c81249a3d5de7306bc1f37218812a066d2cd2f SHA256 785b89b4e62508cf4b61bfa7d1f7f07f4664ed1506f03133e456e421d952ff2e
 MD5 49698cb738763bbaebbbe89470f914ef files/mailer.conf 169
-RMD160 3a79ab2c47d643dafb5e7556e5f67fbef2b5ae94 files/mailer.conf 169
-SHA256 785b89b4e62508cf4b61bfa7d1f7f07f4664ed1506f03133e456e421d952ff2e files/mailer.conf 169
-AUX pam.d-exim 101 RMD160 8ad4e0a05068ae20d5e8d401146456945d068322 SHA1 bdca3fb37937baa5da5e656c07ec333abfaa0f7d SHA256 80d94cb0b3ded20ed1513f4d5627969c4ce85d3006c702eb24920ffa01eec674
 MD5 d230e0fa45f2b65d5bc50c0879c40148 files/pam.d-exim 101
-RMD160 8ad4e0a05068ae20d5e8d401146456945d068322 files/pam.d-exim 101
-SHA256 80d94cb0b3ded20ed1513f4d5627969c4ce85d3006c702eb24920ffa01eec674 files/pam.d-exim 101
-AUX system_filter.exim 8120 RMD160 267545af6dd333e0e5f05e1d4d02a0e8ee638d45 SHA1 a9eaf04538cd35eae726e2920cb0d115bc2ab2e0 SHA256 35539f6d20f2847b4093824618797b4d602dcc5b7d920e49bf5c26f0fd89858e
 MD5 4c0b8ee742360c08f0bc0b526fcaad10 files/system_filter.exim 8120
-RMD160 267545af6dd333e0e5f05e1d4d02a0e8ee638d45 files/system_filter.exim 8120
-SHA256 35539f6d20f2847b4093824618797b4d602dcc5b7d920e49bf5c26f0fd89858e files/system_filter.exim 8120
-DIST exim-4.50.tar.bz2 1434928
-DIST exim-4.54.tar.bz2 1547608
-DIST exim-4.60.tar.bz2 1554749
-DIST exim-4.61.tar.bz2 1574711
-DIST exiscan.conf 22113
-EBUILD exim-4.50-r999.ebuild 7640 RMD160 6927d352c97e717970844419df8ddbbba8c9f86c SHA1 1985e22437817267517717eacb6a4e5d3756d14a SHA256 b6b5571b3368f8f990712b80a881fed76fc649d441533a36b1c3a9a3bbd4d708
-MD5 1af128deb098f20841d4af818951dd27 exim-4.50-r999.ebuild 7640
-RMD160 6927d352c97e717970844419df8ddbbba8c9f86c exim-4.50-r999.ebuild 7640
-SHA256 b6b5571b3368f8f990712b80a881fed76fc649d441533a36b1c3a9a3bbd4d708 exim-4.50-r999.ebuild 7640
-EBUILD exim-4.54.ebuild 8656 RMD160 122e0f148b6ea144dc0f17a66a48b3cf3255359c SHA1 209f07a2430a431f478a88e243cd4f0a33088edc SHA256 1ef5d7e39d266e3ffa0b570caebadbc05181060ed08011320f912ca4546853b1
-MD5 a6bbbee630fa63abe39c7156e93cd79f exim-4.54.ebuild 8656
-RMD160 122e0f148b6ea144dc0f17a66a48b3cf3255359c exim-4.54.ebuild 8656
-SHA256 1ef5d7e39d266e3ffa0b570caebadbc05181060ed08011320f912ca4546853b1 exim-4.54.ebuild 8656
-EBUILD exim-4.60-r1.ebuild 9157 RMD160 fe97604fd7b574574f2597df268f6693c819392f SHA1 9e6096e713d97d57395a75173b0adc4ad6f321e9 SHA256 f14105b42d99aeb24d1325fe855b03efaffbf6f75e9e980f8144045bf228dda0
-MD5 7ca5d698b6ee01b6cfb3a9bd5904b4e8 exim-4.60-r1.ebuild 9157
-RMD160 fe97604fd7b574574f2597df268f6693c819392f exim-4.60-r1.ebuild 9157
-SHA256 f14105b42d99aeb24d1325fe855b03efaffbf6f75e9e980f8144045bf228dda0 exim-4.60-r1.ebuild 9157
-EBUILD exim-4.60.ebuild 9137 RMD160 bf9a87342e755a4ad1c812e3e029ff7f2f8c21d5 SHA1 ec64481e2fcd21970de73497147f914c91685dd1 SHA256 7aaed733b8a15dd13a443a4ca228d8b5632ecd6e7645b0bbc4540cc924da290e
-MD5 d167a6ce531ad11c3c5633af650417f3 exim-4.60.ebuild 9137
-RMD160 bf9a87342e755a4ad1c812e3e029ff7f2f8c21d5 exim-4.60.ebuild 9137
-SHA256 7aaed733b8a15dd13a443a4ca228d8b5632ecd6e7645b0bbc4540cc924da290e exim-4.60.ebuild 9137
-EBUILD exim-4.61.ebuild 9164 RMD160 10a8961d330f3b14ec3b9d751498fa3904d78674 SHA1 39271e48bb5814381027117f9e0835c040581c36 SHA256 a841be3ef61e5d6247b40f7cddf94212e444710ae0ef1f81a47fd3419517d307
-MD5 ee3fee4f9106d53cb6506eedea1de501 exim-4.61.ebuild 9164
-RMD160 10a8961d330f3b14ec3b9d751498fa3904d78674 exim-4.61.ebuild 9164
-SHA256 a841be3ef61e5d6247b40f7cddf94212e444710ae0ef1f81a47fd3419517d307 exim-4.61.ebuild 9164
-MISC ChangeLog 21501 RMD160 e31831b47a79bbef5a013bc608893b48b695e7f2 SHA1 9957f4f05a15f4001ae153129ab9743a2fd7b460 SHA256 55ebcaebc0265523a6a9c41c4c3323c84f588524308ff90c78a364e005f9ab4f
-MD5 9dcfb558bd73e6c2010c7f9c02e38e08 ChangeLog 21501
-RMD160 e31831b47a79bbef5a013bc608893b48b695e7f2 ChangeLog 21501
-SHA256 55ebcaebc0265523a6a9c41c4c3323c84f588524308ff90c78a364e005f9ab4f ChangeLog 21501
-MISC metadata.xml 1029 RMD160 7ed04afc171055590f2d728e7653867928e96151 SHA1 7d293a26e95810434ec7254b4c0b3438707f34c2 SHA256 474af5cb6135399755c15a7393bca9a034f3db99f6cd8a660f8f5b299693c9fb
 MD5 ee52da73838435e93e200a5cba155fa3 metadata.xml 1029
-RMD160 7ed04afc171055590f2d728e7653867928e96151 metadata.xml 1029
-SHA256 474af5cb6135399755c15a7393bca9a034f3db99f6cd8a660f8f5b299693c9fb metadata.xml 1029
-MD5 1c2f7177e8deb2c85ee6bd4b6754cd2e files/digest-exim-4.50-r999 63
-RMD160 6d88ce37e9a8585c2ed52899d0ed85e80c69b558 files/digest-exim-4.50-r999 63
-SHA256 c0b9c6778bb1ffe979af97e17286eb6c745504be4d0295869524d63a26204e6b files/digest-exim-4.50-r999 63
-MD5 b26366d2ddeb6f737f97602be0a873b5 files/digest-exim-4.54 63
-RMD160 09f6ca8969d5b04962185c0aae1c28f6f12d51c2 files/digest-exim-4.54 63
-SHA256 20385dfc87fb0e3365af1e86ba780399e482c7308cdf2c926165850acff548ca files/digest-exim-4.54 63
-MD5 328f709452c0c5b6d6839040fa967883 files/digest-exim-4.60 63
-RMD160 7715c9f4129e4278a5f07734a767e03bcfa526f2 files/digest-exim-4.60 63
-SHA256 d937dfb88ef924fbbc1438a4575036520c24ba13ab5b9d3358a5471996637556 files/digest-exim-4.60 63
-MD5 5cabc72047b0ca8080f3ba17feccf992 files/digest-exim-4.60-r1 119
-RMD160 d1ec289fc49e4ffe2ac292aa5df650a60351d77b files/digest-exim-4.60-r1 119
-SHA256 4c3d39b56b0dc0f0ec42dbca5add7cae1ba397c617a505311f3e112ade1edbf4 files/digest-exim-4.60-r1 119
-MD5 a15891f2d3e6b13ec121037961d4411f files/digest-exim-4.61 119
-RMD160 a7345e6058408012617c4e6ffcd7f67c08d8b217 files/digest-exim-4.61 119
-SHA256 12aa36ad6b3a25b5a89dcacc993ca57d640bf6c159855a17a3fe93151f82372f files/digest-exim-4.61 119
diff --git a/mail-mta/exim/exim-4.50-r999.ebuild b/mail-mta/exim/exim-4.50-r999.ebuild
deleted file mode 100644
index 4a5dbffd43e6..000000000000
--- a/mail-mta/exim/exim-4.50-r999.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# 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.2 2006/03/05 22:46:30 peitolm Exp $
-
-inherit eutils mailer
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl 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}
-	>=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
-	einfo "The Exim ebuild will no longer touch /usr/bin/mail, so as not to interfere with mailx/nail."
-	dosym exim /usr/sbin/rsmtp
-
-	if use mailwrapper
-	then
-		mailer_install_conf
-	else
-		dosym exim /usr/sbin/sendmail
-		dosym /usr/sbin/sendmail /usr/lib/sendmail
-		dosym /usr/sbin/exim /usr/bin/mailq
-		dosym /usr/sbin/exim /usr/bin/newaliases
-		dosym /usr/sbin/exim /usr/bin/rmail
-	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."
-
-	mailer_pkg_postinst
-}
diff --git a/mail-mta/exim/exim-4.54.ebuild b/mail-mta/exim/exim-4.54.ebuild
deleted file mode 100644
index c35b571b6197..000000000000
--- a/mail-mta/exim/exim-4.54.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# 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.17 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 gnutls"
-
-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 ppc64 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 )
-	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 )"
-	# 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
-
-	# 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=/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:" \
-		-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
-	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:" Local/Makefile
-		if use gnutls; then
-			sed \
-				-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=
-	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 exiqgrep \
-		convert4r3 convert4r4 exipick
-	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.60.ebuild b/mail-mta/exim/exim-4.62.ebuild
index d0711b08cbf9..c9e5a1a91540 100644
--- a/mail-mta/exim/exim-4.60.ebuild
+++ b/mail-mta/exim/exim-4.62.ebuild
@@ -1,18 +1,18 @@
 # 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.60.ebuild,v 1.4 2006/02/20 16:58:24 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.62.ebuild,v 1.1 2006/06/12 20:19:07 peitolm Exp $
 
 inherit eutils
 
 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="~alpha ~amd64 ~hppa ia64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 PROVIDE="virtual/mta"
 DEPEND=">=sys-apps/sed-4.0.5
@@ -119,9 +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 -e "s:# AUTH_CYRUS_SASL=yes:AUTH_CYRUS_SASL=yes:" 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
@@ -178,7 +177,7 @@ src_unpack() {
 		LOOKUP_LIBS="$LOOKUP_LIBS -lpq"
 	fi
 	if use sqlite; then
-		sed -i "s:# LOOKUP_SQLITE=yes:# LOOKUP_SQLITE=yes:" Local/Makefile
+		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
diff --git a/mail-mta/exim/files/digest-exim-4.50-r999 b/mail-mta/exim/files/digest-exim-4.50-r999
deleted file mode 100644
index a96f78c973a6..000000000000
--- a/mail-mta/exim/files/digest-exim-4.50-r999
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7844eff82171872f6b3971a4183368d9 exim-4.50.tar.bz2 1434928
diff --git a/mail-mta/exim/files/digest-exim-4.54 b/mail-mta/exim/files/digest-exim-4.54
deleted file mode 100644
index eeaac7635c65..000000000000
--- a/mail-mta/exim/files/digest-exim-4.54
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f3cdf5292f4bbb1ee2de42d4338b3b9f exim-4.54.tar.bz2 1547608
diff --git a/mail-mta/exim/files/digest-exim-4.60 b/mail-mta/exim/files/digest-exim-4.60
deleted file mode 100644
index 2b639ebf7922..000000000000
--- a/mail-mta/exim/files/digest-exim-4.60
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eed3c8fc393cf7ccc9c1079b28516128 exim-4.60.tar.bz2 1554749
diff --git a/mail-mta/exim/files/digest-exim-4.62 b/mail-mta/exim/files/digest-exim-4.62
new file mode 100644
index 000000000000..699009d78d7e
--- /dev/null
+++ b/mail-mta/exim/files/digest-exim-4.62
@@ -0,0 +1,2 @@
+MD5 a8efc92427192fd3b7b5e71decc8cc31 exim-4.62.tar.bz2 1577729
+MD5 eb249c90af3ab11e5a4d307e184a75ac exiscan.conf 22113
diff --git a/mail-mta/exim/files/exiscan.conf b/mail-mta/exim/files/exiscan.conf
deleted file mode 100644
index ae9ec8ec0be3..000000000000
--- a/mail-mta/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.