Add support for redis, by Marcin Mirosław, bug #489736

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

4 files changed, 403 insertions, 18 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index c4c51a2f3dcb..9a0b352a15c3 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,12 @@
 # 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.270 2013/12/30 08:08:58 naota Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.271 2014/03/03 19:37:43 grobian Exp $
+
+*exim-4.82-r1 (03 Mar 2014)
+
+  03 Mar 2014; Fabian Groffen <grobian@gentoo.org> +exim-4.82-r1.ebuild,
+  metadata.xml:
+  Add support for redis, by Marcin Mirosław, bug #489736
 
   30 Dec 2013; Naohiro Aota <naota@gentoo.org> exim-4.82.ebuild,
   files/exim-4.82-makefile-freebsd.patch:
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index ffa0e7331477..8b9117ae7347 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -32,23 +32,14 @@ DIST system_filter.exim.gz 3075 SHA256 3a3471b486a09e0a0153f7b520e1eaf26d21b97d7
 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 12480 SHA256 8a6d58e0c9496d13843865b80473bb1fb379e059eb9920b53843e2c3cf51c538 SHA512 16dfdf4c3e9c743de6f82bf11f438a37664a08cc595e20d95a89e95bd9ba68a6a5c4032030d6b75b8b7800beb5ee7d325091977899b5b000fb751ea18024c697 WHIRLPOOL 9355e03eba4b85ece034a79009ab68777f595cbe38cc5199aabbccf2625322ec78e9f1f3ff9f3dc3d8d1b0bb230f8c94006cd5a5529b43181ea280c103ae8362
 EBUILD exim-4.82.ebuild 12321 SHA256 352faa63c8535e53d3fff78e2a66aa33bc8c01978caf2ff73e006a9d4a708742 SHA512 d70d4d7e5e1805487936b303fdd3cbc150614dfd7d0fbfa819bdf00f80f9dc889ce2019966a487840eec6d92eef07ab5f654c64b0217974034d361ead15531d1 WHIRLPOOL b44e33964f2c432b6765587f63ec8667b688637baeadbd1b3a78dda9fe420ba62bbbcc77fff9838a9fc22dbcf9f2aac94d5c1dd7ae0319d1f458e8713eb4940d
-MISC ChangeLog 51915 SHA256 2ff23e47c83271058395d43f590060f3e7bc54b5597904586659dfba11af012b SHA512 70c9f8132911976277e7b260affd0b5fdd85418f26374781b42b514912764ea77dcf6b896fba33617cde19f2f02539d33ebadea2cc4d3b96deb1f6154b1cbd76 WHIRLPOOL 54697eb38bdd61f9c922453aae7244057aa3c240caf50edd70d384d4150b30610f0365ede144fc5c59f7696337468b7f656ec290a61b0323ce2833e2ecd39992
-MISC metadata.xml 1991 SHA256 b50dad0c801f7918f1a97fb9026cf1717b3584de0cd5f1426c787f26231a8ec9 SHA512 8fe08de4895dffac66f69870e885b00912b77effe053ed29c49a0f6d56ae72e92a19f1eb7de40a89d4830f13c8fa5c195af985d0d1869579e4c7eed1ad36b9c7 WHIRLPOOL 018ec56b871c5b76d208efdcb868ddf8893c1f8032a46873c7ac33db28860dccd8fe81bd137d7a7827851f39355582f57d95399fa03783d2d1130973a1a2b730
+MISC ChangeLog 52094 SHA256 0edf67c20a458f693fb52d9bc648d915665af63603c7b247dfbcab178b317e21 SHA512 838b606566ca7f62b4acd57bc9c264b59f86e808cbe86ee923d57d21e10c046a9cd1892129ae29577b281935b6ac74dfe8c497323f6ee88e59de99bfcdca97a1 WHIRLPOOL 3651c14c195705b865a44e04941eca3fa7b424cb0049ca56c76d4f5bc435cc5b0d2fd78dcee0ef3a62e9c650a030fe119ba99742164fd84ec2a4816c8d4bde4a
+MISC metadata.xml 2069 SHA256 2f87c9549ff93582c2fdff1ce432f13bd2d1283c6f12ed18b9003296496a1e1f SHA512 5deec1643fde5303b90498498911b45d0aafc72d395c88ecf69c3dbceefdf3bc6f16b474931e03598d1d55d68a0df8de027a92f4adfd0f6934805269e38fa6bb WHIRLPOOL bf22f5ebb173ead4d6610aaf90164359b5fd385d0cf54489511836981e58d8a127b1f9b5324631266963ca37b29eba03161593b907e21a25bae36f44082e131b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0.22 (Darwin)
 
