Revbump fixing various small bugs (#436406, #477748, #455346, #447418)

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

5 files changed, 397 insertions, 12 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index fad7a2815f8a..f9375adb88c4 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for mail-mta/exim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.244 2013/03/23 18:00:38 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.245 2013/07/22 19:00:53 grobian Exp $
+
+*exim-4.80.1-r1 (22 Jul 2013)
+
+  22 Jul 2013; Fabian Groffen <grobian@gentoo.org> +exim-4.80.1-r1.ebuild,
+  files/exim.logrotate:
+  Move pid-file to /run, bug #455346
+  Drop unnecessary (and sometimes errors producing) postrotate SIGHUP, thanks
+  Alexander Tsoy, bug #477748
+  Add dlfunc USE-flag to allow external dlfunc libraries to be compiled,
+  based on patch by Marcin Mirosław, bug #436406
+  Bump to EAPI4 to use REQUIRED_USE for spf and srs USE-flags, bug #447418
 
   23 Mar 2013; Fabian Groffen <grobian@gentoo.org> exim-4.80.1.ebuild:
   Set sensible default for relay_from_hosts when IPv6 is enabled, bug #448314
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 86443d2ef93a..e710706714f2 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -13,19 +13,20 @@ AUX exim-4.77-as-needed-ldflags.patch 5954 SHA256 3960f6883f7c3b44110ca5916ad8fa
 AUX exim-4.77-makefile-freebsd.patch 1124 SHA256 50108e7f26ca2acb594d3d9a57c25ad041f32ada729b604da7378e9376b3ac7c SHA512 99dd86a5aedb6505356e3c5614b065a68d4bbae69502cd5c0a780038c231fb1047e21a2f0b8757a65d6b1a6dcdf8a7f7416a299edc1c85adeec4e362b992f321 WHIRLPOOL 33a4d49572cb3beafe2680b742fe68ceb6d7098be4244677c3ae2ea23dfed8af1be4ef91f0247e5d69adec5679dd02cb3dc71233ba4cb3418f93c70e717727fa
 AUX exim-4.80-spool-mail-group.patch 946 SHA256 4f013e30f6f96360baa7d5d7818eaf5247984ab0eb43b8b5ba8d1bd8704b811b SHA512 24f30e9a9d90dc0f1fe8b3db26f8bc2649182b4e78110dc28a9c0f3a3feb7589f923144a4f1c54a1c46ff8cfe40826a1f2212787753be752f4d15a72d54a143b WHIRLPOOL aa34f4e721fda796ebeb091514ec35ffcf153e813b7760245d25da5d6f27590734d28032498a0ffb2262e170355b0a99b53947818e669d1f79bd0393ae85a2d6
 AUX exim.confd 62 SHA256 668f912565a59926957090c6143f669f0e9de2cf441507d3c05fcd046865b401 SHA512 24bae5bba1b41e59247cd7089c3f9ffcc5f4b26c3da1b21f755724a7ee5c99a05e324437c965ae86170056cc63b9bcdc41f624a747ab31b887d69cff620f2155 WHIRLPOOL 8251fa29fadaac5157fcbade5166598d471d13869e30dcbb445bd56e706568fc5f78b7d7cf4f5147f97ef524bcac0e68ea8d4955b071d9f3df7a57f5ce5f297a
-AUX exim.logrotate 206 SHA256 ecd7f245baaf54ee598c67347747fae5aad1f702da7db459ddbac60906943b3c SHA512 a68c0ad8eb6184daf8b19a9ee46492017513e6c134d7871c6f9fccb63d3565e3032cfb19dc71cbeeb6eca0e3bea922f3fcfbbbdcb79219e1e89a1e6e5b97d171 WHIRLPOOL e02e6927f4b4edfede8212f2776333295bdc6e27628a578b3fa9fdac4ef8a40fc7f389677760b5f346747286425f071e234b8092cf2429651d7e5befff9b00b4
+AUX exim.logrotate 131 SHA256 a86a8acabdfaaacb3ec87ae7b0a22bce07053124ec7fbead4afb12d3d0ee5cea SHA512 d0ecd318a53aad27264e4c0b68d109f150c4305f5daa65b63cba1a2b8f06c7df6f210785560800f1d36baf85a75e36fef7c2b0b13987fc400e78f21a224b8737 WHIRLPOOL 6ff090f25fe4c90797595a11db7649081ce021c7500893cb58cc95d3a1976a76a954448919058806b90ac5b1a6ca74762e7d0e7b82fddd6ffc5974f16c3beae6
 AUX exim.rc7 765 SHA256 9f98b698bc74e69f1b1595a108c49500dfc58d15b193bd59f3ec36bbbe648cf6 SHA512 2ed0c6d67fef47b83b552b4850bc74553ab552700523a81e0d28597c3569c24f53b43da8bcfebee32565975528d8b7e169372dd574f577c2eaacc2bf80890306 WHIRLPOOL 86a61f6d45fe3e445e10efcab449e397cb0ef15d945d6d8344003fd34f36dcb2fc5a9aef0eaa6b329c510391067ee1f20c2daf76aa5038c1f6234f323c462e4b
 DIST exim-4.80.1.tar.bz2 1650082 SHA256 9565b10f06be224fd03adafae2e07e6fdbb479f8873e3894ddb13f98eeebe78f SHA512 ed73dd34dc02ab91896c3cdcedb0618ca3be116904c8eeb1303fc3534f8ab9430083f654fa5af994b0e01049e7fdd22d268fed9a3318b64a56c3a61d7f2174f5 WHIRLPOOL d556b7515f081f39a7bb7cb16804f0e13b37a3295a5f19faf28f9fed0966411f13b521dd7e5a8f42a7a851fa46e15ef8478caff734903080f31e910fb1530eab
 DIST exim-html-4.80.1.tar.bz2 404894 SHA256 206ef4acc2641f10f3f23f8ee97cd1f7125486938ea1fc231ac2a1d5d6c9be09 SHA512 c3f7eef6c7d1981185c5d7bae6a1bf4645468d105e85990accf56f66daf809ad8fb0f3e50925339a72c510e2cc0eced864bc06d526e5b735744f4478dd32d373 WHIRLPOOL 7d67d196e0613fba36d7e1e1370b0b1a6f60739befaa7d2f9661bcef9f57df9586aa63a99faa6a5d25619c2cd7186d2bdf27059f1d229be5d8199d6ec3f6b49c
 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-r1.ebuild 11818 SHA256 cebb11697ed8c94d73cd1375435a0ffaf288ee259e9a1fa69c358cfaf32d3c0d SHA512 81739bbd9e8e34ea7f53f7643e1922b876ad88f60c1cdc86c207f0a968c6b3a705caea527bc9bc82faf6bf992c440d208a73c0b4f0bdc5e8e955eb0b014a2a68 WHIRLPOOL 00f49ad28a8f194eb24d2e4e80f39dd475313046027e7d28a8e619a958e0a894030a533025ecc9ec860ba23eb4cfdf4103c0a1013acbfe318b27bf4ec998b19b
 EBUILD exim-4.80.1.ebuild 11527 SHA256 d9abb6d919c25dcde132f31c5b58199f23dcdcace11eb2a2bbd2d83b40790974 SHA512 b55a4a3a7aa81a492881ea402a0455cd03fa4db6ff19cdf5b7f386440704ced53d45ce119572557c5bcef8df76e75541d383be3623298cf2af420788ba1e450b WHIRLPOOL 7425c30f5a2ccc931c3abc23240f0efa0d5fe9c24a55b9bab24006a1572adcdb7e893acfe3abbed6dffdb9b53d0dda16fb50a61f7446ffa15a431b75c188782e
-MISC ChangeLog 47622 SHA256 3f61187904d775afeabf4a9750d359c96f30b4d5a0c85b7e429c91fd5ac7de5e SHA512 43b9360bb4bb1faf0ef5d0005ebacbbcafd60c1719613b510bb2894ff4d805fcc8dce80be15828bab1b278d213b481b628995a42d4e22c2cd0ce6498fd49e519 WHIRLPOOL a4bd566569561da30137e33b88c4bd7c77a5993678f0247078b196762a57d6ee3f70b0fcddbdf0906b201076a2c04d3223c883ac0633985aedcfd301eead61be
-MISC metadata.xml 1745 SHA256 6c25800686eeb918e03fbe6caa54c38512c843e8eca3a2db8783289a9b12bea5 SHA512 5528534fb15dc9b032a19b4bbb5f5a71936c7f068a9496a13cc279d3e0c3c6c2837c9503fb28141c894bb8c5079b5aaf33667ca67d45a4cd4b7d6c5d52e9a7bd WHIRLPOOL 951ec71dcffdb4c82c000f07f2c417c30c11a063d1f20995e55bd45e10b8addcb531c0a2c0e984a7d40b0a03753f5ba1dd42c9209563cc53941afaf42d8d372c
+MISC ChangeLog 48096 SHA256 a165d40260d9e0162837fb1df4e4d44f3b3d17da0e9fd4b8cb62c89b7970b614 SHA512 a7c1c6b97b79a0d8ba87f46a84ab332b26ce6a22fc8c131237c81cd4614949bd225fe8df714ed5f13bcc85dbfc56f8c0540985711ea32811a8715d8d75159a84 WHIRLPOOL 60f5e29acabfea369a29698ba86c09dab1419f3b297432ad1872a8dd9aa1963f4ec7cc31fab4a2da40d5584137565e96f8b3c7c0a010ca7c720c97d8c5f8b163
+MISC metadata.xml 1842 SHA256 1f8d0a0ac10f8ded348ca80419a3c6811ba7b6bf9d48a94a058e2b90414f5e59 SHA512 423fdf58ed326ae7590c8f74c1da1a3d46b1b81ba6ef301b636ce6217ba73e5d24b80ded88a6817e05df5c9ccdb8854483879e7d617d47c6e41ce83c218809b2 WHIRLPOOL d7f1e4bab5f5576a13c9bc99fac06aea7a844855996a5345b0dacba4b4a2a5307da958a1e0029fafc157ca85fe7f5260230dcbcd25c2c925674a0f022b4fca4c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (Darwin)
+Version: GnuPG v2.0.20 (Darwin)
 
-iEYEAREIAAYFAlFN7dIACgkQX3X2B8XHTolQRACffKmhetgAQvCvRSQZMbv1gyfF
-XacAoKNKNq03Zkvxub+asZzr9rVhLmYT
-=g9lh
+iEYEAREIAAYFAlHtgWcACgkQX3X2B8XHTom1GQCfYuKtkYCDWofO7hAQoB09AYXF
+XJsAoIUaTh0blQIweAyMzkN3o5AFrH3W
+=PieO
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/exim/exim-4.80.1-r1.ebuild b/mail-mta/exim/exim-4.80.1-r1.ebuild
new file mode 100644
index 000000000000..934ecff61954
--- /dev/null
+++ b/mail-mta/exim/exim-4.80.1-r1.ebuild
@@ -0,0 +1,375 @@
+# 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.80.1-r1.ebuild,v 1.1 2013/07/22 19:00:53 grobian Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs multilib pam
+
+IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl lmtp ipv6 sasl dnsdb perl mbx X nis selinux syslog spf srs gnutls sqlite doc dovecot-sasl radius maildir +dkim dcc dsn dlfunc"
+REQUIRED_USE="spf? ( exiscan-acl ) srs? ( exiscan-acl )"
+
+DSN_EXIM_V=469
+DSN_V=1_3
+COMM_URI="ftp://ftp.exim.org/pub/exim/exim4$([[ ${PV} == *_rc* ]] && echo /test)"
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="${COMM_URI}/${P//rc/RC}.tar.bz2
+	mirror://gentoo/system_filter.exim.gz
+	dsn? ( mirror://sourceforge/eximdsn/eximdsn-patch-1.3/exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch )
+	doc? ( ${COMM_URI}/${PN}-html-${PV//rc/RC}.tar.bz2 )"
+HOMEPAGE="http://www.exim.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+
+COMMON_DEPEND=">=sys-apps/sed-4.0.5
+	>=sys-libs/db-3.2
+	dev-libs/libpcre
+	perl? ( sys-devel/libperl )
+	pam? ( virtual/pam )
+	tcpd? ( sys-apps/tcp-wrappers )
+	ssl? ( dev-libs/openssl )
+	gnutls? ( net-libs/gnutls
+			  dev-libs/libtasn1 )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.14 )
+	selinux? ( sec-policy/selinux-exim )
+	spf? ( >=mail-filter/libspf2-1.2.5-r1 )
+	srs? ( mail-filter/libsrs_alt )
+	X? ( x11-proto/xproto
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libXaw
+	)
+	sqlite? ( dev-db/sqlite )
+	radius? ( net-dialup/radiusclient )
+	virtual/libiconv
+	"
+	# added X check for #57206
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/mini-qmail
+	!<mail-mta/msmtp-1.4.19-r1
+	!>=mail-mta/msmtp-1.4.19-r1[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/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.77-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
+		cp "${DISTDIR}"/exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch . || die
+		epatch "${FILESDIR}"/${PN}-4.76-dsn.patch
+		epatch exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch
+	fi
+
+	if use ipv6 ; then
+		# set a sensible default, bug #448314
+		sed -i \
+			-e '/^hostlist\s\+relay_from_hosts/s/\(127.0.0.1\)/\1 : ::::1/' \
+			src/configure.default || die
+	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 srs; then
+		myconf="${myconf} -lsrs_alt"
+		sed -i "s:# EXPERIMENTAL_SRS=yes:EXPERIMENTAL_SRS=yes:" Makefile
+	fi
+
+	# enable optional exim_monitor support via X use flag bug #46778
+	if use X; then
+		einfo "Configuring eximon"
+		cp ../exim_monitor/EDITME eximon.conf
+		sed -i "s:# EXIM_MONITOR=eximon.bin:EXIM_MONITOR=eximon.bin:" Makefile
+	fi
+	if use perl; then
+		sed -i "s:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" Makefile
+	fi
+	# mbox useflag renamed, see bug #110741
+	if use mbx; then
+		sed -i "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" Makefile
+	fi
+	if use pam; then
+		sed -i "s:# \(SUPPORT_PAM=yes\):\1:" Makefile
+		myconf="${myconf} -lpam"
+	fi
+	if use sasl; then
+		sed -i "s:# CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/var/state/saslauthd/mux:CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/var/lib/sasl2/mux:"  Makefile
+		sed -i "s:# AUTH_CYRUS_SASL=yes:AUTH_CYRUS_SASL=yes:" Makefile
+		myconf="${myconf} -lsasl2"
+	fi
+	if use tcpd; then
+		sed -i "s:# \(USE_TCP_WRAPPERS=yes\):\1:" Makefile
+		myconf="${myconf} -lwrap"
+	fi
+	if use lmtp; then
+		sed -i "s:# TRANSPORT_LMTP=yes:TRANSPORT_LMTP=yes:" Makefile
+	fi
+	if use ipv6; then
+		echo "HAVE_IPV6=YES" >> Makefile
+		# to fix bug #41196
+		echo "IPV6_USE_INET_PTON=yes" >> Makefile
+	fi
+	if use dovecot-sasl; then
+		sed -i "s:# AUTH_DOVECOT=yes:AUTH_DOVECOT=yes:" Makefile
+	fi
+	if use radius; then
+		myconf="${myconf} -lradiusclient"
+		sed -i "s:# RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf:RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf:" Makefile
+		sed -i "s:# RADIUS_LIB_TYPE=RADIUSCLIENT$:RADIUS_LIB_TYPE=RADIUSCLIENT:" Makefile
+	fi
+	echo "EXTRALIBS=${myconf}" >> Makefile
+
+	# make iconv usage explicit
+	echo "HAVE_ICONV=yes" >> Makefile
+	# if we use libiconv, now is the time to tell so
+	use !elibc_glibc && echo "EXTRALIBS_EXIM=-liconv" >> Makefile
+
+	if use ssl; then
+		echo "SUPPORT_TLS=yes" >> Makefile
+		if use gnutls; then
+			echo "USE_GNUTLS=yes" >> Makefile
+			echo "USE_GNUTLS_PC=gnutls" >> Makefile
+		else
+			echo "USE_OPENSSL_PC=openssl" >> Makefile
+		fi
+	fi
+
+	LOOKUP_INCLUDE=
+	LOOKUP_LIBS=
+
+	if use ldap; then
+		sed -i \
+			-e "s:# \(LOOKUP_LDAP=yes\):\1:" \
+			-e "s:# \(LDAP_LIB_TYPE=OPENLDAP2\):\1:" Makefile
+		LOOKUP_INCLUDE="-I${EROOT}usr/include/ldap"
+		LOOKUP_LIBS="-lldap -llber"
+	fi
+
+	if use mysql; then
+		sed -i "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" Makefile
+		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}usr/include/mysql"
+		LOOKUP_LIBS="$LOOKUP_LIBS -lmysqlclient"
+	fi
+
+	if use postgres; then
+		sed -i "s:# LOOKUP_PGSQL=yes:LOOKUP_PGSQL=yes:" Makefile
+		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}usr/include/postgresql"
+		LOOKUP_LIBS="$LOOKUP_LIBS -lpq"
+	fi
+
+	if use sqlite; then
+		echo "LOOKUP_SQLITE=yes" >> Makefile
+		echo "LOOKUP_SQLITE_PC=sqlite3" >> Makefile
+	fi
+
+	if [[ -n ${LOOKUP_INCLUDE} ]]; then
+		sed -i "s:# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include:LOOKUP_INCLUDE=$LOOKUP_INCLUDE:" \
+			Makefile
+	fi
+
+	if [[ -n ${LOOKUP_LIBS} ]]; then
+		sed -i "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3:LOOKUP_LIBS=$LOOKUP_LIBS:" \
+			Makefile
+	fi
+
+	sed -i "s:# LOOKUP_DSEARCH=yes:LOOKUP_DSEARCH=yes:" Makefile
+
+	if use dnsdb; then
+		sed -i "s:# LOOKUP_DNSDB=yes:LOOKUP_DNSDB=yes:" Makefile
+	fi
+	sed -i "s:# LOOKUP_CDB=yes:LOOKUP_CDB=yes:" Makefile
+
+	if use nis; then
+		sed -i -e "s:# LOOKUP_NIS=yes:LOOKUP_NIS=yes:" \
+			-e "s:# LOOKUP_NISPLUS=yes:LOOKUP_NISPLUS=yes:" Makefile
+	fi
+	if use syslog; then
+		sed -i "s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Makefile
+	fi
+	if ! use dkim; then
+		# DKIM is enabled by default. We have to explicitly disable it.
+		echo "DISABLE_DKIM=yes">> Makefile
+	fi
+	if use dcc; then
+		echo "EXPERIMENTAL_DCC=yes">> Makefile
+	fi
+	if use dsn; then
+		sed -i -e "s:#define SUPPORT_DSN:define SUPPORT_DSN:" Makefile
+	fi
+	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,mytypes,store,local_scan}.h
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/exim.logrotate" exim
+
+	newinitd "${FILESDIR}"/exim.rc7 exim
+
+	newconfd "${FILESDIR}"/exim.confd exim
+
+	DIROPTIONS="--mode=0750 --owner=${MAILUSER} --group=${MAILGROUP}"
+	dodir /var/log/${PN}
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}etc/exim/exim.conf ]] ; then
+		einfo "${EROOT}etc/exim/system_filter.exim is a sample system_filter."
+		einfo "${EROOT}etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
+		einfo "Please create ${EROOT}etc/exim/exim.conf from ${EROOT}etc/exim/exim.conf.dist."
+	fi
+	if use dcc ; then
+		einfo "DCC support is experimental, you can find some limited"
+		einfo "documentation at the bottom of this prerelease message:"
+		einfo "http://article.gmane.org/gmane.mail.exim.devel/3579"
+	fi
+	einfo "Exim maintains some db files under its spool directory that need"
+	einfo "cleaning from time to time.  (${EROOT}var/spool/exim/db)"
+	einfo "Please use the exim_tidydb tool as documented in the Exim manual:"
+	einfo "http://www.exim.org/exim-html-current/doc/html/spec_html/ch-exim_utilities.html#SECThindatmai"
+}
diff --git a/mail-mta/exim/files/exim.logrotate b/mail-mta/exim/files/exim.logrotate
index 9961563f2749..bb3c127fb5f2 100644
--- a/mail-mta/exim/files/exim.logrotate
+++ b/mail-mta/exim/files/exim.logrotate
@@ -7,8 +7,4 @@
 	notifempty
 	create 640 mail mail
 	sharedscripts
-	postrotate
-		/etc/init.d/exim reload > /dev/null 2>&1 || true
-	endscript
 }
-
diff --git a/mail-mta/exim/metadata.xml b/mail-mta/exim/metadata.xml
index d1a294f92837..e849696501d8 100644
--- a/mail-mta/exim/metadata.xml
+++ b/mail-mta/exim/metadata.xml
@@ -24,6 +24,8 @@
 			domain name is the supplied query</flag>
 		<flag name='dovecot-sasl'>Adds support for Dovecot's
 			authentication</flag>
+		<flag name='dlfunc'>Install local_scan.h header to compile separate
+			dlfunc libraries</flag>
 		<flag name='dsn'>Adds support for Delivery Status Notifications
 			(DSN)</flag>
 		<flag name='exiscan-acl'>Patch providing support for content