commit:     62a850cc4c30b096ca965f64dc9b21a8fcf8b53b
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  8 11:28:24 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jul  8 11:28:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62a850cc

mail-mta/exim: cleanup

Package-Manager: portage-2.2.28

 mail-mta/exim/Manifest                             |   8 -
 mail-mta/exim/exim-4.84.2.ebuild                   | 508 --------------------
 mail-mta/exim/exim-4.84.ebuild                     | 508 --------------------
 mail-mta/exim/exim-4.85.2.ebuild                   | 508 --------------------
 mail-mta/exim/exim-4.86.2.ebuild                   | 525 ---------------------
 mail-mta/exim/files/exim-4.86-TMPDIR.patch         |  71 ---
 mail-mta/exim/files/exim-4.86-radius-include.patch |  15 -
 .../exim/files/exim-4.86-radius-type-fix.patch     |  25 -
 mail-mta/exim/files/exim-4.86.2-TMPDIR.patch       |  68 ---
 mail-mta/exim/files/exim.rc8                       |  30 --
 10 files changed, 2266 deletions(-)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 7f78b6b..c702b5e 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,15 +1,7 @@
-DIST exim-4.84.2.tar.bz2 1745970 SHA256 
eb082aedf9349a29e25120e53f9e67a7ca6c4a6dad579c1425da1e131599bf52 SHA512 
04f0f4631d5eb81d7732f4e210fdda87e34adb497f1af744868fab0fe1dc64845b0d1228b34660e0123436a78d0ecf62a6d18702a0ba4f2c1a1c1398b8ac4aaf
 WHIRLPOOL 
34054528aa0a1724001942474ad23385221a42def71bb7460574052f06fe93bead0af04ba5cbdd463fddcb85d855c5441ed3b72a1a97f862a4bf9534267f4434
-DIST exim-4.84.tar.bz2 1761790 SHA256 
78ea22be87fb6df880e7fd482f3bec9ef6ceca0c9dedd50f8a26cae0b38b9e9c SHA512 
3cd41af6d57e5f0377fc93367753eae6cb6bf835803e8608c44e1da5acefce1ed8886f4fe7536950de072bfed6e927afe1536c1e6466cf3121dd352b69a68039
 WHIRLPOOL 
9e840aa6afa0db68455b4ab458706eedd7ea57b084999c9e85eaaec0530ed93958731d934ff1d7830d9b5cd086e36cb56dc8a2f78dad85bdba9ae6573510e840
-DIST exim-4.85.2.tar.bz2 1773050 SHA256 
b0dcdb8832e77716396a6ca8a7523263af518d23910d818ba9a492fe93bef618 SHA512 
17398ac730cc355ea063d68f9396e1f9238d2c9cc90939dd0ed3a003aa995e79190f6a206f1b338c95f300a43c97481b0b24d34bcded7b281b521f9dbb41fc6d
 WHIRLPOOL 
faa21b50b76e7d5ffe94d4bbf3616492108a0ab3702c16d1e0e6fe62d6ecc351d5df62d99f0c97aa32d8e20c1af96a3ed57207a026f8830f0df149edf508a33d
 DIST exim-4.85.tar.bz2 1784150 SHA256 
13211f2bbc5400d095a9b4be075eb1347e0d98676fdfe4be8a3b4d56281daaa4 SHA512 
2c5846528ee98e4aff5dbabe49dfa5ba6753fa64154b9671a7849db8a17773917fe13bcb9e5f732c43d7479debfadd8012b8650823eb12504a6b1b28be456161
 WHIRLPOOL 
4057cd745f12ff62e956838406544060d3d2d7383027959f3c1ca12eff43bddb9be63e284767245b271e53bef92596c1241f5e90e9ed611d02e95b7a30adc7c8
-DIST exim-4.86.2.tar.bz2 1799316 SHA256 
7756deafd0583776e091f2efcba9b36203e668cf420d8876f314980803636eb3 SHA512 
5869a7ae8fd66819f654f6617c7e77075a24b110074317b77135b8cc86f12632e79758d41819c6e91871e0145adaba4b91651f5c6c1d2ebd17927f0198876231
 WHIRLPOOL 
81e284bf6d1be9597e858468834ce8ff60f2783b75fea85a020df20a15a088339c4b2ccc6199c83672fcb37c05d4ca7957e70a2f2827292454266e7f9bcab87f
 DIST exim-4.86.tar.bz2 1804807 SHA256 
f1ccf2ce2ea51b7fbbf160e7e0e41d24ca401cf44a185128ad99ea04635fc456 SHA512 
0b90cd1b4d99bbb976336ccf9c2c3375f453a74bb306f1b0215f7ecca80fbda83cf5cc38c502516c2903c5d753f1f559c534fc4f4b1b32ee3300db86de6610ab
 WHIRLPOOL 
a7e938cfaeb92af1b81c8a113752914b61e49d7fd71c39460b944716725b1e98b50a7c9ef1699569cd031ee7cac210639d9ef9bd21280e5ce7682eb40db91726
 DIST exim-4.87.tar.bz2 1801422 SHA256 
74691e0dff4d1b5d387e9c33c86f96a8f6d2adbc781c0dec9d2061a847b07dc9 SHA512 
2b0d5c82133315c444e29abd182e0866482c904db1abe5ffe9a3008c2174f52eca850a433c069b4102874dc32bbe4af112beac94ffa154f1c06615c24deb47a4
 WHIRLPOOL 
3aede6629fbf41a71f6907e636458165258b523a3080d0b59ba6b295c1a258d8ce205a3295d4c49c2e6e88ef597b64895684fd47a3f5c3fba360d8e56be5f7f9
-DIST exim-html-4.84.2.tar.bz2 459553 SHA256 
407165354936515c28d6f206cf20bb3c3c7f55e70e66c551154e8e9dd554955d SHA512 
17b1151f90eec13334ac27f9f8430276bf1a7b4c9c6e41c76afb52e18fe107ab421194881876221acef6386a7bd8c6a5372fec6217f88e3dd4bcaef8809aa178
 WHIRLPOOL 
df3960dfbb631b9b82d60edda27910e58936e17edc6782cd63bf70bf826bce8dbe76d7add6444045334eb6230167f5f76984274d9ba3a6c6b50009412c6e6e8b
-DIST exim-html-4.84.tar.bz2 465281 SHA256 
7ee7e9015b853915604b7806be93d56e9ba1fb915b63f0d6828c47f2228fd45b SHA512 
7de8513476b6abcdfd36b0121a2a9d6decf1ccf94ef51b8363e544066cc05670e6f2b4d03d5fbc49071b1431183dfd9badde5cbcc65f51d55ec6b25ebcb070b9
 WHIRLPOOL 
88c376fd399e17b2bc06d2d0fad19f8c6485807118a81e0c200f6c39defe7155fa920489481a8b82e629951766ce0222b85956f387d22d22549303bd3dff7f82
-DIST exim-html-4.85.2.tar.bz2 461392 SHA256 
b84e19f53b4077efbb94e232c8ce6557d133e0275a1d0ec32f2677068ad33dfa SHA512 
e6f8531cbf0edc50db43d74b1e671ea51a2eaac7c06c8551f0229bc3a7882c725c8025a95d8a728aeb4ab3feddf6d2e1e5b7191869ac02cdfcb428e986a86422
 WHIRLPOOL 
8fe3a6575300ce660770b1357cef1158ef1171bcd79d7a4d7170a4867a4f7d5fd5e33d3be8a48ddfc875860d209b0771cd1c49173a9b821b3c1d70b48ea1583c
 DIST exim-html-4.85.tar.bz2 467069 SHA256 
fd91946369626e74842a0799b93d0d9e4a201fe640af84e1b5349fe6ff204167 SHA512 
8214576300827f79c0880e2d2163f71d7f1b3fe2aff714b591a011e48816965de5a773c3509137b085fec3d4d2128931f8398768c24dad6c92b7df27cbcafe74
 WHIRLPOOL 
a7edffd7124c4920708616d3e59c0db5159dee5f7e4fd62ce29fdba769d39781a3826d4e3e39cdc97669941bb9a5c977defe280feb73cbe159b23df4cb6fe95f
-DIST exim-html-4.86.2.tar.bz2 466139 SHA256 
1c97a6efd0a7aaf4b9960ce70fed4df37725f676397ce744efea1503ec1f5914 SHA512 
593df23914939f8fa76c15a2ab7fc197efa05fcbb984179c9dc2c7d535fe2bef1394c07bc8449f2219f54615ff2f4ee13b76409d89b846dc71e54880681c913e
 WHIRLPOOL 
e6bbcf9bc20e2231542d20f40c656b30ce1f2e6fff5005f594191c5e325d0c5fbd45543b680151773fc14cbee253f417e7cea4e514d4e677486a6d334a36a3a7
 DIST exim-html-4.86.tar.bz2 471159 SHA256 
