gentoo resync : 11.02.2018

12 files changed, 649 insertions, 42 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 9558922306b5..bc1c2b27ead2 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 7bd3dfaacc1a..f053f423c7a8 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -23,13 +23,15 @@ AUX exim.socket 139 BLAKE2B bb8281a98fdac1b52031d5250fd1e658bf5a2c32e24b49ed0daa
 AUX exim_at.service 140 BLAKE2B 8624f4a555e2acdc7aaf917952c4152ad00dc063a51076aefa1d023d47d5f7fe8b268f3308734f363ed9628cd8551ccac7fc369657e0fdf65507d2e6419f704c SHA512 11c8133ee15b3e5193c9b1c59aed66c81b6e045dd23310bede9fcde6c88905db5ef08afdb798b53b75a7465915ea1247e980edf95db07a7f9b7bb58ce95fbb5a
 DIST exim-4.89.1.tar.bz2 1828699 BLAKE2B 21b3acc73717319c58341f28463d0fd576c725291ae348015f6696f079fc6c3c08c86f9a2c19f81e0019c50b6cb8670466f4b449bf09a454e6b6e02feee60bfc SHA512 391102c5af991c3f9035aefadd031a9ab2505c682a5cd9c2268f82edb01dc5edec94d86e298d2be3c0437c261b63fb2662cc37f4de67106b0325f2c3bf7e0b9e
 DIST exim-4.89.tar.bz2 1844430 BLAKE2B 255bb3f27a264d92bf4664cf1278beabffa888006dfc0b31cde8a04d62501b0fe282db5b959bd303e2a818322716548c97264842130b8d5c3b9075615f668ca7 SHA512 1e059966a93b47f055ab4ec2a4556f2c918aff56ea0367585f3a853f00411e9c275e13be4f9ae615a468fa06263135cd6a138fa1753f1b7fb3259a3321fcca65
+DIST exim-4.90.1.tar.bz2 1854894 BLAKE2B d7fd8963fb8e98e562a87d248b4e0a54c382d922ea9ea0df10d06fd0992dc19b53e85b73e16dc4b8ae294268fa4f66fe1ae98c7bd3a1d62798425fc2a8a4aa01 SHA512 ba612cf056d97dfaac2b49255ad1e952c5f6b2623118a65f4ddae35ceb51a45f63e77956373f5550121bc1d7eb0c2ebeece1144cf1b15d57332a4782e3fb6db1
 DIST exim-4.90.tar.bz2 1873037 BLAKE2B 5498886560f85fba94a5055d9e72eece959cde6db20a589e6567e89b9c7669c4bb421d6a48f3c5d676381aa008088f391007be5de30e033f64e8e6a128059e62 SHA512 0424d5d4eff28d94ade786402cfece3e2760ff0e44da3be5327b8695e4c3c483ec925ab24e13b1ebe145e204ad02b67ae99ff0992705bd1a3c312ede0464c74b
 DIST exim-pdf-4.89.1.tar.bz2 1942785 BLAKE2B 588298b2c3007a94d40370463dec52d9b5c44b72e8c93e9b749e0ed513f1da045b58140f8802edfd9a5e9dd2d9911f70b4d4cdde3b3952c794c6abd9744ed3d9 SHA512 0b7944237fcadf708570c39a7963246fc70579fecafc746ed8e210c3319eed64a4678162c8c4243e84f48396b3b8bcbc3626523984a716b85564ee50c5712333
 DIST exim-pdf-4.89.tar.bz2 1924606 BLAKE2B f03182d51f4cc5b71cb65c2e0bcf74142f8110b6bfbd5b0fc05e321b692ebde5dbc84c4562a39ee85065f4d2db0654e6a189c826bfdea19051f56969d4ca74e2 SHA512 b04ea2e4dcdb1aaf52ef77ccd76e6599c68c4c6e5a98090720dbd3c50f7191bf3f6cd7dc2089a765c47576311780809cff547f85f004caec411d0f1ac9985299
