diff options
| -rw-r--r-- | mail-client/mutt/ChangeLog | 9 | ||||
| -rw-r--r-- | mail-client/mutt/mutt-1.5.21-r11.ebuild (renamed from mail-client/mutt/mutt-1.5.21-r10.ebuild) | 15 |
2 files changed, 16 insertions, 8 deletions
diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog index 22560fc47060..38addf98b356 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.232 2012/08/22 08:37:26 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.233 2012/08/25 12:15:04 grobian Exp $ + +*mutt-1.5.21-r11 (25 Aug 2012) + + 25 Aug 2012; Fabian Groffen <grobian@gentoo.org> +mutt-1.5.21-r11.ebuild, + -mutt-1.5.21-r10.ebuild: + Drop faulty -r10, add fixes for crash (bug #432344) and hang (bug #432562) in + -r11. 22 Aug 2012; Johannes Huber <johu@gentoo.org> mutt-1.5.21-r10.ebuild: Stable for x86, wrt bug #432050 diff --git a/mail-client/mutt/mutt-1.5.21-r10.ebuild b/mail-client/mutt/mutt-1.5.21-r11.ebuild index fc7b64f7b6f3..fff444bc58d5 100644 --- a/mail-client/mutt/mutt-1.5.21-r10.ebuild +++ b/mail-client/mutt/mutt-1.5.21-r11.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-r10.ebuild,v 1.5 2012/08/22 08:37:26 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.21-r11.ebuild,v 1.1 2012/08/25 12:15:04 grobian Exp $ EAPI="3" inherit eutils flag-o-matic autotools -PATCHSET_REV="-r13" +PATCHSET_REV="-r14" DESCRIPTION="A small but very powerful text-based mail client" HOMEPAGE="http://www.mutt.org/" @@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl selinux sidebar smime smtp ssl tokyocabinet" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=">=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( @@ -99,13 +99,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 |