gentoo resync : 20.03.2021

3 files changed, 2 insertions, 149 deletions

diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 0502b2ba7cc7..eabcbb5895b5 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,11 +1,9 @@
 AUX msmtpd.confd 518 BLAKE2B e537ca90e9c4debd53936b227352b73f5ca1e7114ba8daa3121f1979dfc3495996a820276292ec6da63ce79d8f42bafb45c74daacb6778e5b56656aa9688ecbd SHA512 e6f4f39da73aace9f5a4f8e080ca897f51265b8806836366121d61f5367596955eefca377c5fe9c4094f3a9ecbe04801cf38fcc6017c73a9e4b7a68fc9a81528
 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
+DIST msmtp-1.8.15.tar.xz 370736 BLAKE2B 08673535603a7e768b11dea9d1b6a6e00ef9e6948c891572d39b0a8ba1eb1413d1ab71ff877cba1427ee58c25c87b817b4f20f3aad207a8f0a785306fcecbd8e SHA512 66c722f65590785f005631f0edb46f427cc4d9028c71ffbb1fb4eaa8d8fdacaadbcf24f81edc41e464e156b2beb65ecd1166b3d4aad4630ccd9fcaaa2e72e2a6
 EBUILD msmtp-1.8.12.ebuild 3297 BLAKE2B bf4ab8187207ab3b758b3cab1042c69d8f75cd64425f1300e7944f35278bfb2b3e37e52a474b6efd9711f736b49839be859fed8eba929d381c658615592eedaf SHA512 9a2668b03d3085c43ca58cae3483846064f15d065e2c00b36563272c4910491b31265ed735950a7809f2823b0e02d28589bf524e8b8d8a8466cbbad6fb0739bb
-EBUILD msmtp-1.8.13.ebuild 3302 BLAKE2B 2faa958f3468bf73ae0845d6031765aea2b4650e42efe5fd53d9c54299330ae74ed10879798eb8b3908620cca309799580adfdb7d421c68b76463f5ad72aed09 SHA512 73e06a491e0749b6df372e2aa4e7d990d1d7a37bd9e4aebe2a8dd1b44d10e767cdb8857dd309ab83f4360c9f423ca639e30a600b6d12903f626a862011302c5a
 EBUILD msmtp-1.8.14.ebuild 3302 BLAKE2B 2faa958f3468bf73ae0845d6031765aea2b4650e42efe5fd53d9c54299330ae74ed10879798eb8b3908620cca309799580adfdb7d421c68b76463f5ad72aed09 SHA512 73e06a491e0749b6df372e2aa4e7d990d1d7a37bd9e4aebe2a8dd1b44d10e767cdb8857dd309ab83f4360c9f423ca639e30a600b6d12903f626a862011302c5a
-EBUILD msmtp-1.8.7-r1.ebuild 3307 BLAKE2B bce3e2ad1bcd0c52d563cba4cebea0882e2c41a4fc5630b2818b37923650fe14609f977b93ee26c3a9a8e67ab57fe7514b268ace3d702271fd1403476cc5ba11 SHA512 a6479befe38bee42b806029c99a038c262cdcd35d4273724d9199c008a8e056d610acefbff4beca8a79935ec7c9bd3018a333ba1888bde51d2aad26b280fd053
+EBUILD msmtp-1.8.15.ebuild 3302 BLAKE2B 2faa958f3468bf73ae0845d6031765aea2b4650e42efe5fd53d9c54299330ae74ed10879798eb8b3908620cca309799580adfdb7d421c68b76463f5ad72aed09 SHA512 73e06a491e0749b6df372e2aa4e7d990d1d7a37bd9e4aebe2a8dd1b44d10e767cdb8857dd309ab83f4360c9f423ca639e30a600b6d12903f626a862011302c5a
 MISC metadata.xml 470 BLAKE2B 3ea3fcc232512a92126ff900dddf558c06194e473b172655c6960c165669c2323115a2ebf4472c5cbae57062d203b97aeac9b9d65fee5f8a0d6071416325f868 SHA512 c117c6d7f7f28d32dc411049d6a7f7bd70e1b70ff0030c85db2a2df86d1f82353230ca1713d2be7bb10e450d09e9a5749ab2e511b93b39dfe0091eeba41246c9
diff --git a/mail-mta/msmtp/msmtp-1.8.13.ebuild b/mail-mta/msmtp/msmtp-1.8.15.ebuild
index b886b703970d..b886b703970d 100644
--- a/mail-mta/msmtp/msmtp-1.8.13.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.15.ebuild
diff --git a/mail-mta/msmtp/msmtp-1.8.7-r1.ebuild b/mail-mta/msmtp/msmtp-1.8.7-r1.ebuild
deleted file mode 100644
index 8cd0c42f43b3..000000000000
--- a/mail-mta/msmtp/msmtp-1.8.7-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 2004-2021 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"
-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 '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
-}