Version bump, gnome-keyring use flag replaced with libsecret.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 151 insertions, 18 deletions

diff --git a/mail-mta/msmtp/ChangeLog b/mail-mta/msmtp/ChangeLog
index 7e643a0fe460..8a85606e0103 100644
--- a/mail-mta/msmtp/ChangeLog
+++ b/mail-mta/msmtp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/msmtp
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.170 2014/03/19 15:19:11 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.171 2015/01/04 07:04:28 radhermit Exp $
+
+*msmtp-1.6.0 (04 Jan 2015)
+
+  04 Jan 2015; Tim Harder <radhermit@gentoo.org> +msmtp-1.6.0.ebuild,
+  metadata.xml:
+  Version bump, gnome-keyring use flag replaced with libsecret.
 
   19 Mar 2014; Agostino Sarubbo <ago@gentoo.org> msmtp-1.4.31-r1.ebuild:
   Stable for alpha, wrt bug #495690
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 5f5031b661a2..c114abd78bcb 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -4,26 +4,22 @@ Hash: SHA256
 DIST msmtp-1.4.30.tar.bz2 303226 SHA256 f152b9296e36e340eb049c7ee4d6980fcdb29d948e654bdc74bea7ee97409886 SHA512 6ebbf6d4f077bf5dc43d43fdc8b83d131364df5b82ebaa12f93f1a78ef8457c500ded0f6d3ee5b8a7825d292d5338743fd32899fd699dcbe2924064723a5f021 WHIRLPOOL 1ab45fb4eb8922b53dbe805b9944cceb13abb455d2395d8ba10339133584c205f6bbfba5ea560d45d1527a424381dc3e2f88c03e5463a6451a177a28819f3fc4
 DIST msmtp-1.4.31.tar.bz2 305770 SHA256 247af9a95fa22f506e85109fc4268a5d91ca03af9b17eebcc1e46b7cd64c225f SHA512 aec12bd9479342d826e7c838116c1771a17dc2b53c220c7fdf4d3fa4cb53eb76041bb64be7417637887e6f0109f65d97155e9c74d60633c280edb0613417a136 WHIRLPOOL a4c1413937786b3cf994b3d2227821e699f00c517915afea04f30064b48fdfb4ff8829c2ad9826f7c5776580c5ebc38e4dacafe53941c3d3615c1226c9619b14
 DIST msmtp-1.4.32.tar.bz2 303652 SHA256 2bf0c5c7e78f9905f48de235a75111a1a88238793043bbeae00360b22f1a5f88 SHA512 68886e1eec7a63044590cf65ec8f9a2b25c77abe2209f28d6f245141d3188f23f40f9e572165e5a446342c5867cc94cc44337caf4f4d3114227a021686966ff3 WHIRLPOOL 7a8d25f75a4b6b31b2d0d67c8818673279891c1bcd067c7d5c9b3c3541803161c9737f4b89d6ecdc32b11aa2c5c2cc2e1c896aeeb61483f519a76c88259a7dd0
+DIST msmtp-1.6.0.tar.xz 278068 SHA256 ab08d03a575c0de3726fdb68a5f333ae292e14188fe8cce1d1fbd826fa3278fb SHA512 be698d1cba42b5d64d1d01f6d9da808b07f44b14face239f9db279cdb937aecb0599352b45260c8656e59e8a66921ddacf9c5de9c6ca3409f87656b62bef138d WHIRLPOOL 57b042489433fc398de9538c68d2c756ae0aae685026cb8eb503f07c4b5d843aed82e23d848646ad96ab351b3628e47b963e027ab801c867311ee5fe964d3f62
 EBUILD msmtp-1.4.30-r1.ebuild 3257 SHA256 b2a0c9db31809a92172977b2d30eb8ac75ee1fed38baea6041f28584e6728b65 SHA512 aeed6d954815409d85d1e53c5efc9c92cb56873fd21d7ad1931bdbe725e0d1f4cb78c01a61c55e4f05c54c01be1c5e1289aee2d021bf2d9a9f6dd81660e7cfa1 WHIRLPOOL cb8b1f98fc8c7134d247d0a16ee89686715621b1f2fd6430095d9638f16bd0b54ea5bc8bfeb1989a54fe2906835c5680f178a8803227b100c64d1983b4edba28
 EBUILD msmtp-1.4.31-r1.ebuild 3295 SHA256 27f9cd4dd6bd910bfcc8f1bbfa71cb2502f60c78c771c6a5c980e027095d48db SHA512 a575b58667a95461e62d48231c307a1dd58cf10fa3a3dd63d1fd4857c384cdfd0f5d9716228fd8826a93e1cfa08d83ee4d5d8fdedd8ff85a32220499b725f666 WHIRLPOOL 6b496493c157a440d649e1ecc7fa46a2c2a303d994e954c826e735c39716ced75ebc73b02f669466099134f9a3c7d0e77203dbeeae805eee27b8d75c14a8c1ae
 EBUILD msmtp-1.4.31.ebuild 3264 SHA256 80f6bace0d03783427f577792b079cb9077ce60a7597f09b2e687aa78935ee6c SHA512 41f3e0d9f8f7964cc10994865557ad8302a8ea402c2ffcd0e797cd4b5ac03767394a45236ee35d0decc8e58ef609933a7efd7539ee6b27e0edc1bf30f22db8b3 WHIRLPOOL 21a591d6d65893e122cadb933258171d786e95b404f527bfa8ddadb970f6fdc26b459f733b2389d450a843708994f17e1d9c550a315065da17adfc2cddb7b208
 EBUILD msmtp-1.4.32.ebuild 3416 SHA256 c2be6d0fca636e1aae7f44fd300c674cea519e68a4f98abba578bf9234da86ff SHA512 ebb163de7a3184ae2ac438a9affd499104b429b577662593dd8e2fe5b4e7a48ab2dc3f506666555620ae93758ae9e63a5617001884b4c818c3d8bb79460883cd WHIRLPOOL 755cd26b5f3706d19bfdfa575cc500e056401e830fecc5d45779d3bdc94bb60af936b6a279e96bce7e9043e7801261a1eafe72f62fd8c36b779148b6d25f196b
