Remove vulnerable versions, bug #511686

Package-Manager: portage-HEAD/cvs/Darwin i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

4 files changed, 10 insertions, 784 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index 47e3b8c55791..4033df7b8cbb 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/exim
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.276 2014/05/29 11:57:24 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.277 2014/05/29 16:47:03 grobian Exp $
+
+  29 May 2014; Fabian Groffen <grobian@gentoo.org> -exim-4.82-r1.ebuild,
+  -exim-4.82.ebuild:
+  Remove vulnerable versions, bug #511686
 
 *exim-4.83_rc1 (29 May 2014)
 
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index a154dca37d5c..61bf898566d8 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -25,27 +25,23 @@ AUX exim_482_dsn_1_3.patch 41505 SHA256 4e00069a4b2e2deb414f05ea33f29b3f007d9ebf
 AUX exim_at.service 140 SHA256 faad96dadbb2750faa5652d830f10d5a14be487a42e8db1cec797164acf14b73 SHA512 11c8133ee15b3e5193c9b1c59aed66c81b6e045dd23310bede9fcde6c88905db5ef08afdb798b53b75a7465915ea1247e980edf95db07a7f9b7bb58ce95fbb5a WHIRLPOOL 78f0c825526ae890458c4e71df2bd724d77d508081c6d6c2e3493732f11576ffeed755968dd2f3bcfb1cc6e0b0d61ea9fc175cd71340d908646f1a9ccbc7406e
 DIST exim-4.80.1.tar.bz2 1650082 SHA256 9565b10f06be224fd03adafae2e07e6fdbb479f8873e3894ddb13f98eeebe78f SHA512 ed73dd34dc02ab91896c3cdcedb0618ca3be116904c8eeb1303fc3534f8ab9430083f654fa5af994b0e01049e7fdd22d268fed9a3318b64a56c3a61d7f2174f5 WHIRLPOOL d556b7515f081f39a7bb7cb16804f0e13b37a3295a5f19faf28f9fed0966411f13b521dd7e5a8f42a7a851fa46e15ef8478caff734903080f31e910fb1530eab
 DIST exim-4.82.1.tar.bz2 1722912 SHA256 51798cead70b9ca03df88afb63f7a0cabedee8ef82c02bd18d67591c08b14500 SHA512 66a97c3182299283f3a29198c63a0bf89cccc45eb8607fed8d7254ac9081f91080f19a202fea35e254615abc9f71e714cbbe5b7e862e5c0a45c8fc26b9368a95 WHIRLPOOL e8c0cb57658d8d2b496a8640f1ab19875b7d05c388c99f305acb9733d8a4c13a5d107884a94bd584e322b43bfb68c0bfff81694f06f720a1de8f87215dd23ee3
