Revbump for sidebar patches, re-added sidebar_delim_chars for bug #491514 and added counts fix by SpanKY, bug #526696

Package-Manager: portage-2.2.14_rc1-prefix/cvs/Darwin i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

3 files changed, 18 insertions, 9 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 44313ebf3161..266e918dd557 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/mutt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.270 2014/10/24 18:24:05 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.271 2014/10/26 14:49:52 grobian Exp $
+
+*mutt-1.5.23-r4 (26 Oct 2014)
+
+  26 Oct 2014; Fabian Groffen <grobian@gentoo.org> +mutt-1.5.23-r4.ebuild,
+  -mutt-1.5.23-r3.ebuild:
+  Revbump for sidebar patches, re-added sidebar_delim_chars for bug #491514 and
+  added counts fix by SpanKY, bug #526696
 
 *mutt-1.5.23-r3 (24 Oct 2014)
 
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 5df28944b6d8..980a8a4e8c72 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -7,17 +7,17 @@ AUX mutt-1.5.22-cve-2014-0567.patch 564 SHA256 493c7c47a0ae36fb70f07e16de7740cd9
 DIST mutt-1.5.22-gentoo-patches-r2.tar.bz2 81259 SHA256 d4ec35bfaf51276645feb9a7808455e6970aa2c171ed9767d2c6c2f3c9c60f5c SHA512 99b5c37dcd74aabc6c8673321aa13d00dab6bf82ad593ede920897921d633903d1de7fc4a80e04cccf0a5d7673560cb7a4e94830fcae27b60d696cb65315ba50 WHIRLPOOL c164faa5822a8181497a57526dcfe123e2fd5d0aa4db76c702a3794a1adb0fdb56377c4471464828617e44beadd7cd7509c2145fb7ae038b753b61be826bf6ba
 DIST mutt-1.5.22.tar.gz 3782237 SHA256 8feae890ed0758a5108bafaef27bd8fc9c378675acf25a3c620f2c7b7540f3a7 SHA512 96edfafa9460bbaff1c5a78f40735599f53e08f794866822558d59e351646b1d2045afbf97000012a6d9f261649e9b473c01f89ade542712120f9213c657b0a1 WHIRLPOOL 4c13c6f667a8990b933c8e25f43e96ba0562785b4038776949abea45454a1621bf1bb9351a52bec3d69909b9dc643de7f7ba383119f1ab8b20cea77d0bad1da9
 DIST mutt-1.5.23-gentoo-patches-r2.tar.bz2 87389 SHA256 5d1affbaa353a5e5e10aafe805e962f30a259e96f3448205a414b4e92131402f SHA512 93c95411f99f5dfc96478ed749622105da660102a9fdcd0365caf93138b800b27879633fed53f0b6bb4f712bb0b82d523ce307464fdf6c2e78f2353d73818ff3 WHIRLPOOL 9371116119ae4b04539c9e6049f3745a0536a9a28ae1a6d8acdfedb9e60b7fa131d914ccbee10578c8ac59f343ca8469d05af4b2a777b4cbc4543fb6702650dd
-DIST mutt-1.5.23-gentoo-patches-r3.tar.bz2 122922 SHA256 04bdc47ecc8db8d2912bc0e486e5fcbdda90ef8fb7112ad1e946e7d36378d5e8 SHA512 4c6ec21a52c8463a44f310c3278090cd4b4754b4cbd657e3045bb0b8fb8509aa002334636cc5351f209ed30f7dcf4562e0330165d16d25ef64bec0e4a723615b WHIRLPOOL fd70806275378823375590b7a9b1124b0b11cf8c91cecba7ea504e13f1b579dde908b5be86970214adee090f57b75c59d8e7b494cba2d510d2569e1e07ba8dc8
+DIST mutt-1.5.23-gentoo-patches-r4.tar.bz2 124120 SHA256 1e37cc92735ae4105a560c96212a90568956e90241a84c3262b77fc1f5c2689e SHA512 88afbb2d119875e32b531ffe381f12be19c9994bd6d91716246d2bcec6c0733a52f505b01bc05ed5ae50247b3d52a79bf5bf0bc5a509a740facab4df2cd94373 WHIRLPOOL 490393ddf828bf760081b1dfcab52870af4512ecbe9aeede4d67f565c0a22f9cb4ebf620e9536ea4572229b771d0ec316b294d9236da115baf0673d1a6f1c8cc
 DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37 SHA512 f1b4a7230253651857f61bd7215cce870a613012f613d4c907d401556083726c8ed7d429d57a8bf858c3b5b23683380d4c1494540d86ca80813e22cb6b95bc1e WHIRLPOOL b5a676d204aece8c572d57a027fa5a402b7afe8e5b7d4c83b2d1b1612eb0ac5cb58cd225757732a017f03444e0ea42dacffcf1cf2d46c18ae92d7d3306059c61
 EBUILD mutt-1.5.22-r3.ebuild 8041 SHA256 d29454a4795ccd8c725eb1a64d1d60706500f5e3eb04b95bf90105500007c712 SHA512 c5b2e0d93d3e8217c32e547abac76bdf79e81aa5228939145dc8d0e9a4f137db682356c70287f4ba4816b857ee14144faabfe5027d00364075c1c0b801b14c04 WHIRLPOOL 0d545ffb228749103f2dd9d6a114ad066d9a380ba7b04be01634092850ea188f37d60ebc9b63fe32737d3a50f902cba4c8c8845a73f6ffc4db4849dc9640ec48
 EBUILD mutt-1.5.23-r2.ebuild 8029 SHA256 03b8f09b525fe44136a0a3abcec3c37d7e0e713eeeec7ed77abbc49db7d095d1 SHA512 79be6acfbd3d3d7bb4cc9ed21ba9d457b8734ec2da766cfe8d33f386573785e3153c653f0830bbf5bbf03a049d72a51830e214d5b223c5de54a790a566564575 WHIRLPOOL ba88b3775118de6c723bb728f263b4382d45080cfb00e6ab07fb88d735270c333ccd85a4ef279c3e225e9cf094c8025e74661581afb912fa0103da8bf924c492
