From 1f504b1345b7c76525c2186797d6d9be15dc7101 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Mon, 11 Sep 2017 20:14:58 +0200 Subject: mail-client/mutt: revbump to 1.9.0-r1 to fix faulty patchset Package-Manager: Portage-2.3.8-prefix, Repoman-2.3.3 --- mail-client/mutt/Manifest | 2 +- mail-client/mutt/mutt-1.9.0-r1.ebuild | 252 ++++++++++++++++++++++++++++++++++ mail-client/mutt/mutt-1.9.0.ebuild | 252 ---------------------------------- 3 files changed, 253 insertions(+), 253 deletions(-) create mode 100644 mail-client/mutt/mutt-1.9.0-r1.ebuild delete mode 100644 mail-client/mutt/mutt-1.9.0.ebuild (limited to 'mail-client/mutt') diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest index fa360b6715d3..9cba44db41c1 100644 --- a/mail-client/mutt/Manifest +++ b/mail-client/mutt/Manifest @@ -3,4 +3,4 @@ DIST mutt-1.8.3.tar.gz 4122012 SHA256 9b81746d67ffeca5ea44f60893b70dc93c86d4bc10 DIST mutt-1.9.0.tar.gz 4191932 SHA256 ec6d7595d3a1f26ae9f565b5ba5ffee94f9b2dc0683b0014684f2dc874f9e2d4 SHA512 d68b256ba73d19e1fa4594c2f30c5e89f6ce98b34701498cb7179f7f70a9bda4f08eb063e476ef01a7ad9d61cfc12c2528fa3605047dab5ffadd98b955de8b03 WHIRLPOOL d38647d3c7afb4cf1f5e1aab2a03fd6ec6812da9580932301e12e68d71fed9b4de1ba60b15ba5dbeddd1306584615d8aeaae859fb6a34dc34c1d335c616ef1b6 DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cba13b5cab406148fc068f2faa81aca16a6b5d158 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e WHIRLPOOL 8b6b19da9ced5bf27d86b3143c878c8a392ffa1a3505d7f07d6a5ba5f76289f08447266be0b717179062cff3ba52155538be39f02f5af67fe4d84f9dc2a9d36c DIST mutt-gentoo-1.8.3-patches-r0.tar.xz 142724 SHA256 a4eec3dc4732cb98ac9ef3eb4c4ac7ba651a7ea7e99ebf5d33679cff84e15726 SHA512 db4963c04deb29703f744a7e24248f44d4dc69636b42a2ee8dc3a773e847770b735b048670fe3c6d64528a8df9a04bba4fca2eebcfbe79ad11ec6108d6cf9a7e WHIRLPOOL d2d23e1a21165d2489fad716422defb5eeb0178053391c0b9fd97b141b1c663584f1af66721ffbf5feca586c53ac0403c46d5975d34bbc6ebfc9e73622a87999 -DIST mutt-gentoo-1.9.0-patches-r0.tar.xz 110868 SHA256 c634dd4c59be6489b8a69d0fe60095aea2013ad7403acc83472797d37413e31c SHA512 1abf29432e569c7adc99d3cb3c6f3efc843987e43354229c6cf99e55f7adec6b3e509b9e1c7f2f4029900c7013ba6dd330758e0f4e33e1a2b590a7bb89797fbc WHIRLPOOL ec6f2d836f2abf18335f6eb5d27f7e157bdb0ef979458e49399ddcf39ff437f359a36a795754abb36564d4765cecd4f7b4ab3408837140c34241f71e689502bf +DIST mutt-gentoo-1.9.0-patches-r1.tar.xz 113608 SHA256 1b6c37afba0ea596359924fa297b62ef570ad4125b219b407c221ff39d8640b8 SHA512 117819c24799699de6c0723440917aab3cb1b61ffd5305971410414b011c246c261e8e9f993c20c38cfdf863343eaefde0322d24783d3b8babc182a41ca49dcd WHIRLPOOL 613f832968f30bf6e598b7b6bcab77ba66f33ae54b2737f5147a16beb082fe0e2ba66df6d38b10e182cdb3bd9e03983ebfac65dbec6fecc19f623f556dd69d4c diff --git a/mail-client/mutt/mutt-1.9.0-r1.ebuild b/mail-client/mutt/mutt-1.9.0-r1.ebuild new file mode 100644 index 000000000000..4491727bd3a1 --- /dev/null +++ b/mail-client/mutt/mutt-1.9.0-r1.ebuild @@ -0,0 +1,252 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit eutils flag-o-matic autotools + +PATCHREV="r1" +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 +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla prefix" +REQUIRED_USE=" + hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) ) + imap? ( ssl ) + pop? ( ssl ) + nntp? ( ssl ) + smime? ( ssl !gnutls ) + smtp? ( ssl ) + sasl? ( || ( imap pop smtp nntp ) ) + kerberos? ( || ( imap pop smtp nntp ) )" +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +CDEPEND=" + app-misc/mime-types + + berkdb? ( >=sys-libs/db-4:= ) + gdbm? ( sys-libs/gdbm ) + lmdb? ( dev-db/lmdb:= ) + qdbm? ( dev-db/qdbm ) + tokyocabinet? ( dev-db/tokyocabinet ) + + ssl? ( + gnutls? ( >=net-libs/gnutls-1.0.17:= ) + !gnutls? ( + libressl? ( dev-libs/libressl:= ) + !libressl? ( >=dev-libs/openssl-0.9.6:0= ) + ) + ) + + nls? ( virtual/libintl ) + sasl? ( >=dev-libs/cyrus-sasl-2 ) + kerberos? ( virtual/krb5 ) + idn? ( net-dns/libidn ) + gpg? ( >=app-crypt/gpgme-0.9.0:= ) + 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}"/mutt-gentoo-${PV}-patches + + if use !vanilla ; then + # apply patches + export EPATCH_FORCE="yes" + export EPATCH_SUFFIX="patch" + # http://hg.code.sf.net/p/gentoomutt/code/file/gentoo-1.8 + # http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.8 + local patches=( + patches-mutt + bugs-gentoo + features-common + features-extra + gentoo + ) + local patchset + for patchset in "${patches[@]}" ; do + [[ -d "${PATCHDIR}/${patchset}" ]] || continue + 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_(/aThis 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\\' \ + main.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 + local patchset= + use vanilla || patchset=", ${PATCHSET}" + 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" +} + +src_configure() { + local myconf=( + "$(use_enable crypt pgp)" + "$(use_enable debug)" + "$(use_enable doc)" + "$(use_enable gpg gpgme)" + "$(use_enable nls)" + "$(use_enable notmuch)" + "$(use_enable sidebar)" + "$(use_enable smime)" + + "$(use_enable imap)" + "$(use_enable pop)" + "$(use_enable nntp)" + "$(use_enable smtp)" + + $(use ssl && use gnutls && echo --with-gnutls --without-ssl) + $(use ssl && use !gnutls && echo --without-gnutls --with-ssl ) + $(use !ssl && echo --without-gnutls --without-ssl) + + "$(use_with idn)" + "$(use_with kerberos gss)" + "$(use_with sasl)" + "$(use slang && echo --with-slang=${EPREFIX}/usr)" + "$(use_with !slang 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 + + # REQUIRED_USE should have selected only one of these + local hcaches=( + "berkdb:bdb" + "gdbm" + "lmdb" + "qdbm" + "tokyocabinet" + ) + local ucache hcache lcache + for hcache in "${hcaches[@]}" ; do + if use ${hcache%%:*} ; then + ucache=${hcache} + break + fi + done + if [[ -n ${ucache} ]] ; then + myconf+=( "--enable-hcache" ) + else + myconf+=( "--disable-hcache" ) + fi + for hcache in "${hcaches[@]}" ; do + [[ ${hcache} == ${ucache} ]] \ + && myconf+=( "--with-${hcache#*:}" ) \ + || myconf+=( "--without-${hcache#*:}" ) + done + + if use mbox; then + myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" ) + else + 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 "${EPREFIX}"/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 +} diff --git a/mail-client/mutt/mutt-1.9.0.ebuild b/mail-client/mutt/mutt-1.9.0.ebuild deleted file mode 100644 index f7385cf01944..000000000000 --- a/mail-client/mutt/mutt-1.9.0.ebuild +++ /dev/null @@ -1,252 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla prefix" -REQUIRED_USE=" - hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) ) - imap? ( ssl ) - pop? ( ssl ) - nntp? ( ssl ) - smime? ( ssl !gnutls ) - smtp? ( ssl ) - sasl? ( || ( imap pop smtp nntp ) ) - kerberos? ( || ( imap pop smtp nntp ) )" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -CDEPEND=" - app-misc/mime-types - - berkdb? ( >=sys-libs/db-4:= ) - gdbm? ( sys-libs/gdbm ) - lmdb? ( dev-db/lmdb:= ) - qdbm? ( dev-db/qdbm ) - tokyocabinet? ( dev-db/tokyocabinet ) - - ssl? ( - gnutls? ( >=net-libs/gnutls-1.0.17:= ) - !gnutls? ( - libressl? ( dev-libs/libressl:= ) - !libressl? ( >=dev-libs/openssl-0.9.6:0= ) - ) - ) - - nls? ( virtual/libintl ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - kerberos? ( virtual/krb5 ) - idn? ( net-dns/libidn ) - gpg? ( >=app-crypt/gpgme-0.9.0:= ) - 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}"/mutt-gentoo-${PV}-patches - - if use !vanilla ; then - # apply patches - export EPATCH_FORCE="yes" - export EPATCH_SUFFIX="patch" - # http://hg.code.sf.net/p/gentoomutt/code/file/gentoo-1.8 - # http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.8 - local patches=( - patches-mutt - bugs-gentoo - features-common - features-extra - gentoo - ) - local patchset - for patchset in "${patches[@]}" ; do - [[ -d "${PATCHDIR}/${patchset}" ]] || continue - 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_(/aThis 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\\' \ - main.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 - local patchset= - use vanilla || patchset=", ${PATCHSET}" - 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" -} - -src_configure() { - local myconf=( - "$(use_enable crypt pgp)" - "$(use_enable debug)" - "$(use_enable doc)" - "$(use_enable gpg gpgme)" - "$(use_enable nls)" - "$(use_enable notmuch)" - "$(use_enable sidebar)" - "$(use_enable smime)" - - "$(use_enable imap)" - "$(use_enable pop)" - "$(use_enable nntp)" - "$(use_enable smtp)" - - $(use ssl && use gnutls && echo --with-gnutls --without-ssl) - $(use ssl && use !gnutls && echo --without-gnutls --with-ssl ) - $(use !ssl && echo --without-gnutls --without-ssl) - - "$(use_with idn)" - "$(use_with kerberos gss)" - "$(use_with sasl)" - "$(use slang && echo --with-slang=${EPREFIX}/usr)" - "$(use_with !slang 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 - - # REQUIRED_USE should have selected only one of these - local hcaches=( - "berkdb:bdb" - "gdbm" - "lmdb" - "qdbm" - "tokyocabinet" - ) - local ucache hcache lcache - for hcache in "${hcaches[@]}" ; do - if use ${hcache%%:*} ; then - ucache=${hcache} - break - fi - done - if [[ -n ${ucache} ]] ; then - myconf+=( "--enable-hcache" ) - else - myconf+=( "--disable-hcache" ) - fi - for hcache in "${hcaches[@]}" ; do - [[ ${hcache} == ${ucache} ]] \ - && myconf+=( "--with-${hcache#*:}" ) \ - || myconf+=( "--without-${hcache#*:}" ) - done - - if use mbox; then - myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" ) - else - 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 "${EPREFIX}"/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