Stablising 4.67 on x86, fixing a few other bugs

Package-Manager: portage-2.1.2-r9

9 files changed, 36 insertions, 664 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index 99a9eb6b8533..599f210bac95 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/exim
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.91 2007/05/03 14:31:39 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.92 2007/05/03 19:57:50 peitolm Exp $
+
+03 May 2007; Colin Morey <peitolm@gentoo.org> files/auth_conf.sub,
+  files/exim.rc6:
+  files/exim-rc6 - fix for Bug 116196, add reload option
+  files/auth_conf.sub - Fix for Bug 150695, escape colons
+  Keyworded x86
 
   03 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> exim-4.67.ebuild:
   Keyworded ~sparc wrt #176487
@@ -19,6 +25,7 @@
   21 Apr 2007; Raúl Porcel <armin76@gentoo.org> exim-4.62.ebuild:
   ia64 stable
 
+
 *exim-4.67 (18 Apr 2007)
 
   18 Apr 2007; Colin Morey <peitolm@gentoo.org> +exim-4.67.ebuild:
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index ac686efa53e1..f7026c2d1921 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX auth_conf.sub 775 RMD160 3d0280be4646b4e7bb222da2b95af82c2d0d669d SHA1 3116e59ac760f38eb2562fe44df649be4ffa11e5 SHA256 48c652cdeb971ad2b3854f4c6e417174d45568ad9977bb374afc0700aece962f
-MD5 68fc403ba2c98ccba281939085cb9052 files/auth_conf.sub 775
-RMD160 3d0280be4646b4e7bb222da2b95af82c2d0d669d files/auth_conf.sub 775
-SHA256 48c652cdeb971ad2b3854f4c6e417174d45568ad9977bb374afc0700aece962f files/auth_conf.sub 775
+AUX auth_conf.sub 790 RMD160 5d6a71cf9fb593fc34ddce8dc421fcd843356c82 SHA1 5744531af5ee282ae29bdbb4e89fbee16c0034a7 SHA256 d0631d487f115c07a178d48bc7168cd16d7b22c8879b1e926923152cde95ba78
+MD5 ac8d0e9813e9471f350fa39347dc2e6e files/auth_conf.sub 790
+RMD160 5d6a71cf9fb593fc34ddce8dc421fcd843356c82 files/auth_conf.sub 790
+SHA256 d0631d487f115c07a178d48bc7168cd16d7b22c8879b1e926923152cde95ba78 files/auth_conf.sub 790
 AUX configure 16346 RMD160 7826da9ebcf9d9318894bb3a412532a371e62032 SHA1 8e1b61ede8c86fc6efa50eca0e5da52e9be3dfaf SHA256 c0b8dee099095963d77d19a44ed9305759b4db2a1048ae77d1f839f75e017d6e
 MD5 0cb2ffe88c81fd7ac8429b5a19d58b35 files/configure 16346
 RMD160 7826da9ebcf9d9318894bb3a412532a371e62032 files/configure 16346
@@ -41,10 +38,10 @@ AUX exim.confd 62 RMD160 d8dcabf184ffb9066ad45c3e77cce1ec0392a143 SHA1 c56feda3c
 MD5 f442b68d435598831bab8536ade071b8 files/exim.confd 62
 RMD160 d8dcabf184ffb9066ad45c3e77cce1ec0392a143 files/exim.confd 62
 SHA256 668f912565a59926957090c6143f669f0e9de2cf441507d3c05fcd046865b401 files/exim.confd 62
