summaryrefslogtreecommitdiff
path: root/mail-client/mutt
diff options
context:
space:
mode:
Diffstat (limited to 'mail-client/mutt')
-rw-r--r--mail-client/mutt/Manifest10
-rw-r--r--mail-client/mutt/metadata.xml1
-rw-r--r--mail-client/mutt/mutt-2.2.12-r1.ebuild6
-rw-r--r--mail-client/mutt/mutt-2.2.12.ebuild273
-rw-r--r--mail-client/mutt/mutt-2.2.14-r1.ebuild (renamed from mail-client/mutt/mutt-2.2.13.ebuild)13
-rw-r--r--mail-client/mutt/mutt-2.2.14.ebuild273
6 files changed, 13 insertions, 563 deletions
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 07ff3e75070f..b05d14543d45 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -2,13 +2,9 @@ AUX Muttrc 667 BLAKE2B 49aaefba7ceeefde9d727ad88574fc599a48bcd334ac8e99d8d5e555f
AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39fb58d8e336bec6fd500b88c0b14d026c9578d12cd1e4bca45c0d2f3d286d2c9d132b2b5e137e SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90
AUX mutt-2.2.12-configure-c99.patch 962 BLAKE2B 7a3312f7edf131d1b9b0ad868d330d91542fcc112a615b120ac6423d78c527a2b6797db4ecca018ab89df34fcdbebd85bd5339a997fed69abf181ecc025c41cb SHA512 48c703bcf0e5fa59588156fa6407026f7fd2aa619297133286993041b46688fb5473e16c1fcc3d82b65a6cf039ed12b0e1b3c952ce6265c0efc89f51a96bbd2f
DIST mutt-2.2.12.tar.gz 5539244 BLAKE2B f17811a37804221fbb351083a25fa8b67511b7a11220e82ab6ce971fc9a0627ec9bcd8df6095e525dacda347aac51b9671cc8e6f8a3fdd8920b44fbcbc61189e SHA512 75e9926af9abc869929d7729cda67adc3710d15560b6a1853b1d95ca926a9e72d975bafa09ebd9a4919905498602a8b55cf72a576fad170c68902862e9474006
-DIST mutt-2.2.13.tar.gz 5539130 BLAKE2B 993b5dc43f09a313acb7e02b1d182e2856f4f9a9d61c7137a9e4ea3c399302adf69993d6f7d3af3dc1f89e17473071689eb3692949daadaacb0338302090abea SHA512 dcd84235b6f759c31b56cf021efc17c0bb1fd4d59226d12af9838f3cbbcf0301262ae5f67803565cce3afd6ff5eed3a380a81958f57fb7d8f38e2ecfd0ff7d2c
DIST mutt-2.2.14.tar.gz 5549971 BLAKE2B b3e5be5115e7e64e490f76945d929ae464b5553e98b3bb3cd5ae0ac33885c8aacfffbd0bd993e06eec27de3ec7bd8fa3896e8cc29d14a00d9338c87095bbb24e SHA512 5c2aacc6a6be8e2be3ee5085c364383f7ed1b7fef730607c70d5e588f65a0fea8748b12b9cdadee7dabdaa5d3c5f94ebddc092737f0ce3b5022c8e5bc7e3c42f
DIST mutt-gentoo-2.2.12-patches-r0.tar.xz 22444 BLAKE2B 9c973cb0fe4705dda9e601d18b05d1385df6914af5928bfdba2ad196113a973dccac0f46373c3709654d1fc077aedd6e776c4c57803c095622a70807dafe2cc2 SHA512 3857d10055e98360d31d9ed2010e0d75db6fd0c0887e770f6b098869b25f72f5dc594a646b6fdf86cf6b24694e13965f82b8d8a4cb8b65a5e030f628a16b930d
-DIST mutt-gentoo-2.2.13-patches-r0.tar.xz 22388 BLAKE2B e9833e8b8630b1d6a4e90a78b4077b7a4ee37e9b6a492bb3b55e2763e8d6d8d810b6f77f294f1acad721f8fa235b656066a11b2b75f73dcc5294966b8fa18860 SHA512 3093504700ea7caee25f814daab4b869151853ef5fe062abca3a3915a28f688dd38007d07f3da579da1cb25ddcd6017ebba0db35422952ee2adc94b07ba96005
DIST mutt-gentoo-2.2.14-patches-r0.tar.xz 22412 BLAKE2B 34531823a6964888cb79771d0242a36597711738eb3178ed423af7de26c9d1cec0bc3038636a2eaa0b9ef6e14803fc9e2f7b0a5ed7ed4ffca013df3d4160d220 SHA512 ae803d8964d084aaf3de51b339487a8b07b13b0b08660b794487ddb2beec11b909144383b2f06c7572bcd343317103cecbf6a793cbefc5d84187cdd07cc3367b
-EBUILD mutt-2.2.12-r1.ebuild 8257 BLAKE2B cd2ef09616b61b0c2c1803b4c2f52e5aa0b44081b006ae69e859f5a4bd5e93c84dd9ae09d245baa6ccee67546d21c871a7454fc8fbe347ea45f7cfea23bc7fd8 SHA512 00273aedd6bebf6faa2cd2cbd96bda41623caabefc0be6c31e4700c0c00691c3e3759cce12ef2d929f45756321e082537549cac52078085ac12e6b77d07a97be
-EBUILD mutt-2.2.12.ebuild 8105 BLAKE2B 41da2a3b589186508bdbd13371ccd328e9170aa0016579dadbc92c99c62c1f525792e3f41244b20a7ce2836b97bfd1118c4b155b18be4cd63743b307cccf3ac6 SHA512 94f1b3b74aecc161067fb7f0092d20fd0ee482ce9a0ca0e76b8f27b9d4b48f9391256dfb74a00cf54d0281bf07bde7f2f369a89183bb072ca72cf1e957f2e0ad
-EBUILD mutt-2.2.13.ebuild 8208 BLAKE2B 143f1d370184ab652b0a52b3a64ff23c3a4e4b2202efbe5815eb6fc571d3190595d0455d7bafd19c4c29de09c8dedd4d1264c077133b35c5cfe4524ed2ad37f2 SHA512 cb17660caa13ffcee51b08b921c67859b28540a05c966e6dd99cf4a00fae39ac1aac720979ea63b6ac31e1550f336dc36cd4aa2fbb87968836b4cade77c75327
-EBUILD mutt-2.2.14.ebuild 8208 BLAKE2B 143f1d370184ab652b0a52b3a64ff23c3a4e4b2202efbe5815eb6fc571d3190595d0455d7bafd19c4c29de09c8dedd4d1264c077133b35c5cfe4524ed2ad37f2 SHA512 cb17660caa13ffcee51b08b921c67859b28540a05c966e6dd99cf4a00fae39ac1aac720979ea63b6ac31e1550f336dc36cd4aa2fbb87968836b4cade77c75327
-MISC metadata.xml 1414 BLAKE2B 2deac7ed76c71c4621f31bcb32dd224f34763cba4fe8f3df897bb31d144b96949d1026cb498d6e606e30aa445f8813e80eb95bd9564b540eb32c7f9f2282c647 SHA512 8d80b7a8c1f65588d80772f4e71c1ad510d11d881c2634e269ac470a01bcd51d3cd6f897acaebfe156141b1659780cf7661b6709be46ffec9a21b412a67d3796
+EBUILD mutt-2.2.12-r1.ebuild 8257 BLAKE2B b63e048a25a6500988d6eabc9325f4b9d719d39dcc351ce12eb5ac9c8593d2f06f01c2672e08d3d4c94c3b5f850a73f18b5a27a73e6dfea95435990b04b1741b SHA512 b11d91873fd5e47488efb6d42582bd8bb80aaf26c100b39915746c7d022141b5fb07bcf2ea351c75a1fc51c90885ee772ffb0320463fdadc71d65ba258e8c1b7
+EBUILD mutt-2.2.14-r1.ebuild 8150 BLAKE2B 28abd162820bbf823d65ba7b9e79cab3cd2e12548255cf18f9424309100a97faf494a3431b32c662fb98e13c644406521e7a77a1ba72628b1f8f15dd978b05c8 SHA512 611d29b1bfd5023f0a017e19099f6fa09e097606e0257000753c6797ac72fb124f780d05b2fa773144bfc19702ec7e97ebb9e0fb3c38331eb7892c200ea446d9
+MISC metadata.xml 1467 BLAKE2B 65fc4874dc80859ef47a0845001c89e4859acdd52164c335ad9886bcf3725d4a9c538207a1bbf58ceb6aba9513b7875d8d86339b8e756ce69dfff3c430d4f010 SHA512 36399576ff9ce24b63237942b58913685b037eb8d20e6b1f28b0a1fcbbe6332f5e25febd5a3e649fee568b147143f357ff8500c3f76441c43c98a10f267883c2
diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml
index d46d1eab7b90..4dab48c1825a 100644
--- a/mail-client/mutt/metadata.xml
+++ b/mail-client/mutt/metadata.xml
@@ -29,5 +29,6 @@
</use>
<upstream>
<remote-id type="gitlab">muttmua/mutt</remote-id>
+ <remote-id type="bitbucket">mutt/mutt</remote-id>
</upstream>
</pkgmetadata>
diff --git a/mail-client/mutt/mutt-2.2.12-r1.ebuild b/mail-client/mutt/mutt-2.2.12-r1.ebuild
index b490bd4afc3f..3664a0714ea8 100644
--- a/mail-client/mutt/mutt-2.2.12-r1.ebuild
+++ b/mail-client/mutt/mutt-2.2.12-r1.ebuild
@@ -14,6 +14,9 @@ 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="
@@ -26,9 +29,6 @@ REQUIRED_USE="
sasl? ( || ( imap pop smtp ) )
kerberos? ( || ( imap pop smtp ) )
autocrypt? ( gpgme )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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="
diff --git a/mail-client/mutt/mutt-2.2.12.ebuild b/mail-client/mutt/mutt-2.2.12.ebuild
deleted file mode 100644
index dc00685874a3..000000000000
--- a/mail-client/mutt/mutt-2.2.12.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-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}"
-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="ppc" # https://bugs.gentoo.org/945633
-# 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
- # 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
-
- # 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
-}
diff --git a/mail-client/mutt/mutt-2.2.13.ebuild b/mail-client/mutt/mutt-2.2.14-r1.ebuild
index 57d2b218f39c..d729eeb0aa74 100644
--- a/mail-client/mutt/mutt-2.2.13.ebuild
+++ b/mail-client/mutt/mutt-2.2.14-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI="8"
inherit autotools
@@ -14,6 +14,9 @@ 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="
@@ -26,9 +29,6 @@ REQUIRED_USE="
sasl? ( || ( imap pop smtp ) )
kerberos? ( || ( imap pop smtp ) )
autocrypt? ( gpgme )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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="
@@ -67,9 +67,9 @@ DEPEND="${CDEPEND}
|| ( www-client/lynx www-client/w3m www-client/elinks )
)"
RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-mutt )
+ selinux? ( sec-policy/selinux-mutt )
smime-classic? ( >=dev-libs/openssl-0.9.6:0 )
- pgp-classic? ( app-crypt/gnupg )
+ pgp-classic? ( app-crypt/gnupg )
"
src_prepare() {
@@ -77,7 +77,6 @@ src_prepare() {
if use !vanilla ; then
# apply patches
- # http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10
local patches=(
patches-mutt
bugs-gentoo
diff --git a/mail-client/mutt/mutt-2.2.14.ebuild b/mail-client/mutt/mutt-2.2.14.ebuild
deleted file mode 100644
index 57d2b218f39c..000000000000
--- a/mail-client/mutt/mutt-2.2.14.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-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}"
-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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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? ( >=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
- # 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
-
- # 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
-}