-DIST exim-4.82.tar.bz2 1722771 SHA256 46dedfb6ced2aa4a1eddc5d8ce46a790a961508bd389faa2e215302ae80d91cf SHA512 3f65d99e737a524c5ca84bd912193774418134d77f38868258890945c559f3890af470723da7e88a601af3bd4e8055302db59c455381dc26d573d38b64e2f2ca WHIRLPOOL 9c044cf45cc96be2733f8a00c9cdda8d3cffbefe540abf45aaa514124b1f61243806c06fe7faccf7ab0865819076a4c3d5d416b57d5e51e2b7428cf927b5eb8e
 DIST exim-4.83_RC1.tar.bz2 1758340 SHA256 bdbf4bb9a92d722deaaf5cbd1c30eee08a015e6ade8d6bf90a3c02b748e39263 SHA512 9ff056c00c5dba14a846953cd958ffa110cbfce0ef9cc65d9b4d93d9d3f6b64d0eed43a9017baa8104260cfe909a69e85e75755c542fb6101af64684c106a7cc WHIRLPOOL b55710e3fd46b42415f084415f3fadc73669f04eb9b0d9e5eee66197898eedbcf4a2c6184c86cab409c5b9ffac13126daab17f5bb9dacda14e8d5420b9b2fd7a
 DIST exim-html-4.80.1.tar.bz2 404894 SHA256 206ef4acc2641f10f3f23f8ee97cd1f7125486938ea1fc231ac2a1d5d6c9be09 SHA512 c3f7eef6c7d1981185c5d7bae6a1bf4645468d105e85990accf56f66daf809ad8fb0f3e50925339a72c510e2cc0eced864bc06d526e5b735744f4478dd32d373 WHIRLPOOL 7d67d196e0613fba36d7e1e1370b0b1a6f60739befaa7d2f9661bcef9f57df9586aa63a99faa6a5d25619c2cd7186d2bdf27059f1d229be5d8199d6ec3f6b49c
 DIST exim-html-4.82.1.tar.bz2 458569 SHA256 81d0237cff64b259d47c758d5c82da93bd2e7b8ce048974d53d90e597eee122e SHA512 202b9c9d9ebbd7271a222821db32415908624b5d02b9315f20cf8de7f99743ee59bf0a9967534963f665e3c0aaa3f4b8965df083eb309e72779822c94d13ccaf WHIRLPOOL 7c70638c66b493dcd882db50c3673f76b6c7b228265ed8bc5b77be61dd37cf040844c8b6689004a8111ae9dd3a9bc8c61a84d01a53c957bad1281be100c76ddc
-DIST exim-html-4.82.tar.bz2 460106 SHA256 60936677150f177af93c1706d390a5b0e402e618f5f602b065b1afaf9c6f2191 SHA512 d72af692134cdc891af68d024e10c142901833930ee2f5b0dbf29253b811dbc4b419d3566cfdc293d40a2d94c000bf8abae68b56e198d5921fa6a3903b4c7c48 WHIRLPOOL ac1b633782b41a8b4f0894b5066187ae7bc4baf125a68d86053945cca032bddbbd84b3d28322acf676fb9f408ccc5502cf3c53613959f600cf145f8055561fca
 DIST exim-html-4.83_RC1.tar.bz2 464216 SHA256 8db32daa0f149534ef368acf4331646120bbd1a4728fb51bcd55303366c29524 SHA512 6d3df4316914d4af2ed606c8af9f99f7379c7eed42209280a37196f426fef92583f8fad2fea4f7d68792bce8b365f683f96342b9a451b4ce1b47ce7b563b9f57 WHIRLPOOL 8dd086e64be335b7a70188c50391cee833b58b0d753b860a775ec53fdc137dff6acffebccbd902d4b4ad3c8ee96c642bc0e1286bfc92aefe53b63ce7bb43aa72
 DIST exim_469_dsn_1_3.patch 40222 SHA256 605c520ea79507fd387772796c62303c5a49d1dc47b744b4267301096eedd49a SHA512 99cfb5c0c28849452b2b7a6f2b47abf78a77f970465ab5a3a5d68089dd5964610d8c64d1a380051da06f8e85ee7a073ee651b53dbac7451d9be55c78093178e5 WHIRLPOOL 7789e301a9aebe81fc0f3c68875f91e61413b5e8ca41b32562aff6146e1353b5a2a9a158455a18b16cf82a4fdcbb1a8a66fb85842387bc0afbd270ee91e27692
 DIST system_filter.exim.gz 3075 SHA256 3a3471b486a09e0a0153f7b520e1eaf26d21b97d73ea8348bdc593c00eb1e437 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3 WHIRLPOOL ce68d9c18b24eca3ef97ea810964cc1ada5f85b795a7c432ad39b5788188a16419101c92fb52b418738d760e1d658f7a41485e5561079a667d84d276c71be5a4
 EBUILD exim-4.80.1-r2.ebuild 12083 SHA256 5ba65d2507f561a1adbc15091562209979f18bc90e2323580c935386101298a1 SHA512 b79d8688bf37316f9e94ad7870ca53b48cf56c7061bcfafd6741478da17a30d406e512293ac8bc47c5774a6cc5114a4ea7f372f61772dc9a26a8ebec9697e22c WHIRLPOOL 05ba7fd9947c8b35a9b1304d6ad474b03dd45c6fdf273cea8e8e839b8b73a407115d97e924bc36d112417d1eb180e9e18f998f3f7a3f23a42fdd3a92ef6287bd
 EBUILD exim-4.80.1-r3.ebuild 12094 SHA256 c505f9e7c21d1bbc663e21a5423ece90162e34dd2d26fe6c13f72b0ea0a68872 SHA512 6df242718bc1eb8ed62a5f07e3479422a1cc5d41ee61e4d2293ec5a7cf06c5e30b20b799656fb57157c555a0f985f0433cce75e970f357093a30274a2b40fde3 WHIRLPOOL d9ad58df38b60cf2d5194adacd1b75534c866c7efa6f739f39ea9329ef144848a1821fed7743662a0e349aeb83ae9b7a71f6d37b29db93596f4c7308c3ed8d4a
 EBUILD exim-4.80.1.ebuild 11556 SHA256 8630f221f92ddd17cf05891d308d5e1347b550f2c6df596916e289dc2129149f SHA512 1d96761c1a2705be3e21e675ac5ecbbb11a97b140f483fd1067552c5ce07f6e3f0266bfd1139525e43c4fbc7a2ecf5b6e444912c2c6d6bbe3618d7f08c31dd2e WHIRLPOOL 2c994828d448d3266f33f514c595c21b61517ceb4ac13a7c2de519945cd853f100f16a8f3d17a956412b8be4a2a80197a316947d81f1db512d33b09c9b3ecca5
