Fix up -r4 patch to fix compilation issue, bug #314785

Package-Manager: portage-2.2.00.15842-prefix/cvs/SunOS i386

6 files changed, 20 insertions, 16 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 96f4531a3683..c31f70118106 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/mutt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.182 2010/04/11 19:17:46 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.183 2010/04/12 08:31:17 grobian Exp $
+
+  12 Apr 2010; Fabian Groffen <grobian@gentoo.org> mutt-1.5.20-r6.ebuild,
+  mutt-1.5.20-r10.ebuild, mutt-1.5.20-r13.ebuild, mutt-1.5.20-r14.ebuild:
+  Fix up -r4 patch to fix compilation issue, bug #314785
 
 *mutt-1.5.20-r14 (11 Apr 2010)
 
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 7aed3d23ff21..cd17aeb92aa1 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -8,13 +8,13 @@ AUX mutt-1.5.18-solaris-ncurses-chars.patch 1926 RMD160 dc8c17c88f66d4ed94d885ba
 AUX mutt-1.5.20-dont-reveal-bbc.patch 4027 RMD160 0295eb2ed6ae7d3b39c5b101d519d13f45d64c80 SHA1 c7ac97ec879c070eb3a24184ce41b199eec89840 SHA256 88b313f8baea81eec814d03acbe9aa5cf4a249de120426608893c1c53a8a3596
 AUX mutt-1.5.20-gpgme-1.2.0.patch 623 RMD160 0387025c571723f9ebde284789c65464cf0c2da4 SHA1 230af7e00e06a41f0024b8c6e19bd9d5b208511c SHA256 9e69e53cb3013a379f85e6dcea0550c4ec8582ea1f36a83c6a0ad95828164551
 AUX mutt-1.5.20-realpath-slowness.patch 676 RMD160 7e658134eabeec3f67c4de161bd9996e0096f240 SHA1 e189eb03f2488ad158bdd8ec93fed0f7e6762746 SHA256 a8d15cb9e5fb130b6fc28d9b323afe62e2dbe33f1b86f707de20053f2b9a9a3a
-DIST mutt-1.5.20-gentoo-patches-r5.tar.bz2 78270 RMD160 27fcfe0739c6faa9b5b3326310303b60078336e7 SHA1 38fa1b1743776e0bb8aa5b48d93dd421f15e56ec SHA256 224ad87a763bd08e4cd34b2e515c69a36f7090c38ac6a97775237d9824c31aac
-DIST mutt-1.5.20-gentoo-patches-r6.tar.bz2 78025 RMD160 7f16db9be306d99c05685557a2d89ebbaadfee6c SHA1 03ae43a5f4952372e773e8d2d973330f43d67c7b SHA256 b40a2af026a7e8ef177e04e7f0f07374d0e69af652d3c96b098c21210af4f5f4
+DIST mutt-1.5.20-gentoo-patches-r5.1.tar.bz2 78129 RMD160 d34779d691295d85a55828fa51e64b06a6c92d1d SHA1 193ec7edb6cffde670086a262aff9615f07adea8 SHA256 4c855764daaf939777c8f23a217cf43d6246dbc89f99827030c1ad3d53820b2d
+DIST mutt-1.5.20-gentoo-patches-r6.1.tar.bz2 77937 RMD160 6295a415cb2e89abf6f1cc3adb110817b11ef632 SHA1 cddaac63287a1ce9577f8f09e9b6f6973148332a SHA256 2e887fc1294a03af0040216e4d8657c3a642aa61e0021624726681d67f0afbbe
 DIST mutt-1.5.20.tar.gz 3635047 RMD160 df582f79364b9fd70a0001e76a119d8f78275ebb SHA1 d2bec7a33771f128ca49b1723b06b6d248a35d31 SHA256 9579fc079d74ff5c89223ff09df402ef4e508ba8ca925c49e74aa09c02a9a796
 DIST patch-1.5.20.sidebar.20090619.txt 53335 RMD160 4c693b100a320d11ea94aedb75cff63d9f6cfb3f SHA1 d72355e39674bb4f892e4af3b84fe49c94415487 SHA256 6e925319adbfa0ba7f120f0ef4ddc62f99b1dc8f6a8b5bdc31dd8a0040aded1b
