gentoo resync : 02.03.2018

7 files changed, 308 insertions, 6 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index ab8871aef584..88263f556d05 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index d023d7e9b283..e8f2e3c14585 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 4174 BLAKE2B 87a50b93b61c5fa9b638cf652985d85797a780eb24e1ea8cc2d618ba731cee35cc851acbe89f0745f66296f0baa54e171a26320d1f16bb67a6ab7d3c8f1d976f SHA512 32853b028dd94acd2cd72f38ea20248da25adf0eee218d916aeffab2d5fa447fa0ed93e228e27ded11b77c519e0d50c3a588edc5cfbb27aa5947417eb30c4ff9
+EBUILD netqmail-1.06-r4.ebuild 4171 BLAKE2B 80711bdae21c03a1c80b8a2a53b7931f5b982b9b46e97b63952bbf3d7c175bd0602631f778d304bfaf46fc6343c97fb3c5455b421b45b0fe60501c51eeb3fbe7 SHA512 df9333e6f33c9fdbdee8ead286bb4661e8d31d6a0e01f894abbd33628f11003b650382128337eab250d2997c56b9eb635f1eb38423b692f3b0d1988136208639
 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 0288d16973ef..39ce6f925c76 100644
--- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
@@ -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 608a957c2d0c..33165f123035 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -11,15 +11,16 @@ DIST postfix-3.2.2.tar.gz 4390318 BLAKE2B 4d0648ad89c90b13573bf9a2721919f90fa706
 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.2.5.tar.gz 4394765 BLAKE2B 416dfccc1a9dc524afada3e3f0c7e215380afe13df40fb575e4845d28bf2d8e1c347aff93c17455d2c1128686ed99c9ac22f70db6d591c6dc4607e45325e96a0 SHA512 ffd07e8664d41a5c40b7f3f7511a4c4cc57310d103395b12f2f7e9499d1f901768d6ebb1d5d1588d6fdb834ad2548a9df6d925ff3d7f74d74764a6f6f550ecb6
-DIST postfix-3.3.0-RC2.tar.gz 4419927 BLAKE2B 88f4fb83964b244749fd51f9c2d9701a097f37a1b2a647d11d104bd90b6ef97720d67e4bbc09e4fff6b9e7839aff5fb4e2569d50f39cbde8fd368ca92c890bc1 SHA512 51d7cbb8181d525c216827ea4c0914973102ea5c90342d637e9e9b0b4e40c75495701cc94696404fe05b7c058fb1eccd675009e270135b68ab96707ec8adea37
-DIST postfix-3.4-20180218.tar.gz 4422381 BLAKE2B 6f5beef40e4f4b5a43b311721d9ced9104f631c029c6bfdee4a07192784a35a83ac3104b03f95013d1140fbf841b897a29a44dee9af0c803c54002c2273a1534 SHA512 001fc98fb13e5670839f65f310fcab0d27f12a720b47a7b2b39aece92c75698e94559bf268a243b2ffd307e2c698a726728c9a82450e3cd69ffd4c045bce7b7f
+DIST postfix-3.3.0.tar.gz 4419450 BLAKE2B 780aaa33783268a078a077f3436e5bc54a9717d24e25fc0a1cf7a1b7c7388289e24e4ac602911b496a57a9f66515158101e1f00f3ebf8725bf4fc92ae23c44de SHA512 14f52fc47d6bbafefc7452ffbac4c4fb837d30181705486e8e43d6ca9003d218a01755ed4cb86413464c2585b9b84c2adcfef4933326b5d7446fe6c39b6cae8e
+DIST postfix-3.4-20180222.tar.gz 4422765 BLAKE2B 6e09f10bc6998e0a0f58934013505f1ee11950219a3e981ff85040b8fc7327395dda92aced9eb0b8fe7800506c7dd291d844a5de4f28cf438fd469c943ff1d03 SHA512 63bc2be7b2dc4967f24e00ae2e2a231b10b1846339bd9b0734951267fb42c77e95948a4038e4d6dda5e3f4f830e2df2af0ebee77b56314f50010a84b49c18675
 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.2.5-r1.ebuild 8419 BLAKE2B 04e7ab0301098ace3c2195b9197acd6776e5d97be9a5f667149880b0719d2c30093aac3b99535eb9877bd5d6c6b12bc6d9bfdb34dc330b0fbc1bba7de4225b07 SHA512 a398489f03f32b84701ca93848035cef21e4c74e982135acb6662d9ee6985eced46fdeffb7648d448b4e02863bba47e8b4dc5f96e8d9482bfb102af03fcef7d6
 EBUILD postfix-3.2.5.ebuild 8429 BLAKE2B a434f2413f1278ef9f5744ba2f3a8643a0f927eda405d8c0ff6fb3bdb9d8ae7f25a488e06b5b47bff23967257ae39c86f52e56a06554a4f1cb003a0c2a0e47ab SHA512 0039eba87197569aac558b730a109ed99d1e385a837fa6ca607a97aa6b2b8317d8d0637efdf7fb79e3fc05fd62cd46195c62fc359c3c0c48e6f42655eac4ea99