-EBUILD exim-4.82-r1.ebuild 12694 SHA256 7185065bdf7168f8e09fb60d9f297d10819c703204da924488ad2d7f322860b3 SHA512 d904c4c2eba40c7ee5ab1d05c52d7bf4ae13bab1ddb144615536d01620221017ccdf98cca255c52e14416aef1195dbbf1ad1b7d8a9fff45e62139dbd829ea077 WHIRLPOOL f0162c5f3834edfa55b4a3697d91a498e69dc583423d5eb3d04a98d5bc07fbdbc8d3d6cd92fc69883f090425375296867bfd4995044970ad6ae735cbcf0fdfd4
 EBUILD exim-4.82.1.ebuild 12695 SHA256 7f5eeefae8ea4d39433679f391e17764aa6a1a0454bed1fafeee714067e68091 SHA512 fafdcba9b1f196bb2637a57d5888537b213f6e14542f4938d8bcfff833f72faa526e0cdf19072b41ff8e3dc6ce674c218d2e321e0eb9e3df619b7fbb06e2797a WHIRLPOOL d2d170e46754b3ca46a5ac9f6c5436be51f6620e3a38e70e09e835b913f5e64b72fec97071e3e4937d981094d68b70ea7a16eab2969cc91d8c43eb7e54fca8cd
-EBUILD exim-4.82.ebuild 12321 SHA256 352faa63c8535e53d3fff78e2a66aa33bc8c01978caf2ff73e006a9d4a708742 SHA512 d70d4d7e5e1805487936b303fdd3cbc150614dfd7d0fbfa819bdf00f80f9dc889ce2019966a487840eec6d92eef07ab5f654c64b0217974034d361ead15531d1 WHIRLPOOL b44e33964f2c432b6765587f63ec8667b688637baeadbd1b3a78dda9fe420ba62bbbcc77fff9838a9fc22dbcf9f2aac94d5c1dd7ae0319d1f458e8713eb4940d
 EBUILD exim-4.83_rc1.ebuild 12099 SHA256 f2899df0919433ba3f4599ac76e7ec7d8f6793404755985ad6ee3ab42b17685c SHA512 33637fd5f20eb221d2ee32586fe2f5f86200e31906852733ebf867505255e4e65ae05bcca84d33c4c7ea0c023ed03780646902194ce510acb19f17d8a63a1647 WHIRLPOOL b9cccc9e32502f75f1824053655aaadff4d7183f613a70c0981265e4ea8e7b9c70b674e8c2689d2bc553c1b60c648bfe5472ee2eb74b95fced65802808c43281