-EBUILD mutt-1.5.23-r3.ebuild 7948 SHA256 9a84c5ef904be180b475f7b699cafeab2f61b47be3d40062393bf491fc1c86b1 SHA512 03b3b0e523d9fa20bf557e4a8a706d410d6e04f38ca837e10b41a6b3703beb3373459807f6122555a39dad69b6b81aeb682e82b325ebb2bfbb624a5223ff81e8 WHIRLPOOL 69b70f921cb56f051ef552b7b4715b60b57cc72a9c8bd90fdd99a990167c1e37b6a8ac9fd5043006a96c987b5c7ddcb020caa21825793cf06c5a36d6a89fc9d0
-MISC ChangeLog 57300 SHA256 96b217f4020c65565fe091f8bad585232d839aa1569b3fac755a0fc6fa86c684 SHA512 4a84f957b3ead525db031867d4e2027d60c053d59b89959ad4fa91e061146d11974e1cf20777909cba0c0849257140a58ccd70569ff9b1a390a022560050c4f7 WHIRLPOOL 79f0a57138cf40863f36181ffe9de0e899f2d17b860a5f2313d301072c857d5e952432802973731538cc79f546c904492a0735dfe234684232b373201c2c8018
+EBUILD mutt-1.5.23-r4.ebuild 8040 SHA256 76670c24150e01ec724f26e09b9c7975c82e3085d245c43e66f9799a5b90ebea SHA512 3676edd07ee84c76e8bba264163c19c974ae27f14c89ccd0f73e239eefd8b3d0983bcbbf40ecfad1f98466b51d84aa024b3020e826cf99689fadd0bb58b0938d WHIRLPOOL 6b5d21f7e60a8f2cbffd03e83c159f6f4cffd9f155cf142e55103dd8f6af1fd141d1bcf0c33769d112a5c108858783e1769695d1632e39290f9adeb09568897b
+MISC ChangeLog 57555 SHA256 c3d395362ee220e9a56148c4e83cfbace7b0d6bcfd50f448dc7378087ac16830 SHA512 990402af1449b72d5e547f29e903e50e3f1c457e697c81e47036c0a1aa4a5a8ce145ea97a8f2dc5eb9848a9da9cf52bf9d1eed0c6240b0154e12602a336d2333 WHIRLPOOL 2669d28e98031310e474340918b831d5de5d34795bd535c94d1e47fa2e954bc2e8f6297219be23287224cbc0ee7a8519bba4db6ec609d7acca926e8b084db12e
 MISC metadata.xml 650 SHA256 b7ca8aa383b947a5e90eafab3839a9ed2a8c4f36f4890fec19636d774ccf5320 SHA512 26cb0a77d35e30432a88cf487d61da45c52967e8327f605a25f97a455fbb0eb518a44e589e140fa55cd7610b8fd22861c0149ef4ebaadd78173cbf8431adee5a WHIRLPOOL e4a73bbce432f77cc336bc93fed13ac6fc4e0e651643cc06402488383c5297a360c59a90e7e67667e2b48a564f10e5169282fe053a5426ee5f186338eddd2cee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRKmUcACgkQX3X2B8XHTolyGQCfbxt5DZNT6TjTEZXQ3Yh/hYf/
-paUAmweuHnPmfP0lSqK4z0XbdXwjIzOU
-=pfIi
+iEYEAREIAAYFAlRNChEACgkQX3X2B8XHTonMPwCfZS3L8sTKCCSET3cWAw8ycueh
+YZ8An1/7GGfrUXYQVXILMyawo1whx7Mp
+=CP7Q
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mutt/mutt-1.5.23-r3.ebuild b/mail-client/mutt/mutt-1.5.23-r4.ebuild
index 6d2ef44bf6ee..88cea6fc7e59 100644
--- a/mail-client/mutt/mutt-1.5.23-r3.ebuild
+++ b/mail-client/mutt/mutt-1.5.23-r4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.23-r3.ebuild,v 1.1 2014/10/24 18:24:05 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.23-r4.ebuild,v 1.1 2014/10/26 14:49:52 grobian Exp $
 
 EAPI="5"
 
 inherit eutils flag-o-matic autotools
 
-PATCHSET_REV="-r3"
+PATCHSET_REV="-r4"
 
 DESCRIPTION="A small but very powerful text-based mail client"
 HOMEPAGE="http://www.mutt.org/"
@@ -100,6 +100,8 @@ src_prepare() {
 	# impact on the code
 	if use sidebar ; then
 		epatch "${PATCHDIR}"/sidebar-20140412.patch
+		epatch "${PATCHDIR}"/sidebar-dotpathsep.patch
+		epatch "${PATCHDIR}"/sidebar-counts.patch
 	fi
 
 	local upatches=