gentoo (leap year) resync : 29.02.2020

27 files changed, 75 insertions, 454 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 5a6bd8944af2..945b36b3ce36 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 23f36d3614f1..0e3de37be580 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -26,7 +26,7 @@ DIST exim-pdf-4.92.2.tar.xz 2039468 BLAKE2B 3542bb5d38267bb06728ada72cfa89f06027
 DIST exim-pdf-4.92.3.tar.xz 2039436 BLAKE2B 8d20e7f0ebfcb573d08b490737923afc2cd2d5837f5c91bd2f3e6b5e637d86a5d5a59123c57ba9219ead675c72bfc46351d5b705d9533fab80bedeeca8bdd580 SHA512 3245a627a924db92e5a50e842e096731d08284f757274b5083ea234707c493abd6f27a3b34a2025e3acff167260df0f4ebe68b9f5832920c5f22c258143ab43f
 DIST exim-pdf-4.93.0.4.tar.xz 2069744 BLAKE2B 28730134293d87b16d672df66119ff97aaf2d796cf28842bb5bf6831a0be6a186a5cce503200b9fc985aaa14386053ca83c259625949634c5a28937b285247ca SHA512 929b4198a3e8764a64478e7ff5a9c7398ad1990114206b68494b1f1f563c23405c7b440e2f21a9f777e9e3cd3a3398d6faea3b882407f731ef3a767c27fd9361
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
-EBUILD exim-4.92.2.ebuild 13569 BLAKE2B cd16cbe1da0080ef5ce4ce5b1df83bfaa73deb4410dbbf0459fc839d5790c3264ee97ab9eacad914f0ffb4a14e8f84beafa4b31732ef559b55b098daef32ba77 SHA512 9186d2800199541af4fd19b16ca943e369044ab85b83f7877f6a89589fc781513262daa70a65052f370a06b8bff3b2ba236bfb4bc2a5a75c07128d191271dbbb
-EBUILD exim-4.92.3.ebuild 13577 BLAKE2B 480fc32d165b5dbd057f05e1c97b62aeccc67013a5dba37b07d9a7802fc673194df8eed2b2c70eca9e1ca54feec9c50da63cb7ce1413c3d907914048869a56f6 SHA512 49211ced26a43c98551fc005bd1fd74865c54cf021e10b645dd727d98290e0e61e3538207c6f4f342568621d24d338307b1b80fa7fadbfd8a5c7fbe4d77ca2e0
-EBUILD exim-4.93.0.4.ebuild 13656 BLAKE2B 7260656675368ef1370e635617fce79f21a7210c3333e1e03bed20c7c7b3ffc7232c5e982ce2736a7f8abb128b06359366f54d0a38d52ca9fa7d66485a5173e2 SHA512 f771c35492e5d6ade190e930cbc6419f5682e349b8e8ab9116d69a2a6551b1c921d23b4363e1fe292acfb5279017ddb960e71bf17aedd222a45c2a8e22707a36
+EBUILD exim-4.92.2.ebuild 13568 BLAKE2B bccc420e206454e414336cc66fe238e846fda68a4343eb06706f85c646178502c8ad84d06335b6b7b1ad3d95aab4a1ef666e72159a1a4f4d1b25f71e590a1880 SHA512 77063b234b4516837eabbb334d77dfc0a6e1ea3c5cb8aea477a03791b99ca4876740cc33ff37aacb731abc37509c9e3357cbfa0cf2602eafe5d3878d247fcaec
+EBUILD exim-4.92.3.ebuild 13576 BLAKE2B d47a663b87bb780306a65ac95248d6ffa42dd776256edaf1f0c7d9f39a4574bc784ff8b7f50f18ac47e528a2e03a892d54e0cef70ee3119fe8817e356daaca17 SHA512 71273f400536c99b15c0b0b957ee6b51da59756cec18eba7035ad4e3b12481792396c2ab761eff5f454542d5c7b3a376b74a3bbbd9ebf065ca993cd88de73346
+EBUILD exim-4.93.0.4.ebuild 13655 BLAKE2B b88f938e5c1f5fb15b9c859fbbec660e6ae5fd4480056a0561c5bf0ed88c3abc2d3640593a72de939f53abc32ec9d4a0961e5ea2edfdaaded4562656e04658cf SHA512 43c9bf7d1c473741d39fc506befbbc6f86b6bd785dc938240803224c3494ac947b29358eb64c7368fca8a15c3c9e949cb8b11eb74238a587ccb80d95998a4c78
 MISC metadata.xml 2457 BLAKE2B c1dcbaedd069b41c4cfb190806b44014229d53cf6d6f72e04b99dc91f223567cb4f30100792aae72658780da0579fa26e6fb8a0266565bcc0c307996d59ac3ed SHA512 9044abccd15525c7676fc218b62d9b663bd155482894eced9c0cfc8a22e8cd7353009adc75a9f3de15b14f267e6ee6b4f4c91d8bd9260931c0b9de6bf48c762f
diff --git a/mail-mta/exim/exim-4.92.2.ebuild b/mail-mta/exim/exim-4.92.2.ebuild
index 2b4261ab4d6e..d93a9ac37a4c 100644
--- a/mail-mta/exim/exim-4.92.2.ebuild
+++ b/mail-mta/exim/exim-4.92.2.ebuild
@@ -490,7 +490,7 @@ src_compile() {
 		AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO=''
 }
 
