summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'mail-client/mutt')
-rw-r--r--mail-client/mutt/ChangeLog9
-rw-r--r--mail-client/mutt/mutt-1.5.21-r9.ebuild (renamed from mail-client/mutt/mutt-1.5.21-r7.ebuild)20
2 files changed, 23 insertions, 6 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/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