Revbump for bugs #413151 and #413405, added xterm_titles patch, see $ts_enabled, $ts_icon_format and $tc_status_format vars in muttrc(5)

Package-Manager: portage-2.2.01.20430-prefix/cvs/Darwin i386

3 files changed, 30 insertions, 13 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index c88ba3bbbf3d..f2c7f45cb979 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/mutt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.226 2012/03/15 20:10:11 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.227 2012/04/28 15:05:01 grobian Exp $
+
+*mutt-1.5.21-r9 (28 Apr 2012)
+
+  28 Apr 2012; Fabian Groffen <grobian@gentoo.org> +mutt-1.5.21-r9.ebuild,
+  -mutt-1.5.21-r7.ebuild:
+  Revbump for bugs #413151 and #413405, added xterm_titles patch, see
+  $ts_enabled, $ts_icon_format and $tc_status_format vars in muttrc(5)
 
   15 Mar 2012; Fabian Groffen <grobian@gentoo.org> mutt-1.5.21-r8.ebuild:
   Updated sidebar-dotpathsep patch for ignoring trailing path separators, bug
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 0d891ab93e1e..6b7a7e9d673b 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -5,17 +5,17 @@ AUX Muttrc 667 RMD160 0405e73c6a4122869ce9a9bd408068d316740b71 SHA1 e30c96e6f21a
 AUX Muttrc.mbox 486 RMD160 0f692c9d3a7591f3a0611529616aa94a5c62a641 SHA1 9e231303fe9fb2fe80542115ceefb972c7b11d5a SHA256 10b251f88ccc5d4c95c96ab17b6ab6a30a16d6590ab896a60037f869fc4d44a0
 DIST mutt-1.5.21-gentoo-patches-r1.tar.bz2 68796 RMD160 10b38c663d39e169c3c456e5cbf7bd855c203186 SHA1 2df153ce3870576e8dba84a6f54df698333587e8 SHA256 89b67ad863941aacdc2b1c9d3fd4f90f7b0cb50bd5fc10c9284a82ce6e7687c0
 DIST mutt-1.5.21-gentoo-patches-r11.tar.bz2 85590 RMD160 477d2e5fddd168e3256b835f5626311eaceaa240 SHA1 c70fa3bd1eee5d075c09bc60422cb8f5be901b73 SHA256 e8f650eb8ebfa6d160d63ca2af9e89fc4aaf0976661ec5ff73750f5c663f70f9
-DIST mutt-1.5.21-gentoo-patches-r7.tar.bz2 77409 RMD160 4513c4a72e86c2540199811dc472bb9044f0f682 SHA1 eacde1904bc03f0b8717ea9449748d39f54e3d35 SHA256 963e7feb561166dc6ceb7e72e542c7af206aadbb46dd422c9ec39b3e91652bee
+DIST mutt-1.5.21-gentoo-patches-r12.tar.bz2 88492 RMD160 7f6969d64e3ed3275c83fea2a08430d3c9a7142d SHA1 b880376d01d989d646fee744214192cd7b2ad393 SHA256 7b9c0ad07b29918a6a967ff39fa43524229d4a5aeb77707daad0e68853520d94
 DIST mutt-1.5.21.tar.gz 3716886 RMD160 b235a42972ae410592253cdc117a90baf279f47a SHA1 a8475f2618ce5d5d33bff85c0affdf21ab1d76b9 SHA256 2141f36e8d0f4f71c9ca6780001e7cc679fe313e643953fc07f001223e67c4a0
 EBUILD mutt-1.5.21-r1.ebuild 7210 RMD160 374a20b04d4224a70dd586e46f524dbbc7cea5aa SHA1 6cb38aa0bfe28d4c9e6821fecbc679fe465c15c2 SHA256 a0a12e58c0278662869b49be31dc2f340505a48a9210fd9089f18237b86e76ec
-EBUILD mutt-1.5.21-r7.ebuild 7454 RMD160 6342a981202c4151c21d8a7f4142d2311069c8c0 SHA1 ad702d970d08fd2f8c15c7c37cdf4291d4b19776 SHA256 2b4cca3d03bc61cb19787f270c5a1bec3b2535fb4d25ef70af327a85c430a081
 EBUILD mutt-1.5.21-r8.ebuild 7491 RMD160 91cc3924d47c1a4ef65784af72663a44ee749bb0 SHA1 47c29f4664ab4d70450c9d3857256072f3fb7504 SHA256 1a35e4bdb00aea344db2e2f93d160ac4ec0690f2f5cb59f3494123be4ec1fcb3
