Drop vulnerable versions, bug #439734

(Portage version: 2.2.01.21313-prefix/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89)

8 files changed, 7 insertions, 1465 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index afd009633a4b..962b24b2992f 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/exim
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.240 2012/11/11 16:31:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.241 2012/11/11 18:46:52 grobian Exp $
+
+  11 Nov 2012; Fabian Groffen <grobian@gentoo.org> -exim-4.76-r1.ebuild,
+  -exim-4.76.ebuild, -exim-4.77.ebuild, -exim-4.80.ebuild,
+  -files/exim-4.75-makefile-freebsd.patch, -files/exim-4.76-as-needed.patch,
+  -files/exim.rc6:
+  Drop vulnerable versions, bug #439734
 
   11 Nov 2012; Raúl Porcel <armin76@gentoo.org> exim-4.80.1.ebuild:
   ia64/sparc stable wrt #439734
diff --git a/mail-mta/exim/exim-4.76-r1.ebuild b/mail-mta/exim/exim-4.76-r1.ebuild
deleted file mode 100644
index 0a1967bfcd69..000000000000
--- a/mail-mta/exim/exim-4.76-r1.ebuild
+++ /dev/null
@@ -1,334 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.76-r1.ebuild,v 1.4 2012/11/06 11:14:52 eras Exp $
-
-EAPI="3"
-
-inherit eutils toolchain-funcs multilib pam
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl lmtp ipv6 sasl dnsdb perl mbx X nis selinux syslog spf srs gnutls sqlite dovecot-sasl radius maildir +dkim dcc dsn"
-
-DSN_EXIM_V=469
-DSN_V=1_3
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.bz2
-	mirror://gentoo/system_filter.exim.gz
-	dsn? ( mirror://sourceforge/eximdsn/eximdsn-patch-1.3/exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch )"
-HOMEPAGE="http://www.exim.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=sys-apps/sed-4.0.5
-	>=sys-libs/db-3.2
-	dev-libs/libpcre
-	perl? ( sys-devel/libperl )
-	pam? ( virtual/pam )
-	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( >=dev-libs/openssl-0.9.6 <dev-libs/openssl-1.0.1 )
-	gnutls? ( net-libs/gnutls
-			  dev-libs/libtasn1 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.14 )
-	selinux? ( sec-policy/selinux-exim )
-	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 )
-	virtual/libiconv
-	"
-	# added X check for #57206
-RDEPEND="${DEPEND}
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/mini-qmail
-	!<mail-mta/msmtp-1.4.19-r1
-	!>=mail-mta/msmtp-1.4.19-r1[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/mailwrapper
-	>=net-mail/mailbase-0.00-r5
-	virtual/logger
-	dcc? ( mail-filter/dcc )
-	"
-
-src_prepare() {
-	epatch "${FILESDIR}"/exim-4.14-tail.patch
-	epatch "${FILESDIR}"/exim-4.74-localscan_dlopen.patch
-	epatch "${FILESDIR}"/exim-4.69-r1.27021.patch
-	epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
-	epatch "${FILESDIR}"/exim-4.75-makefile-freebsd.patch
-	epatch "${FILESDIR}"/exim-4.76-as-needed.patch # 352265
-	epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
-
-	use maildir && epatch "${FILESDIR}"/exim-4.20-maildir.patch
-
-	if use dsn ; then
-		cp "${DISTDIR}"/exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch . || die
-		epatch "${FILESDIR}"/${P}-dsn.patch
-		epatch exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch
-	fi
-}
-
-src_configure() {
-	local myconf
-
-	sed -i "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${EPREFIX}/etc/mail/aliases'" "${S}"/src/configure.default
-	cp "${S}"/src/configure.default "${S}"/src/configure.default.orig
-
-	sed -i -e 's/^buildname=.*/buildname=exim-gentoo/g' Makefile
-
-	sed -e "48i\CFLAGS=${CFLAGS}" \
-		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
-		-e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=${EPREFIX}/etc/exim/exim.conf:" \
-		-e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=${EPREFIX}/usr/share/info:" \
-		-e "s:# LOG_FILE_PATH=/var/log/exim_%slog:LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log:" \
-		-e "s:# PID_FILE_PATH=/var/lock/exim.pid:PID_FILE_PATH=${EPREFIX}/var/run/exim.pid:" \
-		-e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=${EPREFIX}/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:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \
-		-e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \
-		-e "s:# LOOKUP_PASSWD=yes:LOOKUP_PASSWD=yes:" \
-		-e "s:EXIM_MONITOR=eximon.bin:# EXIM_MONITOR=eximon.bin:" \
-		-e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
-		-e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
-		src/EDITME > Local/Makefile
-
-	cd Local
-
-	# exiscan-acl is now integrated - enable it when use-flag set
-	if use exiscan-acl; then
-		sed -i "s:# WITH_CONTENT_SCAN=yes:WITH_CONTENT_SCAN=yes:" Makefile
-		sed -i "s:# WITH_OLD_DEMIME=yes:WITH_OLD_DEMIME=yes:" Makefile
-	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:" Makefile
-		mycflags="${mycflags} -DEXPERIMENTAL_SPF"
-	fi
-	if use srs; then
-		myconf="${myconf} -lsrs_alt"
-		sed -i "s:# EXPERIMENTAL_SRS=yes:EXPERIMENTAL_SRS=yes:" Makefile
-	fi
-
-	# 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
-	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=${EPREFIX}/var/state/saslauthd/mux:CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/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:TRANSPORT_LMTP=yes:" 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=${EPREFIX}/etc/radiusclient/radiusclient.conf:" Makefile
-		sed -i "s:# RADIUS_LIB_TYPE=RADIUSCLIENT$:RADIUS_LIB_TYPE=RADIUSCLIENT:" Makefile
-	fi
-	echo "EXTRALIBS=${myconf}" >> Makefile
-
-	# make iconv usage explicit
-	echo "HAVE_ICONV=yes" >> Makefile
-	# if we use libiconv, now is the time to tell so
-	use !elibc_glibc && echo "EXTRALIBS_EXIM=-liconv" >> Makefile
-
-	if use ssl; then
-		sed -i \
-			-e "s:# \(SUPPORT_TLS=yes\):\1:" Makefile
-		if use gnutls; then
-			sed -i \
-				-e "s:# \(USE_GNUTLS=yes\):\1:" \
-				-e "s:# \(TLS_LIBS=-lgnutls -ltasn1 -lgcrypt\):\1:" Makefile
-		else
-			sed -i \
-				-e "s:# \(TLS_LIBS=-lssl -lcrypto\):\1:" 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:" Makefile
-		LOOKUP_INCLUDE="-I${EROOT}usr/include/ldap"
-		LOOKUP_LIBS="-lldap -llber"
-	fi
-
-	if use mysql; then
-		sed -i "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}usr/include/mysql"
-		LOOKUP_LIBS="$LOOKUP_LIBS -lmysqlclient"
-	fi
-
-	if use postgres; then
-		sed -i "s:# LOOKUP_PGSQL=yes:LOOKUP_PGSQL=yes:" Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}usr/include/postgresql"
-		LOOKUP_LIBS="$LOOKUP_LIBS -lpq"
-	fi
-
-	if use sqlite; then
-		sed -i "s:# LOOKUP_SQLITE=yes: LOOKUP_SQLITE=yes:" Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}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:" \
-			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:" \
-			Makefile
-	fi
-
-	sed -i "s:# LOOKUP_DSEARCH=yes:LOOKUP_DSEARCH=yes:" Makefile
-
-	if use dnsdb; then
-		sed -i "s:# LOOKUP_DNSDB=yes:LOOKUP_DNSDB=yes:" Makefile
-	fi
-	sed -i "s:# LOOKUP_CDB=yes:LOOKUP_CDB=yes:" Makefile
-
-	if use nis; then
-		sed -i -e "s:# LOOKUP_NIS=yes:LOOKUP_NIS=yes:" \
-			-e "s:# LOOKUP_NISPLUS=yes:LOOKUP_NISPLUS=yes:" Makefile
-	fi
-	if use syslog; then
-		sed -i "s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Makefile
-	fi
-	if ! use dkim; then
-		# DKIM is enabled by default. We have to explicitly disable it.
-		echo "DISABLE_DKIM=yes">> Makefile
-	fi
-	if use dcc; then
-		echo "EXPERIMENTAL_DCC=yes">> Makefile
-	fi
-	if use dsn; then
-		sed -i -e "s:#define SUPPORT_DSN:define SUPPORT_DSN:" Makefile
-	fi
-
-	# use the "native" interface to the DBM library
-	echo "USE_DB=yes" >> Makefile
-}
-
-src_compile() {
-	emake -j1 CC="$(tc-getCC)" HOSTCC="$(tc-getCC $CBUILD)" FULLECHO='' \
-		|| 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 exim /usr/sbin/sendmail
-	dosym exim /usr/sbin/rsmtp
-	dosym exim /usr/sbin/rmail
-	dosym /usr/sbin/exim /usr/bin/mailq
-	dosym /usr/sbin/exim /usr/bin/newaliases
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	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
-	use dsn && dodoc "${S}"/README.DSN
-
-	# 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 "${WORKDIR}"/system_filter.exim
-	doins "${FILESDIR}"/auth_conf.sub
-
-	pamd_mimic system-auth exim auth account
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/exim.logrotate" exim
-
-	newinitd "${FILESDIR}"/exim.rc7 exim
-
-	newconfd "${FILESDIR}"/exim.confd exim
-
-	DIROPTIONS="--mode=0750 --owner=mail --group=mail"
-	dodir /var/log/${PN}
-}
-
-pkg_postinst() {
-	einfo "${EROOT}etc/exim/system_filter.exim is a sample system_filter."
-	einfo "${EROOT}etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
-	einfo "Please create ${EROOT}etc/exim/exim.conf from ${EROOT}etc/exim/exim.conf.dist."
-	if use dcc ; then
-		einfo "DCC support is experimental, you can find some limited"
-		einfo "documentation at the bottom of this prerelease message:"
-		einfo "http://article.gmane.org/gmane.mail.exim.devel/3579"
-	fi
-}
diff --git a/mail-mta/exim/exim-4.76.ebuild b/mail-mta/exim/exim-4.76.ebuild
deleted file mode 100644
index e33fec8ef1d2..000000000000
--- a/mail-mta/exim/exim-4.76.ebuild
+++ /dev/null
@@ -1,332 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.76.ebuild,v 1.13 2012/11/06 11:14:52 eras Exp $
-
-EAPI="3"
-
-inherit eutils toolchain-funcs multilib pam
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl lmtp ipv6 sasl dnsdb perl mbx X nis selinux syslog spf srs gnutls sqlite dovecot-sasl radius maildir +dkim dcc dsn"
-
-DSN_EXIM_V=469
-DSN_V=1_3
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.bz2
-	mirror://gentoo/system_filter.exim.gz
-	dsn? ( mirror://sourceforge/eximdsn/eximdsn-patch-1.3/exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch )"
-HOMEPAGE="http://www.exim.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-
-DEPEND=">=sys-apps/sed-4.0.5
-	>=sys-libs/db-3.2
-	dev-libs/libpcre
-	perl? ( sys-devel/libperl )
-	pam? ( virtual/pam )
-	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( >=dev-libs/openssl-0.9.6 <dev-libs/openssl-1.0.1 )
-	gnutls? ( net-libs/gnutls
-			  dev-libs/libtasn1 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.14 )
-	selinux? ( sec-policy/selinux-exim )
-	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 )
-	virtual/libiconv
-	"
-	# added X check for #57206
-RDEPEND="${DEPEND}
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/mini-qmail
-	!<mail-mta/msmtp-1.4.19-r1
-	!>=mail-mta/msmtp-1.4.19-r1[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/mailwrapper
-	>=net-mail/mailbase-0.00-r5
-	virtual/logger
-	dcc? ( mail-filter/dcc )
-	"
-
-src_prepare() {
-	epatch "${FILESDIR}"/exim-4.14-tail.patch
-	epatch "${FILESDIR}"/exim-4.74-localscan_dlopen.patch
-	epatch "${FILESDIR}"/exim-4.69-r1.27021.patch
-	epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
-	epatch "${FILESDIR}"/exim-4.75-makefile-freebsd.patch
-	epatch "${FILESDIR}"/exim-4.76-as-needed.patch # 352265
-
-	use maildir && epatch "${FILESDIR}"/exim-4.20-maildir.patch
-
-	if use dsn ; then
-		cp "${DISTDIR}"/exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch . || die
-		epatch "${FILESDIR}"/${P}-dsn.patch
-		epatch exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch
-	fi
-}
-
-src_configure() {
-	local myconf
-
-	sed -i "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${EPREFIX}/etc/mail/aliases'" "${S}"/src/configure.default
-	cp "${S}"/src/configure.default "${S}"/src/configure.default.orig
-
-	sed -i -e 's/^buildname=.*/buildname=exim-gentoo/g' Makefile
-
-	sed -e "48i\CFLAGS=${CFLAGS}" \
-		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
-		-e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=${EPREFIX}/etc/exim/exim.conf:" \
-		-e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=${EPREFIX}/usr/share/info:" \
-		-e "s:# LOG_FILE_PATH=/var/log/exim_%slog:LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log:" \
-		-e "s:# PID_FILE_PATH=/var/lock/exim.pid:PID_FILE_PATH=${EPREFIX}/var/run/exim.pid:" \
-		-e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=${EPREFIX}/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:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \
-		-e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \
-		-e "s:# LOOKUP_PASSWD=yes:LOOKUP_PASSWD=yes:" \
-		-e "s:EXIM_MONITOR=eximon.bin:# EXIM_MONITOR=eximon.bin:" \
-		-e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
-		-e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
-		src/EDITME > Local/Makefile
-
-	cd Local
-
-	# exiscan-acl is now integrated - enable it when use-flag set
-	if use exiscan-acl; then
-		sed -i "s:# WITH_CONTENT_SCAN=yes:WITH_CONTENT_SCAN=yes:" Makefile
-		sed -i "s:# WITH_OLD_DEMIME=yes:WITH_OLD_DEMIME=yes:" Makefile
-	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:" Makefile
-		mycflags="${mycflags} -DEXPERIMENTAL_SPF"
-	fi
-	if use srs; then
-		myconf="${myconf} -lsrs_alt"
-		sed -i "s:# EXPERIMENTAL_SRS=yes:EXPERIMENTAL_SRS=yes:" Makefile
-	fi
-
-	# 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
-	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=${EPREFIX}/var/state/saslauthd/mux:CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/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:TRANSPORT_LMTP=yes:" 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=${EPREFIX}/etc/radiusclient/radiusclient.conf:" Makefile
-		sed -i "s:# RADIUS_LIB_TYPE=RADIUSCLIENT$:RADIUS_LIB_TYPE=RADIUSCLIENT:" Makefile
-	fi
-	echo "EXTRALIBS=${myconf}" >> Makefile
-
-	# make iconv usage explicit
-	echo "HAVE_ICONV=yes" >> Makefile
-	# if we use libiconv, now is the time to tell so
-	use !elibc_glibc && echo "EXTRALIBS_EXIM=-liconv" >> Makefile
-
-	if use ssl; then
-		sed -i \
-			-e "s:# \(SUPPORT_TLS=yes\):\1:" Makefile
-		if use gnutls; then
-			sed -i \
-				-e "s:# \(USE_GNUTLS=yes\):\1:" \
-				-e "s:# \(TLS_LIBS=-lgnutls -ltasn1 -lgcrypt\):\1:" Makefile
-		else
-			sed -i \
-				-e "s:# \(TLS_LIBS=-lssl -lcrypto\):\1:" 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:" Makefile
-		LOOKUP_INCLUDE="-I${EROOT}usr/include/ldap"
-		LOOKUP_LIBS="-lldap -llber"
-	fi
-
-	if use mysql; then
-		sed -i "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}usr/include/mysql"
-		LOOKUP_LIBS="$LOOKUP_LIBS -lmysqlclient"
-	fi
-
-	if use postgres; then
-		sed -i "s:# LOOKUP_PGSQL=yes:LOOKUP_PGSQL=yes:" Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}usr/include/postgresql"
-		LOOKUP_LIBS="$LOOKUP_LIBS -lpq"
-	fi
-
-	if use sqlite; then
-		sed -i "s:# LOOKUP_SQLITE=yes: LOOKUP_SQLITE=yes:" Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}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:" \
-			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:" \
-			Makefile
-	fi
-
-	sed -i "s:# LOOKUP_DSEARCH=yes:LOOKUP_DSEARCH=yes:" Makefile
-
-	if use dnsdb; then
-		sed -i "s:# LOOKUP_DNSDB=yes:LOOKUP_DNSDB=yes:" Makefile
-	fi
-	sed -i "s:# LOOKUP_CDB=yes:LOOKUP_CDB=yes:" Makefile
-
-	if use nis; then
-		sed -i -e "s:# LOOKUP_NIS=yes:LOOKUP_NIS=yes:" \
-			-e "s:# LOOKUP_NISPLUS=yes:LOOKUP_NISPLUS=yes:" Makefile
-	fi
-	if use syslog; then
-		sed -i "s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Makefile
-	fi
-	if ! use dkim; then
-		# DKIM is enabled by default. We have to explicitly disable it.
-		echo "DISABLE_DKIM=yes">> Makefile
-	fi
-	if use dcc; then
-		echo "EXPERIMENTAL_DCC=yes">> Makefile
-	fi
-	if use dsn; then
-		sed -i -e "s:#define SUPPORT_DSN:define SUPPORT_DSN:" Makefile
-	fi
-
-	# use the "native" interface to the DBM library
-	echo "USE_DB=yes" >> Makefile
-}
-
-src_compile() {
-	emake -j1 CC="$(tc-getCC)" FULLECHO='' || 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 exim /usr/sbin/sendmail
-	dosym exim /usr/sbin/rsmtp
-	dosym exim /usr/sbin/rmail
-	dosym /usr/sbin/exim /usr/bin/mailq
-	dosym /usr/sbin/exim /usr/bin/newaliases
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	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
-	use dsn && dodoc "${S}"/README.DSN
-
-	# 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 "${WORKDIR}"/system_filter.exim
-	doins "${FILESDIR}"/auth_conf.sub
-
-	pamd_mimic system-auth exim auth account
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/exim.logrotate" exim
-
-	newinitd "${FILESDIR}"/exim.rc6 exim
-
-	newconfd "${FILESDIR}"/exim.confd exim
-
-	DIROPTIONS="--mode=0750 --owner=mail --group=mail"
-	dodir /var/log/${PN}
-}
-
-pkg_postinst() {
-	einfo "${EROOT}etc/exim/system_filter.exim is a sample system_filter."
-	einfo "${EROOT}etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
-	einfo "Please create ${EROOT}etc/exim/exim.conf from ${EROOT}etc/exim/exim.conf.dist."
-	if use dcc ; then
-		einfo "DCC support is experimental, you can find some limited"
-		einfo "documentation at the bottom of this prerelease message:"
-		einfo "http://article.gmane.org/gmane.mail.exim.devel/3579"
-	fi
-}
diff --git a/mail-mta/exim/exim-4.77.ebuild b/mail-mta/exim/exim-4.77.ebuild
deleted file mode 100644
index 0a983535750c..000000000000
--- a/mail-mta/exim/exim-4.77.ebuild
+++ /dev/null
@@ -1,344 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.77.ebuild,v 1.14 2012/11/06 11:14:52 eras Exp $
-
-EAPI="3"
-
-inherit eutils toolchain-funcs multilib pam
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl lmtp ipv6 sasl dnsdb perl mbx X nis selinux syslog spf srs gnutls sqlite doc dovecot-sasl radius maildir +dkim dcc dsn"
-
-DSN_EXIM_V=469
-DSN_V=1_3
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P//rc/RC}.tar.bz2
-	mirror://gentoo/system_filter.exim.gz
-	dsn? ( mirror://sourceforge/eximdsn/eximdsn-patch-1.3/exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch )
-	doc? ( ftp://ftp.exim.org/pub/exim/exim4/${PN}-html-${PV//rc/RC}.tar.bz2 )"
-HOMEPAGE="http://www.exim.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-
-DEPEND=">=sys-apps/sed-4.0.5
-	>=sys-libs/db-3.2
-	dev-libs/libpcre
-	perl? ( sys-devel/libperl )
-	pam? ( virtual/pam )
-	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( >=dev-libs/openssl-0.9.6 <dev-libs/openssl-1.0.1 )
-	gnutls? ( net-libs/gnutls
-			  dev-libs/libtasn1 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.14 )
-	selinux? ( sec-policy/selinux-exim )
-	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 )
-	virtual/libiconv
-	"
-	# added X check for #57206
-RDEPEND="${DEPEND}
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/mini-qmail
-	!<mail-mta/msmtp-1.4.19-r1
-	!>=mail-mta/msmtp-1.4.19-r1[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/mailwrapper
-	>=net-mail/mailbase-0.00-r5
-	virtual/logger
-	dcc? ( mail-filter/dcc )
-	"
-
-S=${WORKDIR}/${P//rc/RC}
-
-src_prepare() {
-	epatch "${FILESDIR}"/exim-4.14-tail.patch
-	epatch "${FILESDIR}"/exim-4.74-localscan_dlopen.patch
-	epatch "${FILESDIR}"/exim-4.69-r1.27021.patch
-	epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
-	epatch "${FILESDIR}"/exim-4.77-makefile-freebsd.patch # 235785
-	epatch "${FILESDIR}"/exim-4.77-as-needed-ldflags.patch # 352265, 391279
-	epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
-
-	use maildir && epatch "${FILESDIR}"/exim-4.20-maildir.patch
-
-	if use dsn ; then
-		cp "${DISTDIR}"/exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch . || die
-		epatch "${FILESDIR}"/${PN}-4.76-dsn.patch
-		epatch exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch
-	fi
-}
-
-src_configure() {
-	local myconf
-
-	sed -i "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${EPREFIX}/etc/mail/aliases'" "${S}"/src/configure.default
-	cp "${S}"/src/configure.default "${S}"/src/configure.default.orig
-
-	sed -i -e 's/^buildname=.*/buildname=exim-gentoo/g' Makefile
-
-	sed -e "48i\CFLAGS=${CFLAGS}" \
-		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
-		-e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=${EPREFIX}/etc/exim/exim.conf:" \
-		-e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=${EPREFIX}/usr/share/info:" \
-		-e "s:# LOG_FILE_PATH=/var/log/exim_%slog:LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log:" \
-		-e "s:# PID_FILE_PATH=/var/lock/exim.pid:PID_FILE_PATH=${EPREFIX}/var/run/exim.pid:" \
-		-e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=${EPREFIX}/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:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \
-		-e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \
-		-e "s:# LOOKUP_PASSWD=yes:LOOKUP_PASSWD=yes:" \
-		-e "s:EXIM_MONITOR=eximon.bin:# EXIM_MONITOR=eximon.bin:" \
-		-e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
-		-e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
-		src/EDITME > Local/Makefile
-
-	cd Local
-
-	# exiscan-acl is now integrated - enable it when use-flag set
-	if use exiscan-acl; then
-		sed -i "s:# WITH_CONTENT_SCAN=yes:WITH_CONTENT_SCAN=yes:" Makefile
-		sed -i "s:# WITH_OLD_DEMIME=yes:WITH_OLD_DEMIME=yes:" Makefile
-	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:" Makefile
-		mycflags="${mycflags} -DEXPERIMENTAL_SPF"
-	fi
-	if use srs; then
-		myconf="${myconf} -lsrs_alt"
-		sed -i "s:# EXPERIMENTAL_SRS=yes:EXPERIMENTAL_SRS=yes:" Makefile
-	fi
-
-	# 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
-	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=${EPREFIX}/var/state/saslauthd/mux:CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/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:TRANSPORT_LMTP=yes:" 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=${EPREFIX}/etc/radiusclient/radiusclient.conf:" Makefile
-		sed -i "s:# RADIUS_LIB_TYPE=RADIUSCLIENT$:RADIUS_LIB_TYPE=RADIUSCLIENT:" Makefile
-	fi
-	echo "EXTRALIBS=${myconf}" >> Makefile
-
-	# make iconv usage explicit
-	echo "HAVE_ICONV=yes" >> Makefile
-	# if we use libiconv, now is the time to tell so
-	use !elibc_glibc && echo "EXTRALIBS_EXIM=-liconv" >> Makefile
-
-	if use ssl; then
-		sed -i \
-			-e "s:# \(SUPPORT_TLS=yes\):\1:" Makefile
-		if use gnutls; then
-			sed -i \
-				-e "s:# \(USE_GNUTLS=yes\):\1:" \
-				-e "s:# \(TLS_LIBS=-lgnutls -ltasn1 -lgcrypt\):\1:" Makefile
-		else
-			sed -i \
-				-e "s:# \(TLS_LIBS=-lssl -lcrypto\):\1:" 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:" Makefile
-		LOOKUP_INCLUDE="-I${EROOT}usr/include/ldap"
-		LOOKUP_LIBS="-lldap -llber"
-	fi
-
-	if use mysql; then
-		sed -i "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}usr/include/mysql"
-		LOOKUP_LIBS="$LOOKUP_LIBS -lmysqlclient"
-	fi
-
-	if use postgres; then
-		sed -i "s:# LOOKUP_PGSQL=yes:LOOKUP_PGSQL=yes:" Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}usr/include/postgresql"
-		LOOKUP_LIBS="$LOOKUP_LIBS -lpq"
-	fi
-
-	if use sqlite; then
-		sed -i "s:# LOOKUP_SQLITE=yes: LOOKUP_SQLITE=yes:" Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}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:" \
-			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:" \
-			Makefile
-	fi
-
-	sed -i "s:# LOOKUP_DSEARCH=yes:LOOKUP_DSEARCH=yes:" Makefile
-
-	if use dnsdb; then
-		sed -i "s:# LOOKUP_DNSDB=yes:LOOKUP_DNSDB=yes:" Makefile
-	fi
-	sed -i "s:# LOOKUP_CDB=yes:LOOKUP_CDB=yes:" Makefile
-
-	if use nis; then
-		sed -i -e "s:# LOOKUP_NIS=yes:LOOKUP_NIS=yes:" \
-			-e "s:# LOOKUP_NISPLUS=yes:LOOKUP_NISPLUS=yes:" Makefile
-	fi
-	if use syslog; then
-		sed -i "s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Makefile
-	fi
-	if ! use dkim; then
-		# DKIM is enabled by default. We have to explicitly disable it.
-		echo "DISABLE_DKIM=yes">> Makefile
-	fi
-	if use dcc; then
-		echo "EXPERIMENTAL_DCC=yes">> Makefile
-	fi
-	if use dsn; then
-		sed -i -e "s:#define SUPPORT_DSN:define SUPPORT_DSN:" Makefile
-	fi
-
-	# use the "native" interface to the DBM library
-	echo "USE_DB=yes" >> Makefile
-}
-
-src_compile() {
-	emake -j1 CC="$(tc-getCC)" HOSTCC="$(tc-getCC $CBUILD)" FULLECHO='' \
-		|| 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 exim /usr/sbin/sendmail
-	dosym exim /usr/sbin/rsmtp
-	dosym exim /usr/sbin/rmail
-	dosym /usr/sbin/exim /usr/bin/mailq
-	dosym /usr/sbin/exim /usr/bin/newaliases
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	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
-	use dsn && dodoc "${S}"/README.DSN
-	use doc && dohtml -r "${WORKDIR}"/${PN}-html-${PV//rc/RC}/doc/html/spec_html/*
-
-	# 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 "${WORKDIR}"/system_filter.exim
-	doins "${FILESDIR}"/auth_conf.sub
-
-	pamd_mimic system-auth exim auth account
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/exim.logrotate" exim
-
-	newinitd "${FILESDIR}"/exim.rc7 exim
-
-	newconfd "${FILESDIR}"/exim.confd exim
-
-	DIROPTIONS="--mode=0750 --owner=mail --group=mail"
-	dodir /var/log/${PN}
-}
-
-pkg_postinst() {
-	if [[ ! -f ${EROOT}etc/exim/exim.conf ]] ; then
-		einfo "${EROOT}etc/exim/system_filter.exim is a sample system_filter."
-		einfo "${EROOT}etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
-		einfo "Please create ${EROOT}etc/exim/exim.conf from ${EROOT}etc/exim/exim.conf.dist."
-	fi
-	if use dcc ; then
-		einfo "DCC support is experimental, you can find some limited"
-		einfo "documentation at the bottom of this prerelease message:"
-		einfo "http://article.gmane.org/gmane.mail.exim.devel/3579"
-	fi
-	einfo "Exim maintains some db files under its spool directory that need"
-	einfo "cleaning from time to time.  (${EROOT}var/spool/exim/db)"
-	einfo "Please use the exim_tidydb tool as documented in the Exim manual:"
-	einfo "http://www.exim.org/exim-html-current/doc/html/spec_html/ch50.html#SECThindatmai"
-}
diff --git a/mail-mta/exim/exim-4.80.ebuild b/mail-mta/exim/exim-4.80.ebuild
deleted file mode 100644
index a9620bfe492e..000000000000
--- a/mail-mta/exim/exim-4.80.ebuild
+++ /dev/null
@@ -1,352 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.80.ebuild,v 1.9 2012/11/06 11:14:52 eras Exp $
-
-EAPI="3"
-
-inherit eutils toolchain-funcs multilib pam
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl lmtp ipv6 sasl dnsdb perl mbx X nis selinux syslog spf srs gnutls sqlite doc dovecot-sasl radius maildir +dkim dcc dsn"
-
-DSN_EXIM_V=469
-DSN_V=1_3
-COMM_URI="ftp://ftp.exim.org/pub/exim/exim4$([[ ${PV} == *_rc* ]] && echo /test)"
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="${COMM_URI}/${P//rc/RC}.tar.bz2
-	mirror://gentoo/system_filter.exim.gz
-	dsn? ( mirror://sourceforge/eximdsn/eximdsn-patch-1.3/exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch )
-	doc? ( ${COMM_URI}/${PN}-html-${PV//rc/RC}.tar.bz2 )"
-HOMEPAGE="http://www.exim.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-solaris"
-
-COMMON_DEPEND=">=sys-apps/sed-4.0.5
-	>=sys-libs/db-3.2
-	dev-libs/libpcre
-	perl? ( sys-devel/libperl )
-	pam? ( virtual/pam )
-	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( dev-libs/openssl )
-	gnutls? ( net-libs/gnutls
-			  dev-libs/libtasn1 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.14 )
-	selinux? ( sec-policy/selinux-exim )
-	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 )
-	virtual/libiconv
-	"
-	# added X check for #57206
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/mini-qmail
-	!<mail-mta/msmtp-1.4.19-r1
-	!>=mail-mta/msmtp-1.4.19-r1[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/mailwrapper
-	>=net-mail/mailbase-0.00-r5
-	virtual/logger
-	dcc? ( mail-filter/dcc )
-	"
-
-S=${WORKDIR}/${P//rc/RC}
-
-src_prepare() {
-	epatch "${FILESDIR}"/exim-4.14-tail.patch
-	epatch "${FILESDIR}"/exim-4.74-localscan_dlopen.patch
-	epatch "${FILESDIR}"/exim-4.69-r1.27021.patch
-	epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
-	epatch "${FILESDIR}"/exim-4.77-makefile-freebsd.patch # 235785
-	epatch "${FILESDIR}"/exim-4.77-as-needed-ldflags.patch # 352265, 391279
-	epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
-
-	use maildir && epatch "${FILESDIR}"/exim-4.20-maildir.patch
-
-	if use dsn ; then
-		cp "${DISTDIR}"/exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch . || die
-		epatch "${FILESDIR}"/${PN}-4.76-dsn.patch
-		epatch exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch
-	fi
-
-	# user Exim believes it should be
-	MAILUSER=mail
-	MAILGROUP=mail
-	if use prefix && [[ ${EUID} != 0 ]] ; then
-		MAILUSER=$(id -un)
-		MAILGROUP=$(id -gn)
-	fi
-}
-
-src_configure() {
-	local myconf
-
-	sed -i "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${EPREFIX}/etc/mail/aliases'" "${S}"/src/configure.default
-	cp "${S}"/src/configure.default "${S}"/src/configure.default.orig
-
-	sed -i -e 's/^buildname=.*/buildname=exim-gentoo/g' Makefile
-
-	sed -e "48i\CFLAGS=${CFLAGS}" \
-		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
-		-e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=${EPREFIX}/etc/exim/exim.conf:" \
-		-e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=${EPREFIX}/usr/share/info:" \
-		-e "s:# LOG_FILE_PATH=/var/log/exim_%slog:LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log:" \
-		-e "s:# PID_FILE_PATH=/var/lock/exim.pid:PID_FILE_PATH=${EPREFIX}/var/run/exim.pid:" \
-		-e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=${EPREFIX}/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=${MAILUSER}:" \
-		-e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \
-		-e "s:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \
-		-e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \
-		-e "s:# LOOKUP_PASSWD=yes:LOOKUP_PASSWD=yes:" \
-		-e "s:EXIM_MONITOR=eximon.bin:# EXIM_MONITOR=eximon.bin:" \
-		-e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
-		-e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
-		src/EDITME > Local/Makefile
-
-	cd Local
-
-	# exiscan-acl is now integrated - enable it when use-flag set
-	if use exiscan-acl; then
-		sed -i "s:# WITH_CONTENT_SCAN=yes:WITH_CONTENT_SCAN=yes:" Makefile
-		sed -i "s:# WITH_OLD_DEMIME=yes:WITH_OLD_DEMIME=yes:" Makefile
-	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:" Makefile
-		mycflags="${mycflags} -DEXPERIMENTAL_SPF"
-	fi
-	if use srs; then
-		myconf="${myconf} -lsrs_alt"
-		sed -i "s:# EXPERIMENTAL_SRS=yes:EXPERIMENTAL_SRS=yes:" Makefile
-	fi
-
-	# 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
-	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=${EPREFIX}/var/state/saslauthd/mux:CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/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:TRANSPORT_LMTP=yes:" 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=${EPREFIX}/etc/radiusclient/radiusclient.conf:" Makefile
-		sed -i "s:# RADIUS_LIB_TYPE=RADIUSCLIENT$:RADIUS_LIB_TYPE=RADIUSCLIENT:" Makefile
-	fi
-	echo "EXTRALIBS=${myconf}" >> Makefile
-
-	# make iconv usage explicit
-	echo "HAVE_ICONV=yes" >> Makefile
-	# if we use libiconv, now is the time to tell so
-	use !elibc_glibc && echo "EXTRALIBS_EXIM=-liconv" >> Makefile
-
-	if use ssl; then
-		echo "SUPPORT_TLS=yes" >> Makefile
-		if use gnutls; then
-			echo "USE_GNUTLS=yes" >> Makefile
-			echo "USE_GNUTLS_PC=gnutls" >> Makefile
-		else
-			echo "USE_OPENSSL_PC=openssl" >> 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:" Makefile
-		LOOKUP_INCLUDE="-I${EROOT}usr/include/ldap"
-		LOOKUP_LIBS="-lldap -llber"
-	fi
-
-	if use mysql; then
-		sed -i "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}usr/include/mysql"
-		LOOKUP_LIBS="$LOOKUP_LIBS -lmysqlclient"
-	fi
-
-	if use postgres; then
-		sed -i "s:# LOOKUP_PGSQL=yes:LOOKUP_PGSQL=yes:" Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}usr/include/postgresql"
-		LOOKUP_LIBS="$LOOKUP_LIBS -lpq"
-	fi
-
-	if use sqlite; then
-		echo "LOOKUP_SQLITE=yes" >> Makefile
-		echo "LOOKUP_SQLITE_PC=sqlite3" >> Makefile
-	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:" \
-			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:" \
-			Makefile
-	fi
-
-	sed -i "s:# LOOKUP_DSEARCH=yes:LOOKUP_DSEARCH=yes:" Makefile
-
-	if use dnsdb; then
-		sed -i "s:# LOOKUP_DNSDB=yes:LOOKUP_DNSDB=yes:" Makefile
-	fi
-	sed -i "s:# LOOKUP_CDB=yes:LOOKUP_CDB=yes:" Makefile
-
-	if use nis; then
-		sed -i -e "s:# LOOKUP_NIS=yes:LOOKUP_NIS=yes:" \
-			-e "s:# LOOKUP_NISPLUS=yes:LOOKUP_NISPLUS=yes:" Makefile
-	fi
-	if use syslog; then
-		sed -i "s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Makefile
-	fi
-	if ! use dkim; then
-		# DKIM is enabled by default. We have to explicitly disable it.
-		echo "DISABLE_DKIM=yes">> Makefile
-	fi
-	if use dcc; then
-		echo "EXPERIMENTAL_DCC=yes">> Makefile
-	fi
-	if use dsn; then
-		sed -i -e "s:#define SUPPORT_DSN:define SUPPORT_DSN:" Makefile
-	fi
-
-	# use the "native" interface to the DBM library
-	echo "USE_DB=yes" >> Makefile
-	echo "DBMLIB=-ldb" >> Makefile
-}
-
-src_compile() {
-	emake -j1 CC="$(tc-getCC)" HOSTCC="$(tc-getCC $CBUILD)" FULLECHO='' \
-		|| 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 exim /usr/sbin/sendmail
-	dosym exim /usr/sbin/rsmtp
-	dosym exim /usr/sbin/rmail
-	dosym /usr/sbin/exim /usr/bin/mailq
-	dosym /usr/sbin/exim /usr/bin/newaliases
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	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
-	use dsn && dodoc "${S}"/README.DSN
-	use doc && dohtml -r "${WORKDIR}"/${PN}-html-${PV//rc/RC}/doc/html/spec_html/*
-
-	# 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 "${WORKDIR}"/system_filter.exim
-	doins "${FILESDIR}"/auth_conf.sub
-
-	pamd_mimic system-auth exim auth account
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/exim.logrotate" exim
-
-	newinitd "${FILESDIR}"/exim.rc7 exim
-
-	newconfd "${FILESDIR}"/exim.confd exim
-
-	DIROPTIONS="--mode=0750 --owner=${MAILUSER} --group=${MAILGROUP}"
-	dodir /var/log/${PN}
-}
-
-pkg_postinst() {
-	if [[ ! -f ${EROOT}etc/exim/exim.conf ]] ; then
-		einfo "${EROOT}etc/exim/system_filter.exim is a sample system_filter."
-		einfo "${EROOT}etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
-		einfo "Please create ${EROOT}etc/exim/exim.conf from ${EROOT}etc/exim/exim.conf.dist."
-	fi
-	if use dcc ; then
-		einfo "DCC support is experimental, you can find some limited"
-		einfo "documentation at the bottom of this prerelease message:"
-		einfo "http://article.gmane.org/gmane.mail.exim.devel/3579"
-	fi
-	einfo "Exim maintains some db files under its spool directory that need"
-	einfo "cleaning from time to time.  (${EROOT}var/spool/exim/db)"
-	einfo "Please use the exim_tidydb tool as documented in the Exim manual:"
-	einfo "http://www.exim.org/exim-html-current/doc/html/spec_html/ch50.html#SECThindatmai"
-}
diff --git a/mail-mta/exim/files/exim-4.75-makefile-freebsd.patch b/mail-mta/exim/files/exim-4.75-makefile-freebsd.patch
deleted file mode 100644
index 3096e4c92000..000000000000
--- a/mail-mta/exim/files/exim-4.75-makefile-freebsd.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- OS/Makefile-FreeBSD
-+++ OS/Makefile-FreeBSD
-@@ -1,14 +1,12 @@
- # $Cambridge: exim/src/OS/Makefile-FreeBSD,v 1.6 2009/11/19 18:58:44 nm4 Exp $
- 
--# Exim: OS-specific make file for FreeBSD
--# There's no setting of CFLAGS here, to allow the system default
--# for "make" to be the default.
--
--PORTOBJFORMAT!= test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
--
--CHOWN_COMMAND=/usr/sbin/chown
--STRIP_COMMAND=/usr/bin/strip
--CHMOD_COMMAND=/bin/chmod
-+# Exim: OS-specific FreeBSD make file, modified for Gentoo Prefix
-+
-+
-+BASENAME_COMMAND=look_for_it
-+CHOWN_COMMAND=look_for_it
-+CHGRP_COMMAND=look_for_it
-+CHMOD_COMMAND=look_for_it
- 
- HAVE_SA_LEN=YES
- 
-@@ -18,23 +16,12 @@
- # Dynamicly loaded modules need to be built with -fPIC
- CFLAGS_DYNAMIC=-shared -rdynamic -fPIC
- 
--# FreeBSD always ships with Berkeley DB
-+DBMLIB = -ldb
- USE_DB=yes
- 
--# This code for building outside ports suggested by Richard Clayton
--.ifdef   X11BASE
--X11=${X11BASE}
--.elifdef LOCALBASE
--X11=$(LOCALBASE)
--.else
--X11=/usr/local
--.endif
--
-+X11=/usr/X11R6
- XINCLUDE=-I$(X11)/include
- XLFLAGS=-L$(X11)/lib
--.if ${PORTOBJFORMAT} == "elf"
--XLFLAGS+=-Wl,-rpath,${X11}/lib
--.endif
- X11_LD_LIB=$(X11)/lib
- 
- EXIWHAT_PS_ARG=-ax
diff --git a/mail-mta/exim/files/exim-4.76-as-needed.patch b/mail-mta/exim/files/exim-4.76-as-needed.patch
deleted file mode 100644
index ba66d83ee518..000000000000
--- a/mail-mta/exim/files/exim-4.76-as-needed.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=352265
-
-Make sure LDFLAGS comes first, such that all libraries are considered,
-and not discarded when --as-needed is in effect.
-
---- OS/Makefile-Base
-+++ OS/Makefile-Base
-@@ -327,12 +327,12 @@
- 	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE) version.c
- 	rm -f exim
- 	@echo "$(LNCC) -o exim"
--	$(FE)$(PURIFY) $(LNCC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \
-+	$(FE)$(PURIFY) $(LNCC) -o exim $(LDFLAGS) $(OBJ_EXIM) version.o \
- 	  routers/routers.a transports/transports.a lookups/lookups.a \
- 	  auths/auths.a pdkim/pdkim.a \
- 	  $(LIBRESOLV) $(LIBS) $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) \
- 	  $(EXTRALIBS_EXIM) $(DBMLIB) $(LOOKUP_LIBS) $(AUTH_LIBS) \
--	  $(PERL_LIBS) $(TLS_LIBS) $(PCRE_LIBS) $(LDFLAGS)
-+	  $(PERL_LIBS) $(TLS_LIBS) $(PCRE_LIBS) $(LFLAGS)
- 	@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
- 	  echo $(STRIP_COMMAND) exim; \
- 	  $(STRIP_COMMAND) exim; \
diff --git a/mail-mta/exim/files/exim.rc6 b/mail-mta/exim/files/exim.rc6
deleted file mode 100644
index 585d16b1f363..000000000000
--- a/mail-mta/exim/files/exim.rc6
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 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.9 2011/12/04 10:03:10 swegener Exp $
-
-extra_started_commands="reload"
-
-depend() {
-	need logger
-	use antivirus net
-	provide mta
-}
-
-start() {
-	ebegin "Starting exim"
-	start-stop-daemon --start --quiet --exec /usr/sbin/exim --pidfile /var/run/exim.pid -- ${EXIM_OPTS:--bd -q15m}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping exim"
-	start-stop-daemon --stop --quiet --pidfile /var/run/exim.pid --name exim
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading exim"
-	start-stop-daemon --signal HUP --pidfile /var/run/exim.pid --name exim
-	eend $?
-}