gentoo resync : 11.08.2021

8 files changed, 309 insertions, 8 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index b251a1d2afb1..322ccd3de1e6 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index ddfaa46db9fb..f84f0741cf9f 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -13,5 +13,5 @@ EBUILD courier-1.0.14.ebuild 9218 BLAKE2B 44fabea536a2b64fa88047a074cbbf30c04c07
 EBUILD courier-1.0.17.ebuild 9226 BLAKE2B 6bc83cef3ea12abe29323d742022584ce7b8024a29eebe8c1e1a280d47d88f89da2bb000203a9146d54b7c52aa11480b8e7116de63152c8f3238059784b9f886 SHA512 9f6d36c6019a16d59c6825de7991cf22afe38e288b02884f33488738ce289a10fdbba9a493fc7a2a790fdbcc7ea9340b2fdedeb52b8ebda37e0ecfb08f0e23d7
 EBUILD courier-1.0.5.ebuild 9443 BLAKE2B 4db42a5ec6807d65df7e5f552fd9fa4723fd55ffc3e48cb10928e455194c09dfdbce92d61caa988db66e18209bfda36d06f4fe641d96ccf1e9b9f37b17d444d8 SHA512 f19f078f7f7567285cf2cfbd86b16e38532f0b51519283b642f0acac30b2b7c4a49322792d7359adabee73d55fa5368a286d1402df44c4019c91c9cb248cb2ff
 EBUILD courier-1.1.2.ebuild 9233 BLAKE2B da6ab9db691a408a4f5aebbaa4134100fccfe8fea11b7e690625f182c5720e5ca5ad98e64ed99e1aa175dd3d1f957d1aec61f61778b4de533657ce7d1d701ce9 SHA512 34254604b8859573c96c04f365cc145b6d5816dd63ca0e2e5847794f7014544f87880b33318c2a8bfdfafebdf88c466584a1385a1f2acf399ff1f7706d128f55
-EBUILD courier-1.1.5.ebuild 9228 BLAKE2B 0b6b73361f4138c733f88f372b95f3de6308185e0c9604e1144340d0fd4396cc27421fc4c4b5d00589838d46449bd06a47500b77a5732d82b59649af3ba2bff6 SHA512 7df3da54ec803631bc5171d23585241f0e50c833b847bdedbb74d4a5f35942295833ff6b6059c68a2a9ffad883c5a56b6999e3b8124ac1e952791daf3fbddbd7
+EBUILD courier-1.1.5.ebuild 9227 BLAKE2B 31c11a26b4ffe178188103ecb20804d263a4caa9913e802b644f8233aa590a06245f67ef2f1c833b2c46079dd3aa7af620d94aa5587e0da004180c53baec3b0c SHA512 1d8faa10604ad31cff09f8a5eaa4faead410cfe5d12db4de2cd90ad5d486fd2ba5a028ebf0c8ebe019458d1e73bfcdc2620bd030111f9e53f61dc02a6c7e7fc0
 MISC metadata.xml 755 BLAKE2B 8ec0dd31ad59193d95585ab88f0bac6ced87132444a4136b2c2f80458a11f5296c42283574c3b56c26a31dad25fff530ebbfbf1ef467a1b824d11afe93a6da31 SHA512 de15af05e98deba4d3b297b4301439d892c3ba0d8af30ca459fcac72bf0179de87bf11260b8bfdb3827dd1f0e5123d68817766ffe037cece9c30adb3e8bd8b06
