diff options
author | Fabian Groffen <grobian@gentoo.org> | 2013-09-09 19:14:05 +0000 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2013-09-09 19:14:05 +0000 |
commit | 43de018c6e7139a10bf97dc99fbe5eec1f1003ec (patch) | |
tree | 235a4315cd2e1321ac6db81514c24ee8df10e7f2 /mail-client/mutt | |
parent | Version bump (diff) | |
download | gentoo-2-43de018c6e7139a10bf97dc99fbe5eec1f1003ec.tar.gz gentoo-2-43de018c6e7139a10bf97dc99fbe5eec1f1003ec.tar.bz2 gentoo-2-43de018c6e7139a10bf97dc99fbe5eec1f1003ec.zip |
Revbump with new patches from upstream. Should contain fix for #359257, adds kerberos support, bug #476070
(Portage version: 2.2.01.22288-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Diffstat (limited to 'mail-client/mutt')
-rw-r--r-- | mail-client/mutt/ChangeLog | 9 | ||||
-rw-r--r-- | mail-client/mutt/mutt-1.5.21-r1.ebuild | 226 | ||||
-rw-r--r-- | mail-client/mutt/mutt-1.5.21-r13.ebuild (renamed from mail-client/mutt/mutt-1.5.21-r11.ebuild) | 16 |
3 files changed, 15 insertions, 236 deletions
diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog index 633d6ba67690..c280ad8ed2bd 100644 --- a/mail-client/mutt/ChangeLog +++ b/mail-client/mutt/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for mail-client/mutt # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.245 2013/05/02 07:47:35 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.246 2013/09/09 19:14:05 grobian Exp $ + +*mutt-1.5.21-r13 (09 Sep 2013) + + 09 Sep 2013; Fabian Groffen <grobian@gentoo.org> +mutt-1.5.21-r13.ebuild, + -mutt-1.5.21-r1.ebuild, -mutt-1.5.21-r11.ebuild: + Revbump with new patches from upstream. Should contain fix for #359257, adds + kerberos support, bug #476070 02 May 2013; Fabian Groffen <grobian@gentoo.org> mutt-1.5.21-r12.ebuild: Fix for automake-1.13 diff --git a/mail-client/mutt/mutt-1.5.21-r1.ebuild b/mail-client/mutt/mutt-1.5.21-r1.ebuild deleted file mode 100644 index dd39484cc4ad..000000000000 --- a/mail-client/mutt/mutt-1.5.21-r1.ebuild +++ /dev/null @@ -1,226 +0,0 @@ -# Copyright 1999-2011 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-r1.ebuild,v 1.11 2011/08/17 20:11:31 grobian Exp $ - -EAPI="3" - -inherit eutils flag-o-matic autotools - -PATCHSET_REV="-r1" - -DESCRIPTION="A small but very powerful text-based mail client" -HOMEPAGE="http://www.mutt.org" -SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz - mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2 - http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2" -IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl 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" -RDEPEND=">=sys-libs/ncurses-5.2 - tokyocabinet? ( dev-db/tokyocabinet ) - !tokyocabinet? ( - qdbm? ( dev-db/qdbm ) - !qdbm? ( - gdbm? ( sys-libs/gdbm ) - !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) - ) - ) - imap? ( - gnutls? ( >=net-libs/gnutls-1.0.17 ) - !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - ) - pop? ( - gnutls? ( >=net-libs/gnutls-1.0.17 ) - !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - ) - smtp? ( - gnutls? ( >=net-libs/gnutls-1.0.17 ) - !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - ) - idn? ( net-dns/libidn ) - gpg? ( >=app-crypt/gpgme-0.9.0 ) - smime? ( >=dev-libs/openssl-0.9.6 ) - app-misc/mime-types" -DEPEND="${RDEPEND} - net-mail/mailbase - doc? ( - dev-libs/libxml2 - dev-libs/libxslt - app-text/docbook-xsl-stylesheets - || ( www-client/lynx www-client/w3m www-client/elinks ) - )" - -PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV} - -src_prepare() { - # Post-release hot-fixes grabbed from HG, this is what all following - # patches are based on in my Mercurial patchqueue (mq). - # If you ever take over or need to modify patches here, just check - # out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and - # the patchqueue as it'll save you a lot of work. - # http://prefix.gentooexperimental.org:8000/mutt/ - # http://prefix.gentooexperimental.org:8000/mutt-patches/ - for rev in $(eval echo {0..${PR#r}}) ; do - local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch - [[ -e ${revpatch} ]] && \ - epatch "${revpatch}" - done - - # this patch is non-generic and only works because we use a sysconfdir - # different from the one used by the mailbase ebuild - use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch - - # must have fixes to compile or behave correctly, upstream - # 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 - # same category, but functional bits - epatch "${PATCHDIR}"/dont-reveal-bbc.patch - - # the big feature patches that upstream doesn't want to include, but - # nearly every distro has due to their usefulness - for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do - epatch "${p}" - done - - # we conditionalise this one, simply because it has considerable - # impact on the code - use sidebar && epatch "${PATCHDIR}"/sidebar.patch - - # patch version string for bug reports - sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \ - muttlib.c || die "failed patching in Gentoo version" - - # many patches touch the buildsystem, we always need this - AT_M4DIR="m4" eautoreconf - - # the configure script contains some "cleverness" whether or not to setgid - # the dotlock program, resulting in bugs like #278332 - sed -i -e 's/@DOTLOCK_GROUP@//' \ - Makefile.in || die "sed failed" - - # don't just build documentation (lengthy process, with big dependencies) - if use !doc ; then - sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die - fi -} - -src_configure() { - local myconf=" - $(use_enable crypt pgp) \ - $(use_enable debug) \ - $(use_enable gpg gpgme) \ - $(use_enable imap) \ - $(use_enable nls) \ - $(use_enable nntp) \ - $(use_enable pop) \ - $(use_enable smime) \ - $(use_enable smtp) \ - $(use_with idn) \ - $(use_with !nntp mixmaster) \ - --enable-compressed \ - --enable-external-dotlock \ - --enable-nfs-fix \ - --sysconfdir="${EPREFIX}"/etc/${PN} \ - --with-curses \ - --with-docdir="${EPREFIX}"/usr/share/doc/${PN}-${PVR} \ - --with-regex \ - --with-exec-shell=${EPREFIX}/bin/sh" - - case $CHOST in - *-solaris*) - # Solaris has no flock in the standard headers - myconf="${myconf} --enable-fcntl --disable-flock" - ;; - *) - myconf="${myconf} --disable-fcntl --enable-flock" - ;; - esac - - # mutt prioritizes gdbm over bdb, so we will too. - # hcache feature requires at least one database is in USE. - if use tokyocabinet; then - myconf="${myconf} --enable-hcache \ - --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb" - elif use qdbm; then - myconf="${myconf} --enable-hcache \ - --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb" - elif use gdbm ; then - myconf="${myconf} --enable-hcache \ - --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb" - elif use berkdb; then - myconf="${myconf} --enable-hcache \ - --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb" - else - myconf="${myconf} --disable-hcache \ - --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb" - fi - - # there's no need for gnutls, ssl or sasl without socket support - if use pop || use imap || use smtp ; then - if use gnutls; then - myconf="${myconf} --with-gnutls" - elif use ssl; then - myconf="${myconf} --with-ssl" - fi - # not sure if this should be mutually exclusive with the other two - myconf="${myconf} $(use_with sasl)" - else - myconf="${myconf} --without-gnutls --without-ssl --without-sasl" - fi - - if use mbox; then - myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail" - else - myconf="${myconf} --with-homespool=Maildir" - fi - - econf ${myconf} || die "configure failed" -} - -src_install() { - make DESTDIR="${D}" install || die "install failed" - if use mbox; then - insinto /etc/mutt - newins "${FILESDIR}"/Muttrc.mbox Muttrc - else - insinto /etc/mutt - doins "${FILESDIR}"/Muttrc - fi - - # A newer file is provided by app-misc/mime-types. So we link it. - rm "${ED}"/etc/${PN}/mime.types - dosym /etc/mime.types /etc/${PN}/mime.types - - # A man-page is always handy - if use !doc; then - cp doc/mutt.man mutt.1 - cp doc/muttbug.man flea.1 - doman mutt.1 flea.1 - else - # nuke manpages that should be provided by an MTA, bug #177605 - rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \ - || ewarn "failed to remove files, please file a bug" - fi - - if use !prefix ; then - fowners root:mail /usr/bin/mutt_dotlock - fperms g+s /usr/bin/mutt_dotlock - fi - - dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION -} - -pkg_postinst() { - echo - elog "If you are new to mutt you may want to take a look at" - elog "the Gentoo QuickStart Guide to Mutt E-Mail:" - elog " http://www.gentoo.org/doc/en/guide-to-mutt.xml" - echo -} diff --git a/mail-client/mutt/mutt-1.5.21-r11.ebuild b/mail-client/mutt/mutt-1.5.21-r13.ebuild index fff444bc58d5..580a42e4deb1 100644 --- a/mail-client/mutt/mutt-1.5.21-r11.ebuild +++ b/mail-client/mutt/mutt-1.5.21-r13.ebuild @@ -1,22 +1,22 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 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-r11.ebuild,v 1.1 2012/08/25 12:15:04 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.21-r13.ebuild,v 1.1 2013/09/09 19:14:05 grobian Exp $ EAPI="3" inherit eutils flag-o-matic autotools -PATCHSET_REV="-r14" +PATCHSET_REV="-r16" DESCRIPTION="A small but very powerful text-based mail client" HOMEPAGE="http://www.mutt.org/" SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2" -IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl selinux sidebar smime smtp ssl tokyocabinet" +IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos 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 ~arm ~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? ( @@ -31,6 +31,7 @@ RDEPEND=">=sys-libs/ncurses-5.2 !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) + kerberos? ( virtual/krb5 ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) @@ -78,10 +79,6 @@ src_prepare() { # must have fixes to compile or behave correctly, upstream # ignores, disagrees or simply doesn't respond/apply epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection - epatch "${PATCHDIR}"/interix-btowc.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 @@ -133,6 +130,7 @@ src_configure() { $(use_enable smime) \ $(use_enable smtp) \ $(use_with idn) \ + $(use_with kerberos gss) \ $(use_with !nntp mixmaster) \ --enable-compressed \ --enable-external-dotlock \ |