From b4169e273b22e6d9262b60f292ef7d2938881e15 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sun, 9 Oct 2016 19:47:32 +0200 Subject: mail-client/mutt: vesion bump to 1.7.1 Package-Manager: portage-2.3.0 --- mail-client/mutt/Manifest | 2 + mail-client/mutt/mutt-1.7.1.ebuild | 266 +++++++++++++++++++++++++++++++++++++ 2 files changed, 268 insertions(+) create mode 100644 mail-client/mutt/mutt-1.7.1.ebuild (limited to 'mail-client') diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest index 2aed7b0ed128..c5b37e5dbf30 100644 --- a/mail-client/mutt/Manifest +++ b/mail-client/mutt/Manifest @@ -7,4 +7,6 @@ DIST mutt-1.6.1.tar.gz 3956840 SHA256 98b26cecc6b1713082fc880344fa345c20bd7ded64 DIST mutt-1.6.2-patches-neomutt-20160710.tar.gz 498925 SHA256 9bceb0cbc66ccbdebe9d6e043125a4589586bc8bfded61168f9ed0a9956f6d67 SHA512 1d9aa8f29cef200c84fbb0e33b1c6d5f9abffb1b038bacf1a1da3b35e9faa2dc6cc43656eaf5a8e3f6ee2af3f999ccee54ce0e842950ac7b7036e83fdbcb8d04 WHIRLPOOL fae79c8d419f8c3cc1e527c9b4f20c2b1257c3e86fac066f6fc9dafe8262417a181685f8d3f2cabfed34fcb1dd42077171a89ac1f04b0ca6d7f8ee74d3e16ed6 DIST mutt-1.6.2.tar.gz 3956745 SHA256 c5d02ef06486cdf04f9eeb9e9d7994890d8dfa7f47e7bfeb53a2a67da2ac1d8e SHA512 c4348ba55459a2f9d5bedda1ec63b7520c0bdcd285bf791972dbd11a947be47e7c88b02c7d244e65c7c0f1be252c43240b570457a5812bf8160611bba7b01916 WHIRLPOOL 4adf29c59dffa50f5e7c8500a81f89ddbda894ade20bc3110cbedefbcdd7db3c2e84aae78d0cb4bc74930a94256738a3b0b1880b840fd81ec433b23b609887de DIST mutt-1.7.0.tar.gz 4019567 SHA256 1d3e987433d8c92ef88a604f4dcefdb35a86ce73f3eff0157e2e491e5b55b345 SHA512 60ff00f268285c12b48e39ca0b5a8bd7e09323255874a6211edc94218ed191ad24ad437dd9c180c45ea6d5a9f163d04bb5515ddf3488c92f4e9411588c550612 WHIRLPOOL 90d28dcb1b522e4cf1ce995e7dad69b5546f26e6878f7d1c2785c9e7e2c12fdfd464c7b2490fa7efa873aa22cf117f7369b1a69adfb1c9efe13e61ed15e27e05 +DIST mutt-1.7.1.tar.gz 4025008 SHA256 e9c6f88e83d48690033f0d862a70293ac746286b77241554f5448bc23bd0d6df SHA512 c0b0be7ba792ecf42bb63c31aa03889b4998474a7cac9a839df3041b0bb72766da140bbb38e70eab5f78f4503d684c9c20620c599c0970ec6933624d22f4613d WHIRLPOOL f63a8e8fd0a403f596c041f2afc8e73db7a0b6ba48749e3cdc6663aae9f114589056cc3ddef7dc5c9e1a9282b607e4f76445ecdc6213cc3a337f8cf2284ba2e5 DIST mutt-gentoo-1.7.0-patches-r5.tar.xz 157172 SHA256 d9370439e6200d75ba9c6705561a408325c07b18f248f59457b45fa09cb080b0 SHA512 758a189ec33d346f4dcc9afad7d5d8b7092c89917a7fe40fbb75803fde0469d8dd197bc360d6e7a3897210973846bec6f7451bee3e4c6b1296e0d8fe8d0db39d WHIRLPOOL 6d26015f7827b182941b9903a2ee0ddaeee2788047c50fb8e67c4466f8403a83252139185cddd72058f790c465783f4e1e637c6fb936a3b25a58f6062458de27 +DIST mutt-gentoo-1.7.1-patches-r0.tar.xz 150172 SHA256 b82859c3ef15ae2225b0ff53e3ff5f7354d7db51a5716eeefae6fe411aafbc9b SHA512 0d4ccff4ad87afe2fdb4603fedf9137d3af80f1b7a6920d7746bc553159369497ee0c0a1e0f40b10ddc3abcfa7f771cc82f8e3565ee430c55198dca5fe68cbd9 WHIRLPOOL d001a5b7e415b9670e1fbbe563365962a44ad0bc65f8b5707908aa48f3ba684d7f573dd19369b6ddef4d74f288b5dc5ec050195ddbfaf3241207797c2b788203 diff --git a/mail-client/mutt/mutt-1.7.1.ebuild b/mail-client/mutt/mutt-1.7.1.ebuild new file mode 100644 index 000000000000..d8843bd0ae2d --- /dev/null +++ b/mail-client/mutt/mutt-1.7.1.ebuild @@ -0,0 +1,266 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" + +inherit eutils flag-o-matic autotools + +PATCHREV="r0" +PATCHSET="gentoo-${PVR}/${PATCHREV}" + +DESCRIPTION="A small but very powerful text-based mail client" +HOMEPAGE="http://www.mutt.org/" +MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz" +SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz + https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz + https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}" +IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla" +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~x86 ~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? ( + !libressl? ( >=dev-libs/openssl-0.9.6:0 ) + libressl? ( dev-libs/libressl ) + ) + ) + sasl? ( >=dev-libs/cyrus-sasl-2 ) + ) + kerberos? ( virtual/krb5 ) + pop? ( + gnutls? ( >=net-libs/gnutls-1.0.17 ) + !gnutls? ( + ssl? ( + !libressl? ( >=dev-libs/openssl-0.9.6:0 ) + libressl? ( dev-libs/libressl ) + ) + ) + sasl? ( >=dev-libs/cyrus-sasl-2 ) + ) + smtp? ( + gnutls? ( >=net-libs/gnutls-1.0.17 ) + !gnutls? ( + ssl? ( + !libressl? ( >=dev-libs/openssl-0.9.6:0 ) + libressl? ( dev-libs/libressl ) + ) + ) + sasl? ( >=dev-libs/cyrus-sasl-2 ) + ) + idn? ( net-dns/libidn ) + gpg? ( >=app-crypt/gpgme-0.9.0 ) + smime? ( + !libressl? ( >=dev-libs/openssl-0.9.6:0 ) + libressl? ( dev-libs/libressl ) + ) + notmuch? ( net-mail/notmuch ) + slang? ( sys-libs/slang ) + !slang? ( >=sys-libs/ncurses-5.2:0 ) +" +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 ) +" + +src_prepare() { + local PATCHDIR="${WORKDIR}"/gentoo-mutt-${PV}-patches + + if use !vanilla ; then + # apply patches + export EPATCH_FORCE="yes" + export EPATCH_SUFFIX="patch" + local patches=( + patches-mutt + bugs-gentoo + features-common + features-extra + gentoo + ) + local patchset + for patchset in "${patches[@]}" ; do + einfo "Applying ${PATCHSET} patchset ${patchset}" + EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \ + || die "patchset ${patchset} failed" + done + # add some explanation as to why not to go upstream + sed -i \ + -e '/ReachingUs = N_(/a\"This release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n"' \ + version.c || die "Failed to add bug instructions" + fi + + local upatches= + # allow user patches + eapply_user && upatches=" with user patches" + + # patch version string for bug reports + sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s, '"${PATCHSET}${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 sidebar) \ + $(use_enable smime) \ + $(use_enable smtp) \ + $(use_enable notmuch) \ + $(use_with idn) \ + $(use_with kerberos gss) \ + $(use slang && echo --with-slang=${EPREFIX}/usr) \ + $(use !slang && echo --with-curses=${EPREFIX}/usr) \ + --enable-compressed \ + --enable-external-dotlock \ + --enable-nfs-fix \ + --sysconfdir=${EPREFIX}/etc/${PN} \ + --with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR} \ + --with-regex \ + --with-exec-shell=${EPREFIX}/bin/sh" + + if [[ ${CHOST} == *-solaris* ]] ; then + # arrows in index view do not show when using wchar_t + myconf+=" --without-wc-funcs" + fi + + # 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 + else + local ver + local preconddate= + for ver in ${REPLACING_VERSIONS} ; do + [[ ${ver} == "1.5"* || ${ver} == "1.6"* ]] && preconddate=true + done + if [[ -n ${preconddate} ]] ; then + echo + elog "The SmartTime functionality has been replaced with" + elog "CondDate feature. To mimic SmartTime, use this CondDate formatter:" + elog "%<[12m?%<[7d?%<[12H?%[%H:%M ]&%[%a-%d]>&%[%d-%b]>&%[%b-%y]>" + echo + fi + fi +} -- cgit v1.2.3-65-gdbad