diff --git a/mail-mta/courier/courier-1.1.5.ebuild b/mail-mta/courier/courier-1.1.5.ebuild
index f013aaaa1aa6..e48f1ce4a040 100644
--- a/mail-mta/courier/courier-1.1.5.ebuild
+++ b/mail-mta/courier/courier-1.1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
 	fam web webmail gnutls"
 
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 89fd87cedc7a..21a545aed4e0 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,11 +1,13 @@
+AUX postfix-glibc-2.34.patch 274 BLAKE2B 65cfdef91aa7fc20a2c1997a73003cd5a9d108e697fb29967bdfa3de1223552467e953237d63e930f59a36357bc8a1f44b486599b65e14937c3e22e48e86a05a SHA512 8710c5e8363fac633378b004f65fedfc4852bfdd470a939b31cc35b95f83008bec037e6ebbe5adbabc47d4c373a2360d843b84c6991e546583cb67d244569a07
 AUX postfix.rc6.2.7 2107 BLAKE2B 4ea7006a381b76d5926a7d1794ab45e30d4829a17acfa0fd8c0580450cdd8d902df285f8bdd7dee79df6776e4a28ce0ecec00f1070c00f19f077358d80d61cfa SHA512 4c0f5f333ec02065cad1578b3a95e50d072317ee5e6cc65c4e9176d0b8687ce8e7e03d5e653f7a93a838a5bdde66230874a3c7f71a315fe2839706c91a8d954e
 AUX postfix.service 662 BLAKE2B dcf9ceb71ad483b580d126fcb5ac68889cdeb898df3333d38f195227190b73cf0fb41cd68a86e97cfe844cc7f9f095cba0a17afe9ce7c8697e0aa30f5faecde6 SHA512 04b475040b153f488a9358567ff9ee2eb8f263c619dadc23c837d17c19106041296e3652bcaded2be0c7c8b9eee7fd5f2ad55bed3e7f9b3a4bf9655f4762d563
 AUX smtp.pass 29 BLAKE2B 589915bd2856fa64e22caa12fca54ef342eb07606de38d3879c13ac395413c84de6c3b733c83cc0625a4433167efcc7d504b2f87fa26c05b2facde9c3d103021 SHA512 a8a940099a77ea0547004daf5392a6efc0cd643f10072803d65e37763012464ad25b1b925ae9e32bffb3c3e8a5d4b2d3bb5619a174d58fdc4ea5d4090db0d365
 AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e6b4983ab26e88ede2f0604737c78144c03e182f66005062f1d49e10443d1ddb9757461d1f SHA512 a48e2bd173c4443dd2c389f6973a541dbcba4223b52b42b409a68d934a7fc82a98d4027267befcd5db6ec628cce6a9dffdf044e6fbd774b6e748f07f4106db47
 DIST postfix-3.6.1.tar.gz 4748754 BLAKE2B c64d8f4c12cd7cb39bd15c371c20db4aa61b39120b6c078eda7c48c94d65e181b51ac8f74f3231791fc3ad6c0d04f74975f50776f984ffa9b9f8a4c5c99cbade SHA512 6f83a6aa55bd442fe005b35c7470483ff5ba6781121f783b07ef454580354fc5c85d0d5106936810d6bef0f5592937f0863eec3b82e138caac7694e2a3bb7bc3
 DIST postfix-3.6.2.tar.gz 4749530 BLAKE2B 349f3eb2995fe72c89e374a2f95cbb09d4a4f5a5c896e340a2a166ffcb2c498ba514022a59a17d2731807f6dadc03f804a3d4b16127dd2d6addb825558b7ffd6 SHA512 464ce9ec77e637ede91123472a0383b2bfda52102f9e9852c7191016d4fda2e14f302f2db9793887c182688c2a14dde6eeda728523196a627a8028f99555a4d9
-DIST postfix-3.7-20210717.tar.gz 4750293 BLAKE2B 59eb90f451790db9f398da79736a23c3ce64a3da2978a597b57ca8df5480739a20a7eb68a100342465b5af3764acaab46b5863207e50e5ba07553777ffd40f51 SHA512 8166c5f2a5d17e042723dbe51c128fa9ba0109de1c29a562cef8a9dbb3517ac2ac0e936467e7877e2c27ac0ef6012a4fa0159d1670ee49f6177a7702f59e9a3c
+DIST postfix-3.7-20210807.tar.gz 4760021 BLAKE2B 351c52657aefbd70d0b24cbf867d85f3cf2939bd85e245a0f71ea6e5db7bd7e7603c026a5bc479215a3484a26857b9171714d5ab4d9a890a40e77b3acd6ba898 SHA512 4a5b283c4be44358313c4193d44ed3268c08c5268e42d12cdc0dd0882f260b9a4f1a4c783d00e281ba9c5857da7489ab26d18398f7a33aa2c98893d0b2ec1e7e
 EBUILD postfix-3.6.1.ebuild 7978 BLAKE2B 66c865d94f250d4ef3ae2c3dc24a0fb184f85cc67cb5e461c8bf46178415b649e80c6b936dd6e85e02adab33e7ef2b6a5e451500dea66967b97f32f0bd17d107 SHA512 368f073d877c9d49e4b38f5c603b30e99c23505c2bce1262b0152a03dfb4bfafeb2d43dc6cdc67e2c4cd4ac4559ebaec61df21d674eba026c27a38c386d14ff0
+EBUILD postfix-3.6.2-r1.ebuild 7968 BLAKE2B b275a53bea871cf3d7a4a124fd169114bebcf93e544fb4729211fa9f5ce83f65d91daf5ac2da08f1bb36060a0e0550072bf0afa7081be0ca6ed0dcfbf82fdfdf SHA512 55ed05197c60227868980d6fc6bd75092483dd11fbffedc2bf82da59389f641a8df89ffc320b137b44d05780c8048884e2ecc571b569de2354e7d573e37a6340
 EBUILD postfix-3.6.2.ebuild 7917 BLAKE2B 58ccfe215e40993ce6dcc20646a3083d2e4ec8c7e6575b65facf3060a15d4ea7184e2ae6130336099ad908b8283eef8947c0fc4db5532801f77c930082b8b5b5 SHA512 aabb59f03bef2d4a8e917c102da12f510b33dd148fa25cd8306c06bb7bd9aafef0d1b41f8e87f768b4927b33c6ebe82290cf3293bd0e0a32739489dab1a8b10d
