Bump for #301036

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 121 insertions, 12 deletions

diff --git a/mail-mta/msmtp/ChangeLog b/mail-mta/msmtp/ChangeLog
index 8b3b05564626..f15682e60f29 100644
--- a/mail-mta/msmtp/ChangeLog
+++ b/mail-mta/msmtp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/msmtp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.82 2010/04/17 18:54:06 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.83 2010/06/09 18:51:09 patrick Exp $
+
+*msmtp-1.4.20 (09 Jun 2010)
+
+  09 Jun 2010; Patrick Lauer <patrick@gentoo.org> +msmtp-1.4.20.ebuild:
+  Bump for #301036
 
   17 Apr 2010; Alex Legler <a3li@gentoo.org> -msmtp-1.4.5.ebuild,
   -msmtp-1.4.7.ebuild:
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 1679a51b158b..fa8f5bd5552d 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mailer.conf 279 RMD160 1814eab17a6810a29a2b3c30ec3a69741fe40902 SHA1 90864ba7b1a44327abb47d54aadd4448b33e52d5 SHA256 f7be36c6d4957cdafcf5162dd5e766fbe269eed25135bc61af02883896b4c25f
 DIST msmtp-1.4.19.tar.bz2 820041 RMD160 1fd6bdf71aed9b8e939203ef59e499feedd63d64 SHA1 4491891326e8accacc02b1d4e7176262222122d0 SHA256 d6bf3f6f796041fc7d6653c022cc696238fdf8b2d538c4b2cd6c0aae5f056c66
+DIST msmtp-1.4.20.tar.bz2 845014 RMD160 5594473abcf25d77157d2410ebb26abec5197c25 SHA1 6668ed503b6647365358b8dd821535b1ff9e2c15 SHA256 328abd95370c6a5a9ea2fd38b55fc50d6fb3b03d96b3da40de2441650d53ebdb
 EBUILD msmtp-1.4.19-r1.ebuild 2708 RMD160 7687da6036a9c2aa864733b60954abd020752c52 SHA1 2644ba0d8ad175e3f267b5ce356c96af5a77bfc5 SHA256 5e5da02c8207926d2c121e6fe8e2a2f8632a98205389c39da22348501dbcb320
 EBUILD msmtp-1.4.19.ebuild 1977 RMD160 f9f4ac94069bec8ce5b8b8345091f174cff24ec3 SHA1 189cd91ba8b94d9fe1bce1ee4cee2ad9de485738 SHA256 81f2edd77a98b6344b1b1beaffc13325336cd98d49c0dbe0f8f8a5e3f4f48b24
-MISC ChangeLog 11586 RMD160 9815eb242d9443309a1152ddb98e6ff51dd04329 SHA1 8f458a8f8138d76362439f25194b542d6981078e SHA256 1f65e5a28ddc0798cfcb84b92389ce1322a0f9d21e85cc7408b9ba80e07e0431
+EBUILD msmtp-1.4.20.ebuild 2703 RMD160 4053056c5d06ed3b7598d906a419d344e8a3aa6f SHA1 170b075f142da200d4e6b1fcede0533da4061bf1 SHA256 9617929c3ad548d32d9d2c756ba70492abc65562335fafbd1884961a4485723f
+MISC ChangeLog 11710 RMD160 e5c8c263c43953e1bc18c650e9f151a11bdf6af9 SHA1 7e5a7919e26ac63b637acb30ed5846e2398c954c SHA256 cc3ca154d0e9df2e50fe863781dfcf3fa16cd0e3920c302bccb282abd0d6ff4b
 MISC metadata.xml 241 RMD160 f3ecce2785b4dbd86fc2454197c5ea18bdceeb8e SHA1 0c8829739037990f3a2c342f959eb734eeabefc7 SHA256 26ee4bda381b79a28729c310bdd467e2d1bbf39f08e271c5845e969d95d0e889
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvKA9gACgkQ+tgfDpkAy6DdeQCeMV8KUmSjHE7o8P9uF8ol/HK8
-x5kAn0au9BhtyG3tg1/t/oE7qj/Z54Rr
-=JTkf
------END PGP SIGNATURE-----
diff --git a/mail-mta/msmtp/msmtp-1.4.20.ebuild b/mail-mta/msmtp/msmtp-1.4.20.ebuild
new file mode 100644
index 000000000000..a740902b1d33
--- /dev/null
+++ b/mail-mta/msmtp/msmtp-1.4.20.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.20.ebuild,v 1.1 2010/06/09 18:51:09 patrick Exp $
+
+EAPI=2
+
+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 mailwrapper nls sasl ssl +mta"
+
+DEPEND="idn? ( net-dns/libidn )
+	nls? ( virtual/libintl )
+	gnome-keyring? ( gnome-base/gnome-keyring )
+	gnutls? ( >=net-libs/gnutls-1.2.0 )
+	!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+	sasl? ( >=virtual/gsasl-0.2.4 )"
+
+RDEPEND="${DEPEND}
+	mta? (
+		!mailwrapper? ( !virtual/mta )
+		mailwrapper? ( >=net-mail/mailwrapper-0.2 )
+	)"
+
+DEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )
+	dev-util/pkgconfig"
+
+PROVIDE="mta? ( virtual/mta )"
+
+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 || die "install failed"
+
+	if use mta; then
+		if use mailwrapper ; then
+			insinto /etc/mail
+			doins "${FILESDIR}"/mailer.conf
+		else
+			dodir /usr/sbin
+			dosym /usr/bin/msmtp /usr/sbin/sendmail || die "dosym failed"
+		fi
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS \
+		doc/{Mutt+msmtp.txt,msmtprc*} || die "dodoc failed"
+
+	if use doc ; then
+		dohtml doc/msmtp.html || die "dohtml failed"
+		dodoc doc/msmtp.pdf
+	fi
+
+	#d=msmtpqueue
+	#local msmtpqueue=/usr/share/${PN}/$d
+	#insinto ${msmtpqueue}
+	#exeinto ${msmtpqueue}
+	#doexe scripts/msmtpqueue/*.sh || die "doexe failed"
+	#for i in ChangeLog README ; do
+	#	newdoc scripts/msmtpqueue/$i msmtpqueue.$i \
+	#		|| die "dodoc scripts/msmtpqueue/$i failed"
+	#done
+
+	#d=msmtpq
+	#local msmtpq=/usr/share/${PN}/$d
+	#insinto ${msmtpqueue}
+	#exeinto ${msmtpqueue}
+	#i=README
+	#newdoc scripts/$d/$i $d.$i \
+	#	|| die "dodoc scripts/$d/$i failed"
+
+	src_install_contrib msmtpqueue "*.sh" "README ChangeLog"
+	src_install_contrib msmtpq "msmtpq msmtpQ" "README"
+
+}
+
+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 || die "doexe $subdir/$i failed"
+	done
+	for i in $docs ; do
+		newdoc scripts/$subdir/$i $subdir.$i \
+			|| die "dodoc $subdir/$i failed"
+	done
+}