Version bump, closes #60609. Also updated required openssl to >=0.9.6

5 files changed, 60 insertions, 16 deletions

diff --git a/mail-mta/msmtp/ChangeLog b/mail-mta/msmtp/ChangeLog
index b29d0754e2c5..fdc545c4590c 100644
--- a/mail-mta/msmtp/ChangeLog
+++ b/mail-mta/msmtp/ChangeLog
@@ -1,6 +1,14 @@
 # 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.14 2004/08/10 16:17:33 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.15 2004/09/01 11:44:53 ticho Exp $
+
+*msmtp-1.2.2 (01 Sep 2004)
+
+  01 Sep 2004; Andrej Kacian <ticho@gentoo.org> +msmtp-1.2.2.ebuild:
+  Version bump. Closes #60609, reported by Daniel Webert
+  <rockoo@rockoo.homelinux.org>. Also specified minimal version number for
+  dev-libs/openssl dependency to 0.9.6 (according to upstream doc) for
+  msmtp-1.2.2 and -1.2.1.
 
   10 Aug 2004; Tom Martin <slarti@gentoo.org> msmtp-1.2.1.ebuild:
   Add virtual/libc DEPEND.
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 0fbf5d9af226..26b96c9dc562 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ba4e47ea7db0d98ad319bb5f456ad34e msmtp-1.1.2-r1.ebuild 1121
+MD5 5fd4087941681e59b027bc135cebd6a6 msmtp-1.1.3.ebuild 1118
 MD5 b27caa9b62c93e9398bfe4d10e7f6020 ChangeLog 1847
+MD5 ba4e47ea7db0d98ad319bb5f456ad34e msmtp-1.1.2-r1.ebuild 1121
 MD5 570c3b91cefa46a71ea570343906ccc3 metadata.xml 247
-MD5 5fd4087941681e59b027bc135cebd6a6 msmtp-1.1.3.ebuild 1118
+MD5 9a3f2e4b4f050126b12d9ab5799d07f6 msmtp-1.2.2.ebuild 1175
 MD5 9a3f2e4b4f050126b12d9ab5799d07f6 msmtp-1.2.1.ebuild 1175
 MD5 de4318539c7e94df4c2a14e3af5546fb files/digest-msmtp-1.1.2-r1 63
-MD5 330ce41e4e067d01fd1561d67ddb860f files/digest-msmtp-1.1.3 63
 MD5 f2d2b60f2bf921464f00d468021a258a files/digest-msmtp-1.2.1 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.5 (GNU/Linux)
-
-iD8DBQFBGPVqCHk4+ZoBpvsRAnBmAJ9vNpuSfCD3uSAnksWSQxQfMr7LNwCgnMaH
-3TPaLKNinpws2L07qL3P7iI=
-=r7/J
------END PGP SIGNATURE-----
+MD5 2ca397018ac168946f81b0094b3bfe44 files/digest-msmtp-1.2.2 63
+MD5 330ce41e4e067d01fd1561d67ddb860f files/digest-msmtp-1.1.3 63
diff --git a/mail-mta/msmtp/files/digest-msmtp-1.2.2 b/mail-mta/msmtp/files/digest-msmtp-1.2.2
new file mode 100644
index 000000000000..4da96d24b27e
--- /dev/null
+++ b/mail-mta/msmtp/files/digest-msmtp-1.2.2
@@ -0,0 +1 @@
+MD5 8a12880351c950722aed2d07538c88e9 msmtp-1.2.2.tar.gz 155930
diff --git a/mail-mta/msmtp/msmtp-1.2.1.ebuild b/mail-mta/msmtp/msmtp-1.2.1.ebuild
index a7ec62f362cc..640a1ef0a5b5 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.5 2004/08/10 16:17:33 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.2.1.ebuild,v 1.6 2004/09/01 11:44:53 ticho 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"
 DEPEND="virtual/libc
 	ssl? (
 		gnutls?	( >=net-libs/gnutls-1.0.0 )
-		!gnutls?  ( dev-libs/openssl )
+		!gnutls?  ( >=dev-libs/openssl-0.9.6 )
 	)
 	sasl? ( virtual/gsasl )"
 SLOT="0"
diff --git a/mail-mta/msmtp/msmtp-1.2.2.ebuild b/mail-mta/msmtp/msmtp-1.2.2.ebuild
new file mode 100644
index 000000000000..b9d83817da8d
--- /dev/null
+++ b/mail-mta/msmtp/msmtp-1.2.2.ebuild
@@ -0,0 +1,43 @@
+# 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.2.ebuild,v 1.1 2004/09/01 11:44:53 ticho 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
+	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 () {
+	einstall || die "install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS \
+		doc/msmtprc.example doc/Mutt+msmtp.txt || die "dodoc failed"
+}