-MISC ChangeLog 50891 RMD160 674a95b3cad474138e6934fd8f71a6d942cccd9c SHA1 21a4043609b30a5145e78981fd1728b3c9845c56 SHA256 dde8417f635c5fd5b5d7cc66315213f4f4896997c407f7c8de5a00867f4f8c70
+EBUILD mutt-1.5.21-r9.ebuild 7868 RMD160 3898ff8f200ba0ae7f29c3f604a112ea57b5a2c4 SHA1 57032835f46bc1f79a465adefb67a5811b7b9b23 SHA256 8487a07bc99d7944684704f55e71a3abc15dafb7815722c96562562cc0014274
+MISC ChangeLog 51165 RMD160 6d05697b3a7aae02835b1dac8ca01e7ea64fb7e0 SHA1 d0bbf429fa2f2bb8142f3ca1599fd0d85926e142 SHA256 25dc2de5a94ff0911d6ed4fa8d44361d08c28b1f8294e6a40c30816d5dd1f51e
 MISC metadata.xml 650 RMD160 499b30bbf757e578b8546c72c9d22e033bad1fd0 SHA1 0ad0c9dc1d2a2a1b9da1e32d2f3e056e5b0e6d98 SHA256 b7ca8aa383b947a5e90eafab3839a9ed2a8c4f36f4890fec19636d774ccf5320
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (Darwin)
+Version: GnuPG v2.0.19 (Darwin)
 
-iEYEARECAAYFAk9iTL4ACgkQX3X2B8XHTolG0QCeNBiDDttju72sPmdwM+PrX4hm
-nFkAnicYg6NH0Lv0w+uoyb6YZbQxc6OA
-=3n2X
+iEYEARECAAYFAk+cB0sACgkQX3X2B8XHTolu8gCcCjrfYj3PcHKIF8tjj5fJ7vmX
+V/oAn1pGurIzxGE+MopOfMbvgLXD67iJ
+=TeBW
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mutt/mutt-1.5.21-r7.ebuild b/mail-client/mutt/mutt-1.5.21-r9.ebuild
index 2f504a56ec87..fe6392cf010b 100644
--- a/mail-client/mutt/mutt-1.5.21-r7.ebuild
+++ b/mail-client/mutt/mutt-1.5.21-r9.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.21-r7.ebuild,v 1.2 2011/12/04 21:05:40 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.21-r9.ebuild,v 1.1 2012/04/28 15:05:01 grobian Exp $
 
 EAPI="3"
 
 inherit eutils flag-o-matic autotools
 
-PATCHSET_REV="-r7"
+PATCHSET_REV="-r12"
 
 DESCRIPTION="A small but very powerful text-based mail client"
 HOMEPAGE="http://www.mutt.org/"
@@ -81,6 +81,8 @@ src_prepare() {
 	epatch "${PATCHDIR}"/interix-btowc.patch
 	epatch "${PATCHDIR}"/solaris-ncurses-chars.patch
 	epatch "${PATCHDIR}"/gpgme-1.2.0.patch
+	epatch "${PATCHDIR}"/emptycharset-segfault.patch
+	epatch "${PATCHDIR}"/gpgkeyverify-segfault.patch
 	# same category, but functional bits
 	epatch "${PATCHDIR}"/dont-reveal-bbc.patch
 
@@ -102,6 +104,9 @@ src_prepare() {
 	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \
 		muttlib.c || die "failed patching in Gentoo version"
 
+	# allow user patches
+	epatch_user
+
 	# many patches touch the buildsystem, we always need this
 	AT_M4DIR="m4" eautoreconf
 
@@ -203,10 +208,15 @@ src_install() {
 	rm "${ED}"/etc/${PN}/mime.types
 	dosym /etc/mime.types /etc/${PN}/mime.types
 
-	# A man-page is always handy
+	# A man-page is always handy, so fake one
 	if use !doc; then
 		make -C doc DESTDIR="${D}" muttrc.man || die
-		cp doc/mutt.man mutt.1
+		# make the fake slightly better, bug #413405
+		sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
+			-e 's#in @docdir@,#at http://www.mutt.org/,#' \
+			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
+			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
+			doc/mutt.man > mutt.1
 		cp doc/muttbug.man flea.1
 		cp doc/muttrc.man muttrc.5
 		doman mutt.1 flea.1 muttrc.5