-AUX exim.rc6 565 RMD160 56200b34825b7bf54462798a587aa3fb41c88466 SHA1 1ecb7710b44c5dee3222bb36edd26050ee37f470 SHA256 8118f7a10f25b2a3b76d230b84b76d3c3c90351eb00b7543b25cb02db70d6085
-MD5 c4ff3912726370dc255d801b8a969272 files/exim.rc6 565
-RMD160 56200b34825b7bf54462798a587aa3fb41c88466 files/exim.rc6 565
-SHA256 8118f7a10f25b2a3b76d230b84b76d3c3c90351eb00b7543b25cb02db70d6085 files/exim.rc6 565
+AUX exim.rc6 738 RMD160 6935a02ff63db979a71cd834675f1aff066b296b SHA1 a4504387906a8386904a40c0aabadd69cb8a4c2a SHA256 db96d7bf9b11dcac4d9d9dab0d111a9d8a36910473918d8903ade9a03963bffd
+MD5 876667a52d77950f33440a1bddbee48e files/exim.rc6 738
+RMD160 6935a02ff63db979a71cd834675f1aff066b296b files/exim.rc6 738
+SHA256 db96d7bf9b11dcac4d9d9dab0d111a9d8a36910473918d8903ade9a03963bffd files/exim.rc6 738
 AUX mailer.conf 259 RMD160 6412ac421b836f9425af443084dbaa49feb14df6 SHA1 690b15bdb334ed2bfda927a156227385823353f2 SHA256 c1dfa59d617c5744ebd119c37b408d7135f1fa6be4322d2f77db8ba9cb30d359
 MD5 9c5befad84b514b263004dc7a66b3d39 files/mailer.conf 259
 RMD160 6412ac421b836f9425af443084dbaa49feb14df6 files/mailer.conf 259
@@ -58,9 +55,7 @@ MD5 4c0b8ee742360c08f0bc0b526fcaad10 files/system_filter.exim 8120
 RMD160 267545af6dd333e0e5f05e1d4d02a0e8ee638d45 files/system_filter.exim 8120
 SHA256 35539f6d20f2847b4093824618797b4d602dcc5b7d920e49bf5c26f0fd89858e files/system_filter.exim 8120
 DIST exim-4.60.tar.bz2 1554749 RMD160 a3da4871a08c1da3674186e634160b8b46b55461 SHA1 51dac6bb0f55c6ce93d4b733348ae1612b75f866 SHA256 eb0de36314301c78eb1e10f84fa18f31f9674271425e585a06dbb404532c97ae
-DIST exim-4.61.tar.bz2 1574711 RMD160 116deef0ffd5f65b8d3e4d7672cad4174246ee7d SHA1 216e0eae687fe2350088e94841be2f95968b7d1f SHA256 e14ce72e125d9765a042ea52ba0859052118432c9df3d5ac068d80b12b2e0889
 DIST exim-4.62.tar.bz2 1577729 RMD160 9553b758e3bfd3d12027262b6211e37ad3259252 SHA1 2b3f95c1880de07ef22a96d7141eaa66e3c46768 SHA256 b5438894807c560a7933af36d10b2951f890aece9bff14c95fe2b91b0398629b
-DIST exim-4.63.tar.bz2 1586169 RMD160 43ff82bad9e097da670d6b5c77e672b3edc3945b SHA1 44bb57c26bee29500d0b80ba57997e5325f144d0 SHA256 b7d64eff366de656a7f992991e354d9be3ab067a94defe2136937f3159da94d7
 DIST exim-4.66.tar.bz2 1584704 RMD160 4481c9ca4932be9ab5f4f0a66b99f3e2f8e6c5fa SHA1 4a2ac2cd51865b57610e2b153e20c305b7f9f504 SHA256 ac967cc6206ec66d65c374ff71bbcbb16073e9ef7577947075e2b2c9d7cee8cb
 DIST exim-4.67.tar.bz2 1615325 RMD160 22823f27ff7ce3fea5dba8b826c4fa06210b50be SHA1 f162a8663308f62ec5586204d08f344ce92b6859 SHA256 b17ac8b356caa3c08d50654660e7c5cf8e42e2a1292839c5706eb951a708b573
 DIST exiscan.conf 22113 RMD160 e52b77f656b3ba2105e833075d1368f41e414d64 SHA1 74dc6e30f49402f5e6fefc280ea325d17f6af8c4 SHA256 f8cc731d3225a902461e05c0997df23bfd231ea8d5bf33a9aba5783bc6e0c964
