Fix bug 52008 by bumping mutt-cvs-maildir-header-cache from .15 to .16 -- thanks to khai for debugging

10 files changed, 15 insertions, 340 deletions

diff --git a/net-mail/mutt/ChangeLog b/net-mail/mutt/ChangeLog
index c62b226e296f..c67bf4c9e9db 100644
--- a/net-mail/mutt/ChangeLog
+++ b/net-mail/mutt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/mutt
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mutt/ChangeLog,v 1.59 2004/05/25 03:46:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mutt/ChangeLog,v 1.60 2004/05/26 03:22:30 agriffis Exp $
+
+*mutt-1.5.6-r2 (25 May 2004)
+
+  25 May 2004; Aron Griffis <agriffis@gentoo.org> -mutt-1.5.4-r1.ebuild,
+  -mutt-1.5.4.ebuild, -mutt-1.5.5.1.ebuild, -mutt-1.5.6-r1.ebuild,
+  +mutt-1.5.6-r2.ebuild:
+  Fix bug 52008 by bumping mutt-cvs-maildir-header-cache from .15 to .16 --
+  thanks to khai for debugging
 
   24 May 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6-r1.ebuild,
   mutt-1.5.6.ebuild:
diff --git a/net-mail/mutt/Manifest b/net-mail/mutt/Manifest
index eb4f32a48580..33443927cab0 100644
--- a/net-mail/mutt/Manifest
+++ b/net-mail/mutt/Manifest
@@ -1,18 +1,12 @@
-MD5 fdf6ddf84796e19711e24132a425d40a mutt-1.5.6-r1.ebuild 4845
-MD5 ddc50e3033c4b3c8a3e120b2c488189f mutt-1.5.4-r1.ebuild 2860
-MD5 8213ea324e49d3962610f1dacac7bfc4 mutt-1.5.4.ebuild 2615
-MD5 f6c046d879f873d0425f4dbc77902506 mutt-1.5.5.1.ebuild 2945
+MD5 762a1135ce2b447835634cbeb127c745 mutt-1.5.6-r2.ebuild 4524
 MD5 e170aef6acb390b5badf3867a6f82f08 mutt-1.4.2.1.ebuild 3376
 MD5 106c594080a2ea37facfa02e23ad2601 mutt-1.5.6.ebuild 4229
 MD5 605e5ec9eae51dde64161a765645c9f4 ChangeLog 8875
 MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253
 MD5 b2b515e96b060771a00646405c620755 files/Muttrc 678
-MD5 2aed1ac688ef4a607857a75422066740 files/digest-mutt-1.5.4 280
 MD5 6cba9546cde7ee8a8e67b44d27b62366 files/digest-mutt-1.5.6 367
 MD5 30ce590d0284ffb0896857714c6a47d4 files/Muttrc.mbox 486
-MD5 2aed1ac688ef4a607857a75422066740 files/digest-mutt-1.5.4-r1 280
-MD5 5ed875973ff5e3c4e82c4cf58d298efc files/digest-mutt-1.5.6-r1 443
+MD5 2d3c784a38fcc6a0bc3aea7a54fa23fb files/digest-mutt-1.5.6-r2 443
 MD5 cae412df424c3f499c539c93ebd02e48 files/digest-mutt-1.4.2.1 292
-MD5 245167f81a90f23cdecb1a55dcc7dd1a files/digest-mutt-1.5.5.1 217
 MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531
 MD5 25e242fd402f42d5bd5230dbe9ea68a6 files/slang.patch 493
