commit:     a587bf137aac1bba23cc2444d9269d8c177774d1
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  2 10:58:59 2025 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Oct  2 10:58:59 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a587bf13

mail-client/mutt-2.2.15: version bump

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 mail-client/mutt/Manifest           |   2 +
 mail-client/mutt/mutt-2.2.15.ebuild | 272 ++++++++++++++++++++++++++++++++++++
 2 files changed, 274 insertions(+)

diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index f8f5078ea487..500498b63143 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,4 +1,6 @@
 DIST mutt-2.2.12.tar.gz 5539244 BLAKE2B 
f17811a37804221fbb351083a25fa8b67511b7a11220e82ab6ce971fc9a0627ec9bcd8df6095e525dacda347aac51b9671cc8e6f8a3fdd8920b44fbcbc61189e
 SHA512 
75e9926af9abc869929d7729cda67adc3710d15560b6a1853b1d95ca926a9e72d975bafa09ebd9a4919905498602a8b55cf72a576fad170c68902862e9474006
 DIST mutt-2.2.14.tar.gz 5549971 BLAKE2B 
b3e5be5115e7e64e490f76945d929ae464b5553e98b3bb3cd5ae0ac33885c8aacfffbd0bd993e06eec27de3ec7bd8fa3896e8cc29d14a00d9338c87095bbb24e
 SHA512 
5c2aacc6a6be8e2be3ee5085c364383f7ed1b7fef730607c70d5e588f65a0fea8748b12b9cdadee7dabdaa5d3c5f94ebddc092737f0ce3b5022c8e5bc7e3c42f
+DIST mutt-2.2.15.tar.gz 5555304 BLAKE2B 
7fccca1d54adebdccf444abebcf2aff5d09fec0059e18c82e60097497d0d203cb40fa1c5e2f090f53952ab9f94bcec6f69f149bf9de206213c36ffc9b79cc78c
 SHA512 
f72c6d372242e2e9a2f8cdd0e38db8acc5311a85a58f90791d2725aa033ca7dbcc68dddea65d3750c9ac53b3b8606e32bf7aef8f9e1586c2d312602e13c0159a
 DIST mutt-gentoo-2.2.12-patches-r0.tar.xz 22444 BLAKE2B 
9c973cb0fe4705dda9e601d18b05d1385df6914af5928bfdba2ad196113a973dccac0f46373c3709654d1fc077aedd6e776c4c57803c095622a70807dafe2cc2
 SHA512 
3857d10055e98360d31d9ed2010e0d75db6fd0c0887e770f6b098869b25f72f5dc594a646b6fdf86cf6b24694e13965f82b8d8a4cb8b65a5e030f628a16b930d
 DIST mutt-gentoo-2.2.14-patches-r0.tar.xz 22412 BLAKE2B 
34531823a6964888cb79771d0242a36597711738eb3178ed423af7de26c9d1cec0bc3038636a2eaa0b9ef6e14803fc9e2f7b0a5ed7ed4ffca013df3d4160d220
 SHA512 
ae803d8964d084aaf3de51b339487a8b07b13b0b08660b794487ddb2beec11b909144383b2f06c7572bcd343317103cecbf6a793cbefc5d84187cdd07cc3367b
+DIST mutt-gentoo-2.2.15-patches-r0.tar.xz 22428 BLAKE2B 
fb3ed2b17e88d9cadec4ec845ecc23aa614c5a9ba8c4ea6622108a90516cb25d561ba4319cd73c507b93216203591c8fce60b9399968002907e2f60b528a655e
 SHA512 
1e41186150589970ab606526f7cbdb916efd10973fb5d2f3169e4907a53f33bb70ee5ec7067330a4f0a98614f07a82e77ab09df4cf4925615e5f0703bb7ea9c7

diff --git a/mail-client/mutt/mutt-2.2.15.ebuild 
b/mail-client/mutt/mutt-2.2.15.ebuild
new file mode 100644
index 000000000000..d729eeb0aa74
--- /dev/null
+++ b/mail-client/mutt/mutt-2.2.15.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit 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="http://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}";
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 
~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+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 )"
+# 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?     ( >=net-misc/gsasl-2.0.0 )
+               !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
+               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
+
+       # allow user patches
+       eapply_user
+
+       # patch version string for bug reports
+       local patchset=
+       use vanilla || patchset=", ${PATCHSET}"
+       sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}"')"|' \
+               muttlib.c || die "failed patching in Gentoo version"
+
+       # bug 864753: avoid warning about missing tools, currently the order
+       # is lynx, w3m, elinks, so remove lynx or w3m when not installed,
+       # elinks should be there via dep.
+       if use doc ; then
+               if ! has_version www-client/lynx ; then
+                       sed -i -e '/lynx/d' doc/Makefile.am || die
+               fi
+               if ! has_version www-client/w3m ; then
+                       sed -i -e '/w3m/d' doc/Makefile.am || die
+               fi
+       fi
+
+       # 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"
+       )
+
+       # 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
+}

Reply via email to