Version bump.

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

3 files changed, 149 insertions, 15 deletions

diff --git a/mail-mta/msmtp/ChangeLog b/mail-mta/msmtp/ChangeLog
index 0ee3498b6737..e0248024b90b 100644
--- a/mail-mta/msmtp/ChangeLog
+++ b/mail-mta/msmtp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/msmtp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.158 2013/02/28 17:51:38 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.159 2013/04/23 00:01:32 radhermit Exp $
+
+*msmtp-1.4.31 (23 Apr 2013)
+
+  23 Apr 2013; Tim Harder <radhermit@gentoo.org> +msmtp-1.4.31.ebuild:
+  Version bump.
 
   28 Feb 2013; Jason A. Donenfeld <zx2c4@gentoo.org> msmtp-1.4.30-r1.ebuild,
   msmtp-1.4.30.ebuild:
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 05ddee28a5e1..c5e1522da55c 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -2,24 +2,20 @@
 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
 EBUILD msmtp-1.4.30-r1.ebuild 3257 SHA256 b2a0c9db31809a92172977b2d30eb8ac75ee1fed38baea6041f28584e6728b65 SHA512 aeed6d954815409d85d1e53c5efc9c92cb56873fd21d7ad1931bdbe725e0d1f4cb78c01a61c55e4f05c54c01be1c5e1289aee2d021bf2d9a9f6dd81660e7cfa1 WHIRLPOOL cb8b1f98fc8c7134d247d0a16ee89686715621b1f2fd6430095d9638f16bd0b54ea5bc8bfeb1989a54fe2906835c5680f178a8803227b100c64d1983b4edba28
 EBUILD msmtp-1.4.30.ebuild 2879 SHA256 cdca21e60d89e540aa108929e05a79b81d8b24ef57ff26f4ecb9bf45ae3d886b SHA512 6e980a4bab31f4ee2b85f424252338528c5058f384c6bd42f6d0fae222d67a85a72baf4e8abd61266526e5d7423be379e224691e5cfb4a8e44ff5370a02feb2c WHIRLPOOL 288784e6b8bb825da8c7932e1af75f929dc2e98a5ef98d4a31c97cadbc7126dfbebb23f9f04cd3a48620f9d29299df6e6920cd931888d718dc7b33f09b82f47f
-MISC ChangeLog 20400 SHA256 dbb44e1fe9c3aeb5510dd2a98df4070326099b0a9498ddf702bc6ac2dfd8b567 SHA512 5eaeccb645f263c14c03bb5e161077c060d3f29479695d667e56c4b453d0ee2f1a32a26794951b910c8100cfcce88258c288951310e8da03c0c7299380f227d7 WHIRLPOOL 914304aa1acff070801e45107c571731f082303e12ad2e9cdd8933dc864acf536f1ecacc5769b3c956ac302a32260f31565dac05fb6286ce10b25d94c31ad568
+EBUILD msmtp-1.4.31.ebuild 3264 SHA256 80f6bace0d03783427f577792b079cb9077ce60a7597f09b2e687aa78935ee6c SHA512 41f3e0d9f8f7964cc10994865557ad8302a8ea402c2ffcd0e797cd4b5ac03767394a45236ee35d0decc8e58ef609933a7efd7539ee6b27e0edc1bf30f22db8b3 WHIRLPOOL 21a591d6d65893e122cadb933258171d786e95b404f527bfa8ddadb970f6fdc26b459f733b2389d450a843708994f17e1d9c550a315065da17adfc2cddb7b208
+MISC ChangeLog 20521 SHA256 04796f717b84f3c3bfb33e84b091f3b304f30aec4dde452093848c17aac0b9af SHA512 fd0c407acba20d7642501f0ce9f95a409bc9ebbfaaf20ca2ea05235be568fde6cd85e2d9f3539ab95ba7388344a0d242f83d741486701b9f4989d18283591116 WHIRLPOOL 1a56e390581aee72a40a04871ec7dbc32227f1fdbcae96d9ba389fbe532b3e3649b63283349f6c267771dd9e1fe34bef12eb0e38f0972f2a405d9478551f4b68
 MISC metadata.xml 241 SHA256 26ee4bda381b79a28729c310bdd467e2d1bbf39f08e271c5845e969d95d0e889 SHA512 07150e609f34b0229a3deb486e6c7ae691dc235b01e8a4c14c6226b6daa9162fe30494e0838a4e81118e05583f008f07167a1a996c2b0a80b4918d4fbb30e1cc WHIRLPOOL a433f2c63462c43e78ab4e3572538d398b9ff57ab8ddc4f0b4fea89327c6e7bfb5e3edefee1f8223bbea492a427c3ade78f41c13e8c8ed0769480a27a084b0a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRL5kpAAoJEEn8cBKl3gOuMlAQAIBC2SyJz5TzypH3s+Gu0brE
