Bump, three more regression patches fixing a block when opening an MH folder, a segfault on certain search patterns and a segfault after 'next' when the previous search pattern was invalid

Package-Manager: portage-2.2.00.14200-prefix/cvs/Darwin powerpc

6 files changed, 339 insertions, 2 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index c670f5523e39..dbab86789188 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for mail-client/mutt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.152 2009/09/07 18:36:17 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.153 2009/09/07 19:12:25 grobian Exp $
+
+*mutt-1.5.20-r5 (07 Sep 2009)
+
+  07 Sep 2009; Fabian Groffen <grobian@gentoo.org> +mutt-1.5.20-r5.ebuild,
+  +files/mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch,
+  +files/mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch,
+  +files/mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch:
+  Bump, three more regression patches fixing a block when opening an MH
+  folder, a segfault on certain search patterns and a segfault after 'next'
+  when the previous search pattern was invalid
 
   07 Sep 2009; Fabian Groffen <grobian@gentoo.org> -mutt-1.5.15-r2.ebuild,
   -files/mutt-1.5.15-parallel-make.patch, -mutt-1.5.20-r1.ebuild,
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 2863894bed16..d71865fc21ea 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -9,6 +9,7 @@ AUX mutt-1.5.19-libgnutls-test-15c662a95b91.patch 9187 RMD160 b5d981c5aeb66f9fc1
 AUX mutt-1.5.19-mutt-gnutls-7d0583e0315d-0b13183e40e0.patch 12414 RMD160 6759b26ee028fc9d5a0f5d6b7d56fd4c1c879a04 SHA1 819146a1650035ee2a9016f01f0e2d11b8c11896 SHA256 92033adfb057818a7dcae8b02b91df8a62e7d52c339268caa4a38149ac28bc45
 AUX mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch 6968 RMD160 ea63c5149d78d2790bfbfbb9a5d2499e179c8ae1 SHA1 d23cab55003763d79475ef4eb95c10504dad323f SHA256 54da63a9ce41c3704a3b96288de7b8d24ef1305a9b27306c8178e900a81f196b
 AUX mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch 1197 RMD160 59f3df7d7f299e90e4c0080d1cc98dcc3a82abfb SHA1 8deb3b88ff64f31ed1ce027de74e76be5a485147 SHA256 4790449de5476f570e95ebdec9db59afd50dd7507485d22d3848ad7bd1327b20
+AUX mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch 484 RMD160 444125b0ec6c56a90bd23586ffd28b96108c0b28 SHA1 0f1fb90b5cfa0d29e04bdd00273de7c90d425241 SHA256 9cf9b6d5410e82d83b650c9568cf9c2428ae580001b512e12c5a3482468c86fb
 AUX mutt-1.5.20-gpgme-1.2.0.patch 623 RMD160 0387025c571723f9ebde284789c65464cf0c2da4 SHA1 230af7e00e06a41f0024b8c6e19bd9d5b208511c SHA256 9e69e53cb3013a379f85e6dcea0550c4ec8582ea1f36a83c6a0ad95828164551
 AUX mutt-1.5.20-gpgme-keys-d41e043fa775.patch 589 RMD160 99b4b44459952afa55db43c5e30f204b3cae797e SHA1 432938b1876fdb95c1bfbd0ab79f6ae8430fe5e9 SHA256 9ea0850343eb54be14f58532bf4bf2a6e5ad970c43ece56e185d693eb50966e8
 AUX mutt-1.5.20-hcache-restore-address-848f08512bf3.patch 1150 RMD160 2df8927ac9b470fa6be814a66ef1dcfcb8cbdf9c SHA1 1423af5422eda09c7c7d5590f19318f7721d9e1d SHA256 86d983f4b61a4449ae148a24dc7ba1749a4b0b5848556dee5de87589a6e39cc3