-MISC ChangeLog 52730 SHA256 d86c99e6fa9d90bd42928a409f86d0e47f86150752ed92e6bd85688a811179ba SHA512 8c0a297f07861ce815337bc585faa48be780a2884fb5ce16ec0dbeac4586d95734450f89e3509455d7c0d4ae718f7072de18694b6211c843be726adad2cbc8df WHIRLPOOL aef4b33af9d6bab7c13063c91a841d7d2222079e55781c10e277adba937f5a09c3eb2610a6e1188930e9c4971c03958bbb17e3e07243a00c7b8d17c95a5cd7f8
+MISC ChangeLog 52867 SHA256 dd59d97baf77c164741b2c906e60d8d0b6d9fa5624ef99221675db922f8d9e15 SHA512 5779e0dc0d15163f8fbbec6c393171ec18fd61b105ae47408018b03ff9b1eac089c1e8f06a8daf3565c928bf879dbd8e1a4e5f4aee72fee21d9fa06251aa2deb WHIRLPOOL f59a031a2ca649d06ecf3c8d916ef0bd7f37a8f75312e9c29a8787b05bedd5d4bd1bd881db18d7ecf51d17d64f637653a4de8d96e298e233ccfa1f20ae53a2b1
 MISC metadata.xml 2299 SHA256 a2985b24eb4e06b72f5c3a77403fd36e511112d789c584c391f344f547b21bcf SHA512 a7d4c9faf6240b5795e1da7df99f918bf438b1bf93fbe9ce12269b0f48000beb622dfad2489337f35b42c342605cd19359edf4e581794fc33f76a4cb0d035568 WHIRLPOOL 7eb7ade4038826e0947df620a65044acd2167b32126963c3f28336050680b05e4dca211588b722e7fb8273e13e171690a5ba0114182047e0690c43fdf244b71f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (SunOS)
+Version: GnuPG v2.0.22 (Darwin)
 
