Tidy 1.4.0; package.masked revision bump to 1.4.0-r1 for mailer-config stuff

(Portage version: 2.0.51.20-r4)

6 files changed, 87 insertions, 74 deletions

diff --git a/mail-mta/msmtp/ChangeLog b/mail-mta/msmtp/ChangeLog
index 1a2653d2f33b..76b36c1159d4 100644
--- a/mail-mta/msmtp/ChangeLog
+++ b/mail-mta/msmtp/ChangeLog
@@ -1,6 +1,13 @@
 # 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.39 2005/04/17 09:46:38 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.40 2005/04/25 15:22:29 slarti Exp $
+
+*msmtp-1.4.0-r1 (25 Apr 2005)
+
+  25 Apr 2005; Tom Martin <slarti@gentoo.org> files/mailer.conf,
+  msmtp-1.4.0.ebuild, +msmtp-1.4.0-r1.ebuild:
+  Revision bump for mailer-config support (package.masked as of this writing).
+  Also, tidy up 1.4.0 with several cosmetic and stylistic changes.
 
   17 Apr 2005; Tom Martin <slarti@gentoo.org> msmtp-1.4.0.ebuild:
   Adding missing IUSE.
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 61f4e3e025dd..9b920023c867 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,29 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 b3b1117a25274d9464ef43d8a4775a57 ChangeLog 5191
 MD5 a5b4575eec20ddc33b2b764391daf483 msmtp-1.3.5.ebuild 1566
 MD5 776754f08dea1b275f28ce3af9355a4a msmtp-1.3.1.ebuild 1168
 MD5 95ea6a4f095ea0872487cb0551f07a75 msmtp-1.3.2.ebuild 1168
 MD5 f5a4df2680c0585705c19501e1658685 msmtp-1.3.2-r1.ebuild 1568
+MD5 961cd690189d0e071293af40d715c048 msmtp-1.4.0-r1.ebuild 1569
 MD5 cffb24cc7853bae9c6775567bc268f85 msmtp-1.3.6.ebuild 1794
 MD5 9ab5e715dff170b84417d6200a03a084 msmtp-1.3.4.ebuild 1566
 MD5 570c3b91cefa46a71ea570343906ccc3 metadata.xml 247
 MD5 25120ef4d3a708b4c30f53477a2645cb msmtp-1.2.4.ebuild 1157
-MD5 482f104d199568d014494260e451c421 msmtp-1.4.0.ebuild 1812
+MD5 caa413702a3a8288c3986b9c3406fdca msmtp-1.4.0.ebuild 1582
 MD5 7794cb5bda2bdb48124f1eee5fd892d6 files/digest-msmtp-1.3.5 64
 MD5 f97e45be1f1dce532bdfb4e3cfb8d1b5 files/digest-msmtp-1.3.2 64
 MD5 384776a579fdf8b01782499a61d77285 files/digest-msmtp-1.3.1 64
 MD5 0553a19313bf7527b1bbb9e1539f2021 files/digest-msmtp-1.2.4 63
+MD5 5c7a9806b21c53c30d4c0181956371c9 files/digest-msmtp-1.4.0-r1 64
 MD5 dc3649e52d046a8f98fdee06ac34b5a2 files/digest-msmtp-1.3.6 64
 MD5 5c7a9806b21c53c30d4c0181956371c9 files/digest-msmtp-1.4.0 64
-MD5 2aac2039b42e533f8f4986d8aa457fcc files/mailer.conf 1478
+MD5 334d4791b75a8466a9500463cf8884dc files/mailer.conf 279
 MD5 f97e45be1f1dce532bdfb4e3cfb8d1b5 files/digest-msmtp-1.3.2-r1 64
 MD5 c129ac863cc45ec6da5aa7c5a8cc16bc files/digest-msmtp-1.3.4 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCYjEoCHk4+ZoBpvsRAu1oAJ9Jpn0/2UEidjhudLUVKghz2GuwFgCgrJ1Y
-o+HlI9/xrXdWIMcsL16OPao=
-=XMpv
------END PGP SIGNATURE-----
diff --git a/mail-mta/msmtp/files/digest-msmtp-1.4.0-r1 b/mail-mta/msmtp/files/digest-msmtp-1.4.0-r1
new file mode 100644
index 000000000000..60348e036cb0
--- /dev/null
+++ b/mail-mta/msmtp/files/digest-msmtp-1.4.0-r1
@@ -0,0 +1 @@
+MD5 07af3a34f61cb533ab45d35e3c7163fd msmtp-1.4.0.tar.bz2 404850
diff --git a/mail-mta/msmtp/files/mailer.conf b/mail-mta/msmtp/files/mailer.conf
index eedd40360899..53e1ebed5a7b 100644
--- a/mail-mta/msmtp/files/mailer.conf
+++ b/mail-mta/msmtp/files/mailer.conf
@@ -1,52 +1,8 @@
-# $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 $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/files/mailer.conf,v 1.2 2005/04/25 15:22:29 slarti 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.4.0-r1.ebuild b/mail-mta/msmtp/msmtp-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..eab7d19ec967
--- /dev/null
+++ b/mail-mta/msmtp/msmtp-1.4.0-r1.ebuild
@@ -0,0 +1,61 @@
+# 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.0-r1.ebuild,v 1.1 2005/04/25 15:22:29 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="~x86 ~ppc ~amd64 ~sparc ~ppc64 ~alpha"
+IUSE="ssl gnutls sasl mailwrapper doc"
+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 )"
+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) \
+		${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 /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
+}
diff --git a/mail-mta/msmtp/msmtp-1.4.0.ebuild b/mail-mta/msmtp/msmtp-1.4.0.ebuild
index 1e1ba3d493b7..ee0ea54f2ab2 100644
--- a/mail-mta/msmtp/msmtp-1.4.0.ebuild
+++ b/mail-mta/msmtp/msmtp-1.4.0.ebuild
@@ -1,23 +1,23 @@
 # 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.0.ebuild,v 1.4 2005/04/17 09:46:38 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.0.ebuild,v 1.5 2005/04/25 15:22:29 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"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~ppc64 ~alpha"
 DEPEND="virtual/libc
 	dev-util/pkgconfig
 	ssl? (
-		gnutls?	( >=net-libs/gnutls-1.2.0 )
+		gnutls? ( >=net-libs/gnutls-1.2.0 )
 		!gnutls?  ( >=dev-libs/openssl-0.9.6 )
 	)
-	sasl? ( >=virtual/gsasl-0.2.4 )
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
+	sasl? ( >=virtual/gsasl-0.2.4 )"
+RDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
 	!mailwrapper? ( !virtual/mta )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~ppc64 ~alpha"
 PROVIDE="virtual/mta"
 
 src_compile () {
@@ -40,7 +40,7 @@ src_compile () {
 }
 
 src_install () {
-	make DESTDIR=${D} docdir=${D}/usr/share/doc docdirname=${P} install || die "install failed"
+	make DESTDIR=${D} install || die "install failed"
 
 	if use mailwrapper; then
 		insinto /etc/mail
@@ -48,17 +48,13 @@ src_install () {
 	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 \
-		doc/msmtprc-system.example doc/msmtprc-user.example \
-	|| die "dodoc failed"
+	dodoc AUTHORS ChangeLog NEWS README* THANKS \
+		doc/{Mutt+msmtp.txt,msmtprc*} || die "dodoc failed"
 
-	if use doc; then
+	if use doc ; then
 		dohtml doc/msmtp.html || die "dohtml failed"
-		insinto /usr/share/doc/${PF}
-		doins doc/msmtp.pdf
+		dodoc doc/msmtp.pdf
 	fi
 }