version bump to 1.5.6

4 files changed, 150 insertions, 5 deletions

diff --git a/net-mail/mutt/ChangeLog b/net-mail/mutt/ChangeLog
index 5113db755088..cd9d185a8cb2 100644
--- a/net-mail/mutt/ChangeLog
+++ b/net-mail/mutt/ChangeLog
@@ -1,6 +1,11 @@
 # 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.39 2004/01/18 22:57:32 tuxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mutt/ChangeLog,v 1.40 2004/02/11 20:39:05 agriffis Exp $
+
+*mutt-1.5.6 (11 Feb 2004)
+
+  11 Feb 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6.ebuild:
+  version bump to 1.5.6
 
   18 Jan 2004; <tuxus@gentoo.org> mutt-1.4.1-r1.ebuild:
   Added ~mips to KEYWORDS.
diff --git a/net-mail/mutt/Manifest b/net-mail/mutt/Manifest
index de153018e4ad..dc869a6c6f24 100644
--- a/net-mail/mutt/Manifest
+++ b/net-mail/mutt/Manifest
@@ -1,14 +1,16 @@
-MD5 de803f18e4cdc5fe10e57912ee7038f3 ChangeLog 6035
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 bea9cadb03b3e44cd6ef1776f3b29685 mutt-1.4.1-r1.ebuild 2697
 MD5 bb3ba98f0fb69ff14e29e1f63917b378 mutt-1.4.1.ebuild 2510
 MD5 24c412f78ba3f177a7d2208271f1d73f mutt-1.5.4-r1.ebuild 2849
 MD5 a3b34d7f3a0833be1ab6807382fd8f1f mutt-1.5.4.ebuild 2607
 MD5 4a401cc7620e491afdbba591b7e65ef1 mutt-1.5.5.1.ebuild 2663
-MD5 78c54f1f293cf702401021c22ca9992a files/Muttrc.color 1177
+MD5 43b44242a4e6cf48c27f225a599969d8 mutt-1.5.6.ebuild 3856
+MD5 de803f18e4cdc5fe10e57912ee7038f3 ChangeLog 6035
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 b2b515e96b060771a00646405c620755 files/Muttrc 678
 MD5 b9367d01117783179ef5042bb2193d77 files/digest-mutt-1.4.1 280
-MD5 b9367d01117783179ef5042bb2193d77 files/digest-mutt-1.4.1-r1 280
 MD5 2aed1ac688ef4a607857a75422066740 files/digest-mutt-1.5.4 280
+MD5 6cba9546cde7ee8a8e67b44d27b62366 files/digest-mutt-1.5.6 367
+MD5 b9367d01117783179ef5042bb2193d77 files/digest-mutt-1.4.1-r1 280
 MD5 2aed1ac688ef4a607857a75422066740 files/digest-mutt-1.5.4-r1 280
+MD5 78c54f1f293cf702401021c22ca9992a files/Muttrc.color 1177
 MD5 245167f81a90f23cdecb1a55dcc7dd1a files/digest-mutt-1.5.5.1 217