@@ -68,30 +63,22 @@ EBUILD exim-4.60-r1.ebuild 9128 RMD160 9a7e667b837dfbc8765aea3f2d6a6015f0ac192e
 MD5 cb9f0fe47217b7f3bc1e007b61f134db exim-4.60-r1.ebuild 9128
 RMD160 9a7e667b837dfbc8765aea3f2d6a6015f0ac192e exim-4.60-r1.ebuild 9128
 SHA256 44930d235be60dd23ccb752c396750ead957cc9886be92cf14359426a7833e7f exim-4.60-r1.ebuild 9128
-EBUILD exim-4.61.ebuild 9133 RMD160 ce012ac13df54d98dfd1b46c184d9cc009fdc647 SHA1 7f9df9c84882a4b29657c9930066da40329cbad0 SHA256 bb7773a4a6a0716b3d883b335efd9e41a9c0e9c2cd77b6aad5eec45bec8ef6b8
-MD5 76330dcebc29718a1aba0944ca9169d3 exim-4.61.ebuild 9133
-RMD160 ce012ac13df54d98dfd1b46c184d9cc009fdc647 exim-4.61.ebuild 9133
-SHA256 bb7773a4a6a0716b3d883b335efd9e41a9c0e9c2cd77b6aad5eec45bec8ef6b8 exim-4.61.ebuild 9133
 EBUILD exim-4.62.ebuild 9127 RMD160 98dc1bcff4429a82ea522c23917704d798fa04e1 SHA1 8b8cd5617291f12b676c05ad1257bebc27e856b7 SHA256 6e70c74182570dabe74cb8d9d4bc5fe8853c39aec972e9986bf5bd795620a0b1
 MD5 df9e82dca9e9472ec3551f83b8bc501c exim-4.62.ebuild 9127
 RMD160 98dc1bcff4429a82ea522c23917704d798fa04e1 exim-4.62.ebuild 9127
 SHA256 6e70c74182570dabe74cb8d9d4bc5fe8853c39aec972e9986bf5bd795620a0b1 exim-4.62.ebuild 9127
-EBUILD exim-4.63.ebuild 9132 RMD160 a4de2ccd05701f15a2175af302455d41f29482e6 SHA1 e5d2072db1de94870c49cefacdcc66431e7b5a45 SHA256 faf6a183cb7de5689cc4d10ee0497358a8fc52a866b672bdb0a4932e8b2e4b6f
-MD5 f83d9b5410e2568f561a471d17693a88 exim-4.63.ebuild 9132
-RMD160 a4de2ccd05701f15a2175af302455d41f29482e6 exim-4.63.ebuild 9132
-SHA256 faf6a183cb7de5689cc4d10ee0497358a8fc52a866b672bdb0a4932e8b2e4b6f exim-4.63.ebuild 9132
 EBUILD exim-4.66.ebuild 9264 RMD160 228ed115700d15226e09d20db5aaee54e1c00912 SHA1 6331bb0511638fc6346317ca3659e5cc98e72201 SHA256 bfb3702fa79978807370c4b6b8d58b2c49fc9514c249235bbd860fd61b89789a
 MD5 cf3bcee886edbe56ebb6ad304f4b4713 exim-4.66.ebuild 9264
 RMD160 228ed115700d15226e09d20db5aaee54e1c00912 exim-4.66.ebuild 9264
 SHA256 bfb3702fa79978807370c4b6b8d58b2c49fc9514c249235bbd860fd61b89789a exim-4.66.ebuild 9264