-EBUILD postfix-3.3.0_rc2.ebuild 8420 BLAKE2B f1804677a9b38594181abb821bbfd67f3e93f90071c8f95c5022388bd7409c9b78ba47293a9856b3dba7973e47acbebd5f73c8bd578b59a309eb5d63d45b08d6 SHA512 abe6283043f741c204a976c487550bf8366041e8e9e481016754d26b1210b1eebd730ee1f2b46b45dcd89de05f7ba4dc981d4071cc88a10a458d836505d53ea4
-EBUILD postfix-3.4_pre20180218.ebuild 8423 BLAKE2B afa1551c7f453fecce31e0e08eeb5f702a26f372860bd8f1789ef7cd9246ad33f211762782b737321d93a03a9e04637e362cc10f96b7864b306dbe64c7efa4fe SHA512 a7cd76bc1e141e8b8396c23d8f23427992083c556c398033cda38a5e71f8cbadb3bcacf62b51488f4ce360f7d6c97ebc205ecf93029edbac63ea1bfdfe9e72ad
+EBUILD postfix-3.3.0.ebuild 8420 BLAKE2B f1804677a9b38594181abb821bbfd67f3e93f90071c8f95c5022388bd7409c9b78ba47293a9856b3dba7973e47acbebd5f73c8bd578b59a309eb5d63d45b08d6 SHA512 abe6283043f741c204a976c487550bf8366041e8e9e481016754d26b1210b1eebd730ee1f2b46b45dcd89de05f7ba4dc981d4071cc88a10a458d836505d53ea4
+EBUILD postfix-3.4_pre20180222.ebuild 8423 BLAKE2B afa1551c7f453fecce31e0e08eeb5f702a26f372860bd8f1789ef7cd9246ad33f211762782b737321d93a03a9e04637e362cc10f96b7864b306dbe64c7efa4fe SHA512 a7cd76bc1e141e8b8396c23d8f23427992083c556c398033cda38a5e71f8cbadb3bcacf62b51488f4ce360f7d6c97ebc205ecf93029edbac63ea1bfdfe9e72ad
 MISC metadata.xml 903 BLAKE2B ad36e98f33e0538aa2cec74a6c7342e42a0e65fea2898b93a9a2e7cb81bddad130fd0eec89e554a3e8ca5d9399ef21ea47d9e16d39f070d8e9d325c45ca95356 SHA512 3159041e80f1b045d9beda6f517be0acd5a5eaca4b979e7ae2d27f6d7cc07ad83ba55a9e78b718689c9d6fff780e77d9b0c8275a1dec96bd84d2cd184d86662d
diff --git a/mail-mta/postfix/postfix-3.2.5-r1.ebuild b/mail-mta/postfix/postfix-3.2.5-r1.ebuild
new file mode 100644
index 000000000000..b0281e5622fc
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.2.5-r1.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 )
+	nis? ( net-libs/libnsl )
+	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}
+	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_rc2.ebuild b/mail-mta/postfix/postfix-3.3.0.ebuild
index 9c6fbd36a9bd..9c6fbd36a9bd 100644
--- a/mail-mta/postfix/postfix-3.3.0_rc2.ebuild
+++ b/mail-mta/postfix/postfix-3.3.0.ebuild
diff --git a/mail-mta/postfix/postfix-3.4_pre20180218.ebuild b/mail-mta/postfix/postfix-3.4_pre20180222.ebuild
index b37369276606..b37369276606 100644
--- a/mail-mta/postfix/postfix-3.4_pre20180218.ebuild
+++ b/mail-mta/postfix/postfix-3.4_pre20180222.ebuild