02226a9fbb6d5aaa9d35f3e2a3bd9077e2307463de6baf6e3e2e938c1fe39146 SHA512 
0c15fbccaf9b744fb8b7990d2b2bd0555a04ef5ed82ffbf2e32372a539bae6d7cebad96960f5570a2f8f27d31ebdf2467c51cb053b059996bb9122bc02fa741b
 WHIRLPOOL 
d9fbaa73491ab1657afb6ba59da5adea26144b58b358aeb9829731d3f35d6c1d8c7021c5243cb989e7c704cc346cde2a330f9eedc5b357326c1d56d7caa4a6c5
 DIST exim-html-4.87.tar.bz2 478953 SHA256 
8f87876d4a392f59d1009ba64ac461862951a3f4eed9c0b14a49be7bcbdc1f12 SHA512 
224884abfd7ab9a2410dbdd24bb65545faf427f1b83a942c6c72309e7d85771f78bf7dc5ec1439de95e1038959cdfc4ab549abb98852c8b17c8310b51ad0385c
 WHIRLPOOL 
0444f0b8d8f2e6fab66e9ec7b169eb1d175247e31c323f0a2817b60e2ce6b75057c8d38477697472b009f73fd4b285595b8ca09bac845763767e8146d6c87491
 DIST system_filter.exim.gz 3075 SHA256 
3a3471b486a09e0a0153f7b520e1eaf26d21b97d73ea8348bdc593c00eb1e437 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
 WHIRLPOOL 
ce68d9c18b24eca3ef97ea810964cc1ada5f85b795a7c432ad39b5788188a16419101c92fb52b418738d760e1d658f7a41485e5561079a667d84d276c71be5a4

diff --git a/mail-mta/exim/exim-4.84.2.ebuild b/mail-mta/exim/exim-4.84.2.ebuild
deleted file mode 100644
index 4479c70..0000000
--- a/mail-mta/exim/exim-4.84.2.ebuild
+++ /dev/null
@@ -1,508 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils toolchain-funcs multilib pam systemd
-
-IUSE="dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls 
ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy 
radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X"
-REQUIRED_USE="spf? ( exiscan-acl ) srs? ( exiscan-acl ) dmarc? ( spf dkim ) 
pkcs11? ( gnutls )"
-
-COMM_URI="ftp://ftp.exim.org/pub/exim/exim4/old";
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="${COMM_URI}/${P//rc/RC}.tar.bz2
-       mirror://gentoo/system_filter.exim.gz
-       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-fbsd 
~x86-solaris"
-
-COMMON_DEPEND=">=sys-apps/sed-4.0.5
-       >=sys-libs/db-3.2:=
-       dev-libs/libpcre
-       perl? ( dev-lang/perl:= )
-       pam? ( virtual/pam )
-       tcpd? ( sys-apps/tcp-wrappers )
-       ssl? ( dev-libs/openssl:= )
-       gnutls? ( net-libs/gnutls[pkcs11?]
-                         dev-libs/libtasn1 )
-       ldap? ( >=net-nds/openldap-2.0.7 )
-       mysql? ( virtual/mysql )
-       postgres? ( dev-db/postgresql:= )
-       sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
-       redis? ( dev-libs/hiredis )
-       spf? ( >=mail-filter/libspf2-1.2.5-r1 )
-       dmarc? ( mail-filter/opendmarc )
-       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/opensmtpd
-       !<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 )
-       selinux? ( sec-policy/selinux-exim )
-       "
-
-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.82-makefile-freebsd.patch # 235785
-       epatch "${FILESDIR}"/exim-4.77-as-needed-ldflags.patch # 352265, 391279
-       epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
-
-       if use maildir ; then
-               epatch "${FILESDIR}"/exim-4.20-maildir.patch
-       else
-               epatch "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
-       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() {
-       # general config and paths
-
-       sed -i.orig \
-               -e 
"/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${EPREFIX}/etc/mail/aliases'" \
-               "${S}"/src/configure.default || die
-
-       sed -i -e 's/^buildname=.*/buildname=exim-gentoo/g' Makefile || die
-
-       sed -e "48i\CFLAGS=${CFLAGS}" \
-               -e 
"s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
-               -e "s:EXIM_USER=:EXIM_USER=${MAILUSER}:" \
-               -e 
"s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=${EPREFIX}/etc/exim/exim.conf:"
 \
-               -e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
-               -e 
"s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
-               src/EDITME > Local/Makefile
-
-       cd Local
-
-       cat >> Makefile <<- EOC
-               INFO_DIRECTORY=${EPREFIX}/usr/share/info
-               PID_FILE_PATH=${EPREFIX}/run/exim.pid
-               SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim
-               HAVE_ICONV=yes
-       EOC
-
-       # if we use libiconv, now is the time to tell so
-       use !elibc_glibc && echo "EXTRALIBS_EXIM=-liconv" >> Makefile
-
-       # support for IPv6
-       if use ipv6; then
-               cat >> Makefile <<- EOC
-                       HAVE_IPV6=YES
-               EOC
-       fi
-
-       #
-       # mail storage formats
-
-       # mailstore is Exim's traditional storage format
-       cat >> Makefile <<- EOC
-               SUPPORT_MAILSTORE=yes
-       EOC
-
-       # mbox
-       if use mbx; then
-               cat >> Makefile <<- EOC
-                       SUPPORT_MBX=yes
-               EOC
-       fi
-
-       # maildir
-       if use maildir; then
-               cat >> Makefile <<- EOC
-                       SUPPORT_MAILDIR=yes
-               EOC
-       fi
-
-       #
-       # lookup methods
-
-       # use the "native" interfaces to the DBM and CDB libraries, support
-       # passwd and directory lookups by default
-       cat >> Makefile <<- EOC
-               USE_DB=yes
-               DBMLIB=-ldb
-               LOOKUP_CDB=yes
-               LOOKUP_PASSWD=yes
-               LOOKUP_DSEARCH=yes
-       EOC
-
-       if ! use dnsdb; then
-               # DNSDB lookup is enabled by default
-               sed -i "s:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:" Makefile
-       fi
-
-       if use ldap; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_LDAP=yes
-                       LDAP_LIB_TYPE=OPENLDAP2
-                       LOOKUP_INCLUDE += -I"${EROOT}"usr/include/ldap
-                       LOOKUP_LIBS += -lldap -llber
-               EOC
-       fi
-
-       if use mysql; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_MYSQL=yes
-                       LOOKUP_INCLUDE += $(mysql_config --include)
-                       LOOKUP_LIBS += $(mysql_config --libs)
-               EOC
-       fi
-
-       if use nis; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_NIS=yes
-                       LOOKUP_NISPLUS=yes
-               EOC
-       fi
-
-       if use postgres; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_PGSQL=yes
-                       LOOKUP_INCLUDE += -I$(pg_config --includedir)
-                       LOOKUP_LIBS += -L$(pg_config --libdir) -lpq
-               EOC
-       fi
-
-       if use sqlite; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_SQLITE=yes
-                       LOOKUP_SQLITE_PC=sqlite3
-               EOC
-       fi
-
-       if use redis; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_REDIS=yes
-                       LOOKUP_LIBS += -lhiredis
-               EOC
-       fi
-
-       #
-       # Exim monitor, enabled by default, controlled via X USE-flag,
-       # disable if not requested, bug #46778
-       if use X; then
-               cp ../exim_monitor/EDITME eximon.conf || die
-       else
-               sed -i -e '/^EXIM_MONITOR=/s/^/# /' Makefile
-       fi
-
-       #
-       # features
-
-       # content scanning support
-       if use exiscan-acl; then
-               cat >> Makefile <<- EOC
-                       WITH_CONTENT_SCAN=yes
-                       WITH_OLD_DEMIME=yes
-               EOC
-       fi
-
-       # DomainKeys Identified Mail, RFC4871
-       if ! use dkim; then
-               # DKIM is enabled by default
-               cat >> Makefile <<- EOC
-                       DISABLE_DKIM=yes
-               EOC
-       fi
-
-       # Per-Recipient-Data-Response
-       if ! use prdr; then
-               # PRDR is enabled by default
-               cat >> Makefile <<- EOC
-                       DISABLE_PRDR=yes
-               EOC
-       fi
-
-       # log to syslog
-       if use syslog; then
-               sed -i 
"s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Makefile
-               cat >> Makefile <<- EOC
-                       LOG_FILE_PATH=syslog
-               EOC
-       else
-               cat >> Makefile <<- EOC
-                       LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log
-               EOC
-       fi
-
-       # starttls support (ssl)
-       if use ssl; then
-               echo "SUPPORT_TLS=yes" >> Makefile
-               if use gnutls; then
-                       echo "USE_GNUTLS=yes" >> Makefile
-                       echo "USE_GNUTLS_PC=gnutls" >> Makefile
-                       use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile
-               else
-                       echo "USE_OPENSSL_PC=openssl" >> Makefile
-               fi
-       fi
-
-       # TCP wrappers
-       if use tcpd; then
-               cat >> Makefile <<- EOC
-                       USE_TCP_WRAPPERS=yes
-                       EXTRALIBS_EXIM += -lwrap
-               EOC
-       fi
-
-       # Light Mail Transport Protocol
-       if use lmtp; then
-               cat >> Makefile <<- EOC
-                       TRANSPORT_LMTP=yes
-               EOC
-       fi
-
-       # embedded Perl
-       if use perl; then
-               cat >> Makefile <<- EOC
-                       EXIM_PERL=perl.o
-               EOC
-       fi
-
-       # dlfunc
-       if use dlfunc; then
-               cat >> Makefile <<- EOC
-                       EXPAND_DLFUNC=yes
-               EOC
-       fi
-
-       #
-       # experimental features
-
-       # Distributed Checksum Clearinghouse
-       if use dcc; then
-               echo "EXPERIMENTAL_DCC=yes">> Makefile
-       fi
-
-       # Sender Policy Framework
-       if use spf; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_SPF=yes
-                       EXTRALIBS_EXIM += -lspf2
-               EOC
-       fi
-
-       # Sender Rewriting Scheme
-       if use srs; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_SRS=yes
-                       EXTRALIBS_EXIM += -lsrs_alt
-               EOC
-       fi
-
-       # DMARC
-       if use dmarc; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_DMARC=yes
-                       EXTRALIBS_EXIM += -lopendmarc
-               EOC
-       fi
-
-       # Transport post-delivery actions
-       if use tpda; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_TPDA=yes
-               EOC
-       fi
-
-       # Proxy Protocol
-       if use proxy; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_PROXY=yes
-               EOC
-       fi
-
-       # Delivery Sender Notifications
-       if use dsn; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_DSN=yes
-               EOC
-       fi
-
-       #
-       # authentication (SMTP AUTH)
-
-       # standard bits
-       cat >> Makefile <<- EOC
-               AUTH_SPA=yes
-               AUTH_CRAM_MD5=yes
-               AUTH_PLAINTEXT=yes
-       EOC
-
-       # Cyrus SASL
-       if use sasl; then
-               cat >> Makefile <<- EOC
-                       CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux
-                       AUTH_CYRUS_SASL=yes
-                       AUTH_LIBS += -lsasl2
-               EOC
-       fi
-
-       # Dovecot
-       if use dovecot-sasl; then
-               cat >> Makefile <<- EOC
-                       AUTH_DOVECOT=yes
-               EOC
-       fi
-
-       # Pluggable Authentication Modules
-       if use pam; then
-               cat >> Makefile <<- EOC
-                       SUPPORT_PAM=yes
-                       AUTH_LIBS += -lpam
-               EOC
-       fi
-
-       # Radius
-       if use radius; then
-               cat >> Makefile <<- EOC
-                       
RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
-                       RADIUS_LIB_TYPE=RADIUSCLIENT
-                       AUTH_LIBS += -lradiusclient
-               EOC
-       fi
-}
-
-src_compile() {
-       emake -j1 CC="$(tc-getCC)" HOSTCC="$(tc-getCC $CBUILD)" \
-               AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' \
-               || die "make failed"
-}
-
-src_install () {
-       cd "${S}"/build-exim-gentoo || die
-       dosbin exim
-       if use X; then
-               dosbin eximon.bin
-               dosbin eximon
-       fi
-       fperms 4755 /usr/sbin/exim
-
-       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
-
-       for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
-               exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep 
\
-               convert4r3 convert4r4 exipick
-       do
-               dosbin $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 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
-
-       # headers, #436406
-       if use dlfunc ; then
-               # fixup includes so they actually can be found when including
-               sed -i \
-                       -e '/#include 
"\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \
-                       local_scan.h || die
-               insinto /usr/include/exim
-               doins {config,local_scan}.h ../src/{mytypes,store}.h
-       fi
-
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}/exim.logrotate" exim
-
-       newinitd "${FILESDIR}"/exim.rc8 exim
-       newconfd "${FILESDIR}"/exim.confd exim
-
-       systemd_dounit 
"${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
-       systemd_newunit "${FILESDIR}"/exim_at.service '[email protected]'
-       systemd_newunit "${FILESDIR}"/exim-submission_at.service 
'[email protected]'
-
-       diropts -m 0750 -o ${MAILUSER} -g ${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
-       use spf && einfo "SPF support is experimental"
-       use srs && einfo "SRS support is experimental"
-       if use dmarc ; then
-               einfo "DMARC support is experimental.  See global settings to"
-               einfo "configure DMARC, for usage see the documentation at "
-               einfo "experimental-spec.txt."
-       fi
-       use tpda && einfo "TPDA support is experimental"
-       use proxy && einfo "proxy support is experimental"
-       if use dsn ; then
-               einfo "Starting from Exim 4.83, DSN support comes from 
upstream."
-               einfo "DSN support is an experimental feature.  If you used DSN"
-               einfo "support prior to 4.83, make sure to remove all 
dsn_process"
-               einfo "switches from your routers, see 
https://bugs.gentoo.org/511818";
-       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/ch-exim_utilities.html#SECThindatmai";
-}