diff --git a/net-mail/mutt/files/digest-mutt-1.5.4 b/net-mail/mutt/files/digest-mutt-1.5.4
deleted file mode 100644
index 7567f1f13a51..000000000000
--- a/net-mail/mutt/files/digest-mutt-1.5.4
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 3d4088f25892af6d71148eef26604f33 mutt-1.5.4i.tar.gz 2788104
-MD5 e2c0b3bb0be0e19a4a6cda01078e3eae patch-1.5.4.rr.compressed.1.gz 14463
-MD5 cecd25d4caadc4055ff7658e2f31f8aa mutt-1.5.4i-ja.1.tar.gz 80299
-MD5 56bbbdeec4c1a2259303dca4b6d9264e patch-1.5.3.cd.edit_threads.9.5 22293
diff --git a/net-mail/mutt/files/digest-mutt-1.5.4-r1 b/net-mail/mutt/files/digest-mutt-1.5.4-r1
deleted file mode 100644
index 7567f1f13a51..000000000000
--- a/net-mail/mutt/files/digest-mutt-1.5.4-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 3d4088f25892af6d71148eef26604f33 mutt-1.5.4i.tar.gz 2788104
-MD5 e2c0b3bb0be0e19a4a6cda01078e3eae patch-1.5.4.rr.compressed.1.gz 14463
-MD5 cecd25d4caadc4055ff7658e2f31f8aa mutt-1.5.4i-ja.1.tar.gz 80299
-MD5 56bbbdeec4c1a2259303dca4b6d9264e patch-1.5.3.cd.edit_threads.9.5 22293
diff --git a/net-mail/mutt/files/digest-mutt-1.5.5.1 b/net-mail/mutt/files/digest-mutt-1.5.5.1
deleted file mode 100644
index dc194a9b3e11..000000000000
--- a/net-mail/mutt/files/digest-mutt-1.5.5.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9729ee2a2024b57e2a903ec7753970a5 mutt-1.5.5.1i.tar.gz 2892962
-MD5 428d3ca0a382ea63c942ebbb12ab4c85 patch-1.5.5.1.rr.compressed.1.gz 14386
-MD5 56bbbdeec4c1a2259303dca4b6d9264e patch-1.5.3.cd.edit_threads.9.5 22293
diff --git a/net-mail/mutt/files/digest-mutt-1.5.6-r1 b/net-mail/mutt/files/digest-mutt-1.5.6-r2
index 832fc16865fd..ca805f949420 100644
--- a/net-mail/mutt/files/digest-mutt-1.5.6-r1
+++ b/net-mail/mutt/files/digest-mutt-1.5.6-r2
@@ -3,4 +3,4 @@ MD5 dbbde55d5865c76822bc13baa6dd6293 patch-1.5.5.1.cd.edit_threads.9.5-gentoo.bz
 MD5 0d57a62f17c93eb1d2eff60e070933b3 patch-1.5.6.rr.compressed.gz 10077
 MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
 MD5 c3a4b9868bcaa0f8e79caa8429ba43fa patch-1.5.6.vvv.nntp-gentoo.bz2 83489
