Added mail.rc to resolved bug #37302. It looks like people using postfix as virtual/mta having problem with --disable-sendmail, add logic to enable-sendmail if postfix is MTA, resolved bug #44249.

4 files changed, 37 insertions, 22 deletions

diff --git a/net-mail/mailutils/ChangeLog b/net-mail/mailutils/ChangeLog
index 136354da362b..21746e9a369a 100644
--- a/net-mail/mailutils/ChangeLog
+++ b/net-mail/mailutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/mailutils
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/ChangeLog,v 1.7 2004/07/09 05:11:02 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/ChangeLog,v 1.8 2004/07/11 05:14:07 langthang Exp $
+
+  10 Jul 2004; Tuan Van <langthang@gentoo.org> mailutils-0.5.ebuild:
+  Added mail.rc to resolved bug #37302.
+  It looks like people using postfix as virtual/mta having problem with 
+  --disable-sendmail, add logic to enable-sendmail if postfix is MTA, 
+  resolved bug #44249.
 
 *mailutils-0.5 (08 Jul 2004)
 
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 9f5de7d4f64d..43bd504176a0 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,10 +1,11 @@
 MD5 d7d0b811d715eb8533f026fec453d0b8 mailutils-0.3.1.ebuild 1179
 MD5 dc4d698875e5ec19cf4cca0c42deda1a mailutils-0.3.1-r1.ebuild 1962
 MD5 4c18aa007bf81287a40efadbaa77fd30 mailutils-0.3.ebuild 1176
-MD5 5848348f003ddce9d02b54ccf2614cc4 mailutils-0.5.ebuild 1939
-MD5 75ddf51bcf804e2d392ccc4f0dfe02a9 ChangeLog 1232
+MD5 d412d2ff6dea6b489e11f78aa49f2cb4 mailutils-0.5.ebuild 2229
+MD5 d27f9949be57d83135e6aad358a0520f ChangeLog 1509
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 d2daee4409fb153be65f6189e96e7eeb files/digest-mailutils-0.3.1 69
+MD5 fd1cc8efc636daa433509675f4216d3e files/mail.rc 174
 MD5 03c7a853d2d764ed51622770eaeabb81 files/mailutils-0.3.1-mh-Makefile.in.patch 557
 MD5 57cb849f954ba9a185a41751d998d0fd files/mailutils-0.5-mh-Makefile.in.patch 536
 MD5 d2daee4409fb153be65f6189e96e7eeb files/digest-mailutils-0.3.1-r1 69
diff --git a/net-mail/mailutils/files/mail.rc b/net-mail/mailutils/files/mail.rc
new file mode 100644
index 000000000000..2a34b7cc1ce9
--- /dev/null
+++ b/net-mail/mailutils/files/mail.rc
@@ -0,0 +1,4 @@
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/files/mail.rc,v 1.1 2004/07/11 05:14:07 langthang Exp $
+# Default mail options, change to suit yourself.
+set ask askcc append dot save crt
+ignore Received Message-Id Resent-Message-Id Status Mail-From Return-Path Via
diff --git a/net-mail/mailutils/mailutils-0.5.ebuild b/net-mail/mailutils/mailutils-0.5.ebuild
index 0203ea00df06..d287bf3387fa 100644
--- a/net-mail/mailutils/mailutils-0.5.ebuild
+++ b/net-mail/mailutils/mailutils-0.5.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/net-mail/mailutils/mailutils-0.5.ebuild,v 1.1 2004/07/09 05:11:02 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/mailutils-0.5.ebuild,v 1.2 2004/07/11 05:14:07 langthang Exp $
 
 inherit eutils
 DESCRIPTION="A useful collection of mail servers, clients, and filters."
@@ -9,14 +9,15 @@ SRC_URI="http://ftp.gnu.org/gnu/mailutils/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
-IUSE="nls pam mysql postgres gdbm"
+IUSE="mailwrapper nls pam mysql postgres gdbm"
 DEPEND="!mail-client/mailx
 	!mail-client/nmh
 	dev-util/guile
 	gdbm? ( sys-libs/gdbm )
 	mysql? ( dev-db/mysql )
 	postgres? ( dev-db/postgresql )
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+	virtual/mta"
 
 src_unpack() {
 	unpack ${A}
@@ -42,30 +43,33 @@ src_compile() {
 		exit 1
 	fi
 
-	local myconf=""
+	local myconf="--localstatedir=/var --sharedstatedir=/var --enable-mh-utils"
 
 	# bug in autoconf logic treats both --with and --without as set,
 	# so we cannot do use_with
 	use mysql && myconf="${myconf} --with-mysql"
 	use postgres && myconf="${myconf} --with-postgres"
 
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--infodir=/usr/share/info \
-		--sharedstatedir=/var \
-		--mandir=/usr/share/man \
-		--disable-sendmail \
-		--enable-mh-utils \
-		`use_enable nls` \
-		`use_enable pam` \
-		`use_with gdbm` \
-		${myconf} || die "./configure failed"
-	emake || die
+	# do not disable-sendmail for postfix user w/o mailwrapper, bug #44249.
+	mymta="$(best_version virtual/mta | awk -F/ '{print $2}' | awk -F- '{print $1}')"
+	if ! use mailwrapper && [ "$mymta" == "postfix" ]; then
+		myconf="${myconf} --enable-sendmail"
+		einfo "My MTA is: $mymta"
+		einfo "enable-sendmail"
+	else
+		myconf="${myconf} --disable-sendmail"
+		einfo "My MTA is: $mymta"
+		einfo "disable-sendmail"
+	fi
+
+	myconf="${myconf} $(use_enable nls) $(use_enable pam) $(use_enable gdbm)"
+	econf ${myconf} || die "configure failed"
+	emake || die "compile failed"
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
+	# mail.rc stolen from mailx, resolve bug #37302.
+	insinto /etc
+	doins "${FILESDIR}/mail.rc"
 }