gentoo christmass resync : 25.12.2020

7 files changed, 151 insertions, 4 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 2f8bb58a4b3e..d4624d4c5616 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 87f24ddfaaec..9d7cf2ea052a 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -2,8 +2,10 @@ AUX msmtpd.confd 518 BLAKE2B e537ca90e9c4debd53936b227352b73f5ca1e7114ba8daa3121
 AUX msmtpd.init 347 BLAKE2B 9faea920dc23ebcdb62b05595acf4f70dd3d654645ed0f5ba6f76316762986c9951905f675c2e527c5e0b5eee2bcf53a14e018d8d64080b97e82da4e3abaa0b8 SHA512 e3080dc1fb7b72b6332ebcd4f807780dc04d32b8d3e5740b62f618d5d8f39f7c2a119604e26282e1d98c1365fff7920944401c399267461fab7ae2cdfdac44d7
 DIST msmtp-1.8.12.tar.xz 364712 BLAKE2B 94707d18d9be71e8e51413cdcc55887fc15bd7d0f059d54cfcf4e07b5589febbb9ed4025206e3b82d1b12edad45086d3ad8a47fb3d37488a49e46984d7b7bc32 SHA512 8620e5e9a88a49769cfdbf2aa83842b230b3fd1584641d17129cb404e3c9696edd5a28237ef46a115ca82d2a846c0f653eaa837ba6f8512f8b57493d64451df8
 DIST msmtp-1.8.13.tar.xz 359536 BLAKE2B 824d88b571ac1dfd78046f1939fa83c4fad9679bce993c20d073df5cd431deee1ca36119123d307d788be13d700901c13c54ba47496f2148cb9fbf9e2308698c SHA512 1b466fc518d0468a8febdf238a6d422fabb95be8158d2e52e38aeb5e5b21661af9791ff8ed82f72f111cebe2ce1b93deabeb91dca4f06f09cf765152095a1cfd
+DIST msmtp-1.8.14.tar.xz 363988 BLAKE2B 46953512002365f8e80e1bdf80f8513845bae62bcfcbe8334642b7a51f2d7da7719e3c1812d43e2a887162d45a1b29893744f452f6ac7dc205fd72a578eec39f SHA512 fa274849082553b14aef922c43b84fa6226a26638747ed3ef6baae9d97ff753b24f5eca055426c2e0355df81b2458f524d940faf2a7db771d80fb027e9f45e8b
 DIST msmtp-1.8.7.tar.xz 340908 BLAKE2B 5241acf54d5a6af6ccf2c3bfd33954a5235af2d2cb467e4134401538e60e1847489a7a599359e2d13202ea9637c32a67ec5180372b139e06f6d47f060cba6c8f SHA512 5a079cb90b48853ad812125e8b341f5bcd5f5ba4725d62c37210050896527b63f993aa6393f1d4107636153bf0ed84b0288e88a7e78a119c66b2d58f1e69a67d
 EBUILD msmtp-1.8.12.ebuild 3308 BLAKE2B 79b949a500e88027d57cdc3c5bbcca4bbf8c5181b2cc002d120ca6fb51d8c2a801f387007377088d0711c46a1edc2b4cbdc9f5ddb0fae832ac46c655f18ca0f8 SHA512 21873bc55103a7aabf5adaffa45a52a91a36e7d67cf81b6fe82de2eba4e52bb32b608d648ed0d9b56b5fca20eb4a21d64f9e009fe5bb682a7619aba5a5f39171
 EBUILD msmtp-1.8.13.ebuild 3313 BLAKE2B 7ef4647ff8f55e4eb8f5a223c7086a47bc64536422c36e4129555d77ce36b5e0750cfb2579353a7475bf4a3e6fd69cfdef3233de32282af6ca5f171ad606eac1 SHA512 4535f9905169e72b6d66531217a71183d8779606b88e6b191880086a1ce69e43d23ea1e635bf7cbf7b5baa8d02fc64c107b8435b8c4f2182558bfe9693fdd3c5
