gentoo resync 08.09.2018

7 files changed, 76 insertions, 37 deletions

diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index beaaf6b517a1..688053104d51 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,7 +1,9 @@
+AUX msmtpd.confd 518 BLAKE2B e537ca90e9c4debd53936b227352b73f5ca1e7114ba8daa3121f1979dfc3495996a820276292ec6da63ce79d8f42bafb45c74daacb6778e5b56656aa9688ecbd SHA512 e6f4f39da73aace9f5a4f8e080ca897f51265b8806836366121d61f5367596955eefca377c5fe9c4094f3a9ecbe04801cf38fcc6017c73a9e4b7a68fc9a81528
+AUX msmtpd.init 347 BLAKE2B 9faea920dc23ebcdb62b05595acf4f70dd3d654645ed0f5ba6f76316762986c9951905f675c2e527c5e0b5eee2bcf53a14e018d8d64080b97e82da4e3abaa0b8 SHA512 e3080dc1fb7b72b6332ebcd4f807780dc04d32b8d3e5740b62f618d5d8f39f7c2a119604e26282e1d98c1365fff7920944401c399267461fab7ae2cdfdac44d7
 DIST msmtp-1.6.6.tar.xz 283744 BLAKE2B 41745d9f20a33b0e4c6f7eee3ad5897c5a555a8cd1e27eb0bf7d347054d072b9eadfc7a31583e12a4f35f071aa710bb403980cba0e06920f65fdb727c786447b SHA512 30f33648b66a6b230cd38d0eee4c916a631a51bddcc1a15c9f7b324305506cb83b9c95f95def9150d0b783d38000db409981331b3c6a756232f0ce49e9b343ab
-DIST msmtp-1.6.7.tar.xz 293208 BLAKE2B 9d493c45a96a0e5e7278d9af89ff74dff92b8699076f17ae556030df55861b2fa9a06f677d2641744ba2a55989ebdc981ae1902c99884675562dd03586768ec9 SHA512 453d4196168a7ad2413cf2a91af25ed8ec73b04ea12f8cc40f6342a892baeb9edfbeba4a555a3a22d11881b831b4cd11b5f2844f66f2a6e7b891422edd9c68d9
 DIST msmtp-1.6.8.tar.xz 294872 BLAKE2B 156237dcc10c320ef15b368ebfe823d6f30f1a740061c5846878a8e478c1f3a3129c52af8327995933ecb15cd8cec0c18a3104993b030bcbfa09e3b0b6c2a58b SHA512 58ccdb6f16ab31959aeb1929c11f820219d4be062edca209c5986e4e0932d718f6f39c81727d05cd448779cedc4ab3e7bb557ce9f5dd3e7cc95e0aa5c3b623bf
