Support mailwrapper properly.

4 files changed, 20 insertions, 25 deletions

diff --git a/mail-mta/esmtp/ChangeLog b/mail-mta/esmtp/ChangeLog
index 4c70725b53c3..12219bd2b098 100644
--- a/mail-mta/esmtp/ChangeLog
+++ b/mail-mta/esmtp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/esmtp
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/esmtp/ChangeLog,v 1.1 2004/09/03 00:54:43 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/esmtp/ChangeLog,v 1.2 2004/09/03 06:56:42 ticho Exp $
+
+*esmtp-0.5.0-r1 (03 Sep 2004)
+
+  03 Sep 2004; Andrej Kacian <ticho@gentoo.org> +esmtp-0.5.0-r1.ebuild,
+  -esmtp-0.5.0.ebuild:
+  Support mailwrapper correctly by adding mailwrapper to IUSE and modifying
+  ebuild code accordingly.
 
 *esmtp-0.5.0 (03 Sep 2004)
 
diff --git a/mail-mta/esmtp/Manifest b/mail-mta/esmtp/Manifest
index 2dda8a9ba33c..89b4fd924230 100644
--- a/mail-mta/esmtp/Manifest
+++ b/mail-mta/esmtp/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 1f2dcfd8da14b0c2042da1c05d8c8c7e ChangeLog 449
 MD5 2936f5fc2ca8837d1cfe4fd0daba2c53 esmtp-0.5.0.ebuild 1109
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 857717b0635a58809d92410e829cd8c0 esmtp-0.5.0-r1.ebuild 1108
+MD5 c99a26bd6ed6b3b450d77f9c3ef0e823 files/digest-esmtp-0.5.0-r1 64
 MD5 c99a26bd6ed6b3b450d77f9c3ef0e823 files/digest-esmtp-0.5.0 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBN8Dc10xuJSrg3/sRAhtIAJ4yXQl0Q1k3+ug3bF45LlAc27QRIwCbBRco
-eTCriMo7gdea5/WyCwaWACw=
-=2kSu
------END PGP SIGNATURE-----
diff --git a/mail-mta/esmtp/esmtp-0.5.0.ebuild b/mail-mta/esmtp/esmtp-0.5.0-r1.ebuild
index 20000d40c61a..fc4638f5fa9a 100644
--- a/mail-mta/esmtp/esmtp-0.5.0.ebuild
+++ b/mail-mta/esmtp/esmtp-0.5.0-r1.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/esmtp/esmtp-0.5.0.ebuild,v 1.1 2004/09/03 00:54:43 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/esmtp/esmtp-0.5.0-r1.ebuild,v 1.1 2004/09/03 06:56:42 ticho Exp $
 
 DESCRIPTION="esmtp is a user configurable relay-only Mail Transfer Agent (MTA) with a sendmail compatible syntax"
 HOMEPAGE="http://esmtp.sourceforge.net/"
@@ -8,26 +8,22 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
+IUSE="mailwrapper"
 DEPEND="virtual/glibc
 	net-libs/libesmtp
 	dev-libs/openssl"
 RDEPEND="${DEPEND}
-	>=net-mail/mailwrapper-0.2"
+	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
+	!mailwrapper? ( !virtual/mta )"
 
 src_install() {
 	make DESTDIR=${D} install || die "einstall failed"
 	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
 
-	# We install sendmail binary to be compatible with mailwrapper
-	mv ${D}/usr/sbin/sendmail ${D}/usr/sbin/sendmail.esmtp
-	mv ${D}/usr/lib/sendmail ${D}/usr/lib/sendmail.esmtp
-}
-
-pkg_postinst() {
-	echo
-	einfo "esmtp on Gentoo supports mailwrapper (\`man mailwrapper\` for more info)."
-	einfo "If you want to use esmtp's /usr/sbin/sendmail as your MTA, please set"
-	einfo "up your mailer.conf accordingly."
-	echo
+	if use mailwrapper
+	then
+		# We install sendmail binary to be compatible with mailwrapper
+		mv ${D}/usr/sbin/sendmail ${D}/usr/sbin/sendmail.esmtp
+		mv ${D}/usr/lib/sendmail ${D}/usr/lib/sendmail.esmtp
+	fi
 }
diff --git a/mail-mta/esmtp/files/digest-esmtp-0.5.0 b/mail-mta/esmtp/files/digest-esmtp-0.5.0-r1
index 2dc21bae2bdd..2dc21bae2bdd 100644
--- a/mail-mta/esmtp/files/digest-esmtp-0.5.0
+++ b/mail-mta/esmtp/files/digest-esmtp-0.5.0-r1