-MlCBjqGQVeh88GnIfR3aYIE4Vos2gp9/h31aqIdl78BpiLKhxObKxJ39/NABy3jF
-O2qgSQnsngFehixs5rHmnAP1S/pzquK8KForIzGArkML56lONvTocOq/94Iqlnua
-iFO2OSlVbb2JaSMyJBabLTxl8rAvD1vA61GJ2hhKbN0pePurIlyqhhw9DARocnym
-mELLTNur96lqy1S62my1PUJtvD/tHbD1ydDdOiqVeJUCVNKiQvgnn5kf0upt8m0T
-zm9RjdFJ3d7hE2UMrSQdS2+UD69T7ZW3UVDTb0LC9SDdZ6yCvXp3g88QJfO/UTGD
-BqD6eYUZM8VQn3NIMJc7p6VRvCdNTDLuWOJtSAm4U46llY9ne4OmoiPf+suODzdj
-i1ePU3TZbnMvwirpJNX1M8IPERSGSIxGKrTFF1iTYwEqP5eAIIwH3yzmWm2Y2+2e
-M3ko5zRImtru57jhaFKm768xyiHJ1EHsK5//jJVnuJHN7JTSP2hKuPuaF1NAswOi
-2sVYhdUuXqu63bkUlB6+d3e0beT/sVXkt3VQcmqqBiqZvX4I3wUjzkTsRCRpgyRs
-qa5IgepEqz0MNoIhk5sOmYlgGgAG9jYvKMit/ndshwHoqxFb6qLyL5Fvpby2pWek
-K5WEtNuD5OfcY+BUMOI+
-=QLx/
+iQEcBAEBCAAGBQJRdc9gAAoJEEqz6FtPBkyjMt4H/RpcF+mElGec8Tr8ZjxjWWQ3
+24q/STdYmvT970W2v7OsBtmFUt4qAtQYThMBgAv2i6Uf+IYuXT5Nk49Uee80UZq1
+o4LjavnulEgnZHeTDl91t5extD1Z7M8AbiJG/HJVV/bXxkNgSeqs34PjUY4M2Vc4
+uc9IM/MEkgyo6idXMc2bGPMiSeoGfFmEYF0vDVanx68LFRXrSauL1G3SBi2uA5cv
+q6g/457k6vaORMuBh2Sxkvp1K5vuXO1fROHGlhC4qNtNGEu5wep5hDTwKJ1o+q2f
+lIe7En7Gddxwzo4Xct3UWdvfQEW5G/2URKwLl4pp5EAo/wACxf1B1Czvucpp9V0=
+=EgpS
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/msmtp/msmtp-1.4.31.ebuild b/mail-mta/msmtp/msmtp-1.4.31.ebuild
new file mode 100644
index 000000000000..d23b9d1d2a91
--- /dev/null
+++ b/mail-mta/msmtp/msmtp-1.4.31.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.31.ebuild,v 1.1 2013/04/23 00:01:33 radhermit Exp $
+
+EAPI=5
+inherit multilib python eutils
+
+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.bz2"
+
+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 gnome-keyring gnutls idn +mta nls sasl ssl vim-syntax"
+
+CDEPEND="
+	gnome-keyring? (
+		dev-python/gnome-keyring-python
+		gnome-base/libgnome-keyring
+	)
+	idn? ( net-dns/libidn )
+	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 )"
+
+src_prepare() {
+	# Use default Gentoo location for mail aliases
+	sed -i -e 's:/etc/aliases:/etc/mail/aliases:' scripts/find_alias/find_alias_for_msmtp.sh || die
+
+	python_convert_shebangs 2 scripts/msmtp-gnome-tool/msmtp-gnome-tool.py
+}
+
+src_configure() {
+	econf \
+		--disable-silent-rules \
+		$(use_with gnome-keyring ) \
+		$(use_with idn libidn) \
+		$(use_enable nls) \
+		$(use_with sasl libgsasl) \
+		$(use_with ssl ssl $(usex gnutls gnutls openssl))
+}
+
+src_compile() {
+	default
+
+	if use doc ; then
+		cd doc || die
+		emake html pdf
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS README THANKS doc/{Mutt+msmtp.txt,msmtprc*}
+
+	if use doc ; then
+		dohtml doc/msmtp.html
+		dodoc doc/msmtp.pdf
+	fi
+
+	if use gnome-keyring ; then
+		src_install_contrib msmtp-gnome-tool msmtp-gnome-tool.py README
+	fi
+
+	if use mta ; then
+		dodir /usr/sbin
+		dosym /usr/bin/msmtp /usr/sbin/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
+}