mail-client/mutt: version bump 1.12.1
authorFabian Groffen <grobian@gentoo.org>
Mon, 17 Jun 2019 17:12:52 +0000 (19:12 +0200)
committerFabian Groffen <grobian@gentoo.org>
Mon, 17 Jun 2019 17:13:08 +0000 (19:13 +0200)
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

mail-client/mutt/Manifest
mail-client/mutt/mutt-1.12.1.ebuild [new file with mode: 0644]

index 1528eb41dbb6a24fd6d4748f60ba7303edd10980..bdd92c71b5683df6afa36a30fe88ab2aa04ff560 100644 (file)
@@ -2,7 +2,9 @@ DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9
 DIST mutt-1.11.3.tar.gz 4581196 BLAKE2B 12f7a067bdfab72628e3fd25e9391d252c8665db845963df5c4a8f66f7d68ce1385e94fd35527718fdbedc9759910e2ee7253430ecddb8ea92f6368078be9a03 SHA512 381079254f01cdd85b9e556a10bb1ddf0b49d96b54fe21d70dd735199dcbbfd46956ad85201fe8a4e8cdf7bdb121664c7b4edc0659da6b14dc8eaf6adf9827df
 DIST mutt-1.11.4.tar.gz 4582417 BLAKE2B 750385cc90df0d34d35103883a9918f205830ea93e5ec9f33cd579d5c121d630b3074f1918fa0e8e5aa91edd503c7ba38c34785a8a96803d7af30d08a0966c4d SHA512 18c5bfa5c45ef70b3307afccf28f613a36de035f1b5c493f84f0571f7ba297cd0b25e01be9102a028c51c28c459c4bc62281da88926e16ce58c3c1407609e0eb
 DIST mutt-1.12.0.tar.gz 4668896 BLAKE2B 0c3d9bdc55ef836ff5951a897be58fef2d0dda11432df96ddab7b5267302dd7669f6c17bcfbbf706efcc8628dd46a209efa51fa8f4539cc3662534a1e820d6ac SHA512 b9482af3bfeb39ab8be7244deda49b56a77cfa15b3dfc7dd2b0ec2d7eba8e32b742b7a254ff64e6827a6f74f563830276bf950e8b2b192d27a1fd6b1df70443c
+DIST mutt-1.12.1.tar.gz 4675166 BLAKE2B f1c073e05d60f41a8057d90074b7cbc2a882243b0c4b495b1b147356c83daad136d5574dd6a567c0180823e73d8fb79a38d316ab0b2c56731baed24fe9ad9890 SHA512 0101120ad2acab89552be210725bae1a903f0b2c48be7207750589d141236537823f27c39e8d700eee16eb6b978058d056180b3d51e45e0242546f176b971538
 DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
 DIST mutt-gentoo-1.11.3-patches-r0.tar.xz 107172 BLAKE2B bb82a95baf3fe5af191d5da7bd56d0f51d43a390be08442c945515330fd11d5d3a0c2893a5a595ea8a23421ec5ea79aa36a05e46ce71d449c28193b819154c9b SHA512 2d1579f03876398eb793548b31fe8bfc15d226651334dfe07a65eff45ab777eebaae66d85dd0a59e05649ae0924fdb45cfced438eb0dff9742bc13b1fb1ae671
 DIST mutt-gentoo-1.11.4-patches-r0.tar.xz 107064 BLAKE2B f8ad915fd0ceea729fdc14719e69c43751e75fd4afc9f19460d15493fd97baee9606703d7d6a8239a34b2c0d6f2458fc007277933bbc724b6a8588bb7514decd SHA512 57714259f802efe54e21cd23560bb158777b50320604db0a8ff8a47c25166a873d13d64b03eba4cb1c5067a586e7c64d9d0ba84ddbe0e179745e92d704a55cd1
 DIST mutt-gentoo-1.12.0-patches-r0.tar.xz 106152 BLAKE2B 675bae3f7bf6e9792bf90c891d03f58fb849bc3744a2453a52b0a3cd992f53ebc30e363eb9490e8511f7a956424b686651139e54c329ad47363c01e0fd3e4fe0 SHA512 1ad062551f3033ef30e5cc5ce2fc4df151614cf9277227f6d9153e37069ecff0b9ee5bad7e4402f35b8cc04c0e942640d326f0636cc7c6b1d968494972ee7b3a