-MISC ChangeLog 21804 SHA256 6d7b6b9902936beab39bcce1c22bfcccbf12c4245da38719344d44cd881ce89c SHA512 697d0281b68a7ae2d56e966a3a43c117d782e66a20cdef8550b1758cc4ef8c6a4c3666c7d00e2de5f3c71353b421153bc0bd88f605e3340ea5906fdc3528c9b5 WHIRLPOOL dad87b63b9227f18839d92f7f4b9ad5b900ce7269346f1451ce90f499d06db3e926482d6a90a2690b2bce2d7a9b3b6364112d874205acfd9164b05ef6e48cd5e
-MISC metadata.xml 241 SHA256 26ee4bda381b79a28729c310bdd467e2d1bbf39f08e271c5845e969d95d0e889 SHA512 07150e609f34b0229a3deb486e6c7ae691dc235b01e8a4c14c6226b6daa9162fe30494e0838a4e81118e05583f008f07167a1a996c2b0a80b4918d4fbb30e1cc WHIRLPOOL a433f2c63462c43e78ab4e3572538d398b9ff57ab8ddc4f0b4fea89327c6e7bfb5e3edefee1f8223bbea492a427c3ade78f41c13e8c8ed0769480a27a084b0a2
+EBUILD msmtp-1.6.0.ebuild 2987 SHA256 a62af6eda0cde546704d78983a0d7ed223ba29a0745dc0374b926cba3af8f0ab SHA512 bf73f98c6e7765387edf273e6bf30172aeb62246950fcae1c8e194f89ea8034045e6c51d7dc508a83c1f294eecea2098490485e4a0a87365dce89bbca3887f15 WHIRLPOOL d1de48222da6c5c981d5f0c3727ab93f4aac1c5c471d946b393f2a31fe59d3237d8e5a7b33a8d63c5de043ca2ba1873c48ac699b4bd8fbc1eccb443264d521c2
+MISC ChangeLog 21989 SHA256 c727f7a248bb1bcd55e922fd964c03a9b5b340ecb0ef6abfb426aa4a34ee3b98 SHA512 1bf5a0ead0ec7a045a496653e505df901a1e7bc554c3ad45fd215be62149f824790bbdb4f0ff9dfb4062a783bac07bb7abfd94ce9a5f5602f919d01930a5d450 WHIRLPOOL 37297b366269ff7c4f7142dbac475a9d5102a6335a01f057c0613bddab27337236f710aed28080e45a8b6d98e0c6f0772edabdecd97afc0ffee6a462cb041e7d
+MISC metadata.xml 324 SHA256 aa2518be70b46886f60ee4d7c2c9044b4fd11c0e3123e2252b33205edf7487de SHA512 0d0de3701379ac788dc38ef29f3b2176cc7dbc6ef7c134fa6ff1448d8f8b47ef3fe8e7d56dae97ade911cf63eda1a41243a50618307a64f1ba3d46a0c23ce307 WHIRLPOOL d52a743031aa579c60a8887e280e179bb4d8932d5af57b999e091ed39f736a351f2c23d7fc56dc43ca3a5616b7da09b2a8d413464a630684850f6e4613104504
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTKbVxAAoJELp701BxlEWfcpQQAKmi/ea/lSBwhLf/Gj22MeLJ
-wyi5juIQPh73TPC6Q08z01FPunMfdzzbYbWX3TTsyhsf1o4mKhoK5Ceg1S4pE8Y6
-hxVtUsp7dP73tKNUtf2hlY3VFwuVIIUi8bkn8oBs4nAnfDn+Wo7g1yfav5WGltv7
-4u1TQxgSAEeMwIJBxiYG0/jhCwLO8PN+IAkWju4TIaW5YIItiYGRvBrxOhHI5Mq/
-L0gd9PkWg/mWfY5ZagJ2DIwXZVlFwPG3q8jJ5O56EtgzcGB4OrF33J+oT6QFTVZY
-RtnyocZlKWqVdGtqewCkn7GScoMtaOo0N6YstSfn5YMIWUUT55QuK85N8LI3mzA2
-N7phb0tXpktMuEEhSSSAqT6Qsu6F0PsSHRKoGlbkoOtNZhu3+HvOyQ68wK5/Qsnn
-sQa8iOYUJNqL2CJGzcYCD+y2DWLe8wvTkWoWVfks7MmZWQTpRK4U5/Am69IhoGCE
-GtKftT/jrytCINpaTRCFryfbz44qRUKlVGzrZvH0fKqXQ4EzFg3dBTBvZ1+0BbWU
-go2ib1GU36h+pqrO7ovF02SK+Z4SAUPsXPN8SMSo7iQq/GEQFczbyocQPFGRJ9dU
-/+kUgvLu3aoBQPuK3ZzqSMm33H4FHiLsZMJwV9rkYJcTQZDhEYJaduj3iGcP1QM5
-WnDcPqGnqI3k5ZOSJT3b
-=yNf2
+iQEcBAEBCAAGBQJUqOYMAAoJEEqz6FtPBkyjHnQH/jxF0EMnA+MIJ80Zpzb2jA7z
+FgFXrKfsLrC5/wRyADy0T6DGWcwx118YtV5HpyCZdwCHoKkuHCXY47ZiBomboZ1O
+7+jXkZW3IsnxPnl0B5J0xVwLEwB0DSsk71h1wFzbZsWstAUXCNSlbEo4hYV/iSeD
+F/6Yli7QitYPf588jEuoHw5y8LIYVzxB5TTRQRN0WE+l+Wnh526T77ZZZclng3jj
+rMFbQvlYELTBS+A03nIbaKwIB7kqF2yxFb26+OKaBQAmQ4fgSdRX2T0X+8rF3Ayg
+rt0ZSz1hLOqi6KKFVvHOIq6pMPTfNhm0Q5sqM7DxvTj9ejzkh9Afm0ZWbD8X90c=
+=+D8k
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/msmtp/metadata.xml b/mail-mta/msmtp/metadata.xml
index 859da605928a..16db75806911 100644
--- a/mail-mta/msmtp/metadata.xml
+++ b/mail-mta/msmtp/metadata.xml
@@ -4,5 +4,6 @@
 <herd>net-mail</herd>
 <use>
 	<flag name='mta'>Enable this to install as system-wide MTA</flag>
