diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2012-12-07 18:43:39 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2012-12-07 18:43:39 +0000 |
| commit | 2673f8566a1715e255354c91451b5c0d62329ad3 (patch) | |
| tree | 368478d07c09aee2fbabb579601d964ff0baf46b /mail-client | |
| parent | Fix LICENSE, bug 445808. (diff) | |
| download | gentoo-2-2673f8566a1715e255354c91451b5c0d62329ad3.tar.gz gentoo-2-2673f8566a1715e255354c91451b5c0d62329ad3.tar.bz2 gentoo-2-2673f8566a1715e255354c91451b5c0d62329ad3.zip | |
Revbump, adding several fixes from upstream
(Portage version: 2.2.01.21418-prefix/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Diffstat (limited to 'mail-client')
| -rw-r--r-- | mail-client/mutt/ChangeLog | 8 | ||||
| -rw-r--r-- | mail-client/mutt/mutt-1.5.21-r12.ebuild (renamed from mail-client/mutt/mutt-1.5.21-r9.ebuild) | 19 |
2 files changed, 16 insertions, 11 deletions
diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog index 38addf98b356..653f9432db30 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.233 2012/08/25 12:15:04 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.234 2012/12/07 18:43:39 grobian Exp $ + +*mutt-1.5.21-r12 (07 Dec 2012) + + 07 Dec 2012; Fabian Groffen <grobian@gentoo.org> +mutt-1.5.21-r12.ebuild, + -mutt-1.5.21-r9.ebuild: + Revbump, adding several fixes from upstream *mutt-1.5.21-r11 (25 Aug 2012) diff --git a/mail-client/mutt/mutt-1.5.21-r9.ebuild b/mail-client/mutt/mutt-1.5.21-r12.ebuild index fe6392cf010b..ecf7775f0696 100644 --- a/mail-client/mutt/mutt-1.5.21-r9.ebuild +++ b/mail-client/mutt/mutt-1.5.21-r12.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-r9.ebuild,v 1.1 2012/04/28 15:05:01 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.21-r12.ebuild,v 1.1 2012/12/07 18:43:39 grobian Exp $ EAPI="3" inherit eutils flag-o-matic autotools -PATCHSET_REV="-r12" +PATCHSET_REV="-r15" DESCRIPTION="A small but very powerful text-based mail client" HOMEPAGE="http://www.mutt.org/" @@ -79,8 +79,6 @@ src_prepare() { # ignores, disagrees or simply doesn't respond/apply epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection 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 @@ -100,13 +98,14 @@ src_prepare() { epatch "${PATCHDIR}"/sidebar-dotpathsep.patch fi + local upatches= + # allow user patches + epatch_user && upatches=" with user patches" + # patch version string for bug reports - sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \ + sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${upatches}"')"/' \ 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 @@ -195,7 +194,7 @@ src_configure() { } src_install() { - make DESTDIR="${D}" install || die "install failed" + emake DESTDIR="${D}" install || die "install failed" if use mbox; then insinto /etc/mutt newins "${FILESDIR}"/Muttrc.mbox Muttrc @@ -210,7 +209,7 @@ src_install() { # A man-page is always handy, so fake one if use !doc; then - make -C doc DESTDIR="${D}" muttrc.man || die + emake -C doc DESTDIR="${D}" muttrc.man || die # 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/,#' \ |