Add support for PRDR and TPDA, bug #489736

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

4 files changed, 22 insertions, 10 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index fb16e5661b1a..a45da5a56d90 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.272 2014/03/03 23:41:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.273 2014/03/04 20:47:50 grobian Exp $
+
+  04 Mar 2014; Fabian Groffen <grobian@gentoo.org> exim-4.82-r1.ebuild,
+  metadata.xml:
+  Add support for PRDR and TPDA, bug #489736
 
   03 Mar 2014; Jeroen Roovers <jer@gentoo.org> exim-4.82-r1.ebuild:
   Marked ~hppa (bug #489736).
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 685190687049..8fd81ec1a3a0 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -32,14 +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 12482 SHA256 c4ac25b35d9d8fcea0426ed38f7184b2505bf5b34a082c58fc99808c8e5a427a SHA512 ea7827dfb6c12b22c043d1e637557dc6a83af6ab73156d6bca5105e680fa9b0e31b3ebd9d5f20f2320e341d5ec945d2d3e6ddc5d90c4bdfa904e7055ac765735 WHIRLPOOL 0f838072da471488f0201e3bae52f0593819e0699ad9def25727d9b34799602453f78ab53999437bcb1a4538894d5dc1513d9c8f544c525c71da56f1aa0b3ec3
+EBUILD exim-4.82-r1.ebuild 12686 SHA256 a2925711de830fc5fafbd36fe35fd3df7423d6ee13bbc4f02ebfc3b365cc078a SHA512 a6541d0732579f46ab69e531ebc9bb187eecfaf44298cad4ca74d6315db64a6d95721d59d5e3099366afbc627146ac335d6390fbcd793807fc13c575c3e8f7c2 WHIRLPOOL 64e2f05c35b2260478e50fb3f89ea0906e29d1b6eb84434d827908d943561d8a547187b7ae64b3fe69e61e3395ca532d8c042a61c2a64e55ed4061a143e23c6a
 EBUILD exim-4.82.ebuild 12321 SHA256 352faa63c8535e53d3fff78e2a66aa33bc8c01978caf2ff73e006a9d4a708742 SHA512 d70d4d7e5e1805487936b303fdd3cbc150614dfd7d0fbfa819bdf00f80f9dc889ce2019966a487840eec6d92eef07ab5f654c64b0217974034d361ead15531d1 WHIRLPOOL b44e33964f2c432b6765587f63ec8667b688637baeadbd1b3a78dda9fe420ba62bbbcc77fff9838a9fc22dbcf9f2aac94d5c1dd7ae0319d1f458e8713eb4940d
-MISC ChangeLog 52189 SHA256 78f6afb605e237bcb9c40ccba9c9572bca692f4ff05c412558f8edbb5523f12b SHA512 7a0a33010640e2d90edcb6be84b46f24d4d05e10a9fb8e3588e8178551732f24d6eb548e7c3dd0ebda79bee8d49b9d8503ccdd394a891fe68332cb6385fe32ec WHIRLPOOL e3049e1a19bff0061bc49e716b0c70796879513e87af19d932dbb31a2d775e34a6db1226a564e968498eae2cb41365b7fbad603db1f87837c38adb9531fde7b3
-MISC metadata.xml 2069 SHA256 2f87c9549ff93582c2fdff1ce432f13bd2d1283c6f12ed18b9003296496a1e1f SHA512 5deec1643fde5303b90498498911b45d0aafc72d395c88ecf69c3dbceefdf3bc6f16b474931e03598d1d55d68a0df8de027a92f4adfd0f6934805269e38fa6bb WHIRLPOOL bf22f5ebb173ead4d6610aaf90164359b5fd385d0cf54489511836981e58d8a127b1f9b5324631266963ca37b29eba03161593b907e21a25bae36f44082e131b
+MISC ChangeLog 52327 SHA256 cb666e65f6139693466fd0e4055adb3409d7d902012b167c961d8ebe522a1cf4 SHA512 527ed49e8cc501032b601bbe4bf928b0a60f4151eaeb264ea9934de3e2d3edc0cd78570548870c5435502efcd17a0f92bda6ed2bf59fd2aa924898f009a5c8bb WHIRLPOOL e2da7db76958b682b5cded63eeb028ed466d7d32ada471e42a34f39e7c9e1bfe4fae32fb2fa915cef5ae42a1d59b066be7f9f88113f0747ec92fa4d3dde843b8
+MISC metadata.xml 2217 SHA256 cd9d6daa5ba91f220a1ac7f581062923924d4b601fc6d437ded14c37315ea866 SHA512 ec5dc6a65f3aa658295acfd51b470ec1255e065f8283053d08b0c9f31310916a1212bad23617e1fc53540def8f90efee5da2bef695200d7a306d27062d09e752 WHIRLPOOL 9b0e5e9f0c2c2608f20faefc8899b3857c18280fb5155a3bd0dd3493ecd0ebce953cb9e55987fb7603a7d6f2001c80287486f25562fac19a573115f9e9b7ca32
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0.22 (Darwin)
 
-iEYEAREIAAYFAlMVExQACgkQVWmRsqeSphMUIQCaAhS7G8IzVkWg4P2AVMOfQBht
-JhYAn2hVcND6KZzyrXN/+pAlSarjy0Oo
-=I8gm
+iEYEAREIAAYFAlMWO/cACgkQX3X2B8XHTolS/ACgmZFI29n2zBXoGDp2QB6bMu43
+vnIAnjApYUCecJ5oJnSHPcN9SnPS1/UK
+=VC9L
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/exim/exim-4.82-r1.ebuild b/mail-mta/exim/exim-4.82-r1.ebuild
index 0f04525d7af8..2227d77afaf6 100644
--- a/mail-mta/exim/exim-4.82-r1.ebuild
+++ b/mail-mta/exim/exim-4.82-r1.ebuild
@@ -1,12 +1,12 @@
 # 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.2 2014/03/03 23:41:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.82-r1.ebuild,v 1.3 2014/03/04 20:47:50 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"
+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
@@ -285,6 +285,12 @@ src_configure() {
 	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
diff --git a/mail-mta/exim/metadata.xml b/mail-mta/exim/metadata.xml
index 14c92a53ec43..ee613437e2d4 100644
--- a/mail-mta/exim/metadata.xml
+++ b/mail-mta/exim/metadata.xml
@@ -37,6 +37,8 @@
 		<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>
+		<flag name='prdr'>Adds support for Per-Recipient Data Response</flag>
+		<flag name='tpda'>Adds support for Transport Post-Delivery Actions</flag>
 	</use>
 	<upstream>
 		<bugs-to>http://bugs.exim.org/</bugs-to>