diff --git a/mail-mta/exim/exim-4.84.ebuild b/mail-mta/exim/exim-4.84.ebuild
deleted file mode 100644
index a09c05c..0000000
--- a/mail-mta/exim/exim-4.84.ebuild
+++ /dev/null
@@ -1,508 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils toolchain-funcs multilib pam systemd
-
-IUSE="dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls 
ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy 
radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X"
-REQUIRED_USE="spf? ( exiscan-acl ) srs? ( exiscan-acl ) dmarc? ( spf dkim ) 
pkcs11? ( gnutls )"
-
-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
-       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-fbsd ~x86-solaris"
-
-COMMON_DEPEND=">=sys-apps/sed-4.0.5
-       >=sys-libs/db-3.2:=
-       dev-libs/libpcre
-       perl? ( dev-lang/perl:= )
-       pam? ( virtual/pam )
-       tcpd? ( sys-apps/tcp-wrappers )
-       ssl? ( dev-libs/openssl:= )
-       gnutls? ( net-libs/gnutls[pkcs11?]
-                         dev-libs/libtasn1 )
-       ldap? ( >=net-nds/openldap-2.0.7 )
-       mysql? ( virtual/mysql )
-       postgres? ( dev-db/postgresql:= )
-       sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
-       redis? ( dev-libs/hiredis )
-       spf? ( >=mail-filter/libspf2-1.2.5-r1 )
-       dmarc? ( mail-filter/opendmarc )
-       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/opensmtpd
-       !<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 )
-       selinux? ( sec-policy/selinux-exim )
-       "
-
-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.82-makefile-freebsd.patch # 235785
-       epatch "${FILESDIR}"/exim-4.77-as-needed-ldflags.patch # 352265, 391279
-       epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
-
-       if use maildir ; then
-               epatch "${FILESDIR}"/exim-4.20-maildir.patch
-       else
-               epatch "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
-       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() {
-       # general config and paths
-
-       sed -i.orig \
-               -e 
"/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${EPREFIX}/etc/mail/aliases'" \
-               "${S}"/src/configure.default || die
-
-       sed -i -e 's/^buildname=.*/buildname=exim-gentoo/g' Makefile || die
-
-       sed -e "48i\CFLAGS=${CFLAGS}" \
-               -e 
"s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
-               -e "s:EXIM_USER=:EXIM_USER=${MAILUSER}:" \
-               -e 
"s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=${EPREFIX}/etc/exim/exim.conf:"
 \
-               -e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
-               -e 
"s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
-               src/EDITME > Local/Makefile
-
-       cd Local
-
-       cat >> Makefile <<- EOC
-               INFO_DIRECTORY=${EPREFIX}/usr/share/info
-               PID_FILE_PATH=${EPREFIX}/run/exim.pid
-               SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim
-               HAVE_ICONV=yes
-       EOC
-
-       # if we use libiconv, now is the time to tell so
-       use !elibc_glibc && echo "EXTRALIBS_EXIM=-liconv" >> Makefile
-
-       # support for IPv6
-       if use ipv6; then
-               cat >> Makefile <<- EOC
-                       HAVE_IPV6=YES
-               EOC
-       fi
-
-       #
-       # mail storage formats
-
-       # mailstore is Exim's traditional storage format
-       cat >> Makefile <<- EOC
-               SUPPORT_MAILSTORE=yes
-       EOC
-
-       # mbox
-       if use mbx; then
-               cat >> Makefile <<- EOC
-                       SUPPORT_MBX=yes
-               EOC
-       fi
-
-       # maildir
-       if use maildir; then
-               cat >> Makefile <<- EOC
-                       SUPPORT_MAILDIR=yes
-               EOC
-       fi
-
-       #
-       # lookup methods
-
-       # use the "native" interfaces to the DBM and CDB libraries, support
-       # passwd and directory lookups by default
-       cat >> Makefile <<- EOC
-               USE_DB=yes
-               DBMLIB=-ldb
-               LOOKUP_CDB=yes
-               LOOKUP_PASSWD=yes
-               LOOKUP_DSEARCH=yes
-       EOC
-
-       if ! use dnsdb; then
-               # DNSDB lookup is enabled by default
-               sed -i "s:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:" Makefile
-       fi
-
-       if use ldap; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_LDAP=yes
-                       LDAP_LIB_TYPE=OPENLDAP2
-                       LOOKUP_INCLUDE += -I"${EROOT}"usr/include/ldap
-                       LOOKUP_LIBS += -lldap -llber
-               EOC
-       fi
-
-       if use mysql; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_MYSQL=yes
-                       LOOKUP_INCLUDE += $(mysql_config --include)
-                       LOOKUP_LIBS += $(mysql_config --libs)
-               EOC
-       fi
-
-       if use nis; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_NIS=yes
-                       LOOKUP_NISPLUS=yes
-               EOC
-       fi
-
-       if use postgres; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_PGSQL=yes
-                       LOOKUP_INCLUDE += -I$(pg_config --includedir)
-                       LOOKUP_LIBS += -L$(pg_config --libdir) -lpq
-               EOC
-       fi
-
-       if use sqlite; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_SQLITE=yes
-                       LOOKUP_SQLITE_PC=sqlite3
-               EOC
-       fi
-
-       if use redis; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_REDIS=yes
-                       LOOKUP_LIBS += -lhiredis
-               EOC
-       fi
-
-       #
-       # Exim monitor, enabled by default, controlled via X USE-flag,
-       # disable if not requested, bug #46778
-       if use X; then
-               cp ../exim_monitor/EDITME eximon.conf || die
-       else
-               sed -i -e '/^EXIM_MONITOR=/s/^/# /' Makefile
-       fi
-
-       #
-       # features
-
-       # content scanning support
-       if use exiscan-acl; then
-               cat >> Makefile <<- EOC
-                       WITH_CONTENT_SCAN=yes
-                       WITH_OLD_DEMIME=yes
-               EOC
-       fi
-
-       # DomainKeys Identified Mail, RFC4871
-       if ! use dkim; then
-               # DKIM is enabled by default
-               cat >> Makefile <<- EOC
-                       DISABLE_DKIM=yes
-               EOC
-       fi
-
-       # Per-Recipient-Data-Response
-       if ! use prdr; then
-               # PRDR is enabled by default
-               cat >> Makefile <<- EOC
-                       DISABLE_PRDR=yes
-               EOC
-       fi
-
-       # log to syslog
-       if use syslog; then
-               sed -i 
"s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Makefile
-               cat >> Makefile <<- EOC
-                       LOG_FILE_PATH=syslog
-               EOC
-       else
-               cat >> Makefile <<- EOC
-                       LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log
-               EOC
-       fi
-
-       # starttls support (ssl)
-       if use ssl; then
-               echo "SUPPORT_TLS=yes" >> Makefile
-               if use gnutls; then
-                       echo "USE_GNUTLS=yes" >> Makefile
-                       echo "USE_GNUTLS_PC=gnutls" >> Makefile
-                       use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile
-               else
-                       echo "USE_OPENSSL_PC=openssl" >> Makefile
-               fi
-       fi
-
-       # TCP wrappers
-       if use tcpd; then
-               cat >> Makefile <<- EOC
-                       USE_TCP_WRAPPERS=yes
-                       EXTRALIBS_EXIM += -lwrap
-               EOC
-       fi
-
-       # Light Mail Transport Protocol
-       if use lmtp; then
-               cat >> Makefile <<- EOC
-                       TRANSPORT_LMTP=yes
-               EOC
-       fi
-
-       # embedded Perl
-       if use perl; then
-               cat >> Makefile <<- EOC
-                       EXIM_PERL=perl.o
-               EOC
-       fi
-
-       # dlfunc
-       if use dlfunc; then
-               cat >> Makefile <<- EOC
-                       EXPAND_DLFUNC=yes
-               EOC
-       fi
-
-       #
-       # experimental features
-
-       # Distributed Checksum Clearinghouse
-       if use dcc; then
-               echo "EXPERIMENTAL_DCC=yes">> Makefile
-       fi
-
-       # Sender Policy Framework
-       if use spf; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_SPF=yes
-                       EXTRALIBS_EXIM += -lspf2
-               EOC
-       fi
-
-       # Sender Rewriting Scheme
-       if use srs; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_SRS=yes
-                       EXTRALIBS_EXIM += -lsrs_alt
-               EOC
-       fi
-
-       # DMARC
-       if use dmarc; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_DMARC=yes
-                       EXTRALIBS_EXIM += -lopendmarc
-               EOC
-       fi
-
-       # Transport post-delivery actions
-       if use tpda; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_TPDA=yes
-               EOC
-       fi
-
-       # Proxy Protocol
-       if use proxy; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_PROXY=yes
-               EOC
-       fi
-
-       # Delivery Sender Notifications
-       if use dsn; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_DSN=yes
-               EOC
-       fi
-
-       #
-       # authentication (SMTP AUTH)
-
-       # standard bits
-       cat >> Makefile <<- EOC
-               AUTH_SPA=yes
-               AUTH_CRAM_MD5=yes
-               AUTH_PLAINTEXT=yes
-       EOC
-
-       # Cyrus SASL
-       if use sasl; then
-               cat >> Makefile <<- EOC
-                       CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux
-                       AUTH_CYRUS_SASL=yes
-                       AUTH_LIBS += -lsasl2
-               EOC
-       fi
-
-       # Dovecot
-       if use dovecot-sasl; then
-               cat >> Makefile <<- EOC
-                       AUTH_DOVECOT=yes
-               EOC
-       fi
-
-       # Pluggable Authentication Modules
-       if use pam; then
-               cat >> Makefile <<- EOC
-                       SUPPORT_PAM=yes
-                       AUTH_LIBS += -lpam
-               EOC
-       fi
-
-       # Radius
-       if use radius; then
-               cat >> Makefile <<- EOC
-                       
RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
-                       RADIUS_LIB_TYPE=RADIUSCLIENT
-                       AUTH_LIBS += -lradiusclient
-               EOC
-       fi
-}
-
-src_compile() {
-       emake -j1 CC="$(tc-getCC)" HOSTCC="$(tc-getCC $CBUILD)" \
-               AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' \
-               || die "make failed"
-}
-
-src_install () {
-       cd "${S}"/build-exim-gentoo || die
-       dosbin exim
-       if use X; then
-               dosbin eximon.bin
-               dosbin eximon
-       fi
-       fperms 4755 /usr/sbin/exim
-
-       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
-
-       for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
-               exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep 
\
-               convert4r3 convert4r4 exipick
-       do
-               dosbin $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 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
-
-       # headers, #436406
-       if use dlfunc ; then
-               # fixup includes so they actually can be found when including
-               sed -i \
-                       -e '/#include 
"\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \
-                       local_scan.h || die
-               insinto /usr/include/exim
-               doins {config,local_scan}.h ../src/{mytypes,store}.h
-       fi
-
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}/exim.logrotate" exim
-
-       newinitd "${FILESDIR}"/exim.rc8 exim
-       newconfd "${FILESDIR}"/exim.confd exim
-
-       systemd_dounit 
"${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
-       systemd_newunit "${FILESDIR}"/exim_at.service '[email protected]'
-       systemd_newunit "${FILESDIR}"/exim-submission_at.service 
'[email protected]'
-
-       diropts -m 0750 -o ${MAILUSER} -g ${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
-       use spf && einfo "SPF support is experimental"
-       use srs && einfo "SRS support is experimental"
-       if use dmarc ; then
-               einfo "DMARC support is experimental.  See global settings to"
-               einfo "configure DMARC, for usage see the documentation at "
-               einfo "experimental-spec.txt."
-       fi
-       use tpda && einfo "TPDA support is experimental"
-       use proxy && einfo "proxy support is experimental"
-       if use dsn ; then
-               einfo "Starting from Exim 4.83, DSN support comes from 
upstream."
-               einfo "DSN support is an experimental feature.  If you used DSN"
-               einfo "support prior to 4.83, make sure to remove all 
dsn_process"
-               einfo "switches from your routers, see 
https://bugs.gentoo.org/511818";
-       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/ch-exim_utilities.html#SECThindatmai";
-}