@@ -20,7 +21,9 @@ AUX mutt-1.5.20-leave-mailbox-no-new-mail-118b8fef8aae.patch 2209 RMD160 e5cd50a
 AUX mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch 2324 RMD160 a71d7fdebcb409947f664b96f1e7d808974f5101 SHA1 035cfaa9290121b3c6c7e57fbda94495239162d3 SHA256 adc78114cc72efb181f20050b24358d2b3959bd78b8795c8245d6049e00ab5fa
 AUX mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch 1502 RMD160 bf7503b9c10fc903b31f85ee3f38efe57fa5489a SHA1 de44ba3e404bb44ea57a663938b91a0c9c51fb5b SHA256 701fd49be77c97ca53b1cfcf9e6a2c0afb37793a3827d453d45c4587cdd4ba41
 AUX mutt-1.5.20-mhs-flags-leak-9f3053f75f27.patch 436 RMD160 26a2be74db7ec3ac72ab579fe42709ecae9b28e1 SHA1 1a87cb97e744911bb862a7e12f0c00295a0a1666 SHA256 d27054521019fb938fadd0d292bc6c4be094823683ea4735bf4c43c238e919f4
+AUX mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch 791 RMD160 b4e91bb9b82be8768f738fbb0d7a8a49ef1d23b1 SHA1 4bb8b95dc810e6de81c2b80a1bf137015f29ab02 SHA256 a2ab67cf1ce9086e8ba1cc7c6fc674fee3992fb468f78712a066b98530a2dc4f
 AUX mutt-1.5.20-propagate-mh_read_sequences-2fc9348684fe.patch 725 RMD160 9125bf147ba4be50821d38301af361844e176b2e SHA1 6f11d93ac397b15d01fe6ede010a29998743356f SHA256 633cbff8666d49e1a02c348e27f7cec1046460581d3af1f5c73905ba6ff4a564
+AUX mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch 634 RMD160 c7eb6d6977b8b43b5ef84cb5dede58bb5018a02c SHA1 381bca1965f0fe2a13429f68872901dfcfe5f07f SHA256 b25f814ec615e5240fc2d449b0b41e3d20d6c862d0131bcc1d0e3d876244470b
 AUX mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch 2211 RMD160 730cd88c1cfaf83d9eeeb1f2ed7d58b2eb43b85f SHA1 e6ce5e3b0ea1a9885a53ba93fc43ce8a17654287 SHA256 838f9734ba360936f99e06b25eb14425870ea788d97769ee2a0c57bd98e42468
 AUX mutt-1.5.20-tab-subject-questionmark-298194c414f0-cff8e8ce4327.patch 1131 RMD160 5286dc8809747291e31e1c1a3801ad5efbdc285b SHA1 fe3cc48c0592b5f7775db8f46a5fccfff4a68895 SHA256 8cec9af4bc073faacfec09331fc928ddb9c0b98be11da5c5022fc1af2bdece5f
 AUX mutt-1.5.20-ungroup-command-77ac8b5c2be6.patch 14089 RMD160 e26623f79a4ecf5d7a84cd94159e01ad8bfb8b42 SHA1 2f3811d9f85ac2764c33cd1aa4f852dc1b56d017 SHA256 830bb141fbfe42226f12af508d6f4d7fa2904213386695967c488a8a89f8b8ab
@@ -37,5 +40,6 @@ DIST patch-1.5.20.sidebar.20090619.txt 53335 RMD160 4c693b100a320d11ea94aedb75cf
 EBUILD mutt-1.5.16.ebuild 4989 RMD160 2a9ae3ece8f56692e0077b7b3940e607c79f2a14 SHA1 a79646fbfce1e85ecc2f8aaa4728e3c7303185f0 SHA256 55a70c2bb8f144549e6a12a4ba6bcb8796202d4f7be25fb809fefa2848615368
 EBUILD mutt-1.5.19-r1.ebuild 5933 RMD160 67a206bce8e2c652216cab13b619adfa2924f624 SHA1 07f6fc64eed63a635dc92f56f53687c66b8def13 SHA256 13c9eb5b1e3d933a4ede446d4779202f47ec6695dc4ecbd7fef31f78c67e8dfc
 EBUILD mutt-1.5.20-r4.ebuild 8445 RMD160 e80d48d7db68db16826b667279ead5d967fb9a38 SHA1 2db5e8a2553c1a6beb9ddf1235cc7429291fbdc0 SHA256 1ca869c0dea981cb33b4b9dd5aa40785785bc714482ee2c6bdfcec7b1d0fbd54
