5 files changed, 152 insertions, 2 deletions
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 1e523eac4790..495c0b800cc3 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 78e808c08f2a..d9880b2990a0 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -19,5 +19,5 @@ AUX exim_at.service 140 BLAKE2B 8624f4a555e2acdc7aaf917952c4152ad00dc063a51076ae
 DIST exim-4.91.tar.xz 1744660 BLAKE2B 8d50a709def02a52f8e76a16fcf51a4fc7e553217d5513a361aa780f58bff336a9ab90d8683e3841a074f54f3c75f2f77bf1a353a849be1207bffdd5fb6e4c51 SHA512 35b34dda8dd0f27c0429e6eb8409756ecd3cf9e535bac421d696b1560db0ff3bf4cd0e4a00bc0b7e32137d31bb5de20776c7c1830ec125aa36b5c4376b0c71a2
 DIST exim-pdf-4.91.tar.xz 1973672 BLAKE2B 0b9e3f65c8e8a5f727dd4359d1c5c6c867c0ecfce3b44763d5a24f2d98353bc58c42456e9884994f404d17685909ea287a478189407ba8e7835352274c788980 SHA512 82add9b42749b6d938ff3b44a4dea3dfe84bcb2a1efea8a32b64d81a9ea312033d33023b5c224a44a2c053b18f9042bd1f2834847cf48873d1725a5594704a12
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
-EBUILD exim-4.91-r2.ebuild 13174 BLAKE2B 32323bcef3062c34a21b71504492802355ed5efec68f931f7dfc2f429f94508fc936d2a9efbf0f04b1e4a2e66a43bee6018c02efab8404f1962fdbf3217b6291 SHA512 8e01eca662614c49d7abd0cd644b0938ddf75b8e5fb4a1d28c4c229ef147f652e11439a1665a883917716c58e2e2346a702d547bab0fb9c70908a33375eb99db
+EBUILD exim-4.91-r2.ebuild 13173 BLAKE2B f7ee40c7dbab94fd499c9fae38e385b2a937805ec340ec511c57d0e00e74f5075b0ced2ed35700af35e40702042612127155360b42529f5377eaee09da7c8fdb SHA512 5bc34da80791d5f5a482f31bdb425299a0201fc6e0d13076c63e92be678569bedab1356618662d7b463e96810b8d34de6462243eecc7c637d43bf7a5f1b0b7a3
 MISC metadata.xml 2562 BLAKE2B b6eecf1c5ab931f7e0cd1524efcd4408cae9a4788b04ff7e0667aaa38dea77151bbfc0fddce5cedaca1e06e081f0f050106bb374be2beaa93e21ab350cd6f6bf SHA512 74abffc1cdcc3f1d15644422519d248772f7024c76f612bbad33a2b720043f92c82623598bcd9766ce141a8196224f7cd35ce155c11692346c950b20e8657382
diff --git a/mail-mta/exim/exim-4.91-r2.ebuild b/mail-mta/exim/exim-4.91-r2.ebuild
index 111f05cbcc34..cf587588b81c 100644
--- a/mail-mta/exim/exim-4.91-r2.ebuild
+++ b/mail-mta/exim/exim-4.91-r2.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="http://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	( >=sys-libs/db-3.2:= <sys-libs/db-6:= )
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 7b3adfd1dc16..404729de439c 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -3,7 +3,9 @@ AUX msmtpd.init 347 BLAKE2B 9faea920dc23ebcdb62b05595acf4f70dd3d654645ed0f5ba6f7
 DIST msmtp-1.6.6.tar.xz 283744 BLAKE2B 41745d9f20a33b0e4c6f7eee3ad5897c5a555a8cd1e27eb0bf7d347054d072b9eadfc7a31583e12a4f35f071aa710bb403980cba0e06920f65fdb727c786447b SHA512 30f33648b66a6b230cd38d0eee4c916a631a51bddcc1a15c9f7b324305506cb83b9c95f95def9150d0b783d38000db409981331b3c6a756232f0ce49e9b343ab
 DIST msmtp-1.6.8.tar.xz 294872 BLAKE2B 156237dcc10c320ef15b368ebfe823d6f30f1a740061c5846878a8e478c1f3a3129c52af8327995933ecb15cd8cec0c18a3104993b030bcbfa09e3b0b6c2a58b SHA512 58ccdb6f16ab31959aeb1929c11f820219d4be062edca209c5986e4e0932d718f6f39c81727d05cd448779cedc4ab3e7bb557ce9f5dd3e7cc95e0aa5c3b623bf
 DIST msmtp-1.8.1.tar.xz 303112 BLAKE2B 6de6c566a0de0f680f354066d1613b3b15be95c24098bdf7019e3f0289f5bce8478d2de65bf5711863617d41eb23b14b6157e25b92fce60f1cd4d33f4a593810 SHA512 00c5d8b810d48c171fc975115911c4cdf3e18efb91448800bdab320d0f850f4893343b436899722d3b9c82e3781c3e103dc31175c89a5c867511c14df5b9785a