+DIST exim-pdf-4.90.1.tar.bz2 1958791 BLAKE2B 2dcb523dbdaa989ca0a228db31967230b1bbb68cb998c90231108a822ca4dcc7db9e4c4a91034129ba7d9f08bb632379f021c65ea43159e21f9c6bae9060f146 SHA512 9529b9b459cc766a7171cbd37c2fab710acf130131326b8eb50d9c65714297b0139364fe6129e80d2f29ccee88e35497604a80d6d92207e16518c1d96c267127
 DIST exim-pdf-4.90.tar.bz2 2025099 BLAKE2B 9b82d0a0dcace893ab6fd6b2273ed6961aa4b0091909eea49f72cace3ac25d9a861f9883373a4a41753ba2fb0eda118e9df2e779f29e6b988865ba4630e2898b SHA512 4baeabeee5554d9e80edc21b12622bf9d4b84461307f2eacaff0ad583818f7f38306ae1029de1066019327e490a3bd046c175c735fe3c6724c31b34d6171bf45
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
-EBUILD exim-4.89-r1.ebuild 12211 BLAKE2B 2f4f19e73a4794d6f4af8a7cd70ba1725ed4095cc208a599beb3e374368ca9c5bf65f641b57632ee4480f4a01364dc54279236adb525c883e629dcfa5930c997 SHA512 d6f08d234c7776539a81ffed1e3afc1d835f3a7336e48ddc736e87d1c91a7e17dd5d40b6600f3062970472398e5b9edb446015f27fbc499927fabb450e7fdedd
-EBUILD exim-4.89-r5.ebuild 12578 BLAKE2B 771ba0b738fa44cd62611ddb8e7c402100b30af0255053dd463ab35debeac1ca6faf70b4c9bace4b128e9bf341995c0c3dd192c0d41ca6114eeab0377fe71e41 SHA512 4c417876d681f11d8f5a0b6a97825621cbc137e19ff48f9f8d9d38f5c6ce6d1277c9de80d1ec4c5cc388fa3b4e83cdd8e1280c4b0c9bda5886434455707a6eb0
-EBUILD exim-4.89.1.ebuild 12301 BLAKE2B 7ecad73cd39ee34c1bfb6a52f0fa93151e308f0a80b799a78ab1284e4a9798344a60ba89c223239085fb0dd9c1ed75cef1e780771e22f0e9df36850b9f4fbdf7 SHA512 f3bb3a44600d182aa03c7fe813afe7801e72e852da03777d9cc2572b1928856cdca5622b44634732ae98d5b4eac480b90464064aefcaf4906f9a266ea00c6e63
-EBUILD exim-4.90.ebuild 12233 BLAKE2B f13122c9432d567ce68d934f5871378fcdd3351bbce76a0631e08abc744a68dda22f02a829d1cc92ad43acc8e05b1198850ae9d5db12f0bacacfc650e49d14b4 SHA512 beb800d1fd149d424dad19556b6dff7cf60948490103b1005d0bf97f67f2a6cc48940c3fc66c2aac71dfc38c2b8bd49bc60ffb0f3674a522d7832613a0f2877c
+EBUILD exim-4.89-r5.ebuild 12585 BLAKE2B 4ab8179cf41e847edcc23214e149e5af9270ebd9367cccf233c17ed3406299f810a195ccbb75368f8a2921a717814e2d4e33dcbe4525cba2d7ff76384138eda3 SHA512 fdd78249ade5e6d1d11a47a71283d47940709d8292b6129722d63f91d422067f4850c350edf28dfce88b7513785f0f0f764bf98a9155be62af404343153c144b
+EBUILD exim-4.89.1.ebuild 12309 BLAKE2B 03cb1d877ccc0057c3242efe64979621c6455aac6371f2ea5cb7eff13b71bc9858cd427d3335269543e03591b2d8b9cb128ede714ef58611b60cdb98e5036adb SHA512 03c237f71fd4d5ede14c02314f2ffce98ccc04337b49ea089d7abf1bceb457eef2baede38d047a75d43d76ec367c0e0f21adb524db0dd8429c6d23dc4f9dbe5e
+EBUILD exim-4.90.1.ebuild 12241 BLAKE2B 62d34f83130e91e4feee5468b1088ef78d23f7fed201b652c13b3c9d22330200cf8b01e745dec0fd4ebc80c4f44614cad744e9944d2c4376f719bf1d20c0a720 SHA512 f3f6ebe42fa81f5527ffdd786a6ab76704bd2bb2caa7263d3931dc1a234fdb27bf2c4c5459d1c2339ad0904906aa2463368135b61b8194c19d3cdda1ac260540
+EBUILD exim-4.90.ebuild 12241 BLAKE2B 62d34f83130e91e4feee5468b1088ef78d23f7fed201b652c13b3c9d22330200cf8b01e745dec0fd4ebc80c4f44614cad744e9944d2c4376f719bf1d20c0a720 SHA512 f3f6ebe42fa81f5527ffdd786a6ab76704bd2bb2caa7263d3931dc1a234fdb27bf2c4c5459d1c2339ad0904906aa2463368135b61b8194c19d3cdda1ac260540
 MISC metadata.xml 2482 BLAKE2B 8cc92e47224d8afbc72bd61d6651887f5211c4ebe36ae1d38e55ed395dee9574307b075bcf36fcd0761be0358c2bc27cfc0e60294a48483b444d4534f5c0b9da SHA512 dcda0d8164098a41d7defa30b84b36bfdc6fc1fecce2dc680aa22341f67be9dad281bdee0b6f9028459b4a62d4f3a83a16bd1cdca99238b114532c7b06f5c25f
