summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2012-06-14 17:13:42 +0000
committerFabian Groffen <grobian@gentoo.org>2012-06-14 17:13:42 +0000
commite7ecc256973fb756b5c65724360773aae3033623 (patch)
tree9a8d06ef1e0a4f76aecd7aa80d2651d7f0d15266 /mail-client
parentReturn 2 branch, bug 418149 (diff)
downloadgentoo-2-e7ecc256973fb756b5c65724360773aae3033623.tar.gz
gentoo-2-e7ecc256973fb756b5c65724360773aae3033623.tar.bz2
gentoo-2-e7ecc256973fb756b5c65724360773aae3033623.zip
Revbump for automake-1.12 fix, bug #420955.
(Portage version: 2.2.01.20430-prefix/cvs/Darwin i386)
Diffstat (limited to 'mail-client')
-rw-r--r--mail-client/mutt/ChangeLog8
-rw-r--r--mail-client/mutt/mutt-1.5.21-r10.ebuild (renamed from mail-client/mutt/mutt-1.5.21-r8.ebuild)15
2 files changed, 18 insertions, 5 deletions
diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index f2c7f45cb979..a2ab99cb4a6c 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,12 @@
# 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.227 2012/04/28 15:05:01 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.228 2012/06/14 17:13:42 grobian Exp $
+
+*mutt-1.5.21-r10 (14 Jun 2012)
+
+ 14 Jun 2012; Fabian Groffen <grobian@gentoo.org> +mutt-1.5.21-r10.ebuild,
+ -mutt-1.5.21-r8.ebuild:
+ Revbump for automake-1.12 fix, bug #420955.
*mutt-1.5.21-r9 (28 Apr 2012)
diff --git a/mail-client/mutt/mutt-1.5.21-r8.ebuild b/mail-client/mutt/mutt-1.5.21-r10.ebuild
index 211176025f6b..0f815be73dea 100644
--- a/mail-client/mutt/mutt-1.5.21-r8.ebuild
+++ b/mail-client/mutt/mutt-1.5.21-r10.ebuild
@@ -1,12 +1,12 @@
# 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-r8.ebuild,v 1.5 2012/03/15 20:10:11 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.21-r10.ebuild,v 1.1 2012/06/14 17:13:42 grobian Exp $
EAPI="3"
inherit eutils flag-o-matic autotools
-PATCHSET_REV="-r11"
+PATCHSET_REV="-r13"
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
@@ -206,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