8 files changed, 42 insertions, 63 deletions
diff --git a/mail-mta/msmtp/ChangeLog b/mail-mta/msmtp/ChangeLog
index 79e9faa05167..f1686b05f3ba 100644
--- a/mail-mta/msmtp/ChangeLog
+++ b/mail-mta/msmtp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-mta/msmtp
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.16 2004/09/07 08:27:54 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.17 2004/10/11 16:46:21 slarti Exp $
+
+*msmtp-1.2.4 (11 Oct 2004)
+
+  11 Oct 2004; Tom Martin <slarti@gentoo.org> -msmtp-1.1.2-r1.ebuild,
+  -msmtp-1.1.3.ebuild, msmtp-1.2.1.ebuild, +msmtp-1.2.4.ebuild:
+  Version bump -> 1.2.4. Removed outdated 1.1.x series ebuilds. 1.2.1 stable
+  on amd64.
 
 *msmtp-1.2.3 (07 Sep 2004)
 
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 8bc4e8c3b6d6..f413093d5950 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -2,21 +2,19 @@
 Hash: SHA1
 
 MD5 ca56829c7278e121c9c3af82f4382641 msmtp-1.2.3.ebuild 1203
-MD5 5fd4087941681e59b027bc135cebd6a6 msmtp-1.1.3.ebuild 1118
-MD5 0b0b7d97a377c75e5314b433a17e6463 ChangeLog 2387
-MD5 ba4e47ea7db0d98ad319bb5f456ad34e msmtp-1.1.2-r1.ebuild 1121
-MD5 570c3b91cefa46a71ea570343906ccc3 metadata.xml 247
 MD5 7ae508a4e145c96cf29d602741c7d412 msmtp-1.2.2.ebuild 1182
-MD5 4e545c2d6de7cf9e563f0d7f1b0481db msmtp-1.2.1.ebuild 1182
-MD5 de4318539c7e94df4c2a14e3af5546fb files/digest-msmtp-1.1.2-r1 63
+MD5 3da3a737a4cf2441263c3129d8a4e099 msmtp-1.2.4.ebuild 1204
+MD5 1470431393fd7dc05eb2b3d398b69b9c ChangeLog 2640
+MD5 570c3b91cefa46a71ea570343906ccc3 metadata.xml 247
+MD5 92f666d6797e112983155cf46ae6fd89 msmtp-1.2.1.ebuild 1182
 MD5 f2d2b60f2bf921464f00d468021a258a files/digest-msmtp-1.2.1 63
 MD5 2ca397018ac168946f81b0094b3bfe44 files/digest-msmtp-1.2.2 63
-MD5 330ce41e4e067d01fd1561d67ddb860f files/digest-msmtp-1.1.3 63
 MD5 7c72ffdb691739c7e527ec1c06c22efd files/digest-msmtp-1.2.3 63