-iEYEAREIAAYFAlOHIKUACgkQX3X2B8XHTomN9wCfV5+H9OEDvHcLp595jv7VKzUH
-M24An2cBgjqJRGKTD35oCx50bIK3Rg7h
-=z/o/
+iEYEAREIAAYFAlOHZIgACgkQX3X2B8XHTonWJgCfWLdf+gc6ybj9nRgmlqlLFTA9
+gsUAoIG5+wHd18TCgFBRv8vC9UbdMANI
+=Gj2w
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/exim/exim-4.82-r1.ebuild b/mail-mta/exim/exim-4.82-r1.ebuild
deleted file mode 100644
index c58ed06362f7..000000000000
--- a/mail-mta/exim/exim-4.82-r1.ebuild
+++ /dev/null
@@ -1,393 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.82-r1.ebuild,v 1.4 2014/03/04 21:22:02 naota Exp $
-
-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 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 )"
-
-DSN_EXIM_V=482  # local version patched by us
-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
-	doc? ( ${COMM_URI}/${PN}-html-${PV//rc/RC}.tar.bz2 )"
-	#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="~amd64 ~hppa ~x86-fbsd ~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[pkcs11?]
-			  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.26-r2 )
-	redis? ( dev-libs/hiredis )
-	selinux? ( sec-policy/selinux-exim )
-	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 )
-	"
-
-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
-
-	if use dsn ; then
-		epatch "${FILESDIR}"/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}/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
-	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 dmarc; then
-		myconf="${myconf} -lopendmarc"
-		sed -i "s:# EXPERIMENTAL_DMARC=yes:EXPERIMENTAL_DMARC=yes:" Makefile
-		mycflags="${mycflags} -DEXPERIMENTAL_DMARC"
-	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}/run/saslauthd/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
-			use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> 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 redis; then
-		sed -i "s:# EXPERIMENTAL_REDIS=yes:EXPERIMENTAL_REDIS=yes:" Makefile
-		LOOKUP_LIBS="$LOOKUP_LIBS -lhiredis"
-	fi
-
-	if use mysql; then
-		sed -i "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE $(mysql_config --include)"
-		LOOKUP_LIBS="$LOOKUP_LIBS $(mysql_config --libs)"
-	fi
-
-	if use postgres; then
-		sed -i "s:# LOOKUP_PGSQL=yes:LOOKUP_PGSQL=yes:" Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I$(pg_config --includedir)"
-		LOOKUP_LIBS="$LOOKUP_LIBS -L$(pg_config --libdir) -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
-	if use dlfunc; then
-		sed -i -e "/^# EXPAND_DLFUNC=yes/s/^# //" Makefile
-	fi
-	if use prdr; then
-		sed -i -e "s:# EXPERIMENTAL_PRDR=yes:EXPERIMENTAL_PRDR=yes:" Makefile
-	fi
-	if use tpda; then
-		sed -i -e "s:# EXPERIMENTAL_TPDA=yes:EXPERIMENTAL_TPDA=yes:" 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)" \
-		AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" 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
-
-	# 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 'exim@.service'
-	systemd_newunit "${FILESDIR}"/exim-submission_at.service 'exim-submission@.service'
-
-	DIROPTIONS="-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
-	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
-	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.82.ebuild b/mail-mta/exim/exim-4.82.ebuild
deleted file mode 100644
index 3d50a3f7c721..000000000000
--- a/mail-mta/exim/exim-4.82.ebuild
+++ /dev/null
@@ -1,381 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.82.ebuild,v 1.4 2013/12/30 08:08:58 naota Exp $
-
-EAPI="5"
-
-inherit eutils toolchain-funcs multilib pam systemd
-
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl lmtp ipv6 sasl dnsdb perl mbx X nis selinux syslog spf srs gnutls pkcs11 sqlite doc dovecot-sasl radius maildir +dkim dcc dsn dlfunc dmarc"
-REQUIRED_USE="spf? ( exiscan-acl ) srs? ( exiscan-acl ) dmarc? ( spf dkim ) pkcs11? ( gnutls )"
-
-DSN_EXIM_V=482  # local version patched by us
-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
-	doc? ( ${COMM_URI}/${PN}-html-${PV//rc/RC}.tar.bz2 )"
-	#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="~amd64 ~hppa ~x86-fbsd ~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[pkcs11?]
-			  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.26-r2 )
-	selinux? ( sec-policy/selinux-exim )
-	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 )
-	"
-
-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
-
-	if use dsn ; then
-		epatch "${FILESDIR}"/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}/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
-	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 dmarc; then
-		myconf="${myconf} -lopendmarc"
-		sed -i "s:# EXPERIMENTAL_DMARC=yes:EXPERIMENTAL_DMARC=yes:" Makefile
-		mycflags="${mycflags} -DEXPERIMENTAL_DMARC"
-	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}/run/saslauthd/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
-			use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> 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 $(mysql_config --include)"
-		LOOKUP_LIBS="$LOOKUP_LIBS $(mysql_config --libs)"
-	fi
-
-	if use postgres; then
-		sed -i "s:# LOOKUP_PGSQL=yes:LOOKUP_PGSQL=yes:" Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I$(pg_config --includedir)"
-		LOOKUP_LIBS="$LOOKUP_LIBS -L$(pg_config --libdir) -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
-	if use dlfunc; then
-		sed -i -e "/^# EXPAND_DLFUNC=yes/s/^# //" 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)" \
-		AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" 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
-
-	# 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 'exim@.service'
-	systemd_newunit "${FILESDIR}"/exim-submission_at.service 'exim-submission@.service'
-
-	DIROPTIONS="-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
-	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
-	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"
-}