Added mailwrapper and virtual/mta functionality, resolving bug 77398.

5 files changed, 126 insertions, 16 deletions

diff --git a/mail-mta/msmtp/ChangeLog b/mail-mta/msmtp/ChangeLog
index 133a468676b0..216e5aea249c 100644
--- a/mail-mta/msmtp/ChangeLog
+++ b/mail-mta/msmtp/ChangeLog
@@ -1,6 +1,11 @@
 # 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.27 2005/01/03 23:44:26 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.28 2005/01/14 15:39:23 slarti Exp $
+
+*msmtp-1.3.2-r1 (14 Jan 2005)
+
+  14 Jan 2005; Tom Martin <slarti@gentoo.org> +msmtp-1.3.2-r1.ebuild:
+  Added mailwrapper and virtual/mta functionality, resolving bug 77398.
 
   04 Jan 2005; Andrej Kacian <ticho@gentoo.org> msmtp-1.2.4.ebuild:
   Stable on x86.
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 6d67933afaf3..ef38ffadc020 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2ddb91f18d2e56bd3ffa35a9759b69cd msmtp-1.2.3.ebuild 1220
 MD5 b36255a75af3d1f405aae70be19a7a7f ChangeLog 3740
-MD5 570c3b91cefa46a71ea570343906ccc3 metadata.xml 247
-MD5 95ea6a4f095ea0872487cb0551f07a75 msmtp-1.3.2.ebuild 1168
 MD5 776754f08dea1b275f28ce3af9355a4a msmtp-1.3.1.ebuild 1168
+MD5 b21a2cb2c09a883945b3b21c92077583 msmtp-1.3.2.ebuild 1167
+MD5 9b8b332b6586e72cdb43341d8010a272 msmtp-1.3.2-r1.ebuild 1469
+MD5 570c3b91cefa46a71ea570343906ccc3 metadata.xml 247
 MD5 67ec446fc5562c12ae3ef2124aafd771 msmtp-1.2.4.ebuild 1158
-MD5 0553a19313bf7527b1bbb9e1539f2021 files/digest-msmtp-1.2.4 63
-MD5 f97e45be1f1dce532bdfb4e3cfb8d1b5 files/digest-msmtp-1.3.2 64
+MD5 2ddb91f18d2e56bd3ffa35a9759b69cd msmtp-1.2.3.ebuild 1220
 MD5 7c72ffdb691739c7e527ec1c06c22efd files/digest-msmtp-1.2.3 63
+MD5 f97e45be1f1dce532bdfb4e3cfb8d1b5 files/digest-msmtp-1.3.2 64
 MD5 384776a579fdf8b01782499a61d77285 files/digest-msmtp-1.3.1 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB2djoQlM6RnzZP+IRAilNAJ9Uq8/sB0Pdeni5PDHJmCvZOjsE5ACghgZN
-rf1egcfWYaNVJ7dQ0cH7lDY=
-=XSTi
------END PGP SIGNATURE-----
+MD5 0553a19313bf7527b1bbb9e1539f2021 files/digest-msmtp-1.2.4 63
+MD5 8dc787ce439ef0dd2f83e809f3ba1668 files/digest-msmtp-1.3.3 64
+MD5 f97e45be1f1dce532bdfb4e3cfb8d1b5 files/digest-msmtp-1.3.2-r1 64
diff --git a/mail-mta/msmtp/files/digest-msmtp-1.3.2-r1 b/mail-mta/msmtp/files/digest-msmtp-1.3.2-r1
new file mode 100644
index 000000000000..90dea5e6b974
--- /dev/null
+++ b/mail-mta/msmtp/files/digest-msmtp-1.3.2-r1
@@ -0,0 +1 @@
+MD5 8461c307baad0928c190269c74fc3133 msmtp-1.3.2.tar.bz2 162756
diff --git a/mail-mta/msmtp/files/mailer.conf b/mail-mta/msmtp/files/mailer.conf
new file mode 100644
index 000000000000..eedd40360899
--- /dev/null
+++ b/mail-mta/msmtp/files/mailer.conf
@@ -0,0 +1,52 @@
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/files/mailer.conf,v 1.1 2005/01/14 15:39:23 slarti Exp $
+# $OpenBSD: mailer.conf,v 1.3 2000/04/06 18:24:19 millert Exp $
+
+# Execute the "real" sendmail program from msmtp, 
+# named /usr/bin/msmtp
+#
+sendmail	/usr/bin/msmtp
+send-mail	/usr/bin/msmtp
+mailq		/usr/bin/msmtp
+newaliases	/usr/bin/msmtp
+
+
+# Execute the "real" sendmail program from ssmtp, 
+# named /usr/sbin/ssmtp
+#
+#sendmail	/usr/sbin/ssmtp
+#send-mail	/usr/sbin/ssmtp
+#mailq		/usr/sbin/ssmtp
+#newaliases	/usr/sbin/ssmtp
+
+# Execute the "real" sendmail program from exim, 
+# named /usr/sbin/exim
+#
+#sendmail	/usr/sbin/exim
+#send-mail	/usr/sbin/exim
+#mailq		/usr/sbin/exim
+#newaliases	/usr/sbin/exim
+#rsmtp		/usr/sbin/exim
+#rmail		/usr/sbin/exim
+#mail		/usr/sbin/exim
+
+# Execute the "real" sendmail program from nullmailer
+# named /usr/sbin/sendmail.nullmailer
+#sendmail	/usr/sbin/sendmail.nullmailer
+#mailq		/usr/bin/mailq.nullmailer
+
+# Execute the "real" sendmail program from postfix, 
+# named /usr/sbin/sendmail.postfix
+#
+#sendmail	/usr/sbin/sendmail.postfix
+#send-mail	/usr/sbin/sendmail.postfix
+#mailq		/usr/sbin/sendmail.postfix
+#newaliases	/usr/sbin/sendmail.postfix
+
+# Execute the "real" sendmail program, named /usr/sbin/sendmail
+#
+#sendmail	/usr/sbin/sendmail.sendmail
+#send-mail	/usr/sbin/sendmail.sendmail
+#mailq		/usr/sbin/sendmail.sendmail
+#newaliases	/usr/sbin/sendmail.sendmail
+#hoststat	/usr/sbin/sendmail.sendmail
+#purgestat	/usr/sbin/sendmail.sendmail
diff --git a/mail-mta/msmtp/msmtp-1.3.2-r1.ebuild b/mail-mta/msmtp/msmtp-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..e7917bc0dd31
--- /dev/null
+++ b/mail-mta/msmtp/msmtp-1.3.2-r1.ebuild
@@ -0,0 +1,59 @@
+# 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 $
+
+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.0.0 )
+		!gnutls?  ( >=dev-libs/openssl-0.9.6 )
+	)
+	sasl? ( >=virtual/gsasl-0.2.3 )
+	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"
+}