diff --git a/net-mail/mutt/files/digest-mutt-1.5.6 b/net-mail/mutt/files/digest-mutt-1.5.6
new file mode 100644
index 000000000000..40aa16b70976
--- /dev/null
+++ b/net-mail/mutt/files/digest-mutt-1.5.6
@@ -0,0 +1,5 @@
+MD5 aa1433635d7c86beba1675a3408b0324 mutt-1.5.6i.tar.gz 2910730
+MD5 dbbde55d5865c76822bc13baa6dd6293 patch-1.5.5.1.cd.edit_threads.9.5-gentoo.bz2 6890
+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
diff --git a/net-mail/mutt/mutt-1.5.6.ebuild b/net-mail/mutt/mutt-1.5.6.ebuild
new file mode 100644
index 000000000000..069fa9686b71
--- /dev/null
+++ b/net-mail/mutt/mutt-1.5.6.ebuild
@@ -0,0 +1,133 @@
+# 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.ebuild,v 1.1 2004/02/11 20:39:05 agriffis Exp $
+
+IUSE="ssl nls slang crypt imap mbox nntp maildir vanilla"
+
+inherit eutils
+
+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"
+
+S=${WORKDIR}/${P}
+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
+	mirror://gentoo/${edit_threads_patch}
+	http://mutt.kiev.ua/download/${P}/${compressed_patch}
+	http://www.woolridge.ca/mutt/patches/${mbox_hook_patch}
+	nntp? ( mirror://gentoo/${nntp_patch} )"
+#	nntp? ( http://mutt.kiev.ua/download/${P}/${nntp_patch} )
+#	http://cedricduval.free.fr/mutt/patches/download/${edit_threads_patch}
+
+DEPEND=">=sys-libs/ncurses-5.2
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	slang? ( >=sys-libs/slang-1.4.2 )
+	>=sys-apps/sed-4
+	!vanilla? ( nntp? ( sys-devel/automake sys-devel/autoconf ) )"
+
+RDEPEND="nls? ( sys-devel/gettext )"
+
+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} || die "unpack failed"
+	if ! use vanilla; then
+		epatch ${DISTDIR}/${compressed_patch}
+		epatch ${DISTDIR}/${edit_threads_patch}
+		epatch ${DISTDIR}/${mbox_hook_patch}
+		if use nntp; then
+			epatch ${DISTDIR}/${nntp_patch}
+			# I don't know how much of this is truly necessary, but it
+			# was all in the ebuild proposed in bug 23196
+			aclocal -I m4					|| die "aclocal failed"
+			autoheader						|| die "autoheader failed"
+			make -C m4 -f Makefile.am.in	|| die "make in m4 failed"
+			automake --foreign				|| die "automake failed"
+			autoconf						|| die "autoconf failed"
+		fi
+	fi
+}
+
+src_compile() {
+	local myconf="
+		$(use_enable nls) \
+		$(use_with ssl) \
+		$(use_enable imap) \
+		$(use_enable crypt pgp) \
+		$(use_enable cjk default-japanese) \
+		--sysconfdir=/etc/mutt \
+		--with-docdir=/usr/share/doc/mutt-${PVR} \
+		--with-regex --enable-pop --enable-nfs-fix \
+		--disable-fcntl --enable-flock --enable-external-dotlock"
+
+	# See Bug #22787
+	unset WANT_AUTOMAKE_2_5 WANT_AUTOMAKE
+
+	# See Bug #11170
+	case ${ARCH} in
+		alpha|ppc) replace-flags "-O[3-9]" "-O2" ;;
+	esac
+
+	if use slang; then
+		myconf="${myconf} --with-slang"
+		ewarn "If you want a transparent background,"
+		ewarn "please merge mutt with USE=-slang."
+	else
+		# --without-slang doesn't work;
+		# specify --with-curses if you don't want slang
+		# (26 Sep 2001 agriffis)
+		myconf="${myconf} --with-curses"
+	fi
+
+	if use mbox; then
+		myconf="${myconf} --with-maildir=/var/spool/mail"
+	else
+		myconf="${myconf} --with-homespool=Maildir"
+	fi
+
+	if ! use vanilla; then
+		# imap part of edit_threads patch
+		myconf="${myconf} $(use_enable imap imap-edit-threads)"
+
+		# rr.compressed patch
+		myconf="${myconf} --enable-compressed"
+
+		# nntp patch
+		myconf="${myconf} $(use_enable nntp)"
+	fi
+
+	econf ${myconf} || die
+	sed -i -e 's/README.UPGRADE//' doc/Makefile || die "sed failed"
+	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
+	if use mbox; then
+		einfo "Not installing an /etc/Muttrc as mbox is default configuration"
+		einfo "with mutt"
+	else
+		insinto /etc/mutt
+		doins ${FILESDIR}/Muttrc
+	fi
+
+	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}