From 06acfecc72e0e97423fadd9530dc64d89d34d822 Mon Sep 17 00:00:00 2001 From: Aron Griffis Date: Tue, 17 Aug 2004 18:40:53 +0000 Subject: Modify nntp patch to co-exist with pgp_timeout patch by eliminating context for PATCHES file #59129 --- mail-client/mutt/ChangeLog | 6 +++++- mail-client/mutt/Manifest | 6 +++--- mail-client/mutt/files/digest-mutt-1.5.6-r2 | 2 +- mail-client/mutt/mutt-1.5.6-r2.ebuild | 4 ++-- 4 files changed, 11 insertions(+), 7 deletions(-) (limited to 'mail-client/mutt') diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog index e0b436591c5b..1c25b0f1df30 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.12 2004/08/17 18:18:18 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.13 2004/08/17 18:40:53 agriffis Exp $ + + 17 Aug 2004; Aron Griffis mutt-1.5.6-r2.ebuild: + Modify nntp patch to co-exist with pgp_timeout patch by eliminating context + for PATCHES file #59129 17 Aug 2004; Aron Griffis mutt-1.4.2.1.ebuild, mutt-1.5.6-r2.ebuild, mutt-1.5.6.ebuild: diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest index f8071bd34b0a..ee645cb658a9 100644 --- a/mail-client/mutt/Manifest +++ b/mail-client/mutt/Manifest @@ -1,12 +1,12 @@ -MD5 e0f00fe7783c1f0c0d4b2b9d6045ac6f ChangeLog 11020 +MD5 4b239f310d99d97bff28d671cefb2967 ChangeLog 11197 MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253 MD5 005b1bb529f6c57a79b3db2100d8a787 mutt-1.4.2.1.ebuild 3367 -MD5 4e924df0e84d0526e9f0ce039eb18597 mutt-1.5.6-r2.ebuild 4618 +MD5 a6cc34e0d680093a9b54ad50cce76e5a mutt-1.5.6-r2.ebuild 4618 MD5 c719facdc640f1e4583f5e52f00b6eed mutt-1.5.6.ebuild 4223 MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531 MD5 b2b515e96b060771a00646405c620755 files/Muttrc 678 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 e08df5d4149c013ae822ece39ecf6d5d files/digest-mutt-1.5.6-r2 517 +MD5 ea50c00af0676472a71638d84950b220 files/digest-mutt-1.5.6-r2 517 MD5 25e242fd402f42d5bd5230dbe9ea68a6 files/slang.patch 493 diff --git a/mail-client/mutt/files/digest-mutt-1.5.6-r2 b/mail-client/mutt/files/digest-mutt-1.5.6-r2 index 15dbc4309d7c..60c8fc2aa820 100644 --- a/mail-client/mutt/files/digest-mutt-1.5.6-r2 +++ b/mail-client/mutt/files/digest-mutt-1.5.6-r2 @@ -2,6 +2,6 @@ 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 fa7dae5a50ecb9e79c20cb3c5f695478 patch-1.5.6.vvv.nntp-gentoo-r1.bz2 83418 +MD5 4f66ba09feaee08cf96aad42879477e5 patch-1.5.6.vvv.nntp-gentoo-r2.bz2 83484 MD5 b901329a115d23ff8e6db8cfd1a0d39e mutt-cvs-maildir-header-cache.16 23431 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 a758cb319db9..fde194f85718 100644 --- a/mail-client/mutt/mutt-1.5.6-r2.ebuild +++ b/mail-client/mutt/mutt-1.5.6-r2.ebuild @@ -1,13 +1,13 @@ # 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.10 2004/08/17 18:18:18 agriffis Exp $ +# $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 $ 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-r1.bz2" +nntp_patch="patch-${PV}.vvv.nntp-gentoo-r2.bz2" mbox_hook_patch="patch-${PV}.dw.mbox-hook.1" maildir_header_cache_patch="mutt-cvs-maildir-header-cache.16" pgp_timeout_patch="patch-${PV}.dw.pgp-timeout.1" -- cgit v1.2.3-65-gdbad