+DIST mutt-gentoo-1.12.1-patches-r0.tar.xz 106064 BLAKE2B 60b73bcfd9713261c7b88fe74d70a630954511a38331c3e8e958ef7f6459b3bf8548211ee920fe238085c6481c03633cec21e7ae70c1473c89914ce720bd7c21 SHA512 feffbd49ad8156e226e7d4dc56b1c976f3f2a0f8dc3551c11696d5653342b91b4406a494d6081b969fe8267bf09a441a4f3c5a0014d108000e55c985aaafa596
diff --git a/mail-client/mutt/mutt-1.12.1.ebuild b/mail-client/mutt/mutt-1.12.1.ebuild
new file mode 100644 (file)
index 0000000..e7a0912
--- /dev/null
@@ -0,0 +1,288 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pop qdbm +sasl selinux slang smime smime_classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+       hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+       imap?             ( ssl )
+       pop?              ( ssl )
+       nntp?             ( ssl )
+       smime?            ( ssl !gnutls )
+       smime_classic?    ( ssl !gnutls )
+       smtp?             ( ssl sasl )
+       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"
+# yes, we overdepend on the backend impls here, hopefully one day we can
+# have REQUIRED_USE do what it is made for again. bug #607360
+CDEPEND="
+       app-misc/mime-types
+       virtual/libiconv
+
+       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/libidn2 )
+       gpg?           ( >=app-crypt/gpgme-0.9.0:= )
+       gpgme?         ( >=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 )
+       smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+       smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+       crypt? ( app-crypt/gnupg )
+       pgp_classic? ( app-crypt/gnupg )
+"
+
+src_prepare() {
+       local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV}
+
+       if use !vanilla ; then
+               # apply patches
+               export EPATCH_FORCE="yes"
+               export EPATCH_SUFFIX="patch"
+               # http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10
+               local patches=(
+                       patches-mutt
+                       bugs-gentoo
+                       features-common
+                       features-extra
+                       gentoo
+               )
+               local patchset
+               for patchset in "${patches[@]}" ; do
+                       [[ -d "${PATCHDIR}/${patchset}" ]] || continue
+                       einfo "Patches for ${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=(
+               # signing and encryption
+               # clumpsy blocks for transition period of USE-flag renames
+               $(use crypt         && use_enable crypt pgp)
+               $(use pgp_classic   && use_enable pgp_classic pgp)
+               $(use !crypt && use !pgp_classic && echo "--disable-pgp")
+
+               $(use smime         && use_enable smime)
+               $(use smime_classic && use_enable smime_classic smime)
+               $(use !smime && use !smime_classic && echo "--disable-smime")
+
+               $(use gpg           && use_enable gpg gpgme)
+               $(use gpgme         && use_enable gpgme)
+               $(use !gpg && use !gpgme && echo "--disable-gpgme")
+
+               # features
+               $(use_enable debug)
+               $(use_enable doc)
+               $(use_enable nls)
+               $(use_enable notmuch)
+
+               # protocols
+               $(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 sasl)
+               $(use_with idn idn2) --without-idn  # avoid automagic libidn dep
+               $(use_with kerberos gss)
+               "$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)"
+               "$(use_with !slang curses "${EPREFIX}"/usr)"
+
+               "--enable-compressed"
+               "--enable-external-dotlock"
+               "--enable-iconv"
+               "--enable-nfs-fix"
+               "--enable-sidebar"
+               "--sysconfdir=${EPREFIX}/etc/${PN}"
+               "--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+               "--with-regex"
+               "--with-exec-shell=${EPREFIX}/bin/sh"
+       )
+
+       if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then
+               # arrows in index view do not show when using wchar_t
+               # or misalign due to wrong computations
+               myconf+=( "--without-wc-funcs" )
+       fi
+
+       # note: REQUIRED_USE should have selected only one of these, but for
+       # bug #607360 we're forced to allow multiple.  For that reason, this
+       # list is ordered to preference, and only the first is taken.
+       local hcaches=(
+               "lmdb"
+               "qdbm"
+               "tokyocabinet"
+               "gdbm"
+               "berkdb:bdb"
+       )
+       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 || die
+               cp doc/muttrc.man muttrc.5 || die
+               doman mutt.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
+               ewarn "This release removes the conditional date feature in favour"
+               ewarn "of Dynamic \$index_format Content, see:"
+               ewarn "  http://www.mutt.org/doc/manual/#index-format-hook"
+       fi
+       if use crypt || use gpg || use smime ; then
+               ewarn "Please note that the crypto related USE-flags of mutt have changed."
+               ewarn "To remove some unclarity, the following USE-flags are renamed:"
+               ewarn "(see https://bugs.gentoo.org/637176)"
+               ewarn "  crypt -> pgp_classic"
+               ewarn "  gpg   -> gpgme"
+               ewarn "  smime -> smime_classic"
+               ewarn "The old USE flags still work but their use is deprecated and will"
+               ewarn "be removed in a future release.  Please update your package.use"
+               if use gpg && ( use crypt || use smime ) ; then
+                       ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
+                       ewarn "  support.  You can probably remove pgp_classic (old crypt)"
+                       ewarn "  and smime_classic (old smime) from your USE-flags and"
+                       ewarn "  only enable gpgme."
+               fi
+       fi
+       if use gpgme ; then
+               ewarn "Note: in order for Mutt to actually use the gpgme backend"
+               ewarn "      you MUST include 'set crypt_use_gpgme=yes' in .muttrc"
+               ewarn "      https://dev.mutt.org/doc/manual.html#crypt-use-gpgme"
+       fi
+}