summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAron Griffis <agriffis@gentoo.org>2004-08-18 17:02:42 +0000
committerAron Griffis <agriffis@gentoo.org>2004-08-18 17:02:42 +0000
commit779601e2a69d4605a91e35f03ce5b6b537fed780 (patch)
tree7f91957df1cd106cd9ede9accef02b2c275458d3 /mail-client
parenttransgaming has stopped watermarking (Manifest recommit) (diff)
downloadgentoo-2-779601e2a69d4605a91e35f03ce5b6b537fed780.tar.gz
gentoo-2-779601e2a69d4605a91e35f03ce5b6b537fed780.tar.bz2
gentoo-2-779601e2a69d4605a91e35f03ce5b6b537fed780.zip
Mark 1.5.6-r2 stable on alpha, ia64, x86. Bump to -r3 to pick up new header_cache patch #60435. This should be marked stable after a couple days.
Diffstat (limited to 'mail-client')
-rw-r--r--mail-client/mutt/ChangeLog6
-rw-r--r--mail-client/mutt/Manifest14
-rw-r--r--mail-client/mutt/files/digest-mutt-1.5.6-r37
-rw-r--r--mail-client/mutt/mutt-1.5.6-r2.ebuild4
-rw-r--r--mail-client/mutt/mutt-1.5.6-r3.ebuild153
5 files changed, 175 insertions, 9 deletions
diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 856311991360..117f6a2f7f45 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for mail-client/mutt
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.14 2004/08/17 18:47:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.15 2004/08/18 17:02:41 agriffis Exp $
+
+ 18 Aug 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6-r2.ebuild:
+ Mark 1.5.6-r2 stable on alpha, ia64, x86. Bump to -r3 to pick up new
+ header_cache patch #60435. This should be marked stable after a couple days.
17 Aug 2004; Aron Griffis <agriffis@gentoo.org> files/Muttrc:
There doesn't seem to be any reason to `unset mbox' in Muttrc, and it causes
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 55a23b539579..b92915b526b2 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,12 +1,14 @@
-MD5 8b8a7a0c665de2c3ed60c99a9b1f1897 ChangeLog 11375
-MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253
-MD5 005b1bb529f6c57a79b3db2100d8a787 mutt-1.4.2.1.ebuild 3367
+MD5 ed17e8accaeb658fd415528818a2972b mutt-1.5.6-r3.ebuild 4577
MD5 a6cc34e0d680093a9b54ad50cce76e5a mutt-1.5.6-r2.ebuild 4618
+MD5 005b1bb529f6c57a79b3db2100d8a787 mutt-1.4.2.1.ebuild 3367
MD5 c719facdc640f1e4583f5e52f00b6eed mutt-1.5.6.ebuild 4223
+MD5 8b8a7a0c665de2c3ed60c99a9b1f1897 ChangeLog 11375
+MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253
MD5 6064ff5a3d1a71ccdb48f88872feb3a3 files/Muttrc 667
-MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531
-MD5 30ce590d0284ffb0896857714c6a47d4 files/Muttrc.mbox 486
-MD5 cae412df424c3f499c539c93ebd02e48 files/digest-mutt-1.4.2.1 292
MD5 6cba9546cde7ee8a8e67b44d27b62366 files/digest-mutt-1.5.6 367
+MD5 30ce590d0284ffb0896857714c6a47d4 files/Muttrc.mbox 486
MD5 ea50c00af0676472a71638d84950b220 files/digest-mutt-1.5.6-r2 517
+MD5 34621fd7163fd6ffdbd78031eda37e6f files/digest-mutt-1.5.6-r3 508
+MD5 cae412df424c3f499c539c93ebd02e48 files/digest-mutt-1.4.2.1 292
+MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531
MD5 25e242fd402f42d5bd5230dbe9ea68a6 files/slang.patch 493
diff --git a/mail-client/mutt/files/digest-mutt-1.5.6-r3 b/mail-client/mutt/files/digest-mutt-1.5.6-r3
new file mode 100644
index 000000000000..c78f36239e13
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.6-r3
@@ -0,0 +1,7 @@
+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 4f66ba09feaee08cf96aad42879477e5 patch-1.5.6.vvv.nntp-gentoo-r2.bz2 83484
+MD5 009f71d84cb9daf5a16b1c26776e35dd patch-1.5.6.tg.hcache.0 34811
+MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
diff --git a/mail-client/mutt/mutt-1.5.6-r2.ebuild b/mail-client/mutt/mutt-1.5.6-r2.ebuild
index fde194f85718..5613298c4aa0 100644
--- a/mail-client/mutt/mutt-1.5.6-r2.ebuild
+++ b/mail-client/mutt/mutt-1.5.6-r2.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/mail-client/mutt/mutt-1.5.6-r2.ebuild,v 1.11 2004/08/17 18:40:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.6-r2.ebuild,v 1.12 2004/08/18 17:02:42 agriffis Exp $
inherit eutils flag-o-matic
IUSE="cjk ssl nls slang crypt imap mbox nntp vanilla"
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~amd64 ~mips ppc64 macos"
+KEYWORDS="x86 ~ppc ~sparc alpha ~hppa ia64 ~amd64 ~mips ppc64 macos"
pkg_setup() {
diff --git a/mail-client/mutt/mutt-1.5.6-r3.ebuild b/mail-client/mutt/mutt-1.5.6-r3.ebuild
new file mode 100644
index 000000000000..bad58fc14198
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.6-r3.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.6-r3.ebuild,v 1.1 2004/08/18 17:02:42 agriffis Exp $
+
+inherit eutils flag-o-matic
+IUSE="cjk ssl nls slang crypt imap mbox nntp vanilla"
+
+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-r2.bz2"
+mbox_hook_patch="patch-${PV}.dw.mbox-hook.1"
+header_cache_patch="patch-${PV}.tg.hcache.0"
+pgp_timeout_patch="patch-${PV}.dw.pgp-timeout.1"
+
+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
+ !vanilla? (
+ 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} )
+ http://wwwcip.informatik.uni-erlangen.de/~sithglan/mutt/${header_cache_patch}
+ http://www.woolridge.ca/mutt/patches/${pgp_timeout_patch}
+ )"
+# nntp? ( http://mutt.kiev.ua/download/${P}/${nntp_patch} )
+# http://cedricduval.free.fr/mutt/patches/download/${edit_threads_patch}
+
+RDEPEND="nls? ( sys-devel/gettext )
+ >=sys-libs/ncurses-5.2
+ ssl? ( >=dev-libs/openssl-0.9.6 )
+ slang? ( >=sys-libs/slang-1.4.2 )
+ !vanilla? ( sys-libs/gdbm )"
+DEPEND="${RDEPEND}
+ net-mail/mailbase
+ !vanilla? ( nntp? ( sys-devel/automake sys-devel/autoconf ) )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~amd64 ~mips ~ppc64 ~macos"
+
+
+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"
+ einfo
+ 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}
+ epatch ${DISTDIR}/${header_cache_patch}
+ epatch ${DISTDIR}/${pgp_timeout_patch}
+ use nntp && epatch ${DISTDIR}/${nntp_patch}
+
+ # The following steps are necessary for the nntp patch and the
+ # header_cache_patch
+ 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"
+ WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
+ fi
+
+ # Fix a slang problem that is already fixed in upstream cvs
+ epatch ${FILESDIR}/slang.patch
+
+ # Fix ability to read from a subprocess with source script.sh|
+ # Bug #42738 (25 Feb 2004 agriffis)
+ epatch ${FILESDIR}/8patch-1.5.6.dyc.source_stat
+}
+
+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_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"
+
+ # nntp patch
+ myconf="${myconf} $(use_enable nntp)"
+
+ # maildir_header_cache_patch
+ myconf="${myconf} --enable-hcache"
+ fi
+
+ econf ${myconf} || die
+ 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
+ insinto /etc/mutt
+ newins ${FILESDIR}/Muttrc.mbox Muttrc
+ 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"
+}