gentoo resync : 13.10.2019

3 files changed, 8 insertions, 159 deletions

diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 658271711abc..39c7fd303cac 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,10 +1,9 @@
 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.4.tar.xz 337292 BLAKE2B ac96dbd14cb5382563b995f2aff247c8ddf429dfa58ad6652ec3a3d05a98703a6c88a83d9e60ba3fb1d389682a6c0a653c5854f85258fe9d529674e61fbb146f SHA512 7c358ff6235802348f55f0359ad5f6a87fcd1cede9e6f95d603b0a6e7197527cf5c99be8c1f30b2c8fadf4fc56b0b8ac4962db0e57bb5bc522145c59637ed6ec
 DIST msmtp-1.8.5.tar.xz 338840 BLAKE2B 92971fae2e3ad4d324d89f6f41950e3d4c4d922dbda82867d0df5f7d2ef67de1b5a2d83fd779a53399ef54a1515bc648e16e8c9d437fc1863bfb669a079a31dc SHA512 16e85d714b15e07f96f5ed5bf32b0c97a970877c13cfb77b5df29f7ea075d4da899a58786dcd60ace049b1f15061f4bcf96fa7fd442413560066a6c17a60f9a8
+DIST msmtp-1.8.6.tar.xz 339732 BLAKE2B 3dc34bf23c935ea5f67df7e65b035771fd1475311311cca7097e71dac1c7b41a4c58497fd378a35a7f212b8a9b13e2dac6f20e0058d6f3491b52149d789b97d8 SHA512 9d3dd282ddfe2d67b67bb6d29412beebcd666d4ab8e90a664b7dd4b951714da0e3adba72dbe165617b1a170779bcd45e2e7bcf54d1d96fa97089686e71cbea66
 EBUILD msmtp-1.8.3.ebuild 3388 BLAKE2B d052cabf121e47bd8d804813d62ba463299d7dfe004bd85686775b6ad3e2d6527292cc50a934b57954d15ef1144aad4a415d76b7a205194a150c7f88f4d90f37 SHA512 33a6a5edb33b0c3e96766fc4d143537b7877b20e290507cb618a5ca214856c52fbdc09d81d731b72b71bb2c17ff67a4d3a0684bc90db23ed5bc5795d29fbd092
-EBUILD msmtp-1.8.4.ebuild 3395 BLAKE2B b786a7d3477fce4658fd2f8e9709cf073cc015a0860c418563b9636b91c2563861b0ee43f6cf87efc4158a6836e13f4b186eafc82a0a07284cefcf76b576b800 SHA512 e6f3d57e499819b687200013090ee96351e50febf55370be080d0777a482c727fd583fcb59edb824b9f46a0a907bd42af501ac856cc6d8684df0f1c5a76f619b
 EBUILD msmtp-1.8.5-r1.ebuild 3369 BLAKE2B 47d644318247557d2b72df85431f4793363c81438827548e189bc475ab8e60322a34915b4b95485c7600e6d05db0834169a759edfc49a1499029dbf428e8a1da SHA512 d2949537bff4d7ad06f9f4f265ea99126581e10aa92f1c8f5b4bdb51c05c1980a8b79d8c015d27059e8c9fe1464839b13bc10a33fb4c7b71b6b413a0814adf88
-EBUILD msmtp-1.8.5.ebuild 3393 BLAKE2B 9172045c24efd88eb8aa3cafc1aea1e9265f52ae1def86a2fa0a1030b0aa71a6b998c3f693b6df7bc4b149fc21bec25ac73e58c2973ad05c27299fbe4a7d0fc1 SHA512 4078e383f08999c8ec23729732dc4c5cc7e5e80229605965132847d85ca763e5ed2a69c454257104dc3c7af653728cdcc9b543ebd0dbf52587ecd94ad5adf641
+EBUILD msmtp-1.8.6.ebuild 3369 BLAKE2B 47d644318247557d2b72df85431f4793363c81438827548e189bc475ab8e60322a34915b4b95485c7600e6d05db0834169a759edfc49a1499029dbf428e8a1da SHA512 d2949537bff4d7ad06f9f4f265ea99126581e10aa92f1c8f5b4bdb51c05c1980a8b79d8c015d27059e8c9fe1464839b13bc10a33fb4c7b71b6b413a0814adf88
 MISC metadata.xml 470 BLAKE2B 3ea3fcc232512a92126ff900dddf558c06194e473b172655c6960c165669c2323115a2ebf4472c5cbae57062d203b97aeac9b9d65fee5f8a0d6071416325f868 SHA512 c117c6d7f7f28d32dc411049d6a7f7bd70e1b70ff0030c85db2a2df86d1f82353230ca1713d2be7bb10e450d09e9a5749ab2e511b93b39dfe0091eeba41246c9
diff --git a/mail-mta/msmtp/msmtp-1.8.4.ebuild b/mail-mta/msmtp/msmtp-1.8.4.ebuild
deleted file mode 100644
index 94bbeb282bd5..000000000000
--- a/mail-mta/msmtp/msmtp-1.8.4.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# 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
-}
diff --git a/mail-mta/msmtp/msmtp-1.8.5.ebuild b/mail-mta/msmtp/msmtp-1.8.6.ebuild
index 4df45a184c6a..416ef1aa3cf1 100644
--- a/mail-mta/msmtp/msmtp-1.8.5.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.6.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
@@ -117,12 +121,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."