+	<flag name="libsecret">Enable libsecret support to store login credentials</flag>
 </use>
 </pkgmetadata>
diff --git a/mail-mta/msmtp/msmtp-1.6.0.ebuild b/mail-mta/msmtp/msmtp-1.6.0.ebuild
new file mode 100644
index 000000000000..4affdd05f95d
--- /dev/null
+++ b/mail-mta/msmtp/msmtp-1.6.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.6.0.ebuild,v 1.1 2015/01/04 07:04:28 radhermit Exp $
+
+EAPI=5
+inherit multilib
+
+DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
+HOMEPAGE="http://msmtp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/msmtp/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc gnutls idn libsecret +mta nls sasl ssl vim-syntax"
+
+CDEPEND="
+	idn? ( net-dns/libidn )
+	libsecret? ( app-crypt/libsecret )
+	nls? ( virtual/libintl )
+	sasl? ( virtual/gsasl )
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( dev-libs/openssl )
+	)
+"
+
+RDEPEND="${CDEPEND}
+	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]
+	)
+"
+
+DEPEND="${CDEPEND}
+	doc? ( virtual/texi2dvi )
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="gnutls? ( ssl )"
+
+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
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
+		$(use_with sasl libgsasl) \
+		$(use_with idn libidn) \
+		$(use_with libsecret )
+}
+
+src_compile() {
+	default
+
+	if use doc ; then
+		cd doc || die
+		emake html pdf
+	fi
+}
+
+src_install() {
+	default
+
+	if use doc ; then
+		dohtml doc/msmtp.html
+		dodoc doc/msmtp.pdf
+	fi
+
+	if use mta ; then
+		dodir /usr/sbin
+		dosym /usr/bin/msmtp /usr/sbin/sendmail
+		dosym /usr/bin/msmtp /usr/bin/sendmail
+		dosym /usr/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 ${ROOT}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
+}