+EBUILD msmtp-1.8.14.ebuild 3313 BLAKE2B 7ef4647ff8f55e4eb8f5a223c7086a47bc64536422c36e4129555d77ce36b5e0750cfb2579353a7475bf4a3e6fd69cfdef3233de32282af6ca5f171ad606eac1 SHA512 4535f9905169e72b6d66531217a71183d8779606b88e6b191880086a1ce69e43d23ea1e635bf7cbf7b5baa8d02fc64c107b8435b8c4f2182558bfe9693fdd3c5
 EBUILD msmtp-1.8.7-r1.ebuild 3318 BLAKE2B 4457fc5562fe18b025597a8d965204d6fec8c97b027857496cf441e0ef465e8d1217a8b2c0eb20fe319e7da9cedca51183a73b90dc4528a7fba090b41d46b0ec SHA512 f722e6f382f8620603183bfc12e7d4b9f855d1054a09686c5f42a0bba7d35a5dc28a03de93ea26e89ae65907ec8981dc07f839e41be33584875c5ba424b11ce9
 MISC metadata.xml 470 BLAKE2B 3ea3fcc232512a92126ff900dddf558c06194e473b172655c6960c165669c2323115a2ebf4472c5cbae57062d203b97aeac9b9d65fee5f8a0d6071416325f868 SHA512 c117c6d7f7f28d32dc411049d6a7f7bd70e1b70ff0030c85db2a2df86d1f82353230ca1713d2be7bb10e450d09e9a5749ab2e511b93b39dfe0091eeba41246c9
diff --git a/mail-mta/msmtp/msmtp-1.8.14.ebuild b/mail-mta/msmtp/msmtp-1.8.14.ebuild
new file mode 100644
index 000000000000..81fb1674438d
--- /dev/null
+++ b/mail-mta/msmtp/msmtp-1.8.14.ebuild
@@ -0,0 +1,145 @@
+# Copyright 2004-2020 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 )
+	idn? ( net-dns/libidn2:= )
+	nls? ( virtual/libintl )
+	sasl? ( virtual/gsasl )
+	ssl? ( net-libs/gnutls[idn?] )
+"
+
+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 's:/etc/aliases:/etc/mail/aliases:' \
+		-i 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 ../bin/msmtp /usr/sbin/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/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index 91215625b406..effba5cdce4a 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -3,5 +3,5 @@ AUX smtpd.pam 147 BLAKE2B 1706fe27cf53621428f563af146d1197dfc59133dda79fe08141ec
 AUX smtpd.service 138 BLAKE2B c76db1847110622621701cdf1fdb764d26bf28b86a25adf9ae8e0ba15838a2a9ddc677f54f5d5fe191591b2bd5c7f20067fc00b6679f448e25371e27f231589d SHA512 b70b173ac275b871d78bac0e55b2e0c8d8a6538c7f2c4dc86fe67fb37a1ee942e0442353b338b286759618299f51b144396251db13f82c9afa035dcaae11a258
 AUX smtpd.socket 114 BLAKE2B e684727be39592dce128cc0ab02f8e5bc4510591dcb2c170b49c120e84319b53e10eae275bc6a26ed8c9d51e53a21e41c551f18afd2441602cefc4e93344d50c SHA512 fbbccb4aab80a4a4612609e590965940642321119a65359cf2490530f81d55706a0105309d321a624d40348f12776724d2cf6b8bf29ea24391e60ef8b8bc8ba2
 DIST opensmtpd-6.7.1p1.tar.gz 859364 BLAKE2B 5b4002e8f15ab31810c9a4ccf22a0efc240f9db8bd14b8bb78aedf853b9c9db77cc4d6602a8d4b8d73904682cb1b345cb34aee69d10152d5be5cdf8d6cd37b96 SHA512 403952e77b360f42d8dc8ae7cd7faeced831b9e37bffd7c67d338b7208f7471d50f3594c3475a9282d18cb17435efd305ec8c05f89eaeab5d363ddb1c4d54a2e
-EBUILD opensmtpd-6.7.1_p1.ebuild 1835 BLAKE2B f5358a44a164b52ef4889e08f4107f9f506383207573571f64130fff280dcb0b189ea479bead2bc15a758d7d381282db8ba0091975346ee673249a400de94368 SHA512 ec6ead32206adf2c1ffb7f7613ccd13ef01cf0e09715748dc7fbc262a9586c3ef5e24200a8f35bd6d5b64f9d04ce2142bfe35f2fc98a026505a28fc22de2872f
+EBUILD opensmtpd-6.7.1_p1.ebuild 1833 BLAKE2B c0f81e5ad50b984666d6b08e07ea6ec3174d23f22fe676d08c461bef32ac5b5f61fb6bbf4099285a70f375b10765f4342d17cbe75ac0bd8931883dd6a3819c3c SHA512 a734ca654a0194550b2012dbf334c3d49a9b176837a1476c3ef8eb1f81f7fccd72d2b440f41c5f1315e9066e9dd513a190fad0c5719c62e5b9752bfce3292159
 MISC metadata.xml 595 BLAKE2B c13a49c15ec7c4430834682a4428b80e81be9832cbf6fbdd506ce9bcfc625aabf342d094ee83c689e63573cff9bfb2abee86196374c617c75aa487eb83ad0e4c SHA512 aa7344806cd011cec6c7afa277345eb2988f11970ea3038d969efa50d5b1f485f199f15a1b632197700791c2242ed8f712ff3cc382b1491e44c14ee94075a1d5