-EBUILD msmtp-1.6.6.ebuild 2963 BLAKE2B 888b4350f2128a11ca0f021dd2780bf774bcfed0865cc40fb2b8de7b743c8c235c40e10b241ba71277e8fedcb65d59d9a952226be239fb4736b6de92c456be1e SHA512 f71fc3f8e8c791c7609b72f4d5fc875a6e66719547f963637d8f16ed1f50014ce559e75b6c61de0eb4a80c28013bc897b8a6a75ad1357e894b68c2f6816a93c8
-EBUILD msmtp-1.6.7.ebuild 3011 BLAKE2B 9a7b702253fbec5765d3a94ffdc7c72da51bc755f5fa2deae8ef9a83efd732dd09717bdff8f78ebea7699f81b0e2d8e8ef732a13f5f416c2f713fdcaff2c0e93 SHA512 373436dcdd78fc48474935cce72ecc8af85c4e5dc11933522e4aed6224bf6dd15e059f745d7f7896a16cfdc3e63cb346407e4144d95f3907c2b64ab75e0a3738
-EBUILD msmtp-1.6.8-r1.ebuild 3008 BLAKE2B 2c894f495423179521fed16d36ca9c33caea377848cbc305ccc64767ac71da51de4424fb68b8fda859b2de2c6abf430999193abd6515a52569b65f9137dd94dd SHA512 38133c5ade83bdf35cad7926e430ef1719009c9a08793a86370a0a5d0f26eefbff8efc54bfbbfd065638aba64d3d4da8e604b7f67b0f3e97e0d9353633ede4cc
-MISC metadata.xml 486 BLAKE2B e1ad25bbf9c7d8309ea8a47b67bb6c3b40230bc1764f6ca5ec4e735b4d34d983fcddf509bdfd7a8776162e313db6d8a492d75835d69d32e8db54ec4f5c6ccf5c SHA512 d52248bba8e2702bb75568c239de59d57592d5957ef4724079c5b75ecfff1ad7e193fe85a6d98cd49a6d462178dae3adc43b41a3869169c122c95990b066c820
+DIST msmtp-1.8.0.tar.xz 302680 BLAKE2B 41537a883dd59e1f2281c0428aa57af985a74aeaa9aad34bdce882c3cca79ad65a796b6ef509c7546079d8f3e647eb493481ddbd5f7781a92c560986cb9958a9 SHA512 986cf8ceca847b857f3884fcef26202429b3099820aa20e4e458768a80421bfb163d8aab9d950da2190ae0e2e95bafb80f4c2647d28dbd470d78c439bfba4f77
+EBUILD msmtp-1.6.6-r1.ebuild 2973 BLAKE2B a2de4fd365a0ec85eab8334bf7c7087d57d91219c82921dd2adbb99b8985475dc50943ae95669f0a788cac0f9bb980b2b62faa96d28b2e1e16a91f4be8544420 SHA512 4ff1b8c2dd5d385a8915d0e1d8d1c6568cc98dde74a02aa83dd20c89c65ef1ceacfc544e6a488ac519b16582675a773dfb13fe7c6bed6f269e37dab7fc6abbd6
+EBUILD msmtp-1.6.8-r2.ebuild 3019 BLAKE2B d09bf4e9830a502ea3d9336ae829ec91d90aef977f8ecb79186e709fed5ae871bbb88c644cb95b24f67be28ea7b70524508eeb81d0941303dc1b8de44aad42bb SHA512 6791c3a584c84590eba42ce62955836a7108d50f85c13915ab0cf72aaf323d770ae3cacace26b823d029608db8bcbbc5cdbc25ee83840410deda926f48219575
+EBUILD msmtp-1.8.0-r1.ebuild 3395 BLAKE2B 095a785e1f0dd82e074aa50c947fb780c4b29d05939a3301cccc03b047b4efd68a8076529b2ce83284fdf56ca995557f32c8f338a9dc45343737fa8e1dda4544 SHA512 7dd5a0298357a2d6123ab54f9599346a8ba5beb9857d5af6ea21665c62f1679bf82465c5cb847d5fd3bbb233ccf435c313bcc80852cc6a11cd385cde3e9b4d32
+MISC metadata.xml 463 BLAKE2B 111797850e3ea08adfbe2affc11aa24050e85e8d8ad516c4181fe7f74b43d7c2429c4bf1e7f389b7b1a050317ab2e351a80d5b3205ebe2e85424359a514fb9dd SHA512 c9bc80afca5b0783a37f1654f9535c420cf19543c3e74dfe42627e2fed9d28b5c2b35542859806607d36d1ff85411d7bdf4f67d46f8a779892cba22cd11ef5cb
diff --git a/mail-mta/msmtp/files/msmtpd.confd b/mail-mta/msmtp/files/msmtpd.confd
new file mode 100644
index 000000000000..a42aa5323ca3
--- /dev/null
+++ b/mail-mta/msmtp/files/msmtpd.confd
@@ -0,0 +1,16 @@
+# The user msmtpd should be run as. Default is "msmtpd".
+#MSMTPD_USER="joe"
+
+
+# Uncomment one of the following arguments for msmtpd or write your own
+# argument list.
+
+# Start single SMTP session on stdin/stdout
+#MSMTPD_ARGS="--inetd"
+
+# Listen on a specific IP and a specific port.
+# Default IP is 127.0.0.1 and default port is 25.
+#MSMTPD_ARGS="--interface=192.168.100.1 --port=25000"
+
+# Pipe mails to a specific command instead of msmtp. Please read msmtpd man page.
+#MSMTPD_ARGS="--command='/usr/bin/msmtp -f %F'"
diff --git a/mail-mta/msmtp/files/msmtpd.init b/mail-mta/msmtp/files/msmtpd.init
new file mode 100644
index 000000000000..29f799099fea
--- /dev/null
+++ b/mail-mta/msmtp/files/msmtpd.init
@@ -0,0 +1,10 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Local mta daemon that pipes mails (by default) to msmtp"
+pidfile="/var/run/msmtpd.pid"
+command="/usr/bin/msmtpd"
+command_user="${MSMTPD_USER:-msmtpd}"
+command_args="${MSMTPD_ARGS}"
+command_background="true"
diff --git a/mail-mta/msmtp/metadata.xml b/mail-mta/msmtp/metadata.xml
index 423cd3ac03fb..472d3fa70d20 100644
--- a/mail-mta/msmtp/metadata.xml
+++ b/mail-mta/msmtp/metadata.xml
@@ -6,8 +6,8 @@
 		<name>Net-Mail</name>
 	</maintainer>
 	<use>
+		<flag name="daemon">Build/install msmtpd MTA daemon</flag>
 		<flag name="mta">Enable this to install as system-wide MTA</flag>