diff --git a/mail-mta/exim/exim-4.85.2.ebuild b/mail-mta/exim/exim-4.85.2.ebuild
deleted file mode 100644
index 5f918df..0000000
--- a/mail-mta/exim/exim-4.85.2.ebuild
+++ /dev/null
@@ -1,508 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils toolchain-funcs multilib pam systemd
-
-IUSE="dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls 
ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy 
radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X"
-REQUIRED_USE="spf? ( exiscan-acl ) srs? ( exiscan-acl ) dmarc? ( spf dkim ) 
pkcs11? ( gnutls )"
-
-COMM_URI="ftp://ftp.exim.org/pub/exim/exim4/old";
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="${COMM_URI}/${P//rc/RC}.tar.bz2
-       mirror://gentoo/system_filter.exim.gz
-       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-fbsd 
~x86-solaris"
-
-COMMON_DEPEND=">=sys-apps/sed-4.0.5
-       >=sys-libs/db-3.2:=
-       dev-libs/libpcre
-       perl? ( dev-lang/perl:= )
-       pam? ( virtual/pam )
-       tcpd? ( sys-apps/tcp-wrappers )
-       ssl? ( dev-libs/openssl:= )
-       gnutls? ( net-libs/gnutls[pkcs11?]
-                         dev-libs/libtasn1 )
-       ldap? ( >=net-nds/openldap-2.0.7 )
-       mysql? ( virtual/mysql )
-       postgres? ( dev-db/postgresql:= )
-       sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
-       redis? ( dev-libs/hiredis )
-       spf? ( >=mail-filter/libspf2-1.2.5-r1 )
-       dmarc? ( mail-filter/opendmarc )
-       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/opensmtpd
-       !<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 )
-       selinux? ( sec-policy/selinux-exim )
-       "
-
-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.82-makefile-freebsd.patch # 235785
-       epatch "${FILESDIR}"/exim-4.77-as-needed-ldflags.patch # 352265, 391279
-       epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
-
-       if use maildir ; then
-               epatch "${FILESDIR}"/exim-4.20-maildir.patch
-       else
-               epatch "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
-       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() {
-       # general config and paths
-
-       sed -i.orig \
-               -e 
"/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${EPREFIX}/etc/mail/aliases'" \
-               "${S}"/src/configure.default || die
-
-       sed -i -e 's/^buildname=.*/buildname=exim-gentoo/g' Makefile || die
-
-       sed -e "48i\CFLAGS=${CFLAGS}" \
-               -e 
"s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
-               -e "s:EXIM_USER=:EXIM_USER=${MAILUSER}:" \
-               -e 
"s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=${EPREFIX}/etc/exim/exim.conf:"
 \
-               -e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
-               -e 
"s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
-               src/EDITME > Local/Makefile
-
-       cd Local
-
-       cat >> Makefile <<- EOC
-               INFO_DIRECTORY=${EPREFIX}/usr/share/info
-               PID_FILE_PATH=${EPREFIX}/run/exim.pid
-               SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim
-               HAVE_ICONV=yes
-       EOC
-
-       # if we use libiconv, now is the time to tell so
-       use !elibc_glibc && echo "EXTRALIBS_EXIM=-liconv" >> Makefile
-
-       # support for IPv6
-       if use ipv6; then
-               cat >> Makefile <<- EOC
-                       HAVE_IPV6=YES
-               EOC
-       fi
-
-       #
-       # mail storage formats
-
-       # mailstore is Exim's traditional storage format
-       cat >> Makefile <<- EOC
-               SUPPORT_MAILSTORE=yes
-       EOC
-
-       # mbox
-       if use mbx; then
-               cat >> Makefile <<- EOC
-                       SUPPORT_MBX=yes
-               EOC
-       fi
-
-       # maildir
-       if use maildir; then
-               cat >> Makefile <<- EOC
-                       SUPPORT_MAILDIR=yes
-               EOC
-       fi
-
-       #
-       # lookup methods
-
-       # use the "native" interfaces to the DBM and CDB libraries, support
-       # passwd and directory lookups by default
-       cat >> Makefile <<- EOC
-               USE_DB=yes
-               DBMLIB=-ldb
-               LOOKUP_CDB=yes
-               LOOKUP_PASSWD=yes
-               LOOKUP_DSEARCH=yes
-       EOC
-
-       if ! use dnsdb; then
-               # DNSDB lookup is enabled by default
-               sed -i "s:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:" Makefile
-       fi
-
-       if use ldap; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_LDAP=yes
-                       LDAP_LIB_TYPE=OPENLDAP2
-                       LOOKUP_INCLUDE += -I"${EROOT}"usr/include/ldap
-                       LOOKUP_LIBS += -lldap -llber
-               EOC
-       fi
-
-       if use mysql; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_MYSQL=yes
-                       LOOKUP_INCLUDE += $(mysql_config --include)
-                       LOOKUP_LIBS += $(mysql_config --libs)
-               EOC
-       fi
-
-       if use nis; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_NIS=yes
-                       LOOKUP_NISPLUS=yes
-               EOC
-       fi
-
-       if use postgres; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_PGSQL=yes
-                       LOOKUP_INCLUDE += -I$(pg_config --includedir)
-                       LOOKUP_LIBS += -L$(pg_config --libdir) -lpq
-               EOC
-       fi
-
-       if use sqlite; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_SQLITE=yes
-                       LOOKUP_SQLITE_PC=sqlite3
-               EOC
-       fi
-
-       if use redis; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_REDIS=yes
-                       LOOKUP_LIBS += -lhiredis
-               EOC
-       fi
-
-       #
-       # Exim monitor, enabled by default, controlled via X USE-flag,
-       # disable if not requested, bug #46778
-       if use X; then
-               cp ../exim_monitor/EDITME eximon.conf || die
-       else
-               sed -i -e '/^EXIM_MONITOR=/s/^/# /' Makefile
-       fi
-
-       #
-       # features
-
-       # content scanning support
-       if use exiscan-acl; then
-               cat >> Makefile <<- EOC
-                       WITH_CONTENT_SCAN=yes
-                       WITH_OLD_DEMIME=yes
-               EOC
-       fi
-
-       # DomainKeys Identified Mail, RFC4871
-       if ! use dkim; then
-               # DKIM is enabled by default
-               cat >> Makefile <<- EOC
-                       DISABLE_DKIM=yes
-               EOC
-       fi
-
-       # Per-Recipient-Data-Response
-       if ! use prdr; then
-               # PRDR is enabled by default
-               cat >> Makefile <<- EOC
-                       DISABLE_PRDR=yes
-               EOC
-       fi
-
-       # log to syslog
-       if use syslog; then
-               sed -i 
"s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Makefile
-               cat >> Makefile <<- EOC
-                       LOG_FILE_PATH=syslog
-               EOC
-       else
-               cat >> Makefile <<- EOC
-                       LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log
-               EOC
-       fi
-
-       # starttls support (ssl)
-       if use ssl; then
-               echo "SUPPORT_TLS=yes" >> Makefile
-               if use gnutls; then
-                       echo "USE_GNUTLS=yes" >> Makefile
-                       echo "USE_GNUTLS_PC=gnutls" >> Makefile
-                       use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile
-               else
-                       echo "USE_OPENSSL_PC=openssl" >> Makefile
-               fi
-       fi
-
-       # TCP wrappers
-       if use tcpd; then
-               cat >> Makefile <<- EOC
-                       USE_TCP_WRAPPERS=yes
-                       EXTRALIBS_EXIM += -lwrap
-               EOC
-       fi
-
-       # Light Mail Transport Protocol
-       if use lmtp; then
-               cat >> Makefile <<- EOC
-                       TRANSPORT_LMTP=yes
-               EOC
-       fi
-
-       # embedded Perl
-       if use perl; then
-               cat >> Makefile <<- EOC
-                       EXIM_PERL=perl.o
-               EOC
-       fi
-
-       # dlfunc
-       if use dlfunc; then
-               cat >> Makefile <<- EOC
-                       EXPAND_DLFUNC=yes
-               EOC
-       fi
-
-       #
-       # experimental features
-
-       # Distributed Checksum Clearinghouse
-       if use dcc; then
-               echo "EXPERIMENTAL_DCC=yes">> Makefile
-       fi
-
-       # Sender Policy Framework
-       if use spf; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_SPF=yes
-                       EXTRALIBS_EXIM += -lspf2
-               EOC
-       fi
-
-       # Sender Rewriting Scheme
-       if use srs; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_SRS=yes
-                       EXTRALIBS_EXIM += -lsrs_alt
-               EOC
-       fi
-
-       # DMARC
-       if use dmarc; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_DMARC=yes
-                       EXTRALIBS_EXIM += -lopendmarc
-               EOC
-       fi
-
-       # Transport post-delivery actions
-       if use tpda; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_EVENT=yes
-               EOC
-       fi
-
-       # Proxy Protocol
-       if use proxy; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_PROXY=yes
-               EOC
-       fi
-
-       # Delivery Sender Notifications
-       if use dsn; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_DSN=yes
-               EOC
-       fi
-
-       #
-       # authentication (SMTP AUTH)
-
-       # standard bits
-       cat >> Makefile <<- EOC
-               AUTH_SPA=yes
-               AUTH_CRAM_MD5=yes
-               AUTH_PLAINTEXT=yes
-       EOC
-
-       # Cyrus SASL
-       if use sasl; then
-               cat >> Makefile <<- EOC
-                       CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux
-                       AUTH_CYRUS_SASL=yes
-                       AUTH_LIBS += -lsasl2
-               EOC
-       fi
-
-       # Dovecot
-       if use dovecot-sasl; then
-               cat >> Makefile <<- EOC
-                       AUTH_DOVECOT=yes
-               EOC
-       fi
-
-       # Pluggable Authentication Modules
-       if use pam; then
-               cat >> Makefile <<- EOC
-                       SUPPORT_PAM=yes
-                       AUTH_LIBS += -lpam
-               EOC
-       fi
-
-       # Radius
-       if use radius; then
-               cat >> Makefile <<- EOC
-                       
RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
-                       RADIUS_LIB_TYPE=RADIUSCLIENT
-                       AUTH_LIBS += -lradiusclient
-               EOC
-       fi
-}
-
-src_compile() {
-       emake -j1 CC="$(tc-getCC)" HOSTCC="$(tc-getCC $CBUILD)" \
-               AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' \
-               || die "make failed"
-}
-
-src_install () {
-       cd "${S}"/build-exim-gentoo || die
-       dosbin exim
-       if use X; then
-               dosbin eximon.bin
-               dosbin eximon
-       fi
-       fperms 4755 /usr/sbin/exim
-
-       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
-
-       for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
-               exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep 
\
-               convert4r3 convert4r4 exipick
-       do
-               dosbin $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 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
-
-       # headers, #436406
-       if use dlfunc ; then
-               # fixup includes so they actually can be found when including
-               sed -i \
-                       -e '/#include 
"\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \
-                       local_scan.h || die
-               insinto /usr/include/exim
-               doins {config,local_scan}.h ../src/{mytypes,store}.h
-       fi
-
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}/exim.logrotate" exim
-
-       newinitd "${FILESDIR}"/exim.rc9 exim
-       newconfd "${FILESDIR}"/exim.confd exim
-
-       systemd_dounit 
"${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
-       systemd_newunit "${FILESDIR}"/exim_at.service '[email protected]'
-       systemd_newunit "${FILESDIR}"/exim-submission_at.service 
'[email protected]'
-
-       diropts -m 0750 -o ${MAILUSER} -g ${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
-       use spf && einfo "SPF support is experimental"
-       use srs && einfo "SRS support is experimental"
-       if use dmarc ; then
-               einfo "DMARC support is experimental.  See global settings to"
-               einfo "configure DMARC, for usage see the documentation at "
-               einfo "experimental-spec.txt."
-       fi
-       use tpda && einfo "TPDA/EVENT support is experimental"
-       use proxy && einfo "proxy support is experimental"
-       if use dsn ; then
-               einfo "Starting from Exim 4.83, DSN support comes from 
upstream."
-               einfo "DSN support is an experimental feature.  If you used DSN"
-               einfo "support prior to 4.83, make sure to remove all 
dsn_process"
-               einfo "switches from your routers, see 
https://bugs.gentoo.org/511818";
-       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/ch-exim_utilities.html#SECThindatmai";
-}