+MD5 0553a19313bf7527b1bbb9e1539f2021 files/digest-msmtp-1.2.4 63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBPXEV10xuJSrg3/sRAj3DAJ44YIy9bXQh7iaE0ZpfrATmcKBAbQCfYTPB
-Cly2L1DIX/farFrct3JITiM=
-=IiLy
+iD8DBQFBarjqCHk4+ZoBpvsRAt/GAJ9883aKLrvTZB5Tek5vwHJFMW/G2wCeM5OL
+BC6bSfWaVRrLYJstBw4FAVU=
+=ajQ8
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/msmtp/files/digest-msmtp-1.1.2-r1 b/mail-mta/msmtp/files/digest-msmtp-1.1.2-r1
deleted file mode 100644
index 3a9f3c96f3ad..000000000000
--- a/mail-mta/msmtp/files/digest-msmtp-1.1.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c7183ed292137e57d42457b03bff9efa msmtp-1.1.2.tar.gz 147955
diff --git a/mail-mta/msmtp/files/digest-msmtp-1.1.3 b/mail-mta/msmtp/files/digest-msmtp-1.1.3
deleted file mode 100644
index fbc8760659c0..000000000000
--- a/mail-mta/msmtp/files/digest-msmtp-1.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 589d6f5651734be17c3a35928c422241 msmtp-1.1.3.tar.gz 149625
diff --git a/mail-mta/msmtp/files/digest-msmtp-1.2.4 b/mail-mta/msmtp/files/digest-msmtp-1.2.4
new file mode 100644
index 000000000000..c7e993596252
--- /dev/null
+++ b/mail-mta/msmtp/files/digest-msmtp-1.2.4
@@ -0,0 +1 @@
+MD5 160567ff76a43a283071fbc15aeeb359 msmtp-1.2.4.tar.gz 159416
diff --git a/mail-mta/msmtp/msmtp-1.1.3.ebuild b/mail-mta/msmtp/msmtp-1.1.3.ebuild
deleted file mode 100644
index 93113dd947a4..000000000000
--- a/mail-mta/msmtp/msmtp-1.1.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.1.3.ebuild,v 1.1 2004/07/10 16:55:17 slarti Exp $
-
-# msmtp *must* be built with TLS/SSL support, so the "ssl" USE flag cannot be
-# used.
-
-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="gnutls sasl"
-DEPEND="gnutls?  ( >=net-libs/gnutls-1.0.0 )
-		!gnutls? ( dev-libs/openssl )
-		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"
-	use gnutls \
-		&& myconf="${myconf} --with-ssl=gnutls" \
-		|| myconf="${myconf} --with-ssl=openssl"
-	econf ${myconf} || die "configure failed"
-	make || die "make failed"
-}
-
-src_install () {
-	einstall || die "install failed"
-	dodoc AUTHORS COPYING ChangeLog NEWS README THANKS \
-		doc/msmtprc.example doc/Mutt+msmtp.txt || die "dodoc failed"
-}
diff --git a/mail-mta/msmtp/msmtp-1.2.1.ebuild b/mail-mta/msmtp/msmtp-1.2.1.ebuild
index 640a1ef0a5b5..207b288ab92b 100644
--- a/mail-mta/msmtp/msmtp-1.2.1.ebuild
+++ b/mail-mta/msmtp/msmtp-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.2.1.ebuild,v 1.6 2004/09/01 11:44:53 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.2.1.ebuild,v 1.7 2004/10/11 16:46:21 slarti Exp $
 
 DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
 HOMEPAGE="http://msmtp.sourceforge.net/"
@@ -14,7 +14,7 @@ DEPEND="virtual/libc
 	sasl? ( virtual/gsasl )"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="amd64 ~x86 ~ppc"
 
 src_compile () {
 	local myconf
diff --git a/mail-mta/msmtp/msmtp-1.1.2-r1.ebuild b/mail-mta/msmtp/msmtp-1.2.4.ebuild
index c5e40c6fd9fc..d59043b527af 100644
--- a/mail-mta/msmtp/msmtp-1.1.2-r1.ebuild
+++ b/mail-mta/msmtp/msmtp-1.2.4.ebuild
@@ -1,35 +1,45 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.1.2-r1.ebuild,v 1.1 2004/07/09 20:04:40 slarti Exp $
-
-# msmtp *must* be built with TLS/SSL support, so the "ssl" USE flag cannot be
-# used.
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.2.4.ebuild,v 1.1 2004/10/11 16:46:21 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.gz"
-IUSE="gnutls sasl"
-DEPEND="gnutls?  ( >=net-libs/gnutls-1.0.0 )
-		!gnutls? ( dev-libs/openssl )
-		sasl?	 ( virtual/gsasl )"
+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"
-	use gnutls \
-		&& myconf="${myconf} --with-ssl=gnutls" \
-		|| myconf="${myconf} --with-ssl=openssl"
+
+	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"
-	make || die "make failed"
+	emake || die "make failed"
 }
 
 src_install () {
 	einstall || die "install failed"
-	dodoc AUTHORS COPYING ChangeLog NEWS README THANKS \
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS \
 		doc/msmtprc.example doc/Mutt+msmtp.txt || die "dodoc failed"
 }