From: Fabian Groffen Date: Wed, 2 Sep 2015 19:42:32 +0000 (+0200) Subject: mail-client/mutt: version bump to 1.5.24 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0c67f886a6b24bdb15582082ec29721ee92bf9f3;p=gentoo.git mail-client/mutt: version bump to 1.5.24 Package-Manager: portage-2.2.20-prefix --- diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest index 100ba596b2c5..85c4eec02eed 100644 --- a/mail-client/mutt/Manifest +++ b/mail-client/mutt/Manifest @@ -2,3 +2,5 @@ DIST mutt-1.5.23-gentoo-patches-r5.tar.bz2 127745 SHA256 a2c457071b17fc1886c8f0d DIST mutt-1.5.23-gentoo-patches-r7.tar.bz2 167553 SHA256 354bd25bdba4f58b4bfcbc84b451199d0d801c239b7e610ff0ec3e76e838741e SHA512 7e7090d7bf74d3d0cc59facc3715f2671a5a2b82ab794b1e1b2b6178ff4059854b3fe6f5b3e3833381d24f7150bea2b8542f26e7ea29aa72752bda1ac3051b29 WHIRLPOOL 0e2f37efdcb4195c5d9d3ec7c859a1f1fa2316907e4b6352c470701ef3613e41502deccd3ca45b5a3e60e5353612b339a26f8c649d2813a0898d67a3802a1a99 DIST mutt-1.5.23-gentoo-patches-r8.tar.bz2 167959 SHA256 30aed5383b77321b92e407b53d759d72ab6da105771a65cecbb07eae191e496b SHA512 5f88217f0fa94e5eb08aa574b1bfa78a512528eaff8127487c8fd3d3e9c59fb9090a11c3f72beff28ca36a3dd5a8ab155f9de880d332836a0ac12e72b64640f8 WHIRLPOOL 994e0bd6a80d4fbcd523d71cf7615deaa46f5e1753fdb5967730e0013cbb8de0d6ceba3c01ea015e3b363fb395456db7507f75fb52e860e28c03e71371acd2b6 DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37 SHA512 f1b4a7230253651857f61bd7215cce870a613012f613d4c907d401556083726c8ed7d429d57a8bf858c3b5b23683380d4c1494540d86ca80813e22cb6b95bc1e WHIRLPOOL b5a676d204aece8c572d57a027fa5a402b7afe8e5b7d4c83b2d1b1612eb0ac5cb58cd225757732a017f03444e0ea42dacffcf1cf2d46c18ae92d7d3306059c61 +DIST mutt-1.5.24-gentoo-patches.tar.bz2 78689 SHA256 8ee2997448a0d1b9039b7dd61bbda0781ad408a3a98ba6febd06ab90b1a86f4d SHA512 43fcc2a3565d97b073285a57f0a684d73706b95306a18d0e348b6230859acdbab83d2917cc6c1d0baba14efb046a5b79f4fdf47388144f769b4685380ca2922e WHIRLPOOL ea247724afa12e7a5ba8a55c773b6195153e0097cb244b62a7c5b287c877a6bc1670750ae6e99d8bef8a794bfcede0048e27d880717853815529c1674b08ebca +DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023 diff --git a/mail-client/mutt/mutt-1.5.24.ebuild b/mail-client/mutt/mutt-1.5.24.ebuild new file mode 100644 index 000000000000..c2c1ed326b14 --- /dev/null +++ b/mail-client/mutt/mutt-1.5.24.ebuild @@ -0,0 +1,252 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils flag-o-matic autotools + +PATCHSET_REV="" + +DESCRIPTION="A small but very powerful text-based mail client" +HOMEPAGE="http://www.mutt.org/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz + mirror://bitbucket/${PN}/${PN}/downloads/${P}.tar.gz + ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz + mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2 + https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2" +IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet" +SLOT="0" +LICENSE="GPL-2" +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" +CDEPEND=" + app-misc/mime-types + nls? ( virtual/libintl ) + 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 ) + ) + kerberos? ( virtual/krb5 ) + 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 ) + slang? ( sys-libs/slang ) + !slang? ( >=sys-libs/ncurses-5.2 ) +" +DEPEND="${CDEPEND} + net-mail/mailbase + doc? ( + dev-libs/libxml2 + dev-libs/libxslt + app-text/docbook-xsl-stylesheets + || ( www-client/lynx www-client/w3m www-client/elinks ) + )" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-mutt ) +" +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://hg.code.sf.net/p/gentoomutt/code/ + # http://hg.code.sf.net/p/gentoomuttpatches/code/ + for rev in $(eval echo {0..${PR#r}}) ; do + local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch + [[ -e ${revpatch} ]] && \ + epatch "${revpatch}" + done + # fix compilation with ncurses[tinfo], #459260 + epatch "${PATCHDIR}"/ncurses-tinfo.patch + + # 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 + # 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 + if use sidebar ; then + epatch "${PATCHDIR}"/sidebar-20140412.patch + epatch "${PATCHDIR}"/sidebar-dotpathsep.patch + epatch "${PATCHDIR}"/sidebar-counts.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}${upatches}"')"/' \ + 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 kerberos gss) \ + $(use slang && echo --with-slang) \ + --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() { + emake 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, so fake one + if use !doc; then + 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/,#' \ + -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 + 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() { + if [[ -z ${REPLACING_VERSIONS} ]] ; then + 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 " https://wiki.gentoo.org/wiki/Mutt" + echo + fi +}