3 files changed, 126 insertions, 5 deletions
diff --git a/mail-mta/msmtp/ChangeLog b/mail-mta/msmtp/ChangeLog
index 6f61278f399e..bbdce4f46fc6 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.100 2011/04/22 16:10:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.101 2011/04/29 06:15:11 radhermit Exp $
+
+*msmtp-1.4.24 (29 Apr 2011)
+
+  29 Apr 2011; Tim Harder <radhermit@gentoo.org> +msmtp-1.4.24.ebuild:
+  Version bump. Update to EAPI 4.
 
   22 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> msmtp-1.4.23.ebuild:
   Prepare for new ssmtp with optional mta support (bug #289973).
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 4e0b34958636..f1a73312947c 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -3,13 +3,19 @@ Hash: SHA1
 
 AUX mailer.conf 279 RMD160 1814eab17a6810a29a2b3c30ec3a69741fe40902 SHA1 90864ba7b1a44327abb47d54aadd4448b33e52d5 SHA256 f7be36c6d4957cdafcf5162dd5e766fbe269eed25135bc61af02883896b4c25f
 DIST msmtp-1.4.23.tar.bz2 942443 RMD160 c0e27e985dd9e4dbf2fee5d2ce547ddc4f10296a SHA1 8a07e7edf752c888252bc32e0f77ad573d0a8bdb SHA256 269cd30eeb867167c6a599e23399f4fc24196fcdef3bac5b120d806b3b421810
+DIST msmtp-1.4.24.tar.bz2 299358 RMD160 5d342818bbbeee303c071a403fd86d40404ed5c2 SHA1 4c9783a888bdd7da6f39ee6fd2d52585c3aee6c0 SHA256 f19f3fcc67da448420b3adbd5add09f8fe110664dd64f3c2cd693ef0cb736887
 EBUILD msmtp-1.4.23.ebuild 2872 RMD160 a033119aff7cf7c180759d35f5684fa2e359cb87 SHA1 2df0ee22e2d8d5a0c37adf1c9e0255f0f893cba1 SHA256 d29d10adb0b75d8ba38847e3c5dc72be121b0fa4a2aa0e7a4171956cc73b898b
-MISC ChangeLog 13912 RMD160 6ef36d2221aa4584b02008d283f90a56a2d167d6 SHA1 078a92b8728a2f076baa1036f47888e078749dc8 SHA256 f1b7023109c48fb44f71d7c09bfa66b5b0e24c17a47f47922d111ff721467d39
+EBUILD msmtp-1.4.24.ebuild 2684 RMD160 b56298a195925fa005df8167518c01177e15a254 SHA1 8947b7cf7f4e1c9c4591c5739f5c5b3820a26e7a SHA256 771a96f6089fdf8cc336c658626d4281c7f6e689ed97b81fa386e7539ee166ba
+MISC ChangeLog 14047 RMD160 eddbfb0c51934fa522aa84be11e51502f30be63f SHA1 93f8e51b5ef4b8b8b8756cd4e42f87fd67990142 SHA256 5e3ac7579aa257ae540219bcbf2b976cf96e3403b010588d0dd5ab39d3d290f0
 MISC metadata.xml 241 RMD160 f3ecce2785b4dbd86fc2454197c5ea18bdceeb8e SHA1 0c8829739037990f3a2c342f959eb734eeabefc7 SHA256 26ee4bda381b79a28729c310bdd467e2d1bbf39f08e271c5845e969d95d0e889
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2xqF0ACgkQAiZjviIA2XifMQCgp4L02gm29476rwamSM9H7k2+
-BtEAn2dgboql3J3qUMdjkifF+wYFkfku
-=qRZC
+iQEcBAEBAgAGBQJNuld1AAoJEEqz6FtPBkyjbDMH/iOIiJRhliQ/YFqsca+kSryE
+AycN4ZRtOomd2ZyBLL7R5oSbW6kXTS0MDMWK16F9A/K+Xf4e3gg1wxULGyQpFdo6
+MwN9HDLfJ51WoWNL2cyMIjj37vqDgvZnIaB3qmMHPu/pBTssLlxn49Fn3dEDz7Wv
+GDA0s0KH72PeeYQH89EzYkEFO6TbH8jNC/pKCwnDl85CdOhieQGCoZdSNLtx38GZ
+jtm+336iZPmWY1a6x6jHTlVS4OJlSihKAcXux/l5vB/3z2oH5i4mZXhWz3+/oq1y
+FXgupharHiDebRpRxbneLml39wrHg/shl+LzAf2E6cLDsqxc4OEiPwbNhK7gLC4=
+=QaMH
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/msmtp/msmtp-1.4.24.ebuild b/mail-mta/msmtp/msmtp-1.4.24.ebuild
new file mode 100644
index 000000000000..6dea724aa37a
--- /dev/null
+++ b/mail-mta/msmtp/msmtp-1.4.24.ebuild
@@ -0,0 +1,110 @@
+# 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.24.ebuild,v 1.1 2011/04/29 06:15:11 radhermit Exp $
+
+EAPI=4
+
+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="idn? ( net-dns/libidn )
+	nls? ( virtual/libintl )
+	gnome-keyring? ( gnome-base/gnome-keyring
+		dev-python/gnome-keyring-python )
+	gnutls? ( >=net-libs/gnutls-1.2.0 )
+	!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+	sasl? ( >=virtual/gsasl-0.2.4 )"
+
+RDEPEND="${CDEPEND}
+	!net-mail/mailwrapper
+	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}
+	nls? ( sys-devel/gettext )
+	dev-util/pkgconfig"
+
+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
+}
+
+src_configure() {
+	local myconf
+
+	if use gnutls ; then
+		myconf="--with-ssl=gnutls"
+	elif use ssl ; then
+		myconf="--with-ssl=openssl"
+	else
+		myconf="--with-ssl=no"
+	fi
+
+	econf \
+		$(use_with idn libidn) \
+		$(use_with sasl libgsasl) \
+		$(use_with gnome-keyring ) \
+		$(use_enable nls) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use mta ; then
+		dodir /usr/sbin
+		dosym /usr/bin/msmtp /usr/sbin/sendmail
+	fi
+
+	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 vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/vim/msmtp.vim
+	fi
+
+	if use gnome-keyring ; then
+		src_install_contrib msmtp-gnome-tool "msmtp-gnome-tool.py" "README"
+	fi
+
+	src_install_contrib find_alias "find_alias_for_msmtp.sh"
+	src_install_contrib msmtpqueue "*.sh" "README ChangeLog"
+	src_install_contrib msmtpq "msmtpq msmtpQ" "README"
+	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
+}