diff --git a/mail-mta/exim/exim-4.89-r5.ebuild b/mail-mta/exim/exim-4.89-r5.ebuild
index 226c7601533a..5201343c00fd 100644
--- a/mail-mta/exim/exim-4.89-r5.ebuild
+++ b/mail-mta/exim/exim-4.89-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -7,9 +7,9 @@ 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 elibc_glibc"
 REQUIRED_USE="
-	dane? ( !gnutls )
+	dane? ( ssl !gnutls )
 	dmarc? ( spf dkim )
-	pkcs11? ( gnutls )
+	pkcs11? ( ssl gnutls )
 	spf? ( exiscan-acl )
 	srs? ( exiscan-acl )
 "
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	>=sys-libs/db-3.2:=
diff --git a/mail-mta/exim/exim-4.89.1.ebuild b/mail-mta/exim/exim-4.89.1.ebuild
index 55536b6c0d35..6ccacc0529b1 100644
--- a/mail-mta/exim/exim-4.89.1.ebuild
+++ b/mail-mta/exim/exim-4.89.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -7,9 +7,9 @@ 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 elibc_glibc"
 REQUIRED_USE="
-	dane? ( !gnutls )
+	dane? ( ssl !gnutls )
 	dmarc? ( spf dkim )
-	pkcs11? ( gnutls )
+	pkcs11? ( ssl gnutls )
 	spf? ( exiscan-acl )
 	srs? ( exiscan-acl )
 "
diff --git a/mail-mta/exim/exim-4.89-r1.ebuild b/mail-mta/exim/exim-4.90.1.ebuild
index aab4f2e3242b..e4f0e7b5fa0a 100644
--- a/mail-mta/exim/exim-4.89-r1.ebuild
+++ b/mail-mta/exim/exim-4.90.1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 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 elibc_glibc"
+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 elibc_glibc"
 REQUIRED_USE="
-	dane? ( !gnutls )
+	dane? ( ssl !gnutls )
 	dmarc? ( spf dkim )