-MISC ChangeLog 34480 RMD160 955bea6f270d9baabc51a51689ef6a5e9191a69a SHA1 70f5bcd385e53629a73c20e087d07209e37e9630 SHA256 299ecd22c15b48066a7787ed44b7b4b7167983ea0033b050233b216bf620cdfc
+EBUILD mutt-1.5.20-r5.ebuild 8672 RMD160 e6637abe65926a657647430f839f6441e82578dd SHA1 b294c377d5926da98b4dfb8625d96fedb6582558 SHA256 b7f016d8657da1b1733c4fd66084c670538c62e275d08457865f600723aa19ae
+MISC ChangeLog 34968 RMD160 055dc00a34f0a35c0cc8ad871e7f9a2b3d4688d4 SHA1 9391df36797d6e236ae1c13613760302a1e4bf6c SHA256 5a09680bebd8f125b3a8d25fe04be8e330c99397bd199b05d05283982f04290a
 MISC metadata.xml 627 RMD160 e3a3709dcc01a6b9db15ac7836c75f8dbe3456ea SHA1 92be48491c090c3e6968812b58dde85961af3b8f SHA256 c30f8f2126be6b11b3e0d0e2f6413ce7ab2ca2613856f558bec7689e5a9ada0b
diff --git a/mail-client/mutt/files/mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch b/mail-client/mutt/files/mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch
new file mode 100644
index 000000000000..b0a390f2f262
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch
@@ -0,0 +1,16 @@
+http://dev.mutt.org/trac/ticket/3312
+http://dev.mutt.org/trac/changeset/14bb498c6a1c
+
+Fix MH parsing, fixes [0698e8195545]. Closes #3312
+
+Index: mh.c
+===================================================================
+--- mh.c (revision 5999:2fc9348684fe)
++++ mh.c (revision 6005:14bb498c6a1c)
+@@ -147,5 +147,5 @@
+   {
+     *p++ = '\0';
+-    if (mutt_atoi (t, first) < 0 || mutt_atoi (t, last) < 0)
++    if (mutt_atoi (t, first) < 0 || mutt_atoi (p, last) < 0)
+       return -1;
+   }
diff --git a/mail-client/mutt/files/mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch b/mail-client/mutt/files/mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch
new file mode 100644
index 000000000000..18b84a59b535
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch
@@ -0,0 +1,23 @@
+http://dev.mutt.org/trac/ticket/3315
+http://dev.mutt.org/trac/changeset/6a08a5244d60
+
+Clear last search pattern if it's invalid. Closes #3315.
+
+We keep both, the string version and compiled version around
+for search-next; however, in case of parsing errors we dropped
+only the compiled version and not the string one making the
+code attempting to perform a search using a NULL pattern.
+
+Index: pattern.c
+===================================================================
+--- pattern.c (revision 6018:053ef7bbaa72)
++++ pattern.c (revision 6019:6a08a5244d60)
+@@ -1437,6 +1437,7 @@
+       err.dsize = sizeof (error);
+       if ((SearchPattern = mutt_pattern_comp (temp, M_FULL_MSG, &err)) == NULL)
+-       {
++      {
+ 	mutt_error ("%s", error);
++	LastSearch[0] = '\0';
+ 	return (-1);
+       }
diff --git a/mail-client/mutt/files/mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch b/mail-client/mutt/files/mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch
new file mode 100644
index 000000000000..df8d99e8fb6a
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch
@@ -0,0 +1,22 @@
+http://dev.mutt.org/trac/ticket/3314
+http://dev.mutt.org/trac/changeset/053ef7bbaa72
+
+Bail on missing pattern modifiers at end of pattern. Closes #3314.
+
+Index: pattern.c
+===================================================================
+--- pattern.c (revision 5989:77ac8b5c2be6)
++++ pattern.c (revision 6018:053ef7bbaa72)
+@@ -824,5 +824,11 @@
+       case '=':
+       case '~':
+-	if (*(ps.dptr + 1) == '(') 
++	if (!*(ps.dptr + 1))
++	{
++	  snprintf (err->data, err->dsize, _("missing pattern: %s"), ps.dptr);
++	  mutt_pattern_free (&curlist);
++	  return NULL;
++	}
++	if (*(ps.dptr + 1) == '(')
+         {
+ 	  ps.dptr ++; /* skip ~ */
diff --git a/mail-client/mutt/mutt-1.5.20-r5.ebuild b/mail-client/mutt/mutt-1.5.20-r5.ebuild
new file mode 100644
index 000000000000..7e252baeb265
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.20-r5.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r5.ebuild,v 1.1 2009/09/07 19:12:25 grobian Exp $
+
+inherit eutils flag-o-matic autotools
+
+PATCHSET_REV="-r3"
+
+# note: latest sidebar patches can be found here:
+# http://www.lunar-linux.org/index.php?option=com_content&task=view&id=44
+SIDEBAR_PATCH_N="patch-1.5.20.sidebar.20090619.txt"
+
+DESCRIPTION="a small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org"
+SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
+	!vanilla? (
+		!sidebar? (
+			mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
+			http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
+		)
+	)
+	sidebar? (
+		http://www.lunar-linux.org/~tchan/mutt/${SIDEBAR_PATCH_N}
+	)"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl vanilla"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+RDEPEND=">=sys-libs/ncurses-5.2
+	qdbm?    ( dev-db/qdbm )
+	!qdbm?   (
+		gdbm?  ( sys-libs/gdbm )
+		!gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
+	)
+	imap?    (
+		gnutls?  ( >=net-libs/gnutls-1.0.17 )
+		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	pop?     (
+		gnutls?  ( >=net-libs/gnutls-1.0.17 )
+		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	smtp?     (
+		gnutls?  ( >=net-libs/gnutls-1.0.17 )
+		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	idn?     ( net-dns/libidn )
+	gpg?   ( >=app-crypt/gpgme-0.9.0 )
+	smime?   ( >=dev-libs/openssl-0.9.6 )
+	app-misc/mime-types"
+DEPEND="${RDEPEND}
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| ( www-client/lynx www-client/w3m www-client/elinks )
+	)"
+
+PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
+
+src_unpack() {
+	unpack ${A//${SIDEBAR_PATCH_N}}
+	cd "${S}"
+
+	# this patch is non-generic and only works because we use a sysconfdir
+	# different from the one used by the mailbase ebuild
+	use prefix && epatch "${FILESDIR}"/mutt-1.5.13-prefix-mailcap.patch
+
+	epatch "${FILESDIR}"/mutt-1.5.18-bdb-prefix.patch # fix bdb detection
+	epatch "${FILESDIR}"/mutt-1.5.18-interix.patch
+	built_with_use sys-libs/ncurses unicode && \
+		epatch "${FILESDIR}"/mutt-1.5.18-solaris-ncurses-chars.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-gpgme-1.2.0.patch
+	# post-release hot-fixes
+	epatch "${FILESDIR}"/mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-header-weeding-f40de578e8ed.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-tab-subject-questionmark-298194c414f0-cff8e8ce4327.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-leave-mailbox-no-new-mail-118b8fef8aae.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-gpgme-keys-d41e043fa775.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-mhs-flags-leak-9f3053f75f27.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-hcache-restore-address-848f08512bf3.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-ungroup-command-77ac8b5c2be6.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-propagate-mh_read_sequences-2fc9348684fe.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-hcache-uidvalidity-size-fix-a2a4286491b4.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch
+
+	# patch version string for bug reports
+	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \
+		muttlib.c || die "failed patching in Gentoo version"
+
+	if use !vanilla && use !sidebar ; then
+		use nntp || rm "${PATCHDIR}"/06-nntp.patch
+		for p in "${PATCHDIR}"/*.patch ; do
+			epatch "${p}"
+		done
+	fi
+
+	if use sidebar ; then
+		use vanilla || \
+			ewarn "The sidebar patch is only applied to a vanilla mutt tree."
+		epatch "${DISTDIR}"/${SIDEBAR_PATCH_N}
+	fi
+
+	AT_M4DIR="m4" eautoreconf
+
+	# the configure script contains some "cleverness" whether or not to setgid
+	# the dotlock program, resulting in bugs like #278332
+	sed -i -e 's/@DOTLOCK_GROUP@//' \
+		Makefile.in || die "sed failed"
+
+	# don't just build documentation (lengthy process, with big dependencies)
+	if use !doc ; then
+		sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
+	fi
+}
+
+src_compile() {
+	declare myconf="
+		$(use_enable nls) \
+		$(use_enable gpg gpgme) \
+		$(use_enable imap) \
+		$(use_enable pop) \
+		$(use_enable smtp) \
+		$(use_enable crypt pgp) \
+		$(use_enable smime) \
+		$(use_enable debug) \
+		$(use_with idn) \
+		--with-curses \
+		--sysconfdir="${EPREFIX}"/etc/${PN} \
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PN}-${PVR} \
+		--with-regex \
+		--enable-nfs-fix --enable-external-dotlock \
+		$(use_with !nntp mixmaster) \
+		--with-exec-shell=${EPREFIX}/bin/sh"
+
+	case $CHOST in
+		*-darwin7)
+			# locales are broken on Panther
+			myconf="${myconf} --enable-locales-fix --without-wc-funcs"
+			myconf="${myconf} --disable-fcntl --enable-flock"
+		;;
+		*-solaris*)
+			# Solaris has no flock in the standard headers
+			myconf="${myconf} --enable-fcntl --disable-flock"
+		;;
+		*)
+			myconf="${myconf} --disable-fcntl --enable-flock"
+		;;
+	esac
+
+	# See Bug #22787
+	unset WANT_AUTOCONF_2_5 WANT_AUTOCONF
+
+	# mutt prioritizes gdbm over bdb, so we will too.
+	# hcache feature requires at least one database is in USE.
+	if use qdbm; then
+		myconf="${myconf} --enable-hcache \
+		--with-qdbm --without-gdbm --without-bdb"
+	elif use gdbm ; then
+		myconf="${myconf} --enable-hcache \
+			--without-qdbm --with-gdbm --without-bdb"
+	elif use berkdb; then
+		myconf="${myconf} --enable-hcache \
+			--without-gdbm --without-qdbm --with-bdb"
+	else
+		myconf="${myconf} --disable-hcache \
+			--without-qdbm --without-gdbm --without-bdb"
+	fi
+
+	# there's no need for gnutls, ssl or sasl without socket support
+	if use pop || use imap || use smtp ; then
+		if use gnutls; then
+			myconf="${myconf} --with-gnutls"
+		elif use ssl; then
+			myconf="${myconf} --with-ssl"
+		fi
+		# not sure if this should be mutually exclusive with the other two
+		myconf="${myconf} $(use_with sasl)"
+	else
+		myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
+	fi
+
+	if use mbox; then
+		myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
+	else
+		myconf="${myconf} --with-homespool=Maildir"
+	fi
+
+	if use !vanilla && use !sidebar ; then
+		# rr.compressed patch
+		myconf="${myconf} --enable-compressed"
+
+		# nntp patch applied conditionally, so avoid QA warning when doing
+		# --disable-nntp while patch not being applied, bug #262069
+		use nntp && myconf="${myconf} --enable-nntp"
+	fi
+
+	econf ${myconf} || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	local ED=${ED-${D}}
+	make DESTDIR="${D}" install || die "install failed"
+	find "${ED}"/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip
+	if use mbox; then
+		insinto /etc/mutt
+		newins "${FILESDIR}"/Muttrc.mbox Muttrc
+	else
+		insinto /etc/mutt
+		doins "${FILESDIR}"/Muttrc
+	fi
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+	rm "${ED}"/etc/${PN}/mime.types
+	dosym /etc/mime.types /etc/${PN}/mime.types
+
+	# A man-page is always handy
+	if use !doc; then
+		cp doc/mutt.man mutt.1
+		cp doc/muttbug.man flea.1
+		doman mutt.1 flea.1
+	fi
+
+	if use !prefix ; then
+		fowners root:mail /usr/bin/mutt_dotlock
+		fperms g+s /usr/bin/mutt_dotlock
+	fi
+
+	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+pkg_setup() {
+	if ! use gpg &&
+		has_version "<${CATEGORY}/${PN}-1.5.20-r2" &&
+		built_with_use ${CATEGORY}/${PN} gpgme ;
+	then
+		ewarn 'The "gpgme" USE-flag has been changed into "gpg".  You'
+		ewarn 'previously had "gpgme" set, and you most likely want to'
+		ewarn 'enable "gpg" instead, right now, to obtain equivalent behaviour.'
+	fi
+}
+
+pkg_postinst() {
+	echo
+	elog "If you are new to mutt you may want to take a look at"
+	elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
+	elog "   http://www.gentoo.org/doc/en/guide-to-mutt.xml"
+	echo
+}