Add 1.4.2.1 since 1.5.x is officially the devel series

6 files changed, 176 insertions, 27 deletions

diff --git a/net-mail/mutt/ChangeLog b/net-mail/mutt/ChangeLog
index f450051e5098..ec6f52fa379f 100644
--- a/net-mail/mutt/ChangeLog
+++ b/net-mail/mutt/ChangeLog
@@ -1,6 +1,12 @@
 # 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.44 2004/02/13 03:12:13 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mutt/ChangeLog,v 1.45 2004/02/17 15:37:20 agriffis Exp $
+
+*mutt-1.4.2.1 (17 Feb 2004)
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.4.2.1.ebuild,
+  mutt-1.5.5.1.ebuild, mutt-1.5.6.ebuild:
+  Add 1.4.2.1 since 1.5.x is officially the devel series
 
   13 Feb 2004; Lars Weiler <pylon@gentoo.org> mutt-1.5.6.ebuild,
   files/slang.patch:
diff --git a/net-mail/mutt/Manifest b/net-mail/mutt/Manifest
index 143293501c19..a3919bb199d5 100644
--- a/net-mail/mutt/Manifest
+++ b/net-mail/mutt/Manifest
@@ -1,13 +1,15 @@
+MD5 5849cdd2f8004ea872300f2171151e12 ChangeLog 7054
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 ddc50e3033c4b3c8a3e120b2c488189f mutt-1.5.4-r1.ebuild 2860
+MD5 c6e202df25fa9a85ccfd4121baf7a991 mutt-1.5.5.1.ebuild 2949
+MD5 0ec1667b2a6713f93048963bcbab2aa0 mutt-1.5.6.ebuild 4045
+MD5 e170aef6acb390b5badf3867a6f82f08 mutt-1.4.2.1.ebuild 3376
 MD5 ba60edd1ef4959b5a3c8511d97755f08 mutt-1.5.4.ebuild 2615
-MD5 d7f1c81983db9562b6a0b9a4920afebd mutt-1.5.5.1.ebuild 2674
-MD5 274206b89ca494dba5adc9c6a07496b5 mutt-1.5.6.ebuild 3890
-MD5 105e7b8ebc75687e39282699d7299b97 ChangeLog 6851
-MD5 b2b515e96b060771a00646405c620755 files/Muttrc 678
+MD5 ddc50e3033c4b3c8a3e120b2c488189f mutt-1.5.4-r1.ebuild 2860
 MD5 78c54f1f293cf702401021c22ca9992a files/Muttrc.color 1177
-MD5 2aed1ac688ef4a607857a75422066740 files/digest-mutt-1.5.4 280
-MD5 2aed1ac688ef4a607857a75422066740 files/digest-mutt-1.5.4-r1 280
+MD5 b2b515e96b060771a00646405c620755 files/Muttrc 678
 MD5 245167f81a90f23cdecb1a55dcc7dd1a files/digest-mutt-1.5.5.1 217
 MD5 6cba9546cde7ee8a8e67b44d27b62366 files/digest-mutt-1.5.6 367
+MD5 cae412df424c3f499c539c93ebd02e48 files/digest-mutt-1.4.2.1 292
 MD5 25e242fd402f42d5bd5230dbe9ea68a6 files/slang.patch 493
