From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- mail-client/mutt/Manifest | 5 +- mail-client/mutt/metadata.xml | 2 + mail-client/mutt/mutt-2.2.1.ebuild | 268 +++++++++++++++++++++++++++++++++++++ 3 files changed, 274 insertions(+), 1 deletion(-) create mode 100644 mail-client/mutt/mutt-2.2.1.ebuild (limited to 'mail-client/mutt') diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest index 08f62e5365db..01b528de2dff 100644 --- a/mail-client/mutt/Manifest +++ b/mail-client/mutt/Manifest @@ -3,10 +3,13 @@ AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39 DIST mutt-2.0.7.tar.gz 5299366 BLAKE2B 587679d3580a55084312b4bd26083c85fb1b3d07b4a08ea5e2081f475d37a0e283ecfd647555519fc6deccb4bdfdd46234ede4669a9abc6fc2cde778f76bf656 SHA512 1eb689fb9e6aa3cf0bcd0b696c25477cd04b74d8ec93404df071de6dc051e46bbad88131cdf610eb01df4789984707f3791366ae2fda28de2d2739aeb9d34e30 DIST mutt-2.1.4.tar.gz 5407563 BLAKE2B 3ae0cdfb59afdfa8ba930fb11a4acb195783be7b47cd100ecb11a99e448ff72ae0fd96503fcfec15d55f041e32010e1596f654b75482ca4741c07cd0f883dd57 SHA512 621240fdecb65ed2d63d6a4cbe134c4ec40486cb4aa3a02649ff822a87c01732e513f403380dc9c7d3840220dde55a6fb13bb9c05b511b9b33965f599ffb2798 DIST mutt-2.1.5.tar.gz 5414049 BLAKE2B 00be360c51f03d80ac1a83554ee92873804ddeb0f3ac34cd1da1e98286384937de3182959457560d9c506f9c813f3a1f679ab8507bef7c323f993d0ad4596b81 SHA512 8daf534ef6b8f97bdbbc1bccb64dad51de6fe0fbdb41d3d5cbe418fe234000dc09ea2b790d2529c205f16b89c6963b6de98eaa2fdc6e3f5b55a3cb5f7962e0d5 +DIST mutt-2.2.1.tar.gz 5503979 BLAKE2B 304dee7e24dcff896e1a12b0eb0f6bb4ccd58067249fd5090f53d0e55dd401f16b037e7519b07e465ccba6c177113ab1f00e1e3983d0f3345be392bccbe2f43b SHA512 2dd29a095698b7bb98dd5631a507ac1eb655d5db22d0e2506dea5d91663483aefb722e99ba8ad53f4e776189163d5339bba03ec41182c13aa9d665ba321f0941 DIST mutt-gentoo-2.0.7-patches-r0.tar.xz 26416 BLAKE2B dd03fd2a29f4c2e8681c4413ca430b65beb2036b73fa95430f5f06e7c2948fb4e3256be89d922646731245672cb2900d6b7ce6bda16cb9306d5531064cfaf8a1 SHA512 cb72df8f6fa3436f134f66772f82ba95ebc92462cf145d21e01ad5b277f13294948c1d03c9c6671e58c655776a6112f2af065df79a56a135ab70c28b37e43334 DIST mutt-gentoo-2.1.4-patches-r0.tar.xz 25840 BLAKE2B 9507c2fdc0297965cca11ea7ae2317daaf5ac24cba8f4477da562c2a1c6ccf50242137efbabd8037c9442a34652df318ea58eb126e14bfbd04d21384d72df248 SHA512 51b9d670321a868fbee33cc36921a8e2ba5fb428e741d1dbf8e6f52123bce44dfcd001897277f660f4ebdc1c51af968757bca6de5b2fb12818a9f5f964a5aecb DIST mutt-gentoo-2.1.5-patches-r0.tar.xz 25832 BLAKE2B 38aaeed745fe2162e6578bb56e897e462f5ea39d5b0497d2f94759945f7f8c1a2db1c92578ccf677daad025868b6bb3565f691f382e7876eea6f6cc041ea79ac SHA512 732e66fc8118b972d878c6d42e95d5cfdb72374f21119033d74d1122dc77e24977408f828a1d5f29f5524027599558892d257fb3830ddf4f094a8102b0ac6c84 +DIST mutt-gentoo-2.2.1-patches-r0.tar.xz 23164 BLAKE2B 755a5904fd68a577c96d78a311b5cd0713df4fa884c18c14ca4c88c48b56997a6372af32391201843e7aa8a7cb9cd7002105f217f42c9dec46073e2fe3ccf1bc SHA512 5d022aa2a2ee83f394c52957ad958ba8739fa9395d8ea7c96c1f1138b9df4413ff9e3209e36741666549232e5595cae77bf04ce180e34fac34594a2886084e6d EBUILD mutt-2.0.7.ebuild 7867 BLAKE2B 90a99efa6b98975bfb2b82407f51ba8187a780e780139f580d90ba8294e4defafaadb7c0b326eef89b9b3ce7e26c8c738a5b90dbcf2ac5a8b3736c8f938342c7 SHA512 48c0ed350e53959f5137ce975535bdf131801578b2c269253b470affce3f6adf2ebce823f708d05ae969055532ce06402d6f55fc2ca2e5cc8069fb5df3d100ee EBUILD mutt-2.1.4.ebuild 7873 BLAKE2B b6ab1e3636ecec7a053f204ecaac1760fc8cddf4e56f2f8e8f7ad036e99044e35c30c995926d8e0873c0ce99f7a660e6fcf7dcc403b5b151dc86c17ae228bed6 SHA512 0d222627a66716790c1b305675b6bcf0b756b1116825262dcb22d0fc5da1f176228f04ab110fe1d1365c974482b078aa94d8f5f0c5cb63e776faad34d86e23ee EBUILD mutt-2.1.5.ebuild 7873 BLAKE2B b6ab1e3636ecec7a053f204ecaac1760fc8cddf4e56f2f8e8f7ad036e99044e35c30c995926d8e0873c0ce99f7a660e6fcf7dcc403b5b151dc86c17ae228bed6 SHA512 0d222627a66716790c1b305675b6bcf0b756b1116825262dcb22d0fc5da1f176228f04ab110fe1d1365c974482b078aa94d8f5f0c5cb63e776faad34d86e23ee -MISC metadata.xml 1298 BLAKE2B a8e83f9fa158a1f0cd2b92de76299c0b450a283331a188c989dcf81b9780d0aa1a15d75a9b58253a397fe17031c4479265c667adba57dbf2baa063c482f20b68 SHA512 3c4034d6b9dc02df1cbbd858edb99f7f79635311fbfc0b2261a0a80bd966bbf41c5fa4125787cc3925d72725f0d065c9711e948bb6ae2f277c6a1296da27f862 +EBUILD mutt-2.2.1.ebuild 8134 BLAKE2B caa8c3bb9bcacfbb6f5513a13e1a1e3a68f46bae24fb78c4300f3e4accdb90f30996987a89ac23a8019100e35ce7494a211a42fb86d4af41ba8c66059fde0cc3 SHA512 95553591ae1328ab50987ee4c7bf8ee5788a19763c6c9a1f7d3a5cca267d82831faa329b3a14a4b893bea5e3232f70fa925a2a0ed088304b41660be730da2e5c +MISC metadata.xml 1413 BLAKE2B b48f350744607d739c38cc54e42abce66e485f1f65fafaa5f4a668f07da70fff0f917f1d67cab621c9e267052fdb958476292fe5222738e7bca59502f560078c SHA512 c9b4c3a9ac62c04be1ef8dc894754334f35fb79d6365360212805e9f9f2c2dca18e1d03c76bb887e81b4fbb2199fdf8fe4341ebc2059f5961184562ee549df65 diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml index 88a77ea08a92..ec82093d6108 100644 --- a/mail-client/mutt/metadata.xml +++ b/mail-client/mutt/metadata.xml @@ -10,6 +10,8 @@ for header caching Enable sys-libs/gdbm database backend for header caching + Use GNU SASL via virtual/gsasl instead + of Cyrus SASL (requires USE=sasl) Enable header cache, one database backend needs to be enabled Enable dev-db/lmdb database backend for diff --git a/mail-client/mutt/mutt-2.2.1.ebuild b/mail-client/mutt/mutt-2.2.1.ebuild new file mode 100644 index 000000000000..9217536891d9 --- /dev/null +++ b/mail-client/mutt/mutt-2.2.1.ebuild @@ -0,0 +1,268 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit 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="autocrypt berkdb debug doc gdbm gnutls gpgme gsasl +hcache idn +imap kerberos +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix" +# hcache: allow multiple, bug #607360 +REQUIRED_USE=" + gsasl? ( sasl ) + hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) + imap? ( ssl ) + pop? ( ssl ) + smime-classic? ( ssl !gnutls ) + smtp? ( ssl sasl ) + sasl? ( || ( imap pop smtp ) ) + kerberos? ( || ( imap pop smtp ) ) + autocrypt? ( gpgme )" +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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? ( >=dev-libs/openssl-0.9.6:0= ) + ) + + nls? ( virtual/libintl ) + sasl? ( + gsasl? ( virtual/gsasl ) + !gsasl? ( >=dev-libs/cyrus-sasl-2 ) + ) + kerberos? ( virtual/krb5 ) + idn? ( net-dns/libidn2 ) + gpgme? ( >=app-crypt/gpgme-0.9.0:= ) + autocrypt? ( >=dev-db/sqlite-3 ) + 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-classic? ( >=dev-libs/openssl-0.9.6:0 ) + pgp-classic? ( app-crypt/gnupg ) +" + +src_prepare() { + local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV} + + if use !vanilla ; then + # apply patches + # 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 p + for patchset in "${patches[@]}" ; do + [[ -d "${PATCHDIR}/${patchset}" ]] || continue + einfo "Patches for ${PATCHSET} patchset ${patchset}" + for p in "${PATCHDIR}/${patchset}"/*.patch ; do + eapply "${p}" || die + done + 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 + $(use_enable autocrypt) $(use_with autocrypt sqlite3) + $(use_enable pgp-classic pgp) + $(use_enable smime-classic smime) + $(use_enable gpgme) + + # features + $(use_enable debug) + $(use_enable doc) + $(use_enable nls) + + # protocols + $(use_enable imap) + $(use_enable pop) + $(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 sasl && use gsasl && echo --with-gsasl --without-sasl) + $(use sasl && use !gsasl && echo --without-gsasl --with-sasl ) + $(use !sasl && echo --without-gsasl --without-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}" + "--without-bundled-regex" # use the implementation from libc + "--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[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + insinto /etc/${PN} + if use mbox; then + newins "${FILESDIR}"/Muttrc.mbox Muttrc + else + doins "${FILESDIR}"/Muttrc + fi + + # include attachment settings, it's mandatory and shouldn't harm + # when not being referenced (index_format using %X) + { + echo + echo "# mandatory attachments settings, not setting these is a BUG!" + echo "# see https://marc.info/?l=mutt-dev&m=158347284923517&w=2" + grep '^attachments' "${ED}"/etc/${PN}/Muttrc.dist + } >> "${ED}"/etc/${PN}/Muttrc + + # add setting to actually enable gpgme usage + if use gpgme || use autocrypt ; then + { + echo + echo "# this setting enables the gpgme backend (via USE=gpgme)" + # https is broken due to a certificate mismatch :( + echo "# see http://www.mutt.org/doc/manual/#crypt-use-gpgme" + echo "set crypt_use_gpgme = yes" + } >> "${ED}"/etc/${PN}/Muttrc + fi + + # similar for autocrypt + if use autocrypt ; then + { + echo + echo "# enables autocrypt (via USE=autocrypt)" + echo "# see http://www.mutt.org/doc/manual/#autocryptdoc" + echo "set autocrypt = yes" + } >> "${ED}"/etc/${PN}/Muttrc + fi + + # A newer file is provided by app-misc/mime-types. So we link it. + rm "${ED}"/etc/${PN}/mime.types + dosym ../mime.types /etc/${PN}/mime.types + + # 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" + + if use !prefix ; then + fowners root:mail /usr/bin/mutt_dotlock + fperms g+s /usr/bin/mutt_dotlock + fi + + dodoc 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 +} -- cgit v1.2.3