Version bump

(Portage version: 2.0.51.22-r1)

6 files changed, 137 insertions, 11 deletions

diff --git a/mail-mta/msmtp/ChangeLog b/mail-mta/msmtp/ChangeLog
index 0aff78676e56..c82cc4979215 100644
--- a/mail-mta/msmtp/ChangeLog
+++ b/mail-mta/msmtp/ChangeLog
@@ -1,6 +1,14 @@
 # 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.52 2005/07/05 20:51:39 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.53 2005/07/08 11:50:05 slarti Exp $
+
+*msmtp-1.4.2-r1 (08 Jul 2005)
+*msmtp-1.4.2 (08 Jul 2005)
+
+  08 Jul 2005; Tom Martin <slarti@gentoo.org> +msmtp-1.4.2.ebuild,
+  +msmtp-1.4.2-r1.ebuild:
+  Version bump, adds NLS support. Two variants, as ever, one for old-style
+  mailwrapper and -r1 for new mailer.eclass support.
 
   05 Jul 2005; Tom Martin <slarti@gentoo.org> msmtp-1.4.1.ebuild,
   msmtp-1.4.1-r1.ebuild:
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index df56b73dc010..07371697972f 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,21 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 5fd93ce6b7395c0c07b4b17c48abfa9d ChangeLog 6724
+MD5 df8d8ff093f117cdcc38d80b310a2e80 msmtp-1.4.2.ebuild 1642
 MD5 404078b247e91c7fc1a8b31e27d2499f msmtp-1.4.1.ebuild 1588
+MD5 e732e0881e8e18c8b14865724c17306e msmtp-1.4.2-r1.ebuild 1503
 MD5 53276ec211c2e0a77e3e15390ca837e2 msmtp-1.4.1-r1.ebuild 1449
 MD5 570c3b91cefa46a71ea570343906ccc3 metadata.xml 247
 MD5 5c397704ff67b621ff79fc18fd846e0b msmtp-1.4.0.ebuild 1577
 MD5 76f50a1c193917903564978a2bfc016a msmtp-1.4.0-r1.ebuild 1452
+MD5 8cad534b9a1023f85c08ce257788e9f5 files/digest-msmtp-1.4.2 64
 MD5 5c7a9806b21c53c30d4c0181956371c9 files/digest-msmtp-1.4.0-r1 64
+MD5 8cad534b9a1023f85c08ce257788e9f5 files/digest-msmtp-1.4.2-r1 64
 MD5 5c7a9806b21c53c30d4c0181956371c9 files/digest-msmtp-1.4.0 64
 MD5 d48ce2f5a0c821e44160dcaa26e0dff8 files/digest-msmtp-1.4.1-r1 64
 MD5 d48ce2f5a0c821e44160dcaa26e0dff8 files/digest-msmtp-1.4.1 64
 MD5 25a1f06b39d5ecd451afeccad46678c6 files/mailer.conf 279
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCyvL5CHk4+ZoBpvsRAiBjAKC10RFIwMgVgn2UYVllna8kfURVKgCeM8aV
-Ywq9YG+uGfM3KkfCImt5jD4=
-=6Ui8
------END PGP SIGNATURE-----
diff --git a/mail-mta/msmtp/files/digest-msmtp-1.4.2 b/mail-mta/msmtp/files/digest-msmtp-1.4.2
new file mode 100644
index 000000000000..ac70e368103c
--- /dev/null
+++ b/mail-mta/msmtp/files/digest-msmtp-1.4.2
@@ -0,0 +1 @@
+MD5 3db095102259103e4eb48fc0c7d21618 msmtp-1.4.2.tar.bz2 479968
diff --git a/mail-mta/msmtp/files/digest-msmtp-1.4.2-r1 b/mail-mta/msmtp/files/digest-msmtp-1.4.2-r1
new file mode 100644
index 000000000000..ac70e368103c
--- /dev/null
+++ b/mail-mta/msmtp/files/digest-msmtp-1.4.2-r1
@@ -0,0 +1 @@
+MD5 3db095102259103e4eb48fc0c7d21618 msmtp-1.4.2.tar.bz2 479968
diff --git a/mail-mta/msmtp/msmtp-1.4.2-r1.ebuild b/mail-mta/msmtp/msmtp-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..fa17f09b5d9b
--- /dev/null
+++ b/mail-mta/msmtp/msmtp-1.4.2-r1.ebuild
@@ -0,0 +1,60 @@
+# 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.2-r1.ebuild,v 1.1 2005/07/08 11:50:05 slarti Exp $
+
+inherit mailer
+
+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-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ssl gnutls sasl doc nls"
+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 )
+	nls? ( sys-devel/gettext )"
+
+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) \
+		$(use_enable nls) \
+		${myconf} \
+		|| die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install () {
+	make DESTDIR=${D} install || die "install failed"
+
+	if use mailwrapper ; then
+		mailer_install_conf
+	else
+		dodir /usr/sbin
+		dosym /usr/bin/msmtp /usr/sbin/sendmail || die "dosym failed"
+	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
+}
diff --git a/mail-mta/msmtp/msmtp-1.4.2.ebuild b/mail-mta/msmtp/msmtp-1.4.2.ebuild
new file mode 100644
index 000000000000..ed2c43e09c08
--- /dev/null
+++ b/mail-mta/msmtp/msmtp-1.4.2.ebuild
@@ -0,0 +1,62 @@
+# 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.2.ebuild,v 1.1 2005/07/08 11:50:05 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"
+LICENSE="GPL-2"
+IUSE="ssl gnutls sasl mailwrapper doc nls"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+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 )
+	nls? ( sys-devel/gettext )"
+RDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
+	!mailwrapper? ( !virtual/mta )"
+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) \
+		$(use_enable nls) \
+		${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"
+	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
+}