Stablising 4.67 on x86, fixing a few other bugs

(Portage version: 2.1.2-r9)

8 files changed, 20 insertions, 622 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/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 $?
+}