DEPEND on GnuTLS 1.2.0 and above instead of 1.1.23 and above. Fix use_enable for GSASL.

Package-Manager: portage-2.0.51.19

5 files changed, 84 insertions, 10 deletions

diff --git a/mail-mta/msmtp/ChangeLog b/mail-mta/msmtp/ChangeLog
index 3f8a46a25501..ce50c1ff3cb3 100644
--- a/mail-mta/msmtp/ChangeLog
+++ b/mail-mta/msmtp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-mta/msmtp
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.35 2005/03/09 22:16:26 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.36 2005/04/07 11:57:27 slarti Exp $
+
+*msmtp-1.4.0 (07 Apr 2005)
+
+  07 Apr 2005; Tom Martin <slarti@gentoo.org> msmtp-1.3.6.ebuild,
+  +msmtp-1.4.0.ebuild:
+  DEPEND on GnuTLS 1.2.0 and above instead of 1.1.23 and above. Fix use_enable
+  for GSASL.
 
   09 Mar 2005; Tom Martin <slarti@gentoo.org> msmtp-1.3.6.ebuild:
   Initial ~sparc.
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 8a8388b4ea84..0e7591d8841c 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,27 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ad8755d16e067533b6592de91eb76e35 ChangeLog 4690
+MD5 5cf940d3b1b99f4a67b8fb1542fb3b0a ChangeLog 4900
 MD5 a5b4575eec20ddc33b2b764391daf483 msmtp-1.3.5.ebuild 1566
 MD5 776754f08dea1b275f28ce3af9355a4a msmtp-1.3.1.ebuild 1168
 MD5 95ea6a4f095ea0872487cb0551f07a75 msmtp-1.3.2.ebuild 1168
 MD5 f5a4df2680c0585705c19501e1658685 msmtp-1.3.2-r1.ebuild 1568
-MD5 1e9bb0f9245411c46ba11c606f4a682f msmtp-1.3.6.ebuild 1789
+MD5 cffb24cc7853bae9c6775567bc268f85 msmtp-1.3.6.ebuild 1794
 MD5 9ab5e715dff170b84417d6200a03a084 msmtp-1.3.4.ebuild 1566
 MD5 570c3b91cefa46a71ea570343906ccc3 metadata.xml 247
 MD5 25120ef4d3a708b4c30f53477a2645cb msmtp-1.2.4.ebuild 1157
+MD5 4b3a3906845c3a8ed7416e7d15667acc msmtp-1.4.0.ebuild 1794
 MD5 7794cb5bda2bdb48124f1eee5fd892d6 files/digest-msmtp-1.3.5 64
 MD5 f97e45be1f1dce532bdfb4e3cfb8d1b5 files/digest-msmtp-1.3.2 64
 MD5 384776a579fdf8b01782499a61d77285 files/digest-msmtp-1.3.1 64
 MD5 0553a19313bf7527b1bbb9e1539f2021 files/digest-msmtp-1.2.4 63
 MD5 dc3649e52d046a8f98fdee06ac34b5a2 files/digest-msmtp-1.3.6 64