-		<flag name="libsecret">Enable libsecret support to store login credentials</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">msmtp</remote-id>
diff --git a/mail-mta/msmtp/msmtp-1.6.6.ebuild b/mail-mta/msmtp/msmtp-1.6.6-r1.ebuild
index 6a189227d216..af7968d17b2b 100644
--- a/mail-mta/msmtp/msmtp-1.6.6.ebuild
+++ b/mail-mta/msmtp/msmtp-1.6.6-r1.ebuild
@@ -10,12 +10,12 @@ SRC_URI="mirror://sourceforge/msmtp/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc gnutls idn libressl libsecret +mta nls sasl ssl vim-syntax"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc gnome-keyring gnutls idn libressl +mta nls sasl ssl vim-syntax"
 
 CDEPEND="
+	gnome-keyring? ( app-crypt/libsecret )
 	idn? ( net-dns/libidn:= )
-	libsecret? ( app-crypt/libsecret )
 	nls? ( virtual/libintl )
 	sasl? ( virtual/gsasl )
 	ssl? (
@@ -68,7 +68,7 @@ src_configure() {
 		$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
 		$(use_with sasl libgsasl) \
 		$(use_with idn libidn) \
-		$(use_with libsecret )
+		$(use_with gnome-keyring libsecret)
 }
 
 src_compile() {
diff --git a/mail-mta/msmtp/msmtp-1.6.8-r1.ebuild b/mail-mta/msmtp/msmtp-1.6.8-r2.ebuild
index 457444d0a607..2716f7113dcf 100644
--- a/mail-mta/msmtp/msmtp-1.6.8-r1.ebuild
+++ b/mail-mta/msmtp/msmtp-1.6.8-r2.ebuild
@@ -11,12 +11,12 @@ 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 ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc gnutls idn libressl libsecret +mta nls sasl ssl vim-syntax"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc gnome-keyring gnutls idn libressl +mta nls sasl ssl vim-syntax"
 
 DEPEND="
+	gnome-keyring? ( app-crypt/libsecret )
 	idn? ( net-dns/libidn:= )
-	libsecret? ( app-crypt/libsecret )
 	nls? ( virtual/libintl )
 	sasl? ( virtual/gsasl )
 	ssl? (
@@ -66,10 +66,10 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		$(use_enable nls)
-		$(use_with ssl tls $(usex gnutls gnutls openssl))
-		$(use_with sasl libgsasl)
+		$(use_with gnome-keyring libsecret)
 		$(use_with idn libidn)
-		$(use_with libsecret)
+		$(use_with sasl libgsasl)
+		$(use_with ssl tls $(usex gnutls gnutls openssl))
 	)
 	econf "${myeconfargs[@]}"
 }
diff --git a/mail-mta/msmtp/msmtp-1.6.7.ebuild b/mail-mta/msmtp/msmtp-1.8.0-r1.ebuild
index 73c12e7a084f..bfd8ac0fa06d 100644
--- a/mail-mta/msmtp/msmtp-1.6.7.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib
+inherit fcaps multilib user
 
 DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
 HOMEPAGE="https://marlam.de/msmtp/"
@@ -11,24 +11,24 @@ 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 ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc gnutls idn libressl libsecret +mta nls sasl ssl vim-syntax"
+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"
 
-CDEPEND="
-	idn? ( net-dns/libidn:= )
-	libsecret? ( app-crypt/libsecret )
+# 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? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
+	ssl? ( net-libs/gnutls[idn?] )
+	!ssl? ( idn? ( net-dns/libidn2:= ) )
 "
 
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	net-mail/mailbase
 	mta? (
 		!mail-mta/courier
@@ -46,14 +46,12 @@ RDEPEND="${CDEPEND}
 	)
 "
 
-DEPEND="${CDEPEND}
+BDEPEND="${DEPEND}
 	doc? ( virtual/texi2dvi )
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig
 "
 
-REQUIRED_USE="gnutls? ( ssl )"
-
 DOCS="AUTHORS ChangeLog NEWS README THANKS doc/msmtprc*"
 
 src_prepare() {
@@ -66,10 +64,11 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		$(use_enable nls)
-		$(use_with ssl ssl $(usex gnutls gnutls openssl))
-		$(use_with sasl libgsasl)
+		$(use_with daemon msmtpd)
+		$(use_with gnome-keyring libsecret)
 		$(use_with idn libidn)
-		$(use_with libsecret )
+		$(use_with sasl libgsasl)
+		$(use_with ssl tls gnutls)
 	)
 	econf "${myeconfargs[@]}"
 }
@@ -86,6 +85,12 @@ src_compile() {
 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
 		dohtml doc/msmtp.html
 		dodoc doc/msmtp.pdf
@@ -112,9 +117,15 @@ 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 ${ROOT}etc/msmtprc before first use."
+		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."