-src_install () {
+src_install() {
 	cd "${S}"/build-exim-gentoo || die
 	dosbin exim
 	if use X; then
diff --git a/mail-mta/exim/exim-4.92.3.ebuild b/mail-mta/exim/exim-4.92.3.ebuild
index 05dbf4afa52d..22f7f20d3ff3 100644
--- a/mail-mta/exim/exim-4.92.3.ebuild
+++ b/mail-mta/exim/exim-4.92.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -490,7 +490,7 @@ src_compile() {
 		AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO=''
 }
 
-src_install () {
+src_install() {
 	cd "${S}"/build-exim-gentoo || die
 	dosbin exim
 	if use X; then
diff --git a/mail-mta/exim/exim-4.93.0.4.ebuild b/mail-mta/exim/exim-4.93.0.4.ebuild
index ab4cf6865d4c..2fcf22048a1c 100644
--- a/mail-mta/exim/exim-4.93.0.4.ebuild
+++ b/mail-mta/exim/exim-4.93.0.4.ebuild
@@ -493,7 +493,7 @@ src_compile() {
 		AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO=''
 }
 
-src_install () {
+src_install() {
 	cd "${S}"/build-exim-gentoo || die
 	dosbin exim
 	if use X; then
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 592600df933c..f6fb31e14046 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,9 +1,5 @@
 AUX msmtpd.confd 518 BLAKE2B e537ca90e9c4debd53936b227352b73f5ca1e7114ba8daa3121f1979dfc3495996a820276292ec6da63ce79d8f42bafb45c74daacb6778e5b56656aa9688ecbd SHA512 e6f4f39da73aace9f5a4f8e080ca897f51265b8806836366121d61f5367596955eefca377c5fe9c4094f3a9ecbe04801cf38fcc6017c73a9e4b7a68fc9a81528
 AUX msmtpd.init 347 BLAKE2B 9faea920dc23ebcdb62b05595acf4f70dd3d654645ed0f5ba6f76316762986c9951905f675c2e527c5e0b5eee2bcf53a14e018d8d64080b97e82da4e3abaa0b8 SHA512 e3080dc1fb7b72b6332ebcd4f807780dc04d32b8d3e5740b62f618d5d8f39f7c2a119604e26282e1d98c1365fff7920944401c399267461fab7ae2cdfdac44d7
-DIST msmtp-1.8.3.tar.xz 336120 BLAKE2B 4c58dc82e01135bc84176c25c65812414901f134a71aba5460675df3270f1d9dd3a706c66f5773315a38d63463f5c9eb68b584d6e5d0d5f0b1c23d6436d9a2b8 SHA512 c265991c0925d79b28a664ee6832316350d59d546f252989dafb8a517a8be1c496fcc85981325e5b381801a7bcb77e38dabdc12fc5be1bf49b9886a409a21819
-DIST msmtp-1.8.6.tar.xz 339732 BLAKE2B 3dc34bf23c935ea5f67df7e65b035771fd1475311311cca7097e71dac1c7b41a4c58497fd378a35a7f212b8a9b13e2dac6f20e0058d6f3491b52149d789b97d8 SHA512 9d3dd282ddfe2d67b67bb6d29412beebcd666d4ab8e90a664b7dd4b951714da0e3adba72dbe165617b1a170779bcd45e2e7bcf54d1d96fa97089686e71cbea66
 DIST msmtp-1.8.7.tar.xz 340908 BLAKE2B 5241acf54d5a6af6ccf2c3bfd33954a5235af2d2cb467e4134401538e60e1847489a7a599359e2d13202ea9637c32a67ec5180372b139e06f6d47f060cba6c8f SHA512 5a079cb90b48853ad812125e8b341f5bcd5f5ba4725d62c37210050896527b63f993aa6393f1d4107636153bf0ed84b0288e88a7e78a119c66b2d58f1e69a67d
-EBUILD msmtp-1.8.3.ebuild 3329 BLAKE2B a9df217483419054fbf17cac85b53906c6f5b9b04d2ff851eb712a7481f9cc27a47a8b70a86616bec759c82fca52d2774fe765b88a4129875dec6244e8174dbf SHA512 1b553c938d532eb98514f4a404475c3b1dacc1e3206d992b1886553c5b2fd30099c1f939b6150ca7da2f98c8cbd2a72696a26a003bae84808c24c72c77c9ba1c
-EBUILD msmtp-1.8.6.ebuild 3311 BLAKE2B 60941137b2f463d03c257935ceb34847ed3bfbf36a4c4ada4ab4b7a609d2dc7591fb2a69cc60574a335281d95a7a31fe24310f048a99f5b9819419fc9bfe1bdb SHA512 6984e6b635efe5406b2b9b2f2a58805cff932a34851dbf46e3c8ae5f51f4953c21ce8e9c41fe494c452adcde3d8c3ae1c9e0e4ca4759f6abab9a3702964ee4fb
-EBUILD msmtp-1.8.7.ebuild 3311 BLAKE2B 60941137b2f463d03c257935ceb34847ed3bfbf36a4c4ada4ab4b7a609d2dc7591fb2a69cc60574a335281d95a7a31fe24310f048a99f5b9819419fc9bfe1bdb SHA512 6984e6b635efe5406b2b9b2f2a58805cff932a34851dbf46e3c8ae5f51f4953c21ce8e9c41fe494c452adcde3d8c3ae1c9e0e4ca4759f6abab9a3702964ee4fb
+EBUILD msmtp-1.8.7-r1.ebuild 3317 BLAKE2B e2e8e0e7341f7599ce75260d5ce1dcfaa679f5cdf9d14b303b99e89fd7cf3d091c0111df1b933788cc3cc81eef8b2420dfc69d87dca64eefb9f2da1637b3f8f7 SHA512 3c2b084a3ef521c60558e065708faaf667157e0b51088636a920e432c5eda3d0a4a88be4e0ac3be40e496016700818c4941cd2beca089fedcd06264bed4899e4
 MISC metadata.xml 470 BLAKE2B 3ea3fcc232512a92126ff900dddf558c06194e473b172655c6960c165669c2323115a2ebf4472c5cbae57062d203b97aeac9b9d65fee5f8a0d6071416325f868 SHA512 c117c6d7f7f28d32dc411049d6a7f7bd70e1b70ff0030c85db2a2df86d1f82353230ca1713d2be7bb10e450d09e9a5749ab2e511b93b39dfe0091eeba41246c9
diff --git a/mail-mta/msmtp/msmtp-1.8.6.ebuild b/mail-mta/msmtp/msmtp-1.8.6.ebuild
deleted file mode 100644
index 967774288fed..000000000000
--- a/mail-mta/msmtp/msmtp-1.8.6.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 2004-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps multilib
-
-DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
-HOMEPAGE="https://marlam.de/msmtp/"
-SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax"
-
-# fcaps.eclass unconditionally defines "filecaps" USE flag which we need for
-# USE="daemon" in order to set the caps we need.
-REQUIRED_USE="daemon? ( filecaps )"
-
-# Upstream discourages usage of openssl. See also
-# https://marlam.de/msmtp/news/openssl-discouraged/
-DEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	nls? ( virtual/libintl )
-	sasl? ( virtual/gsasl )
-	ssl? ( net-libs/gnutls[idn?] )
-	!ssl? ( idn? ( net-dns/libidn2:= ) )
-"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase
-	daemon? (
-		acct-group/msmtpd
-		acct-user/msmtpd
-	)
-	mta? (
-		!mail-mta/courier
-		!mail-mta/esmtp
-		!mail-mta/exim
-		!mail-mta/mini-qmail
-		!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]
-	)
-"
-
-BDEPEND="
-	doc? ( virtual/texi2dvi )
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS doc/msmtprc*"
-
-src_prepare() {
-	# Use default Gentoo location for mail aliases
-	sed -i 's:/etc/aliases:/etc/mail/aliases:' scripts/find_alias/find_alias_for_msmtp.sh || die
-
-	default
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-gai-idn
-		$(use_enable nls)
-		$(use_with daemon msmtpd)
-		$(use_with gnome-keyring libsecret)
-		$(use_with idn libidn)
-		$(use_with sasl libgsasl)
-		$(use_with ssl tls gnutls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc ; then
-		cd doc || die
-		emake html pdf
-	fi
-}
-
-src_install() {
-	default
-
-	if use daemon ; then
-		fcaps CAP_NET_BIND_SERVICE usr/bin/msmtpd
-		newinitd "${FILESDIR}"/msmtpd.init msmtpd
-		newconfd "${FILESDIR}"/msmtpd.confd msmtpd
-	fi
-
-	if use doc ; then
-		dodoc doc/msmtp.{html,pdf}
-	fi
-
-	if use mta ; then
-		dosym msmtp /usr/bin/sendmail
-		dosym ../bin/msmtp /usr/$(get_libdir)/sendmail
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/vim/msmtp.vim
-	fi
-
-	insinto /etc
-	newins doc/msmtprc-system.example msmtprc
-
-	src_install_contrib find_alias find_alias_for_msmtp.sh
-	src_install_contrib msmtpqueue "*.sh" "README ChangeLog"
-	src_install_contrib msmtpq "msmtpq msmtp-queue" README.msmtpq
-	src_install_contrib set_sendmail set_sendmail.sh set_sendmail.conf
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		einfo "Please edit ${EROOT}/etc/msmtprc before first use."
-		einfo "In addition, per user configuration files can be placed"
-		einfo "as '~/.msmtprc'.  See the msmtprc-user.example file under"
-		einfo "/usr/share/doc/${PF}/ for an example."
-	fi
-}
-
-src_install_contrib() {
-	subdir="$1"
-	bins="$2"
-	docs="$3"
-	local dir=/usr/share/${PN}/${subdir}
-	insinto ${dir}
-	exeinto ${dir}
-	for i in ${bins} ; do
-		doexe scripts/${subdir}/${i}
-	done
-	for i in ${docs} ; do
-		newdoc scripts/${subdir}/${i} ${subdir}.${i}
-	done
-}
diff --git a/mail-mta/msmtp/msmtp-1.8.3.ebuild b/mail-mta/msmtp/msmtp-1.8.7-r1.ebuild
index 86c5a843c02f..f55260ecb18e 100644
--- a/mail-mta/msmtp/msmtp-1.8.3.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit fcaps multilib user
+inherit fcaps multilib
 
 DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
 HOMEPAGE="https://marlam.de/msmtp/"
@@ -30,6 +30,10 @@ DEPEND="
 
 RDEPEND="${DEPEND}
 	net-mail/mailbase
+	daemon? (
+		acct-group/msmtpd
+		acct-user/msmtpd
+	)
 	mta? (
 		!mail-mta/courier
 		!mail-mta/esmtp
@@ -46,7 +50,7 @@ RDEPEND="${DEPEND}
 	)
 "
 
-BDEPEND="${DEPEND}
+BDEPEND="
 	doc? ( virtual/texi2dvi )
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig
@@ -56,7 +60,8 @@ DOCS="AUTHORS ChangeLog NEWS README THANKS doc/msmtprc*"
 
 src_prepare() {
 	# Use default Gentoo location for mail aliases
-	sed -i 's:/etc/aliases:/etc/mail/aliases:' scripts/find_alias/find_alias_for_msmtp.sh || die
+	sed 's:/etc/aliases:/etc/mail/aliases:' \
+		-i scripts/find_alias/find_alias_for_msmtp.sh || die
 
 	default
 }
@@ -97,7 +102,7 @@ src_install() {
 	fi
 
 	if use mta ; then
-		dosym msmtp /usr/bin/sendmail
+		dosym ../bin/msmtp /usr/sbin/sendmail
 		dosym ../bin/msmtp /usr/$(get_libdir)/sendmail
 	fi
 
@@ -115,12 +120,6 @@ src_install() {
 	src_install_contrib set_sendmail set_sendmail.sh set_sendmail.conf
 }
 
-pkg_preinst() {
-	if use daemon ; then
-		enewuser msmtpd
-	fi
-}
-
 pkg_postinst() {
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		einfo "Please edit ${EROOT}/etc/msmtprc before first use."
diff --git a/mail-mta/msmtp/msmtp-1.8.7.ebuild b/mail-mta/msmtp/msmtp-1.8.7.ebuild
deleted file mode 100644
index 967774288fed..000000000000
--- a/mail-mta/msmtp/msmtp-1.8.7.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 2004-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps multilib
-
-DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
-HOMEPAGE="https://marlam.de/msmtp/"
-SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax"
-
-# fcaps.eclass unconditionally defines "filecaps" USE flag which we need for
-# USE="daemon" in order to set the caps we need.
-REQUIRED_USE="daemon? ( filecaps )"
-
-# Upstream discourages usage of openssl. See also
-# https://marlam.de/msmtp/news/openssl-discouraged/
-DEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	nls? ( virtual/libintl )
-	sasl? ( virtual/gsasl )
-	ssl? ( net-libs/gnutls[idn?] )
-	!ssl? ( idn? ( net-dns/libidn2:= ) )
-"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase
-	daemon? (
-		acct-group/msmtpd
-		acct-user/msmtpd
-	)
-	mta? (
-		!mail-mta/courier
-		!mail-mta/esmtp
-		!mail-mta/exim
-		!mail-mta/mini-qmail
-		!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]
-	)
-"
-
-BDEPEND="
-	doc? ( virtual/texi2dvi )
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS doc/msmtprc*"
-
-src_prepare() {
-	# Use default Gentoo location for mail aliases
-	sed -i 's:/etc/aliases:/etc/mail/aliases:' scripts/find_alias/find_alias_for_msmtp.sh || die
-
-	default
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-gai-idn
-		$(use_enable nls)
-		$(use_with daemon msmtpd)
-		$(use_with gnome-keyring libsecret)
-		$(use_with idn libidn)
-		$(use_with sasl libgsasl)
-		$(use_with ssl tls gnutls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc ; then
-		cd doc || die
-		emake html pdf
-	fi
-}
-
-src_install() {
-	default
-
-	if use daemon ; then
-		fcaps CAP_NET_BIND_SERVICE usr/bin/msmtpd
-		newinitd "${FILESDIR}"/msmtpd.init msmtpd
-		newconfd "${FILESDIR}"/msmtpd.confd msmtpd
-	fi
-
-	if use doc ; then
-		dodoc doc/msmtp.{html,pdf}
-	fi
-
-	if use mta ; then
-		dosym msmtp /usr/bin/sendmail
-		dosym ../bin/msmtp /usr/$(get_libdir)/sendmail
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/vim/msmtp.vim
-	fi
-
-	insinto /etc
-	newins doc/msmtprc-system.example msmtprc
-
-	src_install_contrib find_alias find_alias_for_msmtp.sh
-	src_install_contrib msmtpqueue "*.sh" "README ChangeLog"
-	src_install_contrib msmtpq "msmtpq msmtp-queue" README.msmtpq
-	src_install_contrib set_sendmail set_sendmail.sh set_sendmail.conf
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		einfo "Please edit ${EROOT}/etc/msmtprc before first use."
-		einfo "In addition, per user configuration files can be placed"
-		einfo "as '~/.msmtprc'.  See the msmtprc-user.example file under"
-		einfo "/usr/share/doc/${PF}/ for an example."
-	fi
-}
-
-src_install_contrib() {
-	subdir="$1"
-	bins="$2"
-	docs="$3"
-	local dir=/usr/share/${PN}/${subdir}
-	insinto ${dir}
-	exeinto ${dir}
-	for i in ${bins} ; do
-		doexe scripts/${subdir}/${i}
-	done
-	for i in ${docs} ; do
-		newdoc scripts/${subdir}/${i} ${subdir}.${i}
-	done
-}
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index 5ded157af5e7..b80c881be948 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -12,7 +12,7 @@ DIST nullmailer-1.13.tar.gz 205431 BLAKE2B e1eaa94262e3d4d202293d35f7ac610a3a2cb
 DIST nullmailer-2.0.tar.gz 249538 BLAKE2B 2340fd0b3e67be0061aedb2a1dc0466c88e1253691c955e960244f2ce330af6798bd43f21908a9f12ce9572489dd5c48288e65ae688cd73a8afedd4f7bb6a49e SHA512 2a7c914c5effcf796f987256ac68836f0ba875cc7f2da1aeb8f23767e15a556da168b8da5cc52d9f800986883bbdbcd49a9610ae220f463164a906c1d82fbce6
 DIST nullmailer-2.2.tar.gz 257740 BLAKE2B 18821caa1a377a899e3fedc84530d7c672f345cafb627da05e6c7bcd7d2708d54fc4ff4b761a6a23b2ddbabe73514473a5ec2abf3182dce2f5d3d4fbe3618fed SHA512 21b29d59f3c386c13ce4541ae11dc5cd69f842085479d7fc9a69a540abc608ce5c1825f06bd3566536b392931f7eeb1b2d35addd816849e6f431877bb18c8268
 DIST nullmailer-patches-1.13.tar.xz 8384 BLAKE2B 523547f8abf9b5d05938aad1e22e4195ee49cfe392c515df442a26d2cfb79f959c37e8f860fb196e99075aaa6fe437aaec182e1c1e2057d97cc32cba78a200d0 SHA512 393531e39a92b0978bccbcdf123e05b2cdad1ec8e600825cc24177ba414c1f615995c0344291ebb664f42b384a160c0359fec5ba3308cc14cbc9ceb8577d799c
-EBUILD nullmailer-1.13-r5.ebuild 4737 BLAKE2B 38fc205db2a05cabd46966d5ce3068e300564f7f96c4062ccb32bf148f4d935a540f81ec69bec79c92031b628a88066f6be8841935a831f20d8c343f1ac3dbce SHA512 e675c290a7d7033afd3cd2f32bac2dc24d87fba0f8deae0ed8ad424930c394c7de0c7ad2a3f5b57a016f071265659ce96c5e7924ab4e5b605a1b86da8d4e611a
+EBUILD nullmailer-1.13-r5.ebuild 4733 BLAKE2B 185455e5c1c02f275bc9ea817dd05e36591ef525bb37797e799394de392b7d9f7fed138234211460ca8e857fd0ba1bd19f6fdbd91f70a3af4ee1514f9877722a SHA512 a2d997adb60e830f042cb4ae93e7a2f60bae8eb165bbd7a838c45a77e445a42b2501942198ade6311320f3268bee5741a30a33b42649013960b329ba29ab6c06
 EBUILD nullmailer-2.0-r1.ebuild 3641 BLAKE2B 0f856d777485527c4b04ad21077c3646bb2106b69050100e20c663bf895ba1846759a423f23928fec9711ccd7595b8c74183e1d0e6eb51f1f82abc192b5f956d SHA512 bd858bf7830066e10c2ef859d8489a0ab124cb7873e327b14d011d286ab5cae94f4e80d86e64dfd13f1204580e6a57bf0495387f6dd361082a874db655bb69f6
 EBUILD nullmailer-2.0-r2.ebuild 3733 BLAKE2B 51fddc79557a9964fc825db2cf1ed20d1ca1fc86385ac9e878d154e173d68cca5ff7b5a431df984bbe50005c64718e7bafbef4d37b26856a0d4f87569f3487b0 SHA512 5664ca004d9f8556be2118d8f7859b5eeabf088e42e1f0d1d496a99e0c9d68b3d5b9b37723202badbda2b3b9bc46f97c849c51a8e3147d99212be1ac26335760
 EBUILD nullmailer-2.0.ebuild 3644 BLAKE2B 0f498b234679f0690a9644d755a9c1cbcbb2cc2c0288b361bea7977644a993ecf61337ca4c1997c9d221f823fd9ddbc70ffaf5b315c99e8aa99041d7c1b845d2 SHA512 5ac17ea2d17a2967399bdfc87b749d1b152741191b801f6e4fec4a1f6ad1977a2cea9dbabf19a8f62e17a7a32c9d90271fbaa93cd68532a8e6ae41ba126af903
diff --git a/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild b/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild
index d43f02ea92b3..10966c371bfe 100644
--- a/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild
+++ b/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -87,7 +87,7 @@ src_configure() {
 		$(use_enable ssl tls)
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" localstatedir=/var/nullmailer install
 
 	dodoc AUTHORS BUGS HOWTO INSTALL ChangeLog NEWS README TODO
diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index 06266e3a18ce..fe73333c487b 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -1,12 +1,12 @@
 AUX opensmtpd-6.0.3_p1-fix-crash-on-auth.patch 1130 BLAKE2B ca2a207549056dc729c34d394ffcc6b3f565ca3963a7c9b56f9f2a2ed68997f2839716945c412f6ba2340931297a8e0afeebae93ef6d767ec251dbe66b196a05 SHA512 23558294281527c679c563f35103ccaac04efa4c62a1494e9907480c38a554b551b86a838204df8a314f7fa86452cbf816690abedf3b5c0179758a9205616c38
 AUX opensmtpd-6.0.3_p1-openssl_1.1.patch 21039 BLAKE2B 05e6e416f8253bb42d3d0cb213c14d2d07ec8d6beee3058621ac41f7a3815562098be4e5eed863d78443d08ad55f70a94d0c9c031630e87a73388510f4e42c55 SHA512 7e6567889ca823ada283153861806e69cee0185d6dc98aa15675c18ee81d2e118e9bc3a9848551b9f49e772de38234b7d4170e66fb6e6b932a50654b5d9a3806
-AUX opensmtpd-6.0.3_p1-security-fixes.patch 3018 BLAKE2B 6ee6e23f50e705c3ed34eee7cfb38bf73ab4cf057104ab829cc0005063f75cf7c628e01de5258688b896861ac6dedfc40b45e7ce11d9f50a777c6ed5fa7653ad SHA512 751497713dc02fa512d4c61ac7feea792c44841673ede4b92ac474605fa2a2808fc6919336a3d53b5b9b8001d45c3dd321c8746c68d36076c2da94ca83a1b0ab
+AUX opensmtpd-6.0.3_p1-security-fixes.patch 4365 BLAKE2B cd6a64173137cad61bf7d6d5925a7d7147973a1b65eeb49d9c35f2ed72b6adf62e386ca9ab1035d31c114c49338817d5478f4999137e62d92bab18b5428305e4 SHA512 a51994fb8e064d652a319cf0acbf7aa2c30e2335712df3cacbc7b9a403f1e5496b29f7d6e97b81723f543e8f78eee82e02c62762fe5adfc12cf1cf35fa4aa7d1
 AUX smtpd.initd 231 BLAKE2B a4991c9226daa2289cb20238dcee0dad8b4ff83474327649b61c7394e46fc929c7792b885f58bf76769567ad2058134b97e5019b508e2edec108a4bafb9cc2b4 SHA512 e4c8386bd7e8d8171172aa181305a55ca67cba6d4c82d77d8846e1bd3301dd9d118bb39dad6c144677f050194de813e4d83e06ea6dd591d4f07da8c4a1edde37
 AUX smtpd.pam 147 BLAKE2B 1706fe27cf53621428f563af146d1197dfc59133dda79fe08141ec4ca9b240880ef63da3f27e4fb8b653af4ae413ca42cdeb343e1f4e737b7e6258c0d338223d SHA512 d0574cc732138fefffe3ca78da2d689f0849de70dfd65204c99a98a58b2165eb46b23a1c32b356ea2eaf8abd56a4929c7419b29cec1d6b284e344680bab24086
 AUX smtpd.service 138 BLAKE2B c76db1847110622621701cdf1fdb764d26bf28b86a25adf9ae8e0ba15838a2a9ddc677f54f5d5fe191591b2bd5c7f20067fc00b6679f448e25371e27f231589d SHA512 b70b173ac275b871d78bac0e55b2e0c8d8a6538c7f2c4dc86fe67fb37a1ee942e0442353b338b286759618299f51b144396251db13f82c9afa035dcaae11a258
 AUX smtpd.socket 114 BLAKE2B e684727be39592dce128cc0ab02f8e5bc4510591dcb2c170b49c120e84319b53e10eae275bc6a26ed8c9d51e53a21e41c551f18afd2441602cefc4e93344d50c SHA512 fbbccb4aab80a4a4612609e590965940642321119a65359cf2490530f81d55706a0105309d321a624d40348f12776724d2cf6b8bf29ea24391e60ef8b8bc8ba2
 DIST opensmtpd-6.0.3p1.tar.gz 699702 BLAKE2B 49f08e8329adc049a562b6ef7efa4c0a39cbcfe8a158cb905cfc726a7302ffe9833ccfb52041340767d55d0f2ae2087e8eac92b7359016c6c76b4d963a334558 SHA512 e579818a0ddbe637deb5a4e40f43eaf797783903ceac18fd89a57581b135b9e407d424e1a70ff7b4b06a0ee50bafb6e8ab2451371917887904b06ff1b55d320f
-DIST opensmtpd-6.6.2p1.tar.gz 777422 BLAKE2B e372a10f618e83ccb6c782d056750f89a5224898a28957509ab306fbe8bb4ea94462c1bbccbbe9c0dea64623c250d9fe9f3b74f2e26eda5d6c232bec50bff1d0 SHA512 b0f7ea94514a4a1880a22996064caa7da0a15e6453236ca2f004402125affa80e9d8c25d3e63826b45045305851959bc58c2c855829e46d6967bf6cd13bd1e91
-EBUILD opensmtpd-6.0.3_p1-r2.ebuild 1910 BLAKE2B e2f00b235de73368d49e209cabc7f0ef80e2a2fd3e967c91a6fe905fa2b3ea0f3e90085d1c7e4c72a9028c1fb5ecfc6ef1f51daf9ddac3c0109fc3394f2d20e7 SHA512 f8c3bf0561a798a4ff39fbf0b123a84626fc7d0e90c7ef7b7357bda4530c9cfb90f64c853bc2f5424bc594c21e2883a3111db30693e6d4da06e9cbb29be94d1c
-EBUILD opensmtpd-6.6.2_p1.ebuild 1998 BLAKE2B 6d24269e834350693240f9a0cbbd702994b027102cbaa26c7a98653e2e6f89e3a80fff36c3386a669475520e8b9bdf79f348deb062b6b71f6e88ed6fbf15c2b1 SHA512 bd9791a7fcec94ecc29835942089abb61bdce74e1d442e27072b6c544c505d43d8417dcc1a27a599be1684ec3e0f228e05d3f4bc68a2f78ddeb719683897eece
+DIST opensmtpd-6.6.4p1.tar.gz 790754 BLAKE2B 18cc19569ae764eff3d672cbfb87df7bd00afcce93705ad128e935c0a47a246c3a6166fca7b6f844c0dd5e728492d8aeb7e0f8a8c1f5a756bf356ae9afb80852 SHA512 267307c91f4fcf21624b0897dfb1f5638b77da7b8d9a02211d734ed2cc5bd39ea7542ae7f200255e2945518fbe7609a0e5aa4e5c6dcb8146014f08b3845c108b
+EBUILD opensmtpd-6.0.3_p1-r3.ebuild 1910 BLAKE2B e2f00b235de73368d49e209cabc7f0ef80e2a2fd3e967c91a6fe905fa2b3ea0f3e90085d1c7e4c72a9028c1fb5ecfc6ef1f51daf9ddac3c0109fc3394f2d20e7 SHA512 f8c3bf0561a798a4ff39fbf0b123a84626fc7d0e90c7ef7b7357bda4530c9cfb90f64c853bc2f5424bc594c21e2883a3111db30693e6d4da06e9cbb29be94d1c
+EBUILD opensmtpd-6.6.4_p1.ebuild 1998 BLAKE2B 6d24269e834350693240f9a0cbbd702994b027102cbaa26c7a98653e2e6f89e3a80fff36c3386a669475520e8b9bdf79f348deb062b6b71f6e88ed6fbf15c2b1 SHA512 bd9791a7fcec94ecc29835942089abb61bdce74e1d442e27072b6c544c505d43d8417dcc1a27a599be1684ec3e0f228e05d3f4bc68a2f78ddeb719683897eece
 MISC metadata.xml 595 BLAKE2B c13a49c15ec7c4430834682a4428b80e81be9832cbf6fbdd506ce9bcfc625aabf342d094ee83c689e63573cff9bfb2abee86196374c617c75aa487eb83ad0e4c SHA512 aa7344806cd011cec6c7afa277345eb2988f11970ea3038d969efa50d5b1f485f199f15a1b632197700791c2242ed8f712ff3cc382b1491e44c14ee94075a1d5
diff --git a/mail-mta/opensmtpd/files/opensmtpd-6.0.3_p1-security-fixes.patch b/mail-mta/opensmtpd/files/opensmtpd-6.0.3_p1-security-fixes.patch
index 58f3ed8c38b1..b22f3af1fbe4 100644
--- a/mail-mta/opensmtpd/files/opensmtpd-6.0.3_p1-security-fixes.patch
+++ b/mail-mta/opensmtpd/files/opensmtpd-6.0.3_p1-security-fixes.patch
@@ -89,3 +89,35 @@ diff -ru OpenSMTPD-opensmtpd-6.0.3/smtpd/smtp_session.c OpenSMTPD-opensmtpd-6.0.
  	return (1);
  }
  
+diff -ru opensmtpd-6.0.3p1/smtpd/mta_session.c opensmtpd-6.0.3p1-modified/smtpd/mta_session.c
+--- opensmtpd-6.0.3p1/smtpd/mta_session.c	2018-01-10 21:06:40.000000000 +0800
++++ opensmtpd-6.0.3p1-modified/smtpd/mta_session.c	2020-02-25 09:57:04.624147227 +0800
+@@ -1214,7 +1214,7 @@
+ 		if (cont) {
+ 			if (s->replybuf[0] == '\0')
+ 				(void)strlcat(s->replybuf, line, sizeof s->replybuf);
+-			else {
++			else if (len > 4) {
+ 				line = line + 4;
+ 				if (isdigit((int)*line) && *(line + 1) == '.' &&
+ 				    isdigit((int)*line+2) && *(line + 3) == '.' &&
+@@ -1229,7 +1229,9 @@
+ 		/* last line of a reply, check if we're on a continuation to parse out status and ESC.
+ 		 * if we overflow reply buffer or are not on continuation, log entire last line.
+ 		 */
+-		if (s->replybuf[0] != '\0') {
++		if (s->replybuf[0] == '\0')
++			(void)strlcat(s->replybuf, line, sizeof s->replybuf);
++		else if (len > 4) {
+ 			p = line + 4;
+ 			if (isdigit((int)*p) && *(p + 1) == '.' &&
+ 			    isdigit((int)*p+2) && *(p + 3) == '.' &&
+@@ -1238,8 +1240,6 @@
+ 			if (strlcat(s->replybuf, p, sizeof s->replybuf) >= sizeof s->replybuf)
+ 				(void)strlcpy(s->replybuf, line, sizeof s->replybuf);
+ 		}
+-		else
+-			(void)strlcpy(s->replybuf, line, sizeof s->replybuf);
+ 
+ 		if (s->state == MTA_QUIT) {
+ 			log_info("%016"PRIx64" mta event=closed reason=quit messages=%zu",
diff --git a/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r2.ebuild b/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r3.ebuild
index 14d9fa69ea4a..14d9fa69ea4a 100644
--- a/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r2.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r3.ebuild
diff --git a/mail-mta/opensmtpd/opensmtpd-6.6.2_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.6.4_p1.ebuild
index 143540cb4f1c..143540cb4f1c 100644
--- a/mail-mta/opensmtpd/opensmtpd-6.6.2_p1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-6.6.4_p1.ebuild
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index d478be32ab75..0446b5e350c4 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -12,10 +12,10 @@ DIST postfix-3.4.7.tar.gz 4572758 BLAKE2B 8d811293672fc2a1e0e3276fadd172d9e130a3
 DIST postfix-3.4.8.tar.gz 4573099 BLAKE2B cef447c8eeb9e2afbb869a94c5d67680ed7e633ea23108c1c109b632bd3f53f9f666302e8d1dac70affcd7d02d27b71a83b06c8e4564b6187268aa656b4c8132 SHA512 782fe83e4b40c7aadfb4c55850db4c7163dd0f647f4ef133e59f7b47c993b2b4fa6c43ebbc45131caa54d968259f9c8568f47e81bfccda02ab142be52aa95d45
 DIST postfix-3.4.9.tar.gz 4573241 BLAKE2B 6f6bd977d4670328aa89a296c0d92d7022a85e289b5197ad46f80e0fb88af565ca93f2affab50c742dd05010aa9a9ea2a68264c07f986ad39a6c1d7d6dec8300 SHA512 9038850d79bf19460d55dede2dd97e6f4bd8255363b4004704e5f0493bf9b1c0729f5bb11663ba6f6ed34177205609f72401b0f55d1d9dbce5398b4603a0a991
 DIST postfix-3.5-20200203.tar.gz 4639007 BLAKE2B 0a79068183ba9658a8295b9f9faa187baf8e05e01a7b446354625bcf020e1ade205dd82eee039f14f3d75410be9a35f0b29dc25e016e61a2cf8d40b5abb3b032 SHA512 61e9f5554717cbe46b976567e50a247c6aee947b395d40fbdd67e42ec1669bf44bb3b69cd5a7f8e2c6f7dd693c4fac42e7329cdf76f37dcc4b9bfd354522bd06
-EBUILD postfix-3.4.5-r1.ebuild 8977 BLAKE2B 6c54758b36ad158097c493f8215aada92740758401bcfa7053b39603187d462337eff5b9193ae3625b45d2e8ddac5a5bf8796b5cde9af6acef8eea88075dce19 SHA512 1236fea49a850f012fa70acef52a79fc4c573bd302e4671e3695786600600dd2e3f24f95890c3f8ef3cbafbd917622337cb84b46a5adfddb19788590697b4c70
-EBUILD postfix-3.4.6.ebuild 8985 BLAKE2B 9f97b796aaa6901751b93b5c87af8a444adf5aeaa0f5455b5e8a878439e5873205bc578c58c4e2c035539774f4c822182116a80c77df52e394145526cf116e95 SHA512 d5280081a7e717e73fb140dfafbef3cfe4ca796fb8a26b487419fbd9216985c8ec3a2729b27e0e8dae44523268b82d49f6bf18fb3cc0907046edb1e5ed076457
-EBUILD postfix-3.4.7.ebuild 8912 BLAKE2B b364c39428875baa41e9ced900858bca98741977f1fc7c689804c739451793ba5c4d0815379acdcd380f123acf219cd5908eb6e124ecb8cd95524296ae9bd533 SHA512 b658e3fa4c71c5df1a2cde9f0999b4f831d33bec4f6bda7aa4501e11581e42afa9ec9e1176e1159a478f3055976745113134c0c445e2a40fe3470fe590021c5a
-EBUILD postfix-3.4.8.ebuild 8912 BLAKE2B b364c39428875baa41e9ced900858bca98741977f1fc7c689804c739451793ba5c4d0815379acdcd380f123acf219cd5908eb6e124ecb8cd95524296ae9bd533 SHA512 b658e3fa4c71c5df1a2cde9f0999b4f831d33bec4f6bda7aa4501e11581e42afa9ec9e1176e1159a478f3055976745113134c0c445e2a40fe3470fe590021c5a
-EBUILD postfix-3.4.9.ebuild 8945 BLAKE2B 381704d8bcf7e0209c34589a42707280b43cc054784ef9edbe03f104b95c16c17c736f7f8484b2f816a5024f60b5ff563ec9be664e4d43b4e2a91e5444b696fb SHA512 2259e9df276de39ee6c9d98bb38ecf7c1e09ca61375369f428c08287bc5908b25a7b5938b037a013bfa8ca2a9f83db2916d446e6930e4b391cbc6d2e7451b7a2
-EBUILD postfix-3.5_pre20200203.ebuild 8843 BLAKE2B f2d17addb3c6a0064a829ec78711e325607fab68f1bb48790ef0de7bc52569c43e06f83e0fa4f7024bc2793f27824d7888418869f695e7775367aae823ecd904 SHA512 6a64f07e279cbfb43f882271993ce60c2f5cdbda59f9862785151e4707392605ecbdc4241be7aa293add4b5f9dafe2edfcf21c4bc61b1ca1f09c1c360a8e5b7d
+EBUILD postfix-3.4.5-r1.ebuild 8976 BLAKE2B 7969806bbd059e620051e28bba52d02631f7bd014d49e463361cee31e24c0d6e468bc0362b47b713347de62af408c9a03e238370af6255879a1735a9bb9decfb SHA512 5d75712e78423cd9a94ed298351fcf29869779a0ea70e5610997a395f439a861203857b3ad2a0619417d19688c3beb0dbd58ed80fe98d1bf5eae68c595ca2e9b
+EBUILD postfix-3.4.6.ebuild 8984 BLAKE2B cc1f4e3e444ba49b36c726a9114bbec2e1db6f93ad5e9366185cd7e6ce573f3b56a3a99c92d15d09e11729f7b71740edd5e1b10f9564001c904a3456a20daf6e SHA512 951cef920c07cd7a50ea4c46715d734894b7b34d0aa6d7c413755b4084e3589dcf39c8c2cfa1b44e5ffa2b137edb71926f3821df6bd1f750470bd9ab3a9eb569
+EBUILD postfix-3.4.7.ebuild 8911 BLAKE2B 77f4c3c147751a8680dae64cee4fc7c0493f192dea33f350dbc419a29b051b30e1d48e16f7939841d38f3d7faf9ca4987d0c37401556e0e0fdbc724aa0f9d0ff SHA512 cfed351b5d81364126ccbb062832de7a907bd1c5653f085e74a95e3f436e5a65bc54f444e9efad3195e71a0d3c636ada51cd642ed0225e5aa15546cab618835c
+EBUILD postfix-3.4.8.ebuild 8911 BLAKE2B 77f4c3c147751a8680dae64cee4fc7c0493f192dea33f350dbc419a29b051b30e1d48e16f7939841d38f3d7faf9ca4987d0c37401556e0e0fdbc724aa0f9d0ff SHA512 cfed351b5d81364126ccbb062832de7a907bd1c5653f085e74a95e3f436e5a65bc54f444e9efad3195e71a0d3c636ada51cd642ed0225e5aa15546cab618835c
+EBUILD postfix-3.4.9.ebuild 8944 BLAKE2B 2e0467e4a747a1a319a2c2499261f6a7fcae2541324c0671e2d061cb6cb3bec5d716a467b92b90ca7fe1ac968d2a04226c8c608985284a8e80d0ddfbbefce5af SHA512 3d4fd067d781a11d4d9acf67031c5f722061df3b3bc305658db4be814763e6247260cbd149a83d7391a5a473319d7a6e007563d380a11e446bed55a61546defd
+EBUILD postfix-3.5_pre20200203.ebuild 8842 BLAKE2B e13ff009b6f4421728233faf20769321540574626a5a64efac770e2b12984335fdf43fc1a1d10705747624e257acce0c10df96c76f5f405649dda8cfb0f0473e SHA512 27b78a27caa1a3c14bd4d88b9700d35d007e8a586bf01f277afbeada87b71906832df4b90b5387122afae2397dca5e2b559b2ce3dd2b8c9236f5281e5c6e0623
 MISC metadata.xml 939 BLAKE2B 01474efe62df1eda9a3ba5976847064d615b3c32d9c71838354ef375c851c7ab4d1fcc2bc0d2945ce3d259fc6a698938cee6d1354c4e0f02f1e66395e377a0c5 SHA512 8602700c2a21b66ecf2c024c06ce23452f7effd9c06a5d58c1ccb351bcdef43a3c89575cc9136efc72fcd4e06ecb0654017b51bb145e7ffeeda771e3f4e7a673
diff --git a/mail-mta/postfix/postfix-3.4.5-r1.ebuild b/mail-mta/postfix/postfix-3.4.5-r1.ebuild
index 61ae93f51f7f..001ca67956eb 100644
--- a/mail-mta/postfix/postfix-3.4.5-r1.ebuild
+++ b/mail-mta/postfix/postfix-3.4.5-r1.ebuild
@@ -198,7 +198,7 @@ src_configure() {
 		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
 }
 
-src_install () {
+src_install() {
 	LD_LIBRARY_PATH="${S}/lib" \
 	/bin/sh postfix-install \
 		-non-interactive \
diff --git a/mail-mta/postfix/postfix-3.4.6.ebuild b/mail-mta/postfix/postfix-3.4.6.ebuild
index 4a5c0d320d24..df756f6871ca 100644
--- a/mail-mta/postfix/postfix-3.4.6.ebuild
+++ b/mail-mta/postfix/postfix-3.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -198,7 +198,7 @@ src_configure() {
 		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
 }
 
-src_install () {
+src_install() {
 	LD_LIBRARY_PATH="${S}/lib" \
 	/bin/sh postfix-install \
 		-non-interactive \
diff --git a/mail-mta/postfix/postfix-3.4.7.ebuild b/mail-mta/postfix/postfix-3.4.7.ebuild
index 7603315b82de..f0bd1f4d4415 100644
--- a/mail-mta/postfix/postfix-3.4.7.ebuild
+++ b/mail-mta/postfix/postfix-3.4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -195,7 +195,7 @@ src_configure() {
 		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
 }
 
-src_install () {
+src_install() {
 	LD_LIBRARY_PATH="${S}/lib" \
 	/bin/sh postfix-install \
 		-non-interactive \
diff --git a/mail-mta/postfix/postfix-3.4.8.ebuild b/mail-mta/postfix/postfix-3.4.8.ebuild
index 7603315b82de..f0bd1f4d4415 100644
--- a/mail-mta/postfix/postfix-3.4.8.ebuild
+++ b/mail-mta/postfix/postfix-3.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -195,7 +195,7 @@ src_configure() {
 		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
 }
 
-src_install () {
+src_install() {
 	LD_LIBRARY_PATH="${S}/lib" \
 	/bin/sh postfix-install \
 		-non-interactive \
diff --git a/mail-mta/postfix/postfix-3.4.9.ebuild b/mail-mta/postfix/postfix-3.4.9.ebuild
index fc0e7c9a565f..f62330bb7af8 100644
--- a/mail-mta/postfix/postfix-3.4.9.ebuild
+++ b/mail-mta/postfix/postfix-3.4.9.ebuild
@@ -196,7 +196,7 @@ src_configure() {
 		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
 }
 
-src_install () {
+src_install() {
 	LD_LIBRARY_PATH="${S}/lib" \
 	/bin/sh postfix-install \
 		-non-interactive \
diff --git a/mail-mta/postfix/postfix-3.5_pre20200203.ebuild b/mail-mta/postfix/postfix-3.5_pre20200203.ebuild
index 9321ebc18007..c1f9fa6fc3fa 100644
--- a/mail-mta/postfix/postfix-3.5_pre20200203.ebuild
+++ b/mail-mta/postfix/postfix-3.5_pre20200203.ebuild
@@ -193,7 +193,7 @@ src_configure() {
 		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
 }
 
-src_install () {
+src_install() {
 	LD_LIBRARY_PATH="${S}/lib" \
 	/bin/sh postfix-install \
 		-non-interactive \
diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index 6c8a5636da3b..4e7956029a7f 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -12,6 +12,6 @@ AUX site.config.m4 564 BLAKE2B 85bcbe7b9a26071aedf0d1b530c1276d93de21d82972add09
 AUX sm-client.service 418 BLAKE2B a9057cac008c11d3cfd5a4b662cf3fc71a33be79e8890a54e556a258b098ceccc2e9941f62dce868498751bd22f23f45289bc84a8250020b140acbd2b6508b58 SHA512 26e5a64790fd7106e45de0f4dfafb3b648094953bd1831a223ca7c60b7cb75b673fb554b426a6aa0e7dc200a134fd042b4ecc6795641cfddd82bd04e4c7ea324
 DIST sendmail.8.14.9.tar.gz 2114293 BLAKE2B 51c24478724a1dd87e3bbda0bf0e8c9c64bc8f36eaa624752eda50942520a4f19262d2c8cebbb0a02467bb3f49e1e7edd78a69f0327effa3834e4234b289f04c SHA512 a541fe687e9967fb87f2f6c6263ecc698aac42c6a52e81e7ee556f0c3d719b9c996dfccf10cc2e0e5c6d03dd8d3ce79b856b78ca049dd47665e38c77763fa424
 DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
-EBUILD sendmail-8.14.9.ebuild 7039 BLAKE2B 262ba263275701dca649e870bc48485bbeccb9f4caee58419a339fb21049d6f0f573fb26715df8d82c975bf215d56e95c71d04d4d4e9fd44826ceda0bd5eb1c8 SHA512 c3521456c37b630318c5c7e02d1cb278e30ca1c519b33cba744ab3e2630a1ab4c177c601e4496e8168013afccb8ef79b04316570b34f26487a2bf581f9f949aa
-EBUILD sendmail-8.15.2-r2.ebuild 7221 BLAKE2B afdb765aeaf8b38f774be0db2d93c18aeecf735fdbf6aa597fdf9512b36db1821cf110577880d89b78cd3132c1d8538d97b69424cebd5e519fab16e0df58e7ef SHA512 1a84d0552df0bb20ebf751649796187b27794e0fe11d18c862aee9766afc0d5006161f1d62e9978f8ee2eaeb6a985bcaf4892906acdb4135f094360fc3c7ec3f
+EBUILD sendmail-8.14.9.ebuild 7038 BLAKE2B e5eeab9989dc4e74fd9763a707bb94afad121d5d5cca6e276e47cb0196781c37f590884e1c2f8ff64a14ba99baffe4186fafa13952bf7bf4617fcd9ecd617c8d SHA512 00169095b070eb1c3e30d2e5e215625dff0677d171c79757c006a1ee1cf171d8ec1e19fd654b56e3da8fe78caa429b8dd8893d639e39bfafdf0015603aabb583
+EBUILD sendmail-8.15.2-r2.ebuild 7220 BLAKE2B bef926cae4d7eec00db753c7ba63f0393a51cba70b90efd4ec6aa76fc47c0871b0f05622893e24846ea923bdf538860871dcb78aeb170f562155e31e3c13502d SHA512 baec1257fd1e4bf7900d9006f560a09f40cb09328215ead62e710594479733a51fd100512134bf5341947d0d22d903032d6ba3b734151e1b747b8510646ca233
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/mail-mta/sendmail/sendmail-8.14.9.ebuild b/mail-mta/sendmail/sendmail-8.14.9.ebuild
index b913a360ffab..8454266308d6 100644
--- a/mail-mta/sendmail/sendmail-8.14.9.ebuild
+++ b/mail-mta/sendmail/sendmail-8.14.9.ebuild
@@ -94,7 +94,7 @@ src_compile() {
 	popd
 }
 
-src_install () {
+src_install() {
 	local MY_LIBDIR=/usr/$(get_libdir)
 	local MY_OBJDIR="obj.`uname -s`.`uname -r`.`uname -m`"
 	dodir /usr/bin ${MY_LIBDIR} /usr/include/libmilter
diff --git a/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild b/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild
index bb76f92e2921..d3fd92fa5bb7 100644
--- a/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild
+++ b/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild
@@ -100,7 +100,7 @@ src_compile() {
 	popd
 }
 
-src_install () {
+src_install() {
 	local MY_LIBDIR=/usr/$(get_libdir)
 	local MY_OBJDIR="obj.`uname -s`.`uname -r`.`uname -m`"
 	dodir /usr/bin ${MY_LIBDIR} /usr/include/libmilter
diff --git a/mail-mta/ssmtp/Manifest b/mail-mta/ssmtp/Manifest
index 256cfb24d277..301ea88f9813 100644
--- a/mail-mta/ssmtp/Manifest
+++ b/mail-mta/ssmtp/Manifest
@@ -1,6 +1,4 @@
-DIST ssmtp-2.64-patches-3.tar.bz2 5128 BLAKE2B c41c6366a0cfc59a2bbb935d9edd209b439ec4512bc43e0eeadad944af03dad5e25cf03270f352edf3fed45f1f8ca082ccde775970cae8e48655de01d3a758c8 SHA512 140ca571705ee45ca2d6718b456ab028e3aaeb910a64230d8143a29de837eb3be8f16641f21f56f2c5112867512fabdc952886701d596f0bb303fc1524a1ad46
 DIST ssmtp-2.64-patches-4.tar.xz 6928 BLAKE2B 6f1d9a823273298abc58025c94cb288e1e296031580f63ed489a9d2559cd8846761e78c6fdfc1a385e645f990bc739ce3cf3ad0d1c1a3006dd3bd60e4a38c4f4 SHA512 6fa57c0bc5ad363e21bf69fb60f1cbb87ad1ead393a53ab5bd25b709303c321a29ed37ce7fe95b94dae748703bba3b0631fc2a95e40957c5241b5d9f42bc0c4a
 DIST ssmtp_2.64.orig.tar.bz2 52501 BLAKE2B be158f8d969f98e1a7105bf4b741da960efa2a1c4a941426d6b6ec0677df13a2272fc71a93d2c44fe65c7d0a30e9acc4ec8259ed298b746c8d9ceefd64f95336 SHA512 911752e744420adf58552b9cf3a6e558d8b39103e5ad33a9ed4429b9a3a2091f7674aac11fe9bbd66747a61cdabe6bd638b80efcaadc86b057c12e2e235cca72
-EBUILD ssmtp-2.64-r2.ebuild 2928 BLAKE2B a012dc951c3042348ffa098ebdbb3aa1f84da612c89393e417c72d6d4bc8b17262217163f6ecf8f210c5b24ce4f8e2e7ebae37e1b3499f4bf3c3ae6af38a60c8 SHA512 c093bd32727c6d6ec9d01be19985315045284ee878379152b18c3c82632fdc27b6c20d8baefd7aaae3037d0731168048c6d61816270df0bec9438fd5e542bad1
 EBUILD ssmtp-2.64-r3.ebuild 3006 BLAKE2B c8029f8e536217af072c40dbf2606f1e164e504e640462678aeeb2466445d91b7b9548f32b5bf1c4558bc7a39cf336d5f58891433a33f6e56ad28e24d7e6f5b5 SHA512 f7e5fce97154d149cad8c8d59655ba7bbafdf8ebd08f47e097c5ca78f20b6708a77691758338f60889d04b749c0383661fad0e118941a5489c26ae3d6ccbd16a
 MISC metadata.xml 259 BLAKE2B eb59516b105b0fdc4b755c3852b714707dba4f5b414eb0eea763db68aa0c5d1971b55866972ef14f1e3e5bc81ccb66975a24b9292aa796edf02877d649a661f2 SHA512 3e7a5afefe4f2095be4347e56af64eef343bbb4920ef80a7d93c88111864e8993f899328af33e736324960d26f30939e29e001e90381548a353ee0089f96a766
diff --git a/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild b/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild
deleted file mode 100644
index 4bfc4613b3c0..000000000000
--- a/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-PATCHSET=3
-
-WANT_AUTOMAKE=none
-
-inherit eutils autotools user
-
-DESCRIPTION="Extremely simple MTA to get mail off the system to a Mailhub"
-HOMEPAGE="ftp://ftp.debian.org/debian/pool/main/s/ssmtp/"
-SRC_URI="mirror://debian/pool/main/s/ssmtp/${P/-/_}.orig.tar.bz2
-	https://dev.gentoo.org/~flameeyes/ssmtp/${P}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ipv6 +ssl gnutls +mta"
-
-DEPEND="ssl? (
-		!gnutls? ( dev-libs/openssl:0 )
-		gnutls? ( net-libs/gnutls[openssl] )
-	)"
-RDEPEND="${DEPEND}
-	net-mail/mailbase
-	mta? (
-		!net-mail/mailwrapper
-		!mail-mta/courier
-		!mail-mta/esmtp
-		!mail-mta/exim
-		!mail-mta/mini-qmail
-		!mail-mta/msmtp[mta]
-		!mail-mta/nbsmtp
-		!mail-mta/netqmail
-		!mail-mta/nullmailer
-		!mail-mta/postfix
-		!mail-mta/qmail-ldap
-		!mail-mta/sendmail
-		!mail-mta/opensmtpd
-	)"
-
-REQUIRED_USE="gnutls? ( ssl )"
-
-pkg_setup() {
-	if ! use prefix; then
-		enewgroup ssmtp
-	fi
-}
-
-src_prepare() {
-	EPATCH_SUFFIX="patch" EPATCH_SOURCE="${WORKDIR}/patches" \
-		epatch
-	epatch_user
-
-	# let's start by not using configure.in anymore as future autoconf
-	# versions will not support it.
-	mv configure.in configure.ac || die
-
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir="${EPREFIX}"/etc/ssmtp \
-		$(use_enable ssl) $(use_with gnutls) \
-		$(use_enable ipv6 inet6) \
-		--enable-md5auth
-}
-
-src_compile() {
-	emake etcdir="${EPREFIX}"/etc
-}
-
-src_install() {
-	dosbin ssmtp
-
-	doman ssmtp.8 ssmtp.conf.5
-	dodoc ChangeLog CHANGELOG_OLD INSTALL README TLS
-	newdoc ssmtp.lsm DESC
-
-	insinto /etc/ssmtp
-	doins ssmtp.conf revaliases
-
-	local conffile="${ED}etc/ssmtp/ssmtp.conf"
-
-	# Sorry about the weird indentation, I couldn't figure out a cleverer way
-	# to do this without having horribly >80 char lines.
-	sed -i -e "s:^hostname=:\n# Gentoo bug #47562\\
-# Commenting the following line will force ssmtp to figure\\
-# out the hostname itself.\n\\
-# hostname=:" \
-		"${conffile}" || die "sed failed"
-
-	# Comment rewriteDomain (bug #243364)
-	sed -i -e "s:^rewriteDomain=:#rewriteDomain=:" "${conffile}"
-
-	# Set restrictive perms on ssmtp.conf as per #187841, #239197
-	# Protect the ssmtp configfile from being readable by regular users as it
-	# may contain login/password data to auth against a the mailhub used.
-	if ! use prefix; then
-		fowners root:ssmtp /etc/ssmtp/ssmtp.conf
-		fperms 640 /etc/ssmtp/ssmtp.conf
-		fowners root:ssmtp /usr/sbin/ssmtp
-		fperms 2711 /usr/sbin/ssmtp
-	fi
-
-	if use mta; then
-		dosym ../sbin/ssmtp /usr/lib/sendmail
-		dosym ../sbin/ssmtp /usr/bin/sendmail
-		dosym ssmtp /usr/sbin/sendmail
-		dosym ../sbin/ssmtp /usr/bin/mailq
-		dosym ../sbin/ssmtp /usr/bin/newaliases
-	fi
-}