[gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/

["Fabian Groffen" <grobian@gentoo.org>]

commit:     a7fb0fb0ea2f1a80e2f54b969a57f542146c7531
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 15:49:30 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 15:51:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7fb0fb0

mail-client/mutt: imported neomutt patch for sidebar with 1.6.0

Package-Manager: portage-2.2.28-prefix

 mail-client/mutt/Manifest          |  2 +-
 mail-client/mutt/mutt-1.6.0.ebuild | 19 ++++---------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 298226a..c14cb0f 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -4,5 +4,5 @@ DIST mutt-1.5.23-gentoo-patches-r8.tar.bz2 167959 SHA256 30aed5383b77321b92e407b
 DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37 SHA512 f1b4a7230253651857f61bd7215cce870a613012f613d4c907d401556083726c8ed7d429d57a8bf858c3b5b23683380d4c1494540d86ca80813e22cb6b95bc1e WHIRLPOOL b5a676d204aece8c572d57a027fa5a402b7afe8e5b7d4c83b2d1b1612eb0ac5cb58cd225757732a017f03444e0ea42dacffcf1cf2d46c18ae92d7d3306059c61
 DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb79020776ce5bdf614772c387b15992e14f7c444d2 SHA512 c19e6627683b91119bbbfcd5b3250cb3fb79ff9d62b45861002c50ac232f65447744313921fe10a517efb9cb93f5638615d5b8ce1dd946fab3083bd9eaffefc1 WHIRLPOOL cbd1a3858e3b187117e26718066a2f2dd9c690aca3a77b050142d12b96599adada1a8a723b91b000f9eda92d9ceed284a1ac5cdd243de8085a233f01fac003d7
 DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
-DIST mutt-1.6.0-gentoo-patches-r2.tar.xz 71108 SHA256 70709080f34b0eb49b5279f477f8f81b9b552e7eadc8e3bade761cbf905aac18 SHA512 8fff6af8e2d92612d9c90d89e526e85e11271ba42ae8b4482f813fe4ad4708746e1a5d602ab75e59ebc90e92b5d3f97a81d69a76d0f75173970f5b338bd1fd67 WHIRLPOOL 590361266bab02f95f1e78784ce8e0617c9766dccd2823864b24e4c6bc12f069ffbcdde741dc162f024431db68b0047cf7b97c3ef756be6f73499bc6a961e796
+DIST mutt-1.6.0-gentoo-patches-r3.tar.xz 98916 SHA256 f2da720b9498764ea42a6c5e2143aa1691ef84982fe02ddf405a1071e834dc95 SHA512 52af447376aac9c24735e4bc1c9c489b44cbb0d94b04b8792d92c3d8286bb4de604ccab5ca2cf4d93240266098e7c307adf60506538ccf47535e23babb3c62db WHIRLPOOL 3210d10f16e1d6b22e809a45456d13c07778b3240c66d3b082ef11d1b3518e733418e3bfe659f02893330a85448bcc3a99b01ef91b4e1f7027831c322da6cca2
 DIST mutt-1.6.0.tar.gz 3954591 SHA256 29afb6238ab7a540c0e3a78ce25c970f975ab6c0f0bc9f919993aab772136c19 SHA512 601d5f70c7cd30903799714cd85b80f9650a029e621d044075e123656411dde809d5cef24a40ba49860bc242cf4a0b914c703deb5a7125b3a24eeb93f4ae3c4c WHIRLPOOL 4d0271ab703ec7fdadc49861921bb4728ee2e88629c45f286647982efa2b1021f07b929a745622961d8cd007941975cee1c29718536fd753563eb74e7670beac

diff --git a/mail-client/mutt/mutt-1.6.0.ebuild b/mail-client/mutt/mutt-1.6.0.ebuild
index ec55f28..985545d 100644
--- a/mail-client/mutt/mutt-1.6.0.ebuild
+++ b/mail-client/mutt/mutt-1.6.0.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 
 inherit eutils flag-o-matic autotools
 
-PATCHSET_REV="-r2"
+PATCHSET_REV="-r3"
 
 DESCRIPTION="A small but very powerful text-based mail client"
 HOMEPAGE="http://www.mutt.org/"
@@ -83,15 +83,6 @@ RDEPEND="${CDEPEND}
 "
 PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
 
-pkg_setup() {
-	if use sidebar ; then
-		eerror "Sorry, but this version does not yet support sidebar"
-		eerror "Please mask ${PF} for now and check back later:"
-		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
-		die "booooo"
-	fi
-}
-
 src_prepare() {
 	# Post-release hot-fixes grabbed from HG, this is what all following
 	# patches are based on in my Mercurial patchqueue (mq).
@@ -127,15 +118,13 @@ src_prepare() {
 	# we conditionalise this one, simply because it has considerable
 	# impact on the code
 	if use sidebar ; then
-		epatch "${PATCHDIR}"/sidebar-20140412.patch
-		epatch "${PATCHDIR}"/sidebar-dotpathsep.patch
-		epatch "${PATCHDIR}"/sidebar-counts.patch
+		epatch "${PATCHDIR}"/sidebar-neomutt.patch
 	fi
 
 	# Avoid symbol conflicts on Solaris
 	sed -i \
-		-e 's/\<M_CMD\>/MUTT_CMD/g' \
-		-e 's/\<M_READ\>/MUTT_READ/g' \
+		-e 's/\<M_CMD\>/MT_CMD/g' \
+		-e 's/\<M_READ\>/MT_READ/g' \
 		*.[ch] imap/*.[ch] || die
 
 	local upatches=