-EBUILD exim-4.67.ebuild 9743 RMD160 8db3c31a7fa19fcbe3c72d32cc20f1182ad16630 SHA1 203e911fcec6002e192468d17b7ff1adc167384f SHA256 b0b68bb8e0be279881cd963237445827989cf5d65c5a63316bcf8e7f79afef98
-MD5 4ac59445f59fab4de2043df2496beecf exim-4.67.ebuild 9743
-RMD160 8db3c31a7fa19fcbe3c72d32cc20f1182ad16630 exim-4.67.ebuild 9743
-SHA256 b0b68bb8e0be279881cd963237445827989cf5d65c5a63316bcf8e7f79afef98 exim-4.67.ebuild 9743
-MISC ChangeLog 24092 RMD160 7ae6eea2bb7016b8f5b9c3a3da30893cfb23b155 SHA1 310031e431ba4f5ff5afa8d40116d5eeacb11e38 SHA256 593053fd45de76e33d764af6cf4795b1159e26676692b2f13e1f388ec0a528af
-MD5 1f6dd1fb874816e8e459bc2e26da51ab ChangeLog 24092
-RMD160 7ae6eea2bb7016b8f5b9c3a3da30893cfb23b155 ChangeLog 24092
-SHA256 593053fd45de76e33d764af6cf4795b1159e26676692b2f13e1f388ec0a528af ChangeLog 24092
+EBUILD exim-4.67.ebuild 9741 RMD160 2f0392f8d0804049ad693e10eafde5a60962831b SHA1 3bd49dd3904898d183630312550d4097ab7d3675 SHA256 6f5e7401da33faae03cc96a34385b1263cd5aa64040fdb118437dea658b4609e
+MD5 725446762e4ef86cc66d65dc05dc77d3 exim-4.67.ebuild 9741
+RMD160 2f0392f8d0804049ad693e10eafde5a60962831b exim-4.67.ebuild 9741
+SHA256 6f5e7401da33faae03cc96a34385b1263cd5aa64040fdb118437dea658b4609e exim-4.67.ebuild 9741
+MISC ChangeLog 24309 RMD160 33e4444fb71bf3fae13464c7eae9330082af4f5e SHA1 12d25fb18bca441fd34b548b29df0fa12ebbc013 SHA256 a080dc5c7f0912ef23a7c468a3e409966e86d66c8a611b2e2dae5a524f0a7633
+MD5 27b12503bbceca09efe65ffc5b2e65b3 ChangeLog 24309
+RMD160 33e4444fb71bf3fae13464c7eae9330082af4f5e ChangeLog 24309
+SHA256 a080dc5c7f0912ef23a7c468a3e409966e86d66c8a611b2e2dae5a524f0a7633 ChangeLog 24309
 MISC metadata.xml 863 RMD160 963b1a80f7d3ec06f670ceea9d8451b7aa1243e8 SHA1 096ec5e2f0957fc0dabc5d1145a73611fb048222 SHA256 8af9e235beb4ba6aedde75b11f5223f0d1eb3ccff4978f3b3acf3d025492984b
 MD5 b6c82f8f9ebef12d06ac62b268691bdd metadata.xml 863
 RMD160 963b1a80f7d3ec06f670ceea9d8451b7aa1243e8 metadata.xml 863
@@ -99,25 +86,12 @@ SHA256 8af9e235beb4ba6aedde75b11f5223f0d1eb3ccff4978f3b3acf3d025492984b metadata
 MD5 49de03204adcf21226115c809a87f397 files/digest-exim-4.60-r1 449
 RMD160 b8c696d47f20942210fdb9ab26a76e25e5c35c5f files/digest-exim-4.60-r1 449
 SHA256 5cb32380b769f6dd12c0c8061989f070383fcc7afaa3093931e8b6a9fcb8b1d4 files/digest-exim-4.60-r1 449
-MD5 247926a87f82b6705165e12d5ac2e2fe files/digest-exim-4.61 449
-RMD160 3680b1995b810983b419f73610850974ee1f53ac files/digest-exim-4.61 449
-SHA256 a8980b881ffe59651b0ef6d18834bbc27be4dd7b68605807d8ca998a0b731bfb files/digest-exim-4.61 449
 MD5 31e2a5f83bcae355694aafddd6d76d10 files/digest-exim-4.62 449
 RMD160 b65f09555de6587827634d3c592f8a25515d938e files/digest-exim-4.62 449
 SHA256 23a4934530694bdb862bb652d6045101cfaa263d8be8e34f7a6b296f97ae2202 files/digest-exim-4.62 449