-EBUILD mutt-1.5.20-r10.ebuild 7956 RMD160 2e132515fe6fa4ebf178f09a09650272d8ca23a0 SHA1 cb1d70b06b9ad23bd2c8acd592b0481d259f47bf SHA256 f69188511d58a4d2f4fc9255e7bcc95a18e135f773550d9f8126c622d651f187
-EBUILD mutt-1.5.20-r13.ebuild 7708 RMD160 46030c076857011f954bd2ff732d76c81cb59f32 SHA1 1f2b5ef61c6a0bbbf275e5872606eb18e3d576a3 SHA256 254122fcdbaa55a43155bbbb1b9285330282ee9d5e2a9d34bfba4926a4427e12
-EBUILD mutt-1.5.20-r14.ebuild 7766 RMD160 27f9059d4da66a38ef6181b2daf1b732b5d673d1 SHA1 4fd711aa168bae2e0c503d04d1ea4bd6cafaa13c SHA256 5feca9be731c229f5f8ccd525e998e871036371f3616ec575008576f86a47d95
-EBUILD mutt-1.5.20-r6.ebuild 7278 RMD160 13f7c5b0a8ce9af13b3c04d0e258bf1ac568bbc9 SHA1 8df8afbd9326c0d66453dddd0a833557dd070ad2 SHA256 bddd72973cb7c74b0528fb1e5bc75be8eeb2833b92f4d3cd0f45f277f847d7b6
-MISC ChangeLog 42791 RMD160 4de6ab875b87e692c6b616a20eb3e2f77cbf4c04 SHA1 4da0dbf1a7db628497ad747bdcd4f492a8cb54e8 SHA256 1c83daf09aad3a8481d0a4f84c0cac16daeba271641f50562377e74cd5fcd994
+EBUILD mutt-1.5.20-r10.ebuild 7958 RMD160 c185ac0ab4fa7cafc2f1e645b5d445c133db59bb SHA1 a87fd09bac2321e30748439b2bbc717254076f54 SHA256 d93b2daf5926e01ba4906720fb86f7285cfa29b7877a32f1aeaababb00e35837
+EBUILD mutt-1.5.20-r13.ebuild 7710 RMD160 1a0685395beda44ab9954552a1cb12b670cb2184 SHA1 ad9e3c4643f3be5ad1bc3eaff7742bf68607a3fc SHA256 0171a87a7d880de9f276c97452655ddd87ba6ae5c81c2dbe61dc10ec1c2363cc
+EBUILD mutt-1.5.20-r14.ebuild 7768 RMD160 b65ab9f3f9be3c76813b4346e84c94f984c8a27f SHA1 cf878bf6606b4cf9a0fb09fd7c535c9d7e36800d SHA256 799546cb5c84fdd15341672d1f51c29446ae28c43e41b7c351ee87e20cbe657b
+EBUILD mutt-1.5.20-r6.ebuild 7280 RMD160 db5a40d2e845def3f4819de2d8272049215da0f1 SHA1 86e2c567618d1e6753806790072efb2811515348 SHA256 4999238ee8c6d875179d49f1b2b32e82c50b6179b8b4f0f6f97948910f55de11
+MISC ChangeLog 42997 RMD160 b1cfab927fa8342e3ca352bebf9e144d4ba3a5d7 SHA1 ee10c1e2e7de9dec31004456e4e45beef0e50176 SHA256 cba420f6f992ccb8e0d26a6f4cf7d279957733862fea7f46a7c634ec21d29ba6
 MISC metadata.xml 650 RMD160 499b30bbf757e578b8546c72c9d22e033bad1fd0 SHA1 0ad0c9dc1d2a2a1b9da1e32d2f3e056e5b0e6d98 SHA256 b7ca8aa383b947a5e90eafab3839a9ed2a8c4f36f4890fec19636d774ccf5320
diff --git a/mail-client/mutt/mutt-1.5.20-r10.ebuild b/mail-client/mutt/mutt-1.5.20-r10.ebuild
index 59eae06341bb..f253c9a8ba7e 100644
--- a/mail-client/mutt/mutt-1.5.20-r10.ebuild
+++ b/mail-client/mutt/mutt-1.5.20-r10.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r10.ebuild,v 1.8 2010/04/11 19:17:46 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r10.ebuild,v 1.9 2010/04/12 08:31:17 grobian Exp $
 
 inherit eutils flag-o-matic autotools
 
-PATCHSET_REV="-r5"
+PATCHSET_REV="-r5.1"
 
 # note: latest sidebar patches can be found here:
 # http://www.lunar-linux.org/index.php?option=com_content&task=view&id=44
diff --git a/mail-client/mutt/mutt-1.5.20-r13.ebuild b/mail-client/mutt/mutt-1.5.20-r13.ebuild
index c3821a66cfe8..db81c222eb7e 100644
--- a/mail-client/mutt/mutt-1.5.20-r13.ebuild
+++ b/mail-client/mutt/mutt-1.5.20-r13.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r13.ebuild,v 1.2 2010/04/11 19:17:46 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r13.ebuild,v 1.3 2010/04/12 08:31:17 grobian Exp $
 
 EAPI="3"
 
 inherit eutils flag-o-matic autotools
 
-PATCHSET_REV="-r5"
+PATCHSET_REV="-r5.1"
 
 # note: latest sidebar patches can be found here:
 # http://www.lunar-linux.org/index.php?option=com_content&task=view&id=44
diff --git a/mail-client/mutt/mutt-1.5.20-r14.ebuild b/mail-client/mutt/mutt-1.5.20-r14.ebuild
index e2a61ea0e4b3..546568996bca 100644
--- a/mail-client/mutt/mutt-1.5.20-r14.ebuild
+++ b/mail-client/mutt/mutt-1.5.20-r14.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r14.ebuild,v 1.1 2010/04/11 19:17:46 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r14.ebuild,v 1.2 2010/04/12 08:31:17 grobian Exp $
 
 EAPI="3"
 
 inherit eutils flag-o-matic autotools
 
-PATCHSET_REV="-r6"
+PATCHSET_REV="-r6.1"
 
 # note: latest sidebar patches can be found here:
 # http://www.lunar-linux.org/index.php?option=com_content&task=view&id=44
diff --git a/mail-client/mutt/mutt-1.5.20-r6.ebuild b/mail-client/mutt/mutt-1.5.20-r6.ebuild
index a6679a57091f..9618f202bb60 100644
--- a/mail-client/mutt/mutt-1.5.20-r6.ebuild
+++ b/mail-client/mutt/mutt-1.5.20-r6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r6.ebuild,v 1.5 2010/04/11 19:17:46 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r6.ebuild,v 1.6 2010/04/12 08:31:17 grobian Exp $
 
 inherit eutils flag-o-matic autotools
 
-PATCHSET_REV="-r5"
+PATCHSET_REV="-r5.1"
 
 # note: latest sidebar patches can be found here:
 # http://www.lunar-linux.org/index.php?option=com_content&task=view&id=44