diff --git a/mail-mta/exim/exim-4.86.2.ebuild b/mail-mta/exim/exim-4.86.2.ebuild
deleted file mode 100644
index 4e7e8ea..0000000
--- a/mail-mta/exim/exim-4.86.2.ebuild
+++ /dev/null
@@ -1,525 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils toolchain-funcs multilib pam systemd
-
-IUSE="dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl 
gnutls ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres 
+prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X"
-REQUIRED_USE="spf? ( exiscan-acl ) srs? ( exiscan-acl ) dmarc? ( spf dkim ) 
pkcs11? ( gnutls )"
-
-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
-       doc? ( ${COMM_URI}/${PN}-html-${PV//rc/RC}.tar.bz2 )"
-HOMEPAGE="http://www.exim.org/";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-
-COMMON_DEPEND=">=sys-apps/sed-4.0.5
-       >=sys-libs/db-3.2:=
-       dev-libs/libpcre
-       perl? ( dev-lang/perl:= )
-       pam? ( virtual/pam )
-       tcpd? ( sys-apps/tcp-wrappers )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0=[-bindist] )
-               libressl? ( dev-libs/libressl:= )
-       )
-       gnutls? ( net-libs/gnutls[pkcs11?]
-                         dev-libs/libtasn1 )
-       ldap? ( >=net-nds/openldap-2.0.7 )
-       mysql? ( virtual/mysql )
-       postgres? ( dev-db/postgresql:= )
-       sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
-       redis? ( dev-libs/hiredis )
-       spf? ( >=mail-filter/libspf2-1.2.5-r1 )
-       dmarc? ( mail-filter/opendmarc )
-       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/freeradius-client )
-       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/opensmtpd
-       !<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 )
-       selinux? ( sec-policy/selinux-exim )
-       "
-
-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.82-makefile-freebsd.patch # 235785
-       epatch "${FILESDIR}"/exim-4.77-as-needed-ldflags.patch # 352265, 391279
-       epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
-       epatch "${FILESDIR}"/exim-4.86-radius-type-fix.patch
-       epatch "${FILESDIR}"/exim-4.86-radius-include.patch
-       epatch "${FILESDIR}"/exim-4.86.2-TMPDIR.patch # 63420
-
-       if use maildir ; then
-               epatch "${FILESDIR}"/exim-4.20-maildir.patch
-       else
-               epatch "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
-       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() {
-       # general config and paths
-
-       sed -i.orig \
-               -e 
"/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${EPREFIX}/etc/mail/aliases'" \
-               "${S}"/src/configure.default || die
-
-       sed -i -e 's/^buildname=.*/buildname=exim-gentoo/g' Makefile || die
-
-       sed -e "48i\CFLAGS=${CFLAGS}" \
-               -e 
"s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
-               -e "s:EXIM_USER=:EXIM_USER=${MAILUSER}:" \
-               -e 
"s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=${EPREFIX}/etc/exim/exim.conf:"
 \
-               -e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
-               -e 
"s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
-               src/EDITME > Local/Makefile
-
-       cd Local
-
-       cat >> Makefile <<- EOC
-               INFO_DIRECTORY=${EPREFIX}/usr/share/info
-               PID_FILE_PATH=${EPREFIX}/run/exim.pid
-               SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim
-               HAVE_ICONV=yes
-       EOC
-
-       # if we use libiconv, now is the time to tell so
-       use !elibc_glibc && echo "EXTRALIBS_EXIM=-liconv" >> Makefile
-
-       # support for IPv6
-       if use ipv6; then
-               cat >> Makefile <<- EOC
-                       HAVE_IPV6=YES
-               EOC
-       fi
-
-       #
-       # mail storage formats
-
-       # mailstore is Exim's traditional storage format
-       cat >> Makefile <<- EOC
-               SUPPORT_MAILSTORE=yes
-       EOC
-
-       # mbox
-       if use mbx; then
-               cat >> Makefile <<- EOC
-                       SUPPORT_MBX=yes
-               EOC
-       fi
-
-       # maildir
-       if use maildir; then
-               cat >> Makefile <<- EOC
-                       SUPPORT_MAILDIR=yes
-               EOC
-       fi
-
-       #
-       # lookup methods
-
-       # use the "native" interfaces to the DBM and CDB libraries, support
-       # passwd and directory lookups by default
-       cat >> Makefile <<- EOC
-               USE_DB=yes
-               DBMLIB=-ldb
-               LOOKUP_CDB=yes
-               LOOKUP_PASSWD=yes
-               LOOKUP_DSEARCH=yes
-       EOC
-
-       if ! use dnsdb; then
-               # DNSDB lookup is enabled by default
-               sed -i "s:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:" Makefile
-       fi
-
-       if use ldap; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_LDAP=yes
-                       LDAP_LIB_TYPE=OPENLDAP2
-                       LOOKUP_INCLUDE += -I"${EROOT}"usr/include/ldap
-                       LOOKUP_LIBS += -lldap -llber
-               EOC
-       fi
-
-       if use mysql; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_MYSQL=yes
-                       LOOKUP_INCLUDE += $(mysql_config --include)
-                       LOOKUP_LIBS += $(mysql_config --libs)
-               EOC
-       fi
-
-       if use nis; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_NIS=yes
-                       LOOKUP_NISPLUS=yes
-               EOC
-       fi
-
-       if use postgres; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_PGSQL=yes
-                       LOOKUP_INCLUDE += -I$(pg_config --includedir)
-                       LOOKUP_LIBS += -L$(pg_config --libdir) -lpq
-               EOC
-       fi
-
-       if use sqlite; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_SQLITE=yes
-                       LOOKUP_SQLITE_PC=sqlite3
-               EOC
-       fi
-
-       if use redis; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_REDIS=yes
-                       LOOKUP_LIBS += -lhiredis
-               EOC
-       fi
-
-       #
-       # Exim monitor, enabled by default, controlled via X USE-flag,
-       # disable if not requested, bug #46778
-       if use X; then
-               cp ../exim_monitor/EDITME eximon.conf || die
-       else
-               sed -i -e '/^EXIM_MONITOR=/s/^/# /' Makefile
-       fi
-
-       #
-       # features
-
-       # content scanning support
-       if use exiscan-acl; then
-               cat >> Makefile <<- EOC
-                       WITH_CONTENT_SCAN=yes
-                       WITH_OLD_DEMIME=yes
-               EOC
-       fi
-
-       # DomainKeys Identified Mail, RFC4871
-       if ! use dkim; then
-               # DKIM is enabled by default
-               cat >> Makefile <<- EOC
-                       DISABLE_DKIM=yes
-               EOC
-       fi
-
-       # Per-Recipient-Data-Response
-       if ! use prdr; then
-               # PRDR is enabled by default
-               cat >> Makefile <<- EOC
-                       DISABLE_PRDR=yes
-               EOC
-       fi
-
-       # log to syslog
-       if use syslog; then
-               sed -i 
"s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Makefile
-               cat >> Makefile <<- EOC
-                       LOG_FILE_PATH=syslog
-               EOC
-       else
-               cat >> Makefile <<- EOC
-                       LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log
-               EOC
-       fi
-
-       # starttls support (ssl)
-       if use ssl; then
-               echo "SUPPORT_TLS=yes" >> Makefile
-               if use gnutls; then
-                       echo "USE_GNUTLS=yes" >> Makefile
-                       echo "USE_GNUTLS_PC=gnutls" >> Makefile
-                       use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile
-               else
-                       echo "USE_OPENSSL_PC=openssl" >> Makefile
-               fi
-       fi
-
-       # TCP wrappers
-       if use tcpd; then
-               cat >> Makefile <<- EOC
-                       USE_TCP_WRAPPERS=yes
-                       EXTRALIBS_EXIM += -lwrap
-               EOC
-       fi
-
-       # Light Mail Transport Protocol
-       if use lmtp; then
-               cat >> Makefile <<- EOC
-                       TRANSPORT_LMTP=yes
-               EOC
-       fi
-
-       # embedded Perl
-       if use perl; then
-               cat >> Makefile <<- EOC
-                       EXIM_PERL=perl.o
-               EOC
-       fi
-
-       # dlfunc
-       if use dlfunc; then
-               cat >> Makefile <<- EOC
-                       EXPAND_DLFUNC=yes
-               EOC
-       fi
-
-       #
-       # experimental features
-
-       # DANE
-       if use dane; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_DANE=yes
-               EOC
-       fi
-
-       # Distributed Checksum Clearinghouse
-       if use dcc; then
-               echo "EXPERIMENTAL_DCC=yes">> Makefile
-       fi
-
-       # Sender Policy Framework
-       if use spf; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_SPF=yes
-                       EXTRALIBS_EXIM += -lspf2
-               EOC
-       fi
-
-       # Sender Rewriting Scheme
-       if use srs; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_SRS=yes
-                       EXTRALIBS_EXIM += -lsrs_alt
-               EOC
-       fi
-
-       # DMARC
-       if use dmarc; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_DMARC=yes
-                       EXTRALIBS_EXIM += -lopendmarc
-               EOC
-       fi
-
-       # Transport post-delivery actions
-       if use tpda; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_EVENT=yes
-               EOC
-       fi
-
-       # Proxy Protocol
-       if use proxy; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_PROXY=yes
-               EOC
-       fi
-
-       # Delivery Sender Notifications
-       if use dsn; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_DSN=yes
-               EOC
-       fi
-
-       #
-       # authentication (SMTP AUTH)
-
-       # standard bits
-       cat >> Makefile <<- EOC
-               AUTH_SPA=yes
-               AUTH_CRAM_MD5=yes
-               AUTH_PLAINTEXT=yes
-       EOC
-
-       # Cyrus SASL
-       if use sasl; then
-               cat >> Makefile <<- EOC
-                       CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux
-                       AUTH_CYRUS_SASL=yes
-                       AUTH_LIBS += -lsasl2
-               EOC
-       fi
-
-       # Dovecot
-       if use dovecot-sasl; then
-               cat >> Makefile <<- EOC
-                       AUTH_DOVECOT=yes
-               EOC
-       fi
-
-       # Pluggable Authentication Modules
-       if use pam; then
-               cat >> Makefile <<- EOC
-                       SUPPORT_PAM=yes
-                       AUTH_LIBS += -lpam
-               EOC
-       fi
-
-       # Radius
-       if use radius; then
-               cat >> Makefile <<- EOC
-                       
RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
-                       RADIUS_LIB_TYPE=RADIUSCLIENTNEW
-                       AUTH_LIBS += -lfreeradius-client
-               EOC
-       fi
-}
-
-src_compile() {
-       emake -j1 CC="$(tc-getCC)" HOSTCC="$(tc-getCC $CBUILD)" \
-               AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' \
-               || die "make failed"
-}
-
-src_install () {
-       cd "${S}"/build-exim-gentoo || die
-       dosbin exim
-       if use X; then
-               dosbin eximon.bin
-               dosbin eximon
-       fi
-       fperms 4755 /usr/sbin/exim
-
-       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
-
-       for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
-               exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep 
\
-               convert4r3 convert4r4 exipick
-       do
-               dosbin $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 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
-
-       # headers, #436406
-       if use dlfunc ; then
-               # fixup includes so they actually can be found when including
-               sed -i \
-                       -e '/#include 
"\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \
-                       local_scan.h || die
-               insinto /usr/include/exim
-               doins {config,local_scan}.h ../src/{mytypes,store}.h
-       fi
-
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}/exim.logrotate" exim
-
-       newinitd "${FILESDIR}"/exim.rc9 exim
-       newconfd "${FILESDIR}"/exim.confd exim
-
-       systemd_dounit 
"${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
-       systemd_newunit "${FILESDIR}"/exim_at.service '[email protected]'
-       systemd_newunit "${FILESDIR}"/exim-submission_at.service 
'[email protected]'
-
-       diropts -m 0750 -o ${MAILUSER} -g ${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
-       use dane && einfo "DANE support is experimental"
-       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
-       use spf && einfo "SPF support is experimental"
-       use srs && einfo "SRS support is experimental"
-       if use dmarc ; then
-               einfo "DMARC support is experimental.  See global settings to"
-               einfo "configure DMARC, for usage see the documentation at "
-               einfo "experimental-spec.txt."
-       fi
-       use tpda && einfo "TPDA/EVENT support is experimental"
-       use proxy && einfo "proxy support is experimental"
-       if use dsn ; then
-               einfo "Starting from Exim 4.83, DSN support comes from 
upstream."
-               einfo "DSN support is an experimental feature.  If you used DSN"
-               einfo "support prior to 4.83, make sure to remove all 
dsn_process"
-               einfo "switches from your routers, see 
https://bugs.gentoo.org/511818";
-       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/ch-exim_utilities.html#SECThindatmai";
-       einfo "For CVE-2016-1531, Exim introduced keep_environment and"
-       einfo "add_environment flags.  You might want to set them, see:"
-       einfo 
"https://lists.exim.org/lurker/message/20160302.191005.a72d8433.en.html";
-}