-MD5 3f23d0bc8c83cf49c168ae59cabc5c8a mutt-cvs-maildir-header-cache.15 22265
+MD5 b901329a115d23ff8e6db8cfd1a0d39e mutt-cvs-maildir-header-cache.16 23431
diff --git a/net-mail/mutt/mutt-1.5.4-r1.ebuild b/net-mail/mutt/mutt-1.5.4-r1.ebuild
deleted file mode 100644
index cedb5f4daca9..000000000000
--- a/net-mail/mutt/mutt-1.5.4-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mutt/mutt-1.5.4-r1.ebuild,v 1.12 2004/02/11 20:48:40 agriffis Exp $
-
-IUSE="ssl nls slang cjk crypt imap mbox maildir"
-
-inherit eutils
-
-edit_threads="patch-1.5.3.cd.edit_threads.9.5"
-
-S=$WORKDIR/${P}
-DESCRIPTION="a small but very powerful text-based mail client"
-SRC_URI="ftp://ftp.mutt.org/mutt/devel/mutt-${PV}i.tar.gz
-	http://www.spinnaker.de/mutt/compressed/patch-${PV}.rr.compressed.1.gz
-	cjk? ( http://www.emaillab.org/mutt/1.5/${P}i-ja.1.tar.gz )
-	http://cedricduval.free.fr/mutt/patches/download/${edit_threads}"
-HOMEPAGE="http://www.mutt.org"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	slang? ( >=sys-libs/slang-1.4.2 )"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa ia64 amd64"
-
-inherit flag-o-matic
-
-src_unpack() {
-	unpack ${P}i.tar.gz
-
-	cd ${S}
-	epatch ${DISTDIR}/patch-${PV}.rr.compressed.1.gz
-	epatch ${DISTDIR}/${edit_threads}
-
-	if [ "`use cjk`" ]; then
-		cd ${WORKDIR}
-		unpack ${P}i-ja.1.tar.gz
-		cd ${S}
-		epatch ../${P}i-ja.1/patch-${PV}.tt.ja.1
-	fi
-}
-
-src_compile() {
-	# See Bug #22787
-	unset WANT_AUTOCONF_2_5
-	# See Bug #11170
-	case ${ARCH} in
-		alpha|ppc) replace-flags "-O[3-9]" "-O2" ;;
-	esac
-
-	local myconf
-	myconf="`use_enable nls` `use_with ssl` \
-			`use_enable imap` `use_enable crypt pgp`"
-
-	# --without-slang doesn't work;
-	# specify --with-curses if you don't want slang
-	# (26 Sep 2001 agriffis)
-
-	use slang \
-		&& myconf="${myconf} --with-slang" \
-		&& ewarn "If you want transparent background, please merge mutt with USE=-slang." \
-		|| myconf="${myconf} --with-curses"
-
-	use mbox \
-		&& myconf="${myconf} --with-maildir=/var/spool/mail" \
-		|| myconf="${myconf} --with-homespool=Maildir"
-
-	use cjk && myconf="$myconf --enable-default-japanese"
-
-	econf \
-		--sysconfdir=/etc/mutt \
-		--with-docdir=/usr/share/doc/mutt-$PVR \
-		--with-regex --enable-pop --enable-nfs-fix \
-		--disable-fcntl --enable-flock --enable-external-dotlock \
-		--enable-compressed \
-		--enable-imap-edit-threads \
-		${myconf} || die
-
-	mv doc/Makefile doc/Makefile.orig
-	sed 's/README.UPGRADE//' doc/Makefile.orig > doc/Makefile
-	make || die "make failed (myconf=${myconf})"
-}
-
-src_install() {
-	make DESTDIR=$D install || die
-	find $D/usr/share/doc -type f |grep -v "html\|manual" | xargs gzip
-	insinto /etc/mutt
-	if [ "`use mbox`" ]; then
-		einfo "Not installing an /etc/Muttrc as mbox is default configuration"
-		einfo "with mutt"
-	else
-		doins $FILESDIR/Muttrc
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-pkg_postinst() {
-	einfo "The USE variable 'imap' is not set by default on most architectures."
-	einfo "To enable imap support in mutt, make sure you have 'imap' set."
-}
diff --git a/net-mail/mutt/mutt-1.5.4.ebuild b/net-mail/mutt/mutt-1.5.4.ebuild
deleted file mode 100644
index 7d8cd866279d..000000000000
--- a/net-mail/mutt/mutt-1.5.4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mutt/mutt-1.5.4.ebuild,v 1.11 2004/05/08 01:37:52 agriffis Exp $
-
-IUSE="ssl nls slang cjk crypt imap"
-
-inherit eutils
-
-edit_threads="patch-1.5.3.cd.edit_threads.9.5"
-
-S=$WORKDIR/${P}
-DESCRIPTION="a small but very powerful text-based mail client"
-SRC_URI="ftp://ftp.mutt.org/mutt/devel/mutt-${PV}i.tar.gz
-	http://www.spinnaker.de/mutt/compressed/patch-${PV}.rr.compressed.1.gz
-	cjk? ( http://www.emaillab.org/mutt/1.5/${P}i-ja.1.tar.gz )
-	http://cedricduval.free.fr/mutt/patches/download/${edit_threads}"
-HOMEPAGE="http://www.mutt.org"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	slang? ( >=sys-libs/slang-1.4.2 )"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
-
-inherit flag-o-matic
-
-src_unpack() {
-	unpack ${P}i.tar.gz
-
-	cd ${S}
-	epatch ${DISTDIR}/patch-${PV}.rr.compressed.1.gz
-	epatch ${DISTDIR}/${edit_threads}
-
-	if [ "`use cjk`" ]; then
-		cd ${WORKDIR}
-		unpack ${P}i-ja.1.tar.gz
-		cd ${S}
-		epatch ../${P}i-ja.1/patch-${PV}.tt.ja.1
-	fi
-}
-
-src_compile() {
-	# See Bug #11170
-	case ${ARCH} in
-		alpha|ppc) replace-flags "-O[3-9]" "-O2" ;;
-	esac
-
-	local myconf
-	myconf="`use_enable nls` `use_with ssl` \
-			`use_enable imap` `use_enable crypt pgp`"
-
-	# --without-slang doesn't work;
-	# specify --with-curses if you don't want slang
-	# (26 Sep 2001 agriffis)
-
-	use slang \
-		&& myconf="${myconf} --with-slang" \
-		|| myconf="${myconf} --with-curses"
-
-	use cjk && myconf="$myconf --enable-default-japanese"
-
-	econf \
-		--sysconfdir=/etc/mutt \
-		--with-docdir=/usr/share/doc/mutt-$PVR \
-		--with-regex --enable-pop --enable-nfs-fix \
-		--disable-fcntl --enable-flock --enable-external-dotlock \
-		--with-homespool=Maildir \
-		--enable-compressed \
-		--enable-imap-edit-threads \
-		${myconf} || die
-
-	mv doc/Makefile doc/Makefile.orig
-	sed 's/README.UPGRADE//' doc/Makefile.orig > doc/Makefile
-	make || die "make failed (myconf=${myconf})"
-}
-
-src_install() {
-	make DESTDIR=$D install || die
-	find $D/usr/share/doc -type f |grep -v html | xargs gzip
-	insinto /etc/mutt
-	if [ "`use mbox`" ]; then
-		einfo "Not installing an /etc/Muttrc as mbox is default configuration"
-		einfo "with mutt"
-	else
-		doins $FILESDIR/Muttrc
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-pkg_postinst() {
-	einfo "The USE variable 'imap' is not set by default on most architectures."
-	einfo "To enable imap support in mutt, make sure you have 'imap' set."
-}
diff --git a/net-mail/mutt/mutt-1.5.5.1.ebuild b/net-mail/mutt/mutt-1.5.5.1.ebuild
deleted file mode 100644
index 479bdb283398..000000000000
--- a/net-mail/mutt/mutt-1.5.5.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mutt/mutt-1.5.5.1.ebuild,v 1.7 2004/02/26 10:32:40 gmsoft Exp $
-
-IUSE="ssl nls slang crypt imap mbox"
-
-inherit eutils
-
-edit_threads_patch="patch-1.5.3.cd.edit_threads.9.5"
-compressed_patch="patch-${PV}.rr.compressed.1.gz"
-
-DESCRIPTION="a small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org"
-SRC_URI="ftp://ftp.mutt.org/mutt/devel/mutt-${PV}i.tar.gz
-	http://cedricduval.free.fr/mutt/patches/download/${edit_threads_patch}
-	http://www.spinnaker.de/mutt/compressed/${compressed_patch}"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-DEPEND="${RDEPEND}
-	>=sys-libs/ncurses-5.2
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	slang? ( >=sys-libs/slang-1.4.2 )
-	>=sys-apps/sed-4"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc ~alpha hppa ~ia64 ~amd64"
-
-inherit flag-o-matic
-
-pkg_setup() {
-	if ! use imap; then
-		echo
-		einfo
-		einfo "NOTE: The USE variable 'imap' is not in your USE flags."
-		einfo "For imap support in mutt, you will need to restart the build with USE=imap"
-		echo
-	fi
-}
-
-src_unpack() {
-	unpack ${P}i.tar.gz
-
-	cd ${S}
-	epatch ${DISTDIR}/patch-${PV}.rr.compressed.1.gz
-	epatch ${DISTDIR}/${edit_threads_patch}
-
-}
-
-src_compile() {
-	# See Bug #22787
-	unset WANT_AUTOCONF_2_5
-	# See Bug #11170
-	case ${ARCH} in
-		alpha|ppc) replace-flags "-O[3-9]" "-O2" ;;
-	esac
-
-	local myconf
-	myconf="`use_enable nls` `use_with ssl` \
-			`use_enable imap` `use_enable crypt pgp`"
-
-	# --without-slang doesn't work;
-	# specify --with-curses if you don't want slang
-	# (26 Sep 2001 agriffis)
-
-	use slang \
-		&& myconf="${myconf} --with-slang" \
-		&& ewarn "If you want transparent background, please merge mutt with USE=-slang." \
-		|| myconf="${myconf} --with-curses"
-
-	use mbox \
-		&& myconf="${myconf} --with-maildir=/var/spool/mail" \
-		|| myconf="${myconf} --with-homespool=Maildir"
-
-	use cjk && myconf="$myconf --enable-default-japanese"
-
-	econf \
-		--sysconfdir=/etc/mutt \
-		--with-docdir=/usr/share/doc/mutt-$PVR \
-		--with-regex --enable-pop --enable-nfs-fix \
-		--disable-fcntl --enable-flock --enable-external-dotlock \
-		--enable-compressed \
-		--enable-imap-edit-threads \
-		${myconf} || die
-
-	mv doc/Makefile doc/Makefile.orig
-	sed 's/README.UPGRADE//' doc/Makefile.orig > doc/Makefile
-	make || die "make failed (myconf=${myconf})"
-}
-
-src_install() {
-	make DESTDIR=$D install || die
-	find $D/usr/share/doc -type f |grep -v "html\|manual" | xargs gzip
-	insinto /etc/mutt
-	if [ "`use mbox`" ]; then
-		einfo "Not installing an /etc/Muttrc as mbox is default configuration"
-		einfo "with mutt"
-	else
-		doins $FILESDIR/Muttrc
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-	einfo "The USE variable 'imap' is not set by default on most architectures."
-	einfo "To enable imap support in mutt, make sure you have USE=imap"
-}
diff --git a/net-mail/mutt/mutt-1.5.6-r1.ebuild b/net-mail/mutt/mutt-1.5.6-r2.ebuild
index 4878b1c3b45f..710bd76f2c8f 100644
--- a/net-mail/mutt/mutt-1.5.6-r1.ebuild
+++ b/net-mail/mutt/mutt-1.5.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mutt/mutt-1.5.6-r1.ebuild,v 1.3 2004/05/25 03:46:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mutt/mutt-1.5.6-r2.ebuild,v 1.1 2004/05/26 03:22:30 agriffis Exp $
 
 IUSE="ssl nls slang crypt imap mbox nntp vanilla"
 
@@ -10,7 +10,7 @@ edit_threads_patch="patch-1.5.5.1.cd.edit_threads.9.5-gentoo.bz2"
 compressed_patch="patch-${PV}.rr.compressed.gz"
 nntp_patch="patch-${PV}.vvv.nntp-gentoo.bz2"
 mbox_hook_patch="patch-${PV}.dw.mbox-hook.1"
-maildir_header_cache_patch="mutt-cvs-maildir-header-cache.15"
+maildir_header_cache_patch="mutt-cvs-maildir-header-cache.16"
 
 DESCRIPTION="a small but very powerful text-based mail client"
 HOMEPAGE="http://www.mutt.org"
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	slang? ( >=sys-libs/slang-1.4.2 )
 	!vanilla? (
-		=sys-libs/db-4.1*
+		>=sys-libs/db-4
 		nntp? ( sys-devel/automake sys-devel/autoconf )
 	)"
 
@@ -60,14 +60,7 @@ src_unpack() {
 		epatch ${DISTDIR}/${compressed_patch}
 		epatch ${DISTDIR}/${edit_threads_patch}
 		epatch ${DISTDIR}/${mbox_hook_patch}
-
 		epatch ${DISTDIR}/${maildir_header_cache_patch}
-		# The following sed enables the maildir_header_cache_patch to
-		# use db-4.1 which is marked stable on more platforms.  Using
-		# db-4.1 is enforced in src_compile by setting a configure
-		# cache variable in the environment.
-		sed -i 's/-ldb-4"/-ldb-4.1"/g' configure.in || die "sed failed"
-
 		use nntp && epatch ${DISTDIR}/${nntp_patch}
 
 		# The following steps are necessary for the nntp patch and the
@@ -136,7 +129,6 @@ src_compile() {
 
 		# maildir_header_cache_patch
 		myconf="${myconf} --enable-hcache"
-		export ac_cv_db4=yes
 	fi
 
 	econf ${myconf} || die