Big Cleanup, removing some old irrelevant files, and an insecure versoin, adding new, packaged masked ebuild for cleaning up lots of little ebuild fixes

(Portage version: 2.1.4.4)

5 files changed, 362 insertions, 15 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index 60fd73fe4f35..0626b501eaea 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-mta/exim
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.120 2008/03/07 16:39:04 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.121 2008/03/20 19:13:06 peitolm Exp $
+
+  20 Mar 2008; Colin Morey <peitolm@gentoo.org> -exim-4.68.ebuild:
+  Removing old, insecure stable version.
 
   07 Mar 2008; Steve Dibb <beandog@gentoo.org> exim-4.69.ebuild:
   amd64 stable, bug 198379
@@ -8,7 +11,7 @@
   07 Mar 2008; Jeroen Roovers <jer@gentoo.org> exim-4.69.ebuild:
   Stable for HPPA (bug #198379).
 
-  06 Mar 2008; Raúl Porcel <armin76@gentoo.org> exim-4.69.ebuild:
+  06 Mar 2008; Raúl Porcel <armin76@gentoo.org> exim-4.69.ebuild:
   alpha/ia64/sparc stable wrt #198379
 
   06 Mar 2008; Christian Faulhammer <opfer@gentoo.org> exim-4.69.ebuild:
@@ -20,6 +23,15 @@
   05 Mar 2008; Tobias Scherbaum <dertobi123@gentoo.org> exim-4.69.ebuild:
   ppc stable, bug #198379
 
+*exim-4.69-r1 (04 Feb 2008)
+
+  04 Feb 2008; Colin Morey <peitolm@gentoo.org> -files/exim-4.30-conf.patch,
+  +exim-4.69-r1.ebuild:
+  New ebuild with lots of little fixes, once this has been in for a couple of
+  weeks, the old versions can be removed. exim-4.30-conf patch was just to
+  cover a default syslog logging location, this is no-longer relevant (came in
+  with bug #27206).
+
 *exim-4.69 (13 Jan 2008)
 
   13 Jan 2008; Colin Morey <peitolm@gentoo.org>
@@ -42,10 +54,10 @@
   14 Nov 2007; Jeroen Roovers <jer@gentoo.org> exim-4.68.ebuild:
   Stable for HPPA (bug #198489). Fixed many quoting issues.
 
-  11 Nov 2007; Raúl Porcel <armin76@gentoo.org> exim-4.68.ebuild:
+  11 Nov 2007; Raúl Porcel <armin76@gentoo.org> exim-4.68.ebuild:
   alpha/ia64/sparc stable wrt #198489
 
-  10 Nov 2007; Dawid Węgliński <cla@gentoo.org> exim-4.68.ebuild:
+  10 Nov 2007; Dawid Węgliński <cla@gentoo.org> exim-4.68.ebuild:
   Stable on x86 (bug #198489)
 
   10 Nov 2007; Markus Rothe <corsair@gentoo.org> exim-4.68.ebuild:
@@ -65,13 +77,13 @@
   04 Sep 2007; Colin Morey <peitolm@gentoo.org> +exim-4.68.ebuild:
   Version Bump to 4.68
 
-  09 Aug 2007; Raúl Porcel <armin76@gentoo.org> exim-4.67-r1.ebuild:
+  09 Aug 2007; Raúl Porcel <armin76@gentoo.org> exim-4.67-r1.ebuild:
   alpha stable
 
   30 Jul 2007; Colin Morey <peitolm@gentoo.org> exim-4.67-r2.ebuild:
   Re-instating missing archs that were accidently dropped in the new revision. #176487
 
-  25 Jul 2007; Raúl Porcel <armin76@gentoo.org> exim-4.67-r2.ebuild:
+  25 Jul 2007; Raúl Porcel <armin76@gentoo.org> exim-4.67-r2.ebuild:
   Re-add ~alpha wrt #176487
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; exim-4.60-r1.ebuild,
@@ -85,7 +97,7 @@
   Fixes for bugs 180894 (Broken symlinks) 184697 (missing -lcrypto when
   building with domainkeys)
 
-  30 Jun 2007; Raúl Porcel <armin76@gentoo.org> exim-4.67-r1.ebuild:
+  30 Jun 2007; Raúl Porcel <armin76@gentoo.org> exim-4.67-r1.ebuild:
   Add ~alpha wrt #176487
 
   17 Jun 2007; Tobias Scherbaum <dertobi123@gentoo.org> exim-4.67-r1.ebuild:
@@ -115,7 +127,7 @@
   01 May 2007; Markus Rothe <corsair@gentoo.org> exim-4.67.ebuild:
   Added ~ppc64; bug #176487
 
-  01 May 2007; Raúl Porcel <armin76@gentoo.org> exim-4.67.ebuild:
+  01 May 2007; Raúl Porcel <armin76@gentoo.org> exim-4.67.ebuild:
   Add ~ia64 wrt bug 176487
 
   28 Apr 2007; Sven Wegener <swegener@gentoo.org> exim-4.60-r1.ebuild,
@@ -123,7 +135,7 @@
   exim-4.67.ebuild:
   Fix *initd, *confd and *envd calls (#17388, #174266)
 
-  21 Apr 2007; Raúl Porcel <armin76@gentoo.org> exim-4.62.ebuild:
+  21 Apr 2007; Raúl Porcel <armin76@gentoo.org> exim-4.62.ebuild:
   ia64 stable
 
 
@@ -137,7 +149,7 @@
   exim-4.61.ebuild, exim-4.62.ebuild, exim-4.63.ebuild:
   add libtasn1 as dependency for USE=gnutls, as reported in bug 143519 by zmedico
 
-  19 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  19 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove pfeifer from metadata.xml due to retirement.
 
   18 Mar 2007; Marius Mauch <genone@gentoo.org> exim-4.60-r1.ebuild,
@@ -151,7 +163,7 @@
   Version bump, also adding dovecot-sasl suport and openssl patch from
   http://bugs.gentoo.org/show_bug.cgi?id=161572
 
-  08 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
+  08 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
 
   20 Dec 2006; Colin Morey <peitolm@gentoo.org> files/mailer.conf:
@@ -317,7 +329,7 @@
   05 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> exim-4.50-r1.ebuild:
   Stable on hppa.
 
-  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> exim-4.50-r1.ebuild:
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> exim-4.50-r1.ebuild:
   Add ~alpha keyword.
 
   26 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> exim-4.50-r1.ebuild:
@@ -400,7 +412,7 @@
   exim-4.43.ebuild:
   KEYWORDS ~amd64 to close bug 61163.
 
-  10 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> exim-4.42.ebuild:
+  10 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> exim-4.42.ebuild:
   Stable on alpha.
 
   08 Oct 2004; Guy Martin <gmsoft@gentoo.org> exim-4.42.ebuild:
@@ -412,7 +424,7 @@
   +exim-4.43.ebuild:
   New Version Bump and Bump of 4.42 to stable.
 
-  04 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> exim-4.42.ebuild:
+  04 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> exim-4.42.ebuild:
   Keyword ~alpha.
 
   05 Sep 2004; Guy Martin <gmsoft@gentoo.org> exim-4.41.ebuild,
@@ -499,7 +511,7 @@
   11 May 2004; Guy Martin <gmsoft@gentoo.org> exim-4.34.ebuild:
   Marked stable on hppa.
 
-  11 May 2004; Bryan Østergaard <kloeri@gentoo.org> exim-4.34.ebuild:
+  11 May 2004; Bryan Østergaard <kloeri@gentoo.org> exim-4.34.ebuild:
   Stable on alpha, bug #50217.
 
   11 May 2004; Jon Portnoy <avenj@gentoo.org> exim-4.34.ebuild :
diff --git a/mail-mta/exim/exim-4.69-r1.ebuild b/mail-mta/exim/exim-4.69-r1.ebuild
new file mode 100644
index 000000000000..e042cf37d08c
--- /dev/null
+++ b/mail-mta/exim/exim-4.69-r1.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.69-r1.ebuild,v 1.1 2008/03/20 19:13:06 peitolm Exp $
+
+inherit eutils
+
+IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl mailwrapper lmtp ipv6 sasl dnsdb perl mbx mbox X exiscan nis syslog spf srs gnutls sqlite dovecot-sasl radius domainkeys maildir"
+
+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
+	)
+	sqlite? ( dev-db/sqlite )
+	radius? ( net-dialup/radiusclient )
+	domainkeys? ( mail-filter/libdomainkeys )
+	"
+	# added X check for #57206
+RDEPEND="${DEPEND}
+	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
+	!mailwrapper? ( !virtual/mta )
+	>=net-mail/mailbase-0.00-r5
+	virtual/logger"
+
+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 maildir; then
+		einfo "Patching maildir support into exim.conf"
+		epatch "${FILESDIR}"/exim-4.20-maildir.patch
+	fi
+	sed -i "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'/etc/mail/aliases'" "${S}"/src/configure.default
+	cp "${S}"/src/configure.default "${S}"/src/configure.default.orig
+
+	# 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 use dovecot-sasl; then
+		sed -i "s:# AUTH_DOVECOT=yes:AUTH_DOVECOT=yes:" Makefile
+	fi
+	if use radius; then
+		myconf="${myconf} -lradiusclient"
+		sed -i "s:# RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf:RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf:" Local/Makefile
+		sed -i "s:# RADIUS_LIB_TYPE=RADIUSCLIENT$:RADIUS_LIB_TYPE=RADIUSCLIENT:" Local/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
+
+	sed -i -e 's/^buildname=.*/buildname=exim-gentoo/g' 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
+	if use domainkeys; then
+		echo "
+		EXPERIMENTAL_DOMAINKEYS=yes
+		CFLAGS  += -I/usr/include/libdomainkeys
+		LDFLAGS += -lcrypto -ldomainkeys -L/usr/lib/libdomainkeys" >> 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
+	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
+		dosym /usr/sbin/exim /usr/bin/mailq
+		dosym /usr/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
+	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() {
+	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/files/digest-exim-4.68 b/mail-mta/exim/files/digest-exim-4.68
new file mode 100644
index 000000000000..f0291f92fa11
--- /dev/null
+++ b/mail-mta/exim/files/digest-exim-4.68
@@ -0,0 +1,6 @@
+MD5 94c46a8bc24b3ad4ad892228449f378b exim-4.68.tar.bz2 1641636
+RMD160 764cc258ee969bb27975d8009bacb6489103e3a5 exim-4.68.tar.bz2 1641636
+SHA256 31e79e045bfbb730dbe86fdfc7793055d21b78367bae5b8e7bb9494c6ea760b0 exim-4.68.tar.bz2 1641636
+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.69 b/mail-mta/exim/files/digest-exim-4.69
new file mode 100644
index 000000000000..369fa41098b0
--- /dev/null
+++ b/mail-mta/exim/files/digest-exim-4.69
@@ -0,0 +1,6 @@
+MD5 6f29f073328c858d8554b08cc0c3c2be exim-4.69.tar.bz2 1658939
+RMD160 ae97c807c63f858ba4a0ab402677225da9337d05 exim-4.69.tar.bz2 1658939
+SHA256 18e856cfdb682ba8e8ccb943ab538734d34d0ecefd63465ecc5430bc15915069 exim-4.69.tar.bz2 1658939
+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.69-r1 b/mail-mta/exim/files/digest-exim-4.69-r1
new file mode 100644
index 000000000000..369fa41098b0
--- /dev/null
+++ b/mail-mta/exim/files/digest-exim-4.69-r1
@@ -0,0 +1,6 @@
+MD5 6f29f073328c858d8554b08cc0c3c2be exim-4.69.tar.bz2 1658939
+RMD160 ae97c807c63f858ba4a0ab402677225da9337d05 exim-4.69.tar.bz2 1658939
+SHA256 18e856cfdb682ba8e8ccb943ab538734d34d0ecefd63465ecc5430bc15915069 exim-4.69.tar.bz2 1658939
+MD5 eb249c90af3ab11e5a4d307e184a75ac exiscan.conf 22113
+RMD160 e52b77f656b3ba2105e833075d1368f41e414d64 exiscan.conf 22113
+SHA256 f8cc731d3225a902461e05c0997df23bfd231ea8d5bf33a9aba5783bc6e0c964 exiscan.conf 22113