diff --git a/mail-mta/exim/files/exim-4.86-TMPDIR.patch 
b/mail-mta/exim/files/exim-4.86-TMPDIR.patch
deleted file mode 100644
index 7fb0a79..0000000
--- a/mail-mta/exim/files/exim-4.86-TMPDIR.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From c36cf51b85cfc86e46226c846914c8d915f9f3c0 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <[email protected]>
-Date: Tue, 2 Feb 2016 20:56:15 +0300
-Subject: [PATCH] Rename build-time option TMPDIR to EXIM_TMPDIR
-
----
- src/EDITME              |  2 +-
- src/config.h.defaults   |  2 +-
- src/exim.c              | 12 ++++++------
- 3 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/EDITME b/src/EDITME
-index 30a296e..6afe0c7 100644
---- a/src/EDITME
-+++ b/src/EDITME
-@@ -1123,7 +1123,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases
- # it replaces the value with what is defined here. Commenting this setting
- # suppresses the check altogether.
- 
--TMPDIR="/tmp"
-+EXIM_TMPDIR="/tmp"
- 
- 
- 
#------------------------------------------------------------------------------
-diff --git a/src/config.h.defaults b/src/config.h.defaults
-index 14de083..c1cf1a9 100644
---- a/src/config.h.defaults
-+++ b/src/config.h.defaults
-@@ -150,7 +150,7 @@ it's a default value. */
- 
- #define TCP_WRAPPERS_DAEMON_NAME "exim"
- #define TIMEZONE_DEFAULT
--#define TMPDIR
-+#define EXIM_TMPDIR
- 
- #define TRANSPORT_APPENDFILE
- #define TRANSPORT_AUTOREPLY
-diff --git a/src/exim.c b/src/exim.c
-index ebc71dd..c134bf5 100644
---- a/src/exim.c
-+++ b/src/exim.c
-@@ -3899,20 +3899,20 @@ if (log_oneline)
- temporary files are created; Exim doesn't use these (apart from when 
delivering
- to MBX mailboxes), but called libraries such as DBM libraries may require 
them.
- If TMPDIR is found in the environment, reset it to the value defined in the
--TMPDIR macro, if this macro is defined. */
-+EXIM_TMPDIR macro, if this macro is defined. */
- 
--#ifdef TMPDIR
-+#ifdef EXIM_TMPDIR
-   {
-   uschar **p;
-   for (p = USS environ; *p != NULL; p++)
-     {
-     if (Ustrncmp(*p, "TMPDIR=", 7) == 0 &&
--        Ustrcmp(*p+7, TMPDIR) != 0)
-+        Ustrcmp(*p+7, EXIM_TMPDIR) != 0)
-       {
--      uschar *newp = malloc(Ustrlen(TMPDIR) + 8);
--      sprintf(CS newp, "TMPDIR=%s", TMPDIR);
-+      uschar *newp = malloc(Ustrlen(EXIM_TMPDIR) + 8);
-+      sprintf(CS newp, "TMPDIR=%s", EXIM_TMPDIR);
-       *p = newp;
--      DEBUG(D_any) debug_printf("reset TMPDIR=%s in environment\n", TMPDIR);
-+      DEBUG(D_any) debug_printf("reset TMPDIR=%s in environment\n", 
EXIM_TMPDIR);
-       }
-     }
-   }
--- 
-2.4.10
-