+MD5 2aed1ac688ef4a607857a75422066740 files/digest-mutt-1.5.4 280
+MD5 2aed1ac688ef4a607857a75422066740 files/digest-mutt-1.5.4-r1 280
diff --git a/net-mail/mutt/files/digest-mutt-1.4.2.1 b/net-mail/mutt/files/digest-mutt-1.4.2.1
new file mode 100644
index 000000000000..48f9e079c6bd
--- /dev/null
+++ b/net-mail/mutt/files/digest-mutt-1.4.2.1
@@ -0,0 +1,4 @@
+MD5 710bd56d3c4c4bcd1403bc4e053f7476 mutt-1.4.2.1i.tar.gz 2611253
+MD5 47b4dbd95f07d9ec2d8e0939f822b7c3 patch-1.4.2.rr.compressed.1-gentoo.bz2 13939
+MD5 18aec38f77a88995e6941df798ce4cd7 patch-1.4.0.cd.edit_threads.9.5 22168
+MD5 e5e108a990346eacff0b2648e03d098f mutt-1.4.2.1i-ja.1.tar.gz 78266
diff --git a/net-mail/mutt/mutt-1.4.2.1.ebuild b/net-mail/mutt/mutt-1.4.2.1.ebuild
new file mode 100644
index 000000000000..0b6c127d12ec
--- /dev/null
+++ b/net-mail/mutt/mutt-1.4.2.1.ebuild
@@ -0,0 +1,121 @@
+# 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.4.2.1.ebuild,v 1.1 2004/02/17 15:37:20 agriffis Exp $
+
+IUSE="ssl nls slang mbox cjk vanilla"
+
+inherit eutils flag-o-matic
+
+edit_threads_patch="patch-1.4.0.cd.edit_threads.9.5"
+compressed_patch="patch-1.4.2.rr.compressed.1-gentoo.bz2"
+cjk_patch="mutt-${PV}i-ja.1.tar.gz"
+
+DESCRIPTION="a small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org"
+SRC_URI="ftp://ftp.mutt.org/mutt/mutt-${PV}i.tar.gz
+	mirror://gentoo/${compressed_patch}
+	http://cedricduval.free.fr/mutt/patches/download/${edit_threads_patch}
+	cjk? ( http://www.emaillab.org/mutt/1.4/${cjk_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 ~mips"
+
+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} || die
+		epatch ${DISTDIR}/${edit_threads_patch} || die
+	fi
+	if use cjk; then
+		cd ${WORKDIR}
+		unpack ${cjk_patch} && cd ${S} || die "unpack cjk failed"
+		epatch ${WORKDIR}/${cjk_patch%.t*}/patch-${PV}.tt.ja.1 || die
+	fi
+}
+
+src_compile() {
+	local myconf="
+		$(use_enable nls) \
+		$(use_with ssl) \
+		$(use_enable imap) \
+		$(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_AUTOCONF_2_5 WANT_AUTOCONF
+
+	# 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"
+	fi
+	econf ${myconf} || die
+	sed -i '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 | xargs gzip
+	if [ "`use mbox`" ]; then
+		echo "Not installing an /etc/Muttrc as mbox is default configuration"
+		echo "with mutt"
+	else
+		insinto /etc/mutt
+		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.5.1.ebuild b/net-mail/mutt/mutt-1.5.5.1.ebuild
index 1fa9b24d9115..3301625177f1 100644
--- a/net-mail/mutt/mutt-1.5.5.1.ebuild
+++ b/net-mail/mutt/mutt-1.5.5.1.ebuild
@@ -1,25 +1,26 @@
 # 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.4 2004/02/11 20:48:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mutt/mutt-1.5.5.1.ebuild,v 1.5 2004/02/17 15:37:20 agriffis Exp $
 
-IUSE="ssl nls slang crypt imap mbox maildir"
+IUSE="ssl nls slang crypt imap mbox"
 
 inherit eutils
 
-edit_threads="patch-1.5.3.cd.edit_threads.9.5"
+edit_threads_patch="patch-1.5.3.cd.edit_threads.9.5"
+compressed_patch="patch-${PV}.rr.compressed.1.gz"
 
-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
-	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 )"
+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"
@@ -27,12 +28,22 @@ 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}
+	epatch ${DISTDIR}/${edit_threads_patch}
 
 }
 
@@ -90,7 +101,8 @@ src_install() {
 
 	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."
+	einfo "To enable imap support in mutt, make sure you have USE=imap"
 }
diff --git a/net-mail/mutt/mutt-1.5.6.ebuild b/net-mail/mutt/mutt-1.5.6.ebuild
index 90678afcabc2..f25841d35247 100644
--- a/net-mail/mutt/mutt-1.5.6.ebuild
+++ b/net-mail/mutt/mutt-1.5.6.ebuild
@@ -1,8 +1,8 @@
 # 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.3 2004/02/13 03:12:13 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mutt/mutt-1.5.6.ebuild,v 1.4 2004/02/17 15:37:20 agriffis Exp $
 
-IUSE="ssl nls slang crypt imap mbox nntp maildir vanilla"
+IUSE="ssl nls slang crypt imap mbox nntp vanilla"
 
 inherit eutils
 
@@ -11,7 +11,6 @@ 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
@@ -22,14 +21,14 @@ SRC_URI="ftp://ftp.mutt.org/mutt/devel/mutt-${PV}i.tar.gz
 #	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
+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
 	!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"
@@ -132,3 +131,8 @@ src_install() {
 
 	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"
+}