Fix the nntp patch to apply to both -r4 and -r5. Bump the nntp patch to -r3

since it has been updated. #83151
(Portage version: 2.0.51-r15)

6 files changed, 16 insertions, 11 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index cb14005acd0e..17b5fb42d3be 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/mutt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.31 2005/02/21 18:38:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.32 2005/02/25 15:09:41 agriffis Exp $
+
+  25 Feb 2005; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6-r4.ebuild,
+  mutt-1.5.6-r5.ebuild:
+  Fix the nntp patch to apply to both -r4 and -r5. Bump the nntp patch to -r3
+  since it has been updated. #83151
 
   21 Feb 2005; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6-r5.ebuild:
   Mark 1.5.6-r5 stable on alpha, amd64, ia64 and x86
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index edaa8df46b15..b8d767e3c420 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,19 +1,19 @@
 MD5 f05d4ae1d5264d74311c231435e87b53 mutt-1.5.6-r3.ebuild 4574
-MD5 40a70be10f81bdd4905e6613bab77437 mutt-1.5.6-r5.ebuild 4727
+MD5 e268348ec43f7a5ec8aa0358bf3d8b33 mutt-1.5.6-r5.ebuild 4727
 MD5 371998d5fbdc88d3d9b52c31725bb18c mutt-1.5.8-r1.ebuild 4256
 MD5 da817d8d2fd14250490514577cdf23d0 mutt-1.5.6-r2.ebuild 4617
 MD5 47c429a9de6aa7dc6d211b511897de59 mutt-1.4.2.1.ebuild 3355
 MD5 778c46506f03eea15be9616869de3168 mutt-1.5.6.ebuild 4232
 MD5 7f64a5788fbfde218116ac8664edfd29 ChangeLog 13692
-MD5 200946843d5e6653f666e745bf28ac8f mutt-1.5.6-r4.ebuild 4571
+MD5 f411833f3e75c6c1ab916b8d61b4afd7 mutt-1.5.6-r4.ebuild 4571
 MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253
 MD5 6064ff5a3d1a71ccdb48f88872feb3a3 files/Muttrc 667
 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 f8939fc46ee6bccbfe58480c71a26f93 files/digest-mutt-1.5.6-r4 508
-MD5 81503e045c5d0a5c9d8c261b47ea200b files/digest-mutt-1.5.6-r5 585
+MD5 a3b8d5ca6c4f009d4a07b6463e44820c files/digest-mutt-1.5.6-r4 508
+MD5 bbcce3c6f8bd265e1449c0631ea896b6 files/digest-mutt-1.5.6-r5 585
 MD5 17ca1e2a5696251d01b9b488bcb0fc79 files/digest-mutt-1.5.8-r1 581
 MD5 cae412df424c3f499c539c93ebd02e48 files/digest-mutt-1.4.2.1 292
 MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531
diff --git a/mail-client/mutt/files/digest-mutt-1.5.6-r4 b/mail-client/mutt/files/digest-mutt-1.5.6-r4
index 7fc9e2fabfe0..d1f77c0b224e 100644
--- a/mail-client/mutt/files/digest-mutt-1.5.6-r4
+++ b/mail-client/mutt/files/digest-mutt-1.5.6-r4
@@ -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 4f66ba09feaee08cf96aad42879477e5 patch-1.5.6.vvv.nntp-gentoo-r2.bz2 83484
+MD5 01df0aa75ff09cfd8e7e4c2e9e26318f patch-1.5.6.vvv.nntp-gentoo-r3.bz2 83360
 MD5 bb4f3a9529e3fc14594ee2d4cf6f523f patch-1.5.6.tg.hcache.8 37794
 MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
diff --git a/mail-client/mutt/files/digest-mutt-1.5.6-r5 b/mail-client/mutt/files/digest-mutt-1.5.6-r5
index 3a39a7734024..3acf749cede8 100644
--- a/mail-client/mutt/files/digest-mutt-1.5.6-r5
+++ b/mail-client/mutt/files/digest-mutt-1.5.6-r5
@@ -2,7 +2,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 6391854229984242011eb757aedda7e7 patch-1.5.6.vvv.nntp-gentoo-r2.bz2 83671
+MD5 01df0aa75ff09cfd8e7e4c2e9e26318f patch-1.5.6.vvv.nntp-gentoo-r3.bz2 83360
 MD5 068e8c331756e0fc007d240456ff7d85 patch-1.5.6.tg.hcache.11 38888
 MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
 MD5 f2d3e1322e1bfb38ae9722c50c599bf9 patch-1.5.6.ddm.pgp-auto-decode.1 4536
diff --git a/mail-client/mutt/mutt-1.5.6-r4.ebuild b/mail-client/mutt/mutt-1.5.6-r4.ebuild
index ec6e9ba6d1cb..b8e3858f8e9c 100644
--- a/mail-client/mutt/mutt-1.5.6-r4.ebuild
+++ b/mail-client/mutt/mutt-1.5.6-r4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 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-r4.ebuild,v 1.9 2005/02/07 00:55:18 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.6-r4.ebuild,v 1.10 2005/02/25 15:09:41 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"
+nntp_patch="patch-${PV}.vvv.nntp-gentoo-r3.bz2"
 mbox_hook_patch="patch-${PV}.dw.mbox-hook.1"
 header_cache_patch="patch-${PV}.tg.hcache.8"
 pgp_timeout_patch="patch-${PV}.dw.pgp-timeout.1"
diff --git a/mail-client/mutt/mutt-1.5.6-r5.ebuild b/mail-client/mutt/mutt-1.5.6-r5.ebuild
index 33406687cafc..bd6a53b91b93 100644
--- a/mail-client/mutt/mutt-1.5.6-r5.ebuild
+++ b/mail-client/mutt/mutt-1.5.6-r5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 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-r5.ebuild,v 1.3 2005/02/21 18:38:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.6-r5.ebuild,v 1.4 2005/02/25 15:09:41 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"
+nntp_patch="patch-${PV}.vvv.nntp-gentoo-r3.bz2"
 mbox_hook_patch="patch-${PV}.dw.mbox-hook.1"
 header_cache_patch="patch-${PV}.tg.hcache.11"
 pgp_timeout_patch="patch-${PV}.dw.pgp-timeout.1"