diff --git a/mail-mta/opensmtpd/opensmtpd-6.7.1_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.7.1_p1.ebuild
index d93aa1e499e4..9e8a2907a207 100644
--- a/mail-mta/opensmtpd/opensmtpd-6.7.1_p1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-6.7.1_p1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.opensmtpd.org/archives/${P/_}.tar.gz"
 
 LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="libressl pam +mta berkdb"
 
 DEPEND="
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index b0215093384c..04be0579f1b6 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -10,6 +10,6 @@ DIST postfix-3.5.8.tar.gz 4614733 BLAKE2B 13166e854f70987f981bb5e7e5dabfaa73b317
 DIST postfix-3.6-20201212.tar.gz 4683741 BLAKE2B 9c6f1e4488c955d5760cd921a546e2f2add363c70fbca7aede45721bfb16f00dc246ad887945054f0e047c49c17a5d4390a826ca4d357c452390e1da88366397 SHA512 2473a5542189a7973a8cdb767552c1cc819607674c0bf29358adef5fd8d7b19010bd4af62e24f061c5deed8feb787962f4827ceb6958bf93437f179332cdeb83
 EBUILD postfix-3.5.6.ebuild 8830 BLAKE2B 5da9e3002be93402fa4b5d767bec9ee1e17571d492a776244210a98b639df1546cd01009348a7c8d1686d0408bdc07175afdc4fe420b55f898e83eb6ba91a440 SHA512 c121bd5ecca3a74d9dad9caf43cd44884f787bb27c146300f730c57590a24007d18a3cd04cea20a22db0e22ef44d355f549514d7a1c1bba6c865749972c90e5d
 EBUILD postfix-3.5.7.ebuild 8842 BLAKE2B a1a23cab748fdf287e5cc0712a14bbc242099cbdd49c4b28574eee88ccb458c1b6022591fbcffaaaf601824862e1457fbd840d50dcf553cb143079f6e1367d2f SHA512 5de8cb33a4bbdd92234bb4f3ce6c4923ffcb493fb3c72739b094d90a209cab8f26ab860b6958c2df3daf2fb0b685ac4e2415eb2cf6d7a46391dba8060b304971
-EBUILD postfix-3.5.8.ebuild 8844 BLAKE2B 05886c2922b08862ab35a769b8f754b2015f123823ca4bbfee0d8a8671238ae947f5f15dcfc5a105f7a17040a54110096826178b42d2ea01c4bcd8a9cbc796d2 SHA512 ccc0a63ca9f74a6ffd0938e2559591084fabcaaeb6c657c7b667cb8822243336a9d15d20753020bd1ca9ce05f22cac7da3e653cb20beb60615a32e60e22ac724
+EBUILD postfix-3.5.8.ebuild 8840 BLAKE2B a6922e9f6c707921fc8ac412477e90447ce1b4705aa064a5fa2d2cf57d8e8a3b8e6f98aa47d35611c04a21e793763e0e5bdb2e561ff02a65a0181a019154983e SHA512 74043ba1c9602513757c49b71394e565e3d244814fb4eefa885190bd43a987756b8a9a8cca9dccdc1c4b7a02e76aae1f3ee359fac26bba280a84238a940c65d5
 EBUILD postfix-3.6_pre20201212.ebuild 8097 BLAKE2B fa8fa8284cfb06bced6c30bda5f7874b00d63552b0541e88b78b909e4a1d29d9183250f5f295d2f6e3ebf8aff099f963a54d67934573a4deb980371b159fbba8 SHA512 cbe0738bc2bf3443f4bf7cb77c261b95a2ee71f0e6908dc0472a2d99e02e5231de09619d09b7261120ac62fb4d34f390b4035cf338f4d85a16e20e677d127e32
 MISC metadata.xml 939 BLAKE2B 01474efe62df1eda9a3ba5976847064d615b3c32d9c71838354ef375c851c7ab4d1fcc2bc0d2945ce3d259fc6a698938cee6d1354c4e0f02f1e66395e377a0c5 SHA512 8602700c2a21b66ecf2c024c06ce23452f7effd9c06a5d58c1ccb351bcdef43a3c89575cc9136efc72fcd4e06ecb0654017b51bb145e7ffeeda771e3f4e7a673
diff --git a/mail-mta/postfix/postfix-3.5.8.ebuild b/mail-mta/postfix/postfix-3.5.8.ebuild
index 35c320b932a1..df5e18df4a47 100644
--- a/mail-mta/postfix/postfix-3.5.8.ebuild
+++ b/mail-mta/postfix/postfix-3.5.8.ebuild
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
 IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
 
 DEPEND="