summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Bock <nicolasbock@gentoo.org>2017-12-10 06:45:56 -0700
committerNicolas Bock <nicolasbock@gentoo.org>2017-12-10 06:45:56 -0700
commitb92b1c6b2c267748be8c748ebcf9ff9a6ec456b5 (patch)
treebecee8706f10f6898801d83c08e3978ed14930ea
parentapp-emulation/free42: Bumps version to 2.0.7 (diff)
downloadgentoo-b92b1c6b2c267748be8c748ebcf9ff9a6ec456b5.tar.gz
gentoo-b92b1c6b2c267748be8c748ebcf9ff9a6ec456b5.tar.bz2
gentoo-b92b1c6b2c267748be8c748ebcf9ff9a6ec456b5.zip
mail-client/mutt: Update USE flag descriptions
The crypto related USE flags are named and described somewhat confusingly. This change updates the crypto related USE flags and adds some more consistent descriptions. This change brings those USE flags in sync with the neomutt package. Closes: https://bugs.gentoo.org/637178 Package-Manager: Portage-2.3.13, Repoman-2.3.3
-rw-r--r--mail-client/mutt/metadata.xml67
-rw-r--r--mail-client/mutt/mutt-1.9.1-r3.ebuild264
2 files changed, 301 insertions, 30 deletions
diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml
index 75c5b94f614..217549fa2db 100644
--- a/mail-client/mutt/metadata.xml
+++ b/mail-client/mutt/metadata.xml
@@ -1,34 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>grobian@gentoo.org</email>
- </maintainer>
- <maintainer type="project">
- <email>net-mail@gentoo.org</email>
- <name>Net-Mail</name>
- </maintainer>
- <use>
- <flag name="berkdb">Enable <pkg>sys-libs/db</pkg> database backend
- for header caching</flag>
- <flag name="gdbm">Enable <pkg>sys-libs/gdbm</pkg> database backend
- for header caching</flag>
- <flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg> to
- sign/verify and encrypt/decrypt OpenPGP messages</flag>
- <flag name="hcache">Enable header cache, one database backend needs
- to be enabled</flag>
- <flag name="lmdb">Enable <pkg>dev-db/lmdb</pkg> database backend for
- header caching</flag>
- <flag name="notmuch">Enable support for <pkg>net-mail/notmuch</pkg></flag>
- <flag name="pop">Enable support for POP3 mailboxes</flag>
- <flag name="sidebar">Enable the sidebar feature</flag>
- <flag name="smime">Enable support for S/MIME mailparts</flag>
- <flag name="smtp">Enable support for direct SMTP delivery</flag>
- <flag name="tokyocabinet">Enable <pkg>dev-db/tokyocabinet</pkg>
- database backend for header caching</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">mutt</remote-id>
- <remote-id type="bitbucket">mutt/mutt</remote-id>
- </upstream>
+ <maintainer type="person">
+ <email>grobian@gentoo.org</email>
+ </maintainer>
+ <maintainer type="project">
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
+ <use>
+ <flag name="berkdb">Enable <pkg>sys-libs/db</pkg> database backend
+ for header caching</flag>
+ <flag name="gdbm">Enable <pkg>sys-libs/gdbm</pkg> database backend
+ for header caching</flag>
+ <flag name="hcache">Enable header cache, one database backend needs
+ to be enabled</flag>
+ <flag name="lmdb">Enable <pkg>dev-db/lmdb</pkg> database backend for
+ header caching</flag>
+ <flag name="notmuch">Enable support for <pkg>net-mail/notmuch</pkg></flag>
+ <flag name="pop">Enable support for POP3 mailboxes</flag>
+ <flag name="sidebar">Enable the sidebar feature</flag>
+ <flag name="smtp">Enable support for direct SMTP delivery</flag>
+ <flag name="tokyocabinet">Enable <pkg>dev-db/tokyocabinet</pkg>
+ database backend for header caching</flag>
+ <flag name="crypt">Add support for encryption -- using mcrypt or gpg
+ where applicable</flag>
+ <flag name="pgp_classic">Build classic_pgp backend to support PGP/MIME
+ and traditional/inline PGP</flag>
+ <flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg></flag>
+ <flag name="gpgme">Build gpgme backend to support S/MIME, PGP/MIME and
+ traditional/inline PGP</flag>
+ <flag name="smime">Enable support for smime</flag>
+ <flag name="smime_classic">Build classic_smime backend to support
+ S/MIME</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">mutt</remote-id>
+ <remote-id type="bitbucket">mutt/mutt</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/mail-client/mutt/mutt-1.9.1-r3.ebuild b/mail-client/mutt/mutt-1.9.1-r3.ebuild
new file mode 100644
index 00000000000..fab20c02df2
--- /dev/null
+++ b/mail-client/mutt/mutt-1.9.1-r3.ebuild
@@ -0,0 +1,264 @@
+# 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="r2"
+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 sidebar slang smime smime_classic smtp ssl tokyocabinet vanilla prefix"
+REQUIRED_USE="
+ hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+ imap? ( ssl )
+ pop? ( ssl )
+ nntp? ( ssl )
+ smime? ( ssl !gnutls )
+ smime_classic? ( 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:= )
+ 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 )
+"
+
+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 pgp_classic pgp)"
+ "$(use_enable debug)"
+ "$(use_enable doc)"
+ "$(use_enable gpg gpgme)"
+ "$(use_enable gpgme)"
+ "$(use_enable nls)"
+ "$(use_enable notmuch)"
+ "$(use_enable sidebar)"
+ "$(use_enable smime)"
+ "$(use_enable smime_classic 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
+ ewarn "Pleae note that the crypto related USE flags of neomutt have changed."
+ ewarn "(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."
+}