+MD5 5c7a9806b21c53c30d4c0181956371c9 files/digest-msmtp-1.4.0 64
 MD5 2aac2039b42e533f8f4986d8aa457fcc files/mailer.conf 1478
 MD5 f97e45be1f1dce532bdfb4e3cfb8d1b5 files/digest-msmtp-1.3.2-r1 64
 MD5 c129ac863cc45ec6da5aa7c5a8cc16bc files/digest-msmtp-1.3.4 64
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD4DBQFCL3ZyCHk4+ZoBpvsRAh+WAJizUGNotIlIvrfnZ32+PDVi9Pc6AJ0ezPI6
-uUXuQJv9/WDGm+bE+KBAGQ==
-=zbWU
+iD8DBQFCVSDwCHk4+ZoBpvsRAl95AJ9xArBzZO7/uZVgOlUZVTZCiY7PtgCgtrRY
+VodavLKdzHC5ewNZxlhpALY=
+=V0O2
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/msmtp/files/digest-msmtp-1.4.0 b/mail-mta/msmtp/files/digest-msmtp-1.4.0
new file mode 100644
index 000000000000..60348e036cb0
--- /dev/null
+++ b/mail-mta/msmtp/files/digest-msmtp-1.4.0
@@ -0,0 +1 @@
+MD5 07af3a34f61cb533ab45d35e3c7163fd msmtp-1.4.0.tar.bz2 404850
diff --git a/mail-mta/msmtp/msmtp-1.3.6.ebuild b/mail-mta/msmtp/msmtp-1.3.6.ebuild
index 3c696258d910..1bc65f2dd8e3 100644
--- a/mail-mta/msmtp/msmtp-1.3.6.ebuild
+++ b/mail-mta/msmtp/msmtp-1.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.3.6.ebuild,v 1.2 2005/03/09 22:16:26 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.3.6.ebuild,v 1.3 2005/04/07 11:57:27 slarti Exp $
 
 DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
 HOMEPAGE="http://msmtp.sourceforge.net/"
@@ -9,7 +9,7 @@ IUSE="ssl gnutls sasl mailwrapper"
 DEPEND="virtual/libc
 	dev-util/pkgconfig
 	ssl? (
-		gnutls?	( >=net-libs/gnutls-1.1.23 )
+		gnutls? ( >=net-libs/gnutls-1.2.0 )
 		!gnutls?  ( >=dev-libs/openssl-0.9.6 )
 	)
 	sasl? ( >=virtual/gsasl-0.2.4 )
@@ -32,7 +32,7 @@ src_compile () {
 	fi
 
 	econf \
-		$(use_enable sasl) \
+		$(use_enable sasl gsasl) \
 		${myconf} \
 	|| die "configure failed"
 
diff --git a/mail-mta/msmtp/msmtp-1.4.0.ebuild b/mail-mta/msmtp/msmtp-1.4.0.ebuild
new file mode 100644
index 000000000000..b6d6c222aebb
--- /dev/null
+++ b/mail-mta/msmtp/msmtp-1.4.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.0.ebuild,v 1.1 2005/04/07 11:57:27 slarti Exp $
+
+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"
+IUSE="ssl gnutls sasl mailwrapper"
+DEPEND="virtual/libc
+	dev-util/pkgconfig
+	ssl? (
+		gnutls?	( >=net-libs/gnutls-1.2.0 )
+		!gnutls?  ( >=dev-libs/openssl-0.9.6 )
+	)
+	sasl? ( >=virtual/gsasl-0.2.4 )
+	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
+	!mailwrapper? ( !virtual/mta )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+PROVIDE="virtual/mta"
+
+src_compile () {
+	local myconf
+
+	if use ssl && use gnutls ; then
+		myconf="${myconf} --enable-ssl --with-ssl=gnutls"
+	elif use ssl && ! use gnutls ; then
+		myconf="${myconf} --enable-ssl --with-ssl=openssl"
+	else
+		myconf="${myconf} --disable-ssl"
+	fi
+
+	econf \
+		$(use_enable sasl gsasl) \
+		${myconf} \
+	|| die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install () {
+	make DESTDIR=${D} docdir=${D}/usr/share/doc docdirname=${P} install || die "install failed"
+
+	if use mailwrapper; then
+		insinto /etc/mail
+		doins ${FILESDIR}/mailer.conf
+	else
+		dodir /usr/sbin /usr/lib
+		dosym /usr/bin/msmtp /usr/sbin/sendmail || die "dosym failed"
+		dosym /usr/sbin/sendmail /usr/lib/sendmail || die "dosym failed"
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS doc/msmtprc.example \
+		doc/Mutt+msmtp.txt doc/msmtprc.example README.gsasl \
+		doc/msmtprc-system.example doc/msmtprc-user.example \
+	|| die "dodoc failed"
+
+	if use doc; then
+		dohtml doc/msmtp.html || die "dohtml failed"
+		insinto /usr/share/doc/${PF}
+		doins doc/msmtp.pdf
+	fi
+}