Version bump; stabilise 1.3.2-r1 on amd64, purge 1.2.3.

(Portage version: 2.0.51-r13)

6 files changed, 68 insertions, 49 deletions

diff --git a/mail-mta/msmtp/ChangeLog b/mail-mta/msmtp/ChangeLog
index 94f7ba6f2423..195bdbb97669 100644
--- a/mail-mta/msmtp/ChangeLog
+++ b/mail-mta/msmtp/ChangeLog
@@ -1,6 +1,12 @@
 # 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.29 2005/01/22 16:59:30 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.30 2005/01/22 22:52:18 slarti Exp $
+
+*msmtp-1.3.4 (22 Jan 2005)
+
+  22 Jan 2005; Tom Martin <slarti@gentoo.org> -msmtp-1.2.3.ebuild,
+  msmtp-1.3.2-r1.ebuild, +msmtp-1.3.4.ebuild:
+  Version bump, stabilise 1.3.2-r1 on amd64, purge 1.2.3.
 
   22 Jan 2005; Lars Weiler <pylon@gentoo.org> msmtp-1.2.4.ebuild:
   Stable on ppc.
diff --git a/mail-mta/msmtp/files/digest-msmtp-1.2.3 b/mail-mta/msmtp/files/digest-msmtp-1.2.3
deleted file mode 100644
index f4423dce2421..000000000000
--- a/mail-mta/msmtp/files/digest-msmtp-1.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eaac33c39c213194ac85297c379c2042 msmtp-1.2.3.tar.gz 158574
diff --git a/mail-mta/msmtp/files/digest-msmtp-1.3.4 b/mail-mta/msmtp/files/digest-msmtp-1.3.4
new file mode 100644
index 000000000000..4b2ef71cc908
--- /dev/null
+++ b/mail-mta/msmtp/files/digest-msmtp-1.3.4
@@ -0,0 +1 @@
+MD5 8564512fcabb49d704a77910d422a34c msmtp-1.3.4.tar.bz2 168425
diff --git a/mail-mta/msmtp/msmtp-1.2.3.ebuild b/mail-mta/msmtp/msmtp-1.2.3.ebuild
deleted file mode 100644
index 195b428f0c3a..000000000000
--- a/mail-mta/msmtp/msmtp-1.2.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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.2.3.ebuild,v 1.5 2005/01/03 20:01:37 corsair Exp $
-
-DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
-HOMEPAGE="http://msmtp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-IUSE="ssl gnutls sasl"
-DEPEND="virtual/libc
-	dev-util/pkgconfig
-	ssl? (
-		gnutls?	( >=net-libs/gnutls-1.0.0 )
-		!gnutls?  ( >=dev-libs/openssl-0.9.6 )
-	)
-	sasl? ( virtual/gsasl )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc amd64"
-
-src_compile () {
-	local myconf
-
-	use sasl \
-		&& myconf="${myconf} --enable-gsasl" \
-		|| myconf="${myconf} --disable-gsasl"
-
-	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 ${myconf} || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS \
-		doc/msmtprc.example doc/Mutt+msmtp.txt || die "dodoc failed"
-}
diff --git a/mail-mta/msmtp/msmtp-1.3.2-r1.ebuild b/mail-mta/msmtp/msmtp-1.3.2-r1.ebuild
index e7917bc0dd31..0d016d2a9f90 100644
--- a/mail-mta/msmtp/msmtp-1.3.2-r1.ebuild
+++ b/mail-mta/msmtp/msmtp-1.3.2-r1.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.2-r1.ebuild,v 1.1 2005/01/14 15:39:23 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.3.2-r1.ebuild,v 1.2 2005/01/22 22:52:18 slarti Exp $
 
 DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
 HOMEPAGE="http://msmtp.sourceforge.net/"
@@ -17,7 +17,7 @@ DEPEND="virtual/libc
 	!mailwrapper? ( !virtual/mta )"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~x86 ~ppc amd64"
 PROVIDE="virtual/mta"
 
 src_compile () {
diff --git a/mail-mta/msmtp/msmtp-1.3.4.ebuild b/mail-mta/msmtp/msmtp-1.3.4.ebuild
new file mode 100644
index 000000000000..d0d81eb1112f
--- /dev/null
+++ b/mail-mta/msmtp/msmtp-1.3.4.ebuild
@@ -0,0 +1,58 @@
+# 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.4.ebuild,v 1.1 2005/01/22 22:52:18 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/${PN}/${P}.tar.bz2"
+IUSE="ssl gnutls sasl mailwrapper"
+DEPEND="virtual/libc
+	dev-util/pkgconfig
+	ssl? (
+		gnutls?	( >=net-libs/gnutls-1.1.23 )
+		!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"
+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) \
+		${myconf} \
+	|| die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install () {
+	make DESTDIR=${D} 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 \
+		|| die "dodoc failed"
+}