+DIST msmtp-1.8.2.tar.xz 335760 BLAKE2B 64952a3614845d72a1e2107ea4c8a2d3599d5aa602928b31c85544a7b2aabef9a22a1371fc68cf4d040317e615448a4f09e473bc0b598359e9d58323ac55302c SHA512 1f37be6f6bb01ddb3ba202673d7ba6457e6e9d8cfb718fdb5e9c19162b85e08c1487f160011775e626df0e37c414dcfbb20380d14084fbe80c46287eec15f5e6
 EBUILD msmtp-1.6.6-r1.ebuild 2973 BLAKE2B a2de4fd365a0ec85eab8334bf7c7087d57d91219c82921dd2adbb99b8985475dc50943ae95669f0a788cac0f9bb980b2b62faa96d28b2e1e16a91f4be8544420 SHA512 4ff1b8c2dd5d385a8915d0e1d8d1c6568cc98dde74a02aa83dd20c89c65ef1ceacfc544e6a488ac519b16582675a773dfb13fe7c6bed6f269e37dab7fc6abbd6
 EBUILD msmtp-1.6.8-r2.ebuild 2999 BLAKE2B f1d854c4a48b6f6bcb226c6e281413f0dc72132c8948f1a6cc64dcbc6f0e2640ba27f6141ef1011666ca43ca44389de729420524669c77437d1cdd73ffaef624 SHA512 91c41e3c8f3847e8cfd3687044a5ddb7d5faac89f96b5cca0488bc24f6470033b406449304df4e6ebf7ec954fbb6f3c9fa55d8e77a92fcfd79ab532b23d31735
 EBUILD msmtp-1.8.1-r1.ebuild 3395 BLAKE2B b786a7d3477fce4658fd2f8e9709cf073cc015a0860c418563b9636b91c2563861b0ee43f6cf87efc4158a6836e13f4b186eafc82a0a07284cefcf76b576b800 SHA512 e6f3d57e499819b687200013090ee96351e50febf55370be080d0777a482c727fd583fcb59edb824b9f46a0a907bd42af501ac856cc6d8684df0f1c5a76f619b
+EBUILD msmtp-1.8.2.ebuild 3395 BLAKE2B b786a7d3477fce4658fd2f8e9709cf073cc015a0860c418563b9636b91c2563861b0ee43f6cf87efc4158a6836e13f4b186eafc82a0a07284cefcf76b576b800 SHA512 e6f3d57e499819b687200013090ee96351e50febf55370be080d0777a482c727fd583fcb59edb824b9f46a0a907bd42af501ac856cc6d8684df0f1c5a76f619b
 MISC metadata.xml 463 BLAKE2B 111797850e3ea08adfbe2affc11aa24050e85e8d8ad516c4181fe7f74b43d7c2429c4bf1e7f389b7b1a050317ab2e351a80d5b3205ebe2e85424359a514fb9dd SHA512 c9bc80afca5b0783a37f1654f9535c420cf19543c3e74dfe42627e2fed9d28b5c2b35542859806607d36d1ff85411d7bdf4f67d46f8a779892cba22cd11ef5cb
diff --git a/mail-mta/msmtp/msmtp-1.8.2.ebuild b/mail-mta/msmtp/msmtp-1.8.2.ebuild
new file mode 100644
index 000000000000..94bbeb282bd5
--- /dev/null
+++ b/mail-mta/msmtp/msmtp-1.8.2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps multilib user
+
+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
+	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="${DEPEND}
+	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
+		dodir /usr/sbin
+		dosym ../bin/msmtp /usr/sbin/sendmail
+		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_preinst() {
+	if use daemon ; then
+		enewuser msmtpd
+	fi
+}
+
+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
+}