-	pkcs11? ( gnutls )
+	pkcs11? ( ssl gnutls )
 	spf? ( exiscan-acl )
 	srs? ( exiscan-acl )
 "
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	>=sys-libs/db-3.2:=
@@ -95,7 +95,6 @@ src_prepare() {
 	epatch "${FILESDIR}"/exim-4.82-makefile-freebsd.patch # 235785
 	epatch "${FILESDIR}"/exim-4.89-as-needed-ldflags.patch # 352265, 391279
 	epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
-	epatch "${FILESDIR}"/exim-4.89-CVE-2017-1000369.patch # 622212
 
 	if use maildir ; then
 		epatch "${FILESDIR}"/exim-4.20-maildir.patch
@@ -146,7 +145,8 @@ src_configure() {
 	EOC
 
 	# if we use libiconv, now is the time to tell so
-	use !elibc_glibc && use !elibc_musl && echo "EXTRALIBS_EXIM=-liconv" >> Makefile
+	use !elibc_glibc && use !elibc_musl && \
+		echo "EXTRALIBS_EXIM=-liconv" >> Makefile
 
 	# support for IPv6
 	if use ipv6; then
@@ -257,7 +257,6 @@ src_configure() {
 	if use exiscan-acl; then
 		cat >> Makefile <<- EOC
 			WITH_CONTENT_SCAN=yes
-			WITH_OLD_DEMIME=yes
 		EOC
 	fi
 
@@ -277,6 +276,14 @@ src_configure() {
 		EOC
 	fi
 
+	# Transport post-delivery actions
+	if ! use tpda; then
+		# EVENT is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_EVENT=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
@@ -376,17 +383,10 @@ src_configure() {
 		EOC
 	fi
 
-	# Transport post-delivery actions
-	if use tpda; then
-		cat >> Makefile <<- EOC
-			EXPERIMENTAL_EVENT=yes
-		EOC
-	fi
-
-	# Delivery Sender Notifications
+	# Delivery Sender Notifications extra information in fail message
 	if use dsn; then
 		cat >> Makefile <<- EOC
-			EXPERIMENTAL_DSN=yes
+			EXPERIMENTAL_DSN_INFO=yes
 		EOC
 	fi
 
@@ -452,9 +452,9 @@ src_install () {
 	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
+	dosym ../sbin/exim /usr/bin/mailq
+	dosym ../sbin/exim /usr/bin/newaliases
+	dosym ../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 \
@@ -522,8 +522,7 @@ pkg_postinst() {
 		einfo "configure DMARC, for usage see the documentation at "
 		einfo "experimental-spec.txt."
 	fi
-	use tpda && einfo "TPDA/EVENT support is experimental"
-	use dsn && einfo "DSN support is experimental"
+	use dsn && einfo "extra information in fail DSN message is experimental"
 	elog "The obsolete acl condition 'demime' is removed, the replacements"
 	elog "are the ACLs acl_smtp_mime and acl_not_smtp_mime"
 }
diff --git a/mail-mta/exim/exim-4.90.ebuild b/mail-mta/exim/exim-4.90.ebuild
index c6f82d8187f9..e4f0e7b5fa0a 100644
--- a/mail-mta/exim/exim-4.90.ebuild
+++ b/mail-mta/exim/exim-4.90.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -7,9 +7,9 @@ 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 elibc_glibc"
 REQUIRED_USE="
-	dane? ( !gnutls )
+	dane? ( ssl !gnutls )
 	dmarc? ( spf dkim )
-	pkcs11? ( gnutls )
+	pkcs11? ( ssl gnutls )
 	spf? ( exiscan-acl )
 	srs? ( exiscan-acl )
 "
diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index 53fe7aa67c78..d023d7e9b283 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -15,7 +15,7 @@ DIST vu555316.patch 617 BLAKE2B fa98c360cb199fc4367c668d605399cc53ab2d26668f5ed6
 EBUILD netqmail-1.06-r1.ebuild 3690 BLAKE2B 3d514287afda99937a2aebc46474bc5df1236f1976bf6b1946a84d1d50e84871b13c73a883b1bc3b749b4fc5265d38234780d1649ea12262777b66e866dc8c2e SHA512 f609b723de624a87863eb152739439a0ec9fe73ac0f451b3ba0d767e79c94264212db0c67fa6561c6760ef72fa840edca3ad4c3535423f7665ea0d62b3050dac
 EBUILD netqmail-1.06-r2.ebuild 3953 BLAKE2B 5736dddbfacf0aca8271630f6a3be3868d8c551f94908033ef6ace94c54b6233ee35e3f1289bf3c57ad61a9cb557541d88c57e97e4f8dd7ef6b6c62f159cc195 SHA512 3cffc0efc1d4e2a0aa9c33a67db7c2f2afb000f2b87e87805d1b2a028e3664e49cbea0a03dcfc5903512bb82fddc50d3db6b2df30edd69a7648cc9ccfff7dafa
 EBUILD netqmail-1.06-r3.ebuild 4027 BLAKE2B e8ba26645946ab2d610267074e4cec3bf785edcc630bb8bca1c3d9b91906f08c647a8e0030edf04bb533b36bf60f4c01a919e03d30f7d173df4f693dd9b3826e SHA512 aff0744852e34f905bdc6f8d2e43faff84af611b4406b823e6e41b6fcaf8336a099620ff766841341a588db7719505a379425b6ecb860b1ffec78732c0d095cd
-EBUILD netqmail-1.06-r4.ebuild 4175 BLAKE2B 07ea9b222a6a6175b258b5f9a622bfbdc7130b58adec4a98b91425f69ec6eb9e341645a18f8fafe3163b113c4bc77fe9f44252b6dcb254ef2dc6a4836a37e6d1 SHA512 85fe524e8a500100ae7e28ff283f7527fc31cee71f3e0d018a07d3ebd1b3f133697d6924248418e5399535414fe0ecb91d01fae26ba5c2f003f464efaa9d7999
+EBUILD netqmail-1.06-r4.ebuild 4174 BLAKE2B 87a50b93b61c5fa9b638cf652985d85797a780eb24e1ea8cc2d618ba731cee35cc851acbe89f0745f66296f0baa54e171a26320d1f16bb67a6ab7d3c8f1d976f SHA512 32853b028dd94acd2cd72f38ea20248da25adf0eee218d916aeffab2d5fa447fa0ed93e228e27ded11b77c519e0d50c3a588edc5cfbb27aa5947417eb30c4ff9
 EBUILD netqmail-1.06-r5.ebuild 4308 BLAKE2B 38decdce0607cc9c4402b744d04b4969e1cc983d7b600bfbf3364ebbc4fb774de82a0719708246803ec8218771e0d3921e5b7e81560f2a092b241fee37408181 SHA512 83b4ada94ccd29c97ceb81c97b5f2e932fba156b6b534866853d8cc0cd15853c8e82faaf0ebc32dc535459ff0d3b6391c4660cb108b9165bfefccc8b67577375
 EBUILD netqmail-1.06.ebuild 3289 BLAKE2B 9d121491b56d59695be2601961901e41ad4060ebbecf809adad9b4f671ad4aa06137f542a5f7c466805017c3481c0ccbd82ace0d7042b323fc6d7ca9fadc9e2b SHA512 7bee6b14ef4d02650d7e502fcd1d4efbb61a40073ea0b4ded730f6fde4d8a309f24d489b5388b86854237b3d990a5a57d5792d57f2d88ada42492034d6d23d4a
 MISC metadata.xml 555 BLAKE2B 5f151e2b07d6c26b0d4445bb0577af01374934d94cdccc099e18730736f8d05829e287ad63b5cbd249e9e29d2fa99b50dd5c2100001e3369a5ef0b8963ba130e SHA512 dec725506e819558500bc86ce215370a6576bfe47baae06da3e12315fbd0395d2d8237d85e41996d6e5b11878bfe7ed2e1bbeb81061351b3bb9729749f702eba
diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
index 1737b7b0edf9..0288d16973ef 100644
--- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,7 +36,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla"
 REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
 RESTRICT="test"
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 1e35702d741e..bf057fcb00fe 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -10,12 +10,16 @@ DIST postfix-3.1.6.tar.gz 4341308 BLAKE2B 6a5ec763cf96770240f63b35b4532c555cc6e5
 DIST postfix-3.2.2.tar.gz 4390318 BLAKE2B 4d0648ad89c90b13573bf9a2721919f90fa706a37d745889bc1e3a38e5f5277af848e2ba6eed8f61dec68f53ac65fd67c133bc37ed73ecb350baa76834a5a33c SHA512 9432fa8b181db99b8e2d72b2a0f640d1456b10c42615f0a002638f7f788d748b8bb55cd36409a368ac4f6d22033d1d059728fa33980fb93d465b6dfd5ae26418
 DIST postfix-3.2.3.tar.gz 4390567 BLAKE2B 911b183c318bc60cfd1ba2ae5e9467cfe3cc62f9787c7566f2edea7b867974bc90f0cc4b236f71b50c08a1696e6d60beeccdc634d7bf7f3a600c260b89743a36 SHA512 99ea74a5a0620e739668e55d620a0370b72c4802983a8a4cf4d6c51c6f8f5573128f2d6869386cedadba66b3f741df2f18867a059facd94092ac95f6da3a600c
 DIST postfix-3.2.4.tar.gz 4390376 BLAKE2B 132a6b467f9156d716a92cc7beae0f9a7c47e6a2045e83726a5e7305e6f9bf666ebcfb93a9ab1a96ec988431661059d62e926287bd13089eeb4bab3e8f4b9fc7 SHA512 6dc583d3b1c98f5c8d6486351bee9f92a98b5379cd0d76d26a382379c112317e7a2a58c3a200477a6d0f831c73395257d1a63170df17ea8a65a4048a7df391f8
-DIST postfix-3.3-20180121.tar.gz 4416991 BLAKE2B 74cd6872de829497b23b44da7784589e0f951ec1ab30c8e89423751313fb628cb6d0040ae86aa91f4b643a61bec5f6efbc3a2ec71260c3d13aa2300de1fa59c4 SHA512 22ce460cf90bac235dc0db3790a21c73de9c81949bb245db0256e807ce6e81e32eb0a9260ec1ff64ddc85da107648ea66a5b42ec7198a5ac66a5bdbf520cd000
+DIST postfix-3.2.5.tar.gz 4394765 BLAKE2B 416dfccc1a9dc524afada3e3f0c7e215380afe13df40fb575e4845d28bf2d8e1c347aff93c17455d2c1128686ed99c9ac22f70db6d591c6dc4607e45325e96a0 SHA512 ffd07e8664d41a5c40b7f3f7511a4c4cc57310d103395b12f2f7e9499d1f901768d6ebb1d5d1588d6fdb834ad2548a9df6d925ff3d7f74d74764a6f6f550ecb6
+DIST postfix-3.3.0-RC1.tar.gz 4418769 BLAKE2B a8b7d7c03929ccf3b69d751844127bce04c42060351605705bc933f8d79e9428413324ddb9b714bf933adab5da7df1879c0195fd495df5cf45a326a21fcb6034 SHA512 fa47ad578719a61c97a8945be281acbbd01cfdd521b0464b7870a3250863a4c1ee2d75a0e727cd0f05b00bc6c7ec2208705141daf1f03959b771008be2a5ea3b
+DIST postfix-3.4-20180203.tar.gz 4420728 BLAKE2B abffa1e18d6ec548c59b5774936ebb6bc0b1188c2de2f425c0f51d313d1eab3a6b593a6fed07353dd5a6ce9fd501f7abd9ebc041c462e75843d0d6d6a5b15dce SHA512 70799582167d74efae723ccc501a2fc94885da028a43d2db8d24f844a19e5f59455fdf3c6a7fdda10e19369bc79128518aab5f0036d2c169b0f9192edfcfa2a9
 DIST postfix-vda-v13-2.10.0.patch 55701 BLAKE2B d8df041bb4ae7457cd066e71b6ae9470840d42edc9990a550ae51356cd62bfb08516250249030da26d1ef475619f0ebd609570d84ce57f8cdc347a2824b29536 SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62
 EBUILD postfix-2.10.9.ebuild 8736 BLAKE2B 2e95575a37c0f4587c9ecde36a9a1d622e2fb5b988f4374c1d1f9951351f138d578ad1540d2ca8e6192baacf868ce3ab8836eca0d4e07d7b11a11b8df57d512a SHA512 09a64554311b5b5c7395770329eb44cf80d3f3e9197adefbb304214feb9ff3d4df9e3d3376b3b4e87f329281e1fb4e03bfb7b3bbfbae463384031b3810e011d0
 EBUILD postfix-3.1.6.ebuild 8661 BLAKE2B 707f1822c7e8359adc8f0884237069cd2092385eb4a55c378d2918ed097b596755a533cdf297895a3651572996b5dce8603e3dce8bea172acee60471cfce32c9 SHA512 6174266e057ca6110d39c76f6bd6d11fa24f40641599a90c143aa9396822d1cc2b3e72b7de94e849c913c5d34bf3dd081f29feedb41b2bfc349a6e567381550d
 EBUILD postfix-3.2.2.ebuild 8669 BLAKE2B bec764e9e0d8a93270bc0b3b2f6bdaedbf5e9be6cbb55b506464eecb7f620317b8d55a577a9b65d19a7ab1c40b83fb059233fb56edc4f9aba01e19b8effae6c1 SHA512 094bd11212903bfcbf678698765da8f72ed3b34562aca398d47e90d3a2ae7ef252bc29eead3bb92eebe46a7dc2aa4e615dc3b85ec192c6d6872c2370fe99a11a
 EBUILD postfix-3.2.3.ebuild 8669 BLAKE2B bec764e9e0d8a93270bc0b3b2f6bdaedbf5e9be6cbb55b506464eecb7f620317b8d55a577a9b65d19a7ab1c40b83fb059233fb56edc4f9aba01e19b8effae6c1 SHA512 094bd11212903bfcbf678698765da8f72ed3b34562aca398d47e90d3a2ae7ef252bc29eead3bb92eebe46a7dc2aa4e615dc3b85ec192c6d6872c2370fe99a11a
 EBUILD postfix-3.2.4.ebuild 8662 BLAKE2B 4b495da67bd4bb41d999e20c92a5802d051eeea44391def3212ad911788eb8f9e9e96f71acf44d8562ac90913856ace4c59164e0d5ce15c2c21af7742e2b9e5a SHA512 7682c0c4402cc2c37781dbe680995d0f2154ddf58ee6f9e8dfdfbb12dbcd199d308dbeaaa7fd1924bde2fb29b040b7eb9390312f2c4ecf2919b7f470a4060588
-EBUILD postfix-3.3_pre20180121.ebuild 8418 BLAKE2B 2f9b2058e43510577a7dbf131288bcc25d426efe55f2c864acde609a6d4f4de2dfdf412c60b2fa2a5e162d782d88a57bf3e91c8ff6dbf3a61a6b067249e9700b SHA512 78875d12be46e34f345da7144346b0c03d620b55e1ae2249b8bd0109c2413d1b9797a03ecd2f91abaab80699a8652aff8839d7595c692693047f3b04aef0950e
+EBUILD postfix-3.2.5.ebuild 8429 BLAKE2B a434f2413f1278ef9f5744ba2f3a8643a0f927eda405d8c0ff6fb3bdb9d8ae7f25a488e06b5b47bff23967257ae39c86f52e56a06554a4f1cb003a0c2a0e47ab SHA512 0039eba87197569aac558b730a109ed99d1e385a837fa6ca607a97aa6b2b8317d8d0637efdf7fb79e3fc05fd62cd46195c62fc359c3c0c48e6f42655eac4ea99
+EBUILD postfix-3.3.0_rc1.ebuild 8430 BLAKE2B fa29acfcd9604faf0c24a84a7346cb0bcaad9f232da9d3c99e26f800482884701bc3f2995c68c24f44acf3610994ad7856b02ffa336d80d1dd3992f6b54d96ac SHA512 b905a5d39c43d98886050c8d420db25eb39a5cbc9bd6c09a981742c1e964224b243b1c2e31361a6e8fabdadb40db5b517b5dc251b706f708ae7e12957a359d57
+EBUILD postfix-3.4_pre20180203.ebuild 8433 BLAKE2B fda5f677413d261a2ca56b531d4ef4012738b1dff4a5e802e9d0e8cd7875b84f21420b9887711a7e23cd9acf651e38f485c96ad9f7eef1d4a9752fa11539895c SHA512 b517e21408bc478fc989d637873308dd7c7aae1ce00ba1e606cdb1777465e65049b32d8c0a3db0367654579ea545d0ab049cff4fb2aba7395eb9bad387512fa5
 MISC metadata.xml 903 BLAKE2B ad36e98f33e0538aa2cec74a6c7342e42a0e65fea2898b93a9a2e7cb81bddad130fd0eec89e554a3e8ca5d9399ef21ea47d9e16d39f070d8e9d325c45ca95356 SHA512 3159041e80f1b045d9beda6f517be0acd5a5eaca4b979e7ae2d27f6d7cc07ad83ba55a9e78b718689c9d6fff780e77d9b0c8275a1dec96bd84d2cd184d86662d
diff --git a/mail-mta/postfix/postfix-3.2.5.ebuild b/mail-mta/postfix/postfix-3.2.5.ebuild
new file mode 100644
index 000000000000..38d277108f74
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.2.5.ebuild
@@ -0,0 +1,301 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic pam systemd toolchain-funcs user
+
+MY_PV="${PV/_pre/-}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="|| ( IBM EPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND=">=dev-libs/libpcre-3.4
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2:* )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+	eai? ( dev-libs/icu:= )
+	ldap? ( net-nds/openldap )
+	ldap-bind? ( net-nds/openldap[sasl] )
+	lmdb? ( >=dev-db/lmdb-0.9.11 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)"
+
+RDEPEND="${DEPEND}
+	dovecot-sasl? ( net-mail/dovecot )
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!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/fastforward
+	selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+pkg_setup() {
+	# Add postfix, postdrop user/group (bug #77565)
+	enewgroup postfix 207
+	enewgroup postdrop 208
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+src_prepare() {
+	default
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+	eapply -p0 "${FILESDIR}/${PN}-libressl.patch"
+	eapply -p0 "${FILESDIR}/${PN}-libressl-runtime.patch"
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+	AUXLIBS_PCRE="$(pcre-config --libs)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			AUXLIBS_CDB="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	# Workaround for bug #76512
+	if use hardened; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	# Remove annoying C++ comment style warnings - bug #378099
+	append-flags -Wno-comment
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install () {
+	local myconf
+	use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
+		html_directory=\"/usr/share/doc/${PF}/html\""
+
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		${myconf} \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape, posttls-finger and collate
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+	dobin auxiliary/collate/collate.pl
+	newdoc auxiliary/collate/README README.collate
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	keepdir /etc/postfix
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+
+	pamd_mimic_system smtp auth account
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+
+	# check and fix file permissions 
+	"${EROOT}"/usr/sbin/postfix set-permissions 2>/dev/null
+
+	# configure tls
+	if use ssl ; then
+		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
+			elog "To configure client side TLS settings:"
+			elog "${EROOT}"usr/sbin/postfix tls enable-client
+		fi
+		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
+			elog "To configure server side TLS settings:"
+			elog "${EROOT}"usr/sbin/postfix tls enable-server
+		fi
+	fi
+}
diff --git a/mail-mta/postfix/postfix-3.3.0_rc1.ebuild b/mail-mta/postfix/postfix-3.3.0_rc1.ebuild
new file mode 100644
index 000000000000..6141058397c2
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.3.0_rc1.ebuild
@@ -0,0 +1,301 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic pam systemd toolchain-funcs user
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="|| ( IBM EPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND=">=dev-libs/libpcre-3.4
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2:* )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+	eai? ( dev-libs/icu:= )
+	ldap? ( net-nds/openldap )
+	ldap-bind? ( net-nds/openldap[sasl] )
+	lmdb? ( >=dev-db/lmdb-0.9.11 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)"
+
+RDEPEND="${DEPEND}
+	dovecot-sasl? ( net-mail/dovecot )
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!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/fastforward
+	selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+pkg_setup() {
+	# Add postfix, postdrop user/group (bug #77565)
+	enewgroup postfix 207
+	enewgroup postdrop 208
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+src_prepare() {
+	default
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+	eapply -p0 "${FILESDIR}/${PN}-libressl.patch"
+	eapply -p0 "${FILESDIR}/${PN}-libressl-runtime.patch"
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+	AUXLIBS_PCRE="$(pcre-config --libs)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			AUXLIBS_CDB="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	# Workaround for bug #76512
+	if use hardened; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	# Remove annoying C++ comment style warnings - bug #378099
+	append-flags -Wno-comment
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install () {
+	local myconf
+	use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
+		html_directory=\"/usr/share/doc/${PF}/html\""
+
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		${myconf} \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape, posttls-finger and collate
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+	dobin auxiliary/collate/collate.pl
+	newdoc auxiliary/collate/README README.collate
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	keepdir /etc/postfix
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+
+	pamd_mimic_system smtp auth account
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+
+	# check and fix file permissions 
+	"${EROOT}"/usr/sbin/postfix set-permissions 2>/dev/null
+
+	# configure tls
+	if use ssl ; then
+		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
+			elog "To configure client side TLS settings:"
+			elog "${EROOT}"usr/sbin/postfix tls enable-client
+		fi
+		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
+			elog "To configure server side TLS settings:"
+			elog "${EROOT}"usr/sbin/postfix tls enable-server
+		fi
+	fi
+}
diff --git a/mail-mta/postfix/postfix-3.3_pre20180121.ebuild b/mail-mta/postfix/postfix-3.4_pre20180203.ebuild
index a778e668f172..2d31204b3f96 100644
--- a/mail-mta/postfix/postfix-3.3_pre20180121.ebuild
+++ b/mail-mta/postfix/postfix-3.4_pre20180203.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="A fast and secure drop-in replacement for sendmail"
 HOMEPAGE="http://www.postfix.org/"
 SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
 
-LICENSE="IBM"
+LICENSE="|| ( IBM EPL-2.0 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"