From afdd723e5ecdd09bdadd520ae94a42fb1d995c87 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@drexel.edu>
Date: Sun, 16 Oct 2011 19:11:41 -0400
Subject: [PATCH] Update my mutt ebuild to match Portage's for mutt-1.5.21-r7.

---
 mail-client/mutt/Manifest                        |  4 ++--
 ...tt-1.5.21-r3.ebuild => mutt-1.5.21-r7.ebuild} | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)
 rename mail-client/mutt/{mutt-1.5.21-r3.ebuild => mutt-1.5.21-r7.ebuild} (94%)

diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 09e3f82..ae506aa 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,8 +1,8 @@
 AUX Muttrc 667 RMD160 0405e73c6a4122869ce9a9bd408068d316740b71 SHA1 e30c96e6f21a30fe576abcb3be65a34accf4e11f SHA256 932940db69c951caaa87a17ee98a8e2262aeadf1e978f6d671b642184c5d545f
 AUX Muttrc.mbox 486 RMD160 0f692c9d3a7591f3a0611529616aa94a5c62a641 SHA1 9e231303fe9fb2fe80542115ceefb972c7b11d5a SHA256 10b251f88ccc5d4c95c96ab17b6ab6a30a16d6590ab896a60037f869fc4d44a0
 AUX pgp_verbose_mime.patch 1470 RMD160 32957437aadf45a492c392ea90f3591ca095c26f SHA1 03a0ef5e24012488b433c0155f2608fb1bb01782 SHA256 3844bdec4edc74aacce0be5050fb336e269da6c0f13b4cb2f083f8821f33d50a
-DIST mutt-1.5.21-gentoo-patches-r3.tar.bz2 73761 RMD160 75c016384a9cd37006cb9246e348b876f8316ef2 SHA1 30762d027e36b85db0c071dd18575a39c9263844 SHA256 d371712919c11d975a27c62dd91071898f2344bdbe3653b9e58ff9a152bf753b
+DIST mutt-1.5.21-gentoo-patches-r7.tar.bz2 77409 RMD160 4513c4a72e86c2540199811dc472bb9044f0f682 SHA1 eacde1904bc03f0b8717ea9449748d39f54e3d35 SHA256 963e7feb561166dc6ceb7e72e542c7af206aadbb46dd422c9ec39b3e91652bee
 DIST mutt-1.5.21.tar.gz 3716886 RMD160 b235a42972ae410592253cdc117a90baf279f47a SHA1 a8475f2618ce5d5d33bff85c0affdf21ab1d76b9 SHA256 2141f36e8d0f4f71c9ca6780001e7cc679fe313e643953fc07f001223e67c4a0
-EBUILD mutt-1.5.21-r3.ebuild 7211 RMD160 047214492c4b8df3c46aa08be24d6400e3c6c95b SHA1 e791c597c40eea9afefd3c95fe31c1314d479f41 SHA256 7f4d9561f9e1c2ad4816d6db7516dc5aa2c8d1dda0deb5e20423ffdb208e8dc5
+EBUILD mutt-1.5.21-r7.ebuild 7398 RMD160 ac36b441f9e3bae8b4debbbeaf14d7057674a110 SHA1 973bd195a9d03fec1fd51e651f22eb2055f2ce73 SHA256 e45a34012fe6763d27b108b0ccea82fa215ae9aef9d9ba39979c8d44cd47ba42
 MISC ChangeLog 583 RMD160 9d1e1ab952568c41a14fba18dc9370798578ebda SHA1 30db4f820f8d5a7b09c86f967f29a3415c0c2507 SHA256 d660680dd3c5cd1ddfdfe96f1fd3c0decd4889fd3c2d37fca0294765f0bde8f1
 MISC metadata.xml 247 RMD160 6735f3a5dd2d7a2b70589d1693f35d54291b7147 SHA1 c015969fe50967340dd050a44cb9f8a30b5e34a5 SHA256 9e65060e5f9d0a50d28c7a69d9c27fed6c3037fdd3e420cc276627fde2794f72
diff --git a/mail-client/mutt/mutt-1.5.21-r3.ebuild b/mail-client/mutt/mutt-1.5.21-r7.ebuild
similarity index 94%
rename from mail-client/mutt/mutt-1.5.21-r3.ebuild
rename to mail-client/mutt/mutt-1.5.21-r7.ebuild
index 93e77af..d200da7 100644
--- a/mail-client/mutt/mutt-1.5.21-r3.ebuild
+++ b/mail-client/mutt/mutt-1.5.21-r7.ebuild
@@ -6,10 +6,10 @@ EAPI="3"
 
 inherit eutils flag-o-matic autotools
 
-PATCHSET_REV="-r3"
+PATCHSET_REV="-r7"
 
 DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org"
+HOMEPAGE="http://www.mutt.org/"
 SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
 	mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
 	http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
@@ -91,7 +91,11 @@ src_prepare() {
 
 	# we conditionalise this one, simply because it has considerable
 	# impact on the code
-	use sidebar && epatch "${PATCHDIR}"/sidebar.patch
+	if use sidebar ; then
+		epatch "${PATCHDIR}"/sidebar.patch
+		epatch "${PATCHDIR}"/sidebar-utf8.patch
+		epatch "${PATCHDIR}"/sidebar-dotpathsep.patch
+	fi
 
 	#custom line: added vk.pgp_verbose_mime patch
 	epatch "${FILESDIR}"/pgp_verbose_mime.patch
@@ -203,9 +207,11 @@ src_install() {
 
 	# A man-page is always handy
 	if use !doc; then
+		make -C doc DESTDIR="${D}" muttrc.man || die
 		cp doc/mutt.man mutt.1
 		cp doc/muttbug.man flea.1
-		doman mutt.1 flea.1
+		cp doc/muttrc.man muttrc.5
+		doman mutt.1 flea.1 muttrc.5
 	else
 		# nuke manpages that should be provided by an MTA, bug #177605
 		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
@@ -224,6 +230,6 @@ pkg_postinst() {
 	echo
 	elog "If you are new to mutt you may want to take a look at"
 	elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
-	elog "   http://dev.gentoo.org/~grobian/guide-to-mutt.xml"
+	elog "   http://www.gentoo.org/doc/en/guide-to-mutt.xml"
 	echo
 }
-- 
2.26.2