gentoo (leap year) resync : 29.02.2020

4 files changed, 10 insertions, 303 deletions

diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 592600df933c..f6fb31e14046 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,9 +1,5 @@
 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.6.tar.xz 339732 BLAKE2B 3dc34bf23c935ea5f67df7e65b035771fd1475311311cca7097e71dac1c7b41a4c58497fd378a35a7f212b8a9b13e2dac6f20e0058d6f3491b52149d789b97d8 SHA512 9d3dd282ddfe2d67b67bb6d29412beebcd666d4ab8e90a664b7dd4b951714da0e3adba72dbe165617b1a170779bcd45e2e7bcf54d1d96fa97089686e71cbea66
 DIST msmtp-1.8.7.tar.xz 340908 BLAKE2B 5241acf54d5a6af6ccf2c3bfd33954a5235af2d2cb467e4134401538e60e1847489a7a599359e2d13202ea9637c32a67ec5180372b139e06f6d47f060cba6c8f SHA512 5a079cb90b48853ad812125e8b341f5bcd5f5ba4725d62c37210050896527b63f993aa6393f1d4107636153bf0ed84b0288e88a7e78a119c66b2d58f1e69a67d
-EBUILD msmtp-1.8.3.ebuild 3329 BLAKE2B a9df217483419054fbf17cac85b53906c6f5b9b04d2ff851eb712a7481f9cc27a47a8b70a86616bec759c82fca52d2774fe765b88a4129875dec6244e8174dbf SHA512 1b553c938d532eb98514f4a404475c3b1dacc1e3206d992b1886553c5b2fd30099c1f939b6150ca7da2f98c8cbd2a72696a26a003bae84808c24c72c77c9ba1c
-EBUILD msmtp-1.8.6.ebuild 3311 BLAKE2B 60941137b2f463d03c257935ceb34847ed3bfbf36a4c4ada4ab4b7a609d2dc7591fb2a69cc60574a335281d95a7a31fe24310f048a99f5b9819419fc9bfe1bdb SHA512 6984e6b635efe5406b2b9b2f2a58805cff932a34851dbf46e3c8ae5f51f4953c21ce8e9c41fe494c452adcde3d8c3ae1c9e0e4ca4759f6abab9a3702964ee4fb
-EBUILD msmtp-1.8.7.ebuild 3311 BLAKE2B 60941137b2f463d03c257935ceb34847ed3bfbf36a4c4ada4ab4b7a609d2dc7591fb2a69cc60574a335281d95a7a31fe24310f048a99f5b9819419fc9bfe1bdb SHA512 6984e6b635efe5406b2b9b2f2a58805cff932a34851dbf46e3c8ae5f51f4953c21ce8e9c41fe494c452adcde3d8c3ae1c9e0e4ca4759f6abab9a3702964ee4fb
+EBUILD msmtp-1.8.7-r1.ebuild 3317 BLAKE2B e2e8e0e7341f7599ce75260d5ce1dcfaa679f5cdf9d14b303b99e89fd7cf3d091c0111df1b933788cc3cc81eef8b2420dfc69d87dca64eefb9f2da1637b3f8f7 SHA512 3c2b084a3ef521c60558e065708faaf667157e0b51088636a920e432c5eda3d0a4a88be4e0ac3be40e496016700818c4941cd2beca089fedcd06264bed4899e4
 MISC metadata.xml 470 BLAKE2B 3ea3fcc232512a92126ff900dddf558c06194e473b172655c6960c165669c2323115a2ebf4472c5cbae57062d203b97aeac9b9d65fee5f8a0d6071416325f868 SHA512 c117c6d7f7f28d32dc411049d6a7f7bd70e1b70ff0030c85db2a2df86d1f82353230ca1713d2be7bb10e450d09e9a5749ab2e511b93b39dfe0091eeba41246c9
diff --git a/mail-mta/msmtp/msmtp-1.8.6.ebuild b/mail-mta/msmtp/msmtp-1.8.6.ebuild
deleted file mode 100644
index 967774288fed..000000000000
--- a/mail-mta/msmtp/msmtp-1.8.6.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 2004-2019 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 )
-	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 -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
-		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_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.3.ebuild b/mail-mta/msmtp/msmtp-1.8.7-r1.ebuild
index 86c5a843c02f..f55260ecb18e 100644
--- a/mail-mta/msmtp/msmtp-1.8.3.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.7-r1.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
@@ -56,7 +60,8 @@ 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
+	sed 's:/etc/aliases:/etc/mail/aliases:' \
+		-i scripts/find_alias/find_alias_for_msmtp.sh || die
 
 	default
 }
@@ -97,7 +102,7 @@ src_install() {
 	fi
 
 	if use mta ; then
-		dosym msmtp /usr/bin/sendmail
+		dosym ../bin/msmtp /usr/sbin/sendmail
 		dosym ../bin/msmtp /usr/$(get_libdir)/sendmail
 	fi
 
@@ -115,12 +120,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."
diff --git a/mail-mta/msmtp/msmtp-1.8.7.ebuild b/mail-mta/msmtp/msmtp-1.8.7.ebuild
deleted file mode 100644
index 967774288fed..000000000000
--- a/mail-mta/msmtp/msmtp-1.8.7.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 2004-2019 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 )
-	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 -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
-		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_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
-}