Version bump.

Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

3 files changed, 136 insertions, 9 deletions

diff --git a/mail-mta/msmtp/ChangeLog b/mail-mta/msmtp/ChangeLog
index fe32846bc681..ebaa76c10516 100644
--- a/mail-mta/msmtp/ChangeLog
+++ b/mail-mta/msmtp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/msmtp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.116 2011/11/08 00:43:29 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.117 2011/11/28 02:55:43 radhermit Exp $
+
+*msmtp-1.4.26 (28 Nov 2011)
+
+  28 Nov 2011; Tim Harder <radhermit@gentoo.org> +msmtp-1.4.26.ebuild:
+  Version bump.
 
   08 Nov 2011; Tim Harder <radhermit@gentoo.org> msmtp-1.4.25.ebuild:
   Add rdep on net-mail/mailbase (bug #389797 by Tiziano Müller).
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index c3c8be608332..798701b030d3 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -3,19 +3,21 @@ Hash: SHA512
 
 DIST msmtp-1.4.24.tar.bz2 299358 RMD160 5d342818bbbeee303c071a403fd86d40404ed5c2 SHA1 4c9783a888bdd7da6f39ee6fd2d52585c3aee6c0 SHA256 f19f3fcc67da448420b3adbd5add09f8fe110664dd64f3c2cd693ef0cb736887
 DIST msmtp-1.4.25.tar.bz2 302039 RMD160 4c74b9e939424015c4a474268273a264e9f3c1bd SHA1 ee3be4e250cbd6fef2fb14af4eadfc0ce58ef424 SHA256 65796adf60e1ebb4341f8415bd3cfa6647226bdba5fbaa5af7bc369808ab4e63
+DIST msmtp-1.4.26.tar.bz2 301686 RMD160 9e552483193129589510f589f3d11ed4ed0c0abb SHA1 0ce5352447b01dc21970b7a00cf13b8a3e7172c9 SHA256 53a3bbea4fa9dbc2b353deeec6ffa9b681ea228cae67f19d3e1197845c62cde2
 EBUILD msmtp-1.4.24-r1.ebuild 2854 RMD160 9000dc55db66bd24ba749a8be8d9ec2a0f4665ed SHA1 2e82f7ce193f6c0aec1bac4e42338e0a8d58acac SHA256 a0397461f09e397a3515918a477047cad0d52f5e4cfb8ca55eec8dac32e3b1c3
 EBUILD msmtp-1.4.24.ebuild 2776 RMD160 325807d98372bd7277597f8764f10e95cb5f9f07 SHA1 dec37de68b4d96f88cc57625437915c9a4ef7938 SHA256 827730bdfde47286d15a65c3a38e88098e6cb0a8ef7df5232db36a65c804d288
 EBUILD msmtp-1.4.25.ebuild 2853 RMD160 be6dce5672c66d51935bc243c1f845dfcca8f0f8 SHA1 5bae938417956bfbcb856ad8b4144cc47be67985 SHA256 c7f84d2eaf2cacc0331b1b2c4217df7dd9b97b22c8602a85f1d006c66d5dbc15
-MISC ChangeLog 15879 RMD160 bd4f5f849fd9a5a4e22bfc53da488776ee1890cf SHA1 55fe6b603093ecebe0a05159498bf7c3a9b6490e SHA256 ecbf6edf42c625ba8d886e08231628c46cd121a3e4584c445112057fb0216a46
+EBUILD msmtp-1.4.26.ebuild 2865 RMD160 85b48feaf21c2d343515460ddd74e882e4c85d5c SHA1 27525ca89b59e58113fe780a94ced1e2c5657d2e SHA256 6859cb41f6d19554d2c87f372dd17d44535f83fcbb873cb6d37abb31af74c581
+MISC ChangeLog 15996 RMD160 94195607ca3097ef501b8c0341642e9185c1f709 SHA1 36f5887406422c7e8a2ce2b85c31eb7796d5d605 SHA256 b61ea4f59f2b9a7c32fedd2cf0af7c26975bf003808e29cbe8aa42a746b4b292
 MISC metadata.xml 241 RMD160 f3ecce2785b4dbd86fc2454197c5ea18bdceeb8e SHA1 0c8829739037990f3a2c342f959eb734eeabefc7 SHA256 26ee4bda381b79a28729c310bdd467e2d1bbf39f08e271c5845e969d95d0e889
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOuHs6AAoJEEqz6FtPBkyjEMQH+wa9awkFvMv3hi+Jih+cyedo
-PAOCqk0GtuJd4uUMR1iMv/KX0kfEzhjZkK1xzkknWNWYRmD+kFOVyxozmytCeb48
-JOM7mcObnf1lgFaR1KR1Fb0URiau7mQGEAgE4dlhx6zkAURKVLEaJ7A9t/QiR+NE
-HGrnA8s9FEzQPILxr+je17g8JD7Ex2tnKzxHtnWdo2SBWVo5yDGpxuNXKFBL4ldU
-iVM+onnFUUL1IKXURFrvtv/M6nLo9fKde3zY36yeD4ml3JkAVD5GGRJclhcbMqVm
-dpaS/yj4TCssT9usdrKVKn8ePwwWFSunaSenpM5Hhjf0I3Fql9pcWsiOVQQL1BA=
-=hVrw
+iQEcBAEBCgAGBQJO0vg1AAoJEEqz6FtPBkyjxxgH/1eDUANEFLw1mCk4JxfpOoUD
+racVJfTC1xUUFjCgMeUwq+BJfulzCJNTJhxjiEkz4WnyUId4H1jPZZ3jD1b/9vUY
+dGMa/SyN4pr2HbXFzuHtJdMQz65WYWPFoS1GlPIPjUdLeeSRQylsp8CnuZtkcemh
+H/rY1JLpy/eh+4nC/A9wdYeDzR5WwQ+KtrZncAooStykIoyPjqYExwHbn8Vvr+jj
+c3nSJPRyJOMjpH7SsId1Ewtfpk0FjH3eZGQQyXLY7AFJMznWtZ4b6M14yQxwIoT+
+uxbySLL5xvWDH/zM0F63UISVz5ttquCVbaq9eobJggvdfE2y4fZE05tegZHO+CU=
+=KJn7
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/msmtp/msmtp-1.4.26.ebuild b/mail-mta/msmtp/msmtp-1.4.26.ebuild
new file mode 100644
index 000000000000..534d49462d44
--- /dev/null
+++ b/mail-mta/msmtp/msmtp-1.4.26.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.26.ebuild,v 1.1 2011/11/28 02:55:43 radhermit Exp $
+
+EAPI=4
+inherit multilib python
+
+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 ~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/nbsmtp
+			!mail-mta/netqmail
+			!mail-mta/nullmailer
+			!mail-mta/postfix
+			!mail-mta/qmail-ldap
+			!mail-mta/sendmail
+			!<mail-mta/ssmtp-2.64-r2
+			!>=mail-mta/ssmtp-2.64-r2[mta] )"
+
+DEPEND="${CDEPEND}
+	doc? ( virtual/texi2dvi )
+	nls? ( sys-devel/gettext )
+	dev-util/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
+
+	python_convert_shebangs 2 scripts/msmtp-gnome-tool/msmtp-gnome-tool.py
+}
+
+src_configure() {
+	econf \
+		$(use_with gnome-keyring ) \
+		$(use_with idn libidn) \
+		$(use_enable nls) \
+		$(use_with sasl libgsasl) \
+		$(use_with ssl ssl $(use gnutls && echo "gnutls" || echo "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
+
+	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
+}
+
+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
+}