-EBUILD postfix-3.7_pre20210717.ebuild 7917 BLAKE2B 504cae64c2c323d844e355600f1d5daee40524a940b54d2a4d28e3a870a0d3628be5cbb1cb1c471544764cc1db4ab49378bc54feb1f9c84214aca1c3a0b28ed1 SHA512 f0011add1c12ae383a03ac9f3989509cbc86aa820680151854e0f783ec387fc571345a0f1a2b78966838bfbdb2f225584d5ee3303bbc33f84729053fd08b25f7
-MISC metadata.xml 939 BLAKE2B 01474efe62df1eda9a3ba5976847064d615b3c32d9c71838354ef375c851c7ab4d1fcc2bc0d2945ce3d259fc6a698938cee6d1354c4e0f02f1e66395e377a0c5 SHA512 8602700c2a21b66ecf2c024c06ce23452f7effd9c06a5d58c1ccb351bcdef43a3c89575cc9136efc72fcd4e06ecb0654017b51bb145e7ffeeda771e3f4e7a673
+EBUILD postfix-3.7_pre20210807.ebuild 7917 BLAKE2B 504cae64c2c323d844e355600f1d5daee40524a940b54d2a4d28e3a870a0d3628be5cbb1cb1c471544764cc1db4ab49378bc54feb1f9c84214aca1c3a0b28ed1 SHA512 f0011add1c12ae383a03ac9f3989509cbc86aa820680151854e0f783ec387fc571345a0f1a2b78966838bfbdb2f225584d5ee3303bbc33f84729053fd08b25f7
+MISC metadata.xml 866 BLAKE2B 341527ecb22f2ec1bb1125c0c9bc9191935ef6f64a7dcf5c3320f7a245b8480eadca539359cb62af1f89ea9091074d621e88c1b2ba2437d1e367cff3c7856b8f SHA512 3f1dd670329e7752770de72e4df9e984e17346a3ff6ff01a9f16fd251f4dde67f59a4178b253ba1fb76c16c2bcd9ae390e15db97de1d3f550581408710a85a84
diff --git a/mail-mta/postfix/files/postfix-glibc-2.34.patch b/mail-mta/postfix/files/postfix-glibc-2.34.patch
new file mode 100644
index 000000000000..0da3ddf5ecdb
--- /dev/null
+++ b/mail-mta/postfix/files/postfix-glibc-2.34.patch
@@ -0,0 +1,12 @@
+--- a/src/util/sys_defs.h	2020-05-21 16:34:23.000000000 +0300
++++ b/src/util/sys_defs.h	2021-08-07 19:14:20.000000000 +0300
+@@ -827,6 +827,9 @@
+ #define HAVE_POSIX_GETPW_R
+ #endif
+ #endif
++#if HAVE_GLIBC_API_VERSION_SUPPORT(2, 34)
++#define HAS_CLOSEFROM
++#endif
+ 
+ #endif
+ 
diff --git a/mail-mta/postfix/metadata.xml b/mail-mta/postfix/metadata.xml
index 1193f1cce9d2..27d992438320 100644
--- a/mail-mta/postfix/metadata.xml
+++ b/mail-mta/postfix/metadata.xml
@@ -24,7 +24,4 @@
 		<flag name="lmdb">Add support for using <pkg>dev-db/lmdb</pkg>
 			for lookup tables</flag>
 	</use>
-	<upstream>
-		<remote-id type="sourceforge">vda</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/mail-mta/postfix/postfix-3.6.2-r1.ebuild b/mail-mta/postfix/postfix-3.6.2-r1.ebuild
new file mode 100644
index 000000000000..823fde3d62d1
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.6.2-r1.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit pam systemd toolchain-funcs
+
+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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND="
+	acct-group/postfix
+	acct-group/postdrop
+	acct-user/postfix
+	>=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? ( dev-db/mysql-connector-c:0= )
+	nis? ( net-libs/libnsl )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:* )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	"
+
+RDEPEND="${DEPEND}
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!mail-mta/ssmtp[mta]
+	selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-glibc-2.34.patch"
+)
+
+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"
+}
+
+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
+
+	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() {
+	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" \
+		|| 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 and tlstype
+	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
+	dobin auxiliary/collate/tlstype.pl
+	dodoc auxiliary/collate/README.tlstype
+
+	# 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
+
+	# Set proper permissions on required files/directories
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02755 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	keepdir /etc/postfix/postfix-files.d
+	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*
+	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+	# postfix set-permissions expects uncompressed man files
+	docompress -x /usr/share/man
+
+	if use pam; then
+		pamd_mimic_system smtp auth account
+	fi
+
+	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
+
+	# 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.7_pre20210717.ebuild b/mail-mta/postfix/postfix-3.7_pre20210807.ebuild
index 7badc66a67e8..7badc66a67e8 100644
--- a/mail-mta/postfix/postfix-3.7_pre20210717.ebuild
+++ b/mail-mta/postfix/postfix-3.7_pre20210807.ebuild