diff --git a/mail-mta/exim/files/exim-4.86-radius-include.patch 
b/mail-mta/exim/files/exim-4.86-radius-include.patch
deleted file mode 100644
index acff7fc..0000000
--- a/mail-mta/exim/files/exim-4.86-radius-include.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN exim-4.86.orig/src/auths/call_radius.c 
exim-4.86/src/auths/call_radius.c
---- exim-4.86.orig/src/auths/call_radius.c     2015-07-24 00:20:37.000000000 
+0300
-+++ exim-4.86/src/auths/call_radius.c  2015-10-17 20:05:31.581240956 +0300
-@@ -38,7 +38,11 @@
-   #if !defined(RADIUS_LIB_RADIUSCLIENT) && 
!defined(RADIUS_LIB_RADIUSCLIENTNEW)
-   #define RADIUS_LIB_RADIUSCLIENT
-   #endif
-+  #ifdef RADIUS_LIB_RADIUSCLIENTNEW
-+  #include <freeradius-client.h>
-+  #else
-   #include <radiusclient.h>
-+  #endif
- #endif
- 
- 

diff --git a/mail-mta/exim/files/exim-4.86-radius-type-fix.patch 
b/mail-mta/exim/files/exim-4.86-radius-type-fix.patch
deleted file mode 100644
index 3ff4722..0000000
--- a/mail-mta/exim/files/exim-4.86-radius-type-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 1b2adaee621f520aa640669a35c089c448294e9e
-Author: Alexander Tsoy <[email protected]>
-Date:   Sat Oct 17 20:39:10 2015 +0300
-
-    Fix conflicting types errors in radius auth
-    
-    Was broken by commits 93a6fce2 and 55414b25
-
-diff --git a/src/src/auths/call_radius.c b/src/src/auths/call_radius.c
-index 2064ed2..1201078 100644
---- a/src/src/auths/call_radius.c
-+++ b/src/src/auths/call_radius.c
-@@ -60,10 +60,10 @@ Returns:   OK if authentication succeeded
- */
- 
- int
--auth_call_radius(uschar *s, uschar **errptr)
-+auth_call_radius(const uschar *s, uschar **errptr)
- {
- uschar *user;
--uschar *radius_args = s;
-+const uschar *radius_args = s;
- int result;
- int sep = 0;
- 

diff --git a/mail-mta/exim/files/exim-4.86.2-TMPDIR.patch 
b/mail-mta/exim/files/exim-4.86.2-TMPDIR.patch
deleted file mode 100644
index 9c05a24..0000000
--- a/mail-mta/exim/files/exim-4.86.2-TMPDIR.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Adapted for 4.86.2
-
-From c36cf51b85cfc86e46226c846914c8d915f9f3c0 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <[email protected]>
-Date: Tue, 2 Feb 2016 20:56:15 +0300
-Subject: [PATCH] Rename build-time option TMPDIR to EXIM_TMPDIR
-
----
- src/EDITME              |  2 +-
- src/config.h.defaults   |  2 +-
- src/exim.c              | 12 ++++++------
- 3 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/EDITME b/src/EDITME
-index 30a296e..6afe0c7 100644
---- a/src/EDITME
-+++ b/src/EDITME
-@@ -1123,7 +1123,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases
- # it replaces the value with what is defined here. Commenting this setting
- # suppresses the check altogether.
- 
--TMPDIR="/tmp"
-+EXIM_TMPDIR="/tmp"
- 
- 
- 
#------------------------------------------------------------------------------
-diff --git a/src/config.h.defaults b/src/config.h.defaults
-index 14de083..c1cf1a9 100644
---- a/src/config.h.defaults
-+++ b/src/config.h.defaults
-@@ -150,7 +150,7 @@ it's a default value. */
- 
- #define TCP_WRAPPERS_DAEMON_NAME "exim"
- #define TIMEZONE_DEFAULT
--#define TMPDIR
-+#define EXIM_TMPDIR
- 
- #define TRANSPORT_APPENDFILE
- #define TRANSPORT_AUTOREPLY
---- a/src/exim.c
-+++ b/src/exim.c
-@@ -3887,20 +3887,20 @@
- temporary files are created; Exim doesn't use these (apart from when 
delivering
- to MBX mailboxes), but called libraries such as DBM libraries may require 
them.
- If TMPDIR is found in the environment, reset it to the value defined in the
--TMPDIR macro, if this macro is defined. */
-+EXIM_TMPDIR macro, if this macro is defined. */
- 
--#ifdef TMPDIR
-+#ifdef EXIM_TMPDIR
-   {
-   uschar **p;
-   if (environ) for (p = USS environ; *p != NULL; p++)
-     {
-     if (Ustrncmp(*p, "TMPDIR=", 7) == 0 &&
--        Ustrcmp(*p+7, TMPDIR) != 0)
-+        Ustrcmp(*p+7, EXIM_TMPDIR) != 0)
-       {
--      uschar *newp = malloc(Ustrlen(TMPDIR) + 8);
--      sprintf(CS newp, "TMPDIR=%s", TMPDIR);
-+      uschar *newp = malloc(Ustrlen(EXIM_TMPDIR) + 8);
-+      sprintf(CS newp, "TMPDIR=%s", EXIM_TMPDIR);
-       *p = newp;
--      DEBUG(D_any) debug_printf("reset TMPDIR=%s in environment\n", TMPDIR);
-+      DEBUG(D_any) debug_printf("reset TMPDIR=%s in environment\n", 
EXIM_TMPDIR);
-       }
-     }
-   }

diff --git a/mail-mta/exim/files/exim.rc8 b/mail-mta/exim/files/exim.rc8
deleted file mode 100644
index c88750b..0000000
--- a/mail-mta/exim/files/exim.rc8
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-extra_started_commands="reload"
-
-depend() {
-       need logger
-       use antivirus net
-       provide mta
-}
-
-start() {
-       ebegin "Starting ${SVCNAME}"
-       start-stop-daemon --start --exec /usr/sbin/exim --pidfile 
/run/${SVCNAME}.pid -- -C /etc/exim/${SVCNAME}.conf ${EXIM_OPTS:--bd -q15m}
-       eend $?
-}
-
-stop() {
-       ebegin "Stopping ${SVCNAME}"
-       start-stop-daemon --stop --pidfile /run/${SVCNAME}.pid --name exim
-       eend $?
-}
-
-reload() {
-       ebegin "Reloading ${SVCNAME}"
-       start-stop-daemon --signal HUP --pidfile /run/${SVCNAME}.pid --name exim
-       eend $?
-}

Reply via email to