-MD5 7e896911202f5cc29d66df5cc32f8d8b files/digest-exim-4.63 449
-RMD160 b35c51c7718b924fc20263ee5ad224a14c2d57c6 files/digest-exim-4.63 449
-SHA256 2cddb407eec5a561dfd0ea5ff5def202abebf996df72215b652bdefeb7dfee7e files/digest-exim-4.63 449
 MD5 1eac2dc1e8b4f5d3e057d51a18064750 files/digest-exim-4.66 449
 RMD160 9528707cb6355da1bb42f884f85ac40a5086cfac files/digest-exim-4.66 449
 SHA256 e401c763c41ebdee1580f56cc615e584ffa9e3075a7fbdb8e706842feba0c4f3 files/digest-exim-4.66 449
 MD5 76dfeb37b079e99c4c48072dcb8b2663 files/digest-exim-4.67 449
 RMD160 da722afaab529f47416d0d44dba78c5c208bd541 files/digest-exim-4.67 449
 SHA256 a3cae93912191285bc1a800613bf43bfeb554864882742caca7bafd89f24b059 files/digest-exim-4.67 449
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
-
-iD8DBQFGOfJVKRy60XGEcJIRAn/TAJ4zM5NqtiIifUqTlP5actttH4LHSwCfRRXn
-5W5C9OknKMovn+KkiJWk3/w=
-=aOnN
------END PGP SIGNATURE-----
diff --git a/mail-mta/exim/exim-4.61.ebuild b/mail-mta/exim/exim-4.61.ebuild
deleted file mode 100644
index a7aa7f3c7c7a..000000000000
--- a/mail-mta/exim/exim-4.61.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.61.ebuild,v 1.5 2007/04/28 16:52:41 swegener 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 mirror://gentoo/exiscan.conf"
-HOMEPAGE="http://www.exim.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~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
-			  dev-libs/libtasn1 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	mysql? ( virtual/mysql )
-	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? ( || ( (	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 )
-	!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
-	# 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
-		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
-		sed -i "s:# AUTH_CYRUS_SASL=yes:AUTH_CYRUS_SASL=yes:" 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 -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=
-	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 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 -lsqlite3: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
-	elog "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
-
-	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
-
-	newinitd ${FILESDIR}/exim.rc6 exim
-
-	newconfd ${FILESDIR}/exim.confd exim
-
-	DIROPTIONS="--mode=0750 --owner=mail --group=mail"
-	dodir /var/log/${PN}
-}
-
-
-pkg_postinst() {
-	elog "/etc/exim/system_filter.exim is a sample system_filter."
-	elog "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
-	elog "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
-
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		elog
-		elog "Since you emerged $PN without mailwrapper in USE,"
-		elog "you probably want to 'emerge -C mailwrapper' now."
-		elog
-	fi
-}
diff --git a/mail-mta/exim/exim-4.63.ebuild b/mail-mta/exim/exim-4.63.ebuild
deleted file mode 100644
index 9640137272c9..000000000000
--- a/mail-mta/exim/exim-4.63.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.63.ebuild,v 1.5 2007/04/28 16:52:41 swegener 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 mirror://gentoo/exiscan.conf"
-HOMEPAGE="http://www.exim.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~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
-			  dev-libs/libtasn1 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	mysql? ( virtual/mysql )
-	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? ( || ( (	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 )
-	!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
-		elog "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
-	# 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
-		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
-		sed -i "s:# AUTH_CYRUS_SASL=yes:AUTH_CYRUS_SASL=yes:" 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 -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=
-	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 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 -lsqlite3: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
-	elog "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
-
-	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
-
-	newinitd ${FILESDIR}/exim.rc6 exim
-
-	newconfd ${FILESDIR}/exim.confd exim
-
-	DIROPTIONS="--mode=0750 --owner=mail --group=mail"
-	dodir /var/log/${PN}
-}
-
-
-pkg_postinst() {
-	elog "/etc/exim/system_filter.exim is a sample system_filter."
-	elog "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
-	elog "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
-
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		elog
-		elog "Since you emerged $PN without mailwrapper in USE,"
-		elog "you probably want to 'emerge -C mailwrapper' now."
-		elog
-	fi
-}
diff --git a/mail-mta/exim/exim-4.67.ebuild b/mail-mta/exim/exim-4.67.ebuild
index c7c88f0b4930..6c4c4279ecd2 100644
--- a/mail-mta/exim/exim-4.67.ebuild
+++ b/mail-mta/exim/exim-4.67.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.67.ebuild,v 1.5 2007/05/03 14:31:39 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.67.ebuild,v 1.6 2007/05/03 19:57:50 peitolm Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~ia64 ~ppc64 ~sparc x86"
 
 PROVIDE="virtual/mta"
 DEPEND=">=sys-apps/sed-4.0.5
diff --git a/mail-mta/exim/files/auth_conf.sub b/mail-mta/exim/files/auth_conf.sub
index fb744a5a67a1..24434a7164a1 100644
--- a/mail-mta/exim/files/auth_conf.sub
+++ b/mail-mta/exim/files/auth_conf.sub
@@ -18,8 +18,8 @@ login:
   driver = plaintext
   public_name = LOGIN
   server_prompts = "Username:: : Password::"
-  server_condition = "${if pam{$1:$2}{1}{0}}"
+  server_condition = "${if pam{$1:${sg{$2}{:}{::}}}{1}{0}}"
   server_set_id = $1
-
+#
 # FIXME
 # Need to add authenticator for SPA!!
diff --git a/mail-mta/exim/files/digest-exim-4.61 b/mail-mta/exim/files/digest-exim-4.61
deleted file mode 100644
index 4ebe8c57f2f5..000000000000
--- a/mail-mta/exim/files/digest-exim-4.61
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 f6bbf99a6f63c0f5045a1779e7e810c4 exim-4.61.tar.bz2 1574711
-RMD160 116deef0ffd5f65b8d3e4d7672cad4174246ee7d exim-4.61.tar.bz2 1574711
-SHA256 e14ce72e125d9765a042ea52ba0859052118432c9df3d5ac068d80b12b2e0889 exim-4.61.tar.bz2 1574711
-MD5 eb249c90af3ab11e5a4d307e184a75ac exiscan.conf 22113
-RMD160 e52b77f656b3ba2105e833075d1368f41e414d64 exiscan.conf 22113
-SHA256 f8cc731d3225a902461e05c0997df23bfd231ea8d5bf33a9aba5783bc6e0c964 exiscan.conf 22113
diff --git a/mail-mta/exim/files/digest-exim-4.63 b/mail-mta/exim/files/digest-exim-4.63
deleted file mode 100644
index e8cb3dea482e..000000000000
--- a/mail-mta/exim/files/digest-exim-4.63
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 dde2d5f7106d51607409af94174db46c exim-4.63.tar.bz2 1586169
-RMD160 43ff82bad9e097da670d6b5c77e672b3edc3945b exim-4.63.tar.bz2 1586169
-SHA256 b7d64eff366de656a7f992991e354d9be3ab067a94defe2136937f3159da94d7 exim-4.63.tar.bz2 1586169
-MD5 eb249c90af3ab11e5a4d307e184a75ac exiscan.conf 22113
-RMD160 e52b77f656b3ba2105e833075d1368f41e414d64 exiscan.conf 22113
-SHA256 f8cc731d3225a902461e05c0997df23bfd231ea8d5bf33a9aba5783bc6e0c964 exiscan.conf 22113
diff --git a/mail-mta/exim/files/exim.rc6 b/mail-mta/exim/files/exim.rc6
index e92d39d9683a..13b1d66f2da7 100644
--- a/mail-mta/exim/files/exim.rc6
+++ b/mail-mta/exim/files/exim.rc6
@@ -1,7 +1,8 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/files/exim.rc6,v 1.6 2007/04/15 12:12:06 peitolm Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/files/exim.rc6,v 1.7 2007/05/03 19:57:50 peitolm Exp $
+opts="${opts} reload"
 
 depend() {
 	need logger
@@ -20,3 +21,9 @@ stop() {
 	start-stop-daemon --stop --quiet --pidfile /var/run/exim.pid --name exim
 	eend $?
 }
+
+reload() {
+       ebegin "Reloading exim"
+       start-stop-daemon --stop --signal 1 --quiet --pidfile /var/run/exim.pid --name exim
+       eend $?
+}