gentoo resync : 12.01.2019

3 files changed, 3 insertions, 151 deletions

diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 86160371d2ac..7b3adfd1dc16 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -2,10 +2,8 @@ AUX msmtpd.confd 518 BLAKE2B e537ca90e9c4debd53936b227352b73f5ca1e7114ba8daa3121
 AUX msmtpd.init 347 BLAKE2B 9faea920dc23ebcdb62b05595acf4f70dd3d654645ed0f5ba6f76316762986c9951905f675c2e527c5e0b5eee2bcf53a14e018d8d64080b97e82da4e3abaa0b8 SHA512 e3080dc1fb7b72b6332ebcd4f807780dc04d32b8d3e5740b62f618d5d8f39f7c2a119604e26282e1d98c1365fff7920944401c399267461fab7ae2cdfdac44d7
 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.0.tar.xz 302680 BLAKE2B 41537a883dd59e1f2281c0428aa57af985a74aeaa9aad34bdce882c3cca79ad65a796b6ef509c7546079d8f3e647eb493481ddbd5f7781a92c560986cb9958a9 SHA512 986cf8ceca847b857f3884fcef26202429b3099820aa20e4e458768a80421bfb163d8aab9d950da2190ae0e2e95bafb80f4c2647d28dbd470d78c439bfba4f77
 DIST msmtp-1.8.1.tar.xz 303112 BLAKE2B 6de6c566a0de0f680f354066d1613b3b15be95c24098bdf7019e3f0289f5bce8478d2de65bf5711863617d41eb23b14b6157e25b92fce60f1cd4d33f4a593810 SHA512 00c5d8b810d48c171fc975115911c4cdf3e18efb91448800bdab320d0f850f4893343b436899722d3b9c82e3781c3e103dc31175c89a5c867511c14df5b9785a
 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.0-r1.ebuild 3375 BLAKE2B f5bd8ce13fa045ece116dabeb2aa773e7fca74b92b7f835d776553806625ab0cc24205fa36a8166683dd21d5c8f04019b9eadb76477db5938df2594ff7f4aa73 SHA512 c63ccd3e1400efb426dfeab145fb4a0c5ceb23fd58b71463a268108eb7d00ab82ff8cd73b010a9c1ec9426102c804d5e2e3f5d12004dc5c2542af43a279bacc9
-EBUILD msmtp-1.8.1.ebuild 3375 BLAKE2B f5bd8ce13fa045ece116dabeb2aa773e7fca74b92b7f835d776553806625ab0cc24205fa36a8166683dd21d5c8f04019b9eadb76477db5938df2594ff7f4aa73 SHA512 c63ccd3e1400efb426dfeab145fb4a0c5ceb23fd58b71463a268108eb7d00ab82ff8cd73b010a9c1ec9426102c804d5e2e3f5d12004dc5c2542af43a279bacc9
+EBUILD msmtp-1.8.1-r1.ebuild 3395 BLAKE2B b786a7d3477fce4658fd2f8e9709cf073cc015a0860c418563b9636b91c2563861b0ee43f6cf87efc4158a6836e13f4b186eafc82a0a07284cefcf76b576b800 SHA512 e6f3d57e499819b687200013090ee96351e50febf55370be080d0777a482c727fd583fcb59edb824b9f46a0a907bd42af501ac856cc6d8684df0f1c5a76f619b
 MISC metadata.xml 463 BLAKE2B 111797850e3ea08adfbe2affc11aa24050e85e8d8ad516c4181fe7f74b43d7c2429c4bf1e7f389b7b1a050317ab2e351a80d5b3205ebe2e85424359a514fb9dd SHA512 c9bc80afca5b0783a37f1654f9535c420cf19543c3e74dfe42627e2fed9d28b5c2b35542859806607d36d1ff85411d7bdf4f67d46f8a779892cba22cd11ef5cb
diff --git a/mail-mta/msmtp/msmtp-1.8.0-r1.ebuild b/mail-mta/msmtp/msmtp-1.8.1-r1.ebuild
index 07cedc460ef4..94bbeb282bd5 100644
--- a/mail-mta/msmtp/msmtp-1.8.0-r1.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -63,6 +63,7 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		--disable-gai-idn
 		$(use_enable nls)
 		$(use_with daemon msmtpd)
 		$(use_with gnome-keyring libsecret)
diff --git a/mail-mta/msmtp/msmtp-1.8.1.ebuild b/mail-mta/msmtp/msmtp-1.8.1.ebuild
deleted file mode 100644
index 07cedc460ef4..000000000000
--- a/mail-mta/msmtp/msmtp-1.8.1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2018 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=(
-		$(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
-}