-iQIcBAEBCAAGBQJSwSocAAoJEDYO1FT4VRUUY9YP/Ajw+MQ3umyNXkcO4miduF7F
-5SWDuraoVGynGQ/H/GPRnjdP/5IunjbnXgSaym7mg8Uxvv/u1OAhbpBAKhffFSoU
-j6F6nyDt41bZK8FqJ9YCGr53w0ArdEhVhBIkdMuSW9ysedtVLimAljzoz8MtmuA1
-KQI/UdHIdmYjin56RyLH+m0W46IrXrZnRzBHFJqSCJ02j3MPa1A5K4DA0sm6+MBZ
-uskuA1W5paC+5RjfMAy1+X4wEEdfeHVvwivq2vTQl0E/saUSTY4F+ONI2ikyjLl9
-c20Z7I9KCUKUuwJz1uDKvtIEGwvSzmVfLZefgVzLv3x/qzKVjk2fa8hTSd5Mj3Dy
-ebfB2ifeifiZRw5jnAgbLRDAKp6cPlF7BILZhdtk7HyS+mwqJHvMWilYPseI5bVx
-+x93WxghA1Z8oXWKodf6XzFoTdcflxJMbCSPmZzmN5td+41oj+i+KKGbNemORndF
-Hs+7+QLdHi613ict03p7gbz270WA3eAtE9rvNOGcpAIngOOqieWjtUMsLs7/v4B/
-/xE5p3ReQ/MGpu5pUn2d3UtL9yifzjaycRC9evwsNNDE2M4f0Y8cUXuzfDkVwIlX
-srdU/FsprqeXlPTFJYE9v+pA+6Rx2+9EvOxyDpFakLHSRLcTtdzJqvD0eoYRILc+
-8q4qlmLlemE4i1+p5Cy0
-=O1jX
+iEYEAREIAAYFAlMU2g4ACgkQX3X2B8XHTolhFQCfeYxajyhAlfKvs2qshM9kRxB1
+LEMAnA4z8/qeE3VDyS3R8ynPHicATixM
+=wnlS
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/exim/exim-4.82-r1.ebuild b/mail-mta/exim/exim-4.82-r1.ebuild
new file mode 100644
index 000000000000..66e25e06460f
--- /dev/null
+++ b/mail-mta/exim/exim-4.82-r1.ebuild
@@ -0,0 +1,387 @@
+# 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.1 2014/03/03 19:37:43 grobian 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 radius redis sasl selinux spf sqlite srs ssl syslog tcpd 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 ~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
+
+	# 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/metadata.xml b/mail-mta/exim/metadata.xml
index e7809e9adbc8..14c92a53ec43 100644
--- a/mail-mta/exim/metadata.xml
+++ b/mail-mta/exim/metadata.xml
@@ -36,6 +36,7 @@
 		<flag name='spf'>Adds support for Sender Policy Framework</flag>
 		<flag name='srs'>Adds support for Sender Rewriting Scheme</flag>
 		<flag name='pkcs11'>Require pkcs11 support in <pkg>net-libs/gnutls</pkg> with USE=gnutls</flag>
+		<flag name='redis'>Adds support for querying <pkg>dev-db/redis</pkg></flag>
 	</use>
 	<upstream>
 		<bugs-to>http://bugs.exim.org/</bugs-to>